Add an API for historical data access

This feature is currently limited to open62541 and the "read raw"
functionality of OPC UA part 11.

Change-Id: I6c7e8f24e09019b671ad82ad16ccdafc3357a47e
Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>

44 files changed, 17084 insertions, 10314 deletions

diff --git a/examples/opcua/opcuaviewer/mainwindow.cpp b/examples/opcua/opcuaviewer/mainwindow.cpp
index 36ba78f..a57c5f7 100644
--- a/examples/opcua/opcuaviewer/mainwindow.cpp
+++ b/examples/opcua/opcuaviewer/mainwindow.cpp
@@ -62,6 +62,8 @@
 #include <QOpcUaAuthenticationInformation>
 #include <QOpcUaErrorState>
 
+#include <QOpcUaHistoryReadRawRequest>
+
 QT_BEGIN_NAMESPACE
 
 static MainWindow *mainWindowGlobal = nullptr;
@@ -134,13 +136,13 @@ MainWindow::MainWindow(const QString &initialUrl, QWidget *parent) : QMainWindow
     ui->treeView->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
 
     if (ui->opcUaPlugin->count() == 0) {
-        ui->opcUaPlugin->setDisabled(true);
-        ui->connectButton->setDisabled(true);
         QMessageBox::critical(this, tr("No OPCUA plugins available"), tr("The list of available OPCUA plugins is empty. No connection possible."));
     }
 
     mContextMenu = new QMenu(ui->treeView);
-    mContextMenuAction = mContextMenu->addAction(tr("Enable Monitoring"), this, &MainWindow::toggleMonitoring);
+    mContextMenuMonitoringAction = mContextMenu->addAction(tr("Enable Monitoring"), this, &MainWindow::toggleMonitoring);
+    mContextMenuHistorizingAction = mContextMenu->addAction(tr("Request historic data"), this, &MainWindow::showHistorizing);
+
     ui->treeView->setContextMenuPolicy(Qt::CustomContextMenu);
     connect(ui->treeView, &QTreeView::customContextMenuRequested, this, &MainWindow::openCustomContextMenu);
 
@@ -465,9 +467,13 @@ void MainWindow::openCustomContextMenu(const QPoint &point)
     if (index.isValid() && index.column() == 1) {
         TreeItem* item = static_cast<TreeItem *>(index.internalPointer());
         if (item) {
-            mContextMenuAction->setData(index);
-            mContextMenuAction->setEnabled(item->supportsMonitoring());
-            mContextMenuAction->setText(item->monitoringEnabled() ? tr("Disable Monitoring") : tr("Enable Monitoring"));
+            mContextMenuMonitoringAction->setData(index);
+            mContextMenuMonitoringAction->setEnabled(item->supportsMonitoring());
+            mContextMenuMonitoringAction->setText(item->monitoringEnabled() ? tr("Disable Monitoring") : tr("Enable Monitoring"));
+
+            mContextMenuHistorizingAction->setData(index);
+            QModelIndex isHistoricIndex = mOpcUaModel->index(index.row(), 7, index.parent());
+            mContextMenuHistorizingAction->setEnabled(mOpcUaModel->data(isHistoricIndex, Qt::DisplayRole).toString() == "true");
             mContextMenu->exec(ui->treeView->viewport()->mapToGlobal(point));
         }
     }
@@ -475,7 +481,7 @@ void MainWindow::openCustomContextMenu(const QPoint &point)
 
 void MainWindow::toggleMonitoring()
 {
-    QModelIndex index = mContextMenuAction->data().toModelIndex();
+    QModelIndex index = mContextMenuMonitoringAction->data().toModelIndex();
     if (index.isValid()) {
         TreeItem* item = static_cast<TreeItem *>(index.internalPointer());
         if (item) {
@@ -484,4 +490,48 @@ void MainWindow::toggleMonitoring()
     }
 }
 
+void MainWindow::showHistorizing()
+{
+    QModelIndex modelIndex = mContextMenuHistorizingAction->data().toModelIndex();
+    QModelIndex nodeIdIndex = mOpcUaModel->index(modelIndex.row(), 4, modelIndex.parent());
+    QString nodeId = mOpcUaModel->data(nodeIdIndex, Qt::DisplayRole).toString();
+    auto request = QOpcUaHistoryReadRawRequest(
+                {QOpcUaReadItem(nodeId)},
+                QDateTime::currentDateTime(),
+                QDateTime::currentDateTime().addDays(-2),
+                5,
+                false
+                );
+    mHistoryReadResponse.reset(mOpcUaClient->readHistoryData(request));
+
+    if (mHistoryReadResponse) {
+        QObject::connect(mHistoryReadResponse.get(), &QOpcUaHistoryReadResponse::readHistoryDataFinished,
+                         this, &MainWindow::handleReadHistoryDataFinished);
+        QObject::connect(mHistoryReadResponse.get(), &QOpcUaHistoryReadResponse::stateChanged, this, [](QOpcUaHistoryReadResponse::State state) {
+            qDebug() << "History read state changed to" << state;
+        });
+    } else {
+        qWarning() << "Failed to request history data";
+    }
+}
+
+void MainWindow::handleReadHistoryDataFinished(QList<QOpcUaHistoryData> results, QOpcUa::UaStatusCode serviceResult)
+{
+    if (serviceResult != QOpcUa::UaStatusCode::Good) {
+        qWarning() << "readHistoryData request finished with bad status code: " << serviceResult;
+        return;
+    }
+
+    for (int i = 0; i < results.count(); ++i) {
+        qInfo() << "NodeId:" << results.at(i).nodeId() << "; statusCode:" << results.at(i).statusCode() << "; returned values:" << results.at(i).count();
+        for (int j = 0; j < results.at(i).count(); ++j) {
+            qInfo() << j
+                       << "source timestamp:" << results.at(i).result()[j].sourceTimestamp()
+                       << "server timestamp:" <<  results.at(i).result()[j].serverTimestamp()
+                       << "value:" << results.at(i).result()[j].value();
+
+        }
+    }
+}
+
 QT_END_NAMESPACE
diff --git a/examples/opcua/opcuaviewer/mainwindow.h b/examples/opcua/opcuaviewer/mainwindow.h
index e254798..cf13149 100644
--- a/examples/opcua/opcuaviewer/mainwindow.h
+++ b/examples/opcua/opcuaviewer/mainwindow.h
@@ -53,6 +53,7 @@
 
 #include <QMainWindow>
 #include <QOpcUaClient>
+#include <QItemSelection>
 
 QT_BEGIN_NAMESPACE
 
@@ -86,6 +87,8 @@ private slots:
     void showErrorDialog(QOpcUaErrorState *errorState);
     void openCustomContextMenu(const QPoint &point);
     void toggleMonitoring();
+    void showHistorizing();
+    void handleReadHistoryDataFinished(QList<QOpcUaHistoryData> results, QOpcUa::UaStatusCode serviceResult);
 
 private:
     void createClient();
@@ -105,7 +108,9 @@ private:
     QOpcUaPkiConfiguration m_pkiConfig;
     QOpcUaEndpointDescription m_endpoint; // current endpoint used to connect
     QMenu *mContextMenu;
-    QAction *mContextMenuAction;
+    QAction *mContextMenuMonitoringAction;
+    QAction *mContextMenuHistorizingAction;
+    QScopedPointer<QOpcUaHistoryReadResponse> mHistoryReadResponse;
 };
 
 QT_END_NAMESPACE
diff --git a/examples/opcua/opcuaviewer/opcuamodel.cpp b/examples/opcua/opcuaviewer/opcuamodel.cpp
index 27f2483..1d36a0d 100644
--- a/examples/opcua/opcuaviewer/opcuamodel.cpp
+++ b/examples/opcua/opcuaviewer/opcuamodel.cpp
@@ -120,6 +120,8 @@ QVariant OpcUaModel::headerData(int section, Qt::Orientation orientation, int ro
         return QStringLiteral("DisplayName");
     case 6:
         return QStringLiteral("Description");
+    case 7:
+        return QStringLiteral("Historizing");
     default:
         break;
     }
diff --git a/examples/opcua/opcuaviewer/treeitem.cpp b/examples/opcua/opcuaviewer/treeitem.cpp
index 23af28a..0edadb9 100644
--- a/examples/opcua/opcuaviewer/treeitem.cpp
+++ b/examples/opcua/opcuaviewer/treeitem.cpp
@@ -66,7 +66,7 @@
 
 QT_BEGIN_NAMESPACE
 
-const int numberOfDisplayColumns = 7; // NodeId, Value, NodeClass, DataType, BrowseName, DisplayName, Description
+const int numberOfDisplayColumns = 8; // NodeId, Value, NodeClass, DataType, BrowseName, DisplayName, Description, Historizing
 
 TreeItem::TreeItem(OpcUaModel *model) : QObject(nullptr)
   , mModel(model)
@@ -88,6 +88,7 @@ TreeItem::TreeItem(QOpcUaNode *node, OpcUaModel *model, TreeItem *parent) : QObj
                             | QOpcUa::NodeAttribute::DataType
                             | QOpcUa::NodeAttribute::BrowseName
                             | QOpcUa::NodeAttribute::DisplayName
+                            | QOpcUa::NodeAttribute::Historizing
                             ))
         qWarning() << "Reading attributes" << mOpcNode->nodeId() << "failed";
 }
@@ -98,6 +99,7 @@ TreeItem::TreeItem(QOpcUaNode *node, OpcUaModel *model, const QOpcUaReferenceDes
     mNodeClass = browsingData.nodeClass();
     mNodeId = browsingData.targetNodeId().nodeId();
     mNodeDisplayName = browsingData.displayName().text();
+    mHistorizing = false;
 }
 
 TreeItem::~TreeItem()
@@ -165,6 +167,10 @@ QVariant TreeItem::data(int column)
             ? mOpcNode->attribute(QOpcUa::NodeAttribute::Description).value<QOpcUaLocalizedText>().text()
             : tr("Loading ...");
     }
+    if (column == 7) {
+        return mAttributesReady
+            ? mHistorizing ? QString("true") : QString("false") : tr("Loading ...");
+    }
     return QVariant();
 }
 
@@ -272,6 +278,9 @@ void TreeItem::handleAttributes(QOpcUa::NodeAttributes attr)
         mNodeBrowseName = mOpcNode->attribute(QOpcUa::NodeAttribute::BrowseName).value<QOpcUaQualifiedName>().name();
     if (attr & QOpcUa::NodeAttribute::DisplayName)
         mNodeDisplayName = mOpcNode->attribute(QOpcUa::NodeAttribute::DisplayName).value<QOpcUaLocalizedText>().text();
+    if (attr & QOpcUa::NodeAttribute::Historizing) {
+        mHistorizing = mOpcNode->attribute(QOpcUa::NodeAttribute::Historizing).value<bool>();
+    }
 
     mAttributesReady = true;
     emit mModel->dataChanged(mModel->createIndex(row(), 0, this), mModel->createIndex(row(), numberOfDisplayColumns - 1, this));
diff --git a/examples/opcua/opcuaviewer/treeitem.h b/examples/opcua/opcuaviewer/treeitem.h
index e28ca0d..52cc82d 100644
--- a/examples/opcua/opcuaviewer/treeitem.h
+++ b/examples/opcua/opcuaviewer/treeitem.h
@@ -108,6 +108,7 @@ private:
     QString mNodeBrowseName;
     QString mNodeId;
     QString mNodeDisplayName;
+    bool mHistorizing;
     QOpcUa::NodeClass mNodeClass = QOpcUa::NodeClass::Undefined;
 };
 
diff --git a/src/3rdparty/open62541/open62541.c b/src/3rdparty/open62541/open62541.c
index 5920352..9d508ae 100644
--- a/src/3rdparty/open62541/open62541.c
+++ b/src/3rdparty/open62541/open62541.c
@@ -1,6 +1,6 @@
 /* THIS IS A SINGLE-FILE DISTRIBUTION CONCATENATED FROM THE OPEN62541 SOURCES
  * visit http://open62541.org/ for information about this software
- * Git-Revision: v1.1.2-8-ge941fc2
+ * Git-Revision: v1.1.2-8-ge941fc23
  */
 
 /*
@@ -27,7 +27,7 @@
 
 #include "open62541.h"
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/deps/open62541_queue.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/deps/open62541_queue.h" ***********************************/
 
 /*	$OpenBSD: queue.h,v 1.38 2013/07/03 15:05:21 fgsch Exp $	*/
 /*	$NetBSD: queue.h,v 1.11 1996/05/16 05:17:14 mycroft Exp $	*/
@@ -675,7 +675,7 @@ struct {								\
 } while (0)
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/deps/pcg_basic.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/deps/pcg_basic.h" ***********************************/
 
 /*
  * PCG Random Number Generation for C.
@@ -722,7 +722,7 @@ uint32_t pcg32_random_r(pcg32_random_t* rng);
 #endif
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/deps/libc_time.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/deps/libc_time.h" ***********************************/
 
 
 struct mytm {
@@ -738,7 +738,7 @@ int __secs_to_tm(long long t, struct mytm *tm);
 long long __tm_to_secs(const struct mytm *tm);
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/deps/base64.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/deps/base64.h" ***********************************/
 
 #ifndef UA_BASE64_H_
 #define UA_BASE64_H_
@@ -772,7 +772,7 @@ _UA_END_DECLS
 
 #endif /* UA_BASE64_H_ */
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/ua_util_internal.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/ua_util_internal.h" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -927,7 +927,7 @@ typedef union {
 _UA_END_DECLS
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/ua_types_encoding_binary.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/ua_types_encoding_binary.h" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -1005,10 +1005,10 @@ UA_findDataTypeByBinary(const UA_NodeId *typeId);
 _UA_END_DECLS
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/build/src_generated/open62541/types_generated_encoding_binary.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/build/src_generated/open62541/types_generated_encoding_binary.h" ***********************************/
 
-/* Generated from Opc.Ua.Types.bsd with script /home/jvoe/open62541/tools/generate_datatypes.py
- * on host rigel by user jvoe at 2020-09-09 11:33:49 */
+/* Generated from Opc.Ua.Types.bsd with script /home/pdie/sonstiges/qtopcua/repos/open62541/tools/generate_datatypes.py
+ * on host mintaka by user pdie at 2021-06-21 11:34:37 */
 
 
 #ifdef UA_ENABLE_AMALGAMATION
@@ -1367,592 +1367,592 @@ UA_DiagnosticInfo_decodeBinary(const UA_ByteString *src, size_t *offset, UA_Diag
     return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_DIAGNOSTICINFO], NULL);
 }
 
-/* ViewAttributes */
+/* NodeClass */
 static UA_INLINE size_t
-UA_ViewAttributes_calcSizeBinary(const UA_ViewAttributes *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_VIEWATTRIBUTES]);
+UA_NodeClass_calcSizeBinary(const UA_NodeClass *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_NODECLASS]);
 }
 static UA_INLINE UA_StatusCode
-UA_ViewAttributes_encodeBinary(const UA_ViewAttributes *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_VIEWATTRIBUTES], bufPos, &bufEnd, NULL, NULL);
+UA_NodeClass_encodeBinary(const UA_NodeClass *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_NODECLASS], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_ViewAttributes_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ViewAttributes *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_VIEWATTRIBUTES], NULL);
+UA_NodeClass_decodeBinary(const UA_ByteString *src, size_t *offset, UA_NodeClass *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_NODECLASS], NULL);
 }
 
-/* XVType */
+/* StructureType */
 static UA_INLINE size_t
-UA_XVType_calcSizeBinary(const UA_XVType *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_XVTYPE]);
+UA_StructureType_calcSizeBinary(const UA_StructureType *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_STRUCTURETYPE]);
 }
 static UA_INLINE UA_StatusCode
-UA_XVType_encodeBinary(const UA_XVType *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_XVTYPE], bufPos, &bufEnd, NULL, NULL);
+UA_StructureType_encodeBinary(const UA_StructureType *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_STRUCTURETYPE], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_XVType_decodeBinary(const UA_ByteString *src, size_t *offset, UA_XVType *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_XVTYPE], NULL);
+UA_StructureType_decodeBinary(const UA_ByteString *src, size_t *offset, UA_StructureType *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_STRUCTURETYPE], NULL);
 }
 
-/* ElementOperand */
+/* StructureField */
 static UA_INLINE size_t
-UA_ElementOperand_calcSizeBinary(const UA_ElementOperand *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_ELEMENTOPERAND]);
+UA_StructureField_calcSizeBinary(const UA_StructureField *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_STRUCTUREFIELD]);
 }
 static UA_INLINE UA_StatusCode
-UA_ElementOperand_encodeBinary(const UA_ElementOperand *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_ELEMENTOPERAND], bufPos, &bufEnd, NULL, NULL);
+UA_StructureField_encodeBinary(const UA_StructureField *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_STRUCTUREFIELD], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_ElementOperand_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ElementOperand *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_ELEMENTOPERAND], NULL);
+UA_StructureField_decodeBinary(const UA_ByteString *src, size_t *offset, UA_StructureField *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_STRUCTUREFIELD], NULL);
 }
 
-/* VariableAttributes */
+/* StructureDefinition */
 static UA_INLINE size_t
-UA_VariableAttributes_calcSizeBinary(const UA_VariableAttributes *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES]);
+UA_StructureDefinition_calcSizeBinary(const UA_StructureDefinition *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_STRUCTUREDEFINITION]);
 }
 static UA_INLINE UA_StatusCode
-UA_VariableAttributes_encodeBinary(const UA_VariableAttributes *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES], bufPos, &bufEnd, NULL, NULL);
+UA_StructureDefinition_encodeBinary(const UA_StructureDefinition *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_STRUCTUREDEFINITION], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_VariableAttributes_decodeBinary(const UA_ByteString *src, size_t *offset, UA_VariableAttributes *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES], NULL);
+UA_StructureDefinition_decodeBinary(const UA_ByteString *src, size_t *offset, UA_StructureDefinition *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_STRUCTUREDEFINITION], NULL);
 }
 
-/* EnumValueType */
+/* Argument */
 static UA_INLINE size_t
-UA_EnumValueType_calcSizeBinary(const UA_EnumValueType *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_ENUMVALUETYPE]);
+UA_Argument_calcSizeBinary(const UA_Argument *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_ARGUMENT]);
 }
 static UA_INLINE UA_StatusCode
-UA_EnumValueType_encodeBinary(const UA_EnumValueType *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_ENUMVALUETYPE], bufPos, &bufEnd, NULL, NULL);
+UA_Argument_encodeBinary(const UA_Argument *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_ARGUMENT], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_EnumValueType_decodeBinary(const UA_ByteString *src, size_t *offset, UA_EnumValueType *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_ENUMVALUETYPE], NULL);
+UA_Argument_decodeBinary(const UA_ByteString *src, size_t *offset, UA_Argument *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_ARGUMENT], NULL);
 }
 
-/* EventFieldList */
+/* EnumValueType */
 static UA_INLINE size_t
-UA_EventFieldList_calcSizeBinary(const UA_EventFieldList *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_EVENTFIELDLIST]);
+UA_EnumValueType_calcSizeBinary(const UA_EnumValueType *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_ENUMVALUETYPE]);
 }
 static UA_INLINE UA_StatusCode
-UA_EventFieldList_encodeBinary(const UA_EventFieldList *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_EVENTFIELDLIST], bufPos, &bufEnd, NULL, NULL);
+UA_EnumValueType_encodeBinary(const UA_EnumValueType *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_ENUMVALUETYPE], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_EventFieldList_decodeBinary(const UA_ByteString *src, size_t *offset, UA_EventFieldList *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_EVENTFIELDLIST], NULL);
+UA_EnumValueType_decodeBinary(const UA_ByteString *src, size_t *offset, UA_EnumValueType *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_ENUMVALUETYPE], NULL);
 }
 
-/* MonitoredItemCreateResult */
+/* EnumField */
 static UA_INLINE size_t
-UA_MonitoredItemCreateResult_calcSizeBinary(const UA_MonitoredItemCreateResult *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_MONITOREDITEMCREATERESULT]);
+UA_EnumField_calcSizeBinary(const UA_EnumField *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_ENUMFIELD]);
 }
 static UA_INLINE UA_StatusCode
-UA_MonitoredItemCreateResult_encodeBinary(const UA_MonitoredItemCreateResult *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_MONITOREDITEMCREATERESULT], bufPos, &bufEnd, NULL, NULL);
+UA_EnumField_encodeBinary(const UA_EnumField *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_ENUMFIELD], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_MonitoredItemCreateResult_decodeBinary(const UA_ByteString *src, size_t *offset, UA_MonitoredItemCreateResult *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_MONITOREDITEMCREATERESULT], NULL);
+UA_EnumField_decodeBinary(const UA_ByteString *src, size_t *offset, UA_EnumField *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_ENUMFIELD], NULL);
 }
 
-/* EUInformation */
+/* Duration */
 static UA_INLINE size_t
-UA_EUInformation_calcSizeBinary(const UA_EUInformation *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_EUINFORMATION]);
+UA_Duration_calcSizeBinary(const UA_Duration *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_DURATION]);
 }
 static UA_INLINE UA_StatusCode
-UA_EUInformation_encodeBinary(const UA_EUInformation *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_EUINFORMATION], bufPos, &bufEnd, NULL, NULL);
+UA_Duration_encodeBinary(const UA_Duration *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_DURATION], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_EUInformation_decodeBinary(const UA_ByteString *src, size_t *offset, UA_EUInformation *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_EUINFORMATION], NULL);
+UA_Duration_decodeBinary(const UA_ByteString *src, size_t *offset, UA_Duration *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_DURATION], NULL);
 }
 
-/* ServerDiagnosticsSummaryDataType */
+/* UtcTime */
 static UA_INLINE size_t
-UA_ServerDiagnosticsSummaryDataType_calcSizeBinary(const UA_ServerDiagnosticsSummaryDataType *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_SERVERDIAGNOSTICSSUMMARYDATATYPE]);
+UA_UtcTime_calcSizeBinary(const UA_UtcTime *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_UTCTIME]);
 }
 static UA_INLINE UA_StatusCode
-UA_ServerDiagnosticsSummaryDataType_encodeBinary(const UA_ServerDiagnosticsSummaryDataType *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_SERVERDIAGNOSTICSSUMMARYDATATYPE], bufPos, &bufEnd, NULL, NULL);
+UA_UtcTime_encodeBinary(const UA_UtcTime *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_UTCTIME], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_ServerDiagnosticsSummaryDataType_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ServerDiagnosticsSummaryDataType *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_SERVERDIAGNOSTICSSUMMARYDATATYPE], NULL);
+UA_UtcTime_decodeBinary(const UA_ByteString *src, size_t *offset, UA_UtcTime *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_UTCTIME], NULL);
 }
 
-/* ContentFilterElementResult */
+/* LocaleId */
 static UA_INLINE size_t
-UA_ContentFilterElementResult_calcSizeBinary(const UA_ContentFilterElementResult *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_CONTENTFILTERELEMENTRESULT]);
+UA_LocaleId_calcSizeBinary(const UA_LocaleId *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_LOCALEID]);
 }
 static UA_INLINE UA_StatusCode
-UA_ContentFilterElementResult_encodeBinary(const UA_ContentFilterElementResult *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_CONTENTFILTERELEMENTRESULT], bufPos, &bufEnd, NULL, NULL);
+UA_LocaleId_encodeBinary(const UA_LocaleId *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_LOCALEID], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_ContentFilterElementResult_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ContentFilterElementResult *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_CONTENTFILTERELEMENTRESULT], NULL);
+UA_LocaleId_decodeBinary(const UA_ByteString *src, size_t *offset, UA_LocaleId *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_LOCALEID], NULL);
 }
 
-/* LiteralOperand */
+/* TimeZoneDataType */
 static UA_INLINE size_t
-UA_LiteralOperand_calcSizeBinary(const UA_LiteralOperand *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_LITERALOPERAND]);
+UA_TimeZoneDataType_calcSizeBinary(const UA_TimeZoneDataType *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_TIMEZONEDATATYPE]);
 }
 static UA_INLINE UA_StatusCode
-UA_LiteralOperand_encodeBinary(const UA_LiteralOperand *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_LITERALOPERAND], bufPos, &bufEnd, NULL, NULL);
+UA_TimeZoneDataType_encodeBinary(const UA_TimeZoneDataType *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_TIMEZONEDATATYPE], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_LiteralOperand_decodeBinary(const UA_ByteString *src, size_t *offset, UA_LiteralOperand *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_LITERALOPERAND], NULL);
+UA_TimeZoneDataType_decodeBinary(const UA_ByteString *src, size_t *offset, UA_TimeZoneDataType *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_TIMEZONEDATATYPE], NULL);
 }
 
-/* MessageSecurityMode */
+/* ApplicationType */
 static UA_INLINE size_t
-UA_MessageSecurityMode_calcSizeBinary(const UA_MessageSecurityMode *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_MESSAGESECURITYMODE]);
+UA_ApplicationType_calcSizeBinary(const UA_ApplicationType *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_APPLICATIONTYPE]);
 }
 static UA_INLINE UA_StatusCode
-UA_MessageSecurityMode_encodeBinary(const UA_MessageSecurityMode *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_MESSAGESECURITYMODE], bufPos, &bufEnd, NULL, NULL);
+UA_ApplicationType_encodeBinary(const UA_ApplicationType *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_APPLICATIONTYPE], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_MessageSecurityMode_decodeBinary(const UA_ByteString *src, size_t *offset, UA_MessageSecurityMode *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_MESSAGESECURITYMODE], NULL);
+UA_ApplicationType_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ApplicationType *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_APPLICATIONTYPE], NULL);
 }
 
-/* UtcTime */
+/* ApplicationDescription */
 static UA_INLINE size_t
-UA_UtcTime_calcSizeBinary(const UA_UtcTime *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_UTCTIME]);
+UA_ApplicationDescription_calcSizeBinary(const UA_ApplicationDescription *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_APPLICATIONDESCRIPTION]);
 }
 static UA_INLINE UA_StatusCode
-UA_UtcTime_encodeBinary(const UA_UtcTime *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_UTCTIME], bufPos, &bufEnd, NULL, NULL);
+UA_ApplicationDescription_encodeBinary(const UA_ApplicationDescription *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_APPLICATIONDESCRIPTION], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_UtcTime_decodeBinary(const UA_ByteString *src, size_t *offset, UA_UtcTime *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_UTCTIME], NULL);
+UA_ApplicationDescription_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ApplicationDescription *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_APPLICATIONDESCRIPTION], NULL);
 }
 
-/* UserIdentityToken */
+/* RequestHeader */
 static UA_INLINE size_t
-UA_UserIdentityToken_calcSizeBinary(const UA_UserIdentityToken *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_USERIDENTITYTOKEN]);
+UA_RequestHeader_calcSizeBinary(const UA_RequestHeader *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_REQUESTHEADER]);
 }
 static UA_INLINE UA_StatusCode
-UA_UserIdentityToken_encodeBinary(const UA_UserIdentityToken *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_USERIDENTITYTOKEN], bufPos, &bufEnd, NULL, NULL);
+UA_RequestHeader_encodeBinary(const UA_RequestHeader *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_REQUESTHEADER], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_UserIdentityToken_decodeBinary(const UA_ByteString *src, size_t *offset, UA_UserIdentityToken *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_USERIDENTITYTOKEN], NULL);
+UA_RequestHeader_decodeBinary(const UA_ByteString *src, size_t *offset, UA_RequestHeader *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_REQUESTHEADER], NULL);
 }
 
-/* X509IdentityToken */
+/* ResponseHeader */
 static UA_INLINE size_t
-UA_X509IdentityToken_calcSizeBinary(const UA_X509IdentityToken *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_X509IDENTITYTOKEN]);
+UA_ResponseHeader_calcSizeBinary(const UA_ResponseHeader *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_RESPONSEHEADER]);
 }
 static UA_INLINE UA_StatusCode
-UA_X509IdentityToken_encodeBinary(const UA_X509IdentityToken *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_X509IDENTITYTOKEN], bufPos, &bufEnd, NULL, NULL);
+UA_ResponseHeader_encodeBinary(const UA_ResponseHeader *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_RESPONSEHEADER], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_X509IdentityToken_decodeBinary(const UA_ByteString *src, size_t *offset, UA_X509IdentityToken *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_X509IDENTITYTOKEN], NULL);
+UA_ResponseHeader_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ResponseHeader *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_RESPONSEHEADER], NULL);
 }
 
-/* MonitoredItemNotification */
+/* ServiceFault */
 static UA_INLINE size_t
-UA_MonitoredItemNotification_calcSizeBinary(const UA_MonitoredItemNotification *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_MONITOREDITEMNOTIFICATION]);
+UA_ServiceFault_calcSizeBinary(const UA_ServiceFault *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_SERVICEFAULT]);
 }
 static UA_INLINE UA_StatusCode
-UA_MonitoredItemNotification_encodeBinary(const UA_MonitoredItemNotification *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_MONITOREDITEMNOTIFICATION], bufPos, &bufEnd, NULL, NULL);
+UA_ServiceFault_encodeBinary(const UA_ServiceFault *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_SERVICEFAULT], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_MonitoredItemNotification_decodeBinary(const UA_ByteString *src, size_t *offset, UA_MonitoredItemNotification *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_MONITOREDITEMNOTIFICATION], NULL);
+UA_ServiceFault_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ServiceFault *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_SERVICEFAULT], NULL);
 }
 
-/* StructureType */
+/* FindServersRequest */
 static UA_INLINE size_t
-UA_StructureType_calcSizeBinary(const UA_StructureType *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_STRUCTURETYPE]);
+UA_FindServersRequest_calcSizeBinary(const UA_FindServersRequest *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_FINDSERVERSREQUEST]);
 }
 static UA_INLINE UA_StatusCode
-UA_StructureType_encodeBinary(const UA_StructureType *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_STRUCTURETYPE], bufPos, &bufEnd, NULL, NULL);
+UA_FindServersRequest_encodeBinary(const UA_FindServersRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_FINDSERVERSREQUEST], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_StructureType_decodeBinary(const UA_ByteString *src, size_t *offset, UA_StructureType *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_STRUCTURETYPE], NULL);
+UA_FindServersRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_FindServersRequest *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_FINDSERVERSREQUEST], NULL);
 }
 
-/* ResponseHeader */
+/* FindServersResponse */
 static UA_INLINE size_t
-UA_ResponseHeader_calcSizeBinary(const UA_ResponseHeader *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_RESPONSEHEADER]);
+UA_FindServersResponse_calcSizeBinary(const UA_FindServersResponse *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_FINDSERVERSRESPONSE]);
 }
 static UA_INLINE UA_StatusCode
-UA_ResponseHeader_encodeBinary(const UA_ResponseHeader *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_RESPONSEHEADER], bufPos, &bufEnd, NULL, NULL);
+UA_FindServersResponse_encodeBinary(const UA_FindServersResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_FINDSERVERSRESPONSE], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_ResponseHeader_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ResponseHeader *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_RESPONSEHEADER], NULL);
+UA_FindServersResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_FindServersResponse *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_FINDSERVERSRESPONSE], NULL);
 }
 
-/* SignatureData */
+/* MessageSecurityMode */
 static UA_INLINE size_t
-UA_SignatureData_calcSizeBinary(const UA_SignatureData *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_SIGNATUREDATA]);
+UA_MessageSecurityMode_calcSizeBinary(const UA_MessageSecurityMode *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_MESSAGESECURITYMODE]);
 }
 static UA_INLINE UA_StatusCode
-UA_SignatureData_encodeBinary(const UA_SignatureData *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_SIGNATUREDATA], bufPos, &bufEnd, NULL, NULL);
+UA_MessageSecurityMode_encodeBinary(const UA_MessageSecurityMode *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_MESSAGESECURITYMODE], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_SignatureData_decodeBinary(const UA_ByteString *src, size_t *offset, UA_SignatureData *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_SIGNATUREDATA], NULL);
+UA_MessageSecurityMode_decodeBinary(const UA_ByteString *src, size_t *offset, UA_MessageSecurityMode *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_MESSAGESECURITYMODE], NULL);
 }
 
-/* ModifySubscriptionResponse */
+/* UserTokenType */
 static UA_INLINE size_t
-UA_ModifySubscriptionResponse_calcSizeBinary(const UA_ModifySubscriptionResponse *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_MODIFYSUBSCRIPTIONRESPONSE]);
+UA_UserTokenType_calcSizeBinary(const UA_UserTokenType *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_USERTOKENTYPE]);
 }
 static UA_INLINE UA_StatusCode
-UA_ModifySubscriptionResponse_encodeBinary(const UA_ModifySubscriptionResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_MODIFYSUBSCRIPTIONRESPONSE], bufPos, &bufEnd, NULL, NULL);
+UA_UserTokenType_encodeBinary(const UA_UserTokenType *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_USERTOKENTYPE], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_ModifySubscriptionResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ModifySubscriptionResponse *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_MODIFYSUBSCRIPTIONRESPONSE], NULL);
+UA_UserTokenType_decodeBinary(const UA_ByteString *src, size_t *offset, UA_UserTokenType *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_USERTOKENTYPE], NULL);
 }
 
-/* NodeAttributes */
+/* UserTokenPolicy */
 static UA_INLINE size_t
-UA_NodeAttributes_calcSizeBinary(const UA_NodeAttributes *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_NODEATTRIBUTES]);
+UA_UserTokenPolicy_calcSizeBinary(const UA_UserTokenPolicy *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_USERTOKENPOLICY]);
 }
 static UA_INLINE UA_StatusCode
-UA_NodeAttributes_encodeBinary(const UA_NodeAttributes *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_NODEATTRIBUTES], bufPos, &bufEnd, NULL, NULL);
+UA_UserTokenPolicy_encodeBinary(const UA_UserTokenPolicy *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_USERTOKENPOLICY], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_NodeAttributes_decodeBinary(const UA_ByteString *src, size_t *offset, UA_NodeAttributes *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_NODEATTRIBUTES], NULL);
+UA_UserTokenPolicy_decodeBinary(const UA_ByteString *src, size_t *offset, UA_UserTokenPolicy *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_USERTOKENPOLICY], NULL);
 }
 
-/* ActivateSessionResponse */
+/* EndpointDescription */
 static UA_INLINE size_t
-UA_ActivateSessionResponse_calcSizeBinary(const UA_ActivateSessionResponse *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_ACTIVATESESSIONRESPONSE]);
+UA_EndpointDescription_calcSizeBinary(const UA_EndpointDescription *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_ENDPOINTDESCRIPTION]);
 }
 static UA_INLINE UA_StatusCode
-UA_ActivateSessionResponse_encodeBinary(const UA_ActivateSessionResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_ACTIVATESESSIONRESPONSE], bufPos, &bufEnd, NULL, NULL);
+UA_EndpointDescription_encodeBinary(const UA_EndpointDescription *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_ENDPOINTDESCRIPTION], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_ActivateSessionResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ActivateSessionResponse *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_ACTIVATESESSIONRESPONSE], NULL);
+UA_EndpointDescription_decodeBinary(const UA_ByteString *src, size_t *offset, UA_EndpointDescription *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_ENDPOINTDESCRIPTION], NULL);
 }
 
-/* EnumField */
+/* GetEndpointsRequest */
 static UA_INLINE size_t
-UA_EnumField_calcSizeBinary(const UA_EnumField *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_ENUMFIELD]);
+UA_GetEndpointsRequest_calcSizeBinary(const UA_GetEndpointsRequest *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_GETENDPOINTSREQUEST]);
 }
 static UA_INLINE UA_StatusCode
-UA_EnumField_encodeBinary(const UA_EnumField *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_ENUMFIELD], bufPos, &bufEnd, NULL, NULL);
+UA_GetEndpointsRequest_encodeBinary(const UA_GetEndpointsRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_GETENDPOINTSREQUEST], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_EnumField_decodeBinary(const UA_ByteString *src, size_t *offset, UA_EnumField *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_ENUMFIELD], NULL);
+UA_GetEndpointsRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_GetEndpointsRequest *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_GETENDPOINTSREQUEST], NULL);
 }
 
-/* VariableTypeAttributes */
+/* GetEndpointsResponse */
 static UA_INLINE size_t
-UA_VariableTypeAttributes_calcSizeBinary(const UA_VariableTypeAttributes *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_VARIABLETYPEATTRIBUTES]);
+UA_GetEndpointsResponse_calcSizeBinary(const UA_GetEndpointsResponse *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_GETENDPOINTSRESPONSE]);
 }
 static UA_INLINE UA_StatusCode
-UA_VariableTypeAttributes_encodeBinary(const UA_VariableTypeAttributes *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_VARIABLETYPEATTRIBUTES], bufPos, &bufEnd, NULL, NULL);
+UA_GetEndpointsResponse_encodeBinary(const UA_GetEndpointsResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_GETENDPOINTSRESPONSE], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_VariableTypeAttributes_decodeBinary(const UA_ByteString *src, size_t *offset, UA_VariableTypeAttributes *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_VARIABLETYPEATTRIBUTES], NULL);
+UA_GetEndpointsResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_GetEndpointsResponse *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_GETENDPOINTSRESPONSE], NULL);
 }
 
-/* CallMethodResult */
+/* SecurityTokenRequestType */
 static UA_INLINE size_t
-UA_CallMethodResult_calcSizeBinary(const UA_CallMethodResult *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_CALLMETHODRESULT]);
+UA_SecurityTokenRequestType_calcSizeBinary(const UA_SecurityTokenRequestType *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_SECURITYTOKENREQUESTTYPE]);
 }
 static UA_INLINE UA_StatusCode
-UA_CallMethodResult_encodeBinary(const UA_CallMethodResult *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_CALLMETHODRESULT], bufPos, &bufEnd, NULL, NULL);
+UA_SecurityTokenRequestType_encodeBinary(const UA_SecurityTokenRequestType *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_SECURITYTOKENREQUESTTYPE], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_CallMethodResult_decodeBinary(const UA_ByteString *src, size_t *offset, UA_CallMethodResult *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_CALLMETHODRESULT], NULL);
+UA_SecurityTokenRequestType_decodeBinary(const UA_ByteString *src, size_t *offset, UA_SecurityTokenRequestType *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_SECURITYTOKENREQUESTTYPE], NULL);
 }
 
-/* MonitoringMode */
+/* ChannelSecurityToken */
 static UA_INLINE size_t
-UA_MonitoringMode_calcSizeBinary(const UA_MonitoringMode *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_MONITORINGMODE]);
+UA_ChannelSecurityToken_calcSizeBinary(const UA_ChannelSecurityToken *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_CHANNELSECURITYTOKEN]);
 }
 static UA_INLINE UA_StatusCode
-UA_MonitoringMode_encodeBinary(const UA_MonitoringMode *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_MONITORINGMODE], bufPos, &bufEnd, NULL, NULL);
+UA_ChannelSecurityToken_encodeBinary(const UA_ChannelSecurityToken *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_CHANNELSECURITYTOKEN], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_MonitoringMode_decodeBinary(const UA_ByteString *src, size_t *offset, UA_MonitoringMode *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_MONITORINGMODE], NULL);
+UA_ChannelSecurityToken_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ChannelSecurityToken *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_CHANNELSECURITYTOKEN], NULL);
 }
 
-/* SetMonitoringModeResponse */
+/* OpenSecureChannelRequest */
 static UA_INLINE size_t
-UA_SetMonitoringModeResponse_calcSizeBinary(const UA_SetMonitoringModeResponse *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_SETMONITORINGMODERESPONSE]);
+UA_OpenSecureChannelRequest_calcSizeBinary(const UA_OpenSecureChannelRequest *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_OPENSECURECHANNELREQUEST]);
 }
 static UA_INLINE UA_StatusCode
-UA_SetMonitoringModeResponse_encodeBinary(const UA_SetMonitoringModeResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_SETMONITORINGMODERESPONSE], bufPos, &bufEnd, NULL, NULL);
+UA_OpenSecureChannelRequest_encodeBinary(const UA_OpenSecureChannelRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_OPENSECURECHANNELREQUEST], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_SetMonitoringModeResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_SetMonitoringModeResponse *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_SETMONITORINGMODERESPONSE], NULL);
+UA_OpenSecureChannelRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_OpenSecureChannelRequest *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_OPENSECURECHANNELREQUEST], NULL);
 }
 
-/* BrowseResultMask */
+/* OpenSecureChannelResponse */
 static UA_INLINE size_t
-UA_BrowseResultMask_calcSizeBinary(const UA_BrowseResultMask *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_BROWSERESULTMASK]);
+UA_OpenSecureChannelResponse_calcSizeBinary(const UA_OpenSecureChannelResponse *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_OPENSECURECHANNELRESPONSE]);
 }
 static UA_INLINE UA_StatusCode
-UA_BrowseResultMask_encodeBinary(const UA_BrowseResultMask *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_BROWSERESULTMASK], bufPos, &bufEnd, NULL, NULL);
+UA_OpenSecureChannelResponse_encodeBinary(const UA_OpenSecureChannelResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_OPENSECURECHANNELRESPONSE], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_BrowseResultMask_decodeBinary(const UA_ByteString *src, size_t *offset, UA_BrowseResultMask *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_BROWSERESULTMASK], NULL);
+UA_OpenSecureChannelResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_OpenSecureChannelResponse *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_OPENSECURECHANNELRESPONSE], NULL);
 }
 
-/* RequestHeader */
+/* CloseSecureChannelRequest */
 static UA_INLINE size_t
-UA_RequestHeader_calcSizeBinary(const UA_RequestHeader *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_REQUESTHEADER]);
+UA_CloseSecureChannelRequest_calcSizeBinary(const UA_CloseSecureChannelRequest *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_CLOSESECURECHANNELREQUEST]);
 }
 static UA_INLINE UA_StatusCode
-UA_RequestHeader_encodeBinary(const UA_RequestHeader *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_REQUESTHEADER], bufPos, &bufEnd, NULL, NULL);
+UA_CloseSecureChannelRequest_encodeBinary(const UA_CloseSecureChannelRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_CLOSESECURECHANNELREQUEST], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_RequestHeader_decodeBinary(const UA_ByteString *src, size_t *offset, UA_RequestHeader *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_REQUESTHEADER], NULL);
+UA_CloseSecureChannelRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_CloseSecureChannelRequest *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_CLOSESECURECHANNELREQUEST], NULL);
 }
 
-/* MonitoredItemModifyResult */
+/* CloseSecureChannelResponse */
 static UA_INLINE size_t
-UA_MonitoredItemModifyResult_calcSizeBinary(const UA_MonitoredItemModifyResult *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_MONITOREDITEMMODIFYRESULT]);
+UA_CloseSecureChannelResponse_calcSizeBinary(const UA_CloseSecureChannelResponse *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_CLOSESECURECHANNELRESPONSE]);
 }
 static UA_INLINE UA_StatusCode
-UA_MonitoredItemModifyResult_encodeBinary(const UA_MonitoredItemModifyResult *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_MONITOREDITEMMODIFYRESULT], bufPos, &bufEnd, NULL, NULL);
+UA_CloseSecureChannelResponse_encodeBinary(const UA_CloseSecureChannelResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_CLOSESECURECHANNELRESPONSE], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_MonitoredItemModifyResult_decodeBinary(const UA_ByteString *src, size_t *offset, UA_MonitoredItemModifyResult *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_MONITOREDITEMMODIFYRESULT], NULL);
+UA_CloseSecureChannelResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_CloseSecureChannelResponse *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_CLOSESECURECHANNELRESPONSE], NULL);
 }
 
-/* CloseSecureChannelRequest */
+/* SignedSoftwareCertificate */
 static UA_INLINE size_t
-UA_CloseSecureChannelRequest_calcSizeBinary(const UA_CloseSecureChannelRequest *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_CLOSESECURECHANNELREQUEST]);
+UA_SignedSoftwareCertificate_calcSizeBinary(const UA_SignedSoftwareCertificate *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_SIGNEDSOFTWARECERTIFICATE]);
 }
 static UA_INLINE UA_StatusCode
-UA_CloseSecureChannelRequest_encodeBinary(const UA_CloseSecureChannelRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_CLOSESECURECHANNELREQUEST], bufPos, &bufEnd, NULL, NULL);
+UA_SignedSoftwareCertificate_encodeBinary(const UA_SignedSoftwareCertificate *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_SIGNEDSOFTWARECERTIFICATE], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_CloseSecureChannelRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_CloseSecureChannelRequest *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_CLOSESECURECHANNELREQUEST], NULL);
+UA_SignedSoftwareCertificate_decodeBinary(const UA_ByteString *src, size_t *offset, UA_SignedSoftwareCertificate *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_SIGNEDSOFTWARECERTIFICATE], NULL);
 }
 
-/* NotificationMessage */
+/* SignatureData */
 static UA_INLINE size_t
-UA_NotificationMessage_calcSizeBinary(const UA_NotificationMessage *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_NOTIFICATIONMESSAGE]);
+UA_SignatureData_calcSizeBinary(const UA_SignatureData *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_SIGNATUREDATA]);
 }
 static UA_INLINE UA_StatusCode
-UA_NotificationMessage_encodeBinary(const UA_NotificationMessage *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_NOTIFICATIONMESSAGE], bufPos, &bufEnd, NULL, NULL);
+UA_SignatureData_encodeBinary(const UA_SignatureData *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_SIGNATUREDATA], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_NotificationMessage_decodeBinary(const UA_ByteString *src, size_t *offset, UA_NotificationMessage *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_NOTIFICATIONMESSAGE], NULL);
+UA_SignatureData_decodeBinary(const UA_ByteString *src, size_t *offset, UA_SignatureData *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_SIGNATUREDATA], NULL);
 }
 
-/* CreateSubscriptionResponse */
+/* CreateSessionRequest */
 static UA_INLINE size_t
-UA_CreateSubscriptionResponse_calcSizeBinary(const UA_CreateSubscriptionResponse *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_CREATESUBSCRIPTIONRESPONSE]);
+UA_CreateSessionRequest_calcSizeBinary(const UA_CreateSessionRequest *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_CREATESESSIONREQUEST]);
 }
 static UA_INLINE UA_StatusCode
-UA_CreateSubscriptionResponse_encodeBinary(const UA_CreateSubscriptionResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_CREATESUBSCRIPTIONRESPONSE], bufPos, &bufEnd, NULL, NULL);
+UA_CreateSessionRequest_encodeBinary(const UA_CreateSessionRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_CREATESESSIONREQUEST], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_CreateSubscriptionResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_CreateSubscriptionResponse *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_CREATESUBSCRIPTIONRESPONSE], NULL);
+UA_CreateSessionRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_CreateSessionRequest *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_CREATESESSIONREQUEST], NULL);
 }
 
-/* EnumDefinition */
+/* CreateSessionResponse */
 static UA_INLINE size_t
-UA_EnumDefinition_calcSizeBinary(const UA_EnumDefinition *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_ENUMDEFINITION]);
+UA_CreateSessionResponse_calcSizeBinary(const UA_CreateSessionResponse *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_CREATESESSIONRESPONSE]);
 }
 static UA_INLINE UA_StatusCode
-UA_EnumDefinition_encodeBinary(const UA_EnumDefinition *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_ENUMDEFINITION], bufPos, &bufEnd, NULL, NULL);
+UA_CreateSessionResponse_encodeBinary(const UA_CreateSessionResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_CREATESESSIONRESPONSE], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_EnumDefinition_decodeBinary(const UA_ByteString *src, size_t *offset, UA_EnumDefinition *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_ENUMDEFINITION], NULL);
+UA_CreateSessionResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_CreateSessionResponse *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_CREATESESSIONRESPONSE], NULL);
 }
 
-/* AxisScaleEnumeration */
+/* UserIdentityToken */
 static UA_INLINE size_t
-UA_AxisScaleEnumeration_calcSizeBinary(const UA_AxisScaleEnumeration *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_AXISSCALEENUMERATION]);
+UA_UserIdentityToken_calcSizeBinary(const UA_UserIdentityToken *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_USERIDENTITYTOKEN]);
 }
 static UA_INLINE UA_StatusCode
-UA_AxisScaleEnumeration_encodeBinary(const UA_AxisScaleEnumeration *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_AXISSCALEENUMERATION], bufPos, &bufEnd, NULL, NULL);
+UA_UserIdentityToken_encodeBinary(const UA_UserIdentityToken *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_USERIDENTITYTOKEN], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_AxisScaleEnumeration_decodeBinary(const UA_ByteString *src, size_t *offset, UA_AxisScaleEnumeration *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_AXISSCALEENUMERATION], NULL);
+UA_UserIdentityToken_decodeBinary(const UA_ByteString *src, size_t *offset, UA_UserIdentityToken *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_USERIDENTITYTOKEN], NULL);
 }
 
-/* BrowseDirection */
+/* AnonymousIdentityToken */
 static UA_INLINE size_t
-UA_BrowseDirection_calcSizeBinary(const UA_BrowseDirection *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_BROWSEDIRECTION]);
+UA_AnonymousIdentityToken_calcSizeBinary(const UA_AnonymousIdentityToken *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_ANONYMOUSIDENTITYTOKEN]);
 }
 static UA_INLINE UA_StatusCode
-UA_BrowseDirection_encodeBinary(const UA_BrowseDirection *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_BROWSEDIRECTION], bufPos, &bufEnd, NULL, NULL);
+UA_AnonymousIdentityToken_encodeBinary(const UA_AnonymousIdentityToken *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_ANONYMOUSIDENTITYTOKEN], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_BrowseDirection_decodeBinary(const UA_ByteString *src, size_t *offset, UA_BrowseDirection *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_BROWSEDIRECTION], NULL);
+UA_AnonymousIdentityToken_decodeBinary(const UA_ByteString *src, size_t *offset, UA_AnonymousIdentityToken *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_ANONYMOUSIDENTITYTOKEN], NULL);
 }
 
-/* CallMethodRequest */
+/* UserNameIdentityToken */
 static UA_INLINE size_t
-UA_CallMethodRequest_calcSizeBinary(const UA_CallMethodRequest *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_CALLMETHODREQUEST]);
+UA_UserNameIdentityToken_calcSizeBinary(const UA_UserNameIdentityToken *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_USERNAMEIDENTITYTOKEN]);
 }
 static UA_INLINE UA_StatusCode
-UA_CallMethodRequest_encodeBinary(const UA_CallMethodRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_CALLMETHODREQUEST], bufPos, &bufEnd, NULL, NULL);
+UA_UserNameIdentityToken_encodeBinary(const UA_UserNameIdentityToken *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_USERNAMEIDENTITYTOKEN], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_CallMethodRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_CallMethodRequest *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_CALLMETHODREQUEST], NULL);
+UA_UserNameIdentityToken_decodeBinary(const UA_ByteString *src, size_t *offset, UA_UserNameIdentityToken *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_USERNAMEIDENTITYTOKEN], NULL);
 }
 
-/* ReadResponse */
+/* X509IdentityToken */
 static UA_INLINE size_t
-UA_ReadResponse_calcSizeBinary(const UA_ReadResponse *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_READRESPONSE]);
+UA_X509IdentityToken_calcSizeBinary(const UA_X509IdentityToken *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_X509IDENTITYTOKEN]);
 }
 static UA_INLINE UA_StatusCode
-UA_ReadResponse_encodeBinary(const UA_ReadResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_READRESPONSE], bufPos, &bufEnd, NULL, NULL);
+UA_X509IdentityToken_encodeBinary(const UA_X509IdentityToken *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_X509IDENTITYTOKEN], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_ReadResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ReadResponse *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_READRESPONSE], NULL);
+UA_X509IdentityToken_decodeBinary(const UA_ByteString *src, size_t *offset, UA_X509IdentityToken *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_X509IDENTITYTOKEN], NULL);
 }
 
-/* TimestampsToReturn */
+/* IssuedIdentityToken */
 static UA_INLINE size_t
-UA_TimestampsToReturn_calcSizeBinary(const UA_TimestampsToReturn *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_TIMESTAMPSTORETURN]);
+UA_IssuedIdentityToken_calcSizeBinary(const UA_IssuedIdentityToken *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_ISSUEDIDENTITYTOKEN]);
 }
 static UA_INLINE UA_StatusCode
-UA_TimestampsToReturn_encodeBinary(const UA_TimestampsToReturn *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_TIMESTAMPSTORETURN], bufPos, &bufEnd, NULL, NULL);
+UA_IssuedIdentityToken_encodeBinary(const UA_IssuedIdentityToken *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_ISSUEDIDENTITYTOKEN], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_TimestampsToReturn_decodeBinary(const UA_ByteString *src, size_t *offset, UA_TimestampsToReturn *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_TIMESTAMPSTORETURN], NULL);
+UA_IssuedIdentityToken_decodeBinary(const UA_ByteString *src, size_t *offset, UA_IssuedIdentityToken *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_ISSUEDIDENTITYTOKEN], NULL);
 }
 
-/* NodeClass */
+/* ActivateSessionRequest */
 static UA_INLINE size_t
-UA_NodeClass_calcSizeBinary(const UA_NodeClass *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_NODECLASS]);
+UA_ActivateSessionRequest_calcSizeBinary(const UA_ActivateSessionRequest *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_ACTIVATESESSIONREQUEST]);
 }
 static UA_INLINE UA_StatusCode
-UA_NodeClass_encodeBinary(const UA_NodeClass *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_NODECLASS], bufPos, &bufEnd, NULL, NULL);
+UA_ActivateSessionRequest_encodeBinary(const UA_ActivateSessionRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_ACTIVATESESSIONREQUEST], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_NodeClass_decodeBinary(const UA_ByteString *src, size_t *offset, UA_NodeClass *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_NODECLASS], NULL);
+UA_ActivateSessionRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ActivateSessionRequest *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_ACTIVATESESSIONREQUEST], NULL);
 }
 
-/* ObjectTypeAttributes */
+/* ActivateSessionResponse */
 static UA_INLINE size_t
-UA_ObjectTypeAttributes_calcSizeBinary(const UA_ObjectTypeAttributes *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_OBJECTTYPEATTRIBUTES]);
+UA_ActivateSessionResponse_calcSizeBinary(const UA_ActivateSessionResponse *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_ACTIVATESESSIONRESPONSE]);
 }
 static UA_INLINE UA_StatusCode
-UA_ObjectTypeAttributes_encodeBinary(const UA_ObjectTypeAttributes *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_OBJECTTYPEATTRIBUTES], bufPos, &bufEnd, NULL, NULL);
+UA_ActivateSessionResponse_encodeBinary(const UA_ActivateSessionResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_ACTIVATESESSIONRESPONSE], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_ObjectTypeAttributes_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ObjectTypeAttributes *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_OBJECTTYPEATTRIBUTES], NULL);
+UA_ActivateSessionResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ActivateSessionResponse *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_ACTIVATESESSIONRESPONSE], NULL);
 }
 
-/* SecurityTokenRequestType */
+/* CloseSessionRequest */
 static UA_INLINE size_t
-UA_SecurityTokenRequestType_calcSizeBinary(const UA_SecurityTokenRequestType *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_SECURITYTOKENREQUESTTYPE]);
+UA_CloseSessionRequest_calcSizeBinary(const UA_CloseSessionRequest *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_CLOSESESSIONREQUEST]);
 }
 static UA_INLINE UA_StatusCode
-UA_SecurityTokenRequestType_encodeBinary(const UA_SecurityTokenRequestType *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_SECURITYTOKENREQUESTTYPE], bufPos, &bufEnd, NULL, NULL);
+UA_CloseSessionRequest_encodeBinary(const UA_CloseSessionRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_CLOSESESSIONREQUEST], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_SecurityTokenRequestType_decodeBinary(const UA_ByteString *src, size_t *offset, UA_SecurityTokenRequestType *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_SECURITYTOKENREQUESTTYPE], NULL);
+UA_CloseSessionRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_CloseSessionRequest *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_CLOSESESSIONREQUEST], NULL);
 }
 
 /* CloseSessionResponse */
@@ -1969,144 +1969,158 @@ UA_CloseSessionResponse_decodeBinary(const UA_ByteString *src, size_t *offset, U
     return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_CLOSESESSIONRESPONSE], NULL);
 }
 
-/* SetPublishingModeRequest */
+/* NodeAttributesMask */
 static UA_INLINE size_t
-UA_SetPublishingModeRequest_calcSizeBinary(const UA_SetPublishingModeRequest *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_SETPUBLISHINGMODEREQUEST]);
+UA_NodeAttributesMask_calcSizeBinary(const UA_NodeAttributesMask *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_NODEATTRIBUTESMASK]);
 }
 static UA_INLINE UA_StatusCode
-UA_SetPublishingModeRequest_encodeBinary(const UA_SetPublishingModeRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_SETPUBLISHINGMODEREQUEST], bufPos, &bufEnd, NULL, NULL);
+UA_NodeAttributesMask_encodeBinary(const UA_NodeAttributesMask *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_NODEATTRIBUTESMASK], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_SetPublishingModeRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_SetPublishingModeRequest *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_SETPUBLISHINGMODEREQUEST], NULL);
+UA_NodeAttributesMask_decodeBinary(const UA_ByteString *src, size_t *offset, UA_NodeAttributesMask *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_NODEATTRIBUTESMASK], NULL);
 }
 
-/* IssuedIdentityToken */
+/* NodeAttributes */
 static UA_INLINE size_t
-UA_IssuedIdentityToken_calcSizeBinary(const UA_IssuedIdentityToken *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_ISSUEDIDENTITYTOKEN]);
+UA_NodeAttributes_calcSizeBinary(const UA_NodeAttributes *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_NODEATTRIBUTES]);
 }
 static UA_INLINE UA_StatusCode
-UA_IssuedIdentityToken_encodeBinary(const UA_IssuedIdentityToken *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_ISSUEDIDENTITYTOKEN], bufPos, &bufEnd, NULL, NULL);
+UA_NodeAttributes_encodeBinary(const UA_NodeAttributes *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_NODEATTRIBUTES], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_IssuedIdentityToken_decodeBinary(const UA_ByteString *src, size_t *offset, UA_IssuedIdentityToken *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_ISSUEDIDENTITYTOKEN], NULL);
+UA_NodeAttributes_decodeBinary(const UA_ByteString *src, size_t *offset, UA_NodeAttributes *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_NODEATTRIBUTES], NULL);
 }
 
-/* DeleteMonitoredItemsResponse */
+/* ObjectAttributes */
 static UA_INLINE size_t
-UA_DeleteMonitoredItemsResponse_calcSizeBinary(const UA_DeleteMonitoredItemsResponse *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_DELETEMONITOREDITEMSRESPONSE]);
+UA_ObjectAttributes_calcSizeBinary(const UA_ObjectAttributes *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES]);
 }
 static UA_INLINE UA_StatusCode
-UA_DeleteMonitoredItemsResponse_encodeBinary(const UA_DeleteMonitoredItemsResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_DELETEMONITOREDITEMSRESPONSE], bufPos, &bufEnd, NULL, NULL);
+UA_ObjectAttributes_encodeBinary(const UA_ObjectAttributes *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_DeleteMonitoredItemsResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_DeleteMonitoredItemsResponse *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_DELETEMONITOREDITEMSRESPONSE], NULL);
+UA_ObjectAttributes_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ObjectAttributes *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES], NULL);
 }
 
-/* ApplicationType */
+/* VariableAttributes */
 static UA_INLINE size_t
-UA_ApplicationType_calcSizeBinary(const UA_ApplicationType *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_APPLICATIONTYPE]);
+UA_VariableAttributes_calcSizeBinary(const UA_VariableAttributes *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES]);
 }
 static UA_INLINE UA_StatusCode
-UA_ApplicationType_encodeBinary(const UA_ApplicationType *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_APPLICATIONTYPE], bufPos, &bufEnd, NULL, NULL);
+UA_VariableAttributes_encodeBinary(const UA_VariableAttributes *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_ApplicationType_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ApplicationType *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_APPLICATIONTYPE], NULL);
+UA_VariableAttributes_decodeBinary(const UA_ByteString *src, size_t *offset, UA_VariableAttributes *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES], NULL);
 }
 
-/* BrowseNextRequest */
+/* MethodAttributes */
 static UA_INLINE size_t
-UA_BrowseNextRequest_calcSizeBinary(const UA_BrowseNextRequest *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_BROWSENEXTREQUEST]);
+UA_MethodAttributes_calcSizeBinary(const UA_MethodAttributes *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_METHODATTRIBUTES]);
 }
 static UA_INLINE UA_StatusCode
-UA_BrowseNextRequest_encodeBinary(const UA_BrowseNextRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_BROWSENEXTREQUEST], bufPos, &bufEnd, NULL, NULL);
+UA_MethodAttributes_encodeBinary(const UA_MethodAttributes *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_METHODATTRIBUTES], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_BrowseNextRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_BrowseNextRequest *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_BROWSENEXTREQUEST], NULL);
+UA_MethodAttributes_decodeBinary(const UA_ByteString *src, size_t *offset, UA_MethodAttributes *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_METHODATTRIBUTES], NULL);
 }
 
-/* ModifySubscriptionRequest */
+/* ObjectTypeAttributes */
 static UA_INLINE size_t
-UA_ModifySubscriptionRequest_calcSizeBinary(const UA_ModifySubscriptionRequest *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_MODIFYSUBSCRIPTIONREQUEST]);
+UA_ObjectTypeAttributes_calcSizeBinary(const UA_ObjectTypeAttributes *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_OBJECTTYPEATTRIBUTES]);
 }
 static UA_INLINE UA_StatusCode
-UA_ModifySubscriptionRequest_encodeBinary(const UA_ModifySubscriptionRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_MODIFYSUBSCRIPTIONREQUEST], bufPos, &bufEnd, NULL, NULL);
+UA_ObjectTypeAttributes_encodeBinary(const UA_ObjectTypeAttributes *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_OBJECTTYPEATTRIBUTES], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_ModifySubscriptionRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ModifySubscriptionRequest *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_MODIFYSUBSCRIPTIONREQUEST], NULL);
+UA_ObjectTypeAttributes_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ObjectTypeAttributes *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_OBJECTTYPEATTRIBUTES], NULL);
 }
 
-/* BrowseDescription */
+/* VariableTypeAttributes */
 static UA_INLINE size_t
-UA_BrowseDescription_calcSizeBinary(const UA_BrowseDescription *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_BROWSEDESCRIPTION]);
+UA_VariableTypeAttributes_calcSizeBinary(const UA_VariableTypeAttributes *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_VARIABLETYPEATTRIBUTES]);
 }
 static UA_INLINE UA_StatusCode
-UA_BrowseDescription_encodeBinary(const UA_BrowseDescription *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_BROWSEDESCRIPTION], bufPos, &bufEnd, NULL, NULL);
+UA_VariableTypeAttributes_encodeBinary(const UA_VariableTypeAttributes *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_VARIABLETYPEATTRIBUTES], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_BrowseDescription_decodeBinary(const UA_ByteString *src, size_t *offset, UA_BrowseDescription *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_BROWSEDESCRIPTION], NULL);
+UA_VariableTypeAttributes_decodeBinary(const UA_ByteString *src, size_t *offset, UA_VariableTypeAttributes *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_VARIABLETYPEATTRIBUTES], NULL);
 }
 
-/* SignedSoftwareCertificate */
+/* ReferenceTypeAttributes */
 static UA_INLINE size_t
-UA_SignedSoftwareCertificate_calcSizeBinary(const UA_SignedSoftwareCertificate *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_SIGNEDSOFTWARECERTIFICATE]);
+UA_ReferenceTypeAttributes_calcSizeBinary(const UA_ReferenceTypeAttributes *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_REFERENCETYPEATTRIBUTES]);
 }
 static UA_INLINE UA_StatusCode
-UA_SignedSoftwareCertificate_encodeBinary(const UA_SignedSoftwareCertificate *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_SIGNEDSOFTWARECERTIFICATE], bufPos, &bufEnd, NULL, NULL);
+UA_ReferenceTypeAttributes_encodeBinary(const UA_ReferenceTypeAttributes *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_REFERENCETYPEATTRIBUTES], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_SignedSoftwareCertificate_decodeBinary(const UA_ByteString *src, size_t *offset, UA_SignedSoftwareCertificate *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_SIGNEDSOFTWARECERTIFICATE], NULL);
+UA_ReferenceTypeAttributes_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ReferenceTypeAttributes *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_REFERENCETYPEATTRIBUTES], NULL);
 }
 
-/* BrowsePathTarget */
+/* DataTypeAttributes */
 static UA_INLINE size_t
-UA_BrowsePathTarget_calcSizeBinary(const UA_BrowsePathTarget *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_BROWSEPATHTARGET]);
+UA_DataTypeAttributes_calcSizeBinary(const UA_DataTypeAttributes *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES]);
 }
 static UA_INLINE UA_StatusCode
-UA_BrowsePathTarget_encodeBinary(const UA_BrowsePathTarget *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_BROWSEPATHTARGET], bufPos, &bufEnd, NULL, NULL);
+UA_DataTypeAttributes_encodeBinary(const UA_DataTypeAttributes *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_BrowsePathTarget_decodeBinary(const UA_ByteString *src, size_t *offset, UA_BrowsePathTarget *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_BROWSEPATHTARGET], NULL);
+UA_DataTypeAttributes_decodeBinary(const UA_ByteString *src, size_t *offset, UA_DataTypeAttributes *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES], NULL);
 }
 
-/* WriteResponse */
+/* ViewAttributes */
 static UA_INLINE size_t
-UA_WriteResponse_calcSizeBinary(const UA_WriteResponse *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_WRITERESPONSE]);
+UA_ViewAttributes_calcSizeBinary(const UA_ViewAttributes *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_VIEWATTRIBUTES]);
 }
 static UA_INLINE UA_StatusCode
-UA_WriteResponse_encodeBinary(const UA_WriteResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_WRITERESPONSE], bufPos, &bufEnd, NULL, NULL);
+UA_ViewAttributes_encodeBinary(const UA_ViewAttributes *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_VIEWATTRIBUTES], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_WriteResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_WriteResponse *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_WRITERESPONSE], NULL);
+UA_ViewAttributes_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ViewAttributes *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_VIEWATTRIBUTES], NULL);
+}
+
+/* AddNodesItem */
+static UA_INLINE size_t
+UA_AddNodesItem_calcSizeBinary(const UA_AddNodesItem *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_ADDNODESITEM]);
+}
+static UA_INLINE UA_StatusCode
+UA_AddNodesItem_encodeBinary(const UA_AddNodesItem *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_ADDNODESITEM], bufPos, &bufEnd, NULL, NULL);
+}
+static UA_INLINE UA_StatusCode
+UA_AddNodesItem_decodeBinary(const UA_ByteString *src, size_t *offset, UA_AddNodesItem *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_ADDNODESITEM], NULL);
 }
 
 /* AddNodesResult */
@@ -2123,6 +2137,34 @@ UA_AddNodesResult_decodeBinary(const UA_ByteString *src, size_t *offset, UA_AddN
     return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_ADDNODESRESULT], NULL);
 }
 
+/* AddNodesRequest */
+static UA_INLINE size_t
+UA_AddNodesRequest_calcSizeBinary(const UA_AddNodesRequest *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_ADDNODESREQUEST]);
+}
+static UA_INLINE UA_StatusCode
+UA_AddNodesRequest_encodeBinary(const UA_AddNodesRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_ADDNODESREQUEST], bufPos, &bufEnd, NULL, NULL);
+}
+static UA_INLINE UA_StatusCode
+UA_AddNodesRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_AddNodesRequest *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_ADDNODESREQUEST], NULL);
+}
+
+/* AddNodesResponse */
+static UA_INLINE size_t
+UA_AddNodesResponse_calcSizeBinary(const UA_AddNodesResponse *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_ADDNODESRESPONSE]);
+}
+static UA_INLINE UA_StatusCode
+UA_AddNodesResponse_encodeBinary(const UA_AddNodesResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_ADDNODESRESPONSE], bufPos, &bufEnd, NULL, NULL);
+}
+static UA_INLINE UA_StatusCode
+UA_AddNodesResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_AddNodesResponse *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_ADDNODESRESPONSE], NULL);
+}
+
 /* AddReferencesItem */
 static UA_INLINE size_t
 UA_AddReferencesItem_calcSizeBinary(const UA_AddReferencesItem *src) {
@@ -2137,60 +2179,74 @@ UA_AddReferencesItem_decodeBinary(const UA_ByteString *src, size_t *offset, UA_A
     return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_ADDREFERENCESITEM], NULL);
 }
 
-/* DeleteReferencesResponse */
+/* AddReferencesRequest */
 static UA_INLINE size_t
-UA_DeleteReferencesResponse_calcSizeBinary(const UA_DeleteReferencesResponse *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_DELETEREFERENCESRESPONSE]);
+UA_AddReferencesRequest_calcSizeBinary(const UA_AddReferencesRequest *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_ADDREFERENCESREQUEST]);
 }
 static UA_INLINE UA_StatusCode
-UA_DeleteReferencesResponse_encodeBinary(const UA_DeleteReferencesResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_DELETEREFERENCESRESPONSE], bufPos, &bufEnd, NULL, NULL);
+UA_AddReferencesRequest_encodeBinary(const UA_AddReferencesRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_ADDREFERENCESREQUEST], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_DeleteReferencesResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_DeleteReferencesResponse *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_DELETEREFERENCESRESPONSE], NULL);
+UA_AddReferencesRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_AddReferencesRequest *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_ADDREFERENCESREQUEST], NULL);
 }
 
-/* RelativePathElement */
+/* AddReferencesResponse */
 static UA_INLINE size_t
-UA_RelativePathElement_calcSizeBinary(const UA_RelativePathElement *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_RELATIVEPATHELEMENT]);
+UA_AddReferencesResponse_calcSizeBinary(const UA_AddReferencesResponse *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_ADDREFERENCESRESPONSE]);
 }
 static UA_INLINE UA_StatusCode
-UA_RelativePathElement_encodeBinary(const UA_RelativePathElement *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_RELATIVEPATHELEMENT], bufPos, &bufEnd, NULL, NULL);
+UA_AddReferencesResponse_encodeBinary(const UA_AddReferencesResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_ADDREFERENCESRESPONSE], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_RelativePathElement_decodeBinary(const UA_ByteString *src, size_t *offset, UA_RelativePathElement *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_RELATIVEPATHELEMENT], NULL);
+UA_AddReferencesResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_AddReferencesResponse *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_ADDREFERENCESRESPONSE], NULL);
 }
 
-/* SubscriptionAcknowledgement */
+/* DeleteNodesItem */
 static UA_INLINE size_t
-UA_SubscriptionAcknowledgement_calcSizeBinary(const UA_SubscriptionAcknowledgement *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_SUBSCRIPTIONACKNOWLEDGEMENT]);
+UA_DeleteNodesItem_calcSizeBinary(const UA_DeleteNodesItem *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_DELETENODESITEM]);
 }
 static UA_INLINE UA_StatusCode
-UA_SubscriptionAcknowledgement_encodeBinary(const UA_SubscriptionAcknowledgement *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_SUBSCRIPTIONACKNOWLEDGEMENT], bufPos, &bufEnd, NULL, NULL);
+UA_DeleteNodesItem_encodeBinary(const UA_DeleteNodesItem *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_DELETENODESITEM], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_SubscriptionAcknowledgement_decodeBinary(const UA_ByteString *src, size_t *offset, UA_SubscriptionAcknowledgement *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_SUBSCRIPTIONACKNOWLEDGEMENT], NULL);
+UA_DeleteNodesItem_decodeBinary(const UA_ByteString *src, size_t *offset, UA_DeleteNodesItem *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_DELETENODESITEM], NULL);
 }
 
-/* CreateMonitoredItemsResponse */
+/* DeleteNodesRequest */
 static UA_INLINE size_t
-UA_CreateMonitoredItemsResponse_calcSizeBinary(const UA_CreateMonitoredItemsResponse *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_CREATEMONITOREDITEMSRESPONSE]);
+UA_DeleteNodesRequest_calcSizeBinary(const UA_DeleteNodesRequest *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_DELETENODESREQUEST]);
 }
 static UA_INLINE UA_StatusCode
-UA_CreateMonitoredItemsResponse_encodeBinary(const UA_CreateMonitoredItemsResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_CREATEMONITOREDITEMSRESPONSE], bufPos, &bufEnd, NULL, NULL);
+UA_DeleteNodesRequest_encodeBinary(const UA_DeleteNodesRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_DELETENODESREQUEST], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_CreateMonitoredItemsResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_CreateMonitoredItemsResponse *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_CREATEMONITOREDITEMSRESPONSE], NULL);
+UA_DeleteNodesRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_DeleteNodesRequest *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_DELETENODESREQUEST], NULL);
+}
+
+/* DeleteNodesResponse */
+static UA_INLINE size_t
+UA_DeleteNodesResponse_calcSizeBinary(const UA_DeleteNodesResponse *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_DELETENODESRESPONSE]);
+}
+static UA_INLINE UA_StatusCode
+UA_DeleteNodesResponse_encodeBinary(const UA_DeleteNodesResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_DELETENODESRESPONSE], bufPos, &bufEnd, NULL, NULL);
+}
+static UA_INLINE UA_StatusCode
+UA_DeleteNodesResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_DeleteNodesResponse *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_DELETENODESRESPONSE], NULL);
 }
 
 /* DeleteReferencesItem */
@@ -2207,172 +2263,186 @@ UA_DeleteReferencesItem_decodeBinary(const UA_ByteString *src, size_t *offset, U
     return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_DELETEREFERENCESITEM], NULL);
 }
 
-/* WriteValue */
+/* DeleteReferencesRequest */
 static UA_INLINE size_t
-UA_WriteValue_calcSizeBinary(const UA_WriteValue *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_WRITEVALUE]);
+UA_DeleteReferencesRequest_calcSizeBinary(const UA_DeleteReferencesRequest *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_DELETEREFERENCESREQUEST]);
 }
 static UA_INLINE UA_StatusCode
-UA_WriteValue_encodeBinary(const UA_WriteValue *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_WRITEVALUE], bufPos, &bufEnd, NULL, NULL);
+UA_DeleteReferencesRequest_encodeBinary(const UA_DeleteReferencesRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_DELETEREFERENCESREQUEST], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_WriteValue_decodeBinary(const UA_ByteString *src, size_t *offset, UA_WriteValue *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_WRITEVALUE], NULL);
+UA_DeleteReferencesRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_DeleteReferencesRequest *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_DELETEREFERENCESREQUEST], NULL);
 }
 
-/* DataTypeAttributes */
+/* DeleteReferencesResponse */
 static UA_INLINE size_t
-UA_DataTypeAttributes_calcSizeBinary(const UA_DataTypeAttributes *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES]);
+UA_DeleteReferencesResponse_calcSizeBinary(const UA_DeleteReferencesResponse *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_DELETEREFERENCESRESPONSE]);
 }
 static UA_INLINE UA_StatusCode
-UA_DataTypeAttributes_encodeBinary(const UA_DataTypeAttributes *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES], bufPos, &bufEnd, NULL, NULL);
+UA_DeleteReferencesResponse_encodeBinary(const UA_DeleteReferencesResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_DELETEREFERENCESRESPONSE], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_DataTypeAttributes_decodeBinary(const UA_ByteString *src, size_t *offset, UA_DataTypeAttributes *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES], NULL);
+UA_DeleteReferencesResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_DeleteReferencesResponse *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_DELETEREFERENCESRESPONSE], NULL);
 }
 
-/* AddReferencesResponse */
+/* BrowseDirection */
 static UA_INLINE size_t
-UA_AddReferencesResponse_calcSizeBinary(const UA_AddReferencesResponse *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_ADDREFERENCESRESPONSE]);
+UA_BrowseDirection_calcSizeBinary(const UA_BrowseDirection *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_BROWSEDIRECTION]);
 }
 static UA_INLINE UA_StatusCode
-UA_AddReferencesResponse_encodeBinary(const UA_AddReferencesResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_ADDREFERENCESRESPONSE], bufPos, &bufEnd, NULL, NULL);
+UA_BrowseDirection_encodeBinary(const UA_BrowseDirection *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_BROWSEDIRECTION], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_AddReferencesResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_AddReferencesResponse *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_ADDREFERENCESRESPONSE], NULL);
+UA_BrowseDirection_decodeBinary(const UA_ByteString *src, size_t *offset, UA_BrowseDirection *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_BROWSEDIRECTION], NULL);
 }
 
-/* DeadbandType */
+/* ViewDescription */
 static UA_INLINE size_t
-UA_DeadbandType_calcSizeBinary(const UA_DeadbandType *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_DEADBANDTYPE]);
+UA_ViewDescription_calcSizeBinary(const UA_ViewDescription *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_VIEWDESCRIPTION]);
 }
 static UA_INLINE UA_StatusCode
-UA_DeadbandType_encodeBinary(const UA_DeadbandType *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_DEADBANDTYPE], bufPos, &bufEnd, NULL, NULL);
+UA_ViewDescription_encodeBinary(const UA_ViewDescription *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_VIEWDESCRIPTION], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_DeadbandType_decodeBinary(const UA_ByteString *src, size_t *offset, UA_DeadbandType *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_DEADBANDTYPE], NULL);
+UA_ViewDescription_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ViewDescription *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_VIEWDESCRIPTION], NULL);
 }
 
-/* DataChangeTrigger */
+/* BrowseDescription */
 static UA_INLINE size_t
-UA_DataChangeTrigger_calcSizeBinary(const UA_DataChangeTrigger *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_DATACHANGETRIGGER]);
+UA_BrowseDescription_calcSizeBinary(const UA_BrowseDescription *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_BROWSEDESCRIPTION]);
 }
 static UA_INLINE UA_StatusCode
-UA_DataChangeTrigger_encodeBinary(const UA_DataChangeTrigger *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_DATACHANGETRIGGER], bufPos, &bufEnd, NULL, NULL);
+UA_BrowseDescription_encodeBinary(const UA_BrowseDescription *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_BROWSEDESCRIPTION], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_DataChangeTrigger_decodeBinary(const UA_ByteString *src, size_t *offset, UA_DataChangeTrigger *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_DATACHANGETRIGGER], NULL);
+UA_BrowseDescription_decodeBinary(const UA_ByteString *src, size_t *offset, UA_BrowseDescription *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_BROWSEDESCRIPTION], NULL);
 }
 
-/* BuildInfo */
+/* BrowseResultMask */
 static UA_INLINE size_t
-UA_BuildInfo_calcSizeBinary(const UA_BuildInfo *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_BUILDINFO]);
+UA_BrowseResultMask_calcSizeBinary(const UA_BrowseResultMask *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_BROWSERESULTMASK]);
 }
 static UA_INLINE UA_StatusCode
-UA_BuildInfo_encodeBinary(const UA_BuildInfo *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_BUILDINFO], bufPos, &bufEnd, NULL, NULL);
+UA_BrowseResultMask_encodeBinary(const UA_BrowseResultMask *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_BROWSERESULTMASK], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_BuildInfo_decodeBinary(const UA_ByteString *src, size_t *offset, UA_BuildInfo *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_BUILDINFO], NULL);
+UA_BrowseResultMask_decodeBinary(const UA_ByteString *src, size_t *offset, UA_BrowseResultMask *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_BROWSERESULTMASK], NULL);
 }
 
-/* FilterOperand */
+/* ReferenceDescription */
 static UA_INLINE size_t
-UA_FilterOperand_calcSizeBinary(const UA_FilterOperand *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_FILTEROPERAND]);
+UA_ReferenceDescription_calcSizeBinary(const UA_ReferenceDescription *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_REFERENCEDESCRIPTION]);
 }
 static UA_INLINE UA_StatusCode
-UA_FilterOperand_encodeBinary(const UA_FilterOperand *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_FILTEROPERAND], bufPos, &bufEnd, NULL, NULL);
+UA_ReferenceDescription_encodeBinary(const UA_ReferenceDescription *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_REFERENCEDESCRIPTION], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_FilterOperand_decodeBinary(const UA_ByteString *src, size_t *offset, UA_FilterOperand *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_FILTEROPERAND], NULL);
+UA_ReferenceDescription_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ReferenceDescription *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_REFERENCEDESCRIPTION], NULL);
 }
 
-/* MonitoringParameters */
+/* BrowseResult */
 static UA_INLINE size_t
-UA_MonitoringParameters_calcSizeBinary(const UA_MonitoringParameters *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_MONITORINGPARAMETERS]);
+UA_BrowseResult_calcSizeBinary(const UA_BrowseResult *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_BROWSERESULT]);
 }
 static UA_INLINE UA_StatusCode
-UA_MonitoringParameters_encodeBinary(const UA_MonitoringParameters *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_MONITORINGPARAMETERS], bufPos, &bufEnd, NULL, NULL);
+UA_BrowseResult_encodeBinary(const UA_BrowseResult *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_BROWSERESULT], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_MonitoringParameters_decodeBinary(const UA_ByteString *src, size_t *offset, UA_MonitoringParameters *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_MONITORINGPARAMETERS], NULL);
+UA_BrowseResult_decodeBinary(const UA_ByteString *src, size_t *offset, UA_BrowseResult *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_BROWSERESULT], NULL);
 }
 
-/* DoubleComplexNumberType */
+/* BrowseRequest */
 static UA_INLINE size_t
-UA_DoubleComplexNumberType_calcSizeBinary(const UA_DoubleComplexNumberType *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_DOUBLECOMPLEXNUMBERTYPE]);
+UA_BrowseRequest_calcSizeBinary(const UA_BrowseRequest *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_BROWSEREQUEST]);
 }
 static UA_INLINE UA_StatusCode
-UA_DoubleComplexNumberType_encodeBinary(const UA_DoubleComplexNumberType *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_DOUBLECOMPLEXNUMBERTYPE], bufPos, &bufEnd, NULL, NULL);
+UA_BrowseRequest_encodeBinary(const UA_BrowseRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_BROWSEREQUEST], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_DoubleComplexNumberType_decodeBinary(const UA_ByteString *src, size_t *offset, UA_DoubleComplexNumberType *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_DOUBLECOMPLEXNUMBERTYPE], NULL);
+UA_BrowseRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_BrowseRequest *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_BROWSEREQUEST], NULL);
 }
 
-/* DeleteNodesItem */
+/* BrowseResponse */
 static UA_INLINE size_t
-UA_DeleteNodesItem_calcSizeBinary(const UA_DeleteNodesItem *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_DELETENODESITEM]);
+UA_BrowseResponse_calcSizeBinary(const UA_BrowseResponse *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_BROWSERESPONSE]);
 }
 static UA_INLINE UA_StatusCode
-UA_DeleteNodesItem_encodeBinary(const UA_DeleteNodesItem *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_DELETENODESITEM], bufPos, &bufEnd, NULL, NULL);
+UA_BrowseResponse_encodeBinary(const UA_BrowseResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_BROWSERESPONSE], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_DeleteNodesItem_decodeBinary(const UA_ByteString *src, size_t *offset, UA_DeleteNodesItem *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_DELETENODESITEM], NULL);
+UA_BrowseResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_BrowseResponse *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_BROWSERESPONSE], NULL);
 }
 
-/* ReadValueId */
+/* BrowseNextRequest */
 static UA_INLINE size_t
-UA_ReadValueId_calcSizeBinary(const UA_ReadValueId *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_READVALUEID]);
+UA_BrowseNextRequest_calcSizeBinary(const UA_BrowseNextRequest *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_BROWSENEXTREQUEST]);
 }
 static UA_INLINE UA_StatusCode
-UA_ReadValueId_encodeBinary(const UA_ReadValueId *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_READVALUEID], bufPos, &bufEnd, NULL, NULL);
+UA_BrowseNextRequest_encodeBinary(const UA_BrowseNextRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_BROWSENEXTREQUEST], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_ReadValueId_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ReadValueId *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_READVALUEID], NULL);
+UA_BrowseNextRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_BrowseNextRequest *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_BROWSENEXTREQUEST], NULL);
 }
 
-/* CallRequest */
+/* BrowseNextResponse */
 static UA_INLINE size_t
-UA_CallRequest_calcSizeBinary(const UA_CallRequest *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_CALLREQUEST]);
+UA_BrowseNextResponse_calcSizeBinary(const UA_BrowseNextResponse *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_BROWSENEXTRESPONSE]);
 }
 static UA_INLINE UA_StatusCode
-UA_CallRequest_encodeBinary(const UA_CallRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_CALLREQUEST], bufPos, &bufEnd, NULL, NULL);
+UA_BrowseNextResponse_encodeBinary(const UA_BrowseNextResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_BROWSENEXTRESPONSE], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_CallRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_CallRequest *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_CALLREQUEST], NULL);
+UA_BrowseNextResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_BrowseNextResponse *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_BROWSENEXTRESPONSE], NULL);
+}
+
+/* RelativePathElement */
+static UA_INLINE size_t
+UA_RelativePathElement_calcSizeBinary(const UA_RelativePathElement *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_RELATIVEPATHELEMENT]);
+}
+static UA_INLINE UA_StatusCode
+UA_RelativePathElement_encodeBinary(const UA_RelativePathElement *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_RELATIVEPATHELEMENT], bufPos, &bufEnd, NULL, NULL);
+}
+static UA_INLINE UA_StatusCode
+UA_RelativePathElement_decodeBinary(const UA_ByteString *src, size_t *offset, UA_RelativePathElement *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_RELATIVEPATHELEMENT], NULL);
 }
 
 /* RelativePath */
@@ -2389,74 +2459,116 @@ UA_RelativePath_decodeBinary(const UA_ByteString *src, size_t *offset, UA_Relati
     return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_RELATIVEPATH], NULL);
 }
 
-/* DeleteNodesRequest */
+/* BrowsePath */
 static UA_INLINE size_t
-UA_DeleteNodesRequest_calcSizeBinary(const UA_DeleteNodesRequest *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_DELETENODESREQUEST]);
+UA_BrowsePath_calcSizeBinary(const UA_BrowsePath *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_BROWSEPATH]);
 }
 static UA_INLINE UA_StatusCode
-UA_DeleteNodesRequest_encodeBinary(const UA_DeleteNodesRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_DELETENODESREQUEST], bufPos, &bufEnd, NULL, NULL);
+UA_BrowsePath_encodeBinary(const UA_BrowsePath *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_BROWSEPATH], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_DeleteNodesRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_DeleteNodesRequest *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_DELETENODESREQUEST], NULL);
+UA_BrowsePath_decodeBinary(const UA_ByteString *src, size_t *offset, UA_BrowsePath *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_BROWSEPATH], NULL);
 }
 
-/* MonitoredItemModifyRequest */
+/* BrowsePathTarget */
 static UA_INLINE size_t
-UA_MonitoredItemModifyRequest_calcSizeBinary(const UA_MonitoredItemModifyRequest *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_MONITOREDITEMMODIFYREQUEST]);
+UA_BrowsePathTarget_calcSizeBinary(const UA_BrowsePathTarget *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_BROWSEPATHTARGET]);
 }
 static UA_INLINE UA_StatusCode
-UA_MonitoredItemModifyRequest_encodeBinary(const UA_MonitoredItemModifyRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_MONITOREDITEMMODIFYREQUEST], bufPos, &bufEnd, NULL, NULL);
+UA_BrowsePathTarget_encodeBinary(const UA_BrowsePathTarget *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_BROWSEPATHTARGET], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_MonitoredItemModifyRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_MonitoredItemModifyRequest *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_MONITOREDITEMMODIFYREQUEST], NULL);
+UA_BrowsePathTarget_decodeBinary(const UA_ByteString *src, size_t *offset, UA_BrowsePathTarget *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_BROWSEPATHTARGET], NULL);
 }
 
-/* UserTokenType */
+/* BrowsePathResult */
 static UA_INLINE size_t
-UA_UserTokenType_calcSizeBinary(const UA_UserTokenType *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_USERTOKENTYPE]);
+UA_BrowsePathResult_calcSizeBinary(const UA_BrowsePathResult *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_BROWSEPATHRESULT]);
 }
 static UA_INLINE UA_StatusCode
-UA_UserTokenType_encodeBinary(const UA_UserTokenType *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_USERTOKENTYPE], bufPos, &bufEnd, NULL, NULL);
+UA_BrowsePathResult_encodeBinary(const UA_BrowsePathResult *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_BROWSEPATHRESULT], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_UserTokenType_decodeBinary(const UA_ByteString *src, size_t *offset, UA_UserTokenType *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_USERTOKENTYPE], NULL);
+UA_BrowsePathResult_decodeBinary(const UA_ByteString *src, size_t *offset, UA_BrowsePathResult *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_BROWSEPATHRESULT], NULL);
 }
 
-/* AggregateConfiguration */
+/* TranslateBrowsePathsToNodeIdsRequest */
 static UA_INLINE size_t
-UA_AggregateConfiguration_calcSizeBinary(const UA_AggregateConfiguration *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_AGGREGATECONFIGURATION]);
+UA_TranslateBrowsePathsToNodeIdsRequest_calcSizeBinary(const UA_TranslateBrowsePathsToNodeIdsRequest *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_TRANSLATEBROWSEPATHSTONODEIDSREQUEST]);
 }
 static UA_INLINE UA_StatusCode
-UA_AggregateConfiguration_encodeBinary(const UA_AggregateConfiguration *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_AGGREGATECONFIGURATION], bufPos, &bufEnd, NULL, NULL);
+UA_TranslateBrowsePathsToNodeIdsRequest_encodeBinary(const UA_TranslateBrowsePathsToNodeIdsRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_TRANSLATEBROWSEPATHSTONODEIDSREQUEST], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_AggregateConfiguration_decodeBinary(const UA_ByteString *src, size_t *offset, UA_AggregateConfiguration *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_AGGREGATECONFIGURATION], NULL);
+UA_TranslateBrowsePathsToNodeIdsRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_TranslateBrowsePathsToNodeIdsRequest *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_TRANSLATEBROWSEPATHSTONODEIDSREQUEST], NULL);
 }
 
-/* LocaleId */
+/* TranslateBrowsePathsToNodeIdsResponse */
 static UA_INLINE size_t
-UA_LocaleId_calcSizeBinary(const UA_LocaleId *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_LOCALEID]);
+UA_TranslateBrowsePathsToNodeIdsResponse_calcSizeBinary(const UA_TranslateBrowsePathsToNodeIdsResponse *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_TRANSLATEBROWSEPATHSTONODEIDSRESPONSE]);
 }
 static UA_INLINE UA_StatusCode
-UA_LocaleId_encodeBinary(const UA_LocaleId *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_LOCALEID], bufPos, &bufEnd, NULL, NULL);
+UA_TranslateBrowsePathsToNodeIdsResponse_encodeBinary(const UA_TranslateBrowsePathsToNodeIdsResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_TRANSLATEBROWSEPATHSTONODEIDSRESPONSE], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_LocaleId_decodeBinary(const UA_ByteString *src, size_t *offset, UA_LocaleId *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_LOCALEID], NULL);
+UA_TranslateBrowsePathsToNodeIdsResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_TranslateBrowsePathsToNodeIdsResponse *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_TRANSLATEBROWSEPATHSTONODEIDSRESPONSE], NULL);
+}
+
+/* RegisterNodesRequest */
+static UA_INLINE size_t
+UA_RegisterNodesRequest_calcSizeBinary(const UA_RegisterNodesRequest *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_REGISTERNODESREQUEST]);
+}
+static UA_INLINE UA_StatusCode
+UA_RegisterNodesRequest_encodeBinary(const UA_RegisterNodesRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_REGISTERNODESREQUEST], bufPos, &bufEnd, NULL, NULL);
+}
+static UA_INLINE UA_StatusCode
+UA_RegisterNodesRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_RegisterNodesRequest *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_REGISTERNODESREQUEST], NULL);
+}
+
+/* RegisterNodesResponse */
+static UA_INLINE size_t
+UA_RegisterNodesResponse_calcSizeBinary(const UA_RegisterNodesResponse *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_REGISTERNODESRESPONSE]);
+}
+static UA_INLINE UA_StatusCode
+UA_RegisterNodesResponse_encodeBinary(const UA_RegisterNodesResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_REGISTERNODESRESPONSE], bufPos, &bufEnd, NULL, NULL);
+}
+static UA_INLINE UA_StatusCode
+UA_RegisterNodesResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_RegisterNodesResponse *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_REGISTERNODESRESPONSE], NULL);
+}
+
+/* UnregisterNodesRequest */
+static UA_INLINE size_t
+UA_UnregisterNodesRequest_calcSizeBinary(const UA_UnregisterNodesRequest *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_UNREGISTERNODESREQUEST]);
+}
+static UA_INLINE UA_StatusCode
+UA_UnregisterNodesRequest_encodeBinary(const UA_UnregisterNodesRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_UNREGISTERNODESREQUEST], bufPos, &bufEnd, NULL, NULL);
+}
+static UA_INLINE UA_StatusCode
+UA_UnregisterNodesRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_UnregisterNodesRequest *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_UNREGISTERNODESREQUEST], NULL);
 }
 
 /* UnregisterNodesResponse */
@@ -2473,6 +2585,132 @@ UA_UnregisterNodesResponse_decodeBinary(const UA_ByteString *src, size_t *offset
     return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_UNREGISTERNODESRESPONSE], NULL);
 }
 
+/* FilterOperator */
+static UA_INLINE size_t
+UA_FilterOperator_calcSizeBinary(const UA_FilterOperator *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_FILTEROPERATOR]);
+}
+static UA_INLINE UA_StatusCode
+UA_FilterOperator_encodeBinary(const UA_FilterOperator *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_FILTEROPERATOR], bufPos, &bufEnd, NULL, NULL);
+}
+static UA_INLINE UA_StatusCode
+UA_FilterOperator_decodeBinary(const UA_ByteString *src, size_t *offset, UA_FilterOperator *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_FILTEROPERATOR], NULL);
+}
+
+/* ContentFilterElement */
+static UA_INLINE size_t
+UA_ContentFilterElement_calcSizeBinary(const UA_ContentFilterElement *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_CONTENTFILTERELEMENT]);
+}
+static UA_INLINE UA_StatusCode
+UA_ContentFilterElement_encodeBinary(const UA_ContentFilterElement *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_CONTENTFILTERELEMENT], bufPos, &bufEnd, NULL, NULL);
+}
+static UA_INLINE UA_StatusCode
+UA_ContentFilterElement_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ContentFilterElement *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_CONTENTFILTERELEMENT], NULL);
+}
+
+/* ContentFilter */
+static UA_INLINE size_t
+UA_ContentFilter_calcSizeBinary(const UA_ContentFilter *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_CONTENTFILTER]);
+}
+static UA_INLINE UA_StatusCode
+UA_ContentFilter_encodeBinary(const UA_ContentFilter *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_CONTENTFILTER], bufPos, &bufEnd, NULL, NULL);
+}
+static UA_INLINE UA_StatusCode
+UA_ContentFilter_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ContentFilter *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_CONTENTFILTER], NULL);
+}
+
+/* FilterOperand */
+static UA_INLINE size_t
+UA_FilterOperand_calcSizeBinary(const UA_FilterOperand *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_FILTEROPERAND]);
+}
+static UA_INLINE UA_StatusCode
+UA_FilterOperand_encodeBinary(const UA_FilterOperand *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_FILTEROPERAND], bufPos, &bufEnd, NULL, NULL);
+}
+static UA_INLINE UA_StatusCode
+UA_FilterOperand_decodeBinary(const UA_ByteString *src, size_t *offset, UA_FilterOperand *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_FILTEROPERAND], NULL);
+}
+
+/* ElementOperand */
+static UA_INLINE size_t
+UA_ElementOperand_calcSizeBinary(const UA_ElementOperand *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_ELEMENTOPERAND]);
+}
+static UA_INLINE UA_StatusCode
+UA_ElementOperand_encodeBinary(const UA_ElementOperand *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_ELEMENTOPERAND], bufPos, &bufEnd, NULL, NULL);
+}
+static UA_INLINE UA_StatusCode
+UA_ElementOperand_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ElementOperand *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_ELEMENTOPERAND], NULL);
+}
+
+/* LiteralOperand */
+static UA_INLINE size_t
+UA_LiteralOperand_calcSizeBinary(const UA_LiteralOperand *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_LITERALOPERAND]);
+}
+static UA_INLINE UA_StatusCode
+UA_LiteralOperand_encodeBinary(const UA_LiteralOperand *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_LITERALOPERAND], bufPos, &bufEnd, NULL, NULL);
+}
+static UA_INLINE UA_StatusCode
+UA_LiteralOperand_decodeBinary(const UA_ByteString *src, size_t *offset, UA_LiteralOperand *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_LITERALOPERAND], NULL);
+}
+
+/* AttributeOperand */
+static UA_INLINE size_t
+UA_AttributeOperand_calcSizeBinary(const UA_AttributeOperand *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_ATTRIBUTEOPERAND]);
+}
+static UA_INLINE UA_StatusCode
+UA_AttributeOperand_encodeBinary(const UA_AttributeOperand *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_ATTRIBUTEOPERAND], bufPos, &bufEnd, NULL, NULL);
+}
+static UA_INLINE UA_StatusCode
+UA_AttributeOperand_decodeBinary(const UA_ByteString *src, size_t *offset, UA_AttributeOperand *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_ATTRIBUTEOPERAND], NULL);
+}
+
+/* SimpleAttributeOperand */
+static UA_INLINE size_t
+UA_SimpleAttributeOperand_calcSizeBinary(const UA_SimpleAttributeOperand *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_SIMPLEATTRIBUTEOPERAND]);
+}
+static UA_INLINE UA_StatusCode
+UA_SimpleAttributeOperand_encodeBinary(const UA_SimpleAttributeOperand *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_SIMPLEATTRIBUTEOPERAND], bufPos, &bufEnd, NULL, NULL);
+}
+static UA_INLINE UA_StatusCode
+UA_SimpleAttributeOperand_decodeBinary(const UA_ByteString *src, size_t *offset, UA_SimpleAttributeOperand *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_SIMPLEATTRIBUTEOPERAND], NULL);
+}
+
+/* ContentFilterElementResult */
+static UA_INLINE size_t
+UA_ContentFilterElementResult_calcSizeBinary(const UA_ContentFilterElementResult *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_CONTENTFILTERELEMENTRESULT]);
+}
+static UA_INLINE UA_StatusCode
+UA_ContentFilterElementResult_encodeBinary(const UA_ContentFilterElementResult *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_CONTENTFILTERELEMENTRESULT], bufPos, &bufEnd, NULL, NULL);
+}
+static UA_INLINE UA_StatusCode
+UA_ContentFilterElementResult_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ContentFilterElementResult *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_CONTENTFILTERELEMENTRESULT], NULL);
+}
+
 /* ContentFilterResult */
 static UA_INLINE size_t
 UA_ContentFilterResult_calcSizeBinary(const UA_ContentFilterResult *src) {
@@ -2487,634 +2725,676 @@ UA_ContentFilterResult_decodeBinary(const UA_ByteString *src, size_t *offset, UA
     return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_CONTENTFILTERRESULT], NULL);
 }
 
-/* UserTokenPolicy */
+/* TimestampsToReturn */
 static UA_INLINE size_t
-UA_UserTokenPolicy_calcSizeBinary(const UA_UserTokenPolicy *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_USERTOKENPOLICY]);
+UA_TimestampsToReturn_calcSizeBinary(const UA_TimestampsToReturn *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_TIMESTAMPSTORETURN]);
 }
 static UA_INLINE UA_StatusCode
-UA_UserTokenPolicy_encodeBinary(const UA_UserTokenPolicy *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_USERTOKENPOLICY], bufPos, &bufEnd, NULL, NULL);
+UA_TimestampsToReturn_encodeBinary(const UA_TimestampsToReturn *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_TIMESTAMPSTORETURN], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_UserTokenPolicy_decodeBinary(const UA_ByteString *src, size_t *offset, UA_UserTokenPolicy *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_USERTOKENPOLICY], NULL);
+UA_TimestampsToReturn_decodeBinary(const UA_ByteString *src, size_t *offset, UA_TimestampsToReturn *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_TIMESTAMPSTORETURN], NULL);
 }
 
-/* DeleteMonitoredItemsRequest */
+/* ReadValueId */
 static UA_INLINE size_t
-UA_DeleteMonitoredItemsRequest_calcSizeBinary(const UA_DeleteMonitoredItemsRequest *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_DELETEMONITOREDITEMSREQUEST]);
+UA_ReadValueId_calcSizeBinary(const UA_ReadValueId *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_READVALUEID]);
 }
 static UA_INLINE UA_StatusCode
-UA_DeleteMonitoredItemsRequest_encodeBinary(const UA_DeleteMonitoredItemsRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_DELETEMONITOREDITEMSREQUEST], bufPos, &bufEnd, NULL, NULL);
+UA_ReadValueId_encodeBinary(const UA_ReadValueId *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_READVALUEID], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_DeleteMonitoredItemsRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_DeleteMonitoredItemsRequest *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_DELETEMONITOREDITEMSREQUEST], NULL);
+UA_ReadValueId_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ReadValueId *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_READVALUEID], NULL);
 }
 
-/* SetMonitoringModeRequest */
+/* ReadRequest */
 static UA_INLINE size_t
-UA_SetMonitoringModeRequest_calcSizeBinary(const UA_SetMonitoringModeRequest *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_SETMONITORINGMODEREQUEST]);
+UA_ReadRequest_calcSizeBinary(const UA_ReadRequest *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_READREQUEST]);
 }
 static UA_INLINE UA_StatusCode
-UA_SetMonitoringModeRequest_encodeBinary(const UA_SetMonitoringModeRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_SETMONITORINGMODEREQUEST], bufPos, &bufEnd, NULL, NULL);
+UA_ReadRequest_encodeBinary(const UA_ReadRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_READREQUEST], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_SetMonitoringModeRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_SetMonitoringModeRequest *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_SETMONITORINGMODEREQUEST], NULL);
+UA_ReadRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ReadRequest *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_READREQUEST], NULL);
 }
 
-/* Duration */
+/* ReadResponse */
 static UA_INLINE size_t
-UA_Duration_calcSizeBinary(const UA_Duration *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_DURATION]);
+UA_ReadResponse_calcSizeBinary(const UA_ReadResponse *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_READRESPONSE]);
 }
 static UA_INLINE UA_StatusCode
-UA_Duration_encodeBinary(const UA_Duration *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_DURATION], bufPos, &bufEnd, NULL, NULL);
+UA_ReadResponse_encodeBinary(const UA_ReadResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_READRESPONSE], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_Duration_decodeBinary(const UA_ByteString *src, size_t *offset, UA_Duration *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_DURATION], NULL);
+UA_ReadResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ReadResponse *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_READRESPONSE], NULL);
 }
 
-/* ReferenceTypeAttributes */
+/* HistoryReadValueId */
 static UA_INLINE size_t
-UA_ReferenceTypeAttributes_calcSizeBinary(const UA_ReferenceTypeAttributes *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_REFERENCETYPEATTRIBUTES]);
+UA_HistoryReadValueId_calcSizeBinary(const UA_HistoryReadValueId *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_HISTORYREADVALUEID]);
 }
 static UA_INLINE UA_StatusCode
-UA_ReferenceTypeAttributes_encodeBinary(const UA_ReferenceTypeAttributes *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_REFERENCETYPEATTRIBUTES], bufPos, &bufEnd, NULL, NULL);
+UA_HistoryReadValueId_encodeBinary(const UA_HistoryReadValueId *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_HISTORYREADVALUEID], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_ReferenceTypeAttributes_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ReferenceTypeAttributes *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_REFERENCETYPEATTRIBUTES], NULL);
+UA_HistoryReadValueId_decodeBinary(const UA_ByteString *src, size_t *offset, UA_HistoryReadValueId *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_HISTORYREADVALUEID], NULL);
 }
 
-/* GetEndpointsRequest */
+/* HistoryReadResult */
 static UA_INLINE size_t
-UA_GetEndpointsRequest_calcSizeBinary(const UA_GetEndpointsRequest *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_GETENDPOINTSREQUEST]);
+UA_HistoryReadResult_calcSizeBinary(const UA_HistoryReadResult *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_HISTORYREADRESULT]);
 }
 static UA_INLINE UA_StatusCode
-UA_GetEndpointsRequest_encodeBinary(const UA_GetEndpointsRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_GETENDPOINTSREQUEST], bufPos, &bufEnd, NULL, NULL);
+UA_HistoryReadResult_encodeBinary(const UA_HistoryReadResult *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_HISTORYREADRESULT], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_GetEndpointsRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_GetEndpointsRequest *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_GETENDPOINTSREQUEST], NULL);
+UA_HistoryReadResult_decodeBinary(const UA_ByteString *src, size_t *offset, UA_HistoryReadResult *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_HISTORYREADRESULT], NULL);
 }
 
-/* CloseSecureChannelResponse */
+/* ReadRawModifiedDetails */
 static UA_INLINE size_t
-UA_CloseSecureChannelResponse_calcSizeBinary(const UA_CloseSecureChannelResponse *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_CLOSESECURECHANNELRESPONSE]);
+UA_ReadRawModifiedDetails_calcSizeBinary(const UA_ReadRawModifiedDetails *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_READRAWMODIFIEDDETAILS]);
 }
 static UA_INLINE UA_StatusCode
-UA_CloseSecureChannelResponse_encodeBinary(const UA_CloseSecureChannelResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_CLOSESECURECHANNELRESPONSE], bufPos, &bufEnd, NULL, NULL);
+UA_ReadRawModifiedDetails_encodeBinary(const UA_ReadRawModifiedDetails *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_READRAWMODIFIEDDETAILS], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_CloseSecureChannelResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_CloseSecureChannelResponse *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_CLOSESECURECHANNELRESPONSE], NULL);
+UA_ReadRawModifiedDetails_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ReadRawModifiedDetails *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_READRAWMODIFIEDDETAILS], NULL);
 }
 
-/* ViewDescription */
+/* ReadAtTimeDetails */
 static UA_INLINE size_t
-UA_ViewDescription_calcSizeBinary(const UA_ViewDescription *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_VIEWDESCRIPTION]);
+UA_ReadAtTimeDetails_calcSizeBinary(const UA_ReadAtTimeDetails *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_READATTIMEDETAILS]);
 }
 static UA_INLINE UA_StatusCode
-UA_ViewDescription_encodeBinary(const UA_ViewDescription *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_VIEWDESCRIPTION], bufPos, &bufEnd, NULL, NULL);
+UA_ReadAtTimeDetails_encodeBinary(const UA_ReadAtTimeDetails *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_READATTIMEDETAILS], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_ViewDescription_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ViewDescription *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_VIEWDESCRIPTION], NULL);
+UA_ReadAtTimeDetails_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ReadAtTimeDetails *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_READATTIMEDETAILS], NULL);
 }
 
-/* SetPublishingModeResponse */
+/* HistoryData */
 static UA_INLINE size_t
-UA_SetPublishingModeResponse_calcSizeBinary(const UA_SetPublishingModeResponse *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_SETPUBLISHINGMODERESPONSE]);
+UA_HistoryData_calcSizeBinary(const UA_HistoryData *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_HISTORYDATA]);
 }
 static UA_INLINE UA_StatusCode
-UA_SetPublishingModeResponse_encodeBinary(const UA_SetPublishingModeResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_SETPUBLISHINGMODERESPONSE], bufPos, &bufEnd, NULL, NULL);
+UA_HistoryData_encodeBinary(const UA_HistoryData *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_HISTORYDATA], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_SetPublishingModeResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_SetPublishingModeResponse *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_SETPUBLISHINGMODERESPONSE], NULL);
+UA_HistoryData_decodeBinary(const UA_ByteString *src, size_t *offset, UA_HistoryData *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_HISTORYDATA], NULL);
 }
 
-/* StatusChangeNotification */
+/* HistoryReadRequest */
 static UA_INLINE size_t
-UA_StatusChangeNotification_calcSizeBinary(const UA_StatusChangeNotification *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_STATUSCHANGENOTIFICATION]);
+UA_HistoryReadRequest_calcSizeBinary(const UA_HistoryReadRequest *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_HISTORYREADREQUEST]);
 }
 static UA_INLINE UA_StatusCode
-UA_StatusChangeNotification_encodeBinary(const UA_StatusChangeNotification *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_STATUSCHANGENOTIFICATION], bufPos, &bufEnd, NULL, NULL);
+UA_HistoryReadRequest_encodeBinary(const UA_HistoryReadRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_HISTORYREADREQUEST], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_StatusChangeNotification_decodeBinary(const UA_ByteString *src, size_t *offset, UA_StatusChangeNotification *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_STATUSCHANGENOTIFICATION], NULL);
+UA_HistoryReadRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_HistoryReadRequest *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_HISTORYREADREQUEST], NULL);
 }
 
-/* StructureField */
+/* HistoryReadResponse */
 static UA_INLINE size_t
-UA_StructureField_calcSizeBinary(const UA_StructureField *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_STRUCTUREFIELD]);
+UA_HistoryReadResponse_calcSizeBinary(const UA_HistoryReadResponse *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_HISTORYREADRESPONSE]);
 }
 static UA_INLINE UA_StatusCode
-UA_StructureField_encodeBinary(const UA_StructureField *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_STRUCTUREFIELD], bufPos, &bufEnd, NULL, NULL);
+UA_HistoryReadResponse_encodeBinary(const UA_HistoryReadResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_HISTORYREADRESPONSE], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_StructureField_decodeBinary(const UA_ByteString *src, size_t *offset, UA_StructureField *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_STRUCTUREFIELD], NULL);
+UA_HistoryReadResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_HistoryReadResponse *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_HISTORYREADRESPONSE], NULL);
 }
 
-/* NodeAttributesMask */
+/* WriteValue */
 static UA_INLINE size_t
-UA_NodeAttributesMask_calcSizeBinary(const UA_NodeAttributesMask *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_NODEATTRIBUTESMASK]);
+UA_WriteValue_calcSizeBinary(const UA_WriteValue *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_WRITEVALUE]);
 }
 static UA_INLINE UA_StatusCode
-UA_NodeAttributesMask_encodeBinary(const UA_NodeAttributesMask *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_NODEATTRIBUTESMASK], bufPos, &bufEnd, NULL, NULL);
+UA_WriteValue_encodeBinary(const UA_WriteValue *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_WRITEVALUE], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_NodeAttributesMask_decodeBinary(const UA_ByteString *src, size_t *offset, UA_NodeAttributesMask *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_NODEATTRIBUTESMASK], NULL);
+UA_WriteValue_decodeBinary(const UA_ByteString *src, size_t *offset, UA_WriteValue *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_WRITEVALUE], NULL);
 }
 
-/* EventFilterResult */
+/* WriteRequest */
 static UA_INLINE size_t
-UA_EventFilterResult_calcSizeBinary(const UA_EventFilterResult *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_EVENTFILTERRESULT]);
+UA_WriteRequest_calcSizeBinary(const UA_WriteRequest *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_WRITEREQUEST]);
 }
 static UA_INLINE UA_StatusCode
-UA_EventFilterResult_encodeBinary(const UA_EventFilterResult *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_EVENTFILTERRESULT], bufPos, &bufEnd, NULL, NULL);
+UA_WriteRequest_encodeBinary(const UA_WriteRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_WRITEREQUEST], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_EventFilterResult_decodeBinary(const UA_ByteString *src, size_t *offset, UA_EventFilterResult *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_EVENTFILTERRESULT], NULL);
+UA_WriteRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_WriteRequest *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_WRITEREQUEST], NULL);
 }
 
-/* MonitoredItemCreateRequest */
+/* WriteResponse */
 static UA_INLINE size_t
-UA_MonitoredItemCreateRequest_calcSizeBinary(const UA_MonitoredItemCreateRequest *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_MONITOREDITEMCREATEREQUEST]);
+UA_WriteResponse_calcSizeBinary(const UA_WriteResponse *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_WRITERESPONSE]);
 }
 static UA_INLINE UA_StatusCode
-UA_MonitoredItemCreateRequest_encodeBinary(const UA_MonitoredItemCreateRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_MONITOREDITEMCREATEREQUEST], bufPos, &bufEnd, NULL, NULL);
+UA_WriteResponse_encodeBinary(const UA_WriteResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_WRITERESPONSE], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_MonitoredItemCreateRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_MonitoredItemCreateRequest *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_MONITOREDITEMCREATEREQUEST], NULL);
+UA_WriteResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_WriteResponse *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_WRITERESPONSE], NULL);
 }
 
-/* ComplexNumberType */
+/* HistoryUpdateType */
 static UA_INLINE size_t
-UA_ComplexNumberType_calcSizeBinary(const UA_ComplexNumberType *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_COMPLEXNUMBERTYPE]);
+UA_HistoryUpdateType_calcSizeBinary(const UA_HistoryUpdateType *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_HISTORYUPDATETYPE]);
 }
 static UA_INLINE UA_StatusCode
-UA_ComplexNumberType_encodeBinary(const UA_ComplexNumberType *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_COMPLEXNUMBERTYPE], bufPos, &bufEnd, NULL, NULL);
+UA_HistoryUpdateType_encodeBinary(const UA_HistoryUpdateType *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_HISTORYUPDATETYPE], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_ComplexNumberType_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ComplexNumberType *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_COMPLEXNUMBERTYPE], NULL);
+UA_HistoryUpdateType_decodeBinary(const UA_ByteString *src, size_t *offset, UA_HistoryUpdateType *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_HISTORYUPDATETYPE], NULL);
 }
 
-/* Range */
+/* PerformUpdateType */
 static UA_INLINE size_t
-UA_Range_calcSizeBinary(const UA_Range *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_RANGE]);
+UA_PerformUpdateType_calcSizeBinary(const UA_PerformUpdateType *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_PERFORMUPDATETYPE]);
 }
 static UA_INLINE UA_StatusCode
-UA_Range_encodeBinary(const UA_Range *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_RANGE], bufPos, &bufEnd, NULL, NULL);
+UA_PerformUpdateType_encodeBinary(const UA_PerformUpdateType *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_PERFORMUPDATETYPE], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_Range_decodeBinary(const UA_ByteString *src, size_t *offset, UA_Range *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_RANGE], NULL);
+UA_PerformUpdateType_decodeBinary(const UA_ByteString *src, size_t *offset, UA_PerformUpdateType *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_PERFORMUPDATETYPE], NULL);
 }
 
-/* DataChangeNotification */
+/* UpdateDataDetails */
 static UA_INLINE size_t
-UA_DataChangeNotification_calcSizeBinary(const UA_DataChangeNotification *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_DATACHANGENOTIFICATION]);
+UA_UpdateDataDetails_calcSizeBinary(const UA_UpdateDataDetails *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_UPDATEDATADETAILS]);
 }
 static UA_INLINE UA_StatusCode
-UA_DataChangeNotification_encodeBinary(const UA_DataChangeNotification *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_DATACHANGENOTIFICATION], bufPos, &bufEnd, NULL, NULL);
+UA_UpdateDataDetails_encodeBinary(const UA_UpdateDataDetails *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_UPDATEDATADETAILS], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_DataChangeNotification_decodeBinary(const UA_ByteString *src, size_t *offset, UA_DataChangeNotification *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_DATACHANGENOTIFICATION], NULL);
+UA_UpdateDataDetails_decodeBinary(const UA_ByteString *src, size_t *offset, UA_UpdateDataDetails *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_UPDATEDATADETAILS], NULL);
 }
 
-/* Argument */
+/* DeleteRawModifiedDetails */
 static UA_INLINE size_t
-UA_Argument_calcSizeBinary(const UA_Argument *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_ARGUMENT]);
+UA_DeleteRawModifiedDetails_calcSizeBinary(const UA_DeleteRawModifiedDetails *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_DELETERAWMODIFIEDDETAILS]);
 }
 static UA_INLINE UA_StatusCode
-UA_Argument_encodeBinary(const UA_Argument *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_ARGUMENT], bufPos, &bufEnd, NULL, NULL);
+UA_DeleteRawModifiedDetails_encodeBinary(const UA_DeleteRawModifiedDetails *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_DELETERAWMODIFIEDDETAILS], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_Argument_decodeBinary(const UA_ByteString *src, size_t *offset, UA_Argument *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_ARGUMENT], NULL);
+UA_DeleteRawModifiedDetails_decodeBinary(const UA_ByteString *src, size_t *offset, UA_DeleteRawModifiedDetails *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_DELETERAWMODIFIEDDETAILS], NULL);
 }
 
-/* ChannelSecurityToken */
+/* HistoryUpdateResult */
 static UA_INLINE size_t
-UA_ChannelSecurityToken_calcSizeBinary(const UA_ChannelSecurityToken *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_CHANNELSECURITYTOKEN]);
+UA_HistoryUpdateResult_calcSizeBinary(const UA_HistoryUpdateResult *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_HISTORYUPDATERESULT]);
 }
 static UA_INLINE UA_StatusCode
-UA_ChannelSecurityToken_encodeBinary(const UA_ChannelSecurityToken *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_CHANNELSECURITYTOKEN], bufPos, &bufEnd, NULL, NULL);
+UA_HistoryUpdateResult_encodeBinary(const UA_HistoryUpdateResult *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_HISTORYUPDATERESULT], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_ChannelSecurityToken_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ChannelSecurityToken *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_CHANNELSECURITYTOKEN], NULL);
+UA_HistoryUpdateResult_decodeBinary(const UA_ByteString *src, size_t *offset, UA_HistoryUpdateResult *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_HISTORYUPDATERESULT], NULL);
 }
 
-/* ServerState */
+/* HistoryUpdateRequest */
 static UA_INLINE size_t
-UA_ServerState_calcSizeBinary(const UA_ServerState *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_SERVERSTATE]);
+UA_HistoryUpdateRequest_calcSizeBinary(const UA_HistoryUpdateRequest *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_HISTORYUPDATEREQUEST]);
 }
 static UA_INLINE UA_StatusCode
-UA_ServerState_encodeBinary(const UA_ServerState *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_SERVERSTATE], bufPos, &bufEnd, NULL, NULL);
+UA_HistoryUpdateRequest_encodeBinary(const UA_HistoryUpdateRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_HISTORYUPDATEREQUEST], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_ServerState_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ServerState *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_SERVERSTATE], NULL);
+UA_HistoryUpdateRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_HistoryUpdateRequest *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_HISTORYUPDATEREQUEST], NULL);
 }
 
-/* EventNotificationList */
+/* HistoryUpdateResponse */
 static UA_INLINE size_t
-UA_EventNotificationList_calcSizeBinary(const UA_EventNotificationList *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_EVENTNOTIFICATIONLIST]);
+UA_HistoryUpdateResponse_calcSizeBinary(const UA_HistoryUpdateResponse *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_HISTORYUPDATERESPONSE]);
 }
 static UA_INLINE UA_StatusCode
-UA_EventNotificationList_encodeBinary(const UA_EventNotificationList *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_EVENTNOTIFICATIONLIST], bufPos, &bufEnd, NULL, NULL);
+UA_HistoryUpdateResponse_encodeBinary(const UA_HistoryUpdateResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_HISTORYUPDATERESPONSE], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_EventNotificationList_decodeBinary(const UA_ByteString *src, size_t *offset, UA_EventNotificationList *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_EVENTNOTIFICATIONLIST], NULL);
+UA_HistoryUpdateResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_HistoryUpdateResponse *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_HISTORYUPDATERESPONSE], NULL);
 }
 
-/* AnonymousIdentityToken */
+/* CallMethodRequest */
 static UA_INLINE size_t
-UA_AnonymousIdentityToken_calcSizeBinary(const UA_AnonymousIdentityToken *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_ANONYMOUSIDENTITYTOKEN]);
+UA_CallMethodRequest_calcSizeBinary(const UA_CallMethodRequest *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_CALLMETHODREQUEST]);
 }
 static UA_INLINE UA_StatusCode
-UA_AnonymousIdentityToken_encodeBinary(const UA_AnonymousIdentityToken *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_ANONYMOUSIDENTITYTOKEN], bufPos, &bufEnd, NULL, NULL);
+UA_CallMethodRequest_encodeBinary(const UA_CallMethodRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_CALLMETHODREQUEST], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_AnonymousIdentityToken_decodeBinary(const UA_ByteString *src, size_t *offset, UA_AnonymousIdentityToken *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_ANONYMOUSIDENTITYTOKEN], NULL);
+UA_CallMethodRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_CallMethodRequest *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_CALLMETHODREQUEST], NULL);
 }
 
-/* FilterOperator */
+/* CallMethodResult */
 static UA_INLINE size_t
-UA_FilterOperator_calcSizeBinary(const UA_FilterOperator *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_FILTEROPERATOR]);
+UA_CallMethodResult_calcSizeBinary(const UA_CallMethodResult *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_CALLMETHODRESULT]);
 }
 static UA_INLINE UA_StatusCode
-UA_FilterOperator_encodeBinary(const UA_FilterOperator *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_FILTEROPERATOR], bufPos, &bufEnd, NULL, NULL);
+UA_CallMethodResult_encodeBinary(const UA_CallMethodResult *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_CALLMETHODRESULT], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_FilterOperator_decodeBinary(const UA_ByteString *src, size_t *offset, UA_FilterOperator *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_FILTEROPERATOR], NULL);
+UA_CallMethodResult_decodeBinary(const UA_ByteString *src, size_t *offset, UA_CallMethodResult *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_CALLMETHODRESULT], NULL);
 }
 
-/* AggregateFilter */
+/* CallRequest */
 static UA_INLINE size_t
-UA_AggregateFilter_calcSizeBinary(const UA_AggregateFilter *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_AGGREGATEFILTER]);
+UA_CallRequest_calcSizeBinary(const UA_CallRequest *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_CALLREQUEST]);
 }
 static UA_INLINE UA_StatusCode
-UA_AggregateFilter_encodeBinary(const UA_AggregateFilter *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_AGGREGATEFILTER], bufPos, &bufEnd, NULL, NULL);
+UA_CallRequest_encodeBinary(const UA_CallRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_CALLREQUEST], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_AggregateFilter_decodeBinary(const UA_ByteString *src, size_t *offset, UA_AggregateFilter *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_AGGREGATEFILTER], NULL);
+UA_CallRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_CallRequest *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_CALLREQUEST], NULL);
 }
 
-/* RepublishResponse */
+/* CallResponse */
 static UA_INLINE size_t
-UA_RepublishResponse_calcSizeBinary(const UA_RepublishResponse *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_REPUBLISHRESPONSE]);
+UA_CallResponse_calcSizeBinary(const UA_CallResponse *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_CALLRESPONSE]);
 }
 static UA_INLINE UA_StatusCode
-UA_RepublishResponse_encodeBinary(const UA_RepublishResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_REPUBLISHRESPONSE], bufPos, &bufEnd, NULL, NULL);
+UA_CallResponse_encodeBinary(const UA_CallResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_CALLRESPONSE], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_RepublishResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_RepublishResponse *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_REPUBLISHRESPONSE], NULL);
+UA_CallResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_CallResponse *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_CALLRESPONSE], NULL);
 }
 
-/* DeleteSubscriptionsResponse */
+/* MonitoringMode */
 static UA_INLINE size_t
-UA_DeleteSubscriptionsResponse_calcSizeBinary(const UA_DeleteSubscriptionsResponse *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_DELETESUBSCRIPTIONSRESPONSE]);
+UA_MonitoringMode_calcSizeBinary(const UA_MonitoringMode *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_MONITORINGMODE]);
 }
 static UA_INLINE UA_StatusCode
-UA_DeleteSubscriptionsResponse_encodeBinary(const UA_DeleteSubscriptionsResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_DELETESUBSCRIPTIONSRESPONSE], bufPos, &bufEnd, NULL, NULL);
+UA_MonitoringMode_encodeBinary(const UA_MonitoringMode *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_MONITORINGMODE], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_DeleteSubscriptionsResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_DeleteSubscriptionsResponse *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_DELETESUBSCRIPTIONSRESPONSE], NULL);
+UA_MonitoringMode_decodeBinary(const UA_ByteString *src, size_t *offset, UA_MonitoringMode *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_MONITORINGMODE], NULL);
 }
 
-/* RegisterNodesRequest */
+/* DataChangeTrigger */
 static UA_INLINE size_t
-UA_RegisterNodesRequest_calcSizeBinary(const UA_RegisterNodesRequest *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_REGISTERNODESREQUEST]);
+UA_DataChangeTrigger_calcSizeBinary(const UA_DataChangeTrigger *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_DATACHANGETRIGGER]);
 }
 static UA_INLINE UA_StatusCode
-UA_RegisterNodesRequest_encodeBinary(const UA_RegisterNodesRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_REGISTERNODESREQUEST], bufPos, &bufEnd, NULL, NULL);
+UA_DataChangeTrigger_encodeBinary(const UA_DataChangeTrigger *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_DATACHANGETRIGGER], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_RegisterNodesRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_RegisterNodesRequest *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_REGISTERNODESREQUEST], NULL);
+UA_DataChangeTrigger_decodeBinary(const UA_ByteString *src, size_t *offset, UA_DataChangeTrigger *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_DATACHANGETRIGGER], NULL);
 }
 
-/* StructureDefinition */
+/* DeadbandType */
 static UA_INLINE size_t
-UA_StructureDefinition_calcSizeBinary(const UA_StructureDefinition *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_STRUCTUREDEFINITION]);
+UA_DeadbandType_calcSizeBinary(const UA_DeadbandType *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_DEADBANDTYPE]);
 }
 static UA_INLINE UA_StatusCode
-UA_StructureDefinition_encodeBinary(const UA_StructureDefinition *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_STRUCTUREDEFINITION], bufPos, &bufEnd, NULL, NULL);
+UA_DeadbandType_encodeBinary(const UA_DeadbandType *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_DEADBANDTYPE], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_StructureDefinition_decodeBinary(const UA_ByteString *src, size_t *offset, UA_StructureDefinition *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_STRUCTUREDEFINITION], NULL);
+UA_DeadbandType_decodeBinary(const UA_ByteString *src, size_t *offset, UA_DeadbandType *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_DEADBANDTYPE], NULL);
 }
 
-/* MethodAttributes */
+/* DataChangeFilter */
 static UA_INLINE size_t
-UA_MethodAttributes_calcSizeBinary(const UA_MethodAttributes *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_METHODATTRIBUTES]);
+UA_DataChangeFilter_calcSizeBinary(const UA_DataChangeFilter *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_DATACHANGEFILTER]);
 }
 static UA_INLINE UA_StatusCode
-UA_MethodAttributes_encodeBinary(const UA_MethodAttributes *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_METHODATTRIBUTES], bufPos, &bufEnd, NULL, NULL);
+UA_DataChangeFilter_encodeBinary(const UA_DataChangeFilter *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_DATACHANGEFILTER], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_MethodAttributes_decodeBinary(const UA_ByteString *src, size_t *offset, UA_MethodAttributes *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_METHODATTRIBUTES], NULL);
+UA_DataChangeFilter_decodeBinary(const UA_ByteString *src, size_t *offset, UA_DataChangeFilter *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_DATACHANGEFILTER], NULL);
 }
 
-/* UserNameIdentityToken */
+/* EventFilter */
 static UA_INLINE size_t
-UA_UserNameIdentityToken_calcSizeBinary(const UA_UserNameIdentityToken *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_USERNAMEIDENTITYTOKEN]);
+UA_EventFilter_calcSizeBinary(const UA_EventFilter *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_EVENTFILTER]);
 }
 static UA_INLINE UA_StatusCode
-UA_UserNameIdentityToken_encodeBinary(const UA_UserNameIdentityToken *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_USERNAMEIDENTITYTOKEN], bufPos, &bufEnd, NULL, NULL);
+UA_EventFilter_encodeBinary(const UA_EventFilter *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_EVENTFILTER], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_UserNameIdentityToken_decodeBinary(const UA_ByteString *src, size_t *offset, UA_UserNameIdentityToken *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_USERNAMEIDENTITYTOKEN], NULL);
+UA_EventFilter_decodeBinary(const UA_ByteString *src, size_t *offset, UA_EventFilter *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_EVENTFILTER], NULL);
 }
 
-/* TimeZoneDataType */
+/* AggregateConfiguration */
 static UA_INLINE size_t
-UA_TimeZoneDataType_calcSizeBinary(const UA_TimeZoneDataType *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_TIMEZONEDATATYPE]);
+UA_AggregateConfiguration_calcSizeBinary(const UA_AggregateConfiguration *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_AGGREGATECONFIGURATION]);
 }
 static UA_INLINE UA_StatusCode
-UA_TimeZoneDataType_encodeBinary(const UA_TimeZoneDataType *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_TIMEZONEDATATYPE], bufPos, &bufEnd, NULL, NULL);
+UA_AggregateConfiguration_encodeBinary(const UA_AggregateConfiguration *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_AGGREGATECONFIGURATION], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_TimeZoneDataType_decodeBinary(const UA_ByteString *src, size_t *offset, UA_TimeZoneDataType *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_TIMEZONEDATATYPE], NULL);
+UA_AggregateConfiguration_decodeBinary(const UA_ByteString *src, size_t *offset, UA_AggregateConfiguration *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_AGGREGATECONFIGURATION], NULL);
 }
 
-/* UnregisterNodesRequest */
+/* AggregateFilter */
 static UA_INLINE size_t
-UA_UnregisterNodesRequest_calcSizeBinary(const UA_UnregisterNodesRequest *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_UNREGISTERNODESREQUEST]);
+UA_AggregateFilter_calcSizeBinary(const UA_AggregateFilter *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_AGGREGATEFILTER]);
 }
 static UA_INLINE UA_StatusCode
-UA_UnregisterNodesRequest_encodeBinary(const UA_UnregisterNodesRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_UNREGISTERNODESREQUEST], bufPos, &bufEnd, NULL, NULL);
+UA_AggregateFilter_encodeBinary(const UA_AggregateFilter *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_AGGREGATEFILTER], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_UnregisterNodesRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_UnregisterNodesRequest *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_UNREGISTERNODESREQUEST], NULL);
+UA_AggregateFilter_decodeBinary(const UA_ByteString *src, size_t *offset, UA_AggregateFilter *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_AGGREGATEFILTER], NULL);
 }
 
-/* OpenSecureChannelResponse */
+/* EventFilterResult */
 static UA_INLINE size_t
-UA_OpenSecureChannelResponse_calcSizeBinary(const UA_OpenSecureChannelResponse *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_OPENSECURECHANNELRESPONSE]);
+UA_EventFilterResult_calcSizeBinary(const UA_EventFilterResult *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_EVENTFILTERRESULT]);
 }
 static UA_INLINE UA_StatusCode
-UA_OpenSecureChannelResponse_encodeBinary(const UA_OpenSecureChannelResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_OPENSECURECHANNELRESPONSE], bufPos, &bufEnd, NULL, NULL);
+UA_EventFilterResult_encodeBinary(const UA_EventFilterResult *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_EVENTFILTERRESULT], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_OpenSecureChannelResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_OpenSecureChannelResponse *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_OPENSECURECHANNELRESPONSE], NULL);
+UA_EventFilterResult_decodeBinary(const UA_ByteString *src, size_t *offset, UA_EventFilterResult *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_EVENTFILTERRESULT], NULL);
 }
 
-/* SetTriggeringResponse */
+/* MonitoringParameters */
 static UA_INLINE size_t
-UA_SetTriggeringResponse_calcSizeBinary(const UA_SetTriggeringResponse *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_SETTRIGGERINGRESPONSE]);
+UA_MonitoringParameters_calcSizeBinary(const UA_MonitoringParameters *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_MONITORINGPARAMETERS]);
 }
 static UA_INLINE UA_StatusCode
-UA_SetTriggeringResponse_encodeBinary(const UA_SetTriggeringResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_SETTRIGGERINGRESPONSE], bufPos, &bufEnd, NULL, NULL);
+UA_MonitoringParameters_encodeBinary(const UA_MonitoringParameters *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_MONITORINGPARAMETERS], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_SetTriggeringResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_SetTriggeringResponse *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_SETTRIGGERINGRESPONSE], NULL);
+UA_MonitoringParameters_decodeBinary(const UA_ByteString *src, size_t *offset, UA_MonitoringParameters *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_MONITORINGPARAMETERS], NULL);
 }
 
-/* SimpleAttributeOperand */
+/* MonitoredItemCreateRequest */
 static UA_INLINE size_t
-UA_SimpleAttributeOperand_calcSizeBinary(const UA_SimpleAttributeOperand *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_SIMPLEATTRIBUTEOPERAND]);
+UA_MonitoredItemCreateRequest_calcSizeBinary(const UA_MonitoredItemCreateRequest *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_MONITOREDITEMCREATEREQUEST]);
 }
 static UA_INLINE UA_StatusCode
-UA_SimpleAttributeOperand_encodeBinary(const UA_SimpleAttributeOperand *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_SIMPLEATTRIBUTEOPERAND], bufPos, &bufEnd, NULL, NULL);
+UA_MonitoredItemCreateRequest_encodeBinary(const UA_MonitoredItemCreateRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_MONITOREDITEMCREATEREQUEST], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_SimpleAttributeOperand_decodeBinary(const UA_ByteString *src, size_t *offset, UA_SimpleAttributeOperand *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_SIMPLEATTRIBUTEOPERAND], NULL);
+UA_MonitoredItemCreateRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_MonitoredItemCreateRequest *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_MONITOREDITEMCREATEREQUEST], NULL);
 }
 
-/* RepublishRequest */
+/* MonitoredItemCreateResult */
 static UA_INLINE size_t
-UA_RepublishRequest_calcSizeBinary(const UA_RepublishRequest *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_REPUBLISHREQUEST]);
+UA_MonitoredItemCreateResult_calcSizeBinary(const UA_MonitoredItemCreateResult *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_MONITOREDITEMCREATERESULT]);
 }
 static UA_INLINE UA_StatusCode
-UA_RepublishRequest_encodeBinary(const UA_RepublishRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_REPUBLISHREQUEST], bufPos, &bufEnd, NULL, NULL);
+UA_MonitoredItemCreateResult_encodeBinary(const UA_MonitoredItemCreateResult *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_MONITOREDITEMCREATERESULT], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_RepublishRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_RepublishRequest *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_REPUBLISHREQUEST], NULL);
+UA_MonitoredItemCreateResult_decodeBinary(const UA_ByteString *src, size_t *offset, UA_MonitoredItemCreateResult *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_MONITOREDITEMCREATERESULT], NULL);
 }
 
-/* RegisterNodesResponse */
+/* CreateMonitoredItemsRequest */
 static UA_INLINE size_t
-UA_RegisterNodesResponse_calcSizeBinary(const UA_RegisterNodesResponse *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_REGISTERNODESRESPONSE]);
+UA_CreateMonitoredItemsRequest_calcSizeBinary(const UA_CreateMonitoredItemsRequest *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_CREATEMONITOREDITEMSREQUEST]);
 }
 static UA_INLINE UA_StatusCode
-UA_RegisterNodesResponse_encodeBinary(const UA_RegisterNodesResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_REGISTERNODESRESPONSE], bufPos, &bufEnd, NULL, NULL);
+UA_CreateMonitoredItemsRequest_encodeBinary(const UA_CreateMonitoredItemsRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_CREATEMONITOREDITEMSREQUEST], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_RegisterNodesResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_RegisterNodesResponse *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_REGISTERNODESRESPONSE], NULL);
+UA_CreateMonitoredItemsRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_CreateMonitoredItemsRequest *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_CREATEMONITOREDITEMSREQUEST], NULL);
 }
 
-/* ModifyMonitoredItemsResponse */
+/* CreateMonitoredItemsResponse */
 static UA_INLINE size_t
-UA_ModifyMonitoredItemsResponse_calcSizeBinary(const UA_ModifyMonitoredItemsResponse *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_MODIFYMONITOREDITEMSRESPONSE]);
+UA_CreateMonitoredItemsResponse_calcSizeBinary(const UA_CreateMonitoredItemsResponse *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_CREATEMONITOREDITEMSRESPONSE]);
 }
 static UA_INLINE UA_StatusCode
-UA_ModifyMonitoredItemsResponse_encodeBinary(const UA_ModifyMonitoredItemsResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_MODIFYMONITOREDITEMSRESPONSE], bufPos, &bufEnd, NULL, NULL);
+UA_CreateMonitoredItemsResponse_encodeBinary(const UA_CreateMonitoredItemsResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_CREATEMONITOREDITEMSRESPONSE], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_ModifyMonitoredItemsResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ModifyMonitoredItemsResponse *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_MODIFYMONITOREDITEMSRESPONSE], NULL);
+UA_CreateMonitoredItemsResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_CreateMonitoredItemsResponse *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_CREATEMONITOREDITEMSRESPONSE], NULL);
 }
 
-/* DeleteSubscriptionsRequest */
+/* MonitoredItemModifyRequest */
 static UA_INLINE size_t
-UA_DeleteSubscriptionsRequest_calcSizeBinary(const UA_DeleteSubscriptionsRequest *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_DELETESUBSCRIPTIONSREQUEST]);
+UA_MonitoredItemModifyRequest_calcSizeBinary(const UA_MonitoredItemModifyRequest *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_MONITOREDITEMMODIFYREQUEST]);
 }
 static UA_INLINE UA_StatusCode
-UA_DeleteSubscriptionsRequest_encodeBinary(const UA_DeleteSubscriptionsRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_DELETESUBSCRIPTIONSREQUEST], bufPos, &bufEnd, NULL, NULL);
+UA_MonitoredItemModifyRequest_encodeBinary(const UA_MonitoredItemModifyRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_MONITOREDITEMMODIFYREQUEST], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_DeleteSubscriptionsRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_DeleteSubscriptionsRequest *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_DELETESUBSCRIPTIONSREQUEST], NULL);
+UA_MonitoredItemModifyRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_MonitoredItemModifyRequest *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_MONITOREDITEMMODIFYREQUEST], NULL);
 }
 
-/* RedundancySupport */
+/* MonitoredItemModifyResult */
 static UA_INLINE size_t
-UA_RedundancySupport_calcSizeBinary(const UA_RedundancySupport *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_REDUNDANCYSUPPORT]);
+UA_MonitoredItemModifyResult_calcSizeBinary(const UA_MonitoredItemModifyResult *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_MONITOREDITEMMODIFYRESULT]);
 }
 static UA_INLINE UA_StatusCode
-UA_RedundancySupport_encodeBinary(const UA_RedundancySupport *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_REDUNDANCYSUPPORT], bufPos, &bufEnd, NULL, NULL);
+UA_MonitoredItemModifyResult_encodeBinary(const UA_MonitoredItemModifyResult *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_MONITOREDITEMMODIFYRESULT], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_RedundancySupport_decodeBinary(const UA_ByteString *src, size_t *offset, UA_RedundancySupport *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_REDUNDANCYSUPPORT], NULL);
+UA_MonitoredItemModifyResult_decodeBinary(const UA_ByteString *src, size_t *offset, UA_MonitoredItemModifyResult *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_MONITOREDITEMMODIFYRESULT], NULL);
 }
 
-/* BrowsePath */
+/* ModifyMonitoredItemsRequest */
 static UA_INLINE size_t
-UA_BrowsePath_calcSizeBinary(const UA_BrowsePath *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_BROWSEPATH]);
+UA_ModifyMonitoredItemsRequest_calcSizeBinary(const UA_ModifyMonitoredItemsRequest *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_MODIFYMONITOREDITEMSREQUEST]);
 }
 static UA_INLINE UA_StatusCode
-UA_BrowsePath_encodeBinary(const UA_BrowsePath *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_BROWSEPATH], bufPos, &bufEnd, NULL, NULL);
+UA_ModifyMonitoredItemsRequest_encodeBinary(const UA_ModifyMonitoredItemsRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_MODIFYMONITOREDITEMSREQUEST], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_BrowsePath_decodeBinary(const UA_ByteString *src, size_t *offset, UA_BrowsePath *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_BROWSEPATH], NULL);
+UA_ModifyMonitoredItemsRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ModifyMonitoredItemsRequest *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_MODIFYMONITOREDITEMSREQUEST], NULL);
 }
 
-/* ObjectAttributes */
+/* ModifyMonitoredItemsResponse */
 static UA_INLINE size_t
-UA_ObjectAttributes_calcSizeBinary(const UA_ObjectAttributes *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES]);
+UA_ModifyMonitoredItemsResponse_calcSizeBinary(const UA_ModifyMonitoredItemsResponse *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_MODIFYMONITOREDITEMSRESPONSE]);
 }
 static UA_INLINE UA_StatusCode
-UA_ObjectAttributes_encodeBinary(const UA_ObjectAttributes *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES], bufPos, &bufEnd, NULL, NULL);
+UA_ModifyMonitoredItemsResponse_encodeBinary(const UA_ModifyMonitoredItemsResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_MODIFYMONITOREDITEMSRESPONSE], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_ObjectAttributes_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ObjectAttributes *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES], NULL);
+UA_ModifyMonitoredItemsResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ModifyMonitoredItemsResponse *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_MODIFYMONITOREDITEMSRESPONSE], NULL);
 }
 
-/* PublishRequest */
+/* SetMonitoringModeRequest */
 static UA_INLINE size_t
-UA_PublishRequest_calcSizeBinary(const UA_PublishRequest *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_PUBLISHREQUEST]);
+UA_SetMonitoringModeRequest_calcSizeBinary(const UA_SetMonitoringModeRequest *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_SETMONITORINGMODEREQUEST]);
 }
 static UA_INLINE UA_StatusCode
-UA_PublishRequest_encodeBinary(const UA_PublishRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_PUBLISHREQUEST], bufPos, &bufEnd, NULL, NULL);
+UA_SetMonitoringModeRequest_encodeBinary(const UA_SetMonitoringModeRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_SETMONITORINGMODEREQUEST], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_PublishRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_PublishRequest *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_PUBLISHREQUEST], NULL);
+UA_SetMonitoringModeRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_SetMonitoringModeRequest *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_SETMONITORINGMODEREQUEST], NULL);
 }
 
-/* FindServersRequest */
+/* SetMonitoringModeResponse */
 static UA_INLINE size_t
-UA_FindServersRequest_calcSizeBinary(const UA_FindServersRequest *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_FINDSERVERSREQUEST]);
+UA_SetMonitoringModeResponse_calcSizeBinary(const UA_SetMonitoringModeResponse *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_SETMONITORINGMODERESPONSE]);
 }
 static UA_INLINE UA_StatusCode
-UA_FindServersRequest_encodeBinary(const UA_FindServersRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_FINDSERVERSREQUEST], bufPos, &bufEnd, NULL, NULL);
+UA_SetMonitoringModeResponse_encodeBinary(const UA_SetMonitoringModeResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_SETMONITORINGMODERESPONSE], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_FindServersRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_FindServersRequest *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_FINDSERVERSREQUEST], NULL);
+UA_SetMonitoringModeResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_SetMonitoringModeResponse *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_SETMONITORINGMODERESPONSE], NULL);
 }
 
-/* ReferenceDescription */
+/* SetTriggeringRequest */
 static UA_INLINE size_t
-UA_ReferenceDescription_calcSizeBinary(const UA_ReferenceDescription *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_REFERENCEDESCRIPTION]);
+UA_SetTriggeringRequest_calcSizeBinary(const UA_SetTriggeringRequest *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_SETTRIGGERINGREQUEST]);
 }
 static UA_INLINE UA_StatusCode
-UA_ReferenceDescription_encodeBinary(const UA_ReferenceDescription *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_REFERENCEDESCRIPTION], bufPos, &bufEnd, NULL, NULL);
+UA_SetTriggeringRequest_encodeBinary(const UA_SetTriggeringRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_SETTRIGGERINGREQUEST], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_ReferenceDescription_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ReferenceDescription *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_REFERENCEDESCRIPTION], NULL);
+UA_SetTriggeringRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_SetTriggeringRequest *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_SETTRIGGERINGREQUEST], NULL);
+}
+
+/* SetTriggeringResponse */
+static UA_INLINE size_t
+UA_SetTriggeringResponse_calcSizeBinary(const UA_SetTriggeringResponse *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_SETTRIGGERINGRESPONSE]);
+}
+static UA_INLINE UA_StatusCode
+UA_SetTriggeringResponse_encodeBinary(const UA_SetTriggeringResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_SETTRIGGERINGRESPONSE], bufPos, &bufEnd, NULL, NULL);
+}
+static UA_INLINE UA_StatusCode
+UA_SetTriggeringResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_SetTriggeringResponse *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_SETTRIGGERINGRESPONSE], NULL);
+}
+
+/* DeleteMonitoredItemsRequest */
+static UA_INLINE size_t
+UA_DeleteMonitoredItemsRequest_calcSizeBinary(const UA_DeleteMonitoredItemsRequest *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_DELETEMONITOREDITEMSREQUEST]);
+}
+static UA_INLINE UA_StatusCode
+UA_DeleteMonitoredItemsRequest_encodeBinary(const UA_DeleteMonitoredItemsRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_DELETEMONITOREDITEMSREQUEST], bufPos, &bufEnd, NULL, NULL);
+}
+static UA_INLINE UA_StatusCode
+UA_DeleteMonitoredItemsRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_DeleteMonitoredItemsRequest *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_DELETEMONITOREDITEMSREQUEST], NULL);
+}
+
+/* DeleteMonitoredItemsResponse */
+static UA_INLINE size_t
+UA_DeleteMonitoredItemsResponse_calcSizeBinary(const UA_DeleteMonitoredItemsResponse *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_DELETEMONITOREDITEMSRESPONSE]);
+}
+static UA_INLINE UA_StatusCode
+UA_DeleteMonitoredItemsResponse_encodeBinary(const UA_DeleteMonitoredItemsResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_DELETEMONITOREDITEMSRESPONSE], bufPos, &bufEnd, NULL, NULL);
+}
+static UA_INLINE UA_StatusCode
+UA_DeleteMonitoredItemsResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_DeleteMonitoredItemsResponse *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_DELETEMONITOREDITEMSRESPONSE], NULL);
 }
 
 /* CreateSubscriptionRequest */
@@ -3131,529 +3411,529 @@ UA_CreateSubscriptionRequest_decodeBinary(const UA_ByteString *src, size_t *offs
     return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_CREATESUBSCRIPTIONREQUEST], NULL);
 }
 
-/* CallResponse */
+/* CreateSubscriptionResponse */
 static UA_INLINE size_t
-UA_CallResponse_calcSizeBinary(const UA_CallResponse *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_CALLRESPONSE]);
+UA_CreateSubscriptionResponse_calcSizeBinary(const UA_CreateSubscriptionResponse *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_CREATESUBSCRIPTIONRESPONSE]);
 }
 static UA_INLINE UA_StatusCode
-UA_CallResponse_encodeBinary(const UA_CallResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_CALLRESPONSE], bufPos, &bufEnd, NULL, NULL);
+UA_CreateSubscriptionResponse_encodeBinary(const UA_CreateSubscriptionResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_CREATESUBSCRIPTIONRESPONSE], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_CallResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_CallResponse *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_CALLRESPONSE], NULL);
+UA_CreateSubscriptionResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_CreateSubscriptionResponse *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_CREATESUBSCRIPTIONRESPONSE], NULL);
 }
 
-/* DeleteNodesResponse */
+/* ModifySubscriptionRequest */
 static UA_INLINE size_t
-UA_DeleteNodesResponse_calcSizeBinary(const UA_DeleteNodesResponse *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_DELETENODESRESPONSE]);
+UA_ModifySubscriptionRequest_calcSizeBinary(const UA_ModifySubscriptionRequest *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_MODIFYSUBSCRIPTIONREQUEST]);
 }
 static UA_INLINE UA_StatusCode
-UA_DeleteNodesResponse_encodeBinary(const UA_DeleteNodesResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_DELETENODESRESPONSE], bufPos, &bufEnd, NULL, NULL);
+UA_ModifySubscriptionRequest_encodeBinary(const UA_ModifySubscriptionRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_MODIFYSUBSCRIPTIONREQUEST], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_DeleteNodesResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_DeleteNodesResponse *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_DELETENODESRESPONSE], NULL);
+UA_ModifySubscriptionRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ModifySubscriptionRequest *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_MODIFYSUBSCRIPTIONREQUEST], NULL);
 }
 
-/* ModifyMonitoredItemsRequest */
+/* ModifySubscriptionResponse */
 static UA_INLINE size_t
-UA_ModifyMonitoredItemsRequest_calcSizeBinary(const UA_ModifyMonitoredItemsRequest *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_MODIFYMONITOREDITEMSREQUEST]);
+UA_ModifySubscriptionResponse_calcSizeBinary(const UA_ModifySubscriptionResponse *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_MODIFYSUBSCRIPTIONRESPONSE]);
 }
 static UA_INLINE UA_StatusCode
-UA_ModifyMonitoredItemsRequest_encodeBinary(const UA_ModifyMonitoredItemsRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_MODIFYMONITOREDITEMSREQUEST], bufPos, &bufEnd, NULL, NULL);
+UA_ModifySubscriptionResponse_encodeBinary(const UA_ModifySubscriptionResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_MODIFYSUBSCRIPTIONRESPONSE], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_ModifyMonitoredItemsRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ModifyMonitoredItemsRequest *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_MODIFYMONITOREDITEMSREQUEST], NULL);
+UA_ModifySubscriptionResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ModifySubscriptionResponse *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_MODIFYSUBSCRIPTIONRESPONSE], NULL);
 }
 
-/* ServiceFault */
+/* SetPublishingModeRequest */
 static UA_INLINE size_t
-UA_ServiceFault_calcSizeBinary(const UA_ServiceFault *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_SERVICEFAULT]);
+UA_SetPublishingModeRequest_calcSizeBinary(const UA_SetPublishingModeRequest *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_SETPUBLISHINGMODEREQUEST]);
 }
 static UA_INLINE UA_StatusCode
-UA_ServiceFault_encodeBinary(const UA_ServiceFault *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_SERVICEFAULT], bufPos, &bufEnd, NULL, NULL);
+UA_SetPublishingModeRequest_encodeBinary(const UA_SetPublishingModeRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_SETPUBLISHINGMODEREQUEST], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_ServiceFault_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ServiceFault *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_SERVICEFAULT], NULL);
+UA_SetPublishingModeRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_SetPublishingModeRequest *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_SETPUBLISHINGMODEREQUEST], NULL);
 }
 
-/* PublishResponse */
+/* SetPublishingModeResponse */
 static UA_INLINE size_t
-UA_PublishResponse_calcSizeBinary(const UA_PublishResponse *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_PUBLISHRESPONSE]);
+UA_SetPublishingModeResponse_calcSizeBinary(const UA_SetPublishingModeResponse *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_SETPUBLISHINGMODERESPONSE]);
 }
 static UA_INLINE UA_StatusCode
-UA_PublishResponse_encodeBinary(const UA_PublishResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_PUBLISHRESPONSE], bufPos, &bufEnd, NULL, NULL);
+UA_SetPublishingModeResponse_encodeBinary(const UA_SetPublishingModeResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_SETPUBLISHINGMODERESPONSE], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_PublishResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_PublishResponse *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_PUBLISHRESPONSE], NULL);
+UA_SetPublishingModeResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_SetPublishingModeResponse *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_SETPUBLISHINGMODERESPONSE], NULL);
 }
 
-/* CreateMonitoredItemsRequest */
+/* NotificationMessage */
 static UA_INLINE size_t
-UA_CreateMonitoredItemsRequest_calcSizeBinary(const UA_CreateMonitoredItemsRequest *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_CREATEMONITOREDITEMSREQUEST]);
+UA_NotificationMessage_calcSizeBinary(const UA_NotificationMessage *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_NOTIFICATIONMESSAGE]);
 }
 static UA_INLINE UA_StatusCode
-UA_CreateMonitoredItemsRequest_encodeBinary(const UA_CreateMonitoredItemsRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_CREATEMONITOREDITEMSREQUEST], bufPos, &bufEnd, NULL, NULL);
+UA_NotificationMessage_encodeBinary(const UA_NotificationMessage *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_NOTIFICATIONMESSAGE], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_CreateMonitoredItemsRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_CreateMonitoredItemsRequest *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_CREATEMONITOREDITEMSREQUEST], NULL);
+UA_NotificationMessage_decodeBinary(const UA_ByteString *src, size_t *offset, UA_NotificationMessage *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_NOTIFICATIONMESSAGE], NULL);
 }
 
-/* OpenSecureChannelRequest */
+/* MonitoredItemNotification */
 static UA_INLINE size_t
-UA_OpenSecureChannelRequest_calcSizeBinary(const UA_OpenSecureChannelRequest *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_OPENSECURECHANNELREQUEST]);
+UA_MonitoredItemNotification_calcSizeBinary(const UA_MonitoredItemNotification *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_MONITOREDITEMNOTIFICATION]);
 }
 static UA_INLINE UA_StatusCode
-UA_OpenSecureChannelRequest_encodeBinary(const UA_OpenSecureChannelRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_OPENSECURECHANNELREQUEST], bufPos, &bufEnd, NULL, NULL);
+UA_MonitoredItemNotification_encodeBinary(const UA_MonitoredItemNotification *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_MONITOREDITEMNOTIFICATION], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_OpenSecureChannelRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_OpenSecureChannelRequest *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_OPENSECURECHANNELREQUEST], NULL);
+UA_MonitoredItemNotification_decodeBinary(const UA_ByteString *src, size_t *offset, UA_MonitoredItemNotification *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_MONITOREDITEMNOTIFICATION], NULL);
 }
 
-/* CloseSessionRequest */
+/* EventFieldList */
 static UA_INLINE size_t
-UA_CloseSessionRequest_calcSizeBinary(const UA_CloseSessionRequest *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_CLOSESESSIONREQUEST]);
+UA_EventFieldList_calcSizeBinary(const UA_EventFieldList *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_EVENTFIELDLIST]);
 }
 static UA_INLINE UA_StatusCode
-UA_CloseSessionRequest_encodeBinary(const UA_CloseSessionRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_CLOSESESSIONREQUEST], bufPos, &bufEnd, NULL, NULL);
+UA_EventFieldList_encodeBinary(const UA_EventFieldList *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_EVENTFIELDLIST], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_CloseSessionRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_CloseSessionRequest *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_CLOSESESSIONREQUEST], NULL);
+UA_EventFieldList_decodeBinary(const UA_ByteString *src, size_t *offset, UA_EventFieldList *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_EVENTFIELDLIST], NULL);
 }
 
-/* SetTriggeringRequest */
+/* HistoryEventFieldList */
 static UA_INLINE size_t
-UA_SetTriggeringRequest_calcSizeBinary(const UA_SetTriggeringRequest *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_SETTRIGGERINGREQUEST]);
+UA_HistoryEventFieldList_calcSizeBinary(const UA_HistoryEventFieldList *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_HISTORYEVENTFIELDLIST]);
 }
 static UA_INLINE UA_StatusCode
-UA_SetTriggeringRequest_encodeBinary(const UA_SetTriggeringRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_SETTRIGGERINGREQUEST], bufPos, &bufEnd, NULL, NULL);
+UA_HistoryEventFieldList_encodeBinary(const UA_HistoryEventFieldList *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_HISTORYEVENTFIELDLIST], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_SetTriggeringRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_SetTriggeringRequest *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_SETTRIGGERINGREQUEST], NULL);
+UA_HistoryEventFieldList_decodeBinary(const UA_ByteString *src, size_t *offset, UA_HistoryEventFieldList *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_HISTORYEVENTFIELDLIST], NULL);
 }
 
-/* BrowseResult */
+/* StatusChangeNotification */
 static UA_INLINE size_t
-UA_BrowseResult_calcSizeBinary(const UA_BrowseResult *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_BROWSERESULT]);
+UA_StatusChangeNotification_calcSizeBinary(const UA_StatusChangeNotification *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_STATUSCHANGENOTIFICATION]);
 }
 static UA_INLINE UA_StatusCode
-UA_BrowseResult_encodeBinary(const UA_BrowseResult *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_BROWSERESULT], bufPos, &bufEnd, NULL, NULL);
+UA_StatusChangeNotification_encodeBinary(const UA_StatusChangeNotification *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_STATUSCHANGENOTIFICATION], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_BrowseResult_decodeBinary(const UA_ByteString *src, size_t *offset, UA_BrowseResult *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_BROWSERESULT], NULL);
+UA_StatusChangeNotification_decodeBinary(const UA_ByteString *src, size_t *offset, UA_StatusChangeNotification *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_STATUSCHANGENOTIFICATION], NULL);
 }
 
-/* AddReferencesRequest */
+/* SubscriptionAcknowledgement */
 static UA_INLINE size_t
-UA_AddReferencesRequest_calcSizeBinary(const UA_AddReferencesRequest *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_ADDREFERENCESREQUEST]);
+UA_SubscriptionAcknowledgement_calcSizeBinary(const UA_SubscriptionAcknowledgement *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_SUBSCRIPTIONACKNOWLEDGEMENT]);
 }
 static UA_INLINE UA_StatusCode
-UA_AddReferencesRequest_encodeBinary(const UA_AddReferencesRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_ADDREFERENCESREQUEST], bufPos, &bufEnd, NULL, NULL);
+UA_SubscriptionAcknowledgement_encodeBinary(const UA_SubscriptionAcknowledgement *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_SUBSCRIPTIONACKNOWLEDGEMENT], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_AddReferencesRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_AddReferencesRequest *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_ADDREFERENCESREQUEST], NULL);
+UA_SubscriptionAcknowledgement_decodeBinary(const UA_ByteString *src, size_t *offset, UA_SubscriptionAcknowledgement *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_SUBSCRIPTIONACKNOWLEDGEMENT], NULL);
 }
 
-/* AddNodesItem */
+/* PublishRequest */
 static UA_INLINE size_t
-UA_AddNodesItem_calcSizeBinary(const UA_AddNodesItem *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_ADDNODESITEM]);
+UA_PublishRequest_calcSizeBinary(const UA_PublishRequest *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_PUBLISHREQUEST]);
 }
 static UA_INLINE UA_StatusCode
-UA_AddNodesItem_encodeBinary(const UA_AddNodesItem *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_ADDNODESITEM], bufPos, &bufEnd, NULL, NULL);
+UA_PublishRequest_encodeBinary(const UA_PublishRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_PUBLISHREQUEST], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_AddNodesItem_decodeBinary(const UA_ByteString *src, size_t *offset, UA_AddNodesItem *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_ADDNODESITEM], NULL);
+UA_PublishRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_PublishRequest *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_PUBLISHREQUEST], NULL);
 }
 
-/* ServerStatusDataType */
+/* PublishResponse */
 static UA_INLINE size_t
-UA_ServerStatusDataType_calcSizeBinary(const UA_ServerStatusDataType *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_SERVERSTATUSDATATYPE]);
+UA_PublishResponse_calcSizeBinary(const UA_PublishResponse *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_PUBLISHRESPONSE]);
 }
 static UA_INLINE UA_StatusCode
-UA_ServerStatusDataType_encodeBinary(const UA_ServerStatusDataType *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_SERVERSTATUSDATATYPE], bufPos, &bufEnd, NULL, NULL);
+UA_PublishResponse_encodeBinary(const UA_PublishResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_PUBLISHRESPONSE], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_ServerStatusDataType_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ServerStatusDataType *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_SERVERSTATUSDATATYPE], NULL);
+UA_PublishResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_PublishResponse *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_PUBLISHRESPONSE], NULL);
 }
 
-/* BrowseNextResponse */
+/* RepublishRequest */
 static UA_INLINE size_t
-UA_BrowseNextResponse_calcSizeBinary(const UA_BrowseNextResponse *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_BROWSENEXTRESPONSE]);
+UA_RepublishRequest_calcSizeBinary(const UA_RepublishRequest *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_REPUBLISHREQUEST]);
 }
 static UA_INLINE UA_StatusCode
-UA_BrowseNextResponse_encodeBinary(const UA_BrowseNextResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_BROWSENEXTRESPONSE], bufPos, &bufEnd, NULL, NULL);
+UA_RepublishRequest_encodeBinary(const UA_RepublishRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_REPUBLISHREQUEST], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_BrowseNextResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_BrowseNextResponse *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_BROWSENEXTRESPONSE], NULL);
+UA_RepublishRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_RepublishRequest *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_REPUBLISHREQUEST], NULL);
 }
 
-/* AxisInformation */
+/* RepublishResponse */
 static UA_INLINE size_t
-UA_AxisInformation_calcSizeBinary(const UA_AxisInformation *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_AXISINFORMATION]);
+UA_RepublishResponse_calcSizeBinary(const UA_RepublishResponse *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_REPUBLISHRESPONSE]);
 }
 static UA_INLINE UA_StatusCode
-UA_AxisInformation_encodeBinary(const UA_AxisInformation *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_AXISINFORMATION], bufPos, &bufEnd, NULL, NULL);
+UA_RepublishResponse_encodeBinary(const UA_RepublishResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_REPUBLISHRESPONSE], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_AxisInformation_decodeBinary(const UA_ByteString *src, size_t *offset, UA_AxisInformation *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_AXISINFORMATION], NULL);
+UA_RepublishResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_RepublishResponse *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_REPUBLISHRESPONSE], NULL);
 }
 
-/* ApplicationDescription */
+/* DeleteSubscriptionsRequest */
 static UA_INLINE size_t
-UA_ApplicationDescription_calcSizeBinary(const UA_ApplicationDescription *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_APPLICATIONDESCRIPTION]);
+UA_DeleteSubscriptionsRequest_calcSizeBinary(const UA_DeleteSubscriptionsRequest *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_DELETESUBSCRIPTIONSREQUEST]);
 }
 static UA_INLINE UA_StatusCode
-UA_ApplicationDescription_encodeBinary(const UA_ApplicationDescription *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_APPLICATIONDESCRIPTION], bufPos, &bufEnd, NULL, NULL);
+UA_DeleteSubscriptionsRequest_encodeBinary(const UA_DeleteSubscriptionsRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_DELETESUBSCRIPTIONSREQUEST], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_ApplicationDescription_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ApplicationDescription *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_APPLICATIONDESCRIPTION], NULL);
+UA_DeleteSubscriptionsRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_DeleteSubscriptionsRequest *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_DELETESUBSCRIPTIONSREQUEST], NULL);
 }
 
-/* ReadRequest */
+/* DeleteSubscriptionsResponse */
 static UA_INLINE size_t
-UA_ReadRequest_calcSizeBinary(const UA_ReadRequest *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_READREQUEST]);
+UA_DeleteSubscriptionsResponse_calcSizeBinary(const UA_DeleteSubscriptionsResponse *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_DELETESUBSCRIPTIONSRESPONSE]);
 }
 static UA_INLINE UA_StatusCode
-UA_ReadRequest_encodeBinary(const UA_ReadRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_READREQUEST], bufPos, &bufEnd, NULL, NULL);
+UA_DeleteSubscriptionsResponse_encodeBinary(const UA_DeleteSubscriptionsResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_DELETESUBSCRIPTIONSRESPONSE], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_ReadRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ReadRequest *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_READREQUEST], NULL);
+UA_DeleteSubscriptionsResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_DeleteSubscriptionsResponse *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_DELETESUBSCRIPTIONSRESPONSE], NULL);
 }
 
-/* ActivateSessionRequest */
+/* BuildInfo */
 static UA_INLINE size_t
-UA_ActivateSessionRequest_calcSizeBinary(const UA_ActivateSessionRequest *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_ACTIVATESESSIONREQUEST]);
+UA_BuildInfo_calcSizeBinary(const UA_BuildInfo *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_BUILDINFO]);
 }
 static UA_INLINE UA_StatusCode
-UA_ActivateSessionRequest_encodeBinary(const UA_ActivateSessionRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_ACTIVATESESSIONREQUEST], bufPos, &bufEnd, NULL, NULL);
+UA_BuildInfo_encodeBinary(const UA_BuildInfo *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_BUILDINFO], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_ActivateSessionRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ActivateSessionRequest *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_ACTIVATESESSIONREQUEST], NULL);
+UA_BuildInfo_decodeBinary(const UA_ByteString *src, size_t *offset, UA_BuildInfo *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_BUILDINFO], NULL);
 }
 
-/* BrowsePathResult */
+/* RedundancySupport */
 static UA_INLINE size_t
-UA_BrowsePathResult_calcSizeBinary(const UA_BrowsePathResult *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_BROWSEPATHRESULT]);
+UA_RedundancySupport_calcSizeBinary(const UA_RedundancySupport *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_REDUNDANCYSUPPORT]);
 }
 static UA_INLINE UA_StatusCode
-UA_BrowsePathResult_encodeBinary(const UA_BrowsePathResult *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_BROWSEPATHRESULT], bufPos, &bufEnd, NULL, NULL);
+UA_RedundancySupport_encodeBinary(const UA_RedundancySupport *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_REDUNDANCYSUPPORT], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_BrowsePathResult_decodeBinary(const UA_ByteString *src, size_t *offset, UA_BrowsePathResult *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_BROWSEPATHRESULT], NULL);
+UA_RedundancySupport_decodeBinary(const UA_ByteString *src, size_t *offset, UA_RedundancySupport *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_REDUNDANCYSUPPORT], NULL);
 }
 
-/* AddNodesRequest */
+/* ServerState */
 static UA_INLINE size_t
-UA_AddNodesRequest_calcSizeBinary(const UA_AddNodesRequest *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_ADDNODESREQUEST]);
+UA_ServerState_calcSizeBinary(const UA_ServerState *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_SERVERSTATE]);
 }
 static UA_INLINE UA_StatusCode
-UA_AddNodesRequest_encodeBinary(const UA_AddNodesRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_ADDNODESREQUEST], bufPos, &bufEnd, NULL, NULL);
+UA_ServerState_encodeBinary(const UA_ServerState *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_SERVERSTATE], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_AddNodesRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_AddNodesRequest *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_ADDNODESREQUEST], NULL);
+UA_ServerState_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ServerState *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_SERVERSTATE], NULL);
 }
 
-/* BrowseRequest */
+/* ServerDiagnosticsSummaryDataType */
 static UA_INLINE size_t
-UA_BrowseRequest_calcSizeBinary(const UA_BrowseRequest *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_BROWSEREQUEST]);
+UA_ServerDiagnosticsSummaryDataType_calcSizeBinary(const UA_ServerDiagnosticsSummaryDataType *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_SERVERDIAGNOSTICSSUMMARYDATATYPE]);
 }
 static UA_INLINE UA_StatusCode
-UA_BrowseRequest_encodeBinary(const UA_BrowseRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_BROWSEREQUEST], bufPos, &bufEnd, NULL, NULL);
+UA_ServerDiagnosticsSummaryDataType_encodeBinary(const UA_ServerDiagnosticsSummaryDataType *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_SERVERDIAGNOSTICSSUMMARYDATATYPE], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_BrowseRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_BrowseRequest *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_BROWSEREQUEST], NULL);
+UA_ServerDiagnosticsSummaryDataType_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ServerDiagnosticsSummaryDataType *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_SERVERDIAGNOSTICSSUMMARYDATATYPE], NULL);
 }
 
-/* WriteRequest */
+/* ServerStatusDataType */
 static UA_INLINE size_t
-UA_WriteRequest_calcSizeBinary(const UA_WriteRequest *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_WRITEREQUEST]);
+UA_ServerStatusDataType_calcSizeBinary(const UA_ServerStatusDataType *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_SERVERSTATUSDATATYPE]);
 }
 static UA_INLINE UA_StatusCode
-UA_WriteRequest_encodeBinary(const UA_WriteRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_WRITEREQUEST], bufPos, &bufEnd, NULL, NULL);
+UA_ServerStatusDataType_encodeBinary(const UA_ServerStatusDataType *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_SERVERSTATUSDATATYPE], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_WriteRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_WriteRequest *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_WRITEREQUEST], NULL);
+UA_ServerStatusDataType_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ServerStatusDataType *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_SERVERSTATUSDATATYPE], NULL);
 }
 
-/* AddNodesResponse */
+/* Range */
 static UA_INLINE size_t
-UA_AddNodesResponse_calcSizeBinary(const UA_AddNodesResponse *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_ADDNODESRESPONSE]);
+UA_Range_calcSizeBinary(const UA_Range *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_RANGE]);
 }
 static UA_INLINE UA_StatusCode
-UA_AddNodesResponse_encodeBinary(const UA_AddNodesResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_ADDNODESRESPONSE], bufPos, &bufEnd, NULL, NULL);
+UA_Range_encodeBinary(const UA_Range *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_RANGE], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_AddNodesResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_AddNodesResponse *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_ADDNODESRESPONSE], NULL);
+UA_Range_decodeBinary(const UA_ByteString *src, size_t *offset, UA_Range *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_RANGE], NULL);
 }
 
-/* AttributeOperand */
+/* EUInformation */
 static UA_INLINE size_t
-UA_AttributeOperand_calcSizeBinary(const UA_AttributeOperand *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_ATTRIBUTEOPERAND]);
+UA_EUInformation_calcSizeBinary(const UA_EUInformation *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_EUINFORMATION]);
 }
 static UA_INLINE UA_StatusCode
-UA_AttributeOperand_encodeBinary(const UA_AttributeOperand *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_ATTRIBUTEOPERAND], bufPos, &bufEnd, NULL, NULL);
+UA_EUInformation_encodeBinary(const UA_EUInformation *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_EUINFORMATION], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_AttributeOperand_decodeBinary(const UA_ByteString *src, size_t *offset, UA_AttributeOperand *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_ATTRIBUTEOPERAND], NULL);
+UA_EUInformation_decodeBinary(const UA_ByteString *src, size_t *offset, UA_EUInformation *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_EUINFORMATION], NULL);
 }
 
-/* DataChangeFilter */
+/* AxisScaleEnumeration */
 static UA_INLINE size_t
-UA_DataChangeFilter_calcSizeBinary(const UA_DataChangeFilter *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_DATACHANGEFILTER]);
+UA_AxisScaleEnumeration_calcSizeBinary(const UA_AxisScaleEnumeration *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_AXISSCALEENUMERATION]);
 }
 static UA_INLINE UA_StatusCode
-UA_DataChangeFilter_encodeBinary(const UA_DataChangeFilter *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_DATACHANGEFILTER], bufPos, &bufEnd, NULL, NULL);
+UA_AxisScaleEnumeration_encodeBinary(const UA_AxisScaleEnumeration *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_AXISSCALEENUMERATION], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_DataChangeFilter_decodeBinary(const UA_ByteString *src, size_t *offset, UA_DataChangeFilter *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_DATACHANGEFILTER], NULL);
+UA_AxisScaleEnumeration_decodeBinary(const UA_ByteString *src, size_t *offset, UA_AxisScaleEnumeration *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_AXISSCALEENUMERATION], NULL);
 }
 
-/* EndpointDescription */
+/* ComplexNumberType */
 static UA_INLINE size_t
-UA_EndpointDescription_calcSizeBinary(const UA_EndpointDescription *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_ENDPOINTDESCRIPTION]);
+UA_ComplexNumberType_calcSizeBinary(const UA_ComplexNumberType *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_COMPLEXNUMBERTYPE]);
 }
 static UA_INLINE UA_StatusCode
-UA_EndpointDescription_encodeBinary(const UA_EndpointDescription *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_ENDPOINTDESCRIPTION], bufPos, &bufEnd, NULL, NULL);
+UA_ComplexNumberType_encodeBinary(const UA_ComplexNumberType *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_COMPLEXNUMBERTYPE], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_EndpointDescription_decodeBinary(const UA_ByteString *src, size_t *offset, UA_EndpointDescription *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_ENDPOINTDESCRIPTION], NULL);
+UA_ComplexNumberType_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ComplexNumberType *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_COMPLEXNUMBERTYPE], NULL);
 }
 
-/* DeleteReferencesRequest */
+/* DoubleComplexNumberType */
 static UA_INLINE size_t
-UA_DeleteReferencesRequest_calcSizeBinary(const UA_DeleteReferencesRequest *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_DELETEREFERENCESREQUEST]);
+UA_DoubleComplexNumberType_calcSizeBinary(const UA_DoubleComplexNumberType *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_DOUBLECOMPLEXNUMBERTYPE]);
 }
 static UA_INLINE UA_StatusCode
-UA_DeleteReferencesRequest_encodeBinary(const UA_DeleteReferencesRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_DELETEREFERENCESREQUEST], bufPos, &bufEnd, NULL, NULL);
+UA_DoubleComplexNumberType_encodeBinary(const UA_DoubleComplexNumberType *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_DOUBLECOMPLEXNUMBERTYPE], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_DeleteReferencesRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_DeleteReferencesRequest *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_DELETEREFERENCESREQUEST], NULL);
+UA_DoubleComplexNumberType_decodeBinary(const UA_ByteString *src, size_t *offset, UA_DoubleComplexNumberType *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_DOUBLECOMPLEXNUMBERTYPE], NULL);
 }
 
-/* TranslateBrowsePathsToNodeIdsRequest */
+/* AxisInformation */
 static UA_INLINE size_t
-UA_TranslateBrowsePathsToNodeIdsRequest_calcSizeBinary(const UA_TranslateBrowsePathsToNodeIdsRequest *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_TRANSLATEBROWSEPATHSTONODEIDSREQUEST]);
+UA_AxisInformation_calcSizeBinary(const UA_AxisInformation *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_AXISINFORMATION]);
 }
 static UA_INLINE UA_StatusCode
-UA_TranslateBrowsePathsToNodeIdsRequest_encodeBinary(const UA_TranslateBrowsePathsToNodeIdsRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_TRANSLATEBROWSEPATHSTONODEIDSREQUEST], bufPos, &bufEnd, NULL, NULL);
+UA_AxisInformation_encodeBinary(const UA_AxisInformation *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_AXISINFORMATION], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_TranslateBrowsePathsToNodeIdsRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_TranslateBrowsePathsToNodeIdsRequest *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_TRANSLATEBROWSEPATHSTONODEIDSREQUEST], NULL);
+UA_AxisInformation_decodeBinary(const UA_ByteString *src, size_t *offset, UA_AxisInformation *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_AXISINFORMATION], NULL);
 }
 
-/* FindServersResponse */
+/* XVType */
 static UA_INLINE size_t
-UA_FindServersResponse_calcSizeBinary(const UA_FindServersResponse *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_FINDSERVERSRESPONSE]);
+UA_XVType_calcSizeBinary(const UA_XVType *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_XVTYPE]);
 }
 static UA_INLINE UA_StatusCode
-UA_FindServersResponse_encodeBinary(const UA_FindServersResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_FINDSERVERSRESPONSE], bufPos, &bufEnd, NULL, NULL);
+UA_XVType_encodeBinary(const UA_XVType *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_XVTYPE], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_FindServersResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_FindServersResponse *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_FINDSERVERSRESPONSE], NULL);
+UA_XVType_decodeBinary(const UA_ByteString *src, size_t *offset, UA_XVType *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_XVTYPE], NULL);
 }
 
-/* CreateSessionRequest */
+/* EnumDefinition */
 static UA_INLINE size_t
-UA_CreateSessionRequest_calcSizeBinary(const UA_CreateSessionRequest *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_CREATESESSIONREQUEST]);
+UA_EnumDefinition_calcSizeBinary(const UA_EnumDefinition *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_ENUMDEFINITION]);
 }
 static UA_INLINE UA_StatusCode
-UA_CreateSessionRequest_encodeBinary(const UA_CreateSessionRequest *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_CREATESESSIONREQUEST], bufPos, &bufEnd, NULL, NULL);
+UA_EnumDefinition_encodeBinary(const UA_EnumDefinition *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_ENUMDEFINITION], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_CreateSessionRequest_decodeBinary(const UA_ByteString *src, size_t *offset, UA_CreateSessionRequest *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_CREATESESSIONREQUEST], NULL);
+UA_EnumDefinition_decodeBinary(const UA_ByteString *src, size_t *offset, UA_EnumDefinition *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_ENUMDEFINITION], NULL);
 }
 
-/* ContentFilterElement */
+/* ReadEventDetails */
 static UA_INLINE size_t
-UA_ContentFilterElement_calcSizeBinary(const UA_ContentFilterElement *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_CONTENTFILTERELEMENT]);
+UA_ReadEventDetails_calcSizeBinary(const UA_ReadEventDetails *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_READEVENTDETAILS]);
 }
 static UA_INLINE UA_StatusCode
-UA_ContentFilterElement_encodeBinary(const UA_ContentFilterElement *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_CONTENTFILTERELEMENT], bufPos, &bufEnd, NULL, NULL);
+UA_ReadEventDetails_encodeBinary(const UA_ReadEventDetails *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_READEVENTDETAILS], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_ContentFilterElement_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ContentFilterElement *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_CONTENTFILTERELEMENT], NULL);
+UA_ReadEventDetails_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ReadEventDetails *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_READEVENTDETAILS], NULL);
 }
 
-/* TranslateBrowsePathsToNodeIdsResponse */
+/* ReadProcessedDetails */
 static UA_INLINE size_t
-UA_TranslateBrowsePathsToNodeIdsResponse_calcSizeBinary(const UA_TranslateBrowsePathsToNodeIdsResponse *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_TRANSLATEBROWSEPATHSTONODEIDSRESPONSE]);
+UA_ReadProcessedDetails_calcSizeBinary(const UA_ReadProcessedDetails *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_READPROCESSEDDETAILS]);
 }
 static UA_INLINE UA_StatusCode
-UA_TranslateBrowsePathsToNodeIdsResponse_encodeBinary(const UA_TranslateBrowsePathsToNodeIdsResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_TRANSLATEBROWSEPATHSTONODEIDSRESPONSE], bufPos, &bufEnd, NULL, NULL);
+UA_ReadProcessedDetails_encodeBinary(const UA_ReadProcessedDetails *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_READPROCESSEDDETAILS], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_TranslateBrowsePathsToNodeIdsResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_TranslateBrowsePathsToNodeIdsResponse *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_TRANSLATEBROWSEPATHSTONODEIDSRESPONSE], NULL);
+UA_ReadProcessedDetails_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ReadProcessedDetails *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_READPROCESSEDDETAILS], NULL);
 }
 
-/* BrowseResponse */
+/* ModificationInfo */
 static UA_INLINE size_t
-UA_BrowseResponse_calcSizeBinary(const UA_BrowseResponse *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_BROWSERESPONSE]);
+UA_ModificationInfo_calcSizeBinary(const UA_ModificationInfo *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_MODIFICATIONINFO]);
 }
 static UA_INLINE UA_StatusCode
-UA_BrowseResponse_encodeBinary(const UA_BrowseResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_BROWSERESPONSE], bufPos, &bufEnd, NULL, NULL);
+UA_ModificationInfo_encodeBinary(const UA_ModificationInfo *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_MODIFICATIONINFO], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_BrowseResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_BrowseResponse *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_BROWSERESPONSE], NULL);
+UA_ModificationInfo_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ModificationInfo *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_MODIFICATIONINFO], NULL);
 }
 
-/* CreateSessionResponse */
+/* HistoryModifiedData */
 static UA_INLINE size_t
-UA_CreateSessionResponse_calcSizeBinary(const UA_CreateSessionResponse *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_CREATESESSIONRESPONSE]);
+UA_HistoryModifiedData_calcSizeBinary(const UA_HistoryModifiedData *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_HISTORYMODIFIEDDATA]);
 }
 static UA_INLINE UA_StatusCode
-UA_CreateSessionResponse_encodeBinary(const UA_CreateSessionResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_CREATESESSIONRESPONSE], bufPos, &bufEnd, NULL, NULL);
+UA_HistoryModifiedData_encodeBinary(const UA_HistoryModifiedData *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_HISTORYMODIFIEDDATA], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_CreateSessionResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_CreateSessionResponse *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_CREATESESSIONRESPONSE], NULL);
+UA_HistoryModifiedData_decodeBinary(const UA_ByteString *src, size_t *offset, UA_HistoryModifiedData *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_HISTORYMODIFIEDDATA], NULL);
 }
 
-/* ContentFilter */
+/* HistoryEvent */
 static UA_INLINE size_t
-UA_ContentFilter_calcSizeBinary(const UA_ContentFilter *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_CONTENTFILTER]);
+UA_HistoryEvent_calcSizeBinary(const UA_HistoryEvent *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_HISTORYEVENT]);
 }
 static UA_INLINE UA_StatusCode
-UA_ContentFilter_encodeBinary(const UA_ContentFilter *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_CONTENTFILTER], bufPos, &bufEnd, NULL, NULL);
+UA_HistoryEvent_encodeBinary(const UA_HistoryEvent *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_HISTORYEVENT], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_ContentFilter_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ContentFilter *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_CONTENTFILTER], NULL);
+UA_HistoryEvent_decodeBinary(const UA_ByteString *src, size_t *offset, UA_HistoryEvent *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_HISTORYEVENT], NULL);
 }
 
-/* GetEndpointsResponse */
+/* DataChangeNotification */
 static UA_INLINE size_t
-UA_GetEndpointsResponse_calcSizeBinary(const UA_GetEndpointsResponse *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_GETENDPOINTSRESPONSE]);
+UA_DataChangeNotification_calcSizeBinary(const UA_DataChangeNotification *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_DATACHANGENOTIFICATION]);
 }
 static UA_INLINE UA_StatusCode
-UA_GetEndpointsResponse_encodeBinary(const UA_GetEndpointsResponse *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_GETENDPOINTSRESPONSE], bufPos, &bufEnd, NULL, NULL);
+UA_DataChangeNotification_encodeBinary(const UA_DataChangeNotification *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_DATACHANGENOTIFICATION], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_GetEndpointsResponse_decodeBinary(const UA_ByteString *src, size_t *offset, UA_GetEndpointsResponse *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_GETENDPOINTSRESPONSE], NULL);
+UA_DataChangeNotification_decodeBinary(const UA_ByteString *src, size_t *offset, UA_DataChangeNotification *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_DATACHANGENOTIFICATION], NULL);
 }
 
-/* EventFilter */
+/* EventNotificationList */
 static UA_INLINE size_t
-UA_EventFilter_calcSizeBinary(const UA_EventFilter *src) {
-    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_EVENTFILTER]);
+UA_EventNotificationList_calcSizeBinary(const UA_EventNotificationList *src) {
+    return UA_calcSizeBinary(src, &UA_TYPES[UA_TYPES_EVENTNOTIFICATIONLIST]);
 }
 static UA_INLINE UA_StatusCode
-UA_EventFilter_encodeBinary(const UA_EventFilter *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_EVENTFILTER], bufPos, &bufEnd, NULL, NULL);
+UA_EventNotificationList_encodeBinary(const UA_EventNotificationList *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TYPES[UA_TYPES_EVENTNOTIFICATIONLIST], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_EventFilter_decodeBinary(const UA_ByteString *src, size_t *offset, UA_EventFilter *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_EVENTFILTER], NULL);
+UA_EventNotificationList_decodeBinary(const UA_ByteString *src, size_t *offset, UA_EventNotificationList *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TYPES[UA_TYPES_EVENTNOTIFICATIONLIST], NULL);
 }
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/build/src_generated/open62541/transport_generated.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/build/src_generated/open62541/transport_generated.h" ***********************************/
 
-/* Generated from Opc.Ua.Types.bsd, Custom.Opc.Ua.Transport.bsd with script /home/jvoe/open62541/tools/generate_datatypes.py
- * on host rigel by user jvoe at 2020-09-09 11:33:50 */
+/* Generated from Opc.Ua.Types.bsd, Custom.Opc.Ua.Transport.bsd with script /home/pdie/sonstiges/qtopcua/repos/open62541/tools/generate_datatypes.py
+ * on host mintaka by user pdie at 2021-06-21 11:34:37 */
 
 
 #ifdef UA_ENABLE_AMALGAMATION
@@ -3672,32 +3952,6 @@ _UA_BEGIN_DECLS
 extern UA_EXPORT const UA_DataType UA_TRANSPORT[UA_TRANSPORT_COUNT];
 
 /**
- * TcpHelloMessage
- * ^^^^^^^^^^^^^^^
- * Hello Message */
-typedef struct {
-    UA_UInt32 protocolVersion;
-    UA_UInt32 receiveBufferSize;
-    UA_UInt32 sendBufferSize;
-    UA_UInt32 maxMessageSize;
-    UA_UInt32 maxChunkCount;
-    UA_String endpointUrl;
-} UA_TcpHelloMessage;
-
-#define UA_TRANSPORT_TCPHELLOMESSAGE 0
-
-/**
- * TcpErrorMessage
- * ^^^^^^^^^^^^^^^
- * Error Message */
-typedef struct {
-    UA_UInt32 error;
-    UA_String reason;
-} UA_TcpErrorMessage;
-
-#define UA_TRANSPORT_TCPERRORMESSAGE 1
-
-/**
  * MessageType
  * ^^^^^^^^^^^
  * Message Type and whether the message contains an intermediate chunk */
@@ -3712,19 +3966,47 @@ typedef enum {
 } UA_MessageType;
 UA_STATIC_ASSERT(sizeof(UA_MessageType) == sizeof(UA_Int32), enum_must_be_32bit);
 
-#define UA_TRANSPORT_MESSAGETYPE 2
+#define UA_TRANSPORT_MESSAGETYPE 0
 
 /**
- * AsymmetricAlgorithmSecurityHeader
- * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- * Security Header */
+ * ChunkType
+ * ^^^^^^^^^
+ * Type of the chunk */
+typedef enum {
+    UA_CHUNKTYPE_FINAL = 0x46000000,
+    UA_CHUNKTYPE_INTERMEDIATE = 0x43000000,
+    UA_CHUNKTYPE_ABORT = 0x41000000,
+    __UA_CHUNKTYPE_FORCE32BIT = 0x7fffffff
+} UA_ChunkType;
+UA_STATIC_ASSERT(sizeof(UA_ChunkType) == sizeof(UA_Int32), enum_must_be_32bit);
+
+#define UA_TRANSPORT_CHUNKTYPE 1
+
+/**
+ * TcpMessageHeader
+ * ^^^^^^^^^^^^^^^^
+ * TCP Header */
 typedef struct {
-    UA_ByteString securityPolicyUri;
-    UA_ByteString senderCertificate;
-    UA_ByteString receiverCertificateThumbprint;
-} UA_AsymmetricAlgorithmSecurityHeader;
+    UA_UInt32 messageTypeAndChunkType;
+    UA_UInt32 messageSize;
+} UA_TcpMessageHeader;
+
+#define UA_TRANSPORT_TCPMESSAGEHEADER 2
+
+/**
+ * TcpHelloMessage
+ * ^^^^^^^^^^^^^^^
+ * Hello Message */
+typedef struct {
+    UA_UInt32 protocolVersion;
+    UA_UInt32 receiveBufferSize;
+    UA_UInt32 sendBufferSize;
+    UA_UInt32 maxMessageSize;
+    UA_UInt32 maxChunkCount;
+    UA_String endpointUrl;
+} UA_TcpHelloMessage;
 
-#define UA_TRANSPORT_ASYMMETRICALGORITHMSECURITYHEADER 3
+#define UA_TRANSPORT_TCPHELLOMESSAGE 3
 
 /**
  * TcpAcknowledgeMessage
@@ -3741,49 +4023,47 @@ typedef struct {
 #define UA_TRANSPORT_TCPACKNOWLEDGEMESSAGE 4
 
 /**
- * SequenceHeader
- * ^^^^^^^^^^^^^^
- * Secure Layer Sequence Header */
+ * TcpErrorMessage
+ * ^^^^^^^^^^^^^^^
+ * Error Message */
 typedef struct {
-    UA_UInt32 sequenceNumber;
-    UA_UInt32 requestId;
-} UA_SequenceHeader;
+    UA_UInt32 error;
+    UA_String reason;
+} UA_TcpErrorMessage;
 
-#define UA_TRANSPORT_SEQUENCEHEADER 5
+#define UA_TRANSPORT_TCPERRORMESSAGE 5
 
 /**
- * TcpMessageHeader
- * ^^^^^^^^^^^^^^^^
- * TCP Header */
+ * AsymmetricAlgorithmSecurityHeader
+ * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ * Security Header */
 typedef struct {
-    UA_UInt32 messageTypeAndChunkType;
-    UA_UInt32 messageSize;
-} UA_TcpMessageHeader;
+    UA_ByteString securityPolicyUri;
+    UA_ByteString senderCertificate;
+    UA_ByteString receiverCertificateThumbprint;
+} UA_AsymmetricAlgorithmSecurityHeader;
 
-#define UA_TRANSPORT_TCPMESSAGEHEADER 6
+#define UA_TRANSPORT_ASYMMETRICALGORITHMSECURITYHEADER 6
 
 /**
- * ChunkType
- * ^^^^^^^^^
- * Type of the chunk */
-typedef enum {
-    UA_CHUNKTYPE_FINAL = 0x46000000,
-    UA_CHUNKTYPE_INTERMEDIATE = 0x43000000,
-    UA_CHUNKTYPE_ABORT = 0x41000000,
-    __UA_CHUNKTYPE_FORCE32BIT = 0x7fffffff
-} UA_ChunkType;
-UA_STATIC_ASSERT(sizeof(UA_ChunkType) == sizeof(UA_Int32), enum_must_be_32bit);
+ * SequenceHeader
+ * ^^^^^^^^^^^^^^
+ * Secure Layer Sequence Header */
+typedef struct {
+    UA_UInt32 sequenceNumber;
+    UA_UInt32 requestId;
+} UA_SequenceHeader;
 
-#define UA_TRANSPORT_CHUNKTYPE 7
+#define UA_TRANSPORT_SEQUENCEHEADER 7
 
 
 _UA_END_DECLS
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/build/src_generated/open62541/transport_generated_handling.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/build/src_generated/open62541/transport_generated_handling.h" ***********************************/
 
-/* Generated from Opc.Ua.Types.bsd, Custom.Opc.Ua.Transport.bsd with script /home/jvoe/open62541/tools/generate_datatypes.py
- * on host rigel by user jvoe at 2020-09-09 11:33:50 */
+/* Generated from Opc.Ua.Types.bsd, Custom.Opc.Ua.Transport.bsd with script /home/pdie/sonstiges/qtopcua/repos/open62541/tools/generate_datatypes.py
+ * on host mintaka by user pdie at 2021-06-21 11:34:37 */
 
 
 
@@ -3796,128 +4076,128 @@ _UA_BEGIN_DECLS
 #endif
 
 
-/* TcpHelloMessage */
+/* MessageType */
 static UA_INLINE void
-UA_TcpHelloMessage_init(UA_TcpHelloMessage *p) {
-    memset(p, 0, sizeof(UA_TcpHelloMessage));
+UA_MessageType_init(UA_MessageType *p) {
+    memset(p, 0, sizeof(UA_MessageType));
 }
 
-static UA_INLINE UA_TcpHelloMessage *
-UA_TcpHelloMessage_new(void) {
-    return (UA_TcpHelloMessage*)UA_new(&UA_TRANSPORT[UA_TRANSPORT_TCPHELLOMESSAGE]);
+static UA_INLINE UA_MessageType *
+UA_MessageType_new(void) {
+    return (UA_MessageType*)UA_new(&UA_TRANSPORT[UA_TRANSPORT_MESSAGETYPE]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_TcpHelloMessage_copy(const UA_TcpHelloMessage *src, UA_TcpHelloMessage *dst) {
-    return UA_copy(src, dst, &UA_TRANSPORT[UA_TRANSPORT_TCPHELLOMESSAGE]);
+UA_MessageType_copy(const UA_MessageType *src, UA_MessageType *dst) {
+    return UA_copy(src, dst, &UA_TRANSPORT[UA_TRANSPORT_MESSAGETYPE]);
 }
 
 static UA_INLINE void
-UA_TcpHelloMessage_deleteMembers(UA_TcpHelloMessage *p) {
-    UA_clear(p, &UA_TRANSPORT[UA_TRANSPORT_TCPHELLOMESSAGE]);
+UA_MessageType_deleteMembers(UA_MessageType *p) {
+    UA_clear(p, &UA_TRANSPORT[UA_TRANSPORT_MESSAGETYPE]);
 }
 
 static UA_INLINE void
-UA_TcpHelloMessage_clear(UA_TcpHelloMessage *p) {
-    UA_clear(p, &UA_TRANSPORT[UA_TRANSPORT_TCPHELLOMESSAGE]);
+UA_MessageType_clear(UA_MessageType *p) {
+    UA_clear(p, &UA_TRANSPORT[UA_TRANSPORT_MESSAGETYPE]);
 }
 
 static UA_INLINE void
-UA_TcpHelloMessage_delete(UA_TcpHelloMessage *p) {
-    UA_delete(p, &UA_TRANSPORT[UA_TRANSPORT_TCPHELLOMESSAGE]);
+UA_MessageType_delete(UA_MessageType *p) {
+    UA_delete(p, &UA_TRANSPORT[UA_TRANSPORT_MESSAGETYPE]);
 }
 
-/* TcpErrorMessage */
+/* ChunkType */
 static UA_INLINE void
-UA_TcpErrorMessage_init(UA_TcpErrorMessage *p) {
-    memset(p, 0, sizeof(UA_TcpErrorMessage));
+UA_ChunkType_init(UA_ChunkType *p) {
+    memset(p, 0, sizeof(UA_ChunkType));
 }
 
-static UA_INLINE UA_TcpErrorMessage *
-UA_TcpErrorMessage_new(void) {
-    return (UA_TcpErrorMessage*)UA_new(&UA_TRANSPORT[UA_TRANSPORT_TCPERRORMESSAGE]);
+static UA_INLINE UA_ChunkType *
+UA_ChunkType_new(void) {
+    return (UA_ChunkType*)UA_new(&UA_TRANSPORT[UA_TRANSPORT_CHUNKTYPE]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_TcpErrorMessage_copy(const UA_TcpErrorMessage *src, UA_TcpErrorMessage *dst) {
-    return UA_copy(src, dst, &UA_TRANSPORT[UA_TRANSPORT_TCPERRORMESSAGE]);
+UA_ChunkType_copy(const UA_ChunkType *src, UA_ChunkType *dst) {
+    return UA_copy(src, dst, &UA_TRANSPORT[UA_TRANSPORT_CHUNKTYPE]);
 }
 
 static UA_INLINE void
-UA_TcpErrorMessage_deleteMembers(UA_TcpErrorMessage *p) {
-    UA_clear(p, &UA_TRANSPORT[UA_TRANSPORT_TCPERRORMESSAGE]);
+UA_ChunkType_deleteMembers(UA_ChunkType *p) {
+    UA_clear(p, &UA_TRANSPORT[UA_TRANSPORT_CHUNKTYPE]);
 }
 
 static UA_INLINE void
-UA_TcpErrorMessage_clear(UA_TcpErrorMessage *p) {
-    UA_clear(p, &UA_TRANSPORT[UA_TRANSPORT_TCPERRORMESSAGE]);
+UA_ChunkType_clear(UA_ChunkType *p) {
+    UA_clear(p, &UA_TRANSPORT[UA_TRANSPORT_CHUNKTYPE]);
 }
 
 static UA_INLINE void
-UA_TcpErrorMessage_delete(UA_TcpErrorMessage *p) {
-    UA_delete(p, &UA_TRANSPORT[UA_TRANSPORT_TCPERRORMESSAGE]);
+UA_ChunkType_delete(UA_ChunkType *p) {
+    UA_delete(p, &UA_TRANSPORT[UA_TRANSPORT_CHUNKTYPE]);
 }
 
-/* MessageType */
+/* TcpMessageHeader */
 static UA_INLINE void
-UA_MessageType_init(UA_MessageType *p) {
-    memset(p, 0, sizeof(UA_MessageType));
+UA_TcpMessageHeader_init(UA_TcpMessageHeader *p) {
+    memset(p, 0, sizeof(UA_TcpMessageHeader));
 }
 
-static UA_INLINE UA_MessageType *
-UA_MessageType_new(void) {
-    return (UA_MessageType*)UA_new(&UA_TRANSPORT[UA_TRANSPORT_MESSAGETYPE]);
+static UA_INLINE UA_TcpMessageHeader *
+UA_TcpMessageHeader_new(void) {
+    return (UA_TcpMessageHeader*)UA_new(&UA_TRANSPORT[UA_TRANSPORT_TCPMESSAGEHEADER]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_MessageType_copy(const UA_MessageType *src, UA_MessageType *dst) {
-    return UA_copy(src, dst, &UA_TRANSPORT[UA_TRANSPORT_MESSAGETYPE]);
+UA_TcpMessageHeader_copy(const UA_TcpMessageHeader *src, UA_TcpMessageHeader *dst) {
+    return UA_copy(src, dst, &UA_TRANSPORT[UA_TRANSPORT_TCPMESSAGEHEADER]);
 }
 
 static UA_INLINE void
-UA_MessageType_deleteMembers(UA_MessageType *p) {
-    UA_clear(p, &UA_TRANSPORT[UA_TRANSPORT_MESSAGETYPE]);
+UA_TcpMessageHeader_deleteMembers(UA_TcpMessageHeader *p) {
+    UA_clear(p, &UA_TRANSPORT[UA_TRANSPORT_TCPMESSAGEHEADER]);
 }
 
 static UA_INLINE void
-UA_MessageType_clear(UA_MessageType *p) {
-    UA_clear(p, &UA_TRANSPORT[UA_TRANSPORT_MESSAGETYPE]);
+UA_TcpMessageHeader_clear(UA_TcpMessageHeader *p) {
+    UA_clear(p, &UA_TRANSPORT[UA_TRANSPORT_TCPMESSAGEHEADER]);
 }
 
 static UA_INLINE void
-UA_MessageType_delete(UA_MessageType *p) {
-    UA_delete(p, &UA_TRANSPORT[UA_TRANSPORT_MESSAGETYPE]);
+UA_TcpMessageHeader_delete(UA_TcpMessageHeader *p) {
+    UA_delete(p, &UA_TRANSPORT[UA_TRANSPORT_TCPMESSAGEHEADER]);
 }
 
-/* AsymmetricAlgorithmSecurityHeader */
+/* TcpHelloMessage */
 static UA_INLINE void
-UA_AsymmetricAlgorithmSecurityHeader_init(UA_AsymmetricAlgorithmSecurityHeader *p) {
-    memset(p, 0, sizeof(UA_AsymmetricAlgorithmSecurityHeader));
+UA_TcpHelloMessage_init(UA_TcpHelloMessage *p) {
+    memset(p, 0, sizeof(UA_TcpHelloMessage));
 }
 
-static UA_INLINE UA_AsymmetricAlgorithmSecurityHeader *
-UA_AsymmetricAlgorithmSecurityHeader_new(void) {
-    return (UA_AsymmetricAlgorithmSecurityHeader*)UA_new(&UA_TRANSPORT[UA_TRANSPORT_ASYMMETRICALGORITHMSECURITYHEADER]);
+static UA_INLINE UA_TcpHelloMessage *
+UA_TcpHelloMessage_new(void) {
+    return (UA_TcpHelloMessage*)UA_new(&UA_TRANSPORT[UA_TRANSPORT_TCPHELLOMESSAGE]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_AsymmetricAlgorithmSecurityHeader_copy(const UA_AsymmetricAlgorithmSecurityHeader *src, UA_AsymmetricAlgorithmSecurityHeader *dst) {
-    return UA_copy(src, dst, &UA_TRANSPORT[UA_TRANSPORT_ASYMMETRICALGORITHMSECURITYHEADER]);
+UA_TcpHelloMessage_copy(const UA_TcpHelloMessage *src, UA_TcpHelloMessage *dst) {
+    return UA_copy(src, dst, &UA_TRANSPORT[UA_TRANSPORT_TCPHELLOMESSAGE]);
 }
 
 static UA_INLINE void
-UA_AsymmetricAlgorithmSecurityHeader_deleteMembers(UA_AsymmetricAlgorithmSecurityHeader *p) {
-    UA_clear(p, &UA_TRANSPORT[UA_TRANSPORT_ASYMMETRICALGORITHMSECURITYHEADER]);
+UA_TcpHelloMessage_deleteMembers(UA_TcpHelloMessage *p) {
+    UA_clear(p, &UA_TRANSPORT[UA_TRANSPORT_TCPHELLOMESSAGE]);
 }
 
 static UA_INLINE void
-UA_AsymmetricAlgorithmSecurityHeader_clear(UA_AsymmetricAlgorithmSecurityHeader *p) {
-    UA_clear(p, &UA_TRANSPORT[UA_TRANSPORT_ASYMMETRICALGORITHMSECURITYHEADER]);
+UA_TcpHelloMessage_clear(UA_TcpHelloMessage *p) {
+    UA_clear(p, &UA_TRANSPORT[UA_TRANSPORT_TCPHELLOMESSAGE]);
 }
 
 static UA_INLINE void
-UA_AsymmetricAlgorithmSecurityHeader_delete(UA_AsymmetricAlgorithmSecurityHeader *p) {
-    UA_delete(p, &UA_TRANSPORT[UA_TRANSPORT_ASYMMETRICALGORITHMSECURITYHEADER]);
+UA_TcpHelloMessage_delete(UA_TcpHelloMessage *p) {
+    UA_delete(p, &UA_TRANSPORT[UA_TRANSPORT_TCPHELLOMESSAGE]);
 }
 
 /* TcpAcknowledgeMessage */
@@ -3951,97 +4231,97 @@ UA_TcpAcknowledgeMessage_delete(UA_TcpAcknowledgeMessage *p) {
     UA_delete(p, &UA_TRANSPORT[UA_TRANSPORT_TCPACKNOWLEDGEMESSAGE]);
 }
 
-/* SequenceHeader */
+/* TcpErrorMessage */
 static UA_INLINE void
-UA_SequenceHeader_init(UA_SequenceHeader *p) {
-    memset(p, 0, sizeof(UA_SequenceHeader));
+UA_TcpErrorMessage_init(UA_TcpErrorMessage *p) {
+    memset(p, 0, sizeof(UA_TcpErrorMessage));
 }
 
-static UA_INLINE UA_SequenceHeader *
-UA_SequenceHeader_new(void) {
-    return (UA_SequenceHeader*)UA_new(&UA_TRANSPORT[UA_TRANSPORT_SEQUENCEHEADER]);
+static UA_INLINE UA_TcpErrorMessage *
+UA_TcpErrorMessage_new(void) {
+    return (UA_TcpErrorMessage*)UA_new(&UA_TRANSPORT[UA_TRANSPORT_TCPERRORMESSAGE]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_SequenceHeader_copy(const UA_SequenceHeader *src, UA_SequenceHeader *dst) {
-    return UA_copy(src, dst, &UA_TRANSPORT[UA_TRANSPORT_SEQUENCEHEADER]);
+UA_TcpErrorMessage_copy(const UA_TcpErrorMessage *src, UA_TcpErrorMessage *dst) {
+    return UA_copy(src, dst, &UA_TRANSPORT[UA_TRANSPORT_TCPERRORMESSAGE]);
 }
 
 static UA_INLINE void
-UA_SequenceHeader_deleteMembers(UA_SequenceHeader *p) {
-    UA_clear(p, &UA_TRANSPORT[UA_TRANSPORT_SEQUENCEHEADER]);
+UA_TcpErrorMessage_deleteMembers(UA_TcpErrorMessage *p) {
+    UA_clear(p, &UA_TRANSPORT[UA_TRANSPORT_TCPERRORMESSAGE]);
 }
 
 static UA_INLINE void
-UA_SequenceHeader_clear(UA_SequenceHeader *p) {
-    UA_clear(p, &UA_TRANSPORT[UA_TRANSPORT_SEQUENCEHEADER]);
+UA_TcpErrorMessage_clear(UA_TcpErrorMessage *p) {
+    UA_clear(p, &UA_TRANSPORT[UA_TRANSPORT_TCPERRORMESSAGE]);
 }
 
 static UA_INLINE void
-UA_SequenceHeader_delete(UA_SequenceHeader *p) {
-    UA_delete(p, &UA_TRANSPORT[UA_TRANSPORT_SEQUENCEHEADER]);
+UA_TcpErrorMessage_delete(UA_TcpErrorMessage *p) {
+    UA_delete(p, &UA_TRANSPORT[UA_TRANSPORT_TCPERRORMESSAGE]);
 }
 
-/* TcpMessageHeader */
+/* AsymmetricAlgorithmSecurityHeader */
 static UA_INLINE void
-UA_TcpMessageHeader_init(UA_TcpMessageHeader *p) {
-    memset(p, 0, sizeof(UA_TcpMessageHeader));
+UA_AsymmetricAlgorithmSecurityHeader_init(UA_AsymmetricAlgorithmSecurityHeader *p) {
+    memset(p, 0, sizeof(UA_AsymmetricAlgorithmSecurityHeader));
 }
 
-static UA_INLINE UA_TcpMessageHeader *
-UA_TcpMessageHeader_new(void) {
-    return (UA_TcpMessageHeader*)UA_new(&UA_TRANSPORT[UA_TRANSPORT_TCPMESSAGEHEADER]);
+static UA_INLINE UA_AsymmetricAlgorithmSecurityHeader *
+UA_AsymmetricAlgorithmSecurityHeader_new(void) {
+    return (UA_AsymmetricAlgorithmSecurityHeader*)UA_new(&UA_TRANSPORT[UA_TRANSPORT_ASYMMETRICALGORITHMSECURITYHEADER]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_TcpMessageHeader_copy(const UA_TcpMessageHeader *src, UA_TcpMessageHeader *dst) {
-    return UA_copy(src, dst, &UA_TRANSPORT[UA_TRANSPORT_TCPMESSAGEHEADER]);
+UA_AsymmetricAlgorithmSecurityHeader_copy(const UA_AsymmetricAlgorithmSecurityHeader *src, UA_AsymmetricAlgorithmSecurityHeader *dst) {
+    return UA_copy(src, dst, &UA_TRANSPORT[UA_TRANSPORT_ASYMMETRICALGORITHMSECURITYHEADER]);
 }
 
 static UA_INLINE void
-UA_TcpMessageHeader_deleteMembers(UA_TcpMessageHeader *p) {
-    UA_clear(p, &UA_TRANSPORT[UA_TRANSPORT_TCPMESSAGEHEADER]);
+UA_AsymmetricAlgorithmSecurityHeader_deleteMembers(UA_AsymmetricAlgorithmSecurityHeader *p) {
+    UA_clear(p, &UA_TRANSPORT[UA_TRANSPORT_ASYMMETRICALGORITHMSECURITYHEADER]);
 }
 
 static UA_INLINE void
-UA_TcpMessageHeader_clear(UA_TcpMessageHeader *p) {
-    UA_clear(p, &UA_TRANSPORT[UA_TRANSPORT_TCPMESSAGEHEADER]);
+UA_AsymmetricAlgorithmSecurityHeader_clear(UA_AsymmetricAlgorithmSecurityHeader *p) {
+    UA_clear(p, &UA_TRANSPORT[UA_TRANSPORT_ASYMMETRICALGORITHMSECURITYHEADER]);
 }
 
 static UA_INLINE void
-UA_TcpMessageHeader_delete(UA_TcpMessageHeader *p) {
-    UA_delete(p, &UA_TRANSPORT[UA_TRANSPORT_TCPMESSAGEHEADER]);
+UA_AsymmetricAlgorithmSecurityHeader_delete(UA_AsymmetricAlgorithmSecurityHeader *p) {
+    UA_delete(p, &UA_TRANSPORT[UA_TRANSPORT_ASYMMETRICALGORITHMSECURITYHEADER]);
 }
 
-/* ChunkType */
+/* SequenceHeader */
 static UA_INLINE void
-UA_ChunkType_init(UA_ChunkType *p) {
-    memset(p, 0, sizeof(UA_ChunkType));
+UA_SequenceHeader_init(UA_SequenceHeader *p) {
+    memset(p, 0, sizeof(UA_SequenceHeader));
 }
 
-static UA_INLINE UA_ChunkType *
-UA_ChunkType_new(void) {
-    return (UA_ChunkType*)UA_new(&UA_TRANSPORT[UA_TRANSPORT_CHUNKTYPE]);
+static UA_INLINE UA_SequenceHeader *
+UA_SequenceHeader_new(void) {
+    return (UA_SequenceHeader*)UA_new(&UA_TRANSPORT[UA_TRANSPORT_SEQUENCEHEADER]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_ChunkType_copy(const UA_ChunkType *src, UA_ChunkType *dst) {
-    return UA_copy(src, dst, &UA_TRANSPORT[UA_TRANSPORT_CHUNKTYPE]);
+UA_SequenceHeader_copy(const UA_SequenceHeader *src, UA_SequenceHeader *dst) {
+    return UA_copy(src, dst, &UA_TRANSPORT[UA_TRANSPORT_SEQUENCEHEADER]);
 }
 
 static UA_INLINE void
-UA_ChunkType_deleteMembers(UA_ChunkType *p) {
-    UA_clear(p, &UA_TRANSPORT[UA_TRANSPORT_CHUNKTYPE]);
+UA_SequenceHeader_deleteMembers(UA_SequenceHeader *p) {
+    UA_clear(p, &UA_TRANSPORT[UA_TRANSPORT_SEQUENCEHEADER]);
 }
 
 static UA_INLINE void
-UA_ChunkType_clear(UA_ChunkType *p) {
-    UA_clear(p, &UA_TRANSPORT[UA_TRANSPORT_CHUNKTYPE]);
+UA_SequenceHeader_clear(UA_SequenceHeader *p) {
+    UA_clear(p, &UA_TRANSPORT[UA_TRANSPORT_SEQUENCEHEADER]);
 }
 
 static UA_INLINE void
-UA_ChunkType_delete(UA_ChunkType *p) {
-    UA_delete(p, &UA_TRANSPORT[UA_TRANSPORT_CHUNKTYPE]);
+UA_SequenceHeader_delete(UA_SequenceHeader *p) {
+    UA_delete(p, &UA_TRANSPORT[UA_TRANSPORT_SEQUENCEHEADER]);
 }
 
 #if defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 6
@@ -4051,10 +4331,10 @@ UA_ChunkType_delete(UA_ChunkType *p) {
 _UA_END_DECLS
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/build/src_generated/open62541/transport_generated_encoding_binary.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/build/src_generated/open62541/transport_generated_encoding_binary.h" ***********************************/
 
-/* Generated from Opc.Ua.Types.bsd, Custom.Opc.Ua.Transport.bsd with script /home/jvoe/open62541/tools/generate_datatypes.py
- * on host rigel by user jvoe at 2020-09-09 11:33:50 */
+/* Generated from Opc.Ua.Types.bsd, Custom.Opc.Ua.Transport.bsd with script /home/pdie/sonstiges/qtopcua/repos/open62541/tools/generate_datatypes.py
+ * on host mintaka by user pdie at 2021-06-21 11:34:37 */
 
 
 #ifdef UA_ENABLE_AMALGAMATION
@@ -4063,60 +4343,60 @@ _UA_END_DECLS
 
 
 
-/* TcpHelloMessage */
+/* MessageType */
 static UA_INLINE size_t
-UA_TcpHelloMessage_calcSizeBinary(const UA_TcpHelloMessage *src) {
-    return UA_calcSizeBinary(src, &UA_TRANSPORT[UA_TRANSPORT_TCPHELLOMESSAGE]);
+UA_MessageType_calcSizeBinary(const UA_MessageType *src) {
+    return UA_calcSizeBinary(src, &UA_TRANSPORT[UA_TRANSPORT_MESSAGETYPE]);
 }
 static UA_INLINE UA_StatusCode
-UA_TcpHelloMessage_encodeBinary(const UA_TcpHelloMessage *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TRANSPORT[UA_TRANSPORT_TCPHELLOMESSAGE], bufPos, &bufEnd, NULL, NULL);
+UA_MessageType_encodeBinary(const UA_MessageType *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TRANSPORT[UA_TRANSPORT_MESSAGETYPE], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_TcpHelloMessage_decodeBinary(const UA_ByteString *src, size_t *offset, UA_TcpHelloMessage *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TRANSPORT[UA_TRANSPORT_TCPHELLOMESSAGE], NULL);
+UA_MessageType_decodeBinary(const UA_ByteString *src, size_t *offset, UA_MessageType *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TRANSPORT[UA_TRANSPORT_MESSAGETYPE], NULL);
 }
 
-/* TcpErrorMessage */
+/* ChunkType */
 static UA_INLINE size_t
-UA_TcpErrorMessage_calcSizeBinary(const UA_TcpErrorMessage *src) {
-    return UA_calcSizeBinary(src, &UA_TRANSPORT[UA_TRANSPORT_TCPERRORMESSAGE]);
+UA_ChunkType_calcSizeBinary(const UA_ChunkType *src) {
+    return UA_calcSizeBinary(src, &UA_TRANSPORT[UA_TRANSPORT_CHUNKTYPE]);
 }
 static UA_INLINE UA_StatusCode
-UA_TcpErrorMessage_encodeBinary(const UA_TcpErrorMessage *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TRANSPORT[UA_TRANSPORT_TCPERRORMESSAGE], bufPos, &bufEnd, NULL, NULL);
+UA_ChunkType_encodeBinary(const UA_ChunkType *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TRANSPORT[UA_TRANSPORT_CHUNKTYPE], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_TcpErrorMessage_decodeBinary(const UA_ByteString *src, size_t *offset, UA_TcpErrorMessage *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TRANSPORT[UA_TRANSPORT_TCPERRORMESSAGE], NULL);
+UA_ChunkType_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ChunkType *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TRANSPORT[UA_TRANSPORT_CHUNKTYPE], NULL);
 }
 
-/* MessageType */
+/* TcpMessageHeader */
 static UA_INLINE size_t
-UA_MessageType_calcSizeBinary(const UA_MessageType *src) {
-    return UA_calcSizeBinary(src, &UA_TRANSPORT[UA_TRANSPORT_MESSAGETYPE]);
+UA_TcpMessageHeader_calcSizeBinary(const UA_TcpMessageHeader *src) {
+    return UA_calcSizeBinary(src, &UA_TRANSPORT[UA_TRANSPORT_TCPMESSAGEHEADER]);
 }
 static UA_INLINE UA_StatusCode
-UA_MessageType_encodeBinary(const UA_MessageType *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TRANSPORT[UA_TRANSPORT_MESSAGETYPE], bufPos, &bufEnd, NULL, NULL);
+UA_TcpMessageHeader_encodeBinary(const UA_TcpMessageHeader *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TRANSPORT[UA_TRANSPORT_TCPMESSAGEHEADER], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_MessageType_decodeBinary(const UA_ByteString *src, size_t *offset, UA_MessageType *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TRANSPORT[UA_TRANSPORT_MESSAGETYPE], NULL);
+UA_TcpMessageHeader_decodeBinary(const UA_ByteString *src, size_t *offset, UA_TcpMessageHeader *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TRANSPORT[UA_TRANSPORT_TCPMESSAGEHEADER], NULL);
 }
 
-/* AsymmetricAlgorithmSecurityHeader */
+/* TcpHelloMessage */
 static UA_INLINE size_t
-UA_AsymmetricAlgorithmSecurityHeader_calcSizeBinary(const UA_AsymmetricAlgorithmSecurityHeader *src) {
-    return UA_calcSizeBinary(src, &UA_TRANSPORT[UA_TRANSPORT_ASYMMETRICALGORITHMSECURITYHEADER]);
+UA_TcpHelloMessage_calcSizeBinary(const UA_TcpHelloMessage *src) {
+    return UA_calcSizeBinary(src, &UA_TRANSPORT[UA_TRANSPORT_TCPHELLOMESSAGE]);
 }
 static UA_INLINE UA_StatusCode
-UA_AsymmetricAlgorithmSecurityHeader_encodeBinary(const UA_AsymmetricAlgorithmSecurityHeader *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TRANSPORT[UA_TRANSPORT_ASYMMETRICALGORITHMSECURITYHEADER], bufPos, &bufEnd, NULL, NULL);
+UA_TcpHelloMessage_encodeBinary(const UA_TcpHelloMessage *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TRANSPORT[UA_TRANSPORT_TCPHELLOMESSAGE], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_AsymmetricAlgorithmSecurityHeader_decodeBinary(const UA_ByteString *src, size_t *offset, UA_AsymmetricAlgorithmSecurityHeader *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TRANSPORT[UA_TRANSPORT_ASYMMETRICALGORITHMSECURITYHEADER], NULL);
+UA_TcpHelloMessage_decodeBinary(const UA_ByteString *src, size_t *offset, UA_TcpHelloMessage *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TRANSPORT[UA_TRANSPORT_TCPHELLOMESSAGE], NULL);
 }
 
 /* TcpAcknowledgeMessage */
@@ -4133,50 +4413,50 @@ UA_TcpAcknowledgeMessage_decodeBinary(const UA_ByteString *src, size_t *offset,
     return UA_decodeBinary(src, offset, dst, &UA_TRANSPORT[UA_TRANSPORT_TCPACKNOWLEDGEMESSAGE], NULL);
 }
 
-/* SequenceHeader */
+/* TcpErrorMessage */
 static UA_INLINE size_t
-UA_SequenceHeader_calcSizeBinary(const UA_SequenceHeader *src) {
-    return UA_calcSizeBinary(src, &UA_TRANSPORT[UA_TRANSPORT_SEQUENCEHEADER]);
+UA_TcpErrorMessage_calcSizeBinary(const UA_TcpErrorMessage *src) {
+    return UA_calcSizeBinary(src, &UA_TRANSPORT[UA_TRANSPORT_TCPERRORMESSAGE]);
 }
 static UA_INLINE UA_StatusCode
-UA_SequenceHeader_encodeBinary(const UA_SequenceHeader *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TRANSPORT[UA_TRANSPORT_SEQUENCEHEADER], bufPos, &bufEnd, NULL, NULL);
+UA_TcpErrorMessage_encodeBinary(const UA_TcpErrorMessage *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TRANSPORT[UA_TRANSPORT_TCPERRORMESSAGE], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_SequenceHeader_decodeBinary(const UA_ByteString *src, size_t *offset, UA_SequenceHeader *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TRANSPORT[UA_TRANSPORT_SEQUENCEHEADER], NULL);
+UA_TcpErrorMessage_decodeBinary(const UA_ByteString *src, size_t *offset, UA_TcpErrorMessage *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TRANSPORT[UA_TRANSPORT_TCPERRORMESSAGE], NULL);
 }
 
-/* TcpMessageHeader */
+/* AsymmetricAlgorithmSecurityHeader */
 static UA_INLINE size_t
-UA_TcpMessageHeader_calcSizeBinary(const UA_TcpMessageHeader *src) {
-    return UA_calcSizeBinary(src, &UA_TRANSPORT[UA_TRANSPORT_TCPMESSAGEHEADER]);
+UA_AsymmetricAlgorithmSecurityHeader_calcSizeBinary(const UA_AsymmetricAlgorithmSecurityHeader *src) {
+    return UA_calcSizeBinary(src, &UA_TRANSPORT[UA_TRANSPORT_ASYMMETRICALGORITHMSECURITYHEADER]);
 }
 static UA_INLINE UA_StatusCode
-UA_TcpMessageHeader_encodeBinary(const UA_TcpMessageHeader *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TRANSPORT[UA_TRANSPORT_TCPMESSAGEHEADER], bufPos, &bufEnd, NULL, NULL);
+UA_AsymmetricAlgorithmSecurityHeader_encodeBinary(const UA_AsymmetricAlgorithmSecurityHeader *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TRANSPORT[UA_TRANSPORT_ASYMMETRICALGORITHMSECURITYHEADER], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_TcpMessageHeader_decodeBinary(const UA_ByteString *src, size_t *offset, UA_TcpMessageHeader *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TRANSPORT[UA_TRANSPORT_TCPMESSAGEHEADER], NULL);
+UA_AsymmetricAlgorithmSecurityHeader_decodeBinary(const UA_ByteString *src, size_t *offset, UA_AsymmetricAlgorithmSecurityHeader *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TRANSPORT[UA_TRANSPORT_ASYMMETRICALGORITHMSECURITYHEADER], NULL);
 }
 
-/* ChunkType */
+/* SequenceHeader */
 static UA_INLINE size_t
-UA_ChunkType_calcSizeBinary(const UA_ChunkType *src) {
-    return UA_calcSizeBinary(src, &UA_TRANSPORT[UA_TRANSPORT_CHUNKTYPE]);
+UA_SequenceHeader_calcSizeBinary(const UA_SequenceHeader *src) {
+    return UA_calcSizeBinary(src, &UA_TRANSPORT[UA_TRANSPORT_SEQUENCEHEADER]);
 }
 static UA_INLINE UA_StatusCode
-UA_ChunkType_encodeBinary(const UA_ChunkType *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
-    return UA_encodeBinary(src, &UA_TRANSPORT[UA_TRANSPORT_CHUNKTYPE], bufPos, &bufEnd, NULL, NULL);
+UA_SequenceHeader_encodeBinary(const UA_SequenceHeader *src, UA_Byte **bufPos, const UA_Byte *bufEnd) {
+    return UA_encodeBinary(src, &UA_TRANSPORT[UA_TRANSPORT_SEQUENCEHEADER], bufPos, &bufEnd, NULL, NULL);
 }
 static UA_INLINE UA_StatusCode
-UA_ChunkType_decodeBinary(const UA_ByteString *src, size_t *offset, UA_ChunkType *dst) {
-    return UA_decodeBinary(src, offset, dst, &UA_TRANSPORT[UA_TRANSPORT_CHUNKTYPE], NULL);
+UA_SequenceHeader_decodeBinary(const UA_ByteString *src, size_t *offset, UA_SequenceHeader *dst) {
+    return UA_decodeBinary(src, offset, dst, &UA_TRANSPORT[UA_TRANSPORT_SEQUENCEHEADER], NULL);
 }
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/ua_connection_internal.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/ua_connection_internal.h" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -4208,7 +4488,7 @@ void UA_Connection_attachSecureChannel(UA_Connection *connection,
 _UA_END_DECLS
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/ua_securechannel.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/ua_securechannel.h" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -4575,7 +4855,7 @@ encryptChunkSym(UA_MessageContext *const messageContext, size_t totalLength);
 _UA_END_DECLS
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/ua_workqueue.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/ua_workqueue.h" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -4702,7 +4982,7 @@ void UA_WorkQueue_manuallyProcessDelayed(UA_WorkQueue *wq);
 _UA_END_DECLS
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/ua_timer.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/ua_timer.h" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -4771,7 +5051,7 @@ void UA_Timer_deleteMembers(UA_Timer *t);
 _UA_END_DECLS
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/server/ua_session.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/server/ua_session.h" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -4940,7 +5220,7 @@ UA_Session_dequeuePublishReq(UA_Session *session);
 _UA_END_DECLS
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/server/ua_subscription.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/server/ua_subscription.h" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -5266,7 +5546,7 @@ UA_Server_evaluateWhereClauseContentFilter(
 _UA_END_DECLS
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/pubsub/ua_pubsub_networkmessage.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/pubsub/ua_pubsub_networkmessage.h" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -5547,7 +5827,7 @@ UA_StatusCode UA_NetworkMessage_decodeJson(UA_NetworkMessage *dst, const UA_Byte
 _UA_END_DECLS
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/pubsub/ua_pubsub.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/pubsub/ua_pubsub.h" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -5796,7 +6076,7 @@ UA_ReaderGroup_subscribeCallback(UA_Server *server, UA_ReaderGroup *readerGroup)
 _UA_END_DECLS
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/pubsub/ua_pubsub_manager.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/pubsub/ua_pubsub_manager.h" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -5846,7 +6126,7 @@ UA_PubSubManager_removeRepeatedPubSubCallback(UA_Server *server, UA_UInt64 callb
 _UA_END_DECLS
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/pubsub/ua_pubsub_ns0.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/pubsub/ua_pubsub_ns0.h" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -5906,7 +6186,7 @@ _UA_END_DECLS
 
 #endif /* UA_PUBSUB_NS0_H_ */
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/server/ua_server_async.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/server/ua_server_async.h" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -6021,7 +6301,7 @@ UA_FUNC_ATTR_WARN_UNUSED_RESULT;
 _UA_END_DECLS
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/server/ua_server_internal.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/server/ua_server_internal.h" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -6541,7 +6821,7 @@ UA_StatusCode writeNs0VariableArray(UA_Server *server, UA_UInt32 id, void *v,
 _UA_END_DECLS
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/server/ua_services.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/server/ua_services.h" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -7044,7 +7324,7 @@ void Service_DeleteSubscriptions(UA_Server *server, UA_Session *session,
 _UA_END_DECLS
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/client/ua_client_internal.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/client/ua_client_internal.h" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -7213,7 +7493,7 @@ receiveResponseAsync(UA_Client *client, UA_UInt32 timeout);
 _UA_END_DECLS
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/build/src_generated/open62541/namespace0_generated.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/build/src_generated/open62541/namespace0_generated.h" ***********************************/
 
 /* WARNING: This is a generated file.
  * Any manual changes will be overwritten. */
@@ -7264,7 +7544,7 @@ _UA_END_DECLS
 
 #endif /* NAMESPACE0_GENERATED_H_ */
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/ua_types.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/ua_types.c" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8639,7 +8919,7 @@ UA_NumericRange_parse(UA_NumericRange *range, const UA_String str) {
     return retval;
 }
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/ua_types_encoding_binary.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/ua_types_encoding_binary.c" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -10659,10 +10939,10 @@ UA_calcSizeBinary(const void *p, const UA_DataType *type) {
     return calcSizeBinaryJumpTable[type->typeKind](p, type);
 }
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/build/src_generated/open62541/types_generated.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/build/src_generated/open62541/types_generated.c" ***********************************/
 
-/* Generated from Opc.Ua.Types.bsd with script /home/jvoe/open62541/tools/generate_datatypes.py
- * on host rigel by user jvoe at 2020-09-09 11:33:49 */
+/* Generated from Opc.Ua.Types.bsd with script /home/pdie/sonstiges/qtopcua/repos/open62541/tools/generate_datatypes.py
+ * on host mintaka by user pdie at 2021-06-21 11:34:37 */
 
 
 /* Boolean */
@@ -10740,100 +11020,154 @@ UA_calcSizeBinary(const void *p, const UA_DataType *type) {
 /* DiagnosticInfo */
 #define DiagnosticInfo_members NULL
 
-/* ViewAttributes */
-static UA_DataTypeMember ViewAttributes_members[7] = {
+/* NodeClass */
+#define NodeClass_members NULL
+
+/* StructureType */
+#define StructureType_members NULL
+
+/* StructureField */
+static UA_DataTypeMember StructureField_members[7] = {
 {
-    UA_TYPENAME("SpecifiedAttributes") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
+    UA_TYPENAME("Name") /* .memberName */
+    UA_TYPES_STRING, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("DisplayName") /* .memberName */
+    UA_TYPENAME("Description") /* .memberName */
     UA_TYPES_LOCALIZEDTEXT, /* .memberTypeIndex */
-    offsetof(UA_ViewAttributes, displayName) - offsetof(UA_ViewAttributes, specifiedAttributes) - sizeof(UA_UInt32), /* .padding */
+    offsetof(UA_StructureField, description) - offsetof(UA_StructureField, name) - sizeof(UA_String), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("Description") /* .memberName */
-    UA_TYPES_LOCALIZEDTEXT, /* .memberTypeIndex */
-    offsetof(UA_ViewAttributes, description) - offsetof(UA_ViewAttributes, displayName) - sizeof(UA_LocalizedText), /* .padding */
+    UA_TYPENAME("DataType") /* .memberName */
+    UA_TYPES_NODEID, /* .memberTypeIndex */
+    offsetof(UA_StructureField, dataType) - offsetof(UA_StructureField, description) - sizeof(UA_LocalizedText), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("WriteMask") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_ViewAttributes, writeMask) - offsetof(UA_ViewAttributes, description) - sizeof(UA_LocalizedText), /* .padding */
+    UA_TYPENAME("ValueRank") /* .memberName */
+    UA_TYPES_INT32, /* .memberTypeIndex */
+    offsetof(UA_StructureField, valueRank) - offsetof(UA_StructureField, dataType) - sizeof(UA_NodeId), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("UserWriteMask") /* .memberName */
+    UA_TYPENAME("ArrayDimensions") /* .memberName */
     UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_ViewAttributes, userWriteMask) - offsetof(UA_ViewAttributes, writeMask) - sizeof(UA_UInt32), /* .padding */
+    offsetof(UA_StructureField, arrayDimensionsSize) - offsetof(UA_StructureField, valueRank) - sizeof(UA_Int32), /* .padding */
     true, /* .namespaceZero */
-    false, /* .isArray */
+    true, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("ContainsNoLoops") /* .memberName */
-    UA_TYPES_BOOLEAN, /* .memberTypeIndex */
-    offsetof(UA_ViewAttributes, containsNoLoops) - offsetof(UA_ViewAttributes, userWriteMask) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("MaxStringLength") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_StructureField, maxStringLength) - offsetof(UA_StructureField, arrayDimensions) - sizeof(void *), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("EventNotifier") /* .memberName */
-    UA_TYPES_BYTE, /* .memberTypeIndex */
-    offsetof(UA_ViewAttributes, eventNotifier) - offsetof(UA_ViewAttributes, containsNoLoops) - sizeof(UA_Boolean), /* .padding */
+    UA_TYPENAME("IsOptional") /* .memberName */
+    UA_TYPES_BOOLEAN, /* .memberTypeIndex */
+    offsetof(UA_StructureField, isOptional) - offsetof(UA_StructureField, maxStringLength) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },};
 
-/* XVType */
-static UA_DataTypeMember XVType_members[2] = {
+/* StructureDefinition */
+static UA_DataTypeMember StructureDefinition_members[4] = {
 {
-    UA_TYPENAME("X") /* .memberName */
-    UA_TYPES_DOUBLE, /* .memberTypeIndex */
+    UA_TYPENAME("DefaultEncodingId") /* .memberName */
+    UA_TYPES_NODEID, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("Value") /* .memberName */
-    UA_TYPES_FLOAT, /* .memberTypeIndex */
-    offsetof(UA_XVType, value) - offsetof(UA_XVType, x) - sizeof(UA_Double), /* .padding */
+    UA_TYPENAME("BaseDataType") /* .memberName */
+    UA_TYPES_NODEID, /* .memberTypeIndex */
+    offsetof(UA_StructureDefinition, baseDataType) - offsetof(UA_StructureDefinition, defaultEncodingId) - sizeof(UA_NodeId), /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
+    false /* .isOptional */
+},
+{
+    UA_TYPENAME("StructureType") /* .memberName */
+    UA_TYPES_STRUCTURETYPE, /* .memberTypeIndex */
+    offsetof(UA_StructureDefinition, structureType) - offsetof(UA_StructureDefinition, baseDataType) - sizeof(UA_NodeId), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
+},
+{
+    UA_TYPENAME("Fields") /* .memberName */
+    UA_TYPES_STRUCTUREFIELD, /* .memberTypeIndex */
+    offsetof(UA_StructureDefinition, fieldsSize) - offsetof(UA_StructureDefinition, structureType) - sizeof(UA_StructureType), /* .padding */
+    true, /* .namespaceZero */
+    true, /* .isArray */
+    false /* .isOptional */
 },};
 
-/* ElementOperand */
-static UA_DataTypeMember ElementOperand_members[1] = {
+/* Argument */
+static UA_DataTypeMember Argument_members[5] = {
 {
-    UA_TYPENAME("Index") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
+    UA_TYPENAME("Name") /* .memberName */
+    UA_TYPES_STRING, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
+},
+{
+    UA_TYPENAME("DataType") /* .memberName */
+    UA_TYPES_NODEID, /* .memberTypeIndex */
+    offsetof(UA_Argument, dataType) - offsetof(UA_Argument, name) - sizeof(UA_String), /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
+    false /* .isOptional */
+},
+{
+    UA_TYPENAME("ValueRank") /* .memberName */
+    UA_TYPES_INT32, /* .memberTypeIndex */
+    offsetof(UA_Argument, valueRank) - offsetof(UA_Argument, dataType) - sizeof(UA_NodeId), /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
+    false /* .isOptional */
+},
+{
+    UA_TYPENAME("ArrayDimensions") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_Argument, arrayDimensionsSize) - offsetof(UA_Argument, valueRank) - sizeof(UA_Int32), /* .padding */
+    true, /* .namespaceZero */
+    true, /* .isArray */
+    false /* .isOptional */
+},
+{
+    UA_TYPENAME("Description") /* .memberName */
+    UA_TYPES_LOCALIZEDTEXT, /* .memberTypeIndex */
+    offsetof(UA_Argument, description) - offsetof(UA_Argument, arrayDimensions) - sizeof(void *), /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
+    false /* .isOptional */
 },};
 
-/* VariableAttributes */
-static UA_DataTypeMember VariableAttributes_members[13] = {
+/* EnumValueType */
+static UA_DataTypeMember EnumValueType_members[3] = {
 {
-    UA_TYPENAME("SpecifiedAttributes") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
+    UA_TYPENAME("Value") /* .memberName */
+    UA_TYPES_INT64, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
@@ -10842,7 +11176,7 @@ static UA_DataTypeMember VariableAttributes_members[13] = {
 {
     UA_TYPENAME("DisplayName") /* .memberName */
     UA_TYPES_LOCALIZEDTEXT, /* .memberTypeIndex */
-    offsetof(UA_VariableAttributes, displayName) - offsetof(UA_VariableAttributes, specifiedAttributes) - sizeof(UA_UInt32), /* .padding */
+    offsetof(UA_EnumValueType, displayName) - offsetof(UA_EnumValueType, value) - sizeof(UA_Int64), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
@@ -10850,457 +11184,642 @@ static UA_DataTypeMember VariableAttributes_members[13] = {
 {
     UA_TYPENAME("Description") /* .memberName */
     UA_TYPES_LOCALIZEDTEXT, /* .memberTypeIndex */
-    offsetof(UA_VariableAttributes, description) - offsetof(UA_VariableAttributes, displayName) - sizeof(UA_LocalizedText), /* .padding */
+    offsetof(UA_EnumValueType, description) - offsetof(UA_EnumValueType, displayName) - sizeof(UA_LocalizedText), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
-},
+},};
+
+/* EnumField */
+static UA_DataTypeMember EnumField_members[4] = {
 {
-    UA_TYPENAME("WriteMask") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_VariableAttributes, writeMask) - offsetof(UA_VariableAttributes, description) - sizeof(UA_LocalizedText), /* .padding */
+    UA_TYPENAME("Value") /* .memberName */
+    UA_TYPES_INT64, /* .memberTypeIndex */
+    0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("UserWriteMask") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_VariableAttributes, userWriteMask) - offsetof(UA_VariableAttributes, writeMask) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("DisplayName") /* .memberName */
+    UA_TYPES_LOCALIZEDTEXT, /* .memberTypeIndex */
+    offsetof(UA_EnumField, displayName) - offsetof(UA_EnumField, value) - sizeof(UA_Int64), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("Value") /* .memberName */
-    UA_TYPES_VARIANT, /* .memberTypeIndex */
-    offsetof(UA_VariableAttributes, value) - offsetof(UA_VariableAttributes, userWriteMask) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("Description") /* .memberName */
+    UA_TYPES_LOCALIZEDTEXT, /* .memberTypeIndex */
+    offsetof(UA_EnumField, description) - offsetof(UA_EnumField, displayName) - sizeof(UA_LocalizedText), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("DataType") /* .memberName */
-    UA_TYPES_NODEID, /* .memberTypeIndex */
-    offsetof(UA_VariableAttributes, dataType) - offsetof(UA_VariableAttributes, value) - sizeof(UA_Variant), /* .padding */
+    UA_TYPENAME("Name") /* .memberName */
+    UA_TYPES_STRING, /* .memberTypeIndex */
+    offsetof(UA_EnumField, name) - offsetof(UA_EnumField, description) - sizeof(UA_LocalizedText), /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
+    false /* .isOptional */
+},};
+
+/* Duration */
+#define Duration_members NULL
+
+/* UtcTime */
+#define UtcTime_members NULL
+
+/* LocaleId */
+#define LocaleId_members NULL
+
+/* TimeZoneDataType */
+static UA_DataTypeMember TimeZoneDataType_members[2] = {
+{
+    UA_TYPENAME("Offset") /* .memberName */
+    UA_TYPES_INT16, /* .memberTypeIndex */
+    0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("ValueRank") /* .memberName */
-    UA_TYPES_INT32, /* .memberTypeIndex */
-    offsetof(UA_VariableAttributes, valueRank) - offsetof(UA_VariableAttributes, dataType) - sizeof(UA_NodeId), /* .padding */
+    UA_TYPENAME("DaylightSavingInOffset") /* .memberName */
+    UA_TYPES_BOOLEAN, /* .memberTypeIndex */
+    offsetof(UA_TimeZoneDataType, daylightSavingInOffset) - offsetof(UA_TimeZoneDataType, offset) - sizeof(UA_Int16), /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
+    false /* .isOptional */
+},};
+
+/* ApplicationType */
+#define ApplicationType_members NULL
+
+/* ApplicationDescription */
+static UA_DataTypeMember ApplicationDescription_members[7] = {
+{
+    UA_TYPENAME("ApplicationUri") /* .memberName */
+    UA_TYPES_STRING, /* .memberTypeIndex */
+    0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("ArrayDimensions") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_VariableAttributes, arrayDimensionsSize) - offsetof(UA_VariableAttributes, valueRank) - sizeof(UA_Int32), /* .padding */
+    UA_TYPENAME("ProductUri") /* .memberName */
+    UA_TYPES_STRING, /* .memberTypeIndex */
+    offsetof(UA_ApplicationDescription, productUri) - offsetof(UA_ApplicationDescription, applicationUri) - sizeof(UA_String), /* .padding */
     true, /* .namespaceZero */
-    true, /* .isArray */
+    false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("AccessLevel") /* .memberName */
-    UA_TYPES_BYTE, /* .memberTypeIndex */
-    offsetof(UA_VariableAttributes, accessLevel) - offsetof(UA_VariableAttributes, arrayDimensions) - sizeof(void *), /* .padding */
+    UA_TYPENAME("ApplicationName") /* .memberName */
+    UA_TYPES_LOCALIZEDTEXT, /* .memberTypeIndex */
+    offsetof(UA_ApplicationDescription, applicationName) - offsetof(UA_ApplicationDescription, productUri) - sizeof(UA_String), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("UserAccessLevel") /* .memberName */
-    UA_TYPES_BYTE, /* .memberTypeIndex */
-    offsetof(UA_VariableAttributes, userAccessLevel) - offsetof(UA_VariableAttributes, accessLevel) - sizeof(UA_Byte), /* .padding */
+    UA_TYPENAME("ApplicationType") /* .memberName */
+    UA_TYPES_APPLICATIONTYPE, /* .memberTypeIndex */
+    offsetof(UA_ApplicationDescription, applicationType) - offsetof(UA_ApplicationDescription, applicationName) - sizeof(UA_LocalizedText), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("MinimumSamplingInterval") /* .memberName */
-    UA_TYPES_DOUBLE, /* .memberTypeIndex */
-    offsetof(UA_VariableAttributes, minimumSamplingInterval) - offsetof(UA_VariableAttributes, userAccessLevel) - sizeof(UA_Byte), /* .padding */
+    UA_TYPENAME("GatewayServerUri") /* .memberName */
+    UA_TYPES_STRING, /* .memberTypeIndex */
+    offsetof(UA_ApplicationDescription, gatewayServerUri) - offsetof(UA_ApplicationDescription, applicationType) - sizeof(UA_ApplicationType), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("Historizing") /* .memberName */
-    UA_TYPES_BOOLEAN, /* .memberTypeIndex */
-    offsetof(UA_VariableAttributes, historizing) - offsetof(UA_VariableAttributes, minimumSamplingInterval) - sizeof(UA_Double), /* .padding */
+    UA_TYPENAME("DiscoveryProfileUri") /* .memberName */
+    UA_TYPES_STRING, /* .memberTypeIndex */
+    offsetof(UA_ApplicationDescription, discoveryProfileUri) - offsetof(UA_ApplicationDescription, gatewayServerUri) - sizeof(UA_String), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
+},
+{
+    UA_TYPENAME("DiscoveryUrls") /* .memberName */
+    UA_TYPES_STRING, /* .memberTypeIndex */
+    offsetof(UA_ApplicationDescription, discoveryUrlsSize) - offsetof(UA_ApplicationDescription, discoveryProfileUri) - sizeof(UA_String), /* .padding */
+    true, /* .namespaceZero */
+    true, /* .isArray */
+    false /* .isOptional */
 },};
 
-/* EnumValueType */
-static UA_DataTypeMember EnumValueType_members[3] = {
+/* RequestHeader */
+static UA_DataTypeMember RequestHeader_members[7] = {
 {
-    UA_TYPENAME("Value") /* .memberName */
-    UA_TYPES_INT64, /* .memberTypeIndex */
+    UA_TYPENAME("AuthenticationToken") /* .memberName */
+    UA_TYPES_NODEID, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("DisplayName") /* .memberName */
-    UA_TYPES_LOCALIZEDTEXT, /* .memberTypeIndex */
-    offsetof(UA_EnumValueType, displayName) - offsetof(UA_EnumValueType, value) - sizeof(UA_Int64), /* .padding */
+    UA_TYPENAME("Timestamp") /* .memberName */
+    UA_TYPES_DATETIME, /* .memberTypeIndex */
+    offsetof(UA_RequestHeader, timestamp) - offsetof(UA_RequestHeader, authenticationToken) - sizeof(UA_NodeId), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("Description") /* .memberName */
-    UA_TYPES_LOCALIZEDTEXT, /* .memberTypeIndex */
-    offsetof(UA_EnumValueType, description) - offsetof(UA_EnumValueType, displayName) - sizeof(UA_LocalizedText), /* .padding */
+    UA_TYPENAME("RequestHandle") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_RequestHeader, requestHandle) - offsetof(UA_RequestHeader, timestamp) - sizeof(UA_DateTime), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
-},};
-
-/* EventFieldList */
-static UA_DataTypeMember EventFieldList_members[2] = {
+},
 {
-    UA_TYPENAME("ClientHandle") /* .memberName */
+    UA_TYPENAME("ReturnDiagnostics") /* .memberName */
     UA_TYPES_UINT32, /* .memberTypeIndex */
-    0, /* .padding */
+    offsetof(UA_RequestHeader, returnDiagnostics) - offsetof(UA_RequestHeader, requestHandle) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("EventFields") /* .memberName */
-    UA_TYPES_VARIANT, /* .memberTypeIndex */
-    offsetof(UA_EventFieldList, eventFieldsSize) - offsetof(UA_EventFieldList, clientHandle) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("AuditEntryId") /* .memberName */
+    UA_TYPES_STRING, /* .memberTypeIndex */
+    offsetof(UA_RequestHeader, auditEntryId) - offsetof(UA_RequestHeader, returnDiagnostics) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
-    true, /* .isArray */
+    false, /* .isArray */
+    false /* .isOptional */
+},
+{
+    UA_TYPENAME("TimeoutHint") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_RequestHeader, timeoutHint) - offsetof(UA_RequestHeader, auditEntryId) - sizeof(UA_String), /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
+    false /* .isOptional */
+},
+{
+    UA_TYPENAME("AdditionalHeader") /* .memberName */
+    UA_TYPES_EXTENSIONOBJECT, /* .memberTypeIndex */
+    offsetof(UA_RequestHeader, additionalHeader) - offsetof(UA_RequestHeader, timeoutHint) - sizeof(UA_UInt32), /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
     false /* .isOptional */
 },};
 
-/* MonitoredItemCreateResult */
-static UA_DataTypeMember MonitoredItemCreateResult_members[5] = {
+/* ResponseHeader */
+static UA_DataTypeMember ResponseHeader_members[6] = {
 {
-    UA_TYPENAME("StatusCode") /* .memberName */
-    UA_TYPES_STATUSCODE, /* .memberTypeIndex */
+    UA_TYPENAME("Timestamp") /* .memberName */
+    UA_TYPES_DATETIME, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("MonitoredItemId") /* .memberName */
+    UA_TYPENAME("RequestHandle") /* .memberName */
     UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_MonitoredItemCreateResult, monitoredItemId) - offsetof(UA_MonitoredItemCreateResult, statusCode) - sizeof(UA_StatusCode), /* .padding */
+    offsetof(UA_ResponseHeader, requestHandle) - offsetof(UA_ResponseHeader, timestamp) - sizeof(UA_DateTime), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("RevisedSamplingInterval") /* .memberName */
-    UA_TYPES_DOUBLE, /* .memberTypeIndex */
-    offsetof(UA_MonitoredItemCreateResult, revisedSamplingInterval) - offsetof(UA_MonitoredItemCreateResult, monitoredItemId) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("ServiceResult") /* .memberName */
+    UA_TYPES_STATUSCODE, /* .memberTypeIndex */
+    offsetof(UA_ResponseHeader, serviceResult) - offsetof(UA_ResponseHeader, requestHandle) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("RevisedQueueSize") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_MonitoredItemCreateResult, revisedQueueSize) - offsetof(UA_MonitoredItemCreateResult, revisedSamplingInterval) - sizeof(UA_Double), /* .padding */
+    UA_TYPENAME("ServiceDiagnostics") /* .memberName */
+    UA_TYPES_DIAGNOSTICINFO, /* .memberTypeIndex */
+    offsetof(UA_ResponseHeader, serviceDiagnostics) - offsetof(UA_ResponseHeader, serviceResult) - sizeof(UA_StatusCode), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("FilterResult") /* .memberName */
+    UA_TYPENAME("StringTable") /* .memberName */
+    UA_TYPES_STRING, /* .memberTypeIndex */
+    offsetof(UA_ResponseHeader, stringTableSize) - offsetof(UA_ResponseHeader, serviceDiagnostics) - sizeof(UA_DiagnosticInfo), /* .padding */
+    true, /* .namespaceZero */
+    true, /* .isArray */
+    false /* .isOptional */
+},
+{
+    UA_TYPENAME("AdditionalHeader") /* .memberName */
     UA_TYPES_EXTENSIONOBJECT, /* .memberTypeIndex */
-    offsetof(UA_MonitoredItemCreateResult, filterResult) - offsetof(UA_MonitoredItemCreateResult, revisedQueueSize) - sizeof(UA_UInt32), /* .padding */
+    offsetof(UA_ResponseHeader, additionalHeader) - offsetof(UA_ResponseHeader, stringTable) - sizeof(void *), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },};
 
-/* EUInformation */
-static UA_DataTypeMember EUInformation_members[4] = {
+/* ServiceFault */
+static UA_DataTypeMember ServiceFault_members[1] = {
 {
-    UA_TYPENAME("NamespaceUri") /* .memberName */
-    UA_TYPES_STRING, /* .memberTypeIndex */
+    UA_TYPENAME("ResponseHeader") /* .memberName */
+    UA_TYPES_RESPONSEHEADER, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
-},
+},};
+
+/* FindServersRequest */
+static UA_DataTypeMember FindServersRequest_members[4] = {
 {
-    UA_TYPENAME("UnitId") /* .memberName */
-    UA_TYPES_INT32, /* .memberTypeIndex */
-    offsetof(UA_EUInformation, unitId) - offsetof(UA_EUInformation, namespaceUri) - sizeof(UA_String), /* .padding */
+    UA_TYPENAME("RequestHeader") /* .memberName */
+    UA_TYPES_REQUESTHEADER, /* .memberTypeIndex */
+    0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("DisplayName") /* .memberName */
-    UA_TYPES_LOCALIZEDTEXT, /* .memberTypeIndex */
-    offsetof(UA_EUInformation, displayName) - offsetof(UA_EUInformation, unitId) - sizeof(UA_Int32), /* .padding */
+    UA_TYPENAME("EndpointUrl") /* .memberName */
+    UA_TYPES_STRING, /* .memberTypeIndex */
+    offsetof(UA_FindServersRequest, endpointUrl) - offsetof(UA_FindServersRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("Description") /* .memberName */
-    UA_TYPES_LOCALIZEDTEXT, /* .memberTypeIndex */
-    offsetof(UA_EUInformation, description) - offsetof(UA_EUInformation, displayName) - sizeof(UA_LocalizedText), /* .padding */
+    UA_TYPENAME("LocaleIds") /* .memberName */
+    UA_TYPES_STRING, /* .memberTypeIndex */
+    offsetof(UA_FindServersRequest, localeIdsSize) - offsetof(UA_FindServersRequest, endpointUrl) - sizeof(UA_String), /* .padding */
     true, /* .namespaceZero */
-    false, /* .isArray */
+    true, /* .isArray */
+    false /* .isOptional */
+},
+{
+    UA_TYPENAME("ServerUris") /* .memberName */
+    UA_TYPES_STRING, /* .memberTypeIndex */
+    offsetof(UA_FindServersRequest, serverUrisSize) - offsetof(UA_FindServersRequest, localeIds) - sizeof(void *), /* .padding */
+    true, /* .namespaceZero */
+    true, /* .isArray */
     false /* .isOptional */
 },};
 
-/* ServerDiagnosticsSummaryDataType */
-static UA_DataTypeMember ServerDiagnosticsSummaryDataType_members[12] = {
+/* FindServersResponse */
+static UA_DataTypeMember FindServersResponse_members[2] = {
 {
-    UA_TYPENAME("ServerViewCount") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
+    UA_TYPENAME("ResponseHeader") /* .memberName */
+    UA_TYPES_RESPONSEHEADER, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("CurrentSessionCount") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_ServerDiagnosticsSummaryDataType, currentSessionCount) - offsetof(UA_ServerDiagnosticsSummaryDataType, serverViewCount) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("Servers") /* .memberName */
+    UA_TYPES_APPLICATIONDESCRIPTION, /* .memberTypeIndex */
+    offsetof(UA_FindServersResponse, serversSize) - offsetof(UA_FindServersResponse, responseHeader) - sizeof(UA_ResponseHeader), /* .padding */
+    true, /* .namespaceZero */
+    true, /* .isArray */
+    false /* .isOptional */
+},};
+
+/* MessageSecurityMode */
+#define MessageSecurityMode_members NULL
+
+/* UserTokenType */
+#define UserTokenType_members NULL
+
+/* UserTokenPolicy */
+static UA_DataTypeMember UserTokenPolicy_members[5] = {
+{
+    UA_TYPENAME("PolicyId") /* .memberName */
+    UA_TYPES_STRING, /* .memberTypeIndex */
+    0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("CumulatedSessionCount") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_ServerDiagnosticsSummaryDataType, cumulatedSessionCount) - offsetof(UA_ServerDiagnosticsSummaryDataType, currentSessionCount) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("TokenType") /* .memberName */
+    UA_TYPES_USERTOKENTYPE, /* .memberTypeIndex */
+    offsetof(UA_UserTokenPolicy, tokenType) - offsetof(UA_UserTokenPolicy, policyId) - sizeof(UA_String), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("SecurityRejectedSessionCount") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_ServerDiagnosticsSummaryDataType, securityRejectedSessionCount) - offsetof(UA_ServerDiagnosticsSummaryDataType, cumulatedSessionCount) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("IssuedTokenType") /* .memberName */
+    UA_TYPES_STRING, /* .memberTypeIndex */
+    offsetof(UA_UserTokenPolicy, issuedTokenType) - offsetof(UA_UserTokenPolicy, tokenType) - sizeof(UA_UserTokenType), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("RejectedSessionCount") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_ServerDiagnosticsSummaryDataType, rejectedSessionCount) - offsetof(UA_ServerDiagnosticsSummaryDataType, securityRejectedSessionCount) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("IssuerEndpointUrl") /* .memberName */
+    UA_TYPES_STRING, /* .memberTypeIndex */
+    offsetof(UA_UserTokenPolicy, issuerEndpointUrl) - offsetof(UA_UserTokenPolicy, issuedTokenType) - sizeof(UA_String), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("SessionTimeoutCount") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_ServerDiagnosticsSummaryDataType, sessionTimeoutCount) - offsetof(UA_ServerDiagnosticsSummaryDataType, rejectedSessionCount) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("SecurityPolicyUri") /* .memberName */
+    UA_TYPES_STRING, /* .memberTypeIndex */
+    offsetof(UA_UserTokenPolicy, securityPolicyUri) - offsetof(UA_UserTokenPolicy, issuerEndpointUrl) - sizeof(UA_String), /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
+    false /* .isOptional */
+},};
+
+/* EndpointDescription */
+static UA_DataTypeMember EndpointDescription_members[8] = {
+{
+    UA_TYPENAME("EndpointUrl") /* .memberName */
+    UA_TYPES_STRING, /* .memberTypeIndex */
+    0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("SessionAbortCount") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_ServerDiagnosticsSummaryDataType, sessionAbortCount) - offsetof(UA_ServerDiagnosticsSummaryDataType, sessionTimeoutCount) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("Server") /* .memberName */
+    UA_TYPES_APPLICATIONDESCRIPTION, /* .memberTypeIndex */
+    offsetof(UA_EndpointDescription, server) - offsetof(UA_EndpointDescription, endpointUrl) - sizeof(UA_String), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("CurrentSubscriptionCount") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_ServerDiagnosticsSummaryDataType, currentSubscriptionCount) - offsetof(UA_ServerDiagnosticsSummaryDataType, sessionAbortCount) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("ServerCertificate") /* .memberName */
+    UA_TYPES_BYTESTRING, /* .memberTypeIndex */
+    offsetof(UA_EndpointDescription, serverCertificate) - offsetof(UA_EndpointDescription, server) - sizeof(UA_ApplicationDescription), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("CumulatedSubscriptionCount") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_ServerDiagnosticsSummaryDataType, cumulatedSubscriptionCount) - offsetof(UA_ServerDiagnosticsSummaryDataType, currentSubscriptionCount) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("SecurityMode") /* .memberName */
+    UA_TYPES_MESSAGESECURITYMODE, /* .memberTypeIndex */
+    offsetof(UA_EndpointDescription, securityMode) - offsetof(UA_EndpointDescription, serverCertificate) - sizeof(UA_ByteString), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("PublishingIntervalCount") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_ServerDiagnosticsSummaryDataType, publishingIntervalCount) - offsetof(UA_ServerDiagnosticsSummaryDataType, cumulatedSubscriptionCount) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("SecurityPolicyUri") /* .memberName */
+    UA_TYPES_STRING, /* .memberTypeIndex */
+    offsetof(UA_EndpointDescription, securityPolicyUri) - offsetof(UA_EndpointDescription, securityMode) - sizeof(UA_MessageSecurityMode), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("SecurityRejectedRequestsCount") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_ServerDiagnosticsSummaryDataType, securityRejectedRequestsCount) - offsetof(UA_ServerDiagnosticsSummaryDataType, publishingIntervalCount) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("UserIdentityTokens") /* .memberName */
+    UA_TYPES_USERTOKENPOLICY, /* .memberTypeIndex */
+    offsetof(UA_EndpointDescription, userIdentityTokensSize) - offsetof(UA_EndpointDescription, securityPolicyUri) - sizeof(UA_String), /* .padding */
+    true, /* .namespaceZero */
+    true, /* .isArray */
+    false /* .isOptional */
+},
+{
+    UA_TYPENAME("TransportProfileUri") /* .memberName */
+    UA_TYPES_STRING, /* .memberTypeIndex */
+    offsetof(UA_EndpointDescription, transportProfileUri) - offsetof(UA_EndpointDescription, userIdentityTokens) - sizeof(void *), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("RejectedRequestsCount") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_ServerDiagnosticsSummaryDataType, rejectedRequestsCount) - offsetof(UA_ServerDiagnosticsSummaryDataType, securityRejectedRequestsCount) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("SecurityLevel") /* .memberName */
+    UA_TYPES_BYTE, /* .memberTypeIndex */
+    offsetof(UA_EndpointDescription, securityLevel) - offsetof(UA_EndpointDescription, transportProfileUri) - sizeof(UA_String), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },};
 
-/* ContentFilterElementResult */
-static UA_DataTypeMember ContentFilterElementResult_members[3] = {
+/* GetEndpointsRequest */
+static UA_DataTypeMember GetEndpointsRequest_members[4] = {
 {
-    UA_TYPENAME("StatusCode") /* .memberName */
-    UA_TYPES_STATUSCODE, /* .memberTypeIndex */
+    UA_TYPENAME("RequestHeader") /* .memberName */
+    UA_TYPES_REQUESTHEADER, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("OperandStatusCodes") /* .memberName */
-    UA_TYPES_STATUSCODE, /* .memberTypeIndex */
-    offsetof(UA_ContentFilterElementResult, operandStatusCodesSize) - offsetof(UA_ContentFilterElementResult, statusCode) - sizeof(UA_StatusCode), /* .padding */
+    UA_TYPENAME("EndpointUrl") /* .memberName */
+    UA_TYPES_STRING, /* .memberTypeIndex */
+    offsetof(UA_GetEndpointsRequest, endpointUrl) - offsetof(UA_GetEndpointsRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
+    false /* .isOptional */
+},
+{
+    UA_TYPENAME("LocaleIds") /* .memberName */
+    UA_TYPES_STRING, /* .memberTypeIndex */
+    offsetof(UA_GetEndpointsRequest, localeIdsSize) - offsetof(UA_GetEndpointsRequest, endpointUrl) - sizeof(UA_String), /* .padding */
     true, /* .namespaceZero */
     true, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("OperandDiagnosticInfos") /* .memberName */
-    UA_TYPES_DIAGNOSTICINFO, /* .memberTypeIndex */
-    offsetof(UA_ContentFilterElementResult, operandDiagnosticInfosSize) - offsetof(UA_ContentFilterElementResult, operandStatusCodes) - sizeof(void *), /* .padding */
+    UA_TYPENAME("ProfileUris") /* .memberName */
+    UA_TYPES_STRING, /* .memberTypeIndex */
+    offsetof(UA_GetEndpointsRequest, profileUrisSize) - offsetof(UA_GetEndpointsRequest, localeIds) - sizeof(void *), /* .padding */
     true, /* .namespaceZero */
     true, /* .isArray */
     false /* .isOptional */
 },};
 
-/* LiteralOperand */
-static UA_DataTypeMember LiteralOperand_members[1] = {
+/* GetEndpointsResponse */
+static UA_DataTypeMember GetEndpointsResponse_members[2] = {
 {
-    UA_TYPENAME("Value") /* .memberName */
-    UA_TYPES_VARIANT, /* .memberTypeIndex */
+    UA_TYPENAME("ResponseHeader") /* .memberName */
+    UA_TYPES_RESPONSEHEADER, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
+},
+{
+    UA_TYPENAME("Endpoints") /* .memberName */
+    UA_TYPES_ENDPOINTDESCRIPTION, /* .memberTypeIndex */
+    offsetof(UA_GetEndpointsResponse, endpointsSize) - offsetof(UA_GetEndpointsResponse, responseHeader) - sizeof(UA_ResponseHeader), /* .padding */
+    true, /* .namespaceZero */
+    true, /* .isArray */
+    false /* .isOptional */
 },};
 
-/* MessageSecurityMode */
-#define MessageSecurityMode_members NULL
-
-/* UtcTime */
-#define UtcTime_members NULL
+/* SecurityTokenRequestType */
+#define SecurityTokenRequestType_members NULL
 
-/* UserIdentityToken */
-static UA_DataTypeMember UserIdentityToken_members[1] = {
+/* ChannelSecurityToken */
+static UA_DataTypeMember ChannelSecurityToken_members[4] = {
 {
-    UA_TYPENAME("PolicyId") /* .memberName */
-    UA_TYPES_STRING, /* .memberTypeIndex */
+    UA_TYPENAME("ChannelId") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
-},};
-
-/* X509IdentityToken */
-static UA_DataTypeMember X509IdentityToken_members[2] = {
+},
 {
-    UA_TYPENAME("PolicyId") /* .memberName */
-    UA_TYPES_STRING, /* .memberTypeIndex */
-    0, /* .padding */
+    UA_TYPENAME("TokenId") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_ChannelSecurityToken, tokenId) - offsetof(UA_ChannelSecurityToken, channelId) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("CertificateData") /* .memberName */
-    UA_TYPES_BYTESTRING, /* .memberTypeIndex */
-    offsetof(UA_X509IdentityToken, certificateData) - offsetof(UA_X509IdentityToken, policyId) - sizeof(UA_String), /* .padding */
+    UA_TYPENAME("CreatedAt") /* .memberName */
+    UA_TYPES_DATETIME, /* .memberTypeIndex */
+    offsetof(UA_ChannelSecurityToken, createdAt) - offsetof(UA_ChannelSecurityToken, tokenId) - sizeof(UA_UInt32), /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
+    false /* .isOptional */
+},
+{
+    UA_TYPENAME("RevisedLifetime") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_ChannelSecurityToken, revisedLifetime) - offsetof(UA_ChannelSecurityToken, createdAt) - sizeof(UA_DateTime), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },};
 
-/* MonitoredItemNotification */
-static UA_DataTypeMember MonitoredItemNotification_members[2] = {
+/* OpenSecureChannelRequest */
+static UA_DataTypeMember OpenSecureChannelRequest_members[6] = {
 {
-    UA_TYPENAME("ClientHandle") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
+    UA_TYPENAME("RequestHeader") /* .memberName */
+    UA_TYPES_REQUESTHEADER, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("Value") /* .memberName */
-    UA_TYPES_DATAVALUE, /* .memberTypeIndex */
-    offsetof(UA_MonitoredItemNotification, value) - offsetof(UA_MonitoredItemNotification, clientHandle) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("ClientProtocolVersion") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_OpenSecureChannelRequest, clientProtocolVersion) - offsetof(UA_OpenSecureChannelRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
+    false /* .isOptional */
+},
+{
+    UA_TYPENAME("RequestType") /* .memberName */
+    UA_TYPES_SECURITYTOKENREQUESTTYPE, /* .memberTypeIndex */
+    offsetof(UA_OpenSecureChannelRequest, requestType) - offsetof(UA_OpenSecureChannelRequest, clientProtocolVersion) - sizeof(UA_UInt32), /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
+    false /* .isOptional */
+},
+{
+    UA_TYPENAME("SecurityMode") /* .memberName */
+    UA_TYPES_MESSAGESECURITYMODE, /* .memberTypeIndex */
+    offsetof(UA_OpenSecureChannelRequest, securityMode) - offsetof(UA_OpenSecureChannelRequest, requestType) - sizeof(UA_SecurityTokenRequestType), /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
+    false /* .isOptional */
+},
+{
+    UA_TYPENAME("ClientNonce") /* .memberName */
+    UA_TYPES_BYTESTRING, /* .memberTypeIndex */
+    offsetof(UA_OpenSecureChannelRequest, clientNonce) - offsetof(UA_OpenSecureChannelRequest, securityMode) - sizeof(UA_MessageSecurityMode), /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
+    false /* .isOptional */
+},
+{
+    UA_TYPENAME("RequestedLifetime") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_OpenSecureChannelRequest, requestedLifetime) - offsetof(UA_OpenSecureChannelRequest, clientNonce) - sizeof(UA_ByteString), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },};
 
-/* StructureType */
-#define StructureType_members NULL
-
-/* ResponseHeader */
-static UA_DataTypeMember ResponseHeader_members[6] = {
+/* OpenSecureChannelResponse */
+static UA_DataTypeMember OpenSecureChannelResponse_members[4] = {
 {
-    UA_TYPENAME("Timestamp") /* .memberName */
-    UA_TYPES_DATETIME, /* .memberTypeIndex */
+    UA_TYPENAME("ResponseHeader") /* .memberName */
+    UA_TYPES_RESPONSEHEADER, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("RequestHandle") /* .memberName */
+    UA_TYPENAME("ServerProtocolVersion") /* .memberName */
     UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_ResponseHeader, requestHandle) - offsetof(UA_ResponseHeader, timestamp) - sizeof(UA_DateTime), /* .padding */
+    offsetof(UA_OpenSecureChannelResponse, serverProtocolVersion) - offsetof(UA_OpenSecureChannelResponse, responseHeader) - sizeof(UA_ResponseHeader), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("ServiceResult") /* .memberName */
-    UA_TYPES_STATUSCODE, /* .memberTypeIndex */
-    offsetof(UA_ResponseHeader, serviceResult) - offsetof(UA_ResponseHeader, requestHandle) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("SecurityToken") /* .memberName */
+    UA_TYPES_CHANNELSECURITYTOKEN, /* .memberTypeIndex */
+    offsetof(UA_OpenSecureChannelResponse, securityToken) - offsetof(UA_OpenSecureChannelResponse, serverProtocolVersion) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("ServiceDiagnostics") /* .memberName */
-    UA_TYPES_DIAGNOSTICINFO, /* .memberTypeIndex */
-    offsetof(UA_ResponseHeader, serviceDiagnostics) - offsetof(UA_ResponseHeader, serviceResult) - sizeof(UA_StatusCode), /* .padding */
+    UA_TYPENAME("ServerNonce") /* .memberName */
+    UA_TYPES_BYTESTRING, /* .memberTypeIndex */
+    offsetof(UA_OpenSecureChannelResponse, serverNonce) - offsetof(UA_OpenSecureChannelResponse, securityToken) - sizeof(UA_ChannelSecurityToken), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
-},
+},};
+
+/* CloseSecureChannelRequest */
+static UA_DataTypeMember CloseSecureChannelRequest_members[1] = {
 {
-    UA_TYPENAME("StringTable") /* .memberName */
-    UA_TYPES_STRING, /* .memberTypeIndex */
-    offsetof(UA_ResponseHeader, stringTableSize) - offsetof(UA_ResponseHeader, serviceDiagnostics) - sizeof(UA_DiagnosticInfo), /* .padding */
+    UA_TYPENAME("RequestHeader") /* .memberName */
+    UA_TYPES_REQUESTHEADER, /* .memberTypeIndex */
+    0, /* .padding */
     true, /* .namespaceZero */
-    true, /* .isArray */
+    false, /* .isArray */
+    false /* .isOptional */
+},};
+
+/* CloseSecureChannelResponse */
+static UA_DataTypeMember CloseSecureChannelResponse_members[1] = {
+{
+    UA_TYPENAME("ResponseHeader") /* .memberName */
+    UA_TYPES_RESPONSEHEADER, /* .memberTypeIndex */
+    0, /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
+    false /* .isOptional */
+},};
+
+/* SignedSoftwareCertificate */
+static UA_DataTypeMember SignedSoftwareCertificate_members[2] = {
+{
+    UA_TYPENAME("CertificateData") /* .memberName */
+    UA_TYPES_BYTESTRING, /* .memberTypeIndex */
+    0, /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("AdditionalHeader") /* .memberName */
-    UA_TYPES_EXTENSIONOBJECT, /* .memberTypeIndex */
-    offsetof(UA_ResponseHeader, additionalHeader) - offsetof(UA_ResponseHeader, stringTable) - sizeof(void *), /* .padding */
+    UA_TYPENAME("Signature") /* .memberName */
+    UA_TYPES_BYTESTRING, /* .memberTypeIndex */
+    offsetof(UA_SignedSoftwareCertificate, signature) - offsetof(UA_SignedSoftwareCertificate, certificateData) - sizeof(UA_ByteString), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
@@ -11325,86 +11844,83 @@ static UA_DataTypeMember SignatureData_members[2] = {
     false /* .isOptional */
 },};
 
-/* ModifySubscriptionResponse */
-static UA_DataTypeMember ModifySubscriptionResponse_members[4] = {
+/* CreateSessionRequest */
+static UA_DataTypeMember CreateSessionRequest_members[9] = {
 {
-    UA_TYPENAME("ResponseHeader") /* .memberName */
-    UA_TYPES_RESPONSEHEADER, /* .memberTypeIndex */
+    UA_TYPENAME("RequestHeader") /* .memberName */
+    UA_TYPES_REQUESTHEADER, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("RevisedPublishingInterval") /* .memberName */
-    UA_TYPES_DOUBLE, /* .memberTypeIndex */
-    offsetof(UA_ModifySubscriptionResponse, revisedPublishingInterval) - offsetof(UA_ModifySubscriptionResponse, responseHeader) - sizeof(UA_ResponseHeader), /* .padding */
+    UA_TYPENAME("ClientDescription") /* .memberName */
+    UA_TYPES_APPLICATIONDESCRIPTION, /* .memberTypeIndex */
+    offsetof(UA_CreateSessionRequest, clientDescription) - offsetof(UA_CreateSessionRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("RevisedLifetimeCount") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_ModifySubscriptionResponse, revisedLifetimeCount) - offsetof(UA_ModifySubscriptionResponse, revisedPublishingInterval) - sizeof(UA_Double), /* .padding */
+    UA_TYPENAME("ServerUri") /* .memberName */
+    UA_TYPES_STRING, /* .memberTypeIndex */
+    offsetof(UA_CreateSessionRequest, serverUri) - offsetof(UA_CreateSessionRequest, clientDescription) - sizeof(UA_ApplicationDescription), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("RevisedMaxKeepAliveCount") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_ModifySubscriptionResponse, revisedMaxKeepAliveCount) - offsetof(UA_ModifySubscriptionResponse, revisedLifetimeCount) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("EndpointUrl") /* .memberName */
+    UA_TYPES_STRING, /* .memberTypeIndex */
+    offsetof(UA_CreateSessionRequest, endpointUrl) - offsetof(UA_CreateSessionRequest, serverUri) - sizeof(UA_String), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
-},};
-
-/* NodeAttributes */
-static UA_DataTypeMember NodeAttributes_members[5] = {
+},
 {
-    UA_TYPENAME("SpecifiedAttributes") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    0, /* .padding */
+    UA_TYPENAME("SessionName") /* .memberName */
+    UA_TYPES_STRING, /* .memberTypeIndex */
+    offsetof(UA_CreateSessionRequest, sessionName) - offsetof(UA_CreateSessionRequest, endpointUrl) - sizeof(UA_String), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("DisplayName") /* .memberName */
-    UA_TYPES_LOCALIZEDTEXT, /* .memberTypeIndex */
-    offsetof(UA_NodeAttributes, displayName) - offsetof(UA_NodeAttributes, specifiedAttributes) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("ClientNonce") /* .memberName */
+    UA_TYPES_BYTESTRING, /* .memberTypeIndex */
+    offsetof(UA_CreateSessionRequest, clientNonce) - offsetof(UA_CreateSessionRequest, sessionName) - sizeof(UA_String), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("Description") /* .memberName */
-    UA_TYPES_LOCALIZEDTEXT, /* .memberTypeIndex */
-    offsetof(UA_NodeAttributes, description) - offsetof(UA_NodeAttributes, displayName) - sizeof(UA_LocalizedText), /* .padding */
+    UA_TYPENAME("ClientCertificate") /* .memberName */
+    UA_TYPES_BYTESTRING, /* .memberTypeIndex */
+    offsetof(UA_CreateSessionRequest, clientCertificate) - offsetof(UA_CreateSessionRequest, clientNonce) - sizeof(UA_ByteString), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("WriteMask") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_NodeAttributes, writeMask) - offsetof(UA_NodeAttributes, description) - sizeof(UA_LocalizedText), /* .padding */
+    UA_TYPENAME("RequestedSessionTimeout") /* .memberName */
+    UA_TYPES_DOUBLE, /* .memberTypeIndex */
+    offsetof(UA_CreateSessionRequest, requestedSessionTimeout) - offsetof(UA_CreateSessionRequest, clientCertificate) - sizeof(UA_ByteString), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("UserWriteMask") /* .memberName */
+    UA_TYPENAME("MaxResponseMessageSize") /* .memberName */
     UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_NodeAttributes, userWriteMask) - offsetof(UA_NodeAttributes, writeMask) - sizeof(UA_UInt32), /* .padding */
+    offsetof(UA_CreateSessionRequest, maxResponseMessageSize) - offsetof(UA_CreateSessionRequest, requestedSessionTimeout) - sizeof(UA_Double), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },};
 
-/* ActivateSessionResponse */
-static UA_DataTypeMember ActivateSessionResponse_members[4] = {
+/* CreateSessionResponse */
+static UA_DataTypeMember CreateSessionResponse_members[10] = {
 {
     UA_TYPENAME("ResponseHeader") /* .memberName */
     UA_TYPES_RESPONSEHEADER, /* .memberTypeIndex */
@@ -11414,188 +11930,234 @@ static UA_DataTypeMember ActivateSessionResponse_members[4] = {
     false /* .isOptional */
 },
 {
+    UA_TYPENAME("SessionId") /* .memberName */
+    UA_TYPES_NODEID, /* .memberTypeIndex */
+    offsetof(UA_CreateSessionResponse, sessionId) - offsetof(UA_CreateSessionResponse, responseHeader) - sizeof(UA_ResponseHeader), /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
+    false /* .isOptional */
+},
+{
+    UA_TYPENAME("AuthenticationToken") /* .memberName */
+    UA_TYPES_NODEID, /* .memberTypeIndex */
+    offsetof(UA_CreateSessionResponse, authenticationToken) - offsetof(UA_CreateSessionResponse, sessionId) - sizeof(UA_NodeId), /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
+    false /* .isOptional */
+},
+{
+    UA_TYPENAME("RevisedSessionTimeout") /* .memberName */
+    UA_TYPES_DOUBLE, /* .memberTypeIndex */
+    offsetof(UA_CreateSessionResponse, revisedSessionTimeout) - offsetof(UA_CreateSessionResponse, authenticationToken) - sizeof(UA_NodeId), /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
+    false /* .isOptional */
+},
+{
     UA_TYPENAME("ServerNonce") /* .memberName */
     UA_TYPES_BYTESTRING, /* .memberTypeIndex */
-    offsetof(UA_ActivateSessionResponse, serverNonce) - offsetof(UA_ActivateSessionResponse, responseHeader) - sizeof(UA_ResponseHeader), /* .padding */
+    offsetof(UA_CreateSessionResponse, serverNonce) - offsetof(UA_CreateSessionResponse, revisedSessionTimeout) - sizeof(UA_Double), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("Results") /* .memberName */
-    UA_TYPES_STATUSCODE, /* .memberTypeIndex */
-    offsetof(UA_ActivateSessionResponse, resultsSize) - offsetof(UA_ActivateSessionResponse, serverNonce) - sizeof(UA_ByteString), /* .padding */
+    UA_TYPENAME("ServerCertificate") /* .memberName */
+    UA_TYPES_BYTESTRING, /* .memberTypeIndex */
+    offsetof(UA_CreateSessionResponse, serverCertificate) - offsetof(UA_CreateSessionResponse, serverNonce) - sizeof(UA_ByteString), /* .padding */
     true, /* .namespaceZero */
-    true, /* .isArray */
+    false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("DiagnosticInfos") /* .memberName */
-    UA_TYPES_DIAGNOSTICINFO, /* .memberTypeIndex */
-    offsetof(UA_ActivateSessionResponse, diagnosticInfosSize) - offsetof(UA_ActivateSessionResponse, results) - sizeof(void *), /* .padding */
+    UA_TYPENAME("ServerEndpoints") /* .memberName */
+    UA_TYPES_ENDPOINTDESCRIPTION, /* .memberTypeIndex */
+    offsetof(UA_CreateSessionResponse, serverEndpointsSize) - offsetof(UA_CreateSessionResponse, serverCertificate) - sizeof(UA_ByteString), /* .padding */
     true, /* .namespaceZero */
     true, /* .isArray */
     false /* .isOptional */
-},};
-
-/* EnumField */
-static UA_DataTypeMember EnumField_members[4] = {
+},
 {
-    UA_TYPENAME("Value") /* .memberName */
-    UA_TYPES_INT64, /* .memberTypeIndex */
-    0, /* .padding */
+    UA_TYPENAME("ServerSoftwareCertificates") /* .memberName */
+    UA_TYPES_SIGNEDSOFTWARECERTIFICATE, /* .memberTypeIndex */
+    offsetof(UA_CreateSessionResponse, serverSoftwareCertificatesSize) - offsetof(UA_CreateSessionResponse, serverEndpoints) - sizeof(void *), /* .padding */
     true, /* .namespaceZero */
-    false, /* .isArray */
+    true, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("DisplayName") /* .memberName */
-    UA_TYPES_LOCALIZEDTEXT, /* .memberTypeIndex */
-    offsetof(UA_EnumField, displayName) - offsetof(UA_EnumField, value) - sizeof(UA_Int64), /* .padding */
+    UA_TYPENAME("ServerSignature") /* .memberName */
+    UA_TYPES_SIGNATUREDATA, /* .memberTypeIndex */
+    offsetof(UA_CreateSessionResponse, serverSignature) - offsetof(UA_CreateSessionResponse, serverSoftwareCertificates) - sizeof(void *), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("Description") /* .memberName */
-    UA_TYPES_LOCALIZEDTEXT, /* .memberTypeIndex */
-    offsetof(UA_EnumField, description) - offsetof(UA_EnumField, displayName) - sizeof(UA_LocalizedText), /* .padding */
+    UA_TYPENAME("MaxRequestMessageSize") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_CreateSessionResponse, maxRequestMessageSize) - offsetof(UA_CreateSessionResponse, serverSignature) - sizeof(UA_SignatureData), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
-},
+},};
+
+/* UserIdentityToken */
+static UA_DataTypeMember UserIdentityToken_members[1] = {
 {
-    UA_TYPENAME("Name") /* .memberName */
+    UA_TYPENAME("PolicyId") /* .memberName */
     UA_TYPES_STRING, /* .memberTypeIndex */
-    offsetof(UA_EnumField, name) - offsetof(UA_EnumField, description) - sizeof(UA_LocalizedText), /* .padding */
+    0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },};
 
-/* VariableTypeAttributes */
-static UA_DataTypeMember VariableTypeAttributes_members[10] = {
+/* AnonymousIdentityToken */
+static UA_DataTypeMember AnonymousIdentityToken_members[1] = {
 {
-    UA_TYPENAME("SpecifiedAttributes") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
+    UA_TYPENAME("PolicyId") /* .memberName */
+    UA_TYPES_STRING, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
-},
+},};
+
+/* UserNameIdentityToken */
+static UA_DataTypeMember UserNameIdentityToken_members[4] = {
 {
-    UA_TYPENAME("DisplayName") /* .memberName */
-    UA_TYPES_LOCALIZEDTEXT, /* .memberTypeIndex */
-    offsetof(UA_VariableTypeAttributes, displayName) - offsetof(UA_VariableTypeAttributes, specifiedAttributes) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("PolicyId") /* .memberName */
+    UA_TYPES_STRING, /* .memberTypeIndex */
+    0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("Description") /* .memberName */
-    UA_TYPES_LOCALIZEDTEXT, /* .memberTypeIndex */
-    offsetof(UA_VariableTypeAttributes, description) - offsetof(UA_VariableTypeAttributes, displayName) - sizeof(UA_LocalizedText), /* .padding */
+    UA_TYPENAME("UserName") /* .memberName */
+    UA_TYPES_STRING, /* .memberTypeIndex */
+    offsetof(UA_UserNameIdentityToken, userName) - offsetof(UA_UserNameIdentityToken, policyId) - sizeof(UA_String), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("WriteMask") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_VariableTypeAttributes, writeMask) - offsetof(UA_VariableTypeAttributes, description) - sizeof(UA_LocalizedText), /* .padding */
+    UA_TYPENAME("Password") /* .memberName */
+    UA_TYPES_BYTESTRING, /* .memberTypeIndex */
+    offsetof(UA_UserNameIdentityToken, password) - offsetof(UA_UserNameIdentityToken, userName) - sizeof(UA_String), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("UserWriteMask") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_VariableTypeAttributes, userWriteMask) - offsetof(UA_VariableTypeAttributes, writeMask) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("EncryptionAlgorithm") /* .memberName */
+    UA_TYPES_STRING, /* .memberTypeIndex */
+    offsetof(UA_UserNameIdentityToken, encryptionAlgorithm) - offsetof(UA_UserNameIdentityToken, password) - sizeof(UA_ByteString), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
-},
+},};
+
+/* X509IdentityToken */
+static UA_DataTypeMember X509IdentityToken_members[2] = {
 {
-    UA_TYPENAME("Value") /* .memberName */
-    UA_TYPES_VARIANT, /* .memberTypeIndex */
-    offsetof(UA_VariableTypeAttributes, value) - offsetof(UA_VariableTypeAttributes, userWriteMask) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("PolicyId") /* .memberName */
+    UA_TYPES_STRING, /* .memberTypeIndex */
+    0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("DataType") /* .memberName */
-    UA_TYPES_NODEID, /* .memberTypeIndex */
-    offsetof(UA_VariableTypeAttributes, dataType) - offsetof(UA_VariableTypeAttributes, value) - sizeof(UA_Variant), /* .padding */
+    UA_TYPENAME("CertificateData") /* .memberName */
+    UA_TYPES_BYTESTRING, /* .memberTypeIndex */
+    offsetof(UA_X509IdentityToken, certificateData) - offsetof(UA_X509IdentityToken, policyId) - sizeof(UA_String), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
-},
+},};
+
+/* IssuedIdentityToken */
+static UA_DataTypeMember IssuedIdentityToken_members[3] = {
 {
-    UA_TYPENAME("ValueRank") /* .memberName */
-    UA_TYPES_INT32, /* .memberTypeIndex */
-    offsetof(UA_VariableTypeAttributes, valueRank) - offsetof(UA_VariableTypeAttributes, dataType) - sizeof(UA_NodeId), /* .padding */
+    UA_TYPENAME("PolicyId") /* .memberName */
+    UA_TYPES_STRING, /* .memberTypeIndex */
+    0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("ArrayDimensions") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_VariableTypeAttributes, arrayDimensionsSize) - offsetof(UA_VariableTypeAttributes, valueRank) - sizeof(UA_Int32), /* .padding */
+    UA_TYPENAME("TokenData") /* .memberName */
+    UA_TYPES_BYTESTRING, /* .memberTypeIndex */
+    offsetof(UA_IssuedIdentityToken, tokenData) - offsetof(UA_IssuedIdentityToken, policyId) - sizeof(UA_String), /* .padding */
     true, /* .namespaceZero */
-    true, /* .isArray */
+    false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("IsAbstract") /* .memberName */
-    UA_TYPES_BOOLEAN, /* .memberTypeIndex */
-    offsetof(UA_VariableTypeAttributes, isAbstract) - offsetof(UA_VariableTypeAttributes, arrayDimensions) - sizeof(void *), /* .padding */
+    UA_TYPENAME("EncryptionAlgorithm") /* .memberName */
+    UA_TYPES_STRING, /* .memberTypeIndex */
+    offsetof(UA_IssuedIdentityToken, encryptionAlgorithm) - offsetof(UA_IssuedIdentityToken, tokenData) - sizeof(UA_ByteString), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },};
 
-/* CallMethodResult */
-static UA_DataTypeMember CallMethodResult_members[4] = {
+/* ActivateSessionRequest */
+static UA_DataTypeMember ActivateSessionRequest_members[6] = {
 {
-    UA_TYPENAME("StatusCode") /* .memberName */
-    UA_TYPES_STATUSCODE, /* .memberTypeIndex */
+    UA_TYPENAME("RequestHeader") /* .memberName */
+    UA_TYPES_REQUESTHEADER, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("InputArgumentResults") /* .memberName */
-    UA_TYPES_STATUSCODE, /* .memberTypeIndex */
-    offsetof(UA_CallMethodResult, inputArgumentResultsSize) - offsetof(UA_CallMethodResult, statusCode) - sizeof(UA_StatusCode), /* .padding */
+    UA_TYPENAME("ClientSignature") /* .memberName */
+    UA_TYPES_SIGNATUREDATA, /* .memberTypeIndex */
+    offsetof(UA_ActivateSessionRequest, clientSignature) - offsetof(UA_ActivateSessionRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
     true, /* .namespaceZero */
-    true, /* .isArray */
+    false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("InputArgumentDiagnosticInfos") /* .memberName */
-    UA_TYPES_DIAGNOSTICINFO, /* .memberTypeIndex */
-    offsetof(UA_CallMethodResult, inputArgumentDiagnosticInfosSize) - offsetof(UA_CallMethodResult, inputArgumentResults) - sizeof(void *), /* .padding */
+    UA_TYPENAME("ClientSoftwareCertificates") /* .memberName */
+    UA_TYPES_SIGNEDSOFTWARECERTIFICATE, /* .memberTypeIndex */
+    offsetof(UA_ActivateSessionRequest, clientSoftwareCertificatesSize) - offsetof(UA_ActivateSessionRequest, clientSignature) - sizeof(UA_SignatureData), /* .padding */
     true, /* .namespaceZero */
     true, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("OutputArguments") /* .memberName */
-    UA_TYPES_VARIANT, /* .memberTypeIndex */
-    offsetof(UA_CallMethodResult, outputArgumentsSize) - offsetof(UA_CallMethodResult, inputArgumentDiagnosticInfos) - sizeof(void *), /* .padding */
+    UA_TYPENAME("LocaleIds") /* .memberName */
+    UA_TYPES_STRING, /* .memberTypeIndex */
+    offsetof(UA_ActivateSessionRequest, localeIdsSize) - offsetof(UA_ActivateSessionRequest, clientSoftwareCertificates) - sizeof(void *), /* .padding */
     true, /* .namespaceZero */
     true, /* .isArray */
     false /* .isOptional */
+},
+{
+    UA_TYPENAME("UserIdentityToken") /* .memberName */
+    UA_TYPES_EXTENSIONOBJECT, /* .memberTypeIndex */
+    offsetof(UA_ActivateSessionRequest, userIdentityToken) - offsetof(UA_ActivateSessionRequest, localeIds) - sizeof(void *), /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
+    false /* .isOptional */
+},
+{
+    UA_TYPENAME("UserTokenSignature") /* .memberName */
+    UA_TYPES_SIGNATUREDATA, /* .memberTypeIndex */
+    offsetof(UA_ActivateSessionRequest, userTokenSignature) - offsetof(UA_ActivateSessionRequest, userIdentityToken) - sizeof(UA_ExtensionObject), /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
+    false /* .isOptional */
 },};
 
-/* MonitoringMode */
-#define MonitoringMode_members NULL
-
-/* SetMonitoringModeResponse */
-static UA_DataTypeMember SetMonitoringModeResponse_members[3] = {
+/* ActivateSessionResponse */
+static UA_DataTypeMember ActivateSessionResponse_members[4] = {
 {
     UA_TYPENAME("ResponseHeader") /* .memberName */
     UA_TYPES_RESPONSEHEADER, /* .memberTypeIndex */
@@ -11605,9 +12167,17 @@ static UA_DataTypeMember SetMonitoringModeResponse_members[3] = {
     false /* .isOptional */
 },
 {
+    UA_TYPENAME("ServerNonce") /* .memberName */
+    UA_TYPES_BYTESTRING, /* .memberTypeIndex */
+    offsetof(UA_ActivateSessionResponse, serverNonce) - offsetof(UA_ActivateSessionResponse, responseHeader) - sizeof(UA_ResponseHeader), /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
+    false /* .isOptional */
+},
+{
     UA_TYPENAME("Results") /* .memberName */
     UA_TYPES_STATUSCODE, /* .memberTypeIndex */
-    offsetof(UA_SetMonitoringModeResponse, resultsSize) - offsetof(UA_SetMonitoringModeResponse, responseHeader) - sizeof(UA_ResponseHeader), /* .padding */
+    offsetof(UA_ActivateSessionResponse, resultsSize) - offsetof(UA_ActivateSessionResponse, serverNonce) - sizeof(UA_ByteString), /* .padding */
     true, /* .namespaceZero */
     true, /* .isArray */
     false /* .isOptional */
@@ -11615,124 +12185,143 @@ static UA_DataTypeMember SetMonitoringModeResponse_members[3] = {
 {
     UA_TYPENAME("DiagnosticInfos") /* .memberName */
     UA_TYPES_DIAGNOSTICINFO, /* .memberTypeIndex */
-    offsetof(UA_SetMonitoringModeResponse, diagnosticInfosSize) - offsetof(UA_SetMonitoringModeResponse, results) - sizeof(void *), /* .padding */
+    offsetof(UA_ActivateSessionResponse, diagnosticInfosSize) - offsetof(UA_ActivateSessionResponse, results) - sizeof(void *), /* .padding */
     true, /* .namespaceZero */
     true, /* .isArray */
     false /* .isOptional */
 },};
 
-/* BrowseResultMask */
-#define BrowseResultMask_members NULL
-
-/* RequestHeader */
-static UA_DataTypeMember RequestHeader_members[7] = {
+/* CloseSessionRequest */
+static UA_DataTypeMember CloseSessionRequest_members[2] = {
 {
-    UA_TYPENAME("AuthenticationToken") /* .memberName */
-    UA_TYPES_NODEID, /* .memberTypeIndex */
+    UA_TYPENAME("RequestHeader") /* .memberName */
+    UA_TYPES_REQUESTHEADER, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("Timestamp") /* .memberName */
-    UA_TYPES_DATETIME, /* .memberTypeIndex */
-    offsetof(UA_RequestHeader, timestamp) - offsetof(UA_RequestHeader, authenticationToken) - sizeof(UA_NodeId), /* .padding */
+    UA_TYPENAME("DeleteSubscriptions") /* .memberName */
+    UA_TYPES_BOOLEAN, /* .memberTypeIndex */
+    offsetof(UA_CloseSessionRequest, deleteSubscriptions) - offsetof(UA_CloseSessionRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
-},
+},};
+
+/* CloseSessionResponse */
+static UA_DataTypeMember CloseSessionResponse_members[1] = {
 {
-    UA_TYPENAME("RequestHandle") /* .memberName */
+    UA_TYPENAME("ResponseHeader") /* .memberName */
+    UA_TYPES_RESPONSEHEADER, /* .memberTypeIndex */
+    0, /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
+    false /* .isOptional */
+},};
+
+/* NodeAttributesMask */
+#define NodeAttributesMask_members NULL
+
+/* NodeAttributes */
+static UA_DataTypeMember NodeAttributes_members[5] = {
+{
+    UA_TYPENAME("SpecifiedAttributes") /* .memberName */
     UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_RequestHeader, requestHandle) - offsetof(UA_RequestHeader, timestamp) - sizeof(UA_DateTime), /* .padding */
+    0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("ReturnDiagnostics") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_RequestHeader, returnDiagnostics) - offsetof(UA_RequestHeader, requestHandle) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("DisplayName") /* .memberName */
+    UA_TYPES_LOCALIZEDTEXT, /* .memberTypeIndex */
+    offsetof(UA_NodeAttributes, displayName) - offsetof(UA_NodeAttributes, specifiedAttributes) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("AuditEntryId") /* .memberName */
-    UA_TYPES_STRING, /* .memberTypeIndex */
-    offsetof(UA_RequestHeader, auditEntryId) - offsetof(UA_RequestHeader, returnDiagnostics) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("Description") /* .memberName */
+    UA_TYPES_LOCALIZEDTEXT, /* .memberTypeIndex */
+    offsetof(UA_NodeAttributes, description) - offsetof(UA_NodeAttributes, displayName) - sizeof(UA_LocalizedText), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("TimeoutHint") /* .memberName */
+    UA_TYPENAME("WriteMask") /* .memberName */
     UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_RequestHeader, timeoutHint) - offsetof(UA_RequestHeader, auditEntryId) - sizeof(UA_String), /* .padding */
+    offsetof(UA_NodeAttributes, writeMask) - offsetof(UA_NodeAttributes, description) - sizeof(UA_LocalizedText), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("AdditionalHeader") /* .memberName */
-    UA_TYPES_EXTENSIONOBJECT, /* .memberTypeIndex */
-    offsetof(UA_RequestHeader, additionalHeader) - offsetof(UA_RequestHeader, timeoutHint) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("UserWriteMask") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_NodeAttributes, userWriteMask) - offsetof(UA_NodeAttributes, writeMask) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },};
 
-/* MonitoredItemModifyResult */
-static UA_DataTypeMember MonitoredItemModifyResult_members[4] = {
+/* ObjectAttributes */
+static UA_DataTypeMember ObjectAttributes_members[6] = {
 {
-    UA_TYPENAME("StatusCode") /* .memberName */
-    UA_TYPES_STATUSCODE, /* .memberTypeIndex */
+    UA_TYPENAME("SpecifiedAttributes") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("RevisedSamplingInterval") /* .memberName */
-    UA_TYPES_DOUBLE, /* .memberTypeIndex */
-    offsetof(UA_MonitoredItemModifyResult, revisedSamplingInterval) - offsetof(UA_MonitoredItemModifyResult, statusCode) - sizeof(UA_StatusCode), /* .padding */
+    UA_TYPENAME("DisplayName") /* .memberName */
+    UA_TYPES_LOCALIZEDTEXT, /* .memberTypeIndex */
+    offsetof(UA_ObjectAttributes, displayName) - offsetof(UA_ObjectAttributes, specifiedAttributes) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("RevisedQueueSize") /* .memberName */
+    UA_TYPENAME("Description") /* .memberName */
+    UA_TYPES_LOCALIZEDTEXT, /* .memberTypeIndex */
+    offsetof(UA_ObjectAttributes, description) - offsetof(UA_ObjectAttributes, displayName) - sizeof(UA_LocalizedText), /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
+    false /* .isOptional */
+},
+{
+    UA_TYPENAME("WriteMask") /* .memberName */
     UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_MonitoredItemModifyResult, revisedQueueSize) - offsetof(UA_MonitoredItemModifyResult, revisedSamplingInterval) - sizeof(UA_Double), /* .padding */
+    offsetof(UA_ObjectAttributes, writeMask) - offsetof(UA_ObjectAttributes, description) - sizeof(UA_LocalizedText), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("FilterResult") /* .memberName */
-    UA_TYPES_EXTENSIONOBJECT, /* .memberTypeIndex */
-    offsetof(UA_MonitoredItemModifyResult, filterResult) - offsetof(UA_MonitoredItemModifyResult, revisedQueueSize) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("UserWriteMask") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_ObjectAttributes, userWriteMask) - offsetof(UA_ObjectAttributes, writeMask) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
-},};
-
-/* CloseSecureChannelRequest */
-static UA_DataTypeMember CloseSecureChannelRequest_members[1] = {
+},
 {
-    UA_TYPENAME("RequestHeader") /* .memberName */
-    UA_TYPES_REQUESTHEADER, /* .memberTypeIndex */
-    0, /* .padding */
+    UA_TYPENAME("EventNotifier") /* .memberName */
+    UA_TYPES_BYTE, /* .memberTypeIndex */
+    offsetof(UA_ObjectAttributes, eventNotifier) - offsetof(UA_ObjectAttributes, userWriteMask) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },};
 
-/* NotificationMessage */
-static UA_DataTypeMember NotificationMessage_members[3] = {
+/* VariableAttributes */
+static UA_DataTypeMember VariableAttributes_members[13] = {
 {
-    UA_TYPENAME("SequenceNumber") /* .memberName */
+    UA_TYPENAME("SpecifiedAttributes") /* .memberName */
     UA_TYPES_UINT32, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
@@ -11740,142 +12329,161 @@ static UA_DataTypeMember NotificationMessage_members[3] = {
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("PublishTime") /* .memberName */
-    UA_TYPES_DATETIME, /* .memberTypeIndex */
-    offsetof(UA_NotificationMessage, publishTime) - offsetof(UA_NotificationMessage, sequenceNumber) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("DisplayName") /* .memberName */
+    UA_TYPES_LOCALIZEDTEXT, /* .memberTypeIndex */
+    offsetof(UA_VariableAttributes, displayName) - offsetof(UA_VariableAttributes, specifiedAttributes) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("NotificationData") /* .memberName */
-    UA_TYPES_EXTENSIONOBJECT, /* .memberTypeIndex */
-    offsetof(UA_NotificationMessage, notificationDataSize) - offsetof(UA_NotificationMessage, publishTime) - sizeof(UA_DateTime), /* .padding */
+    UA_TYPENAME("Description") /* .memberName */
+    UA_TYPES_LOCALIZEDTEXT, /* .memberTypeIndex */
+    offsetof(UA_VariableAttributes, description) - offsetof(UA_VariableAttributes, displayName) - sizeof(UA_LocalizedText), /* .padding */
     true, /* .namespaceZero */
-    true, /* .isArray */
+    false, /* .isArray */
     false /* .isOptional */
-},};
-
-/* CreateSubscriptionResponse */
-static UA_DataTypeMember CreateSubscriptionResponse_members[5] = {
+},
 {
-    UA_TYPENAME("ResponseHeader") /* .memberName */
-    UA_TYPES_RESPONSEHEADER, /* .memberTypeIndex */
-    0, /* .padding */
+    UA_TYPENAME("WriteMask") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_VariableAttributes, writeMask) - offsetof(UA_VariableAttributes, description) - sizeof(UA_LocalizedText), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("SubscriptionId") /* .memberName */
+    UA_TYPENAME("UserWriteMask") /* .memberName */
     UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_CreateSubscriptionResponse, subscriptionId) - offsetof(UA_CreateSubscriptionResponse, responseHeader) - sizeof(UA_ResponseHeader), /* .padding */
+    offsetof(UA_VariableAttributes, userWriteMask) - offsetof(UA_VariableAttributes, writeMask) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("RevisedPublishingInterval") /* .memberName */
-    UA_TYPES_DOUBLE, /* .memberTypeIndex */
-    offsetof(UA_CreateSubscriptionResponse, revisedPublishingInterval) - offsetof(UA_CreateSubscriptionResponse, subscriptionId) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("Value") /* .memberName */
+    UA_TYPES_VARIANT, /* .memberTypeIndex */
+    offsetof(UA_VariableAttributes, value) - offsetof(UA_VariableAttributes, userWriteMask) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("RevisedLifetimeCount") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_CreateSubscriptionResponse, revisedLifetimeCount) - offsetof(UA_CreateSubscriptionResponse, revisedPublishingInterval) - sizeof(UA_Double), /* .padding */
+    UA_TYPENAME("DataType") /* .memberName */
+    UA_TYPES_NODEID, /* .memberTypeIndex */
+    offsetof(UA_VariableAttributes, dataType) - offsetof(UA_VariableAttributes, value) - sizeof(UA_Variant), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("RevisedMaxKeepAliveCount") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_CreateSubscriptionResponse, revisedMaxKeepAliveCount) - offsetof(UA_CreateSubscriptionResponse, revisedLifetimeCount) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("ValueRank") /* .memberName */
+    UA_TYPES_INT32, /* .memberTypeIndex */
+    offsetof(UA_VariableAttributes, valueRank) - offsetof(UA_VariableAttributes, dataType) - sizeof(UA_NodeId), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
-},};
-
-/* EnumDefinition */
-static UA_DataTypeMember EnumDefinition_members[1] = {
+},
 {
-    UA_TYPENAME("Fields") /* .memberName */
-    UA_TYPES_ENUMFIELD, /* .memberTypeIndex */
-    0, /* .padding */
+    UA_TYPENAME("ArrayDimensions") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_VariableAttributes, arrayDimensionsSize) - offsetof(UA_VariableAttributes, valueRank) - sizeof(UA_Int32), /* .padding */
     true, /* .namespaceZero */
     true, /* .isArray */
     false /* .isOptional */
-},};
-
-/* AxisScaleEnumeration */
-#define AxisScaleEnumeration_members NULL
-
-/* BrowseDirection */
-#define BrowseDirection_members NULL
-
-/* CallMethodRequest */
-static UA_DataTypeMember CallMethodRequest_members[3] = {
+},
 {
-    UA_TYPENAME("ObjectId") /* .memberName */
-    UA_TYPES_NODEID, /* .memberTypeIndex */
-    0, /* .padding */
+    UA_TYPENAME("AccessLevel") /* .memberName */
+    UA_TYPES_BYTE, /* .memberTypeIndex */
+    offsetof(UA_VariableAttributes, accessLevel) - offsetof(UA_VariableAttributes, arrayDimensions) - sizeof(void *), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("MethodId") /* .memberName */
-    UA_TYPES_NODEID, /* .memberTypeIndex */
-    offsetof(UA_CallMethodRequest, methodId) - offsetof(UA_CallMethodRequest, objectId) - sizeof(UA_NodeId), /* .padding */
+    UA_TYPENAME("UserAccessLevel") /* .memberName */
+    UA_TYPES_BYTE, /* .memberTypeIndex */
+    offsetof(UA_VariableAttributes, userAccessLevel) - offsetof(UA_VariableAttributes, accessLevel) - sizeof(UA_Byte), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("InputArguments") /* .memberName */
-    UA_TYPES_VARIANT, /* .memberTypeIndex */
-    offsetof(UA_CallMethodRequest, inputArgumentsSize) - offsetof(UA_CallMethodRequest, methodId) - sizeof(UA_NodeId), /* .padding */
+    UA_TYPENAME("MinimumSamplingInterval") /* .memberName */
+    UA_TYPES_DOUBLE, /* .memberTypeIndex */
+    offsetof(UA_VariableAttributes, minimumSamplingInterval) - offsetof(UA_VariableAttributes, userAccessLevel) - sizeof(UA_Byte), /* .padding */
     true, /* .namespaceZero */
-    true, /* .isArray */
+    false, /* .isArray */
+    false /* .isOptional */
+},
+{
+    UA_TYPENAME("Historizing") /* .memberName */
+    UA_TYPES_BOOLEAN, /* .memberTypeIndex */
+    offsetof(UA_VariableAttributes, historizing) - offsetof(UA_VariableAttributes, minimumSamplingInterval) - sizeof(UA_Double), /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
     false /* .isOptional */
 },};
 
-/* ReadResponse */
-static UA_DataTypeMember ReadResponse_members[3] = {
+/* MethodAttributes */
+static UA_DataTypeMember MethodAttributes_members[7] = {
 {
-    UA_TYPENAME("ResponseHeader") /* .memberName */
-    UA_TYPES_RESPONSEHEADER, /* .memberTypeIndex */
+    UA_TYPENAME("SpecifiedAttributes") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("Results") /* .memberName */
-    UA_TYPES_DATAVALUE, /* .memberTypeIndex */
-    offsetof(UA_ReadResponse, resultsSize) - offsetof(UA_ReadResponse, responseHeader) - sizeof(UA_ResponseHeader), /* .padding */
+    UA_TYPENAME("DisplayName") /* .memberName */
+    UA_TYPES_LOCALIZEDTEXT, /* .memberTypeIndex */
+    offsetof(UA_MethodAttributes, displayName) - offsetof(UA_MethodAttributes, specifiedAttributes) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
-    true, /* .isArray */
+    false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("DiagnosticInfos") /* .memberName */
-    UA_TYPES_DIAGNOSTICINFO, /* .memberTypeIndex */
-    offsetof(UA_ReadResponse, diagnosticInfosSize) - offsetof(UA_ReadResponse, results) - sizeof(void *), /* .padding */
+    UA_TYPENAME("Description") /* .memberName */
+    UA_TYPES_LOCALIZEDTEXT, /* .memberTypeIndex */
+    offsetof(UA_MethodAttributes, description) - offsetof(UA_MethodAttributes, displayName) - sizeof(UA_LocalizedText), /* .padding */
     true, /* .namespaceZero */
-    true, /* .isArray */
+    false, /* .isArray */
+    false /* .isOptional */
+},
+{
+    UA_TYPENAME("WriteMask") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_MethodAttributes, writeMask) - offsetof(UA_MethodAttributes, description) - sizeof(UA_LocalizedText), /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
+    false /* .isOptional */
+},
+{
+    UA_TYPENAME("UserWriteMask") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_MethodAttributes, userWriteMask) - offsetof(UA_MethodAttributes, writeMask) - sizeof(UA_UInt32), /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
+    false /* .isOptional */
+},
+{
+    UA_TYPENAME("Executable") /* .memberName */
+    UA_TYPES_BOOLEAN, /* .memberTypeIndex */
+    offsetof(UA_MethodAttributes, executable) - offsetof(UA_MethodAttributes, userWriteMask) - sizeof(UA_UInt32), /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
+    false /* .isOptional */
+},
+{
+    UA_TYPENAME("UserExecutable") /* .memberName */
+    UA_TYPES_BOOLEAN, /* .memberTypeIndex */
+    offsetof(UA_MethodAttributes, userExecutable) - offsetof(UA_MethodAttributes, executable) - sizeof(UA_Boolean), /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
     false /* .isOptional */
 },};
 
-/* TimestampsToReturn */
-#define TimestampsToReturn_members NULL
-
-/* NodeClass */
-#define NodeClass_members NULL
-
 /* ObjectTypeAttributes */
 static UA_DataTypeMember ObjectTypeAttributes_members[6] = {
 {
@@ -11927,303 +12535,322 @@ static UA_DataTypeMember ObjectTypeAttributes_members[6] = {
     false /* .isOptional */
 },};
 
-/* SecurityTokenRequestType */
-#define SecurityTokenRequestType_members NULL
-
-/* CloseSessionResponse */
-static UA_DataTypeMember CloseSessionResponse_members[1] = {
+/* VariableTypeAttributes */
+static UA_DataTypeMember VariableTypeAttributes_members[10] = {
 {
-    UA_TYPENAME("ResponseHeader") /* .memberName */
-    UA_TYPES_RESPONSEHEADER, /* .memberTypeIndex */
+    UA_TYPENAME("SpecifiedAttributes") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
-},};
-
-/* SetPublishingModeRequest */
-static UA_DataTypeMember SetPublishingModeRequest_members[3] = {
+},
 {
-    UA_TYPENAME("RequestHeader") /* .memberName */
-    UA_TYPES_REQUESTHEADER, /* .memberTypeIndex */
-    0, /* .padding */
+    UA_TYPENAME("DisplayName") /* .memberName */
+    UA_TYPES_LOCALIZEDTEXT, /* .memberTypeIndex */
+    offsetof(UA_VariableTypeAttributes, displayName) - offsetof(UA_VariableTypeAttributes, specifiedAttributes) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("PublishingEnabled") /* .memberName */
-    UA_TYPES_BOOLEAN, /* .memberTypeIndex */
-    offsetof(UA_SetPublishingModeRequest, publishingEnabled) - offsetof(UA_SetPublishingModeRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
+    UA_TYPENAME("Description") /* .memberName */
+    UA_TYPES_LOCALIZEDTEXT, /* .memberTypeIndex */
+    offsetof(UA_VariableTypeAttributes, description) - offsetof(UA_VariableTypeAttributes, displayName) - sizeof(UA_LocalizedText), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("SubscriptionIds") /* .memberName */
+    UA_TYPENAME("WriteMask") /* .memberName */
     UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_SetPublishingModeRequest, subscriptionIdsSize) - offsetof(UA_SetPublishingModeRequest, publishingEnabled) - sizeof(UA_Boolean), /* .padding */
+    offsetof(UA_VariableTypeAttributes, writeMask) - offsetof(UA_VariableTypeAttributes, description) - sizeof(UA_LocalizedText), /* .padding */
     true, /* .namespaceZero */
-    true, /* .isArray */
+    false, /* .isArray */
     false /* .isOptional */
-},};
-
-/* IssuedIdentityToken */
-static UA_DataTypeMember IssuedIdentityToken_members[3] = {
+},
 {
-    UA_TYPENAME("PolicyId") /* .memberName */
-    UA_TYPES_STRING, /* .memberTypeIndex */
-    0, /* .padding */
+    UA_TYPENAME("UserWriteMask") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_VariableTypeAttributes, userWriteMask) - offsetof(UA_VariableTypeAttributes, writeMask) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("TokenData") /* .memberName */
-    UA_TYPES_BYTESTRING, /* .memberTypeIndex */
-    offsetof(UA_IssuedIdentityToken, tokenData) - offsetof(UA_IssuedIdentityToken, policyId) - sizeof(UA_String), /* .padding */
+    UA_TYPENAME("Value") /* .memberName */
+    UA_TYPES_VARIANT, /* .memberTypeIndex */
+    offsetof(UA_VariableTypeAttributes, value) - offsetof(UA_VariableTypeAttributes, userWriteMask) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("EncryptionAlgorithm") /* .memberName */
-    UA_TYPES_STRING, /* .memberTypeIndex */
-    offsetof(UA_IssuedIdentityToken, encryptionAlgorithm) - offsetof(UA_IssuedIdentityToken, tokenData) - sizeof(UA_ByteString), /* .padding */
+    UA_TYPENAME("DataType") /* .memberName */
+    UA_TYPES_NODEID, /* .memberTypeIndex */
+    offsetof(UA_VariableTypeAttributes, dataType) - offsetof(UA_VariableTypeAttributes, value) - sizeof(UA_Variant), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
-},};
-
-/* DeleteMonitoredItemsResponse */
-static UA_DataTypeMember DeleteMonitoredItemsResponse_members[3] = {
+},
 {
-    UA_TYPENAME("ResponseHeader") /* .memberName */
-    UA_TYPES_RESPONSEHEADER, /* .memberTypeIndex */
-    0, /* .padding */
+    UA_TYPENAME("ValueRank") /* .memberName */
+    UA_TYPES_INT32, /* .memberTypeIndex */
+    offsetof(UA_VariableTypeAttributes, valueRank) - offsetof(UA_VariableTypeAttributes, dataType) - sizeof(UA_NodeId), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("Results") /* .memberName */
-    UA_TYPES_STATUSCODE, /* .memberTypeIndex */
-    offsetof(UA_DeleteMonitoredItemsResponse, resultsSize) - offsetof(UA_DeleteMonitoredItemsResponse, responseHeader) - sizeof(UA_ResponseHeader), /* .padding */
+    UA_TYPENAME("ArrayDimensions") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_VariableTypeAttributes, arrayDimensionsSize) - offsetof(UA_VariableTypeAttributes, valueRank) - sizeof(UA_Int32), /* .padding */
     true, /* .namespaceZero */
     true, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("DiagnosticInfos") /* .memberName */
-    UA_TYPES_DIAGNOSTICINFO, /* .memberTypeIndex */
-    offsetof(UA_DeleteMonitoredItemsResponse, diagnosticInfosSize) - offsetof(UA_DeleteMonitoredItemsResponse, results) - sizeof(void *), /* .padding */
+    UA_TYPENAME("IsAbstract") /* .memberName */
+    UA_TYPES_BOOLEAN, /* .memberTypeIndex */
+    offsetof(UA_VariableTypeAttributes, isAbstract) - offsetof(UA_VariableTypeAttributes, arrayDimensions) - sizeof(void *), /* .padding */
     true, /* .namespaceZero */
-    true, /* .isArray */
+    false, /* .isArray */
     false /* .isOptional */
 },};
 
-/* ApplicationType */
-#define ApplicationType_members NULL
-
-/* BrowseNextRequest */
-static UA_DataTypeMember BrowseNextRequest_members[3] = {
+/* ReferenceTypeAttributes */
+static UA_DataTypeMember ReferenceTypeAttributes_members[8] = {
 {
-    UA_TYPENAME("RequestHeader") /* .memberName */
-    UA_TYPES_REQUESTHEADER, /* .memberTypeIndex */
+    UA_TYPENAME("SpecifiedAttributes") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("ReleaseContinuationPoints") /* .memberName */
-    UA_TYPES_BOOLEAN, /* .memberTypeIndex */
-    offsetof(UA_BrowseNextRequest, releaseContinuationPoints) - offsetof(UA_BrowseNextRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
+    UA_TYPENAME("DisplayName") /* .memberName */
+    UA_TYPES_LOCALIZEDTEXT, /* .memberTypeIndex */
+    offsetof(UA_ReferenceTypeAttributes, displayName) - offsetof(UA_ReferenceTypeAttributes, specifiedAttributes) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("ContinuationPoints") /* .memberName */
-    UA_TYPES_BYTESTRING, /* .memberTypeIndex */
-    offsetof(UA_BrowseNextRequest, continuationPointsSize) - offsetof(UA_BrowseNextRequest, releaseContinuationPoints) - sizeof(UA_Boolean), /* .padding */
+    UA_TYPENAME("Description") /* .memberName */
+    UA_TYPES_LOCALIZEDTEXT, /* .memberTypeIndex */
+    offsetof(UA_ReferenceTypeAttributes, description) - offsetof(UA_ReferenceTypeAttributes, displayName) - sizeof(UA_LocalizedText), /* .padding */
     true, /* .namespaceZero */
-    true, /* .isArray */
+    false, /* .isArray */
     false /* .isOptional */
-},};
-
-/* ModifySubscriptionRequest */
-static UA_DataTypeMember ModifySubscriptionRequest_members[7] = {
+},
 {
-    UA_TYPENAME("RequestHeader") /* .memberName */
-    UA_TYPES_REQUESTHEADER, /* .memberTypeIndex */
-    0, /* .padding */
+    UA_TYPENAME("WriteMask") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_ReferenceTypeAttributes, writeMask) - offsetof(UA_ReferenceTypeAttributes, description) - sizeof(UA_LocalizedText), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("SubscriptionId") /* .memberName */
+    UA_TYPENAME("UserWriteMask") /* .memberName */
     UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_ModifySubscriptionRequest, subscriptionId) - offsetof(UA_ModifySubscriptionRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
+    offsetof(UA_ReferenceTypeAttributes, userWriteMask) - offsetof(UA_ReferenceTypeAttributes, writeMask) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("RequestedPublishingInterval") /* .memberName */
-    UA_TYPES_DOUBLE, /* .memberTypeIndex */
-    offsetof(UA_ModifySubscriptionRequest, requestedPublishingInterval) - offsetof(UA_ModifySubscriptionRequest, subscriptionId) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("IsAbstract") /* .memberName */
+    UA_TYPES_BOOLEAN, /* .memberTypeIndex */
+    offsetof(UA_ReferenceTypeAttributes, isAbstract) - offsetof(UA_ReferenceTypeAttributes, userWriteMask) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("RequestedLifetimeCount") /* .memberName */
+    UA_TYPENAME("Symmetric") /* .memberName */
+    UA_TYPES_BOOLEAN, /* .memberTypeIndex */
+    offsetof(UA_ReferenceTypeAttributes, symmetric) - offsetof(UA_ReferenceTypeAttributes, isAbstract) - sizeof(UA_Boolean), /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
+    false /* .isOptional */
+},
+{
+    UA_TYPENAME("InverseName") /* .memberName */
+    UA_TYPES_LOCALIZEDTEXT, /* .memberTypeIndex */
+    offsetof(UA_ReferenceTypeAttributes, inverseName) - offsetof(UA_ReferenceTypeAttributes, symmetric) - sizeof(UA_Boolean), /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
+    false /* .isOptional */
+},};
+
+/* DataTypeAttributes */
+static UA_DataTypeMember DataTypeAttributes_members[6] = {
+{
+    UA_TYPENAME("SpecifiedAttributes") /* .memberName */
     UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_ModifySubscriptionRequest, requestedLifetimeCount) - offsetof(UA_ModifySubscriptionRequest, requestedPublishingInterval) - sizeof(UA_Double), /* .padding */
+    0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("RequestedMaxKeepAliveCount") /* .memberName */
+    UA_TYPENAME("DisplayName") /* .memberName */
+    UA_TYPES_LOCALIZEDTEXT, /* .memberTypeIndex */
+    offsetof(UA_DataTypeAttributes, displayName) - offsetof(UA_DataTypeAttributes, specifiedAttributes) - sizeof(UA_UInt32), /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
+    false /* .isOptional */
+},
+{
+    UA_TYPENAME("Description") /* .memberName */
+    UA_TYPES_LOCALIZEDTEXT, /* .memberTypeIndex */
+    offsetof(UA_DataTypeAttributes, description) - offsetof(UA_DataTypeAttributes, displayName) - sizeof(UA_LocalizedText), /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
+    false /* .isOptional */
+},
+{
+    UA_TYPENAME("WriteMask") /* .memberName */
     UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_ModifySubscriptionRequest, requestedMaxKeepAliveCount) - offsetof(UA_ModifySubscriptionRequest, requestedLifetimeCount) - sizeof(UA_UInt32), /* .padding */
+    offsetof(UA_DataTypeAttributes, writeMask) - offsetof(UA_DataTypeAttributes, description) - sizeof(UA_LocalizedText), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("MaxNotificationsPerPublish") /* .memberName */
+    UA_TYPENAME("UserWriteMask") /* .memberName */
     UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_ModifySubscriptionRequest, maxNotificationsPerPublish) - offsetof(UA_ModifySubscriptionRequest, requestedMaxKeepAliveCount) - sizeof(UA_UInt32), /* .padding */
+    offsetof(UA_DataTypeAttributes, userWriteMask) - offsetof(UA_DataTypeAttributes, writeMask) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("Priority") /* .memberName */
-    UA_TYPES_BYTE, /* .memberTypeIndex */
-    offsetof(UA_ModifySubscriptionRequest, priority) - offsetof(UA_ModifySubscriptionRequest, maxNotificationsPerPublish) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("IsAbstract") /* .memberName */
+    UA_TYPES_BOOLEAN, /* .memberTypeIndex */
+    offsetof(UA_DataTypeAttributes, isAbstract) - offsetof(UA_DataTypeAttributes, userWriteMask) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },};
 
-/* BrowseDescription */
-static UA_DataTypeMember BrowseDescription_members[6] = {
+/* ViewAttributes */
+static UA_DataTypeMember ViewAttributes_members[7] = {
 {
-    UA_TYPENAME("NodeId") /* .memberName */
-    UA_TYPES_NODEID, /* .memberTypeIndex */
+    UA_TYPENAME("SpecifiedAttributes") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("BrowseDirection") /* .memberName */
-    UA_TYPES_BROWSEDIRECTION, /* .memberTypeIndex */
-    offsetof(UA_BrowseDescription, browseDirection) - offsetof(UA_BrowseDescription, nodeId) - sizeof(UA_NodeId), /* .padding */
+    UA_TYPENAME("DisplayName") /* .memberName */
+    UA_TYPES_LOCALIZEDTEXT, /* .memberTypeIndex */
+    offsetof(UA_ViewAttributes, displayName) - offsetof(UA_ViewAttributes, specifiedAttributes) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("ReferenceTypeId") /* .memberName */
-    UA_TYPES_NODEID, /* .memberTypeIndex */
-    offsetof(UA_BrowseDescription, referenceTypeId) - offsetof(UA_BrowseDescription, browseDirection) - sizeof(UA_BrowseDirection), /* .padding */
+    UA_TYPENAME("Description") /* .memberName */
+    UA_TYPES_LOCALIZEDTEXT, /* .memberTypeIndex */
+    offsetof(UA_ViewAttributes, description) - offsetof(UA_ViewAttributes, displayName) - sizeof(UA_LocalizedText), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("IncludeSubtypes") /* .memberName */
-    UA_TYPES_BOOLEAN, /* .memberTypeIndex */
-    offsetof(UA_BrowseDescription, includeSubtypes) - offsetof(UA_BrowseDescription, referenceTypeId) - sizeof(UA_NodeId), /* .padding */
+    UA_TYPENAME("WriteMask") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_ViewAttributes, writeMask) - offsetof(UA_ViewAttributes, description) - sizeof(UA_LocalizedText), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("NodeClassMask") /* .memberName */
+    UA_TYPENAME("UserWriteMask") /* .memberName */
     UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_BrowseDescription, nodeClassMask) - offsetof(UA_BrowseDescription, includeSubtypes) - sizeof(UA_Boolean), /* .padding */
+    offsetof(UA_ViewAttributes, userWriteMask) - offsetof(UA_ViewAttributes, writeMask) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("ResultMask") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_BrowseDescription, resultMask) - offsetof(UA_BrowseDescription, nodeClassMask) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("ContainsNoLoops") /* .memberName */
+    UA_TYPES_BOOLEAN, /* .memberTypeIndex */
+    offsetof(UA_ViewAttributes, containsNoLoops) - offsetof(UA_ViewAttributes, userWriteMask) - sizeof(UA_UInt32), /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
+    false /* .isOptional */
+},
+{
+    UA_TYPENAME("EventNotifier") /* .memberName */
+    UA_TYPES_BYTE, /* .memberTypeIndex */
+    offsetof(UA_ViewAttributes, eventNotifier) - offsetof(UA_ViewAttributes, containsNoLoops) - sizeof(UA_Boolean), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },};
 
-/* SignedSoftwareCertificate */
-static UA_DataTypeMember SignedSoftwareCertificate_members[2] = {
+/* AddNodesItem */
+static UA_DataTypeMember AddNodesItem_members[7] = {
 {
-    UA_TYPENAME("CertificateData") /* .memberName */
-    UA_TYPES_BYTESTRING, /* .memberTypeIndex */
+    UA_TYPENAME("ParentNodeId") /* .memberName */
+    UA_TYPES_EXPANDEDNODEID, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("Signature") /* .memberName */
-    UA_TYPES_BYTESTRING, /* .memberTypeIndex */
-    offsetof(UA_SignedSoftwareCertificate, signature) - offsetof(UA_SignedSoftwareCertificate, certificateData) - sizeof(UA_ByteString), /* .padding */
+    UA_TYPENAME("ReferenceTypeId") /* .memberName */
+    UA_TYPES_NODEID, /* .memberTypeIndex */
+    offsetof(UA_AddNodesItem, referenceTypeId) - offsetof(UA_AddNodesItem, parentNodeId) - sizeof(UA_ExpandedNodeId), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
-},};
-
-/* BrowsePathTarget */
-static UA_DataTypeMember BrowsePathTarget_members[2] = {
+},
 {
-    UA_TYPENAME("TargetId") /* .memberName */
+    UA_TYPENAME("RequestedNewNodeId") /* .memberName */
     UA_TYPES_EXPANDEDNODEID, /* .memberTypeIndex */
-    0, /* .padding */
+    offsetof(UA_AddNodesItem, requestedNewNodeId) - offsetof(UA_AddNodesItem, referenceTypeId) - sizeof(UA_NodeId), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("RemainingPathIndex") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_BrowsePathTarget, remainingPathIndex) - offsetof(UA_BrowsePathTarget, targetId) - sizeof(UA_ExpandedNodeId), /* .padding */
+    UA_TYPENAME("BrowseName") /* .memberName */
+    UA_TYPES_QUALIFIEDNAME, /* .memberTypeIndex */
+    offsetof(UA_AddNodesItem, browseName) - offsetof(UA_AddNodesItem, requestedNewNodeId) - sizeof(UA_ExpandedNodeId), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
-},};
-
-/* WriteResponse */
-static UA_DataTypeMember WriteResponse_members[3] = {
+},
 {
-    UA_TYPENAME("ResponseHeader") /* .memberName */
-    UA_TYPES_RESPONSEHEADER, /* .memberTypeIndex */
-    0, /* .padding */
+    UA_TYPENAME("NodeClass") /* .memberName */
+    UA_TYPES_NODECLASS, /* .memberTypeIndex */
+    offsetof(UA_AddNodesItem, nodeClass) - offsetof(UA_AddNodesItem, browseName) - sizeof(UA_QualifiedName), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("Results") /* .memberName */
-    UA_TYPES_STATUSCODE, /* .memberTypeIndex */
-    offsetof(UA_WriteResponse, resultsSize) - offsetof(UA_WriteResponse, responseHeader) - sizeof(UA_ResponseHeader), /* .padding */
+    UA_TYPENAME("NodeAttributes") /* .memberName */
+    UA_TYPES_EXTENSIONOBJECT, /* .memberTypeIndex */
+    offsetof(UA_AddNodesItem, nodeAttributes) - offsetof(UA_AddNodesItem, nodeClass) - sizeof(UA_NodeClass), /* .padding */
     true, /* .namespaceZero */
-    true, /* .isArray */
+    false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("DiagnosticInfos") /* .memberName */
-    UA_TYPES_DIAGNOSTICINFO, /* .memberTypeIndex */
-    offsetof(UA_WriteResponse, diagnosticInfosSize) - offsetof(UA_WriteResponse, results) - sizeof(void *), /* .padding */
+    UA_TYPENAME("TypeDefinition") /* .memberName */
+    UA_TYPES_EXPANDEDNODEID, /* .memberTypeIndex */
+    offsetof(UA_AddNodesItem, typeDefinition) - offsetof(UA_AddNodesItem, nodeAttributes) - sizeof(UA_ExtensionObject), /* .padding */
     true, /* .namespaceZero */
-    true, /* .isArray */
+    false, /* .isArray */
     false /* .isOptional */
 },};
 
@@ -12246,6 +12873,52 @@ static UA_DataTypeMember AddNodesResult_members[2] = {
     false /* .isOptional */
 },};
 
+/* AddNodesRequest */
+static UA_DataTypeMember AddNodesRequest_members[2] = {
+{
+    UA_TYPENAME("RequestHeader") /* .memberName */
+    UA_TYPES_REQUESTHEADER, /* .memberTypeIndex */
+    0, /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
+    false /* .isOptional */
+},
+{
+    UA_TYPENAME("NodesToAdd") /* .memberName */
+    UA_TYPES_ADDNODESITEM, /* .memberTypeIndex */
+    offsetof(UA_AddNodesRequest, nodesToAddSize) - offsetof(UA_AddNodesRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
+    true, /* .namespaceZero */
+    true, /* .isArray */
+    false /* .isOptional */
+},};
+
+/* AddNodesResponse */
+static UA_DataTypeMember AddNodesResponse_members[3] = {
+{
+    UA_TYPENAME("ResponseHeader") /* .memberName */
+    UA_TYPES_RESPONSEHEADER, /* .memberTypeIndex */
+    0, /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
+    false /* .isOptional */
+},
+{
+    UA_TYPENAME("Results") /* .memberName */
+    UA_TYPES_ADDNODESRESULT, /* .memberTypeIndex */
+    offsetof(UA_AddNodesResponse, resultsSize) - offsetof(UA_AddNodesResponse, responseHeader) - sizeof(UA_ResponseHeader), /* .padding */
+    true, /* .namespaceZero */
+    true, /* .isArray */
+    false /* .isOptional */
+},
+{
+    UA_TYPENAME("DiagnosticInfos") /* .memberName */
+    UA_TYPES_DIAGNOSTICINFO, /* .memberTypeIndex */
+    offsetof(UA_AddNodesResponse, diagnosticInfosSize) - offsetof(UA_AddNodesResponse, results) - sizeof(void *), /* .padding */
+    true, /* .namespaceZero */
+    true, /* .isArray */
+    false /* .isOptional */
+},};
+
 /* AddReferencesItem */
 static UA_DataTypeMember AddReferencesItem_members[6] = {
 {
@@ -12297,8 +12970,27 @@ static UA_DataTypeMember AddReferencesItem_members[6] = {
     false /* .isOptional */
 },};
 
-/* DeleteReferencesResponse */
-static UA_DataTypeMember DeleteReferencesResponse_members[3] = {
+/* AddReferencesRequest */
+static UA_DataTypeMember AddReferencesRequest_members[2] = {
+{
+    UA_TYPENAME("RequestHeader") /* .memberName */
+    UA_TYPES_REQUESTHEADER, /* .memberTypeIndex */
+    0, /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
+    false /* .isOptional */
+},
+{
+    UA_TYPENAME("ReferencesToAdd") /* .memberName */
+    UA_TYPES_ADDREFERENCESITEM, /* .memberTypeIndex */
+    offsetof(UA_AddReferencesRequest, referencesToAddSize) - offsetof(UA_AddReferencesRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
+    true, /* .namespaceZero */
+    true, /* .isArray */
+    false /* .isOptional */
+},};
+
+/* AddReferencesResponse */
+static UA_DataTypeMember AddReferencesResponse_members[3] = {
 {
     UA_TYPENAME("ResponseHeader") /* .memberName */
     UA_TYPES_RESPONSEHEADER, /* .memberTypeIndex */
@@ -12310,7 +13002,7 @@ static UA_DataTypeMember DeleteReferencesResponse_members[3] = {
 {
     UA_TYPENAME("Results") /* .memberName */
     UA_TYPES_STATUSCODE, /* .memberTypeIndex */
-    offsetof(UA_DeleteReferencesResponse, resultsSize) - offsetof(UA_DeleteReferencesResponse, responseHeader) - sizeof(UA_ResponseHeader), /* .padding */
+    offsetof(UA_AddReferencesResponse, resultsSize) - offsetof(UA_AddReferencesResponse, responseHeader) - sizeof(UA_ResponseHeader), /* .padding */
     true, /* .namespaceZero */
     true, /* .isArray */
     false /* .isOptional */
@@ -12318,16 +13010,16 @@ static UA_DataTypeMember DeleteReferencesResponse_members[3] = {
 {
     UA_TYPENAME("DiagnosticInfos") /* .memberName */
     UA_TYPES_DIAGNOSTICINFO, /* .memberTypeIndex */
-    offsetof(UA_DeleteReferencesResponse, diagnosticInfosSize) - offsetof(UA_DeleteReferencesResponse, results) - sizeof(void *), /* .padding */
+    offsetof(UA_AddReferencesResponse, diagnosticInfosSize) - offsetof(UA_AddReferencesResponse, results) - sizeof(void *), /* .padding */
     true, /* .namespaceZero */
     true, /* .isArray */
     false /* .isOptional */
 },};
 
-/* RelativePathElement */
-static UA_DataTypeMember RelativePathElement_members[4] = {
+/* DeleteNodesItem */
+static UA_DataTypeMember DeleteNodesItem_members[2] = {
 {
-    UA_TYPENAME("ReferenceTypeId") /* .memberName */
+    UA_TYPENAME("NodeId") /* .memberName */
     UA_TYPES_NODEID, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
@@ -12335,51 +13027,35 @@ static UA_DataTypeMember RelativePathElement_members[4] = {
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("IsInverse") /* .memberName */
-    UA_TYPES_BOOLEAN, /* .memberTypeIndex */
-    offsetof(UA_RelativePathElement, isInverse) - offsetof(UA_RelativePathElement, referenceTypeId) - sizeof(UA_NodeId), /* .padding */
-    true, /* .namespaceZero */
-    false, /* .isArray */
-    false /* .isOptional */
-},
-{
-    UA_TYPENAME("IncludeSubtypes") /* .memberName */
+    UA_TYPENAME("DeleteTargetReferences") /* .memberName */
     UA_TYPES_BOOLEAN, /* .memberTypeIndex */
-    offsetof(UA_RelativePathElement, includeSubtypes) - offsetof(UA_RelativePathElement, isInverse) - sizeof(UA_Boolean), /* .padding */
-    true, /* .namespaceZero */
-    false, /* .isArray */
-    false /* .isOptional */
-},
-{
-    UA_TYPENAME("TargetName") /* .memberName */
-    UA_TYPES_QUALIFIEDNAME, /* .memberTypeIndex */
-    offsetof(UA_RelativePathElement, targetName) - offsetof(UA_RelativePathElement, includeSubtypes) - sizeof(UA_Boolean), /* .padding */
+    offsetof(UA_DeleteNodesItem, deleteTargetReferences) - offsetof(UA_DeleteNodesItem, nodeId) - sizeof(UA_NodeId), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },};
 
-/* SubscriptionAcknowledgement */
-static UA_DataTypeMember SubscriptionAcknowledgement_members[2] = {
+/* DeleteNodesRequest */
+static UA_DataTypeMember DeleteNodesRequest_members[2] = {
 {
-    UA_TYPENAME("SubscriptionId") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
+    UA_TYPENAME("RequestHeader") /* .memberName */
+    UA_TYPES_REQUESTHEADER, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("SequenceNumber") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_SubscriptionAcknowledgement, sequenceNumber) - offsetof(UA_SubscriptionAcknowledgement, subscriptionId) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("NodesToDelete") /* .memberName */
+    UA_TYPES_DELETENODESITEM, /* .memberTypeIndex */
+    offsetof(UA_DeleteNodesRequest, nodesToDeleteSize) - offsetof(UA_DeleteNodesRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
     true, /* .namespaceZero */
-    false, /* .isArray */
+    true, /* .isArray */
     false /* .isOptional */
 },};
 
-/* CreateMonitoredItemsResponse */
-static UA_DataTypeMember CreateMonitoredItemsResponse_members[3] = {
+/* DeleteNodesResponse */
+static UA_DataTypeMember DeleteNodesResponse_members[3] = {
 {
     UA_TYPENAME("ResponseHeader") /* .memberName */
     UA_TYPES_RESPONSEHEADER, /* .memberTypeIndex */
@@ -12390,8 +13066,8 @@ static UA_DataTypeMember CreateMonitoredItemsResponse_members[3] = {
 },
 {
     UA_TYPENAME("Results") /* .memberName */
-    UA_TYPES_MONITOREDITEMCREATERESULT, /* .memberTypeIndex */
-    offsetof(UA_CreateMonitoredItemsResponse, resultsSize) - offsetof(UA_CreateMonitoredItemsResponse, responseHeader) - sizeof(UA_ResponseHeader), /* .padding */
+    UA_TYPES_STATUSCODE, /* .memberTypeIndex */
+    offsetof(UA_DeleteNodesResponse, resultsSize) - offsetof(UA_DeleteNodesResponse, responseHeader) - sizeof(UA_ResponseHeader), /* .padding */
     true, /* .namespaceZero */
     true, /* .isArray */
     false /* .isOptional */
@@ -12399,7 +13075,7 @@ static UA_DataTypeMember CreateMonitoredItemsResponse_members[3] = {
 {
     UA_TYPENAME("DiagnosticInfos") /* .memberName */
     UA_TYPES_DIAGNOSTICINFO, /* .memberTypeIndex */
-    offsetof(UA_CreateMonitoredItemsResponse, diagnosticInfosSize) - offsetof(UA_CreateMonitoredItemsResponse, results) - sizeof(void *), /* .padding */
+    offsetof(UA_DeleteNodesResponse, diagnosticInfosSize) - offsetof(UA_DeleteNodesResponse, results) - sizeof(void *), /* .padding */
     true, /* .namespaceZero */
     true, /* .isArray */
     false /* .isOptional */
@@ -12448,327 +13124,286 @@ static UA_DataTypeMember DeleteReferencesItem_members[5] = {
     false /* .isOptional */
 },};
 
-/* WriteValue */
-static UA_DataTypeMember WriteValue_members[4] = {
+/* DeleteReferencesRequest */
+static UA_DataTypeMember DeleteReferencesRequest_members[2] = {
 {
-    UA_TYPENAME("NodeId") /* .memberName */
-    UA_TYPES_NODEID, /* .memberTypeIndex */
+    UA_TYPENAME("RequestHeader") /* .memberName */
+    UA_TYPES_REQUESTHEADER, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("AttributeId") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_WriteValue, attributeId) - offsetof(UA_WriteValue, nodeId) - sizeof(UA_NodeId), /* .padding */
-    true, /* .namespaceZero */
-    false, /* .isArray */
-    false /* .isOptional */
-},
-{
-    UA_TYPENAME("IndexRange") /* .memberName */
-    UA_TYPES_STRING, /* .memberTypeIndex */
-    offsetof(UA_WriteValue, indexRange) - offsetof(UA_WriteValue, attributeId) - sizeof(UA_UInt32), /* .padding */
-    true, /* .namespaceZero */
-    false, /* .isArray */
-    false /* .isOptional */
-},
-{
-    UA_TYPENAME("Value") /* .memberName */
-    UA_TYPES_DATAVALUE, /* .memberTypeIndex */
-    offsetof(UA_WriteValue, value) - offsetof(UA_WriteValue, indexRange) - sizeof(UA_String), /* .padding */
+    UA_TYPENAME("ReferencesToDelete") /* .memberName */
+    UA_TYPES_DELETEREFERENCESITEM, /* .memberTypeIndex */
+    offsetof(UA_DeleteReferencesRequest, referencesToDeleteSize) - offsetof(UA_DeleteReferencesRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
     true, /* .namespaceZero */
-    false, /* .isArray */
+    true, /* .isArray */
     false /* .isOptional */
 },};
 
-/* DataTypeAttributes */
-static UA_DataTypeMember DataTypeAttributes_members[6] = {
+/* DeleteReferencesResponse */
+static UA_DataTypeMember DeleteReferencesResponse_members[3] = {
 {
-    UA_TYPENAME("SpecifiedAttributes") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
+    UA_TYPENAME("ResponseHeader") /* .memberName */
+    UA_TYPES_RESPONSEHEADER, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("DisplayName") /* .memberName */
-    UA_TYPES_LOCALIZEDTEXT, /* .memberTypeIndex */
-    offsetof(UA_DataTypeAttributes, displayName) - offsetof(UA_DataTypeAttributes, specifiedAttributes) - sizeof(UA_UInt32), /* .padding */
-    true, /* .namespaceZero */
-    false, /* .isArray */
-    false /* .isOptional */
-},
-{
-    UA_TYPENAME("Description") /* .memberName */
-    UA_TYPES_LOCALIZEDTEXT, /* .memberTypeIndex */
-    offsetof(UA_DataTypeAttributes, description) - offsetof(UA_DataTypeAttributes, displayName) - sizeof(UA_LocalizedText), /* .padding */
-    true, /* .namespaceZero */
-    false, /* .isArray */
-    false /* .isOptional */
-},
-{
-    UA_TYPENAME("WriteMask") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_DataTypeAttributes, writeMask) - offsetof(UA_DataTypeAttributes, description) - sizeof(UA_LocalizedText), /* .padding */
-    true, /* .namespaceZero */
-    false, /* .isArray */
-    false /* .isOptional */
-},
-{
-    UA_TYPENAME("UserWriteMask") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_DataTypeAttributes, userWriteMask) - offsetof(UA_DataTypeAttributes, writeMask) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("Results") /* .memberName */
+    UA_TYPES_STATUSCODE, /* .memberTypeIndex */
+    offsetof(UA_DeleteReferencesResponse, resultsSize) - offsetof(UA_DeleteReferencesResponse, responseHeader) - sizeof(UA_ResponseHeader), /* .padding */
     true, /* .namespaceZero */
-    false, /* .isArray */
+    true, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("IsAbstract") /* .memberName */
-    UA_TYPES_BOOLEAN, /* .memberTypeIndex */
-    offsetof(UA_DataTypeAttributes, isAbstract) - offsetof(UA_DataTypeAttributes, userWriteMask) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("DiagnosticInfos") /* .memberName */
+    UA_TYPES_DIAGNOSTICINFO, /* .memberTypeIndex */
+    offsetof(UA_DeleteReferencesResponse, diagnosticInfosSize) - offsetof(UA_DeleteReferencesResponse, results) - sizeof(void *), /* .padding */
     true, /* .namespaceZero */
-    false, /* .isArray */
+    true, /* .isArray */
     false /* .isOptional */
 },};
 
-/* AddReferencesResponse */
-static UA_DataTypeMember AddReferencesResponse_members[3] = {
+/* BrowseDirection */
+#define BrowseDirection_members NULL
+
+/* ViewDescription */
+static UA_DataTypeMember ViewDescription_members[3] = {
 {
-    UA_TYPENAME("ResponseHeader") /* .memberName */
-    UA_TYPES_RESPONSEHEADER, /* .memberTypeIndex */
+    UA_TYPENAME("ViewId") /* .memberName */
+    UA_TYPES_NODEID, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("Results") /* .memberName */
-    UA_TYPES_STATUSCODE, /* .memberTypeIndex */
-    offsetof(UA_AddReferencesResponse, resultsSize) - offsetof(UA_AddReferencesResponse, responseHeader) - sizeof(UA_ResponseHeader), /* .padding */
+    UA_TYPENAME("Timestamp") /* .memberName */
+    UA_TYPES_DATETIME, /* .memberTypeIndex */
+    offsetof(UA_ViewDescription, timestamp) - offsetof(UA_ViewDescription, viewId) - sizeof(UA_NodeId), /* .padding */
     true, /* .namespaceZero */
-    true, /* .isArray */
+    false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("DiagnosticInfos") /* .memberName */
-    UA_TYPES_DIAGNOSTICINFO, /* .memberTypeIndex */
-    offsetof(UA_AddReferencesResponse, diagnosticInfosSize) - offsetof(UA_AddReferencesResponse, results) - sizeof(void *), /* .padding */
+    UA_TYPENAME("ViewVersion") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_ViewDescription, viewVersion) - offsetof(UA_ViewDescription, timestamp) - sizeof(UA_DateTime), /* .padding */
     true, /* .namespaceZero */
-    true, /* .isArray */
+    false, /* .isArray */
     false /* .isOptional */
 },};
 
-/* DeadbandType */
-#define DeadbandType_members NULL
-
-/* DataChangeTrigger */
-#define DataChangeTrigger_members NULL
-
-/* BuildInfo */
-static UA_DataTypeMember BuildInfo_members[6] = {
+/* BrowseDescription */
+static UA_DataTypeMember BrowseDescription_members[6] = {
 {
-    UA_TYPENAME("ProductUri") /* .memberName */
-    UA_TYPES_STRING, /* .memberTypeIndex */
+    UA_TYPENAME("NodeId") /* .memberName */
+    UA_TYPES_NODEID, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("ManufacturerName") /* .memberName */
-    UA_TYPES_STRING, /* .memberTypeIndex */
-    offsetof(UA_BuildInfo, manufacturerName) - offsetof(UA_BuildInfo, productUri) - sizeof(UA_String), /* .padding */
+    UA_TYPENAME("BrowseDirection") /* .memberName */
+    UA_TYPES_BROWSEDIRECTION, /* .memberTypeIndex */
+    offsetof(UA_BrowseDescription, browseDirection) - offsetof(UA_BrowseDescription, nodeId) - sizeof(UA_NodeId), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("ProductName") /* .memberName */
-    UA_TYPES_STRING, /* .memberTypeIndex */
-    offsetof(UA_BuildInfo, productName) - offsetof(UA_BuildInfo, manufacturerName) - sizeof(UA_String), /* .padding */
+    UA_TYPENAME("ReferenceTypeId") /* .memberName */
+    UA_TYPES_NODEID, /* .memberTypeIndex */
+    offsetof(UA_BrowseDescription, referenceTypeId) - offsetof(UA_BrowseDescription, browseDirection) - sizeof(UA_BrowseDirection), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("SoftwareVersion") /* .memberName */
-    UA_TYPES_STRING, /* .memberTypeIndex */
-    offsetof(UA_BuildInfo, softwareVersion) - offsetof(UA_BuildInfo, productName) - sizeof(UA_String), /* .padding */
+    UA_TYPENAME("IncludeSubtypes") /* .memberName */
+    UA_TYPES_BOOLEAN, /* .memberTypeIndex */
+    offsetof(UA_BrowseDescription, includeSubtypes) - offsetof(UA_BrowseDescription, referenceTypeId) - sizeof(UA_NodeId), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("BuildNumber") /* .memberName */
-    UA_TYPES_STRING, /* .memberTypeIndex */
-    offsetof(UA_BuildInfo, buildNumber) - offsetof(UA_BuildInfo, softwareVersion) - sizeof(UA_String), /* .padding */
+    UA_TYPENAME("NodeClassMask") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_BrowseDescription, nodeClassMask) - offsetof(UA_BrowseDescription, includeSubtypes) - sizeof(UA_Boolean), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("BuildDate") /* .memberName */
-    UA_TYPES_DATETIME, /* .memberTypeIndex */
-    offsetof(UA_BuildInfo, buildDate) - offsetof(UA_BuildInfo, buildNumber) - sizeof(UA_String), /* .padding */
+    UA_TYPENAME("ResultMask") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_BrowseDescription, resultMask) - offsetof(UA_BrowseDescription, nodeClassMask) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },};
 
-/* FilterOperand */
-#define FilterOperand_members NULL
+/* BrowseResultMask */
+#define BrowseResultMask_members NULL
 
-/* MonitoringParameters */
-static UA_DataTypeMember MonitoringParameters_members[5] = {
+/* ReferenceDescription */
+static UA_DataTypeMember ReferenceDescription_members[7] = {
 {
-    UA_TYPENAME("ClientHandle") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
+    UA_TYPENAME("ReferenceTypeId") /* .memberName */
+    UA_TYPES_NODEID, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("SamplingInterval") /* .memberName */
-    UA_TYPES_DOUBLE, /* .memberTypeIndex */
-    offsetof(UA_MonitoringParameters, samplingInterval) - offsetof(UA_MonitoringParameters, clientHandle) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("IsForward") /* .memberName */
+    UA_TYPES_BOOLEAN, /* .memberTypeIndex */
+    offsetof(UA_ReferenceDescription, isForward) - offsetof(UA_ReferenceDescription, referenceTypeId) - sizeof(UA_NodeId), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("Filter") /* .memberName */
-    UA_TYPES_EXTENSIONOBJECT, /* .memberTypeIndex */
-    offsetof(UA_MonitoringParameters, filter) - offsetof(UA_MonitoringParameters, samplingInterval) - sizeof(UA_Double), /* .padding */
+    UA_TYPENAME("NodeId") /* .memberName */
+    UA_TYPES_EXPANDEDNODEID, /* .memberTypeIndex */
+    offsetof(UA_ReferenceDescription, nodeId) - offsetof(UA_ReferenceDescription, isForward) - sizeof(UA_Boolean), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("QueueSize") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_MonitoringParameters, queueSize) - offsetof(UA_MonitoringParameters, filter) - sizeof(UA_ExtensionObject), /* .padding */
+    UA_TYPENAME("BrowseName") /* .memberName */
+    UA_TYPES_QUALIFIEDNAME, /* .memberTypeIndex */
+    offsetof(UA_ReferenceDescription, browseName) - offsetof(UA_ReferenceDescription, nodeId) - sizeof(UA_ExpandedNodeId), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("DiscardOldest") /* .memberName */
-    UA_TYPES_BOOLEAN, /* .memberTypeIndex */
-    offsetof(UA_MonitoringParameters, discardOldest) - offsetof(UA_MonitoringParameters, queueSize) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("DisplayName") /* .memberName */
+    UA_TYPES_LOCALIZEDTEXT, /* .memberTypeIndex */
+    offsetof(UA_ReferenceDescription, displayName) - offsetof(UA_ReferenceDescription, browseName) - sizeof(UA_QualifiedName), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
-},};
-
-/* DoubleComplexNumberType */
-static UA_DataTypeMember DoubleComplexNumberType_members[2] = {
+},
 {
-    UA_TYPENAME("Real") /* .memberName */
-    UA_TYPES_DOUBLE, /* .memberTypeIndex */
-    0, /* .padding */
+    UA_TYPENAME("NodeClass") /* .memberName */
+    UA_TYPES_NODECLASS, /* .memberTypeIndex */
+    offsetof(UA_ReferenceDescription, nodeClass) - offsetof(UA_ReferenceDescription, displayName) - sizeof(UA_LocalizedText), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("Imaginary") /* .memberName */
-    UA_TYPES_DOUBLE, /* .memberTypeIndex */
-    offsetof(UA_DoubleComplexNumberType, imaginary) - offsetof(UA_DoubleComplexNumberType, real) - sizeof(UA_Double), /* .padding */
+    UA_TYPENAME("TypeDefinition") /* .memberName */
+    UA_TYPES_EXPANDEDNODEID, /* .memberTypeIndex */
+    offsetof(UA_ReferenceDescription, typeDefinition) - offsetof(UA_ReferenceDescription, nodeClass) - sizeof(UA_NodeClass), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },};
 
-/* DeleteNodesItem */
-static UA_DataTypeMember DeleteNodesItem_members[2] = {
+/* BrowseResult */
+static UA_DataTypeMember BrowseResult_members[3] = {
 {
-    UA_TYPENAME("NodeId") /* .memberName */
-    UA_TYPES_NODEID, /* .memberTypeIndex */
+    UA_TYPENAME("StatusCode") /* .memberName */
+    UA_TYPES_STATUSCODE, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("DeleteTargetReferences") /* .memberName */
-    UA_TYPES_BOOLEAN, /* .memberTypeIndex */
-    offsetof(UA_DeleteNodesItem, deleteTargetReferences) - offsetof(UA_DeleteNodesItem, nodeId) - sizeof(UA_NodeId), /* .padding */
+    UA_TYPENAME("ContinuationPoint") /* .memberName */
+    UA_TYPES_BYTESTRING, /* .memberTypeIndex */
+    offsetof(UA_BrowseResult, continuationPoint) - offsetof(UA_BrowseResult, statusCode) - sizeof(UA_StatusCode), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
+},
+{
+    UA_TYPENAME("References") /* .memberName */
+    UA_TYPES_REFERENCEDESCRIPTION, /* .memberTypeIndex */
+    offsetof(UA_BrowseResult, referencesSize) - offsetof(UA_BrowseResult, continuationPoint) - sizeof(UA_ByteString), /* .padding */
+    true, /* .namespaceZero */
+    true, /* .isArray */
+    false /* .isOptional */
 },};
 
-/* ReadValueId */
-static UA_DataTypeMember ReadValueId_members[4] = {
+/* BrowseRequest */
+static UA_DataTypeMember BrowseRequest_members[4] = {
 {
-    UA_TYPENAME("NodeId") /* .memberName */
-    UA_TYPES_NODEID, /* .memberTypeIndex */
+    UA_TYPENAME("RequestHeader") /* .memberName */
+    UA_TYPES_REQUESTHEADER, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("AttributeId") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_ReadValueId, attributeId) - offsetof(UA_ReadValueId, nodeId) - sizeof(UA_NodeId), /* .padding */
+    UA_TYPENAME("View") /* .memberName */
+    UA_TYPES_VIEWDESCRIPTION, /* .memberTypeIndex */
+    offsetof(UA_BrowseRequest, view) - offsetof(UA_BrowseRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("IndexRange") /* .memberName */
-    UA_TYPES_STRING, /* .memberTypeIndex */
-    offsetof(UA_ReadValueId, indexRange) - offsetof(UA_ReadValueId, attributeId) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("RequestedMaxReferencesPerNode") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_BrowseRequest, requestedMaxReferencesPerNode) - offsetof(UA_BrowseRequest, view) - sizeof(UA_ViewDescription), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("DataEncoding") /* .memberName */
-    UA_TYPES_QUALIFIEDNAME, /* .memberTypeIndex */
-    offsetof(UA_ReadValueId, dataEncoding) - offsetof(UA_ReadValueId, indexRange) - sizeof(UA_String), /* .padding */
+    UA_TYPENAME("NodesToBrowse") /* .memberName */
+    UA_TYPES_BROWSEDESCRIPTION, /* .memberTypeIndex */
+    offsetof(UA_BrowseRequest, nodesToBrowseSize) - offsetof(UA_BrowseRequest, requestedMaxReferencesPerNode) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
-    false, /* .isArray */
+    true, /* .isArray */
     false /* .isOptional */
 },};
 
-/* CallRequest */
-static UA_DataTypeMember CallRequest_members[2] = {
+/* BrowseResponse */
+static UA_DataTypeMember BrowseResponse_members[3] = {
 {
-    UA_TYPENAME("RequestHeader") /* .memberName */
-    UA_TYPES_REQUESTHEADER, /* .memberTypeIndex */
+    UA_TYPENAME("ResponseHeader") /* .memberName */
+    UA_TYPES_RESPONSEHEADER, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("MethodsToCall") /* .memberName */
-    UA_TYPES_CALLMETHODREQUEST, /* .memberTypeIndex */
-    offsetof(UA_CallRequest, methodsToCallSize) - offsetof(UA_CallRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
+    UA_TYPENAME("Results") /* .memberName */
+    UA_TYPES_BROWSERESULT, /* .memberTypeIndex */
+    offsetof(UA_BrowseResponse, resultsSize) - offsetof(UA_BrowseResponse, responseHeader) - sizeof(UA_ResponseHeader), /* .padding */
     true, /* .namespaceZero */
     true, /* .isArray */
     false /* .isOptional */
-},};
-
-/* RelativePath */
-static UA_DataTypeMember RelativePath_members[1] = {
+},
 {
-    UA_TYPENAME("Elements") /* .memberName */
-    UA_TYPES_RELATIVEPATHELEMENT, /* .memberTypeIndex */
-    0, /* .padding */
+    UA_TYPENAME("DiagnosticInfos") /* .memberName */
+    UA_TYPES_DIAGNOSTICINFO, /* .memberTypeIndex */
+    offsetof(UA_BrowseResponse, diagnosticInfosSize) - offsetof(UA_BrowseResponse, results) - sizeof(void *), /* .padding */
     true, /* .namespaceZero */
     true, /* .isArray */
     false /* .isOptional */
 },};
 
-/* DeleteNodesRequest */
-static UA_DataTypeMember DeleteNodesRequest_members[2] = {
+/* BrowseNextRequest */
+static UA_DataTypeMember BrowseNextRequest_members[3] = {
 {
     UA_TYPENAME("RequestHeader") /* .memberName */
     UA_TYPES_REQUESTHEADER, /* .memberTypeIndex */
@@ -12778,184 +13413,200 @@ static UA_DataTypeMember DeleteNodesRequest_members[2] = {
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("NodesToDelete") /* .memberName */
-    UA_TYPES_DELETENODESITEM, /* .memberTypeIndex */
-    offsetof(UA_DeleteNodesRequest, nodesToDeleteSize) - offsetof(UA_DeleteNodesRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
+    UA_TYPENAME("ReleaseContinuationPoints") /* .memberName */
+    UA_TYPES_BOOLEAN, /* .memberTypeIndex */
+    offsetof(UA_BrowseNextRequest, releaseContinuationPoints) - offsetof(UA_BrowseNextRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
+    false /* .isOptional */
+},
+{
+    UA_TYPENAME("ContinuationPoints") /* .memberName */
+    UA_TYPES_BYTESTRING, /* .memberTypeIndex */
+    offsetof(UA_BrowseNextRequest, continuationPointsSize) - offsetof(UA_BrowseNextRequest, releaseContinuationPoints) - sizeof(UA_Boolean), /* .padding */
     true, /* .namespaceZero */
     true, /* .isArray */
     false /* .isOptional */
 },};
 
-/* MonitoredItemModifyRequest */
-static UA_DataTypeMember MonitoredItemModifyRequest_members[2] = {
+/* BrowseNextResponse */
+static UA_DataTypeMember BrowseNextResponse_members[3] = {
 {
-    UA_TYPENAME("MonitoredItemId") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
+    UA_TYPENAME("ResponseHeader") /* .memberName */
+    UA_TYPES_RESPONSEHEADER, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("RequestedParameters") /* .memberName */
-    UA_TYPES_MONITORINGPARAMETERS, /* .memberTypeIndex */
-    offsetof(UA_MonitoredItemModifyRequest, requestedParameters) - offsetof(UA_MonitoredItemModifyRequest, monitoredItemId) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("Results") /* .memberName */
+    UA_TYPES_BROWSERESULT, /* .memberTypeIndex */
+    offsetof(UA_BrowseNextResponse, resultsSize) - offsetof(UA_BrowseNextResponse, responseHeader) - sizeof(UA_ResponseHeader), /* .padding */
     true, /* .namespaceZero */
-    false, /* .isArray */
+    true, /* .isArray */
+    false /* .isOptional */
+},
+{
+    UA_TYPENAME("DiagnosticInfos") /* .memberName */
+    UA_TYPES_DIAGNOSTICINFO, /* .memberTypeIndex */
+    offsetof(UA_BrowseNextResponse, diagnosticInfosSize) - offsetof(UA_BrowseNextResponse, results) - sizeof(void *), /* .padding */
+    true, /* .namespaceZero */
+    true, /* .isArray */
     false /* .isOptional */
 },};
 
-/* UserTokenType */
-#define UserTokenType_members NULL
-
-/* AggregateConfiguration */
-static UA_DataTypeMember AggregateConfiguration_members[5] = {
+/* RelativePathElement */
+static UA_DataTypeMember RelativePathElement_members[4] = {
 {
-    UA_TYPENAME("UseServerCapabilitiesDefaults") /* .memberName */
-    UA_TYPES_BOOLEAN, /* .memberTypeIndex */
+    UA_TYPENAME("ReferenceTypeId") /* .memberName */
+    UA_TYPES_NODEID, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("TreatUncertainAsBad") /* .memberName */
+    UA_TYPENAME("IsInverse") /* .memberName */
     UA_TYPES_BOOLEAN, /* .memberTypeIndex */
-    offsetof(UA_AggregateConfiguration, treatUncertainAsBad) - offsetof(UA_AggregateConfiguration, useServerCapabilitiesDefaults) - sizeof(UA_Boolean), /* .padding */
-    true, /* .namespaceZero */
-    false, /* .isArray */
-    false /* .isOptional */
-},
-{
-    UA_TYPENAME("PercentDataBad") /* .memberName */
-    UA_TYPES_BYTE, /* .memberTypeIndex */
-    offsetof(UA_AggregateConfiguration, percentDataBad) - offsetof(UA_AggregateConfiguration, treatUncertainAsBad) - sizeof(UA_Boolean), /* .padding */
+    offsetof(UA_RelativePathElement, isInverse) - offsetof(UA_RelativePathElement, referenceTypeId) - sizeof(UA_NodeId), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("PercentDataGood") /* .memberName */
-    UA_TYPES_BYTE, /* .memberTypeIndex */
-    offsetof(UA_AggregateConfiguration, percentDataGood) - offsetof(UA_AggregateConfiguration, percentDataBad) - sizeof(UA_Byte), /* .padding */
+    UA_TYPENAME("IncludeSubtypes") /* .memberName */
+    UA_TYPES_BOOLEAN, /* .memberTypeIndex */
+    offsetof(UA_RelativePathElement, includeSubtypes) - offsetof(UA_RelativePathElement, isInverse) - sizeof(UA_Boolean), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("UseSlopedExtrapolation") /* .memberName */
-    UA_TYPES_BOOLEAN, /* .memberTypeIndex */
-    offsetof(UA_AggregateConfiguration, useSlopedExtrapolation) - offsetof(UA_AggregateConfiguration, percentDataGood) - sizeof(UA_Byte), /* .padding */
+    UA_TYPENAME("TargetName") /* .memberName */
+    UA_TYPES_QUALIFIEDNAME, /* .memberTypeIndex */
+    offsetof(UA_RelativePathElement, targetName) - offsetof(UA_RelativePathElement, includeSubtypes) - sizeof(UA_Boolean), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },};
 
-/* LocaleId */
-#define LocaleId_members NULL
-
-/* UnregisterNodesResponse */
-static UA_DataTypeMember UnregisterNodesResponse_members[1] = {
+/* RelativePath */
+static UA_DataTypeMember RelativePath_members[1] = {
 {
-    UA_TYPENAME("ResponseHeader") /* .memberName */
-    UA_TYPES_RESPONSEHEADER, /* .memberTypeIndex */
+    UA_TYPENAME("Elements") /* .memberName */
+    UA_TYPES_RELATIVEPATHELEMENT, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
-    false, /* .isArray */
+    true, /* .isArray */
     false /* .isOptional */
 },};
 
-/* ContentFilterResult */
-static UA_DataTypeMember ContentFilterResult_members[2] = {
+/* BrowsePath */
+static UA_DataTypeMember BrowsePath_members[2] = {
 {
-    UA_TYPENAME("ElementResults") /* .memberName */
-    UA_TYPES_CONTENTFILTERELEMENTRESULT, /* .memberTypeIndex */
+    UA_TYPENAME("StartingNode") /* .memberName */
+    UA_TYPES_NODEID, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
-    true, /* .isArray */
+    false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("ElementDiagnosticInfos") /* .memberName */
-    UA_TYPES_DIAGNOSTICINFO, /* .memberTypeIndex */
-    offsetof(UA_ContentFilterResult, elementDiagnosticInfosSize) - offsetof(UA_ContentFilterResult, elementResults) - sizeof(void *), /* .padding */
+    UA_TYPENAME("RelativePath") /* .memberName */
+    UA_TYPES_RELATIVEPATH, /* .memberTypeIndex */
+    offsetof(UA_BrowsePath, relativePath) - offsetof(UA_BrowsePath, startingNode) - sizeof(UA_NodeId), /* .padding */
     true, /* .namespaceZero */
-    true, /* .isArray */
+    false, /* .isArray */
     false /* .isOptional */
 },};
 
-/* UserTokenPolicy */
-static UA_DataTypeMember UserTokenPolicy_members[5] = {
+/* BrowsePathTarget */
+static UA_DataTypeMember BrowsePathTarget_members[2] = {
 {
-    UA_TYPENAME("PolicyId") /* .memberName */
-    UA_TYPES_STRING, /* .memberTypeIndex */
+    UA_TYPENAME("TargetId") /* .memberName */
+    UA_TYPES_EXPANDEDNODEID, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("TokenType") /* .memberName */
-    UA_TYPES_USERTOKENTYPE, /* .memberTypeIndex */
-    offsetof(UA_UserTokenPolicy, tokenType) - offsetof(UA_UserTokenPolicy, policyId) - sizeof(UA_String), /* .padding */
+    UA_TYPENAME("RemainingPathIndex") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_BrowsePathTarget, remainingPathIndex) - offsetof(UA_BrowsePathTarget, targetId) - sizeof(UA_ExpandedNodeId), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
-},
+},};
+
+/* BrowsePathResult */
+static UA_DataTypeMember BrowsePathResult_members[2] = {
 {
-    UA_TYPENAME("IssuedTokenType") /* .memberName */
-    UA_TYPES_STRING, /* .memberTypeIndex */
-    offsetof(UA_UserTokenPolicy, issuedTokenType) - offsetof(UA_UserTokenPolicy, tokenType) - sizeof(UA_UserTokenType), /* .padding */
+    UA_TYPENAME("StatusCode") /* .memberName */
+    UA_TYPES_STATUSCODE, /* .memberTypeIndex */
+    0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("IssuerEndpointUrl") /* .memberName */
-    UA_TYPES_STRING, /* .memberTypeIndex */
-    offsetof(UA_UserTokenPolicy, issuerEndpointUrl) - offsetof(UA_UserTokenPolicy, issuedTokenType) - sizeof(UA_String), /* .padding */
+    UA_TYPENAME("Targets") /* .memberName */
+    UA_TYPES_BROWSEPATHTARGET, /* .memberTypeIndex */
+    offsetof(UA_BrowsePathResult, targetsSize) - offsetof(UA_BrowsePathResult, statusCode) - sizeof(UA_StatusCode), /* .padding */
+    true, /* .namespaceZero */
+    true, /* .isArray */
+    false /* .isOptional */
+},};
+
+/* TranslateBrowsePathsToNodeIdsRequest */
+static UA_DataTypeMember TranslateBrowsePathsToNodeIdsRequest_members[2] = {
+{
+    UA_TYPENAME("RequestHeader") /* .memberName */
+    UA_TYPES_REQUESTHEADER, /* .memberTypeIndex */
+    0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("SecurityPolicyUri") /* .memberName */
-    UA_TYPES_STRING, /* .memberTypeIndex */
-    offsetof(UA_UserTokenPolicy, securityPolicyUri) - offsetof(UA_UserTokenPolicy, issuerEndpointUrl) - sizeof(UA_String), /* .padding */
+    UA_TYPENAME("BrowsePaths") /* .memberName */
+    UA_TYPES_BROWSEPATH, /* .memberTypeIndex */
+    offsetof(UA_TranslateBrowsePathsToNodeIdsRequest, browsePathsSize) - offsetof(UA_TranslateBrowsePathsToNodeIdsRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
     true, /* .namespaceZero */
-    false, /* .isArray */
+    true, /* .isArray */
     false /* .isOptional */
 },};
 
-/* DeleteMonitoredItemsRequest */
-static UA_DataTypeMember DeleteMonitoredItemsRequest_members[3] = {
+/* TranslateBrowsePathsToNodeIdsResponse */
+static UA_DataTypeMember TranslateBrowsePathsToNodeIdsResponse_members[3] = {
 {
-    UA_TYPENAME("RequestHeader") /* .memberName */
-    UA_TYPES_REQUESTHEADER, /* .memberTypeIndex */
+    UA_TYPENAME("ResponseHeader") /* .memberName */
+    UA_TYPES_RESPONSEHEADER, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("SubscriptionId") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_DeleteMonitoredItemsRequest, subscriptionId) - offsetof(UA_DeleteMonitoredItemsRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
+    UA_TYPENAME("Results") /* .memberName */
+    UA_TYPES_BROWSEPATHRESULT, /* .memberTypeIndex */
+    offsetof(UA_TranslateBrowsePathsToNodeIdsResponse, resultsSize) - offsetof(UA_TranslateBrowsePathsToNodeIdsResponse, responseHeader) - sizeof(UA_ResponseHeader), /* .padding */
     true, /* .namespaceZero */
-    false, /* .isArray */
+    true, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("MonitoredItemIds") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_DeleteMonitoredItemsRequest, monitoredItemIdsSize) - offsetof(UA_DeleteMonitoredItemsRequest, subscriptionId) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("DiagnosticInfos") /* .memberName */
+    UA_TYPES_DIAGNOSTICINFO, /* .memberTypeIndex */
+    offsetof(UA_TranslateBrowsePathsToNodeIdsResponse, diagnosticInfosSize) - offsetof(UA_TranslateBrowsePathsToNodeIdsResponse, results) - sizeof(void *), /* .padding */
     true, /* .namespaceZero */
     true, /* .isArray */
     false /* .isOptional */
 },};
 
-/* SetMonitoringModeRequest */
-static UA_DataTypeMember SetMonitoringModeRequest_members[4] = {
+/* RegisterNodesRequest */
+static UA_DataTypeMember RegisterNodesRequest_members[2] = {
 {
     UA_TYPENAME("RequestHeader") /* .memberName */
     UA_TYPES_REQUESTHEADER, /* .memberTypeIndex */
@@ -12965,150 +13616,168 @@ static UA_DataTypeMember SetMonitoringModeRequest_members[4] = {
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("SubscriptionId") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_SetMonitoringModeRequest, subscriptionId) - offsetof(UA_SetMonitoringModeRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
+    UA_TYPENAME("NodesToRegister") /* .memberName */
+    UA_TYPES_NODEID, /* .memberTypeIndex */
+    offsetof(UA_RegisterNodesRequest, nodesToRegisterSize) - offsetof(UA_RegisterNodesRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
     true, /* .namespaceZero */
-    false, /* .isArray */
+    true, /* .isArray */
     false /* .isOptional */
-},
+},};
+
+/* RegisterNodesResponse */
+static UA_DataTypeMember RegisterNodesResponse_members[2] = {
 {
-    UA_TYPENAME("MonitoringMode") /* .memberName */
-    UA_TYPES_MONITORINGMODE, /* .memberTypeIndex */
-    offsetof(UA_SetMonitoringModeRequest, monitoringMode) - offsetof(UA_SetMonitoringModeRequest, subscriptionId) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("ResponseHeader") /* .memberName */
+    UA_TYPES_RESPONSEHEADER, /* .memberTypeIndex */
+    0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("MonitoredItemIds") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_SetMonitoringModeRequest, monitoredItemIdsSize) - offsetof(UA_SetMonitoringModeRequest, monitoringMode) - sizeof(UA_MonitoringMode), /* .padding */
+    UA_TYPENAME("RegisteredNodeIds") /* .memberName */
+    UA_TYPES_NODEID, /* .memberTypeIndex */
+    offsetof(UA_RegisterNodesResponse, registeredNodeIdsSize) - offsetof(UA_RegisterNodesResponse, responseHeader) - sizeof(UA_ResponseHeader), /* .padding */
     true, /* .namespaceZero */
     true, /* .isArray */
     false /* .isOptional */
 },};
 
-/* Duration */
-#define Duration_members NULL
-
-/* ReferenceTypeAttributes */
-static UA_DataTypeMember ReferenceTypeAttributes_members[8] = {
+/* UnregisterNodesRequest */
+static UA_DataTypeMember UnregisterNodesRequest_members[2] = {
 {
-    UA_TYPENAME("SpecifiedAttributes") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
+    UA_TYPENAME("RequestHeader") /* .memberName */
+    UA_TYPES_REQUESTHEADER, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("DisplayName") /* .memberName */
-    UA_TYPES_LOCALIZEDTEXT, /* .memberTypeIndex */
-    offsetof(UA_ReferenceTypeAttributes, displayName) - offsetof(UA_ReferenceTypeAttributes, specifiedAttributes) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("NodesToUnregister") /* .memberName */
+    UA_TYPES_NODEID, /* .memberTypeIndex */
+    offsetof(UA_UnregisterNodesRequest, nodesToUnregisterSize) - offsetof(UA_UnregisterNodesRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
     true, /* .namespaceZero */
-    false, /* .isArray */
+    true, /* .isArray */
     false /* .isOptional */
-},
+},};
+
+/* UnregisterNodesResponse */
+static UA_DataTypeMember UnregisterNodesResponse_members[1] = {
 {
-    UA_TYPENAME("Description") /* .memberName */
-    UA_TYPES_LOCALIZEDTEXT, /* .memberTypeIndex */
-    offsetof(UA_ReferenceTypeAttributes, description) - offsetof(UA_ReferenceTypeAttributes, displayName) - sizeof(UA_LocalizedText), /* .padding */
+    UA_TYPENAME("ResponseHeader") /* .memberName */
+    UA_TYPES_RESPONSEHEADER, /* .memberTypeIndex */
+    0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
-},
+},};
+
+/* FilterOperator */
+#define FilterOperator_members NULL
+
+/* ContentFilterElement */
+static UA_DataTypeMember ContentFilterElement_members[2] = {
 {
-    UA_TYPENAME("WriteMask") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_ReferenceTypeAttributes, writeMask) - offsetof(UA_ReferenceTypeAttributes, description) - sizeof(UA_LocalizedText), /* .padding */
+    UA_TYPENAME("FilterOperator") /* .memberName */
+    UA_TYPES_FILTEROPERATOR, /* .memberTypeIndex */
+    0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("UserWriteMask") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_ReferenceTypeAttributes, userWriteMask) - offsetof(UA_ReferenceTypeAttributes, writeMask) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("FilterOperands") /* .memberName */
+    UA_TYPES_EXTENSIONOBJECT, /* .memberTypeIndex */
+    offsetof(UA_ContentFilterElement, filterOperandsSize) - offsetof(UA_ContentFilterElement, filterOperator) - sizeof(UA_FilterOperator), /* .padding */
     true, /* .namespaceZero */
-    false, /* .isArray */
+    true, /* .isArray */
     false /* .isOptional */
-},
+},};
+
+/* ContentFilter */
+static UA_DataTypeMember ContentFilter_members[1] = {
 {
-    UA_TYPENAME("IsAbstract") /* .memberName */
-    UA_TYPES_BOOLEAN, /* .memberTypeIndex */
-    offsetof(UA_ReferenceTypeAttributes, isAbstract) - offsetof(UA_ReferenceTypeAttributes, userWriteMask) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("Elements") /* .memberName */
+    UA_TYPES_CONTENTFILTERELEMENT, /* .memberTypeIndex */
+    0, /* .padding */
     true, /* .namespaceZero */
-    false, /* .isArray */
+    true, /* .isArray */
     false /* .isOptional */
-},
+},};
+
+/* FilterOperand */
+#define FilterOperand_members NULL
+
+/* ElementOperand */
+static UA_DataTypeMember ElementOperand_members[1] = {
 {
-    UA_TYPENAME("Symmetric") /* .memberName */
-    UA_TYPES_BOOLEAN, /* .memberTypeIndex */
-    offsetof(UA_ReferenceTypeAttributes, symmetric) - offsetof(UA_ReferenceTypeAttributes, isAbstract) - sizeof(UA_Boolean), /* .padding */
+    UA_TYPENAME("Index") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
-},
+},};
+
+/* LiteralOperand */
+static UA_DataTypeMember LiteralOperand_members[1] = {
 {
-    UA_TYPENAME("InverseName") /* .memberName */
-    UA_TYPES_LOCALIZEDTEXT, /* .memberTypeIndex */
-    offsetof(UA_ReferenceTypeAttributes, inverseName) - offsetof(UA_ReferenceTypeAttributes, symmetric) - sizeof(UA_Boolean), /* .padding */
+    UA_TYPENAME("Value") /* .memberName */
+    UA_TYPES_VARIANT, /* .memberTypeIndex */
+    0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },};
 
-/* GetEndpointsRequest */
-static UA_DataTypeMember GetEndpointsRequest_members[4] = {
+/* AttributeOperand */
+static UA_DataTypeMember AttributeOperand_members[5] = {
 {
-    UA_TYPENAME("RequestHeader") /* .memberName */
-    UA_TYPES_REQUESTHEADER, /* .memberTypeIndex */
+    UA_TYPENAME("NodeId") /* .memberName */
+    UA_TYPES_NODEID, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("EndpointUrl") /* .memberName */
+    UA_TYPENAME("Alias") /* .memberName */
     UA_TYPES_STRING, /* .memberTypeIndex */
-    offsetof(UA_GetEndpointsRequest, endpointUrl) - offsetof(UA_GetEndpointsRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
+    offsetof(UA_AttributeOperand, alias) - offsetof(UA_AttributeOperand, nodeId) - sizeof(UA_NodeId), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("LocaleIds") /* .memberName */
-    UA_TYPES_STRING, /* .memberTypeIndex */
-    offsetof(UA_GetEndpointsRequest, localeIdsSize) - offsetof(UA_GetEndpointsRequest, endpointUrl) - sizeof(UA_String), /* .padding */
+    UA_TYPENAME("BrowsePath") /* .memberName */
+    UA_TYPES_RELATIVEPATH, /* .memberTypeIndex */
+    offsetof(UA_AttributeOperand, browsePath) - offsetof(UA_AttributeOperand, alias) - sizeof(UA_String), /* .padding */
     true, /* .namespaceZero */
-    true, /* .isArray */
+    false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("ProfileUris") /* .memberName */
-    UA_TYPES_STRING, /* .memberTypeIndex */
-    offsetof(UA_GetEndpointsRequest, profileUrisSize) - offsetof(UA_GetEndpointsRequest, localeIds) - sizeof(void *), /* .padding */
+    UA_TYPENAME("AttributeId") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_AttributeOperand, attributeId) - offsetof(UA_AttributeOperand, browsePath) - sizeof(UA_RelativePath), /* .padding */
     true, /* .namespaceZero */
-    true, /* .isArray */
+    false, /* .isArray */
     false /* .isOptional */
-},};
-
-/* CloseSecureChannelResponse */
-static UA_DataTypeMember CloseSecureChannelResponse_members[1] = {
+},
 {
-    UA_TYPENAME("ResponseHeader") /* .memberName */
-    UA_TYPES_RESPONSEHEADER, /* .memberTypeIndex */
-    0, /* .padding */
+    UA_TYPENAME("IndexRange") /* .memberName */
+    UA_TYPES_STRING, /* .memberTypeIndex */
+    offsetof(UA_AttributeOperand, indexRange) - offsetof(UA_AttributeOperand, attributeId) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },};
 
-/* ViewDescription */
-static UA_DataTypeMember ViewDescription_members[3] = {
+/* SimpleAttributeOperand */
+static UA_DataTypeMember SimpleAttributeOperand_members[4] = {
 {
-    UA_TYPENAME("ViewId") /* .memberName */
+    UA_TYPENAME("TypeDefinitionId") /* .memberName */
     UA_TYPES_NODEID, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
@@ -13116,403 +13785,356 @@ static UA_DataTypeMember ViewDescription_members[3] = {
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("Timestamp") /* .memberName */
-    UA_TYPES_DATETIME, /* .memberTypeIndex */
-    offsetof(UA_ViewDescription, timestamp) - offsetof(UA_ViewDescription, viewId) - sizeof(UA_NodeId), /* .padding */
+    UA_TYPENAME("BrowsePath") /* .memberName */
+    UA_TYPES_QUALIFIEDNAME, /* .memberTypeIndex */
+    offsetof(UA_SimpleAttributeOperand, browsePathSize) - offsetof(UA_SimpleAttributeOperand, typeDefinitionId) - sizeof(UA_NodeId), /* .padding */
     true, /* .namespaceZero */
-    false, /* .isArray */
+    true, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("ViewVersion") /* .memberName */
+    UA_TYPENAME("AttributeId") /* .memberName */
     UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_ViewDescription, viewVersion) - offsetof(UA_ViewDescription, timestamp) - sizeof(UA_DateTime), /* .padding */
+    offsetof(UA_SimpleAttributeOperand, attributeId) - offsetof(UA_SimpleAttributeOperand, browsePath) - sizeof(void *), /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
+    false /* .isOptional */
+},
+{
+    UA_TYPENAME("IndexRange") /* .memberName */
+    UA_TYPES_STRING, /* .memberTypeIndex */
+    offsetof(UA_SimpleAttributeOperand, indexRange) - offsetof(UA_SimpleAttributeOperand, attributeId) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },};
 
-/* SetPublishingModeResponse */
-static UA_DataTypeMember SetPublishingModeResponse_members[3] = {
+/* ContentFilterElementResult */
+static UA_DataTypeMember ContentFilterElementResult_members[3] = {
 {
-    UA_TYPENAME("ResponseHeader") /* .memberName */
-    UA_TYPES_RESPONSEHEADER, /* .memberTypeIndex */
+    UA_TYPENAME("StatusCode") /* .memberName */
+    UA_TYPES_STATUSCODE, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("Results") /* .memberName */
+    UA_TYPENAME("OperandStatusCodes") /* .memberName */
     UA_TYPES_STATUSCODE, /* .memberTypeIndex */
-    offsetof(UA_SetPublishingModeResponse, resultsSize) - offsetof(UA_SetPublishingModeResponse, responseHeader) - sizeof(UA_ResponseHeader), /* .padding */
+    offsetof(UA_ContentFilterElementResult, operandStatusCodesSize) - offsetof(UA_ContentFilterElementResult, statusCode) - sizeof(UA_StatusCode), /* .padding */
     true, /* .namespaceZero */
     true, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("DiagnosticInfos") /* .memberName */
+    UA_TYPENAME("OperandDiagnosticInfos") /* .memberName */
     UA_TYPES_DIAGNOSTICINFO, /* .memberTypeIndex */
-    offsetof(UA_SetPublishingModeResponse, diagnosticInfosSize) - offsetof(UA_SetPublishingModeResponse, results) - sizeof(void *), /* .padding */
+    offsetof(UA_ContentFilterElementResult, operandDiagnosticInfosSize) - offsetof(UA_ContentFilterElementResult, operandStatusCodes) - sizeof(void *), /* .padding */
     true, /* .namespaceZero */
     true, /* .isArray */
     false /* .isOptional */
 },};
 
-/* StatusChangeNotification */
-static UA_DataTypeMember StatusChangeNotification_members[2] = {
+/* ContentFilterResult */
+static UA_DataTypeMember ContentFilterResult_members[2] = {
 {
-    UA_TYPENAME("Status") /* .memberName */
-    UA_TYPES_STATUSCODE, /* .memberTypeIndex */
+    UA_TYPENAME("ElementResults") /* .memberName */
+    UA_TYPES_CONTENTFILTERELEMENTRESULT, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
-    false, /* .isArray */
+    true, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("DiagnosticInfo") /* .memberName */
+    UA_TYPENAME("ElementDiagnosticInfos") /* .memberName */
     UA_TYPES_DIAGNOSTICINFO, /* .memberTypeIndex */
-    offsetof(UA_StatusChangeNotification, diagnosticInfo) - offsetof(UA_StatusChangeNotification, status) - sizeof(UA_StatusCode), /* .padding */
+    offsetof(UA_ContentFilterResult, elementDiagnosticInfosSize) - offsetof(UA_ContentFilterResult, elementResults) - sizeof(void *), /* .padding */
     true, /* .namespaceZero */
-    false, /* .isArray */
+    true, /* .isArray */
     false /* .isOptional */
 },};
 
-/* StructureField */
-static UA_DataTypeMember StructureField_members[7] = {
+/* TimestampsToReturn */
+#define TimestampsToReturn_members NULL
+
+/* ReadValueId */
+static UA_DataTypeMember ReadValueId_members[4] = {
 {
-    UA_TYPENAME("Name") /* .memberName */
-    UA_TYPES_STRING, /* .memberTypeIndex */
+    UA_TYPENAME("NodeId") /* .memberName */
+    UA_TYPES_NODEID, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("Description") /* .memberName */
-    UA_TYPES_LOCALIZEDTEXT, /* .memberTypeIndex */
-    offsetof(UA_StructureField, description) - offsetof(UA_StructureField, name) - sizeof(UA_String), /* .padding */
+    UA_TYPENAME("AttributeId") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_ReadValueId, attributeId) - offsetof(UA_ReadValueId, nodeId) - sizeof(UA_NodeId), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("DataType") /* .memberName */
-    UA_TYPES_NODEID, /* .memberTypeIndex */
-    offsetof(UA_StructureField, dataType) - offsetof(UA_StructureField, description) - sizeof(UA_LocalizedText), /* .padding */
+    UA_TYPENAME("IndexRange") /* .memberName */
+    UA_TYPES_STRING, /* .memberTypeIndex */
+    offsetof(UA_ReadValueId, indexRange) - offsetof(UA_ReadValueId, attributeId) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("ValueRank") /* .memberName */
-    UA_TYPES_INT32, /* .memberTypeIndex */
-    offsetof(UA_StructureField, valueRank) - offsetof(UA_StructureField, dataType) - sizeof(UA_NodeId), /* .padding */
+    UA_TYPENAME("DataEncoding") /* .memberName */
+    UA_TYPES_QUALIFIEDNAME, /* .memberTypeIndex */
+    offsetof(UA_ReadValueId, dataEncoding) - offsetof(UA_ReadValueId, indexRange) - sizeof(UA_String), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
-},
+},};
+
+/* ReadRequest */
+static UA_DataTypeMember ReadRequest_members[4] = {
 {
-    UA_TYPENAME("ArrayDimensions") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_StructureField, arrayDimensionsSize) - offsetof(UA_StructureField, valueRank) - sizeof(UA_Int32), /* .padding */
+    UA_TYPENAME("RequestHeader") /* .memberName */
+    UA_TYPES_REQUESTHEADER, /* .memberTypeIndex */
+    0, /* .padding */
     true, /* .namespaceZero */
-    true, /* .isArray */
+    false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("MaxStringLength") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_StructureField, maxStringLength) - offsetof(UA_StructureField, arrayDimensions) - sizeof(void *), /* .padding */
+    UA_TYPENAME("MaxAge") /* .memberName */
+    UA_TYPES_DOUBLE, /* .memberTypeIndex */
+    offsetof(UA_ReadRequest, maxAge) - offsetof(UA_ReadRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("IsOptional") /* .memberName */
-    UA_TYPES_BOOLEAN, /* .memberTypeIndex */
-    offsetof(UA_StructureField, isOptional) - offsetof(UA_StructureField, maxStringLength) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("TimestampsToReturn") /* .memberName */
+    UA_TYPES_TIMESTAMPSTORETURN, /* .memberTypeIndex */
+    offsetof(UA_ReadRequest, timestampsToReturn) - offsetof(UA_ReadRequest, maxAge) - sizeof(UA_Double), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
+},
+{
+    UA_TYPENAME("NodesToRead") /* .memberName */
+    UA_TYPES_READVALUEID, /* .memberTypeIndex */
+    offsetof(UA_ReadRequest, nodesToReadSize) - offsetof(UA_ReadRequest, timestampsToReturn) - sizeof(UA_TimestampsToReturn), /* .padding */
+    true, /* .namespaceZero */
+    true, /* .isArray */
+    false /* .isOptional */
 },};
 
-/* NodeAttributesMask */
-#define NodeAttributesMask_members NULL
-
-/* EventFilterResult */
-static UA_DataTypeMember EventFilterResult_members[3] = {
+/* ReadResponse */
+static UA_DataTypeMember ReadResponse_members[3] = {
 {
-    UA_TYPENAME("SelectClauseResults") /* .memberName */
-    UA_TYPES_STATUSCODE, /* .memberTypeIndex */
+    UA_TYPENAME("ResponseHeader") /* .memberName */
+    UA_TYPES_RESPONSEHEADER, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
-    true, /* .isArray */
+    false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("SelectClauseDiagnosticInfos") /* .memberName */
-    UA_TYPES_DIAGNOSTICINFO, /* .memberTypeIndex */
-    offsetof(UA_EventFilterResult, selectClauseDiagnosticInfosSize) - offsetof(UA_EventFilterResult, selectClauseResults) - sizeof(void *), /* .padding */
+    UA_TYPENAME("Results") /* .memberName */
+    UA_TYPES_DATAVALUE, /* .memberTypeIndex */
+    offsetof(UA_ReadResponse, resultsSize) - offsetof(UA_ReadResponse, responseHeader) - sizeof(UA_ResponseHeader), /* .padding */
     true, /* .namespaceZero */
     true, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("WhereClauseResult") /* .memberName */
-    UA_TYPES_CONTENTFILTERRESULT, /* .memberTypeIndex */
-    offsetof(UA_EventFilterResult, whereClauseResult) - offsetof(UA_EventFilterResult, selectClauseDiagnosticInfos) - sizeof(void *), /* .padding */
+    UA_TYPENAME("DiagnosticInfos") /* .memberName */
+    UA_TYPES_DIAGNOSTICINFO, /* .memberTypeIndex */
+    offsetof(UA_ReadResponse, diagnosticInfosSize) - offsetof(UA_ReadResponse, results) - sizeof(void *), /* .padding */
     true, /* .namespaceZero */
-    false, /* .isArray */
+    true, /* .isArray */
     false /* .isOptional */
 },};
 
-/* MonitoredItemCreateRequest */
-static UA_DataTypeMember MonitoredItemCreateRequest_members[3] = {
+/* HistoryReadValueId */
+static UA_DataTypeMember HistoryReadValueId_members[4] = {
 {
-    UA_TYPENAME("ItemToMonitor") /* .memberName */
-    UA_TYPES_READVALUEID, /* .memberTypeIndex */
+    UA_TYPENAME("NodeId") /* .memberName */
+    UA_TYPES_NODEID, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("MonitoringMode") /* .memberName */
-    UA_TYPES_MONITORINGMODE, /* .memberTypeIndex */
-    offsetof(UA_MonitoredItemCreateRequest, monitoringMode) - offsetof(UA_MonitoredItemCreateRequest, itemToMonitor) - sizeof(UA_ReadValueId), /* .padding */
+    UA_TYPENAME("IndexRange") /* .memberName */
+    UA_TYPES_STRING, /* .memberTypeIndex */
+    offsetof(UA_HistoryReadValueId, indexRange) - offsetof(UA_HistoryReadValueId, nodeId) - sizeof(UA_NodeId), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("RequestedParameters") /* .memberName */
-    UA_TYPES_MONITORINGPARAMETERS, /* .memberTypeIndex */
-    offsetof(UA_MonitoredItemCreateRequest, requestedParameters) - offsetof(UA_MonitoredItemCreateRequest, monitoringMode) - sizeof(UA_MonitoringMode), /* .padding */
-    true, /* .namespaceZero */
-    false, /* .isArray */
-    false /* .isOptional */
-},};
-
-/* ComplexNumberType */
-static UA_DataTypeMember ComplexNumberType_members[2] = {
-{
-    UA_TYPENAME("Real") /* .memberName */
-    UA_TYPES_FLOAT, /* .memberTypeIndex */
-    0, /* .padding */
+    UA_TYPENAME("DataEncoding") /* .memberName */
+    UA_TYPES_QUALIFIEDNAME, /* .memberTypeIndex */
+    offsetof(UA_HistoryReadValueId, dataEncoding) - offsetof(UA_HistoryReadValueId, indexRange) - sizeof(UA_String), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("Imaginary") /* .memberName */
-    UA_TYPES_FLOAT, /* .memberTypeIndex */
-    offsetof(UA_ComplexNumberType, imaginary) - offsetof(UA_ComplexNumberType, real) - sizeof(UA_Float), /* .padding */
+    UA_TYPENAME("ContinuationPoint") /* .memberName */
+    UA_TYPES_BYTESTRING, /* .memberTypeIndex */
+    offsetof(UA_HistoryReadValueId, continuationPoint) - offsetof(UA_HistoryReadValueId, dataEncoding) - sizeof(UA_QualifiedName), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },};
 
-/* Range */
-static UA_DataTypeMember Range_members[2] = {
+/* HistoryReadResult */
+static UA_DataTypeMember HistoryReadResult_members[3] = {
 {
-    UA_TYPENAME("Low") /* .memberName */
-    UA_TYPES_DOUBLE, /* .memberTypeIndex */
+    UA_TYPENAME("StatusCode") /* .memberName */
+    UA_TYPES_STATUSCODE, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("High") /* .memberName */
-    UA_TYPES_DOUBLE, /* .memberTypeIndex */
-    offsetof(UA_Range, high) - offsetof(UA_Range, low) - sizeof(UA_Double), /* .padding */
+    UA_TYPENAME("ContinuationPoint") /* .memberName */
+    UA_TYPES_BYTESTRING, /* .memberTypeIndex */
+    offsetof(UA_HistoryReadResult, continuationPoint) - offsetof(UA_HistoryReadResult, statusCode) - sizeof(UA_StatusCode), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
-},};
-
-/* DataChangeNotification */
-static UA_DataTypeMember DataChangeNotification_members[2] = {
-{
-    UA_TYPENAME("MonitoredItems") /* .memberName */
-    UA_TYPES_MONITOREDITEMNOTIFICATION, /* .memberTypeIndex */
-    0, /* .padding */
-    true, /* .namespaceZero */
-    true, /* .isArray */
-    false /* .isOptional */
 },
 {
-    UA_TYPENAME("DiagnosticInfos") /* .memberName */
-    UA_TYPES_DIAGNOSTICINFO, /* .memberTypeIndex */
-    offsetof(UA_DataChangeNotification, diagnosticInfosSize) - offsetof(UA_DataChangeNotification, monitoredItems) - sizeof(void *), /* .padding */
+    UA_TYPENAME("HistoryData") /* .memberName */
+    UA_TYPES_EXTENSIONOBJECT, /* .memberTypeIndex */
+    offsetof(UA_HistoryReadResult, historyData) - offsetof(UA_HistoryReadResult, continuationPoint) - sizeof(UA_ByteString), /* .padding */
     true, /* .namespaceZero */
-    true, /* .isArray */
+    false, /* .isArray */
     false /* .isOptional */
 },};
 
-/* Argument */
-static UA_DataTypeMember Argument_members[5] = {
+/* ReadRawModifiedDetails */
+static UA_DataTypeMember ReadRawModifiedDetails_members[5] = {
 {
-    UA_TYPENAME("Name") /* .memberName */
-    UA_TYPES_STRING, /* .memberTypeIndex */
+    UA_TYPENAME("IsReadModified") /* .memberName */
+    UA_TYPES_BOOLEAN, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("DataType") /* .memberName */
-    UA_TYPES_NODEID, /* .memberTypeIndex */
-    offsetof(UA_Argument, dataType) - offsetof(UA_Argument, name) - sizeof(UA_String), /* .padding */
+    UA_TYPENAME("StartTime") /* .memberName */
+    UA_TYPES_DATETIME, /* .memberTypeIndex */
+    offsetof(UA_ReadRawModifiedDetails, startTime) - offsetof(UA_ReadRawModifiedDetails, isReadModified) - sizeof(UA_Boolean), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("ValueRank") /* .memberName */
-    UA_TYPES_INT32, /* .memberTypeIndex */
-    offsetof(UA_Argument, valueRank) - offsetof(UA_Argument, dataType) - sizeof(UA_NodeId), /* .padding */
+    UA_TYPENAME("EndTime") /* .memberName */
+    UA_TYPES_DATETIME, /* .memberTypeIndex */
+    offsetof(UA_ReadRawModifiedDetails, endTime) - offsetof(UA_ReadRawModifiedDetails, startTime) - sizeof(UA_DateTime), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("ArrayDimensions") /* .memberName */
+    UA_TYPENAME("NumValuesPerNode") /* .memberName */
     UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_Argument, arrayDimensionsSize) - offsetof(UA_Argument, valueRank) - sizeof(UA_Int32), /* .padding */
+    offsetof(UA_ReadRawModifiedDetails, numValuesPerNode) - offsetof(UA_ReadRawModifiedDetails, endTime) - sizeof(UA_DateTime), /* .padding */
     true, /* .namespaceZero */
-    true, /* .isArray */
+    false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("Description") /* .memberName */
-    UA_TYPES_LOCALIZEDTEXT, /* .memberTypeIndex */
-    offsetof(UA_Argument, description) - offsetof(UA_Argument, arrayDimensions) - sizeof(void *), /* .padding */
+    UA_TYPENAME("ReturnBounds") /* .memberName */
+    UA_TYPES_BOOLEAN, /* .memberTypeIndex */
+    offsetof(UA_ReadRawModifiedDetails, returnBounds) - offsetof(UA_ReadRawModifiedDetails, numValuesPerNode) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },};
 
-/* ChannelSecurityToken */
-static UA_DataTypeMember ChannelSecurityToken_members[4] = {
-{
-    UA_TYPENAME("ChannelId") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    0, /* .padding */
-    true, /* .namespaceZero */
-    false, /* .isArray */
-    false /* .isOptional */
-},
-{
-    UA_TYPENAME("TokenId") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_ChannelSecurityToken, tokenId) - offsetof(UA_ChannelSecurityToken, channelId) - sizeof(UA_UInt32), /* .padding */
-    true, /* .namespaceZero */
-    false, /* .isArray */
-    false /* .isOptional */
-},
+/* ReadAtTimeDetails */
+static UA_DataTypeMember ReadAtTimeDetails_members[2] = {
 {
-    UA_TYPENAME("CreatedAt") /* .memberName */
+    UA_TYPENAME("ReqTimes") /* .memberName */
     UA_TYPES_DATETIME, /* .memberTypeIndex */
-    offsetof(UA_ChannelSecurityToken, createdAt) - offsetof(UA_ChannelSecurityToken, tokenId) - sizeof(UA_UInt32), /* .padding */
+    0, /* .padding */
     true, /* .namespaceZero */
-    false, /* .isArray */
+    true, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("RevisedLifetime") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_ChannelSecurityToken, revisedLifetime) - offsetof(UA_ChannelSecurityToken, createdAt) - sizeof(UA_DateTime), /* .padding */
+    UA_TYPENAME("UseSimpleBounds") /* .memberName */
+    UA_TYPES_BOOLEAN, /* .memberTypeIndex */
+    offsetof(UA_ReadAtTimeDetails, useSimpleBounds) - offsetof(UA_ReadAtTimeDetails, reqTimes) - sizeof(void *), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },};
 
-/* ServerState */
-#define ServerState_members NULL
-
-/* EventNotificationList */
-static UA_DataTypeMember EventNotificationList_members[1] = {
+/* HistoryData */
+static UA_DataTypeMember HistoryData_members[1] = {
 {
-    UA_TYPENAME("Events") /* .memberName */
-    UA_TYPES_EVENTFIELDLIST, /* .memberTypeIndex */
+    UA_TYPENAME("DataValues") /* .memberName */
+    UA_TYPES_DATAVALUE, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     true, /* .isArray */
     false /* .isOptional */
 },};
 
-/* AnonymousIdentityToken */
-static UA_DataTypeMember AnonymousIdentityToken_members[1] = {
-{
-    UA_TYPENAME("PolicyId") /* .memberName */
-    UA_TYPES_STRING, /* .memberTypeIndex */
-    0, /* .padding */
-    true, /* .namespaceZero */
-    false, /* .isArray */
-    false /* .isOptional */
-},};
-
-/* FilterOperator */
-#define FilterOperator_members NULL
-
-/* AggregateFilter */
-static UA_DataTypeMember AggregateFilter_members[4] = {
+/* HistoryReadRequest */
+static UA_DataTypeMember HistoryReadRequest_members[5] = {
 {
-    UA_TYPENAME("StartTime") /* .memberName */
-    UA_TYPES_DATETIME, /* .memberTypeIndex */
+    UA_TYPENAME("RequestHeader") /* .memberName */
+    UA_TYPES_REQUESTHEADER, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("AggregateType") /* .memberName */
-    UA_TYPES_NODEID, /* .memberTypeIndex */
-    offsetof(UA_AggregateFilter, aggregateType) - offsetof(UA_AggregateFilter, startTime) - sizeof(UA_DateTime), /* .padding */
+    UA_TYPENAME("HistoryReadDetails") /* .memberName */
+    UA_TYPES_EXTENSIONOBJECT, /* .memberTypeIndex */
+    offsetof(UA_HistoryReadRequest, historyReadDetails) - offsetof(UA_HistoryReadRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("ProcessingInterval") /* .memberName */
-    UA_TYPES_DOUBLE, /* .memberTypeIndex */
-    offsetof(UA_AggregateFilter, processingInterval) - offsetof(UA_AggregateFilter, aggregateType) - sizeof(UA_NodeId), /* .padding */
+    UA_TYPENAME("TimestampsToReturn") /* .memberName */
+    UA_TYPES_TIMESTAMPSTORETURN, /* .memberTypeIndex */
+    offsetof(UA_HistoryReadRequest, timestampsToReturn) - offsetof(UA_HistoryReadRequest, historyReadDetails) - sizeof(UA_ExtensionObject), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("AggregateConfiguration") /* .memberName */
-    UA_TYPES_AGGREGATECONFIGURATION, /* .memberTypeIndex */
-    offsetof(UA_AggregateFilter, aggregateConfiguration) - offsetof(UA_AggregateFilter, processingInterval) - sizeof(UA_Double), /* .padding */
-    true, /* .namespaceZero */
-    false, /* .isArray */
-    false /* .isOptional */
-},};
-
-/* RepublishResponse */
-static UA_DataTypeMember RepublishResponse_members[2] = {
-{
-    UA_TYPENAME("ResponseHeader") /* .memberName */
-    UA_TYPES_RESPONSEHEADER, /* .memberTypeIndex */
-    0, /* .padding */
+    UA_TYPENAME("ReleaseContinuationPoints") /* .memberName */
+    UA_TYPES_BOOLEAN, /* .memberTypeIndex */
+    offsetof(UA_HistoryReadRequest, releaseContinuationPoints) - offsetof(UA_HistoryReadRequest, timestampsToReturn) - sizeof(UA_TimestampsToReturn), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("NotificationMessage") /* .memberName */
-    UA_TYPES_NOTIFICATIONMESSAGE, /* .memberTypeIndex */
-    offsetof(UA_RepublishResponse, notificationMessage) - offsetof(UA_RepublishResponse, responseHeader) - sizeof(UA_ResponseHeader), /* .padding */
+    UA_TYPENAME("NodesToRead") /* .memberName */
+    UA_TYPES_HISTORYREADVALUEID, /* .memberTypeIndex */
+    offsetof(UA_HistoryReadRequest, nodesToReadSize) - offsetof(UA_HistoryReadRequest, releaseContinuationPoints) - sizeof(UA_Boolean), /* .padding */
     true, /* .namespaceZero */
-    false, /* .isArray */
+    true, /* .isArray */
     false /* .isOptional */
 },};
 
-/* DeleteSubscriptionsResponse */
-static UA_DataTypeMember DeleteSubscriptionsResponse_members[3] = {
+/* HistoryReadResponse */
+static UA_DataTypeMember HistoryReadResponse_members[3] = {
 {
     UA_TYPENAME("ResponseHeader") /* .memberName */
     UA_TYPES_RESPONSEHEADER, /* .memberTypeIndex */
@@ -13523,8 +14145,8 @@ static UA_DataTypeMember DeleteSubscriptionsResponse_members[3] = {
 },
 {
     UA_TYPENAME("Results") /* .memberName */
-    UA_TYPES_STATUSCODE, /* .memberTypeIndex */
-    offsetof(UA_DeleteSubscriptionsResponse, resultsSize) - offsetof(UA_DeleteSubscriptionsResponse, responseHeader) - sizeof(UA_ResponseHeader), /* .padding */
+    UA_TYPES_HISTORYREADRESULT, /* .memberTypeIndex */
+    offsetof(UA_HistoryReadResponse, resultsSize) - offsetof(UA_HistoryReadResponse, responseHeader) - sizeof(UA_ResponseHeader), /* .padding */
     true, /* .namespaceZero */
     true, /* .isArray */
     false /* .isOptional */
@@ -13532,181 +14154,190 @@ static UA_DataTypeMember DeleteSubscriptionsResponse_members[3] = {
 {
     UA_TYPENAME("DiagnosticInfos") /* .memberName */
     UA_TYPES_DIAGNOSTICINFO, /* .memberTypeIndex */
-    offsetof(UA_DeleteSubscriptionsResponse, diagnosticInfosSize) - offsetof(UA_DeleteSubscriptionsResponse, results) - sizeof(void *), /* .padding */
+    offsetof(UA_HistoryReadResponse, diagnosticInfosSize) - offsetof(UA_HistoryReadResponse, results) - sizeof(void *), /* .padding */
     true, /* .namespaceZero */
     true, /* .isArray */
     false /* .isOptional */
 },};
 
-/* RegisterNodesRequest */
-static UA_DataTypeMember RegisterNodesRequest_members[2] = {
+/* WriteValue */
+static UA_DataTypeMember WriteValue_members[4] = {
 {
-    UA_TYPENAME("RequestHeader") /* .memberName */
-    UA_TYPES_REQUESTHEADER, /* .memberTypeIndex */
+    UA_TYPENAME("NodeId") /* .memberName */
+    UA_TYPES_NODEID, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("NodesToRegister") /* .memberName */
-    UA_TYPES_NODEID, /* .memberTypeIndex */
-    offsetof(UA_RegisterNodesRequest, nodesToRegisterSize) - offsetof(UA_RegisterNodesRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
+    UA_TYPENAME("AttributeId") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_WriteValue, attributeId) - offsetof(UA_WriteValue, nodeId) - sizeof(UA_NodeId), /* .padding */
     true, /* .namespaceZero */
-    true, /* .isArray */
+    false, /* .isArray */
     false /* .isOptional */
-},};
-
-/* StructureDefinition */
-static UA_DataTypeMember StructureDefinition_members[4] = {
+},
 {
-    UA_TYPENAME("DefaultEncodingId") /* .memberName */
-    UA_TYPES_NODEID, /* .memberTypeIndex */
-    0, /* .padding */
+    UA_TYPENAME("IndexRange") /* .memberName */
+    UA_TYPES_STRING, /* .memberTypeIndex */
+    offsetof(UA_WriteValue, indexRange) - offsetof(UA_WriteValue, attributeId) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("BaseDataType") /* .memberName */
-    UA_TYPES_NODEID, /* .memberTypeIndex */
-    offsetof(UA_StructureDefinition, baseDataType) - offsetof(UA_StructureDefinition, defaultEncodingId) - sizeof(UA_NodeId), /* .padding */
+    UA_TYPENAME("Value") /* .memberName */
+    UA_TYPES_DATAVALUE, /* .memberTypeIndex */
+    offsetof(UA_WriteValue, value) - offsetof(UA_WriteValue, indexRange) - sizeof(UA_String), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
-},
+},};
+
+/* WriteRequest */
+static UA_DataTypeMember WriteRequest_members[2] = {
 {
-    UA_TYPENAME("StructureType") /* .memberName */
-    UA_TYPES_STRUCTURETYPE, /* .memberTypeIndex */
-    offsetof(UA_StructureDefinition, structureType) - offsetof(UA_StructureDefinition, baseDataType) - sizeof(UA_NodeId), /* .padding */
+    UA_TYPENAME("RequestHeader") /* .memberName */
+    UA_TYPES_REQUESTHEADER, /* .memberTypeIndex */
+    0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("Fields") /* .memberName */
-    UA_TYPES_STRUCTUREFIELD, /* .memberTypeIndex */
-    offsetof(UA_StructureDefinition, fieldsSize) - offsetof(UA_StructureDefinition, structureType) - sizeof(UA_StructureType), /* .padding */
+    UA_TYPENAME("NodesToWrite") /* .memberName */
+    UA_TYPES_WRITEVALUE, /* .memberTypeIndex */
+    offsetof(UA_WriteRequest, nodesToWriteSize) - offsetof(UA_WriteRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
     true, /* .namespaceZero */
     true, /* .isArray */
     false /* .isOptional */
 },};
 
-/* MethodAttributes */
-static UA_DataTypeMember MethodAttributes_members[7] = {
+/* WriteResponse */
+static UA_DataTypeMember WriteResponse_members[3] = {
 {
-    UA_TYPENAME("SpecifiedAttributes") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
+    UA_TYPENAME("ResponseHeader") /* .memberName */
+    UA_TYPES_RESPONSEHEADER, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("DisplayName") /* .memberName */
-    UA_TYPES_LOCALIZEDTEXT, /* .memberTypeIndex */
-    offsetof(UA_MethodAttributes, displayName) - offsetof(UA_MethodAttributes, specifiedAttributes) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("Results") /* .memberName */
+    UA_TYPES_STATUSCODE, /* .memberTypeIndex */
+    offsetof(UA_WriteResponse, resultsSize) - offsetof(UA_WriteResponse, responseHeader) - sizeof(UA_ResponseHeader), /* .padding */
     true, /* .namespaceZero */
-    false, /* .isArray */
+    true, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("Description") /* .memberName */
-    UA_TYPES_LOCALIZEDTEXT, /* .memberTypeIndex */
-    offsetof(UA_MethodAttributes, description) - offsetof(UA_MethodAttributes, displayName) - sizeof(UA_LocalizedText), /* .padding */
+    UA_TYPENAME("DiagnosticInfos") /* .memberName */
+    UA_TYPES_DIAGNOSTICINFO, /* .memberTypeIndex */
+    offsetof(UA_WriteResponse, diagnosticInfosSize) - offsetof(UA_WriteResponse, results) - sizeof(void *), /* .padding */
     true, /* .namespaceZero */
-    false, /* .isArray */
+    true, /* .isArray */
     false /* .isOptional */
-},
+},};
+
+/* HistoryUpdateType */
+#define HistoryUpdateType_members NULL
+
+/* PerformUpdateType */
+#define PerformUpdateType_members NULL
+
+/* UpdateDataDetails */
+static UA_DataTypeMember UpdateDataDetails_members[3] = {
 {
-    UA_TYPENAME("WriteMask") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_MethodAttributes, writeMask) - offsetof(UA_MethodAttributes, description) - sizeof(UA_LocalizedText), /* .padding */
+    UA_TYPENAME("NodeId") /* .memberName */
+    UA_TYPES_NODEID, /* .memberTypeIndex */
+    0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("UserWriteMask") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_MethodAttributes, userWriteMask) - offsetof(UA_MethodAttributes, writeMask) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("PerformInsertReplace") /* .memberName */
+    UA_TYPES_PERFORMUPDATETYPE, /* .memberTypeIndex */
+    offsetof(UA_UpdateDataDetails, performInsertReplace) - offsetof(UA_UpdateDataDetails, nodeId) - sizeof(UA_NodeId), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("Executable") /* .memberName */
-    UA_TYPES_BOOLEAN, /* .memberTypeIndex */
-    offsetof(UA_MethodAttributes, executable) - offsetof(UA_MethodAttributes, userWriteMask) - sizeof(UA_UInt32), /* .padding */
-    true, /* .namespaceZero */
-    false, /* .isArray */
-    false /* .isOptional */
-},
-{
-    UA_TYPENAME("UserExecutable") /* .memberName */
-    UA_TYPES_BOOLEAN, /* .memberTypeIndex */
-    offsetof(UA_MethodAttributes, userExecutable) - offsetof(UA_MethodAttributes, executable) - sizeof(UA_Boolean), /* .padding */
+    UA_TYPENAME("UpdateValues") /* .memberName */
+    UA_TYPES_DATAVALUE, /* .memberTypeIndex */
+    offsetof(UA_UpdateDataDetails, updateValuesSize) - offsetof(UA_UpdateDataDetails, performInsertReplace) - sizeof(UA_PerformUpdateType), /* .padding */
     true, /* .namespaceZero */
-    false, /* .isArray */
+    true, /* .isArray */
     false /* .isOptional */
 },};
 
-/* UserNameIdentityToken */
-static UA_DataTypeMember UserNameIdentityToken_members[4] = {
+/* DeleteRawModifiedDetails */
+static UA_DataTypeMember DeleteRawModifiedDetails_members[4] = {
 {
-    UA_TYPENAME("PolicyId") /* .memberName */
-    UA_TYPES_STRING, /* .memberTypeIndex */
+    UA_TYPENAME("NodeId") /* .memberName */
+    UA_TYPES_NODEID, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("UserName") /* .memberName */
-    UA_TYPES_STRING, /* .memberTypeIndex */
-    offsetof(UA_UserNameIdentityToken, userName) - offsetof(UA_UserNameIdentityToken, policyId) - sizeof(UA_String), /* .padding */
+    UA_TYPENAME("IsDeleteModified") /* .memberName */
+    UA_TYPES_BOOLEAN, /* .memberTypeIndex */
+    offsetof(UA_DeleteRawModifiedDetails, isDeleteModified) - offsetof(UA_DeleteRawModifiedDetails, nodeId) - sizeof(UA_NodeId), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("Password") /* .memberName */
-    UA_TYPES_BYTESTRING, /* .memberTypeIndex */
-    offsetof(UA_UserNameIdentityToken, password) - offsetof(UA_UserNameIdentityToken, userName) - sizeof(UA_String), /* .padding */
+    UA_TYPENAME("StartTime") /* .memberName */
+    UA_TYPES_DATETIME, /* .memberTypeIndex */
+    offsetof(UA_DeleteRawModifiedDetails, startTime) - offsetof(UA_DeleteRawModifiedDetails, isDeleteModified) - sizeof(UA_Boolean), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("EncryptionAlgorithm") /* .memberName */
-    UA_TYPES_STRING, /* .memberTypeIndex */
-    offsetof(UA_UserNameIdentityToken, encryptionAlgorithm) - offsetof(UA_UserNameIdentityToken, password) - sizeof(UA_ByteString), /* .padding */
+    UA_TYPENAME("EndTime") /* .memberName */
+    UA_TYPES_DATETIME, /* .memberTypeIndex */
+    offsetof(UA_DeleteRawModifiedDetails, endTime) - offsetof(UA_DeleteRawModifiedDetails, startTime) - sizeof(UA_DateTime), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },};
 
-/* TimeZoneDataType */
-static UA_DataTypeMember TimeZoneDataType_members[2] = {
+/* HistoryUpdateResult */
+static UA_DataTypeMember HistoryUpdateResult_members[3] = {
 {
-    UA_TYPENAME("Offset") /* .memberName */
-    UA_TYPES_INT16, /* .memberTypeIndex */
+    UA_TYPENAME("StatusCode") /* .memberName */
+    UA_TYPES_STATUSCODE, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("DaylightSavingInOffset") /* .memberName */
-    UA_TYPES_BOOLEAN, /* .memberTypeIndex */
-    offsetof(UA_TimeZoneDataType, daylightSavingInOffset) - offsetof(UA_TimeZoneDataType, offset) - sizeof(UA_Int16), /* .padding */
+    UA_TYPENAME("OperationResults") /* .memberName */
+    UA_TYPES_STATUSCODE, /* .memberTypeIndex */
+    offsetof(UA_HistoryUpdateResult, operationResultsSize) - offsetof(UA_HistoryUpdateResult, statusCode) - sizeof(UA_StatusCode), /* .padding */
     true, /* .namespaceZero */
-    false, /* .isArray */
+    true, /* .isArray */
+    false /* .isOptional */
+},
+{
+    UA_TYPENAME("DiagnosticInfos") /* .memberName */
+    UA_TYPES_DIAGNOSTICINFO, /* .memberTypeIndex */
+    offsetof(UA_HistoryUpdateResult, diagnosticInfosSize) - offsetof(UA_HistoryUpdateResult, operationResults) - sizeof(void *), /* .padding */
+    true, /* .namespaceZero */
+    true, /* .isArray */
     false /* .isOptional */
 },};
 
-/* UnregisterNodesRequest */
-static UA_DataTypeMember UnregisterNodesRequest_members[2] = {
+/* HistoryUpdateRequest */
+static UA_DataTypeMember HistoryUpdateRequest_members[2] = {
 {
     UA_TYPENAME("RequestHeader") /* .memberName */
     UA_TYPES_REQUESTHEADER, /* .memberTypeIndex */
@@ -13716,16 +14347,16 @@ static UA_DataTypeMember UnregisterNodesRequest_members[2] = {
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("NodesToUnregister") /* .memberName */
-    UA_TYPES_NODEID, /* .memberTypeIndex */
-    offsetof(UA_UnregisterNodesRequest, nodesToUnregisterSize) - offsetof(UA_UnregisterNodesRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
+    UA_TYPENAME("HistoryUpdateDetails") /* .memberName */
+    UA_TYPES_EXTENSIONOBJECT, /* .memberTypeIndex */
+    offsetof(UA_HistoryUpdateRequest, historyUpdateDetailsSize) - offsetof(UA_HistoryUpdateRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
     true, /* .namespaceZero */
     true, /* .isArray */
     false /* .isOptional */
 },};
 
-/* OpenSecureChannelResponse */
-static UA_DataTypeMember OpenSecureChannelResponse_members[4] = {
+/* HistoryUpdateResponse */
+static UA_DataTypeMember HistoryUpdateResponse_members[3] = {
 {
     UA_TYPENAME("ResponseHeader") /* .memberName */
     UA_TYPES_RESPONSEHEADER, /* .memberTypeIndex */
@@ -13735,110 +14366,86 @@ static UA_DataTypeMember OpenSecureChannelResponse_members[4] = {
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("ServerProtocolVersion") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_OpenSecureChannelResponse, serverProtocolVersion) - offsetof(UA_OpenSecureChannelResponse, responseHeader) - sizeof(UA_ResponseHeader), /* .padding */
-    true, /* .namespaceZero */
-    false, /* .isArray */
-    false /* .isOptional */
-},
-{
-    UA_TYPENAME("SecurityToken") /* .memberName */
-    UA_TYPES_CHANNELSECURITYTOKEN, /* .memberTypeIndex */
-    offsetof(UA_OpenSecureChannelResponse, securityToken) - offsetof(UA_OpenSecureChannelResponse, serverProtocolVersion) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("Results") /* .memberName */
+    UA_TYPES_HISTORYUPDATERESULT, /* .memberTypeIndex */
+    offsetof(UA_HistoryUpdateResponse, resultsSize) - offsetof(UA_HistoryUpdateResponse, responseHeader) - sizeof(UA_ResponseHeader), /* .padding */
     true, /* .namespaceZero */
-    false, /* .isArray */
+    true, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("ServerNonce") /* .memberName */
-    UA_TYPES_BYTESTRING, /* .memberTypeIndex */
-    offsetof(UA_OpenSecureChannelResponse, serverNonce) - offsetof(UA_OpenSecureChannelResponse, securityToken) - sizeof(UA_ChannelSecurityToken), /* .padding */
+    UA_TYPENAME("DiagnosticInfos") /* .memberName */
+    UA_TYPES_DIAGNOSTICINFO, /* .memberTypeIndex */
+    offsetof(UA_HistoryUpdateResponse, diagnosticInfosSize) - offsetof(UA_HistoryUpdateResponse, results) - sizeof(void *), /* .padding */
     true, /* .namespaceZero */
-    false, /* .isArray */
+    true, /* .isArray */
     false /* .isOptional */
 },};
 
-/* SetTriggeringResponse */
-static UA_DataTypeMember SetTriggeringResponse_members[5] = {
+/* CallMethodRequest */
+static UA_DataTypeMember CallMethodRequest_members[3] = {
 {
-    UA_TYPENAME("ResponseHeader") /* .memberName */
-    UA_TYPES_RESPONSEHEADER, /* .memberTypeIndex */
+    UA_TYPENAME("ObjectId") /* .memberName */
+    UA_TYPES_NODEID, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("AddResults") /* .memberName */
-    UA_TYPES_STATUSCODE, /* .memberTypeIndex */
-    offsetof(UA_SetTriggeringResponse, addResultsSize) - offsetof(UA_SetTriggeringResponse, responseHeader) - sizeof(UA_ResponseHeader), /* .padding */
-    true, /* .namespaceZero */
-    true, /* .isArray */
-    false /* .isOptional */
-},
-{
-    UA_TYPENAME("AddDiagnosticInfos") /* .memberName */
-    UA_TYPES_DIAGNOSTICINFO, /* .memberTypeIndex */
-    offsetof(UA_SetTriggeringResponse, addDiagnosticInfosSize) - offsetof(UA_SetTriggeringResponse, addResults) - sizeof(void *), /* .padding */
-    true, /* .namespaceZero */
-    true, /* .isArray */
-    false /* .isOptional */
-},
-{
-    UA_TYPENAME("RemoveResults") /* .memberName */
-    UA_TYPES_STATUSCODE, /* .memberTypeIndex */
-    offsetof(UA_SetTriggeringResponse, removeResultsSize) - offsetof(UA_SetTriggeringResponse, addDiagnosticInfos) - sizeof(void *), /* .padding */
+    UA_TYPENAME("MethodId") /* .memberName */
+    UA_TYPES_NODEID, /* .memberTypeIndex */
+    offsetof(UA_CallMethodRequest, methodId) - offsetof(UA_CallMethodRequest, objectId) - sizeof(UA_NodeId), /* .padding */
     true, /* .namespaceZero */
-    true, /* .isArray */
+    false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("RemoveDiagnosticInfos") /* .memberName */
-    UA_TYPES_DIAGNOSTICINFO, /* .memberTypeIndex */
-    offsetof(UA_SetTriggeringResponse, removeDiagnosticInfosSize) - offsetof(UA_SetTriggeringResponse, removeResults) - sizeof(void *), /* .padding */
+    UA_TYPENAME("InputArguments") /* .memberName */
+    UA_TYPES_VARIANT, /* .memberTypeIndex */
+    offsetof(UA_CallMethodRequest, inputArgumentsSize) - offsetof(UA_CallMethodRequest, methodId) - sizeof(UA_NodeId), /* .padding */
     true, /* .namespaceZero */
     true, /* .isArray */
     false /* .isOptional */
 },};
 
-/* SimpleAttributeOperand */
-static UA_DataTypeMember SimpleAttributeOperand_members[4] = {
+/* CallMethodResult */
+static UA_DataTypeMember CallMethodResult_members[4] = {
 {
-    UA_TYPENAME("TypeDefinitionId") /* .memberName */
-    UA_TYPES_NODEID, /* .memberTypeIndex */
+    UA_TYPENAME("StatusCode") /* .memberName */
+    UA_TYPES_STATUSCODE, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("BrowsePath") /* .memberName */
-    UA_TYPES_QUALIFIEDNAME, /* .memberTypeIndex */
-    offsetof(UA_SimpleAttributeOperand, browsePathSize) - offsetof(UA_SimpleAttributeOperand, typeDefinitionId) - sizeof(UA_NodeId), /* .padding */
+    UA_TYPENAME("InputArgumentResults") /* .memberName */
+    UA_TYPES_STATUSCODE, /* .memberTypeIndex */
+    offsetof(UA_CallMethodResult, inputArgumentResultsSize) - offsetof(UA_CallMethodResult, statusCode) - sizeof(UA_StatusCode), /* .padding */
     true, /* .namespaceZero */
     true, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("AttributeId") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_SimpleAttributeOperand, attributeId) - offsetof(UA_SimpleAttributeOperand, browsePath) - sizeof(void *), /* .padding */
+    UA_TYPENAME("InputArgumentDiagnosticInfos") /* .memberName */
+    UA_TYPES_DIAGNOSTICINFO, /* .memberTypeIndex */
+    offsetof(UA_CallMethodResult, inputArgumentDiagnosticInfosSize) - offsetof(UA_CallMethodResult, inputArgumentResults) - sizeof(void *), /* .padding */
     true, /* .namespaceZero */
-    false, /* .isArray */
+    true, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("IndexRange") /* .memberName */
-    UA_TYPES_STRING, /* .memberTypeIndex */
-    offsetof(UA_SimpleAttributeOperand, indexRange) - offsetof(UA_SimpleAttributeOperand, attributeId) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("OutputArguments") /* .memberName */
+    UA_TYPES_VARIANT, /* .memberTypeIndex */
+    offsetof(UA_CallMethodResult, outputArgumentsSize) - offsetof(UA_CallMethodResult, inputArgumentDiagnosticInfos) - sizeof(void *), /* .padding */
     true, /* .namespaceZero */
-    false, /* .isArray */
+    true, /* .isArray */
     false /* .isOptional */
 },};
 
-/* RepublishRequest */
-static UA_DataTypeMember RepublishRequest_members[3] = {
+/* CallRequest */
+static UA_DataTypeMember CallRequest_members[2] = {
 {
     UA_TYPENAME("RequestHeader") /* .memberName */
     UA_TYPES_REQUESTHEADER, /* .memberTypeIndex */
@@ -13848,43 +14455,16 @@ static UA_DataTypeMember RepublishRequest_members[3] = {
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("SubscriptionId") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_RepublishRequest, subscriptionId) - offsetof(UA_RepublishRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
-    true, /* .namespaceZero */
-    false, /* .isArray */
-    false /* .isOptional */
-},
-{
-    UA_TYPENAME("RetransmitSequenceNumber") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_RepublishRequest, retransmitSequenceNumber) - offsetof(UA_RepublishRequest, subscriptionId) - sizeof(UA_UInt32), /* .padding */
-    true, /* .namespaceZero */
-    false, /* .isArray */
-    false /* .isOptional */
-},};
-
-/* RegisterNodesResponse */
-static UA_DataTypeMember RegisterNodesResponse_members[2] = {
-{
-    UA_TYPENAME("ResponseHeader") /* .memberName */
-    UA_TYPES_RESPONSEHEADER, /* .memberTypeIndex */
-    0, /* .padding */
-    true, /* .namespaceZero */
-    false, /* .isArray */
-    false /* .isOptional */
-},
-{
-    UA_TYPENAME("RegisteredNodeIds") /* .memberName */
-    UA_TYPES_NODEID, /* .memberTypeIndex */
-    offsetof(UA_RegisterNodesResponse, registeredNodeIdsSize) - offsetof(UA_RegisterNodesResponse, responseHeader) - sizeof(UA_ResponseHeader), /* .padding */
+    UA_TYPENAME("MethodsToCall") /* .memberName */
+    UA_TYPES_CALLMETHODREQUEST, /* .memberTypeIndex */
+    offsetof(UA_CallRequest, methodsToCallSize) - offsetof(UA_CallRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
     true, /* .namespaceZero */
     true, /* .isArray */
     false /* .isOptional */
 },};
 
-/* ModifyMonitoredItemsResponse */
-static UA_DataTypeMember ModifyMonitoredItemsResponse_members[3] = {
+/* CallResponse */
+static UA_DataTypeMember CallResponse_members[3] = {
 {
     UA_TYPENAME("ResponseHeader") /* .memberName */
     UA_TYPES_RESPONSEHEADER, /* .memberTypeIndex */
@@ -13895,8 +14475,8 @@ static UA_DataTypeMember ModifyMonitoredItemsResponse_members[3] = {
 },
 {
     UA_TYPENAME("Results") /* .memberName */
-    UA_TYPES_MONITOREDITEMMODIFYRESULT, /* .memberTypeIndex */
-    offsetof(UA_ModifyMonitoredItemsResponse, resultsSize) - offsetof(UA_ModifyMonitoredItemsResponse, responseHeader) - sizeof(UA_ResponseHeader), /* .padding */
+    UA_TYPES_CALLMETHODRESULT, /* .memberTypeIndex */
+    offsetof(UA_CallResponse, resultsSize) - offsetof(UA_CallResponse, responseHeader) - sizeof(UA_ResponseHeader), /* .padding */
     true, /* .namespaceZero */
     true, /* .isArray */
     false /* .isOptional */
@@ -13904,278 +14484,322 @@ static UA_DataTypeMember ModifyMonitoredItemsResponse_members[3] = {
 {
     UA_TYPENAME("DiagnosticInfos") /* .memberName */
     UA_TYPES_DIAGNOSTICINFO, /* .memberTypeIndex */
-    offsetof(UA_ModifyMonitoredItemsResponse, diagnosticInfosSize) - offsetof(UA_ModifyMonitoredItemsResponse, results) - sizeof(void *), /* .padding */
+    offsetof(UA_CallResponse, diagnosticInfosSize) - offsetof(UA_CallResponse, results) - sizeof(void *), /* .padding */
     true, /* .namespaceZero */
     true, /* .isArray */
     false /* .isOptional */
 },};
 
-/* DeleteSubscriptionsRequest */
-static UA_DataTypeMember DeleteSubscriptionsRequest_members[2] = {
+/* MonitoringMode */
+#define MonitoringMode_members NULL
+
+/* DataChangeTrigger */
+#define DataChangeTrigger_members NULL
+
+/* DeadbandType */
+#define DeadbandType_members NULL
+
+/* DataChangeFilter */
+static UA_DataTypeMember DataChangeFilter_members[3] = {
 {
-    UA_TYPENAME("RequestHeader") /* .memberName */
-    UA_TYPES_REQUESTHEADER, /* .memberTypeIndex */
+    UA_TYPENAME("Trigger") /* .memberName */
+    UA_TYPES_DATACHANGETRIGGER, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("SubscriptionIds") /* .memberName */
+    UA_TYPENAME("DeadbandType") /* .memberName */
     UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_DeleteSubscriptionsRequest, subscriptionIdsSize) - offsetof(UA_DeleteSubscriptionsRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
+    offsetof(UA_DataChangeFilter, deadbandType) - offsetof(UA_DataChangeFilter, trigger) - sizeof(UA_DataChangeTrigger), /* .padding */
     true, /* .namespaceZero */
-    true, /* .isArray */
+    false, /* .isArray */
+    false /* .isOptional */
+},
+{
+    UA_TYPENAME("DeadbandValue") /* .memberName */
+    UA_TYPES_DOUBLE, /* .memberTypeIndex */
+    offsetof(UA_DataChangeFilter, deadbandValue) - offsetof(UA_DataChangeFilter, deadbandType) - sizeof(UA_UInt32), /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
     false /* .isOptional */
 },};
 
-/* RedundancySupport */
-#define RedundancySupport_members NULL
-
-/* BrowsePath */
-static UA_DataTypeMember BrowsePath_members[2] = {
+/* EventFilter */
+static UA_DataTypeMember EventFilter_members[2] = {
 {
-    UA_TYPENAME("StartingNode") /* .memberName */
-    UA_TYPES_NODEID, /* .memberTypeIndex */
+    UA_TYPENAME("SelectClauses") /* .memberName */
+    UA_TYPES_SIMPLEATTRIBUTEOPERAND, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
-    false, /* .isArray */
+    true, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("RelativePath") /* .memberName */
-    UA_TYPES_RELATIVEPATH, /* .memberTypeIndex */
-    offsetof(UA_BrowsePath, relativePath) - offsetof(UA_BrowsePath, startingNode) - sizeof(UA_NodeId), /* .padding */
+    UA_TYPENAME("WhereClause") /* .memberName */
+    UA_TYPES_CONTENTFILTER, /* .memberTypeIndex */
+    offsetof(UA_EventFilter, whereClause) - offsetof(UA_EventFilter, selectClauses) - sizeof(void *), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },};
 
-/* ObjectAttributes */
-static UA_DataTypeMember ObjectAttributes_members[6] = {
+/* AggregateConfiguration */
+static UA_DataTypeMember AggregateConfiguration_members[5] = {
 {
-    UA_TYPENAME("SpecifiedAttributes") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
+    UA_TYPENAME("UseServerCapabilitiesDefaults") /* .memberName */
+    UA_TYPES_BOOLEAN, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("DisplayName") /* .memberName */
-    UA_TYPES_LOCALIZEDTEXT, /* .memberTypeIndex */
-    offsetof(UA_ObjectAttributes, displayName) - offsetof(UA_ObjectAttributes, specifiedAttributes) - sizeof(UA_UInt32), /* .padding */
-    true, /* .namespaceZero */
-    false, /* .isArray */
-    false /* .isOptional */
-},
-{
-    UA_TYPENAME("Description") /* .memberName */
-    UA_TYPES_LOCALIZEDTEXT, /* .memberTypeIndex */
-    offsetof(UA_ObjectAttributes, description) - offsetof(UA_ObjectAttributes, displayName) - sizeof(UA_LocalizedText), /* .padding */
+    UA_TYPENAME("TreatUncertainAsBad") /* .memberName */
+    UA_TYPES_BOOLEAN, /* .memberTypeIndex */
+    offsetof(UA_AggregateConfiguration, treatUncertainAsBad) - offsetof(UA_AggregateConfiguration, useServerCapabilitiesDefaults) - sizeof(UA_Boolean), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("WriteMask") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_ObjectAttributes, writeMask) - offsetof(UA_ObjectAttributes, description) - sizeof(UA_LocalizedText), /* .padding */
+    UA_TYPENAME("PercentDataBad") /* .memberName */
+    UA_TYPES_BYTE, /* .memberTypeIndex */
+    offsetof(UA_AggregateConfiguration, percentDataBad) - offsetof(UA_AggregateConfiguration, treatUncertainAsBad) - sizeof(UA_Boolean), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("UserWriteMask") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_ObjectAttributes, userWriteMask) - offsetof(UA_ObjectAttributes, writeMask) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("PercentDataGood") /* .memberName */
+    UA_TYPES_BYTE, /* .memberTypeIndex */
+    offsetof(UA_AggregateConfiguration, percentDataGood) - offsetof(UA_AggregateConfiguration, percentDataBad) - sizeof(UA_Byte), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("EventNotifier") /* .memberName */
-    UA_TYPES_BYTE, /* .memberTypeIndex */
-    offsetof(UA_ObjectAttributes, eventNotifier) - offsetof(UA_ObjectAttributes, userWriteMask) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("UseSlopedExtrapolation") /* .memberName */
+    UA_TYPES_BOOLEAN, /* .memberTypeIndex */
+    offsetof(UA_AggregateConfiguration, useSlopedExtrapolation) - offsetof(UA_AggregateConfiguration, percentDataGood) - sizeof(UA_Byte), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },};
 
-/* PublishRequest */
-static UA_DataTypeMember PublishRequest_members[2] = {
+/* AggregateFilter */
+static UA_DataTypeMember AggregateFilter_members[4] = {
 {
-    UA_TYPENAME("RequestHeader") /* .memberName */
-    UA_TYPES_REQUESTHEADER, /* .memberTypeIndex */
+    UA_TYPENAME("StartTime") /* .memberName */
+    UA_TYPES_DATETIME, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("SubscriptionAcknowledgements") /* .memberName */
-    UA_TYPES_SUBSCRIPTIONACKNOWLEDGEMENT, /* .memberTypeIndex */
-    offsetof(UA_PublishRequest, subscriptionAcknowledgementsSize) - offsetof(UA_PublishRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
+    UA_TYPENAME("AggregateType") /* .memberName */
+    UA_TYPES_NODEID, /* .memberTypeIndex */
+    offsetof(UA_AggregateFilter, aggregateType) - offsetof(UA_AggregateFilter, startTime) - sizeof(UA_DateTime), /* .padding */
     true, /* .namespaceZero */
-    true, /* .isArray */
+    false, /* .isArray */
     false /* .isOptional */
-},};
-
-/* FindServersRequest */
-static UA_DataTypeMember FindServersRequest_members[4] = {
+},
 {
-    UA_TYPENAME("RequestHeader") /* .memberName */
-    UA_TYPES_REQUESTHEADER, /* .memberTypeIndex */
-    0, /* .padding */
+    UA_TYPENAME("ProcessingInterval") /* .memberName */
+    UA_TYPES_DOUBLE, /* .memberTypeIndex */
+    offsetof(UA_AggregateFilter, processingInterval) - offsetof(UA_AggregateFilter, aggregateType) - sizeof(UA_NodeId), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("EndpointUrl") /* .memberName */
-    UA_TYPES_STRING, /* .memberTypeIndex */
-    offsetof(UA_FindServersRequest, endpointUrl) - offsetof(UA_FindServersRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
+    UA_TYPENAME("AggregateConfiguration") /* .memberName */
+    UA_TYPES_AGGREGATECONFIGURATION, /* .memberTypeIndex */
+    offsetof(UA_AggregateFilter, aggregateConfiguration) - offsetof(UA_AggregateFilter, processingInterval) - sizeof(UA_Double), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
-},
+},};
+
+/* EventFilterResult */
+static UA_DataTypeMember EventFilterResult_members[3] = {
 {
-    UA_TYPENAME("LocaleIds") /* .memberName */
-    UA_TYPES_STRING, /* .memberTypeIndex */
-    offsetof(UA_FindServersRequest, localeIdsSize) - offsetof(UA_FindServersRequest, endpointUrl) - sizeof(UA_String), /* .padding */
+    UA_TYPENAME("SelectClauseResults") /* .memberName */
+    UA_TYPES_STATUSCODE, /* .memberTypeIndex */
+    0, /* .padding */
     true, /* .namespaceZero */
     true, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("ServerUris") /* .memberName */
-    UA_TYPES_STRING, /* .memberTypeIndex */
-    offsetof(UA_FindServersRequest, serverUrisSize) - offsetof(UA_FindServersRequest, localeIds) - sizeof(void *), /* .padding */
+    UA_TYPENAME("SelectClauseDiagnosticInfos") /* .memberName */
+    UA_TYPES_DIAGNOSTICINFO, /* .memberTypeIndex */
+    offsetof(UA_EventFilterResult, selectClauseDiagnosticInfosSize) - offsetof(UA_EventFilterResult, selectClauseResults) - sizeof(void *), /* .padding */
     true, /* .namespaceZero */
     true, /* .isArray */
     false /* .isOptional */
+},
+{
+    UA_TYPENAME("WhereClauseResult") /* .memberName */
+    UA_TYPES_CONTENTFILTERRESULT, /* .memberTypeIndex */
+    offsetof(UA_EventFilterResult, whereClauseResult) - offsetof(UA_EventFilterResult, selectClauseDiagnosticInfos) - sizeof(void *), /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
+    false /* .isOptional */
 },};
 
-/* ReferenceDescription */
-static UA_DataTypeMember ReferenceDescription_members[7] = {
+/* MonitoringParameters */
+static UA_DataTypeMember MonitoringParameters_members[5] = {
 {
-    UA_TYPENAME("ReferenceTypeId") /* .memberName */
-    UA_TYPES_NODEID, /* .memberTypeIndex */
+    UA_TYPENAME("ClientHandle") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("IsForward") /* .memberName */
-    UA_TYPES_BOOLEAN, /* .memberTypeIndex */
-    offsetof(UA_ReferenceDescription, isForward) - offsetof(UA_ReferenceDescription, referenceTypeId) - sizeof(UA_NodeId), /* .padding */
+    UA_TYPENAME("SamplingInterval") /* .memberName */
+    UA_TYPES_DOUBLE, /* .memberTypeIndex */
+    offsetof(UA_MonitoringParameters, samplingInterval) - offsetof(UA_MonitoringParameters, clientHandle) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("NodeId") /* .memberName */
-    UA_TYPES_EXPANDEDNODEID, /* .memberTypeIndex */
-    offsetof(UA_ReferenceDescription, nodeId) - offsetof(UA_ReferenceDescription, isForward) - sizeof(UA_Boolean), /* .padding */
+    UA_TYPENAME("Filter") /* .memberName */
+    UA_TYPES_EXTENSIONOBJECT, /* .memberTypeIndex */
+    offsetof(UA_MonitoringParameters, filter) - offsetof(UA_MonitoringParameters, samplingInterval) - sizeof(UA_Double), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("BrowseName") /* .memberName */
-    UA_TYPES_QUALIFIEDNAME, /* .memberTypeIndex */
-    offsetof(UA_ReferenceDescription, browseName) - offsetof(UA_ReferenceDescription, nodeId) - sizeof(UA_ExpandedNodeId), /* .padding */
+    UA_TYPENAME("QueueSize") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_MonitoringParameters, queueSize) - offsetof(UA_MonitoringParameters, filter) - sizeof(UA_ExtensionObject), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("DisplayName") /* .memberName */
-    UA_TYPES_LOCALIZEDTEXT, /* .memberTypeIndex */
-    offsetof(UA_ReferenceDescription, displayName) - offsetof(UA_ReferenceDescription, browseName) - sizeof(UA_QualifiedName), /* .padding */
+    UA_TYPENAME("DiscardOldest") /* .memberName */
+    UA_TYPES_BOOLEAN, /* .memberTypeIndex */
+    offsetof(UA_MonitoringParameters, discardOldest) - offsetof(UA_MonitoringParameters, queueSize) - sizeof(UA_UInt32), /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
+    false /* .isOptional */
+},};
+
+/* MonitoredItemCreateRequest */
+static UA_DataTypeMember MonitoredItemCreateRequest_members[3] = {
+{
+    UA_TYPENAME("ItemToMonitor") /* .memberName */
+    UA_TYPES_READVALUEID, /* .memberTypeIndex */
+    0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("NodeClass") /* .memberName */
-    UA_TYPES_NODECLASS, /* .memberTypeIndex */
-    offsetof(UA_ReferenceDescription, nodeClass) - offsetof(UA_ReferenceDescription, displayName) - sizeof(UA_LocalizedText), /* .padding */
+    UA_TYPENAME("MonitoringMode") /* .memberName */
+    UA_TYPES_MONITORINGMODE, /* .memberTypeIndex */
+    offsetof(UA_MonitoredItemCreateRequest, monitoringMode) - offsetof(UA_MonitoredItemCreateRequest, itemToMonitor) - sizeof(UA_ReadValueId), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("TypeDefinition") /* .memberName */
-    UA_TYPES_EXPANDEDNODEID, /* .memberTypeIndex */
-    offsetof(UA_ReferenceDescription, typeDefinition) - offsetof(UA_ReferenceDescription, nodeClass) - sizeof(UA_NodeClass), /* .padding */
+    UA_TYPENAME("RequestedParameters") /* .memberName */
+    UA_TYPES_MONITORINGPARAMETERS, /* .memberTypeIndex */
+    offsetof(UA_MonitoredItemCreateRequest, requestedParameters) - offsetof(UA_MonitoredItemCreateRequest, monitoringMode) - sizeof(UA_MonitoringMode), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },};
 
-/* CreateSubscriptionRequest */
-static UA_DataTypeMember CreateSubscriptionRequest_members[7] = {
+/* MonitoredItemCreateResult */
+static UA_DataTypeMember MonitoredItemCreateResult_members[5] = {
 {
-    UA_TYPENAME("RequestHeader") /* .memberName */
-    UA_TYPES_REQUESTHEADER, /* .memberTypeIndex */
+    UA_TYPENAME("StatusCode") /* .memberName */
+    UA_TYPES_STATUSCODE, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("RequestedPublishingInterval") /* .memberName */
+    UA_TYPENAME("MonitoredItemId") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_MonitoredItemCreateResult, monitoredItemId) - offsetof(UA_MonitoredItemCreateResult, statusCode) - sizeof(UA_StatusCode), /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
+    false /* .isOptional */
+},
+{
+    UA_TYPENAME("RevisedSamplingInterval") /* .memberName */
     UA_TYPES_DOUBLE, /* .memberTypeIndex */
-    offsetof(UA_CreateSubscriptionRequest, requestedPublishingInterval) - offsetof(UA_CreateSubscriptionRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
+    offsetof(UA_MonitoredItemCreateResult, revisedSamplingInterval) - offsetof(UA_MonitoredItemCreateResult, monitoredItemId) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("RequestedLifetimeCount") /* .memberName */
+    UA_TYPENAME("RevisedQueueSize") /* .memberName */
     UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_CreateSubscriptionRequest, requestedLifetimeCount) - offsetof(UA_CreateSubscriptionRequest, requestedPublishingInterval) - sizeof(UA_Double), /* .padding */
+    offsetof(UA_MonitoredItemCreateResult, revisedQueueSize) - offsetof(UA_MonitoredItemCreateResult, revisedSamplingInterval) - sizeof(UA_Double), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("RequestedMaxKeepAliveCount") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_CreateSubscriptionRequest, requestedMaxKeepAliveCount) - offsetof(UA_CreateSubscriptionRequest, requestedLifetimeCount) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("FilterResult") /* .memberName */
+    UA_TYPES_EXTENSIONOBJECT, /* .memberTypeIndex */
+    offsetof(UA_MonitoredItemCreateResult, filterResult) - offsetof(UA_MonitoredItemCreateResult, revisedQueueSize) - sizeof(UA_UInt32), /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
+    false /* .isOptional */
+},};
+
+/* CreateMonitoredItemsRequest */
+static UA_DataTypeMember CreateMonitoredItemsRequest_members[4] = {
+{
+    UA_TYPENAME("RequestHeader") /* .memberName */
+    UA_TYPES_REQUESTHEADER, /* .memberTypeIndex */
+    0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("MaxNotificationsPerPublish") /* .memberName */
+    UA_TYPENAME("SubscriptionId") /* .memberName */
     UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_CreateSubscriptionRequest, maxNotificationsPerPublish) - offsetof(UA_CreateSubscriptionRequest, requestedMaxKeepAliveCount) - sizeof(UA_UInt32), /* .padding */
+    offsetof(UA_CreateMonitoredItemsRequest, subscriptionId) - offsetof(UA_CreateMonitoredItemsRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("PublishingEnabled") /* .memberName */
-    UA_TYPES_BOOLEAN, /* .memberTypeIndex */
-    offsetof(UA_CreateSubscriptionRequest, publishingEnabled) - offsetof(UA_CreateSubscriptionRequest, maxNotificationsPerPublish) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("TimestampsToReturn") /* .memberName */
+    UA_TYPES_TIMESTAMPSTORETURN, /* .memberTypeIndex */
+    offsetof(UA_CreateMonitoredItemsRequest, timestampsToReturn) - offsetof(UA_CreateMonitoredItemsRequest, subscriptionId) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("Priority") /* .memberName */
-    UA_TYPES_BYTE, /* .memberTypeIndex */
-    offsetof(UA_CreateSubscriptionRequest, priority) - offsetof(UA_CreateSubscriptionRequest, publishingEnabled) - sizeof(UA_Boolean), /* .padding */
+    UA_TYPENAME("ItemsToCreate") /* .memberName */
+    UA_TYPES_MONITOREDITEMCREATEREQUEST, /* .memberTypeIndex */
+    offsetof(UA_CreateMonitoredItemsRequest, itemsToCreateSize) - offsetof(UA_CreateMonitoredItemsRequest, timestampsToReturn) - sizeof(UA_TimestampsToReturn), /* .padding */
     true, /* .namespaceZero */
-    false, /* .isArray */
+    true, /* .isArray */
     false /* .isOptional */
 },};
 
-/* CallResponse */
-static UA_DataTypeMember CallResponse_members[3] = {
+/* CreateMonitoredItemsResponse */
+static UA_DataTypeMember CreateMonitoredItemsResponse_members[3] = {
 {
     UA_TYPENAME("ResponseHeader") /* .memberName */
     UA_TYPES_RESPONSEHEADER, /* .memberTypeIndex */
@@ -14186,8 +14810,8 @@ static UA_DataTypeMember CallResponse_members[3] = {
 },
 {
     UA_TYPENAME("Results") /* .memberName */
-    UA_TYPES_CALLMETHODRESULT, /* .memberTypeIndex */
-    offsetof(UA_CallResponse, resultsSize) - offsetof(UA_CallResponse, responseHeader) - sizeof(UA_ResponseHeader), /* .padding */
+    UA_TYPES_MONITOREDITEMCREATERESULT, /* .memberTypeIndex */
+    offsetof(UA_CreateMonitoredItemsResponse, resultsSize) - offsetof(UA_CreateMonitoredItemsResponse, responseHeader) - sizeof(UA_ResponseHeader), /* .padding */
     true, /* .namespaceZero */
     true, /* .isArray */
     false /* .isOptional */
@@ -14195,36 +14819,63 @@ static UA_DataTypeMember CallResponse_members[3] = {
 {
     UA_TYPENAME("DiagnosticInfos") /* .memberName */
     UA_TYPES_DIAGNOSTICINFO, /* .memberTypeIndex */
-    offsetof(UA_CallResponse, diagnosticInfosSize) - offsetof(UA_CallResponse, results) - sizeof(void *), /* .padding */
+    offsetof(UA_CreateMonitoredItemsResponse, diagnosticInfosSize) - offsetof(UA_CreateMonitoredItemsResponse, results) - sizeof(void *), /* .padding */
     true, /* .namespaceZero */
     true, /* .isArray */
     false /* .isOptional */
 },};
 
-/* DeleteNodesResponse */
-static UA_DataTypeMember DeleteNodesResponse_members[3] = {
+/* MonitoredItemModifyRequest */
+static UA_DataTypeMember MonitoredItemModifyRequest_members[2] = {
 {
-    UA_TYPENAME("ResponseHeader") /* .memberName */
-    UA_TYPES_RESPONSEHEADER, /* .memberTypeIndex */
+    UA_TYPENAME("MonitoredItemId") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("Results") /* .memberName */
+    UA_TYPENAME("RequestedParameters") /* .memberName */
+    UA_TYPES_MONITORINGPARAMETERS, /* .memberTypeIndex */
+    offsetof(UA_MonitoredItemModifyRequest, requestedParameters) - offsetof(UA_MonitoredItemModifyRequest, monitoredItemId) - sizeof(UA_UInt32), /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
+    false /* .isOptional */
+},};
+
+/* MonitoredItemModifyResult */
+static UA_DataTypeMember MonitoredItemModifyResult_members[4] = {
+{
+    UA_TYPENAME("StatusCode") /* .memberName */
     UA_TYPES_STATUSCODE, /* .memberTypeIndex */
-    offsetof(UA_DeleteNodesResponse, resultsSize) - offsetof(UA_DeleteNodesResponse, responseHeader) - sizeof(UA_ResponseHeader), /* .padding */
+    0, /* .padding */
     true, /* .namespaceZero */
-    true, /* .isArray */
+    false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("DiagnosticInfos") /* .memberName */
-    UA_TYPES_DIAGNOSTICINFO, /* .memberTypeIndex */
-    offsetof(UA_DeleteNodesResponse, diagnosticInfosSize) - offsetof(UA_DeleteNodesResponse, results) - sizeof(void *), /* .padding */
+    UA_TYPENAME("RevisedSamplingInterval") /* .memberName */
+    UA_TYPES_DOUBLE, /* .memberTypeIndex */
+    offsetof(UA_MonitoredItemModifyResult, revisedSamplingInterval) - offsetof(UA_MonitoredItemModifyResult, statusCode) - sizeof(UA_StatusCode), /* .padding */
     true, /* .namespaceZero */
-    true, /* .isArray */
+    false, /* .isArray */
+    false /* .isOptional */
+},
+{
+    UA_TYPENAME("RevisedQueueSize") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_MonitoredItemModifyResult, revisedQueueSize) - offsetof(UA_MonitoredItemModifyResult, revisedSamplingInterval) - sizeof(UA_Double), /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
+    false /* .isOptional */
+},
+{
+    UA_TYPENAME("FilterResult") /* .memberName */
+    UA_TYPES_EXTENSIONOBJECT, /* .memberTypeIndex */
+    offsetof(UA_MonitoredItemModifyResult, filterResult) - offsetof(UA_MonitoredItemModifyResult, revisedQueueSize) - sizeof(UA_UInt32), /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
     false /* .isOptional */
 },};
 
@@ -14263,8 +14914,8 @@ static UA_DataTypeMember ModifyMonitoredItemsRequest_members[4] = {
     false /* .isOptional */
 },};
 
-/* ServiceFault */
-static UA_DataTypeMember ServiceFault_members[1] = {
+/* ModifyMonitoredItemsResponse */
+static UA_DataTypeMember ModifyMonitoredItemsResponse_members[3] = {
 {
     UA_TYPENAME("ResponseHeader") /* .memberName */
     UA_TYPES_RESPONSEHEADER, /* .memberTypeIndex */
@@ -14272,13 +14923,29 @@ static UA_DataTypeMember ServiceFault_members[1] = {
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
+},
+{
+    UA_TYPENAME("Results") /* .memberName */
+    UA_TYPES_MONITOREDITEMMODIFYRESULT, /* .memberTypeIndex */
+    offsetof(UA_ModifyMonitoredItemsResponse, resultsSize) - offsetof(UA_ModifyMonitoredItemsResponse, responseHeader) - sizeof(UA_ResponseHeader), /* .padding */
+    true, /* .namespaceZero */
+    true, /* .isArray */
+    false /* .isOptional */
+},
+{
+    UA_TYPENAME("DiagnosticInfos") /* .memberName */
+    UA_TYPES_DIAGNOSTICINFO, /* .memberTypeIndex */
+    offsetof(UA_ModifyMonitoredItemsResponse, diagnosticInfosSize) - offsetof(UA_ModifyMonitoredItemsResponse, results) - sizeof(void *), /* .padding */
+    true, /* .namespaceZero */
+    true, /* .isArray */
+    false /* .isOptional */
 },};
 
-/* PublishResponse */
-static UA_DataTypeMember PublishResponse_members[7] = {
+/* SetMonitoringModeRequest */
+static UA_DataTypeMember SetMonitoringModeRequest_members[4] = {
 {
-    UA_TYPENAME("ResponseHeader") /* .memberName */
-    UA_TYPES_RESPONSEHEADER, /* .memberTypeIndex */
+    UA_TYPENAME("RequestHeader") /* .memberName */
+    UA_TYPES_REQUESTHEADER, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
@@ -14287,31 +14954,34 @@ static UA_DataTypeMember PublishResponse_members[7] = {
 {
     UA_TYPENAME("SubscriptionId") /* .memberName */
     UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_PublishResponse, subscriptionId) - offsetof(UA_PublishResponse, responseHeader) - sizeof(UA_ResponseHeader), /* .padding */
+    offsetof(UA_SetMonitoringModeRequest, subscriptionId) - offsetof(UA_SetMonitoringModeRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("AvailableSequenceNumbers") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_PublishResponse, availableSequenceNumbersSize) - offsetof(UA_PublishResponse, subscriptionId) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("MonitoringMode") /* .memberName */
+    UA_TYPES_MONITORINGMODE, /* .memberTypeIndex */
+    offsetof(UA_SetMonitoringModeRequest, monitoringMode) - offsetof(UA_SetMonitoringModeRequest, subscriptionId) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
-    true, /* .isArray */
+    false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("MoreNotifications") /* .memberName */
-    UA_TYPES_BOOLEAN, /* .memberTypeIndex */
-    offsetof(UA_PublishResponse, moreNotifications) - offsetof(UA_PublishResponse, availableSequenceNumbers) - sizeof(void *), /* .padding */
+    UA_TYPENAME("MonitoredItemIds") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_SetMonitoringModeRequest, monitoredItemIdsSize) - offsetof(UA_SetMonitoringModeRequest, monitoringMode) - sizeof(UA_MonitoringMode), /* .padding */
     true, /* .namespaceZero */
-    false, /* .isArray */
+    true, /* .isArray */
     false /* .isOptional */
-},
+},};
+
+/* SetMonitoringModeResponse */
+static UA_DataTypeMember SetMonitoringModeResponse_members[3] = {
 {
-    UA_TYPENAME("NotificationMessage") /* .memberName */
-    UA_TYPES_NOTIFICATIONMESSAGE, /* .memberTypeIndex */
-    offsetof(UA_PublishResponse, notificationMessage) - offsetof(UA_PublishResponse, moreNotifications) - sizeof(UA_Boolean), /* .padding */
+    UA_TYPENAME("ResponseHeader") /* .memberName */
+    UA_TYPES_RESPONSEHEADER, /* .memberTypeIndex */
+    0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
@@ -14319,7 +14989,7 @@ static UA_DataTypeMember PublishResponse_members[7] = {
 {
     UA_TYPENAME("Results") /* .memberName */
     UA_TYPES_STATUSCODE, /* .memberTypeIndex */
-    offsetof(UA_PublishResponse, resultsSize) - offsetof(UA_PublishResponse, notificationMessage) - sizeof(UA_NotificationMessage), /* .padding */
+    offsetof(UA_SetMonitoringModeResponse, resultsSize) - offsetof(UA_SetMonitoringModeResponse, responseHeader) - sizeof(UA_ResponseHeader), /* .padding */
     true, /* .namespaceZero */
     true, /* .isArray */
     false /* .isOptional */
@@ -14327,14 +14997,14 @@ static UA_DataTypeMember PublishResponse_members[7] = {
 {
     UA_TYPENAME("DiagnosticInfos") /* .memberName */
     UA_TYPES_DIAGNOSTICINFO, /* .memberTypeIndex */
-    offsetof(UA_PublishResponse, diagnosticInfosSize) - offsetof(UA_PublishResponse, results) - sizeof(void *), /* .padding */
+    offsetof(UA_SetMonitoringModeResponse, diagnosticInfosSize) - offsetof(UA_SetMonitoringModeResponse, results) - sizeof(void *), /* .padding */
     true, /* .namespaceZero */
     true, /* .isArray */
     false /* .isOptional */
 },};
 
-/* CreateMonitoredItemsRequest */
-static UA_DataTypeMember CreateMonitoredItemsRequest_members[4] = {
+/* SetTriggeringRequest */
+static UA_DataTypeMember SetTriggeringRequest_members[5] = {
 {
     UA_TYPENAME("RequestHeader") /* .memberName */
     UA_TYPES_REQUESTHEADER, /* .memberTypeIndex */
@@ -14346,100 +15016,135 @@ static UA_DataTypeMember CreateMonitoredItemsRequest_members[4] = {
 {
     UA_TYPENAME("SubscriptionId") /* .memberName */
     UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_CreateMonitoredItemsRequest, subscriptionId) - offsetof(UA_CreateMonitoredItemsRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
+    offsetof(UA_SetTriggeringRequest, subscriptionId) - offsetof(UA_SetTriggeringRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("TimestampsToReturn") /* .memberName */
-    UA_TYPES_TIMESTAMPSTORETURN, /* .memberTypeIndex */
-    offsetof(UA_CreateMonitoredItemsRequest, timestampsToReturn) - offsetof(UA_CreateMonitoredItemsRequest, subscriptionId) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("TriggeringItemId") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_SetTriggeringRequest, triggeringItemId) - offsetof(UA_SetTriggeringRequest, subscriptionId) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("ItemsToCreate") /* .memberName */
-    UA_TYPES_MONITOREDITEMCREATEREQUEST, /* .memberTypeIndex */
-    offsetof(UA_CreateMonitoredItemsRequest, itemsToCreateSize) - offsetof(UA_CreateMonitoredItemsRequest, timestampsToReturn) - sizeof(UA_TimestampsToReturn), /* .padding */
+    UA_TYPENAME("LinksToAdd") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_SetTriggeringRequest, linksToAddSize) - offsetof(UA_SetTriggeringRequest, triggeringItemId) - sizeof(UA_UInt32), /* .padding */
+    true, /* .namespaceZero */
+    true, /* .isArray */
+    false /* .isOptional */
+},
+{
+    UA_TYPENAME("LinksToRemove") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_SetTriggeringRequest, linksToRemoveSize) - offsetof(UA_SetTriggeringRequest, linksToAdd) - sizeof(void *), /* .padding */
     true, /* .namespaceZero */
     true, /* .isArray */
     false /* .isOptional */
 },};
 
-/* OpenSecureChannelRequest */
-static UA_DataTypeMember OpenSecureChannelRequest_members[6] = {
+/* SetTriggeringResponse */
+static UA_DataTypeMember SetTriggeringResponse_members[5] = {
 {
-    UA_TYPENAME("RequestHeader") /* .memberName */
-    UA_TYPES_REQUESTHEADER, /* .memberTypeIndex */
+    UA_TYPENAME("ResponseHeader") /* .memberName */
+    UA_TYPES_RESPONSEHEADER, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("ClientProtocolVersion") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_OpenSecureChannelRequest, clientProtocolVersion) - offsetof(UA_OpenSecureChannelRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
+    UA_TYPENAME("AddResults") /* .memberName */
+    UA_TYPES_STATUSCODE, /* .memberTypeIndex */
+    offsetof(UA_SetTriggeringResponse, addResultsSize) - offsetof(UA_SetTriggeringResponse, responseHeader) - sizeof(UA_ResponseHeader), /* .padding */
     true, /* .namespaceZero */
-    false, /* .isArray */
+    true, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("RequestType") /* .memberName */
-    UA_TYPES_SECURITYTOKENREQUESTTYPE, /* .memberTypeIndex */
-    offsetof(UA_OpenSecureChannelRequest, requestType) - offsetof(UA_OpenSecureChannelRequest, clientProtocolVersion) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("AddDiagnosticInfos") /* .memberName */
+    UA_TYPES_DIAGNOSTICINFO, /* .memberTypeIndex */
+    offsetof(UA_SetTriggeringResponse, addDiagnosticInfosSize) - offsetof(UA_SetTriggeringResponse, addResults) - sizeof(void *), /* .padding */
     true, /* .namespaceZero */
-    false, /* .isArray */
+    true, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("SecurityMode") /* .memberName */
-    UA_TYPES_MESSAGESECURITYMODE, /* .memberTypeIndex */
-    offsetof(UA_OpenSecureChannelRequest, securityMode) - offsetof(UA_OpenSecureChannelRequest, requestType) - sizeof(UA_SecurityTokenRequestType), /* .padding */
+    UA_TYPENAME("RemoveResults") /* .memberName */
+    UA_TYPES_STATUSCODE, /* .memberTypeIndex */
+    offsetof(UA_SetTriggeringResponse, removeResultsSize) - offsetof(UA_SetTriggeringResponse, addDiagnosticInfos) - sizeof(void *), /* .padding */
     true, /* .namespaceZero */
-    false, /* .isArray */
+    true, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("ClientNonce") /* .memberName */
-    UA_TYPES_BYTESTRING, /* .memberTypeIndex */
-    offsetof(UA_OpenSecureChannelRequest, clientNonce) - offsetof(UA_OpenSecureChannelRequest, securityMode) - sizeof(UA_MessageSecurityMode), /* .padding */
+    UA_TYPENAME("RemoveDiagnosticInfos") /* .memberName */
+    UA_TYPES_DIAGNOSTICINFO, /* .memberTypeIndex */
+    offsetof(UA_SetTriggeringResponse, removeDiagnosticInfosSize) - offsetof(UA_SetTriggeringResponse, removeResults) - sizeof(void *), /* .padding */
+    true, /* .namespaceZero */
+    true, /* .isArray */
+    false /* .isOptional */
+},};
+
+/* DeleteMonitoredItemsRequest */
+static UA_DataTypeMember DeleteMonitoredItemsRequest_members[3] = {
+{
+    UA_TYPENAME("RequestHeader") /* .memberName */
+    UA_TYPES_REQUESTHEADER, /* .memberTypeIndex */
+    0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("RequestedLifetime") /* .memberName */
+    UA_TYPENAME("SubscriptionId") /* .memberName */
     UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_OpenSecureChannelRequest, requestedLifetime) - offsetof(UA_OpenSecureChannelRequest, clientNonce) - sizeof(UA_ByteString), /* .padding */
+    offsetof(UA_DeleteMonitoredItemsRequest, subscriptionId) - offsetof(UA_DeleteMonitoredItemsRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
+},
+{
+    UA_TYPENAME("MonitoredItemIds") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_DeleteMonitoredItemsRequest, monitoredItemIdsSize) - offsetof(UA_DeleteMonitoredItemsRequest, subscriptionId) - sizeof(UA_UInt32), /* .padding */
+    true, /* .namespaceZero */
+    true, /* .isArray */
+    false /* .isOptional */
 },};
 
-/* CloseSessionRequest */
-static UA_DataTypeMember CloseSessionRequest_members[2] = {
+/* DeleteMonitoredItemsResponse */
+static UA_DataTypeMember DeleteMonitoredItemsResponse_members[3] = {
 {
-    UA_TYPENAME("RequestHeader") /* .memberName */
-    UA_TYPES_REQUESTHEADER, /* .memberTypeIndex */
+    UA_TYPENAME("ResponseHeader") /* .memberName */
+    UA_TYPES_RESPONSEHEADER, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("DeleteSubscriptions") /* .memberName */
-    UA_TYPES_BOOLEAN, /* .memberTypeIndex */
-    offsetof(UA_CloseSessionRequest, deleteSubscriptions) - offsetof(UA_CloseSessionRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
+    UA_TYPENAME("Results") /* .memberName */
+    UA_TYPES_STATUSCODE, /* .memberTypeIndex */
+    offsetof(UA_DeleteMonitoredItemsResponse, resultsSize) - offsetof(UA_DeleteMonitoredItemsResponse, responseHeader) - sizeof(UA_ResponseHeader), /* .padding */
     true, /* .namespaceZero */
-    false, /* .isArray */
+    true, /* .isArray */
+    false /* .isOptional */
+},
+{
+    UA_TYPENAME("DiagnosticInfos") /* .memberName */
+    UA_TYPES_DIAGNOSTICINFO, /* .memberTypeIndex */
+    offsetof(UA_DeleteMonitoredItemsResponse, diagnosticInfosSize) - offsetof(UA_DeleteMonitoredItemsResponse, results) - sizeof(void *), /* .padding */
+    true, /* .namespaceZero */
+    true, /* .isArray */
     false /* .isOptional */
 },};
 
-/* SetTriggeringRequest */
-static UA_DataTypeMember SetTriggeringRequest_members[5] = {
+/* CreateSubscriptionRequest */
+static UA_DataTypeMember CreateSubscriptionRequest_members[7] = {
 {
     UA_TYPENAME("RequestHeader") /* .memberName */
     UA_TYPES_REQUESTHEADER, /* .memberTypeIndex */
@@ -14449,196 +15154,220 @@ static UA_DataTypeMember SetTriggeringRequest_members[5] = {
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("SubscriptionId") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_SetTriggeringRequest, subscriptionId) - offsetof(UA_SetTriggeringRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
+    UA_TYPENAME("RequestedPublishingInterval") /* .memberName */
+    UA_TYPES_DOUBLE, /* .memberTypeIndex */
+    offsetof(UA_CreateSubscriptionRequest, requestedPublishingInterval) - offsetof(UA_CreateSubscriptionRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("TriggeringItemId") /* .memberName */
+    UA_TYPENAME("RequestedLifetimeCount") /* .memberName */
     UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_SetTriggeringRequest, triggeringItemId) - offsetof(UA_SetTriggeringRequest, subscriptionId) - sizeof(UA_UInt32), /* .padding */
+    offsetof(UA_CreateSubscriptionRequest, requestedLifetimeCount) - offsetof(UA_CreateSubscriptionRequest, requestedPublishingInterval) - sizeof(UA_Double), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("LinksToAdd") /* .memberName */
+    UA_TYPENAME("RequestedMaxKeepAliveCount") /* .memberName */
     UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_SetTriggeringRequest, linksToAddSize) - offsetof(UA_SetTriggeringRequest, triggeringItemId) - sizeof(UA_UInt32), /* .padding */
+    offsetof(UA_CreateSubscriptionRequest, requestedMaxKeepAliveCount) - offsetof(UA_CreateSubscriptionRequest, requestedLifetimeCount) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
-    true, /* .isArray */
+    false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("LinksToRemove") /* .memberName */
+    UA_TYPENAME("MaxNotificationsPerPublish") /* .memberName */
     UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_SetTriggeringRequest, linksToRemoveSize) - offsetof(UA_SetTriggeringRequest, linksToAdd) - sizeof(void *), /* .padding */
+    offsetof(UA_CreateSubscriptionRequest, maxNotificationsPerPublish) - offsetof(UA_CreateSubscriptionRequest, requestedMaxKeepAliveCount) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
-    true, /* .isArray */
+    false, /* .isArray */
+    false /* .isOptional */
+},
+{
+    UA_TYPENAME("PublishingEnabled") /* .memberName */
+    UA_TYPES_BOOLEAN, /* .memberTypeIndex */
+    offsetof(UA_CreateSubscriptionRequest, publishingEnabled) - offsetof(UA_CreateSubscriptionRequest, maxNotificationsPerPublish) - sizeof(UA_UInt32), /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
+    false /* .isOptional */
+},
+{
+    UA_TYPENAME("Priority") /* .memberName */
+    UA_TYPES_BYTE, /* .memberTypeIndex */
+    offsetof(UA_CreateSubscriptionRequest, priority) - offsetof(UA_CreateSubscriptionRequest, publishingEnabled) - sizeof(UA_Boolean), /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
     false /* .isOptional */
 },};
 
-/* BrowseResult */
-static UA_DataTypeMember BrowseResult_members[3] = {
+/* CreateSubscriptionResponse */
+static UA_DataTypeMember CreateSubscriptionResponse_members[5] = {
 {
-    UA_TYPENAME("StatusCode") /* .memberName */
-    UA_TYPES_STATUSCODE, /* .memberTypeIndex */
+    UA_TYPENAME("ResponseHeader") /* .memberName */
+    UA_TYPES_RESPONSEHEADER, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("ContinuationPoint") /* .memberName */
-    UA_TYPES_BYTESTRING, /* .memberTypeIndex */
-    offsetof(UA_BrowseResult, continuationPoint) - offsetof(UA_BrowseResult, statusCode) - sizeof(UA_StatusCode), /* .padding */
+    UA_TYPENAME("SubscriptionId") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_CreateSubscriptionResponse, subscriptionId) - offsetof(UA_CreateSubscriptionResponse, responseHeader) - sizeof(UA_ResponseHeader), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("References") /* .memberName */
-    UA_TYPES_REFERENCEDESCRIPTION, /* .memberTypeIndex */
-    offsetof(UA_BrowseResult, referencesSize) - offsetof(UA_BrowseResult, continuationPoint) - sizeof(UA_ByteString), /* .padding */
+    UA_TYPENAME("RevisedPublishingInterval") /* .memberName */
+    UA_TYPES_DOUBLE, /* .memberTypeIndex */
+    offsetof(UA_CreateSubscriptionResponse, revisedPublishingInterval) - offsetof(UA_CreateSubscriptionResponse, subscriptionId) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
-    true, /* .isArray */
+    false, /* .isArray */
     false /* .isOptional */
-},};
-
-/* AddReferencesRequest */
-static UA_DataTypeMember AddReferencesRequest_members[2] = {
+},
 {
-    UA_TYPENAME("RequestHeader") /* .memberName */
-    UA_TYPES_REQUESTHEADER, /* .memberTypeIndex */
-    0, /* .padding */
+    UA_TYPENAME("RevisedLifetimeCount") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_CreateSubscriptionResponse, revisedLifetimeCount) - offsetof(UA_CreateSubscriptionResponse, revisedPublishingInterval) - sizeof(UA_Double), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("ReferencesToAdd") /* .memberName */
-    UA_TYPES_ADDREFERENCESITEM, /* .memberTypeIndex */
-    offsetof(UA_AddReferencesRequest, referencesToAddSize) - offsetof(UA_AddReferencesRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
+    UA_TYPENAME("RevisedMaxKeepAliveCount") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_CreateSubscriptionResponse, revisedMaxKeepAliveCount) - offsetof(UA_CreateSubscriptionResponse, revisedLifetimeCount) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
-    true, /* .isArray */
+    false, /* .isArray */
     false /* .isOptional */
 },};
 
-/* AddNodesItem */
-static UA_DataTypeMember AddNodesItem_members[7] = {
+/* ModifySubscriptionRequest */
+static UA_DataTypeMember ModifySubscriptionRequest_members[7] = {
 {
-    UA_TYPENAME("ParentNodeId") /* .memberName */
-    UA_TYPES_EXPANDEDNODEID, /* .memberTypeIndex */
+    UA_TYPENAME("RequestHeader") /* .memberName */
+    UA_TYPES_REQUESTHEADER, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("ReferenceTypeId") /* .memberName */
-    UA_TYPES_NODEID, /* .memberTypeIndex */
-    offsetof(UA_AddNodesItem, referenceTypeId) - offsetof(UA_AddNodesItem, parentNodeId) - sizeof(UA_ExpandedNodeId), /* .padding */
+    UA_TYPENAME("SubscriptionId") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_ModifySubscriptionRequest, subscriptionId) - offsetof(UA_ModifySubscriptionRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("RequestedNewNodeId") /* .memberName */
-    UA_TYPES_EXPANDEDNODEID, /* .memberTypeIndex */
-    offsetof(UA_AddNodesItem, requestedNewNodeId) - offsetof(UA_AddNodesItem, referenceTypeId) - sizeof(UA_NodeId), /* .padding */
+    UA_TYPENAME("RequestedPublishingInterval") /* .memberName */
+    UA_TYPES_DOUBLE, /* .memberTypeIndex */
+    offsetof(UA_ModifySubscriptionRequest, requestedPublishingInterval) - offsetof(UA_ModifySubscriptionRequest, subscriptionId) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("BrowseName") /* .memberName */
-    UA_TYPES_QUALIFIEDNAME, /* .memberTypeIndex */
-    offsetof(UA_AddNodesItem, browseName) - offsetof(UA_AddNodesItem, requestedNewNodeId) - sizeof(UA_ExpandedNodeId), /* .padding */
+    UA_TYPENAME("RequestedLifetimeCount") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_ModifySubscriptionRequest, requestedLifetimeCount) - offsetof(UA_ModifySubscriptionRequest, requestedPublishingInterval) - sizeof(UA_Double), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("NodeClass") /* .memberName */
-    UA_TYPES_NODECLASS, /* .memberTypeIndex */
-    offsetof(UA_AddNodesItem, nodeClass) - offsetof(UA_AddNodesItem, browseName) - sizeof(UA_QualifiedName), /* .padding */
+    UA_TYPENAME("RequestedMaxKeepAliveCount") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_ModifySubscriptionRequest, requestedMaxKeepAliveCount) - offsetof(UA_ModifySubscriptionRequest, requestedLifetimeCount) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("NodeAttributes") /* .memberName */
-    UA_TYPES_EXTENSIONOBJECT, /* .memberTypeIndex */
-    offsetof(UA_AddNodesItem, nodeAttributes) - offsetof(UA_AddNodesItem, nodeClass) - sizeof(UA_NodeClass), /* .padding */
+    UA_TYPENAME("MaxNotificationsPerPublish") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_ModifySubscriptionRequest, maxNotificationsPerPublish) - offsetof(UA_ModifySubscriptionRequest, requestedMaxKeepAliveCount) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("TypeDefinition") /* .memberName */
-    UA_TYPES_EXPANDEDNODEID, /* .memberTypeIndex */
-    offsetof(UA_AddNodesItem, typeDefinition) - offsetof(UA_AddNodesItem, nodeAttributes) - sizeof(UA_ExtensionObject), /* .padding */
+    UA_TYPENAME("Priority") /* .memberName */
+    UA_TYPES_BYTE, /* .memberTypeIndex */
+    offsetof(UA_ModifySubscriptionRequest, priority) - offsetof(UA_ModifySubscriptionRequest, maxNotificationsPerPublish) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },};
 
-/* ServerStatusDataType */
-static UA_DataTypeMember ServerStatusDataType_members[6] = {
+/* ModifySubscriptionResponse */
+static UA_DataTypeMember ModifySubscriptionResponse_members[4] = {
 {
-    UA_TYPENAME("StartTime") /* .memberName */
-    UA_TYPES_DATETIME, /* .memberTypeIndex */
+    UA_TYPENAME("ResponseHeader") /* .memberName */
+    UA_TYPES_RESPONSEHEADER, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("CurrentTime") /* .memberName */
-    UA_TYPES_DATETIME, /* .memberTypeIndex */
-    offsetof(UA_ServerStatusDataType, currentTime) - offsetof(UA_ServerStatusDataType, startTime) - sizeof(UA_DateTime), /* .padding */
+    UA_TYPENAME("RevisedPublishingInterval") /* .memberName */
+    UA_TYPES_DOUBLE, /* .memberTypeIndex */
+    offsetof(UA_ModifySubscriptionResponse, revisedPublishingInterval) - offsetof(UA_ModifySubscriptionResponse, responseHeader) - sizeof(UA_ResponseHeader), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("State") /* .memberName */
-    UA_TYPES_SERVERSTATE, /* .memberTypeIndex */
-    offsetof(UA_ServerStatusDataType, state) - offsetof(UA_ServerStatusDataType, currentTime) - sizeof(UA_DateTime), /* .padding */
+    UA_TYPENAME("RevisedLifetimeCount") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_ModifySubscriptionResponse, revisedLifetimeCount) - offsetof(UA_ModifySubscriptionResponse, revisedPublishingInterval) - sizeof(UA_Double), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("BuildInfo") /* .memberName */
-    UA_TYPES_BUILDINFO, /* .memberTypeIndex */
-    offsetof(UA_ServerStatusDataType, buildInfo) - offsetof(UA_ServerStatusDataType, state) - sizeof(UA_ServerState), /* .padding */
+    UA_TYPENAME("RevisedMaxKeepAliveCount") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_ModifySubscriptionResponse, revisedMaxKeepAliveCount) - offsetof(UA_ModifySubscriptionResponse, revisedLifetimeCount) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
-},
+},};
+
+/* SetPublishingModeRequest */
+static UA_DataTypeMember SetPublishingModeRequest_members[3] = {
 {
-    UA_TYPENAME("SecondsTillShutdown") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_ServerStatusDataType, secondsTillShutdown) - offsetof(UA_ServerStatusDataType, buildInfo) - sizeof(UA_BuildInfo), /* .padding */
+    UA_TYPENAME("RequestHeader") /* .memberName */
+    UA_TYPES_REQUESTHEADER, /* .memberTypeIndex */
+    0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("ShutdownReason") /* .memberName */
-    UA_TYPES_LOCALIZEDTEXT, /* .memberTypeIndex */
-    offsetof(UA_ServerStatusDataType, shutdownReason) - offsetof(UA_ServerStatusDataType, secondsTillShutdown) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("PublishingEnabled") /* .memberName */
+    UA_TYPES_BOOLEAN, /* .memberTypeIndex */
+    offsetof(UA_SetPublishingModeRequest, publishingEnabled) - offsetof(UA_SetPublishingModeRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
+},
+{
+    UA_TYPENAME("SubscriptionIds") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_SetPublishingModeRequest, subscriptionIdsSize) - offsetof(UA_SetPublishingModeRequest, publishingEnabled) - sizeof(UA_Boolean), /* .padding */
+    true, /* .namespaceZero */
+    true, /* .isArray */
+    false /* .isOptional */
 },};
 
-/* BrowseNextResponse */
-static UA_DataTypeMember BrowseNextResponse_members[3] = {
+/* SetPublishingModeResponse */
+static UA_DataTypeMember SetPublishingModeResponse_members[3] = {
 {
     UA_TYPENAME("ResponseHeader") /* .memberName */
     UA_TYPES_RESPONSEHEADER, /* .memberTypeIndex */
@@ -14649,8 +15378,8 @@ static UA_DataTypeMember BrowseNextResponse_members[3] = {
 },
 {
     UA_TYPENAME("Results") /* .memberName */
-    UA_TYPES_BROWSERESULT, /* .memberTypeIndex */
-    offsetof(UA_BrowseNextResponse, resultsSize) - offsetof(UA_BrowseNextResponse, responseHeader) - sizeof(UA_ResponseHeader), /* .padding */
+    UA_TYPES_STATUSCODE, /* .memberTypeIndex */
+    offsetof(UA_SetPublishingModeResponse, resultsSize) - offsetof(UA_SetPublishingModeResponse, responseHeader) - sizeof(UA_ResponseHeader), /* .padding */
     true, /* .namespaceZero */
     true, /* .isArray */
     false /* .isOptional */
@@ -14658,221 +15387,206 @@ static UA_DataTypeMember BrowseNextResponse_members[3] = {
 {
     UA_TYPENAME("DiagnosticInfos") /* .memberName */
     UA_TYPES_DIAGNOSTICINFO, /* .memberTypeIndex */
-    offsetof(UA_BrowseNextResponse, diagnosticInfosSize) - offsetof(UA_BrowseNextResponse, results) - sizeof(void *), /* .padding */
+    offsetof(UA_SetPublishingModeResponse, diagnosticInfosSize) - offsetof(UA_SetPublishingModeResponse, results) - sizeof(void *), /* .padding */
     true, /* .namespaceZero */
     true, /* .isArray */
     false /* .isOptional */
 },};
 
-/* AxisInformation */
-static UA_DataTypeMember AxisInformation_members[5] = {
+/* NotificationMessage */
+static UA_DataTypeMember NotificationMessage_members[3] = {
 {
-    UA_TYPENAME("EngineeringUnits") /* .memberName */
-    UA_TYPES_EUINFORMATION, /* .memberTypeIndex */
+    UA_TYPENAME("SequenceNumber") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("EURange") /* .memberName */
-    UA_TYPES_RANGE, /* .memberTypeIndex */
-    offsetof(UA_AxisInformation, eURange) - offsetof(UA_AxisInformation, engineeringUnits) - sizeof(UA_EUInformation), /* .padding */
-    true, /* .namespaceZero */
-    false, /* .isArray */
-    false /* .isOptional */
-},
-{
-    UA_TYPENAME("Title") /* .memberName */
-    UA_TYPES_LOCALIZEDTEXT, /* .memberTypeIndex */
-    offsetof(UA_AxisInformation, title) - offsetof(UA_AxisInformation, eURange) - sizeof(UA_Range), /* .padding */
-    true, /* .namespaceZero */
-    false, /* .isArray */
-    false /* .isOptional */
-},
-{
-    UA_TYPENAME("AxisScaleType") /* .memberName */
-    UA_TYPES_AXISSCALEENUMERATION, /* .memberTypeIndex */
-    offsetof(UA_AxisInformation, axisScaleType) - offsetof(UA_AxisInformation, title) - sizeof(UA_LocalizedText), /* .padding */
+    UA_TYPENAME("PublishTime") /* .memberName */
+    UA_TYPES_DATETIME, /* .memberTypeIndex */
+    offsetof(UA_NotificationMessage, publishTime) - offsetof(UA_NotificationMessage, sequenceNumber) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("AxisSteps") /* .memberName */
-    UA_TYPES_DOUBLE, /* .memberTypeIndex */
-    offsetof(UA_AxisInformation, axisStepsSize) - offsetof(UA_AxisInformation, axisScaleType) - sizeof(UA_AxisScaleEnumeration), /* .padding */
+    UA_TYPENAME("NotificationData") /* .memberName */
+    UA_TYPES_EXTENSIONOBJECT, /* .memberTypeIndex */
+    offsetof(UA_NotificationMessage, notificationDataSize) - offsetof(UA_NotificationMessage, publishTime) - sizeof(UA_DateTime), /* .padding */
     true, /* .namespaceZero */
     true, /* .isArray */
     false /* .isOptional */
 },};
 
-/* ApplicationDescription */
-static UA_DataTypeMember ApplicationDescription_members[7] = {
+/* MonitoredItemNotification */
+static UA_DataTypeMember MonitoredItemNotification_members[2] = {
 {
-    UA_TYPENAME("ApplicationUri") /* .memberName */
-    UA_TYPES_STRING, /* .memberTypeIndex */
+    UA_TYPENAME("ClientHandle") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("ProductUri") /* .memberName */
-    UA_TYPES_STRING, /* .memberTypeIndex */
-    offsetof(UA_ApplicationDescription, productUri) - offsetof(UA_ApplicationDescription, applicationUri) - sizeof(UA_String), /* .padding */
+    UA_TYPENAME("Value") /* .memberName */
+    UA_TYPES_DATAVALUE, /* .memberTypeIndex */
+    offsetof(UA_MonitoredItemNotification, value) - offsetof(UA_MonitoredItemNotification, clientHandle) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
-},
+},};
+
+/* EventFieldList */
+static UA_DataTypeMember EventFieldList_members[2] = {
 {
-    UA_TYPENAME("ApplicationName") /* .memberName */
-    UA_TYPES_LOCALIZEDTEXT, /* .memberTypeIndex */
-    offsetof(UA_ApplicationDescription, applicationName) - offsetof(UA_ApplicationDescription, productUri) - sizeof(UA_String), /* .padding */
+    UA_TYPENAME("ClientHandle") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("ApplicationType") /* .memberName */
-    UA_TYPES_APPLICATIONTYPE, /* .memberTypeIndex */
-    offsetof(UA_ApplicationDescription, applicationType) - offsetof(UA_ApplicationDescription, applicationName) - sizeof(UA_LocalizedText), /* .padding */
+    UA_TYPENAME("EventFields") /* .memberName */
+    UA_TYPES_VARIANT, /* .memberTypeIndex */
+    offsetof(UA_EventFieldList, eventFieldsSize) - offsetof(UA_EventFieldList, clientHandle) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
-    false, /* .isArray */
+    true, /* .isArray */
     false /* .isOptional */
-},
+},};
+
+/* HistoryEventFieldList */
+static UA_DataTypeMember HistoryEventFieldList_members[1] = {
 {
-    UA_TYPENAME("GatewayServerUri") /* .memberName */
-    UA_TYPES_STRING, /* .memberTypeIndex */
-    offsetof(UA_ApplicationDescription, gatewayServerUri) - offsetof(UA_ApplicationDescription, applicationType) - sizeof(UA_ApplicationType), /* .padding */
+    UA_TYPENAME("EventFields") /* .memberName */
+    UA_TYPES_VARIANT, /* .memberTypeIndex */
+    0, /* .padding */
     true, /* .namespaceZero */
-    false, /* .isArray */
+    true, /* .isArray */
     false /* .isOptional */
-},
+},};
+
+/* StatusChangeNotification */
+static UA_DataTypeMember StatusChangeNotification_members[2] = {
 {
-    UA_TYPENAME("DiscoveryProfileUri") /* .memberName */
-    UA_TYPES_STRING, /* .memberTypeIndex */
-    offsetof(UA_ApplicationDescription, discoveryProfileUri) - offsetof(UA_ApplicationDescription, gatewayServerUri) - sizeof(UA_String), /* .padding */
+    UA_TYPENAME("Status") /* .memberName */
+    UA_TYPES_STATUSCODE, /* .memberTypeIndex */
+    0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("DiscoveryUrls") /* .memberName */
-    UA_TYPES_STRING, /* .memberTypeIndex */
-    offsetof(UA_ApplicationDescription, discoveryUrlsSize) - offsetof(UA_ApplicationDescription, discoveryProfileUri) - sizeof(UA_String), /* .padding */
+    UA_TYPENAME("DiagnosticInfo") /* .memberName */
+    UA_TYPES_DIAGNOSTICINFO, /* .memberTypeIndex */
+    offsetof(UA_StatusChangeNotification, diagnosticInfo) - offsetof(UA_StatusChangeNotification, status) - sizeof(UA_StatusCode), /* .padding */
     true, /* .namespaceZero */
-    true, /* .isArray */
+    false, /* .isArray */
     false /* .isOptional */
 },};
 
-/* ReadRequest */
-static UA_DataTypeMember ReadRequest_members[4] = {
+/* SubscriptionAcknowledgement */
+static UA_DataTypeMember SubscriptionAcknowledgement_members[2] = {
 {
-    UA_TYPENAME("RequestHeader") /* .memberName */
-    UA_TYPES_REQUESTHEADER, /* .memberTypeIndex */
+    UA_TYPENAME("SubscriptionId") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("MaxAge") /* .memberName */
-    UA_TYPES_DOUBLE, /* .memberTypeIndex */
-    offsetof(UA_ReadRequest, maxAge) - offsetof(UA_ReadRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
+    UA_TYPENAME("SequenceNumber") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_SubscriptionAcknowledgement, sequenceNumber) - offsetof(UA_SubscriptionAcknowledgement, subscriptionId) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
-},
+},};
+
+/* PublishRequest */
+static UA_DataTypeMember PublishRequest_members[2] = {
 {
-    UA_TYPENAME("TimestampsToReturn") /* .memberName */
-    UA_TYPES_TIMESTAMPSTORETURN, /* .memberTypeIndex */
-    offsetof(UA_ReadRequest, timestampsToReturn) - offsetof(UA_ReadRequest, maxAge) - sizeof(UA_Double), /* .padding */
+    UA_TYPENAME("RequestHeader") /* .memberName */
+    UA_TYPES_REQUESTHEADER, /* .memberTypeIndex */
+    0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("NodesToRead") /* .memberName */
-    UA_TYPES_READVALUEID, /* .memberTypeIndex */
-    offsetof(UA_ReadRequest, nodesToReadSize) - offsetof(UA_ReadRequest, timestampsToReturn) - sizeof(UA_TimestampsToReturn), /* .padding */
+    UA_TYPENAME("SubscriptionAcknowledgements") /* .memberName */
+    UA_TYPES_SUBSCRIPTIONACKNOWLEDGEMENT, /* .memberTypeIndex */
+    offsetof(UA_PublishRequest, subscriptionAcknowledgementsSize) - offsetof(UA_PublishRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
     true, /* .namespaceZero */
     true, /* .isArray */
     false /* .isOptional */
 },};
 
-/* ActivateSessionRequest */
-static UA_DataTypeMember ActivateSessionRequest_members[6] = {
+/* PublishResponse */
+static UA_DataTypeMember PublishResponse_members[7] = {
 {
-    UA_TYPENAME("RequestHeader") /* .memberName */
-    UA_TYPES_REQUESTHEADER, /* .memberTypeIndex */
+    UA_TYPENAME("ResponseHeader") /* .memberName */
+    UA_TYPES_RESPONSEHEADER, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("ClientSignature") /* .memberName */
-    UA_TYPES_SIGNATUREDATA, /* .memberTypeIndex */
-    offsetof(UA_ActivateSessionRequest, clientSignature) - offsetof(UA_ActivateSessionRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
+    UA_TYPENAME("SubscriptionId") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_PublishResponse, subscriptionId) - offsetof(UA_PublishResponse, responseHeader) - sizeof(UA_ResponseHeader), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("ClientSoftwareCertificates") /* .memberName */
-    UA_TYPES_SIGNEDSOFTWARECERTIFICATE, /* .memberTypeIndex */
-    offsetof(UA_ActivateSessionRequest, clientSoftwareCertificatesSize) - offsetof(UA_ActivateSessionRequest, clientSignature) - sizeof(UA_SignatureData), /* .padding */
-    true, /* .namespaceZero */
-    true, /* .isArray */
-    false /* .isOptional */
-},
-{
-    UA_TYPENAME("LocaleIds") /* .memberName */
-    UA_TYPES_STRING, /* .memberTypeIndex */
-    offsetof(UA_ActivateSessionRequest, localeIdsSize) - offsetof(UA_ActivateSessionRequest, clientSoftwareCertificates) - sizeof(void *), /* .padding */
+    UA_TYPENAME("AvailableSequenceNumbers") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_PublishResponse, availableSequenceNumbersSize) - offsetof(UA_PublishResponse, subscriptionId) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     true, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("UserIdentityToken") /* .memberName */
-    UA_TYPES_EXTENSIONOBJECT, /* .memberTypeIndex */
-    offsetof(UA_ActivateSessionRequest, userIdentityToken) - offsetof(UA_ActivateSessionRequest, localeIds) - sizeof(void *), /* .padding */
+    UA_TYPENAME("MoreNotifications") /* .memberName */
+    UA_TYPES_BOOLEAN, /* .memberTypeIndex */
+    offsetof(UA_PublishResponse, moreNotifications) - offsetof(UA_PublishResponse, availableSequenceNumbers) - sizeof(void *), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("UserTokenSignature") /* .memberName */
-    UA_TYPES_SIGNATUREDATA, /* .memberTypeIndex */
-    offsetof(UA_ActivateSessionRequest, userTokenSignature) - offsetof(UA_ActivateSessionRequest, userIdentityToken) - sizeof(UA_ExtensionObject), /* .padding */
+    UA_TYPENAME("NotificationMessage") /* .memberName */
+    UA_TYPES_NOTIFICATIONMESSAGE, /* .memberTypeIndex */
+    offsetof(UA_PublishResponse, notificationMessage) - offsetof(UA_PublishResponse, moreNotifications) - sizeof(UA_Boolean), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
-},};
-
-/* BrowsePathResult */
-static UA_DataTypeMember BrowsePathResult_members[2] = {
+},
 {
-    UA_TYPENAME("StatusCode") /* .memberName */
+    UA_TYPENAME("Results") /* .memberName */
     UA_TYPES_STATUSCODE, /* .memberTypeIndex */
-    0, /* .padding */
+    offsetof(UA_PublishResponse, resultsSize) - offsetof(UA_PublishResponse, notificationMessage) - sizeof(UA_NotificationMessage), /* .padding */
     true, /* .namespaceZero */
-    false, /* .isArray */
+    true, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("Targets") /* .memberName */
-    UA_TYPES_BROWSEPATHTARGET, /* .memberTypeIndex */
-    offsetof(UA_BrowsePathResult, targetsSize) - offsetof(UA_BrowsePathResult, statusCode) - sizeof(UA_StatusCode), /* .padding */
+    UA_TYPENAME("DiagnosticInfos") /* .memberName */
+    UA_TYPES_DIAGNOSTICINFO, /* .memberTypeIndex */
+    offsetof(UA_PublishResponse, diagnosticInfosSize) - offsetof(UA_PublishResponse, results) - sizeof(void *), /* .padding */
     true, /* .namespaceZero */
     true, /* .isArray */
     false /* .isOptional */
 },};
 
-/* AddNodesRequest */
-static UA_DataTypeMember AddNodesRequest_members[2] = {
+/* RepublishRequest */
+static UA_DataTypeMember RepublishRequest_members[3] = {
 {
     UA_TYPENAME("RequestHeader") /* .memberName */
     UA_TYPES_REQUESTHEADER, /* .memberTypeIndex */
@@ -14882,51 +15596,43 @@ static UA_DataTypeMember AddNodesRequest_members[2] = {
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("NodesToAdd") /* .memberName */
-    UA_TYPES_ADDNODESITEM, /* .memberTypeIndex */
-    offsetof(UA_AddNodesRequest, nodesToAddSize) - offsetof(UA_AddNodesRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
-    true, /* .namespaceZero */
-    true, /* .isArray */
-    false /* .isOptional */
-},};
-
-/* BrowseRequest */
-static UA_DataTypeMember BrowseRequest_members[4] = {
-{
-    UA_TYPENAME("RequestHeader") /* .memberName */
-    UA_TYPES_REQUESTHEADER, /* .memberTypeIndex */
-    0, /* .padding */
+    UA_TYPENAME("SubscriptionId") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_RepublishRequest, subscriptionId) - offsetof(UA_RepublishRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("View") /* .memberName */
-    UA_TYPES_VIEWDESCRIPTION, /* .memberTypeIndex */
-    offsetof(UA_BrowseRequest, view) - offsetof(UA_BrowseRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
+    UA_TYPENAME("RetransmitSequenceNumber") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_RepublishRequest, retransmitSequenceNumber) - offsetof(UA_RepublishRequest, subscriptionId) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
-},
+},};
+
+/* RepublishResponse */
+static UA_DataTypeMember RepublishResponse_members[2] = {
 {
-    UA_TYPENAME("RequestedMaxReferencesPerNode") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_BrowseRequest, requestedMaxReferencesPerNode) - offsetof(UA_BrowseRequest, view) - sizeof(UA_ViewDescription), /* .padding */
+    UA_TYPENAME("ResponseHeader") /* .memberName */
+    UA_TYPES_RESPONSEHEADER, /* .memberTypeIndex */
+    0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("NodesToBrowse") /* .memberName */
-    UA_TYPES_BROWSEDESCRIPTION, /* .memberTypeIndex */
-    offsetof(UA_BrowseRequest, nodesToBrowseSize) - offsetof(UA_BrowseRequest, requestedMaxReferencesPerNode) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("NotificationMessage") /* .memberName */
+    UA_TYPES_NOTIFICATIONMESSAGE, /* .memberTypeIndex */
+    offsetof(UA_RepublishResponse, notificationMessage) - offsetof(UA_RepublishResponse, responseHeader) - sizeof(UA_ResponseHeader), /* .padding */
     true, /* .namespaceZero */
-    true, /* .isArray */
+    false, /* .isArray */
     false /* .isOptional */
 },};
 
-/* WriteRequest */
-static UA_DataTypeMember WriteRequest_members[2] = {
+/* DeleteSubscriptionsRequest */
+static UA_DataTypeMember DeleteSubscriptionsRequest_members[2] = {
 {
     UA_TYPENAME("RequestHeader") /* .memberName */
     UA_TYPES_REQUESTHEADER, /* .memberTypeIndex */
@@ -14936,16 +15642,16 @@ static UA_DataTypeMember WriteRequest_members[2] = {
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("NodesToWrite") /* .memberName */
-    UA_TYPES_WRITEVALUE, /* .memberTypeIndex */
-    offsetof(UA_WriteRequest, nodesToWriteSize) - offsetof(UA_WriteRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
+    UA_TYPENAME("SubscriptionIds") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_DeleteSubscriptionsRequest, subscriptionIdsSize) - offsetof(UA_DeleteSubscriptionsRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
     true, /* .namespaceZero */
     true, /* .isArray */
     false /* .isOptional */
 },};
 
-/* AddNodesResponse */
-static UA_DataTypeMember AddNodesResponse_members[3] = {
+/* DeleteSubscriptionsResponse */
+static UA_DataTypeMember DeleteSubscriptionsResponse_members[3] = {
 {
     UA_TYPENAME("ResponseHeader") /* .memberName */
     UA_TYPES_RESPONSEHEADER, /* .memberTypeIndex */
@@ -14956,8 +15662,8 @@ static UA_DataTypeMember AddNodesResponse_members[3] = {
 },
 {
     UA_TYPENAME("Results") /* .memberName */
-    UA_TYPES_ADDNODESRESULT, /* .memberTypeIndex */
-    offsetof(UA_AddNodesResponse, resultsSize) - offsetof(UA_AddNodesResponse, responseHeader) - sizeof(UA_ResponseHeader), /* .padding */
+    UA_TYPES_STATUSCODE, /* .memberTypeIndex */
+    offsetof(UA_DeleteSubscriptionsResponse, resultsSize) - offsetof(UA_DeleteSubscriptionsResponse, responseHeader) - sizeof(UA_ResponseHeader), /* .padding */
     true, /* .namespaceZero */
     true, /* .isArray */
     false /* .isOptional */
@@ -14965,483 +15671,549 @@ static UA_DataTypeMember AddNodesResponse_members[3] = {
 {
     UA_TYPENAME("DiagnosticInfos") /* .memberName */
     UA_TYPES_DIAGNOSTICINFO, /* .memberTypeIndex */
-    offsetof(UA_AddNodesResponse, diagnosticInfosSize) - offsetof(UA_AddNodesResponse, results) - sizeof(void *), /* .padding */
+    offsetof(UA_DeleteSubscriptionsResponse, diagnosticInfosSize) - offsetof(UA_DeleteSubscriptionsResponse, results) - sizeof(void *), /* .padding */
     true, /* .namespaceZero */
     true, /* .isArray */
     false /* .isOptional */
 },};
 
-/* AttributeOperand */
-static UA_DataTypeMember AttributeOperand_members[5] = {
+/* BuildInfo */
+static UA_DataTypeMember BuildInfo_members[6] = {
 {
-    UA_TYPENAME("NodeId") /* .memberName */
-    UA_TYPES_NODEID, /* .memberTypeIndex */
+    UA_TYPENAME("ProductUri") /* .memberName */
+    UA_TYPES_STRING, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("Alias") /* .memberName */
+    UA_TYPENAME("ManufacturerName") /* .memberName */
     UA_TYPES_STRING, /* .memberTypeIndex */
-    offsetof(UA_AttributeOperand, alias) - offsetof(UA_AttributeOperand, nodeId) - sizeof(UA_NodeId), /* .padding */
+    offsetof(UA_BuildInfo, manufacturerName) - offsetof(UA_BuildInfo, productUri) - sizeof(UA_String), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("BrowsePath") /* .memberName */
-    UA_TYPES_RELATIVEPATH, /* .memberTypeIndex */
-    offsetof(UA_AttributeOperand, browsePath) - offsetof(UA_AttributeOperand, alias) - sizeof(UA_String), /* .padding */
+    UA_TYPENAME("ProductName") /* .memberName */
+    UA_TYPES_STRING, /* .memberTypeIndex */
+    offsetof(UA_BuildInfo, productName) - offsetof(UA_BuildInfo, manufacturerName) - sizeof(UA_String), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("AttributeId") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_AttributeOperand, attributeId) - offsetof(UA_AttributeOperand, browsePath) - sizeof(UA_RelativePath), /* .padding */
+    UA_TYPENAME("SoftwareVersion") /* .memberName */
+    UA_TYPES_STRING, /* .memberTypeIndex */
+    offsetof(UA_BuildInfo, softwareVersion) - offsetof(UA_BuildInfo, productName) - sizeof(UA_String), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("IndexRange") /* .memberName */
+    UA_TYPENAME("BuildNumber") /* .memberName */
     UA_TYPES_STRING, /* .memberTypeIndex */
-    offsetof(UA_AttributeOperand, indexRange) - offsetof(UA_AttributeOperand, attributeId) - sizeof(UA_UInt32), /* .padding */
+    offsetof(UA_BuildInfo, buildNumber) - offsetof(UA_BuildInfo, softwareVersion) - sizeof(UA_String), /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
+    false /* .isOptional */
+},
+{
+    UA_TYPENAME("BuildDate") /* .memberName */
+    UA_TYPES_DATETIME, /* .memberTypeIndex */
+    offsetof(UA_BuildInfo, buildDate) - offsetof(UA_BuildInfo, buildNumber) - sizeof(UA_String), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },};
 
-/* DataChangeFilter */
-static UA_DataTypeMember DataChangeFilter_members[3] = {
+/* RedundancySupport */
+#define RedundancySupport_members NULL
+
+/* ServerState */
+#define ServerState_members NULL
+
+/* ServerDiagnosticsSummaryDataType */
+static UA_DataTypeMember ServerDiagnosticsSummaryDataType_members[12] = {
 {
-    UA_TYPENAME("Trigger") /* .memberName */
-    UA_TYPES_DATACHANGETRIGGER, /* .memberTypeIndex */
+    UA_TYPENAME("ServerViewCount") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("DeadbandType") /* .memberName */
+    UA_TYPENAME("CurrentSessionCount") /* .memberName */
     UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_DataChangeFilter, deadbandType) - offsetof(UA_DataChangeFilter, trigger) - sizeof(UA_DataChangeTrigger), /* .padding */
+    offsetof(UA_ServerDiagnosticsSummaryDataType, currentSessionCount) - offsetof(UA_ServerDiagnosticsSummaryDataType, serverViewCount) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("DeadbandValue") /* .memberName */
-    UA_TYPES_DOUBLE, /* .memberTypeIndex */
-    offsetof(UA_DataChangeFilter, deadbandValue) - offsetof(UA_DataChangeFilter, deadbandType) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("CumulatedSessionCount") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_ServerDiagnosticsSummaryDataType, cumulatedSessionCount) - offsetof(UA_ServerDiagnosticsSummaryDataType, currentSessionCount) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
-},};
-
-/* EndpointDescription */
-static UA_DataTypeMember EndpointDescription_members[8] = {
+},
 {
-    UA_TYPENAME("EndpointUrl") /* .memberName */
-    UA_TYPES_STRING, /* .memberTypeIndex */
-    0, /* .padding */
+    UA_TYPENAME("SecurityRejectedSessionCount") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_ServerDiagnosticsSummaryDataType, securityRejectedSessionCount) - offsetof(UA_ServerDiagnosticsSummaryDataType, cumulatedSessionCount) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("Server") /* .memberName */
-    UA_TYPES_APPLICATIONDESCRIPTION, /* .memberTypeIndex */
-    offsetof(UA_EndpointDescription, server) - offsetof(UA_EndpointDescription, endpointUrl) - sizeof(UA_String), /* .padding */
+    UA_TYPENAME("RejectedSessionCount") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_ServerDiagnosticsSummaryDataType, rejectedSessionCount) - offsetof(UA_ServerDiagnosticsSummaryDataType, securityRejectedSessionCount) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("ServerCertificate") /* .memberName */
-    UA_TYPES_BYTESTRING, /* .memberTypeIndex */
-    offsetof(UA_EndpointDescription, serverCertificate) - offsetof(UA_EndpointDescription, server) - sizeof(UA_ApplicationDescription), /* .padding */
+    UA_TYPENAME("SessionTimeoutCount") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_ServerDiagnosticsSummaryDataType, sessionTimeoutCount) - offsetof(UA_ServerDiagnosticsSummaryDataType, rejectedSessionCount) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("SecurityMode") /* .memberName */
-    UA_TYPES_MESSAGESECURITYMODE, /* .memberTypeIndex */
-    offsetof(UA_EndpointDescription, securityMode) - offsetof(UA_EndpointDescription, serverCertificate) - sizeof(UA_ByteString), /* .padding */
+    UA_TYPENAME("SessionAbortCount") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_ServerDiagnosticsSummaryDataType, sessionAbortCount) - offsetof(UA_ServerDiagnosticsSummaryDataType, sessionTimeoutCount) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("SecurityPolicyUri") /* .memberName */
-    UA_TYPES_STRING, /* .memberTypeIndex */
-    offsetof(UA_EndpointDescription, securityPolicyUri) - offsetof(UA_EndpointDescription, securityMode) - sizeof(UA_MessageSecurityMode), /* .padding */
+    UA_TYPENAME("CurrentSubscriptionCount") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_ServerDiagnosticsSummaryDataType, currentSubscriptionCount) - offsetof(UA_ServerDiagnosticsSummaryDataType, sessionAbortCount) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("UserIdentityTokens") /* .memberName */
-    UA_TYPES_USERTOKENPOLICY, /* .memberTypeIndex */
-    offsetof(UA_EndpointDescription, userIdentityTokensSize) - offsetof(UA_EndpointDescription, securityPolicyUri) - sizeof(UA_String), /* .padding */
+    UA_TYPENAME("CumulatedSubscriptionCount") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_ServerDiagnosticsSummaryDataType, cumulatedSubscriptionCount) - offsetof(UA_ServerDiagnosticsSummaryDataType, currentSubscriptionCount) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
-    true, /* .isArray */
+    false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("TransportProfileUri") /* .memberName */
-    UA_TYPES_STRING, /* .memberTypeIndex */
-    offsetof(UA_EndpointDescription, transportProfileUri) - offsetof(UA_EndpointDescription, userIdentityTokens) - sizeof(void *), /* .padding */
+    UA_TYPENAME("PublishingIntervalCount") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_ServerDiagnosticsSummaryDataType, publishingIntervalCount) - offsetof(UA_ServerDiagnosticsSummaryDataType, cumulatedSubscriptionCount) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("SecurityLevel") /* .memberName */
-    UA_TYPES_BYTE, /* .memberTypeIndex */
-    offsetof(UA_EndpointDescription, securityLevel) - offsetof(UA_EndpointDescription, transportProfileUri) - sizeof(UA_String), /* .padding */
+    UA_TYPENAME("SecurityRejectedRequestsCount") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_ServerDiagnosticsSummaryDataType, securityRejectedRequestsCount) - offsetof(UA_ServerDiagnosticsSummaryDataType, publishingIntervalCount) - sizeof(UA_UInt32), /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
+    false /* .isOptional */
+},
+{
+    UA_TYPENAME("RejectedRequestsCount") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_ServerDiagnosticsSummaryDataType, rejectedRequestsCount) - offsetof(UA_ServerDiagnosticsSummaryDataType, securityRejectedRequestsCount) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },};
 
-/* DeleteReferencesRequest */
-static UA_DataTypeMember DeleteReferencesRequest_members[2] = {
+/* ServerStatusDataType */
+static UA_DataTypeMember ServerStatusDataType_members[6] = {
 {
-    UA_TYPENAME("RequestHeader") /* .memberName */
-    UA_TYPES_REQUESTHEADER, /* .memberTypeIndex */
+    UA_TYPENAME("StartTime") /* .memberName */
+    UA_TYPES_DATETIME, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("ReferencesToDelete") /* .memberName */
-    UA_TYPES_DELETEREFERENCESITEM, /* .memberTypeIndex */
-    offsetof(UA_DeleteReferencesRequest, referencesToDeleteSize) - offsetof(UA_DeleteReferencesRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
+    UA_TYPENAME("CurrentTime") /* .memberName */
+    UA_TYPES_DATETIME, /* .memberTypeIndex */
+    offsetof(UA_ServerStatusDataType, currentTime) - offsetof(UA_ServerStatusDataType, startTime) - sizeof(UA_DateTime), /* .padding */
     true, /* .namespaceZero */
-    true, /* .isArray */
+    false, /* .isArray */
     false /* .isOptional */
-},};
-
-/* TranslateBrowsePathsToNodeIdsRequest */
-static UA_DataTypeMember TranslateBrowsePathsToNodeIdsRequest_members[2] = {
+},
 {
-    UA_TYPENAME("RequestHeader") /* .memberName */
-    UA_TYPES_REQUESTHEADER, /* .memberTypeIndex */
-    0, /* .padding */
+    UA_TYPENAME("State") /* .memberName */
+    UA_TYPES_SERVERSTATE, /* .memberTypeIndex */
+    offsetof(UA_ServerStatusDataType, state) - offsetof(UA_ServerStatusDataType, currentTime) - sizeof(UA_DateTime), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("BrowsePaths") /* .memberName */
-    UA_TYPES_BROWSEPATH, /* .memberTypeIndex */
-    offsetof(UA_TranslateBrowsePathsToNodeIdsRequest, browsePathsSize) - offsetof(UA_TranslateBrowsePathsToNodeIdsRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
+    UA_TYPENAME("BuildInfo") /* .memberName */
+    UA_TYPES_BUILDINFO, /* .memberTypeIndex */
+    offsetof(UA_ServerStatusDataType, buildInfo) - offsetof(UA_ServerStatusDataType, state) - sizeof(UA_ServerState), /* .padding */
     true, /* .namespaceZero */
-    true, /* .isArray */
+    false, /* .isArray */
     false /* .isOptional */
-},};
-
-/* FindServersResponse */
-static UA_DataTypeMember FindServersResponse_members[2] = {
+},
 {
-    UA_TYPENAME("ResponseHeader") /* .memberName */
-    UA_TYPES_RESPONSEHEADER, /* .memberTypeIndex */
-    0, /* .padding */
+    UA_TYPENAME("SecondsTillShutdown") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_ServerStatusDataType, secondsTillShutdown) - offsetof(UA_ServerStatusDataType, buildInfo) - sizeof(UA_BuildInfo), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("Servers") /* .memberName */
-    UA_TYPES_APPLICATIONDESCRIPTION, /* .memberTypeIndex */
-    offsetof(UA_FindServersResponse, serversSize) - offsetof(UA_FindServersResponse, responseHeader) - sizeof(UA_ResponseHeader), /* .padding */
+    UA_TYPENAME("ShutdownReason") /* .memberName */
+    UA_TYPES_LOCALIZEDTEXT, /* .memberTypeIndex */
+    offsetof(UA_ServerStatusDataType, shutdownReason) - offsetof(UA_ServerStatusDataType, secondsTillShutdown) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
-    true, /* .isArray */
+    false, /* .isArray */
     false /* .isOptional */
 },};
 
-/* CreateSessionRequest */
-static UA_DataTypeMember CreateSessionRequest_members[9] = {
+/* Range */
+static UA_DataTypeMember Range_members[2] = {
 {
-    UA_TYPENAME("RequestHeader") /* .memberName */
-    UA_TYPES_REQUESTHEADER, /* .memberTypeIndex */
+    UA_TYPENAME("Low") /* .memberName */
+    UA_TYPES_DOUBLE, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("ClientDescription") /* .memberName */
-    UA_TYPES_APPLICATIONDESCRIPTION, /* .memberTypeIndex */
-    offsetof(UA_CreateSessionRequest, clientDescription) - offsetof(UA_CreateSessionRequest, requestHeader) - sizeof(UA_RequestHeader), /* .padding */
+    UA_TYPENAME("High") /* .memberName */
+    UA_TYPES_DOUBLE, /* .memberTypeIndex */
+    offsetof(UA_Range, high) - offsetof(UA_Range, low) - sizeof(UA_Double), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
-},
+},};
+
+/* EUInformation */
+static UA_DataTypeMember EUInformation_members[4] = {
 {
-    UA_TYPENAME("ServerUri") /* .memberName */
+    UA_TYPENAME("NamespaceUri") /* .memberName */
     UA_TYPES_STRING, /* .memberTypeIndex */
-    offsetof(UA_CreateSessionRequest, serverUri) - offsetof(UA_CreateSessionRequest, clientDescription) - sizeof(UA_ApplicationDescription), /* .padding */
+    0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("EndpointUrl") /* .memberName */
-    UA_TYPES_STRING, /* .memberTypeIndex */
-    offsetof(UA_CreateSessionRequest, endpointUrl) - offsetof(UA_CreateSessionRequest, serverUri) - sizeof(UA_String), /* .padding */
+    UA_TYPENAME("UnitId") /* .memberName */
+    UA_TYPES_INT32, /* .memberTypeIndex */
+    offsetof(UA_EUInformation, unitId) - offsetof(UA_EUInformation, namespaceUri) - sizeof(UA_String), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("SessionName") /* .memberName */
-    UA_TYPES_STRING, /* .memberTypeIndex */
-    offsetof(UA_CreateSessionRequest, sessionName) - offsetof(UA_CreateSessionRequest, endpointUrl) - sizeof(UA_String), /* .padding */
+    UA_TYPENAME("DisplayName") /* .memberName */
+    UA_TYPES_LOCALIZEDTEXT, /* .memberTypeIndex */
+    offsetof(UA_EUInformation, displayName) - offsetof(UA_EUInformation, unitId) - sizeof(UA_Int32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("ClientNonce") /* .memberName */
-    UA_TYPES_BYTESTRING, /* .memberTypeIndex */
-    offsetof(UA_CreateSessionRequest, clientNonce) - offsetof(UA_CreateSessionRequest, sessionName) - sizeof(UA_String), /* .padding */
+    UA_TYPENAME("Description") /* .memberName */
+    UA_TYPES_LOCALIZEDTEXT, /* .memberTypeIndex */
+    offsetof(UA_EUInformation, description) - offsetof(UA_EUInformation, displayName) - sizeof(UA_LocalizedText), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
-},
+},};
+
+/* AxisScaleEnumeration */
+#define AxisScaleEnumeration_members NULL
+
+/* ComplexNumberType */
+static UA_DataTypeMember ComplexNumberType_members[2] = {
 {
-    UA_TYPENAME("ClientCertificate") /* .memberName */
-    UA_TYPES_BYTESTRING, /* .memberTypeIndex */
-    offsetof(UA_CreateSessionRequest, clientCertificate) - offsetof(UA_CreateSessionRequest, clientNonce) - sizeof(UA_ByteString), /* .padding */
+    UA_TYPENAME("Real") /* .memberName */
+    UA_TYPES_FLOAT, /* .memberTypeIndex */
+    0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("RequestedSessionTimeout") /* .memberName */
+    UA_TYPENAME("Imaginary") /* .memberName */
+    UA_TYPES_FLOAT, /* .memberTypeIndex */
+    offsetof(UA_ComplexNumberType, imaginary) - offsetof(UA_ComplexNumberType, real) - sizeof(UA_Float), /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
+    false /* .isOptional */
+},};
+
+/* DoubleComplexNumberType */
+static UA_DataTypeMember DoubleComplexNumberType_members[2] = {
+{
+    UA_TYPENAME("Real") /* .memberName */
     UA_TYPES_DOUBLE, /* .memberTypeIndex */
-    offsetof(UA_CreateSessionRequest, requestedSessionTimeout) - offsetof(UA_CreateSessionRequest, clientCertificate) - sizeof(UA_ByteString), /* .padding */
+    0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("MaxResponseMessageSize") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_CreateSessionRequest, maxResponseMessageSize) - offsetof(UA_CreateSessionRequest, requestedSessionTimeout) - sizeof(UA_Double), /* .padding */
+    UA_TYPENAME("Imaginary") /* .memberName */
+    UA_TYPES_DOUBLE, /* .memberTypeIndex */
+    offsetof(UA_DoubleComplexNumberType, imaginary) - offsetof(UA_DoubleComplexNumberType, real) - sizeof(UA_Double), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },};
 
-/* ContentFilterElement */
-static UA_DataTypeMember ContentFilterElement_members[2] = {
+/* AxisInformation */
+static UA_DataTypeMember AxisInformation_members[5] = {
 {
-    UA_TYPENAME("FilterOperator") /* .memberName */
-    UA_TYPES_FILTEROPERATOR, /* .memberTypeIndex */
+    UA_TYPENAME("EngineeringUnits") /* .memberName */
+    UA_TYPES_EUINFORMATION, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("FilterOperands") /* .memberName */
-    UA_TYPES_EXTENSIONOBJECT, /* .memberTypeIndex */
-    offsetof(UA_ContentFilterElement, filterOperandsSize) - offsetof(UA_ContentFilterElement, filterOperator) - sizeof(UA_FilterOperator), /* .padding */
+    UA_TYPENAME("EURange") /* .memberName */
+    UA_TYPES_RANGE, /* .memberTypeIndex */
+    offsetof(UA_AxisInformation, eURange) - offsetof(UA_AxisInformation, engineeringUnits) - sizeof(UA_EUInformation), /* .padding */
     true, /* .namespaceZero */
-    true, /* .isArray */
+    false, /* .isArray */
     false /* .isOptional */
-},};
-
-/* TranslateBrowsePathsToNodeIdsResponse */
-static UA_DataTypeMember TranslateBrowsePathsToNodeIdsResponse_members[3] = {
+},
 {
-    UA_TYPENAME("ResponseHeader") /* .memberName */
-    UA_TYPES_RESPONSEHEADER, /* .memberTypeIndex */
-    0, /* .padding */
+    UA_TYPENAME("Title") /* .memberName */
+    UA_TYPES_LOCALIZEDTEXT, /* .memberTypeIndex */
+    offsetof(UA_AxisInformation, title) - offsetof(UA_AxisInformation, eURange) - sizeof(UA_Range), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("Results") /* .memberName */
-    UA_TYPES_BROWSEPATHRESULT, /* .memberTypeIndex */
-    offsetof(UA_TranslateBrowsePathsToNodeIdsResponse, resultsSize) - offsetof(UA_TranslateBrowsePathsToNodeIdsResponse, responseHeader) - sizeof(UA_ResponseHeader), /* .padding */
+    UA_TYPENAME("AxisScaleType") /* .memberName */
+    UA_TYPES_AXISSCALEENUMERATION, /* .memberTypeIndex */
+    offsetof(UA_AxisInformation, axisScaleType) - offsetof(UA_AxisInformation, title) - sizeof(UA_LocalizedText), /* .padding */
     true, /* .namespaceZero */
-    true, /* .isArray */
+    false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("DiagnosticInfos") /* .memberName */
-    UA_TYPES_DIAGNOSTICINFO, /* .memberTypeIndex */
-    offsetof(UA_TranslateBrowsePathsToNodeIdsResponse, diagnosticInfosSize) - offsetof(UA_TranslateBrowsePathsToNodeIdsResponse, results) - sizeof(void *), /* .padding */
+    UA_TYPENAME("AxisSteps") /* .memberName */
+    UA_TYPES_DOUBLE, /* .memberTypeIndex */
+    offsetof(UA_AxisInformation, axisStepsSize) - offsetof(UA_AxisInformation, axisScaleType) - sizeof(UA_AxisScaleEnumeration), /* .padding */
     true, /* .namespaceZero */
     true, /* .isArray */
     false /* .isOptional */
 },};
 
-/* BrowseResponse */
-static UA_DataTypeMember BrowseResponse_members[3] = {
+/* XVType */
+static UA_DataTypeMember XVType_members[2] = {
 {
-    UA_TYPENAME("ResponseHeader") /* .memberName */
-    UA_TYPES_RESPONSEHEADER, /* .memberTypeIndex */
+    UA_TYPENAME("X") /* .memberName */
+    UA_TYPES_DOUBLE, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("Results") /* .memberName */
-    UA_TYPES_BROWSERESULT, /* .memberTypeIndex */
-    offsetof(UA_BrowseResponse, resultsSize) - offsetof(UA_BrowseResponse, responseHeader) - sizeof(UA_ResponseHeader), /* .padding */
+    UA_TYPENAME("Value") /* .memberName */
+    UA_TYPES_FLOAT, /* .memberTypeIndex */
+    offsetof(UA_XVType, value) - offsetof(UA_XVType, x) - sizeof(UA_Double), /* .padding */
     true, /* .namespaceZero */
-    true, /* .isArray */
+    false, /* .isArray */
     false /* .isOptional */
-},
+},};
+
+/* EnumDefinition */
+static UA_DataTypeMember EnumDefinition_members[1] = {
 {
-    UA_TYPENAME("DiagnosticInfos") /* .memberName */
-    UA_TYPES_DIAGNOSTICINFO, /* .memberTypeIndex */
-    offsetof(UA_BrowseResponse, diagnosticInfosSize) - offsetof(UA_BrowseResponse, results) - sizeof(void *), /* .padding */
+    UA_TYPENAME("Fields") /* .memberName */
+    UA_TYPES_ENUMFIELD, /* .memberTypeIndex */
+    0, /* .padding */
     true, /* .namespaceZero */
     true, /* .isArray */
     false /* .isOptional */
 },};
 
-/* CreateSessionResponse */
-static UA_DataTypeMember CreateSessionResponse_members[10] = {
+/* ReadEventDetails */
+static UA_DataTypeMember ReadEventDetails_members[4] = {
 {
-    UA_TYPENAME("ResponseHeader") /* .memberName */
-    UA_TYPES_RESPONSEHEADER, /* .memberTypeIndex */
+    UA_TYPENAME("NumValuesPerNode") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("SessionId") /* .memberName */
-    UA_TYPES_NODEID, /* .memberTypeIndex */
-    offsetof(UA_CreateSessionResponse, sessionId) - offsetof(UA_CreateSessionResponse, responseHeader) - sizeof(UA_ResponseHeader), /* .padding */
+    UA_TYPENAME("StartTime") /* .memberName */
+    UA_TYPES_DATETIME, /* .memberTypeIndex */
+    offsetof(UA_ReadEventDetails, startTime) - offsetof(UA_ReadEventDetails, numValuesPerNode) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("AuthenticationToken") /* .memberName */
-    UA_TYPES_NODEID, /* .memberTypeIndex */
-    offsetof(UA_CreateSessionResponse, authenticationToken) - offsetof(UA_CreateSessionResponse, sessionId) - sizeof(UA_NodeId), /* .padding */
+    UA_TYPENAME("EndTime") /* .memberName */
+    UA_TYPES_DATETIME, /* .memberTypeIndex */
+    offsetof(UA_ReadEventDetails, endTime) - offsetof(UA_ReadEventDetails, startTime) - sizeof(UA_DateTime), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("RevisedSessionTimeout") /* .memberName */
-    UA_TYPES_DOUBLE, /* .memberTypeIndex */
-    offsetof(UA_CreateSessionResponse, revisedSessionTimeout) - offsetof(UA_CreateSessionResponse, authenticationToken) - sizeof(UA_NodeId), /* .padding */
+    UA_TYPENAME("Filter") /* .memberName */
+    UA_TYPES_EVENTFILTER, /* .memberTypeIndex */
+    offsetof(UA_ReadEventDetails, filter) - offsetof(UA_ReadEventDetails, endTime) - sizeof(UA_DateTime), /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
+    false /* .isOptional */
+},};
+
+/* ReadProcessedDetails */
+static UA_DataTypeMember ReadProcessedDetails_members[5] = {
+{
+    UA_TYPENAME("StartTime") /* .memberName */
+    UA_TYPES_DATETIME, /* .memberTypeIndex */
+    0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("ServerNonce") /* .memberName */
-    UA_TYPES_BYTESTRING, /* .memberTypeIndex */
-    offsetof(UA_CreateSessionResponse, serverNonce) - offsetof(UA_CreateSessionResponse, revisedSessionTimeout) - sizeof(UA_Double), /* .padding */
+    UA_TYPENAME("EndTime") /* .memberName */
+    UA_TYPES_DATETIME, /* .memberTypeIndex */
+    offsetof(UA_ReadProcessedDetails, endTime) - offsetof(UA_ReadProcessedDetails, startTime) - sizeof(UA_DateTime), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("ServerCertificate") /* .memberName */
-    UA_TYPES_BYTESTRING, /* .memberTypeIndex */
-    offsetof(UA_CreateSessionResponse, serverCertificate) - offsetof(UA_CreateSessionResponse, serverNonce) - sizeof(UA_ByteString), /* .padding */
+    UA_TYPENAME("ProcessingInterval") /* .memberName */
+    UA_TYPES_DOUBLE, /* .memberTypeIndex */
+    offsetof(UA_ReadProcessedDetails, processingInterval) - offsetof(UA_ReadProcessedDetails, endTime) - sizeof(UA_DateTime), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("ServerEndpoints") /* .memberName */
-    UA_TYPES_ENDPOINTDESCRIPTION, /* .memberTypeIndex */
-    offsetof(UA_CreateSessionResponse, serverEndpointsSize) - offsetof(UA_CreateSessionResponse, serverCertificate) - sizeof(UA_ByteString), /* .padding */
+    UA_TYPENAME("AggregateType") /* .memberName */
+    UA_TYPES_NODEID, /* .memberTypeIndex */
+    offsetof(UA_ReadProcessedDetails, aggregateTypeSize) - offsetof(UA_ReadProcessedDetails, processingInterval) - sizeof(UA_Double), /* .padding */
     true, /* .namespaceZero */
     true, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("ServerSoftwareCertificates") /* .memberName */
-    UA_TYPES_SIGNEDSOFTWARECERTIFICATE, /* .memberTypeIndex */
-    offsetof(UA_CreateSessionResponse, serverSoftwareCertificatesSize) - offsetof(UA_CreateSessionResponse, serverEndpoints) - sizeof(void *), /* .padding */
+    UA_TYPENAME("AggregateConfiguration") /* .memberName */
+    UA_TYPES_AGGREGATECONFIGURATION, /* .memberTypeIndex */
+    offsetof(UA_ReadProcessedDetails, aggregateConfiguration) - offsetof(UA_ReadProcessedDetails, aggregateType) - sizeof(void *), /* .padding */
     true, /* .namespaceZero */
-    true, /* .isArray */
+    false, /* .isArray */
+    false /* .isOptional */
+},};
+
+/* ModificationInfo */
+static UA_DataTypeMember ModificationInfo_members[3] = {
+{
+    UA_TYPENAME("ModificationTime") /* .memberName */
+    UA_TYPES_DATETIME, /* .memberTypeIndex */
+    0, /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("ServerSignature") /* .memberName */
-    UA_TYPES_SIGNATUREDATA, /* .memberTypeIndex */
-    offsetof(UA_CreateSessionResponse, serverSignature) - offsetof(UA_CreateSessionResponse, serverSoftwareCertificates) - sizeof(void *), /* .padding */
+    UA_TYPENAME("UpdateType") /* .memberName */
+    UA_TYPES_HISTORYUPDATETYPE, /* .memberTypeIndex */
+    offsetof(UA_ModificationInfo, updateType) - offsetof(UA_ModificationInfo, modificationTime) - sizeof(UA_DateTime), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("MaxRequestMessageSize") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_CreateSessionResponse, maxRequestMessageSize) - offsetof(UA_CreateSessionResponse, serverSignature) - sizeof(UA_SignatureData), /* .padding */
+    UA_TYPENAME("UserName") /* .memberName */
+    UA_TYPES_STRING, /* .memberTypeIndex */
+    offsetof(UA_ModificationInfo, userName) - offsetof(UA_ModificationInfo, updateType) - sizeof(UA_HistoryUpdateType), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },};
 
-/* ContentFilter */
-static UA_DataTypeMember ContentFilter_members[1] = {
+/* HistoryModifiedData */
+static UA_DataTypeMember HistoryModifiedData_members[2] = {
 {
-    UA_TYPENAME("Elements") /* .memberName */
-    UA_TYPES_CONTENTFILTERELEMENT, /* .memberTypeIndex */
+    UA_TYPENAME("DataValues") /* .memberName */
+    UA_TYPES_DATAVALUE, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     true, /* .isArray */
     false /* .isOptional */
-},};
-
-/* GetEndpointsResponse */
-static UA_DataTypeMember GetEndpointsResponse_members[2] = {
+},
 {
-    UA_TYPENAME("ResponseHeader") /* .memberName */
-    UA_TYPES_RESPONSEHEADER, /* .memberTypeIndex */
-    0, /* .padding */
+    UA_TYPENAME("ModificationInfos") /* .memberName */
+    UA_TYPES_MODIFICATIONINFO, /* .memberTypeIndex */
+    offsetof(UA_HistoryModifiedData, modificationInfosSize) - offsetof(UA_HistoryModifiedData, dataValues) - sizeof(void *), /* .padding */
     true, /* .namespaceZero */
-    false, /* .isArray */
+    true, /* .isArray */
     false /* .isOptional */
-},
+},};
+
+/* HistoryEvent */
+static UA_DataTypeMember HistoryEvent_members[1] = {
 {
-    UA_TYPENAME("Endpoints") /* .memberName */
-    UA_TYPES_ENDPOINTDESCRIPTION, /* .memberTypeIndex */
-    offsetof(UA_GetEndpointsResponse, endpointsSize) - offsetof(UA_GetEndpointsResponse, responseHeader) - sizeof(UA_ResponseHeader), /* .padding */
+    UA_TYPENAME("Events") /* .memberName */
+    UA_TYPES_HISTORYEVENTFIELDLIST, /* .memberTypeIndex */
+    0, /* .padding */
     true, /* .namespaceZero */
     true, /* .isArray */
     false /* .isOptional */
 },};
 
-/* EventFilter */
-static UA_DataTypeMember EventFilter_members[2] = {
+/* DataChangeNotification */
+static UA_DataTypeMember DataChangeNotification_members[2] = {
 {
-    UA_TYPENAME("SelectClauses") /* .memberName */
-    UA_TYPES_SIMPLEATTRIBUTEOPERAND, /* .memberTypeIndex */
+    UA_TYPENAME("MonitoredItems") /* .memberName */
+    UA_TYPES_MONITOREDITEMNOTIFICATION, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
     true, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("WhereClause") /* .memberName */
-    UA_TYPES_CONTENTFILTER, /* .memberTypeIndex */
-    offsetof(UA_EventFilter, whereClause) - offsetof(UA_EventFilter, selectClauses) - sizeof(void *), /* .padding */
+    UA_TYPENAME("DiagnosticInfos") /* .memberName */
+    UA_TYPES_DIAGNOSTICINFO, /* .memberTypeIndex */
+    offsetof(UA_DataChangeNotification, diagnosticInfosSize) - offsetof(UA_DataChangeNotification, monitoredItems) - sizeof(void *), /* .padding */
     true, /* .namespaceZero */
-    false, /* .isArray */
+    true, /* .isArray */
+    false /* .isOptional */
+},};
+
+/* EventNotificationList */
+static UA_DataTypeMember EventNotificationList_members[1] = {
+{
+    UA_TYPENAME("Events") /* .memberName */
+    UA_TYPES_EVENTFIELDLIST, /* .memberTypeIndex */
+    0, /* .padding */
+    true, /* .namespaceZero */
+    true, /* .isArray */
     false /* .isOptional */
 },};
 const UA_DataType UA_TYPES[UA_TYPES_COUNT] = {
@@ -15770,57 +16542,70 @@ const UA_DataType UA_TYPES[UA_TYPES_COUNT] = {
     0, /* .binaryEncodingId */
     DiagnosticInfo_members /* .members */
 },
-/* ViewAttributes */
+/* NodeClass */
 {
-    UA_TYPENAME("ViewAttributes") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {373}}, /* .typeId */
-    sizeof(UA_ViewAttributes), /* .memSize */
-    UA_TYPES_VIEWATTRIBUTES, /* .typeIndex */
-    UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
-    false, /* .pointerFree */
-    false, /* .overlayable */
-    7, /* .membersSize */
-    375, /* .binaryEncodingId */
-    ViewAttributes_members /* .members */
+    UA_TYPENAME("NodeClass") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {257}}, /* .typeId */
+    sizeof(UA_NodeClass), /* .memSize */
+    UA_TYPES_INT32, /* .typeIndex */
+    UA_DATATYPEKIND_ENUM, /* .typeKind */
+    true, /* .pointerFree */
+    UA_BINARY_OVERLAYABLE_INTEGER, /* .overlayable */
+    0, /* .membersSize */
+    0, /* .binaryEncodingId */
+    NodeClass_members /* .members */
 },
-/* XVType */
+/* StructureType */
 {
-    UA_TYPENAME("XVType") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {12080}}, /* .typeId */
-    sizeof(UA_XVType), /* .memSize */
-    UA_TYPES_XVTYPE, /* .typeIndex */
-    UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
+    UA_TYPENAME("StructureType") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {98}}, /* .typeId */
+    sizeof(UA_StructureType), /* .memSize */
+    UA_TYPES_INT32, /* .typeIndex */
+    UA_DATATYPEKIND_ENUM, /* .typeKind */
     true, /* .pointerFree */
+    UA_BINARY_OVERLAYABLE_INTEGER, /* .overlayable */
+    0, /* .membersSize */
+    0, /* .binaryEncodingId */
+    StructureType_members /* .members */
+},
+/* StructureField */
+{
+    UA_TYPENAME("StructureField") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {101}}, /* .typeId */
+    sizeof(UA_StructureField), /* .memSize */
+    UA_TYPES_STRUCTUREFIELD, /* .typeIndex */
+    UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
+    false, /* .pointerFree */
     false, /* .overlayable */
-    2, /* .membersSize */
-    12090, /* .binaryEncodingId */
-    XVType_members /* .members */
+    7, /* .membersSize */
+    14844, /* .binaryEncodingId */
+    StructureField_members /* .members */
 },
-/* ElementOperand */
+/* StructureDefinition */
 {
-    UA_TYPENAME("ElementOperand") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {592}}, /* .typeId */
-    sizeof(UA_ElementOperand), /* .memSize */
-    UA_TYPES_ELEMENTOPERAND, /* .typeIndex */
+    UA_TYPENAME("StructureDefinition") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {99}}, /* .typeId */
+    sizeof(UA_StructureDefinition), /* .memSize */
+    UA_TYPES_STRUCTUREDEFINITION, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
-    true, /* .pointerFree */
+    false, /* .pointerFree */
     false, /* .overlayable */
-    1, /* .membersSize */
-    594, /* .binaryEncodingId */
-    ElementOperand_members /* .members */
+    4, /* .membersSize */
+    122, /* .binaryEncodingId */
+    StructureDefinition_members /* .members */
 },
-/* VariableAttributes */
+/* Argument */
 {
-    UA_TYPENAME("VariableAttributes") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {355}}, /* .typeId */
-    sizeof(UA_VariableAttributes), /* .memSize */
-    UA_TYPES_VARIABLEATTRIBUTES, /* .typeIndex */
+    UA_TYPENAME("Argument") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {296}}, /* .typeId */
+    sizeof(UA_Argument), /* .memSize */
+    UA_TYPES_ARGUMENT, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    13, /* .membersSize */
-    357, /* .binaryEncodingId */
-    VariableAttributes_members /* .members */
+    5, /* .membersSize */
+    298, /* .binaryEncodingId */
+    Argument_members /* .members */
 },
 /* EnumValueType */
 {
@@ -15835,96 +16620,31 @@ const UA_DataType UA_TYPES[UA_TYPES_COUNT] = {
     8251, /* .binaryEncodingId */
     EnumValueType_members /* .members */
 },
-/* EventFieldList */
-{
-    UA_TYPENAME("EventFieldList") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {917}}, /* .typeId */
-    sizeof(UA_EventFieldList), /* .memSize */
-    UA_TYPES_EVENTFIELDLIST, /* .typeIndex */
-    UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
-    false, /* .pointerFree */
-    false, /* .overlayable */
-    2, /* .membersSize */
-    919, /* .binaryEncodingId */
-    EventFieldList_members /* .members */
-},
-/* MonitoredItemCreateResult */
-{
-    UA_TYPENAME("MonitoredItemCreateResult") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {746}}, /* .typeId */
-    sizeof(UA_MonitoredItemCreateResult), /* .memSize */
-    UA_TYPES_MONITOREDITEMCREATERESULT, /* .typeIndex */
-    UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
-    false, /* .pointerFree */
-    false, /* .overlayable */
-    5, /* .membersSize */
-    748, /* .binaryEncodingId */
-    MonitoredItemCreateResult_members /* .members */
-},
-/* EUInformation */
+/* EnumField */
 {
-    UA_TYPENAME("EUInformation") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {887}}, /* .typeId */
-    sizeof(UA_EUInformation), /* .memSize */
-    UA_TYPES_EUINFORMATION, /* .typeIndex */
+    UA_TYPENAME("EnumField") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {102}}, /* .typeId */
+    sizeof(UA_EnumField), /* .memSize */
+    UA_TYPES_ENUMFIELD, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
     4, /* .membersSize */
-    889, /* .binaryEncodingId */
-    EUInformation_members /* .members */
-},
-/* ServerDiagnosticsSummaryDataType */
-{
-    UA_TYPENAME("ServerDiagnosticsSummaryDataType") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {859}}, /* .typeId */
-    sizeof(UA_ServerDiagnosticsSummaryDataType), /* .memSize */
-    UA_TYPES_SERVERDIAGNOSTICSSUMMARYDATATYPE, /* .typeIndex */
-    UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
-    true, /* .pointerFree */
-    false, /* .overlayable */
-    12, /* .membersSize */
-    861, /* .binaryEncodingId */
-    ServerDiagnosticsSummaryDataType_members /* .members */
-},
-/* ContentFilterElementResult */
-{
-    UA_TYPENAME("ContentFilterElementResult") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {604}}, /* .typeId */
-    sizeof(UA_ContentFilterElementResult), /* .memSize */
-    UA_TYPES_CONTENTFILTERELEMENTRESULT, /* .typeIndex */
-    UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
-    false, /* .pointerFree */
-    false, /* .overlayable */
-    3, /* .membersSize */
-    606, /* .binaryEncodingId */
-    ContentFilterElementResult_members /* .members */
+    14845, /* .binaryEncodingId */
+    EnumField_members /* .members */
 },
-/* LiteralOperand */
+/* Duration */
 {
-    UA_TYPENAME("LiteralOperand") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {595}}, /* .typeId */
-    sizeof(UA_LiteralOperand), /* .memSize */
-    UA_TYPES_LITERALOPERAND, /* .typeIndex */
-    UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
+    UA_TYPENAME("Duration") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {290}}, /* .typeId */
+    sizeof(UA_Duration), /* .memSize */
+    UA_TYPES_DURATION, /* .typeIndex */
+    UA_DATATYPEKIND_DOUBLE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    1, /* .membersSize */
-    597, /* .binaryEncodingId */
-    LiteralOperand_members /* .members */
-},
-/* MessageSecurityMode */
-{
-    UA_TYPENAME("MessageSecurityMode") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {302}}, /* .typeId */
-    sizeof(UA_MessageSecurityMode), /* .memSize */
-    UA_TYPES_INT32, /* .typeIndex */
-    UA_DATATYPEKIND_ENUM, /* .typeKind */
-    true, /* .pointerFree */
-    UA_BINARY_OVERLAYABLE_INTEGER, /* .overlayable */
     0, /* .membersSize */
     0, /* .binaryEncodingId */
-    MessageSecurityMode_members /* .members */
+    Duration_members /* .members */
 },
 /* UtcTime */
 {
@@ -15939,57 +16659,70 @@ const UA_DataType UA_TYPES[UA_TYPES_COUNT] = {
     0, /* .binaryEncodingId */
     UtcTime_members /* .members */
 },
-/* UserIdentityToken */
-{
-    UA_TYPENAME("UserIdentityToken") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {316}}, /* .typeId */
-    sizeof(UA_UserIdentityToken), /* .memSize */
-    UA_TYPES_USERIDENTITYTOKEN, /* .typeIndex */
-    UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
-    false, /* .pointerFree */
-    false, /* .overlayable */
-    1, /* .membersSize */
-    318, /* .binaryEncodingId */
-    UserIdentityToken_members /* .members */
-},
-/* X509IdentityToken */
+/* LocaleId */
 {
-    UA_TYPENAME("X509IdentityToken") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {325}}, /* .typeId */
-    sizeof(UA_X509IdentityToken), /* .memSize */
-    UA_TYPES_X509IDENTITYTOKEN, /* .typeIndex */
-    UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
+    UA_TYPENAME("LocaleId") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {295}}, /* .typeId */
+    sizeof(UA_LocaleId), /* .memSize */
+    UA_TYPES_LOCALEID, /* .typeIndex */
+    UA_DATATYPEKIND_STRING, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    2, /* .membersSize */
-    327, /* .binaryEncodingId */
-    X509IdentityToken_members /* .members */
+    0, /* .membersSize */
+    0, /* .binaryEncodingId */
+    LocaleId_members /* .members */
 },
-/* MonitoredItemNotification */
+/* TimeZoneDataType */
 {
-    UA_TYPENAME("MonitoredItemNotification") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {806}}, /* .typeId */
-    sizeof(UA_MonitoredItemNotification), /* .memSize */
-    UA_TYPES_MONITOREDITEMNOTIFICATION, /* .typeIndex */
+    UA_TYPENAME("TimeZoneDataType") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {8912}}, /* .typeId */
+    sizeof(UA_TimeZoneDataType), /* .memSize */
+    UA_TYPES_TIMEZONEDATATYPE, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
-    false, /* .pointerFree */
+    true, /* .pointerFree */
     false, /* .overlayable */
     2, /* .membersSize */
-    808, /* .binaryEncodingId */
-    MonitoredItemNotification_members /* .members */
+    8917, /* .binaryEncodingId */
+    TimeZoneDataType_members /* .members */
 },
-/* StructureType */
+/* ApplicationType */
 {
-    UA_TYPENAME("StructureType") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {98}}, /* .typeId */
-    sizeof(UA_StructureType), /* .memSize */
+    UA_TYPENAME("ApplicationType") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {307}}, /* .typeId */
+    sizeof(UA_ApplicationType), /* .memSize */
     UA_TYPES_INT32, /* .typeIndex */
     UA_DATATYPEKIND_ENUM, /* .typeKind */
     true, /* .pointerFree */
     UA_BINARY_OVERLAYABLE_INTEGER, /* .overlayable */
     0, /* .membersSize */
     0, /* .binaryEncodingId */
-    StructureType_members /* .members */
+    ApplicationType_members /* .members */
+},
+/* ApplicationDescription */
+{
+    UA_TYPENAME("ApplicationDescription") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {308}}, /* .typeId */
+    sizeof(UA_ApplicationDescription), /* .memSize */
+    UA_TYPES_APPLICATIONDESCRIPTION, /* .typeIndex */
+    UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
+    false, /* .pointerFree */
+    false, /* .overlayable */
+    7, /* .membersSize */
+    310, /* .binaryEncodingId */
+    ApplicationDescription_members /* .members */
+},
+/* RequestHeader */
+{
+    UA_TYPENAME("RequestHeader") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {389}}, /* .typeId */
+    sizeof(UA_RequestHeader), /* .memSize */
+    UA_TYPES_REQUESTHEADER, /* .typeIndex */
+    UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
+    false, /* .pointerFree */
+    false, /* .overlayable */
+    7, /* .membersSize */
+    391, /* .binaryEncodingId */
+    RequestHeader_members /* .members */
 },
 /* ResponseHeader */
 {
@@ -16004,161 +16737,174 @@ const UA_DataType UA_TYPES[UA_TYPES_COUNT] = {
     394, /* .binaryEncodingId */
     ResponseHeader_members /* .members */
 },
-/* SignatureData */
+/* ServiceFault */
 {
-    UA_TYPENAME("SignatureData") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {456}}, /* .typeId */
-    sizeof(UA_SignatureData), /* .memSize */
-    UA_TYPES_SIGNATUREDATA, /* .typeIndex */
+    UA_TYPENAME("ServiceFault") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {395}}, /* .typeId */
+    sizeof(UA_ServiceFault), /* .memSize */
+    UA_TYPES_SERVICEFAULT, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    2, /* .membersSize */
-    458, /* .binaryEncodingId */
-    SignatureData_members /* .members */
+    1, /* .membersSize */
+    397, /* .binaryEncodingId */
+    ServiceFault_members /* .members */
 },
-/* ModifySubscriptionResponse */
+/* FindServersRequest */
 {
-    UA_TYPENAME("ModifySubscriptionResponse") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {794}}, /* .typeId */
-    sizeof(UA_ModifySubscriptionResponse), /* .memSize */
-    UA_TYPES_MODIFYSUBSCRIPTIONRESPONSE, /* .typeIndex */
+    UA_TYPENAME("FindServersRequest") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {420}}, /* .typeId */
+    sizeof(UA_FindServersRequest), /* .memSize */
+    UA_TYPES_FINDSERVERSREQUEST, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
     4, /* .membersSize */
-    796, /* .binaryEncodingId */
-    ModifySubscriptionResponse_members /* .members */
+    422, /* .binaryEncodingId */
+    FindServersRequest_members /* .members */
 },
-/* NodeAttributes */
+/* FindServersResponse */
 {
-    UA_TYPENAME("NodeAttributes") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {349}}, /* .typeId */
-    sizeof(UA_NodeAttributes), /* .memSize */
-    UA_TYPES_NODEATTRIBUTES, /* .typeIndex */
+    UA_TYPENAME("FindServersResponse") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {423}}, /* .typeId */
+    sizeof(UA_FindServersResponse), /* .memSize */
+    UA_TYPES_FINDSERVERSRESPONSE, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    5, /* .membersSize */
-    351, /* .binaryEncodingId */
-    NodeAttributes_members /* .members */
+    2, /* .membersSize */
+    425, /* .binaryEncodingId */
+    FindServersResponse_members /* .members */
 },
-/* ActivateSessionResponse */
+/* MessageSecurityMode */
 {
-    UA_TYPENAME("ActivateSessionResponse") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {468}}, /* .typeId */
-    sizeof(UA_ActivateSessionResponse), /* .memSize */
-    UA_TYPES_ACTIVATESESSIONRESPONSE, /* .typeIndex */
+    UA_TYPENAME("MessageSecurityMode") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {302}}, /* .typeId */
+    sizeof(UA_MessageSecurityMode), /* .memSize */
+    UA_TYPES_INT32, /* .typeIndex */
+    UA_DATATYPEKIND_ENUM, /* .typeKind */
+    true, /* .pointerFree */
+    UA_BINARY_OVERLAYABLE_INTEGER, /* .overlayable */
+    0, /* .membersSize */
+    0, /* .binaryEncodingId */
+    MessageSecurityMode_members /* .members */
+},
+/* UserTokenType */
+{
+    UA_TYPENAME("UserTokenType") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {303}}, /* .typeId */
+    sizeof(UA_UserTokenType), /* .memSize */
+    UA_TYPES_INT32, /* .typeIndex */
+    UA_DATATYPEKIND_ENUM, /* .typeKind */
+    true, /* .pointerFree */
+    UA_BINARY_OVERLAYABLE_INTEGER, /* .overlayable */
+    0, /* .membersSize */
+    0, /* .binaryEncodingId */
+    UserTokenType_members /* .members */
+},
+/* UserTokenPolicy */
+{
+    UA_TYPENAME("UserTokenPolicy") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {304}}, /* .typeId */
+    sizeof(UA_UserTokenPolicy), /* .memSize */
+    UA_TYPES_USERTOKENPOLICY, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    4, /* .membersSize */
-    470, /* .binaryEncodingId */
-    ActivateSessionResponse_members /* .members */
+    5, /* .membersSize */
+    306, /* .binaryEncodingId */
+    UserTokenPolicy_members /* .members */
 },
-/* EnumField */
+/* EndpointDescription */
 {
-    UA_TYPENAME("EnumField") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {102}}, /* .typeId */
-    sizeof(UA_EnumField), /* .memSize */
-    UA_TYPES_ENUMFIELD, /* .typeIndex */
+    UA_TYPENAME("EndpointDescription") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {312}}, /* .typeId */
+    sizeof(UA_EndpointDescription), /* .memSize */
+    UA_TYPES_ENDPOINTDESCRIPTION, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    4, /* .membersSize */
-    14845, /* .binaryEncodingId */
-    EnumField_members /* .members */
+    8, /* .membersSize */
+    314, /* .binaryEncodingId */
+    EndpointDescription_members /* .members */
 },
-/* VariableTypeAttributes */
+/* GetEndpointsRequest */
 {
-    UA_TYPENAME("VariableTypeAttributes") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {364}}, /* .typeId */
-    sizeof(UA_VariableTypeAttributes), /* .memSize */
-    UA_TYPES_VARIABLETYPEATTRIBUTES, /* .typeIndex */
+    UA_TYPENAME("GetEndpointsRequest") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {426}}, /* .typeId */
+    sizeof(UA_GetEndpointsRequest), /* .memSize */
+    UA_TYPES_GETENDPOINTSREQUEST, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    10, /* .membersSize */
-    366, /* .binaryEncodingId */
-    VariableTypeAttributes_members /* .members */
+    4, /* .membersSize */
+    428, /* .binaryEncodingId */
+    GetEndpointsRequest_members /* .members */
 },
-/* CallMethodResult */
+/* GetEndpointsResponse */
 {
-    UA_TYPENAME("CallMethodResult") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {707}}, /* .typeId */
-    sizeof(UA_CallMethodResult), /* .memSize */
-    UA_TYPES_CALLMETHODRESULT, /* .typeIndex */
+    UA_TYPENAME("GetEndpointsResponse") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {429}}, /* .typeId */
+    sizeof(UA_GetEndpointsResponse), /* .memSize */
+    UA_TYPES_GETENDPOINTSRESPONSE, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    4, /* .membersSize */
-    709, /* .binaryEncodingId */
-    CallMethodResult_members /* .members */
+    2, /* .membersSize */
+    431, /* .binaryEncodingId */
+    GetEndpointsResponse_members /* .members */
 },
-/* MonitoringMode */
+/* SecurityTokenRequestType */
 {
-    UA_TYPENAME("MonitoringMode") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {716}}, /* .typeId */
-    sizeof(UA_MonitoringMode), /* .memSize */
+    UA_TYPENAME("SecurityTokenRequestType") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {315}}, /* .typeId */
+    sizeof(UA_SecurityTokenRequestType), /* .memSize */
     UA_TYPES_INT32, /* .typeIndex */
     UA_DATATYPEKIND_ENUM, /* .typeKind */
     true, /* .pointerFree */
     UA_BINARY_OVERLAYABLE_INTEGER, /* .overlayable */
     0, /* .membersSize */
     0, /* .binaryEncodingId */
-    MonitoringMode_members /* .members */
+    SecurityTokenRequestType_members /* .members */
 },
-/* SetMonitoringModeResponse */
+/* ChannelSecurityToken */
 {
-    UA_TYPENAME("SetMonitoringModeResponse") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {770}}, /* .typeId */
-    sizeof(UA_SetMonitoringModeResponse), /* .memSize */
-    UA_TYPES_SETMONITORINGMODERESPONSE, /* .typeIndex */
+    UA_TYPENAME("ChannelSecurityToken") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {441}}, /* .typeId */
+    sizeof(UA_ChannelSecurityToken), /* .memSize */
+    UA_TYPES_CHANNELSECURITYTOKEN, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
-    false, /* .pointerFree */
-    false, /* .overlayable */
-    3, /* .membersSize */
-    772, /* .binaryEncodingId */
-    SetMonitoringModeResponse_members /* .members */
-},
-/* BrowseResultMask */
-{
-    UA_TYPENAME("BrowseResultMask") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {517}}, /* .typeId */
-    sizeof(UA_BrowseResultMask), /* .memSize */
-    UA_TYPES_INT32, /* .typeIndex */
-    UA_DATATYPEKIND_ENUM, /* .typeKind */
     true, /* .pointerFree */
-    UA_BINARY_OVERLAYABLE_INTEGER, /* .overlayable */
-    0, /* .membersSize */
-    0, /* .binaryEncodingId */
-    BrowseResultMask_members /* .members */
+    false, /* .overlayable */
+    4, /* .membersSize */
+    443, /* .binaryEncodingId */
+    ChannelSecurityToken_members /* .members */
 },
-/* RequestHeader */
+/* OpenSecureChannelRequest */
 {
-    UA_TYPENAME("RequestHeader") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {389}}, /* .typeId */
-    sizeof(UA_RequestHeader), /* .memSize */
-    UA_TYPES_REQUESTHEADER, /* .typeIndex */
+    UA_TYPENAME("OpenSecureChannelRequest") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {444}}, /* .typeId */
+    sizeof(UA_OpenSecureChannelRequest), /* .memSize */
+    UA_TYPES_OPENSECURECHANNELREQUEST, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    7, /* .membersSize */
-    391, /* .binaryEncodingId */
-    RequestHeader_members /* .members */
+    6, /* .membersSize */
+    446, /* .binaryEncodingId */
+    OpenSecureChannelRequest_members /* .members */
 },
-/* MonitoredItemModifyResult */
+/* OpenSecureChannelResponse */
 {
-    UA_TYPENAME("MonitoredItemModifyResult") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {758}}, /* .typeId */
-    sizeof(UA_MonitoredItemModifyResult), /* .memSize */
-    UA_TYPES_MONITOREDITEMMODIFYRESULT, /* .typeIndex */
+    UA_TYPENAME("OpenSecureChannelResponse") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {447}}, /* .typeId */
+    sizeof(UA_OpenSecureChannelResponse), /* .memSize */
+    UA_TYPES_OPENSECURECHANNELRESPONSE, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
     4, /* .membersSize */
-    760, /* .binaryEncodingId */
-    MonitoredItemModifyResult_members /* .members */
+    449, /* .binaryEncodingId */
+    OpenSecureChannelResponse_members /* .members */
 },
 /* CloseSecureChannelRequest */
 {
@@ -16173,148 +16919,174 @@ const UA_DataType UA_TYPES[UA_TYPES_COUNT] = {
     452, /* .binaryEncodingId */
     CloseSecureChannelRequest_members /* .members */
 },
-/* NotificationMessage */
+/* CloseSecureChannelResponse */
 {
-    UA_TYPENAME("NotificationMessage") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {803}}, /* .typeId */
-    sizeof(UA_NotificationMessage), /* .memSize */
-    UA_TYPES_NOTIFICATIONMESSAGE, /* .typeIndex */
+    UA_TYPENAME("CloseSecureChannelResponse") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {453}}, /* .typeId */
+    sizeof(UA_CloseSecureChannelResponse), /* .memSize */
+    UA_TYPES_CLOSESECURECHANNELRESPONSE, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    3, /* .membersSize */
-    805, /* .binaryEncodingId */
-    NotificationMessage_members /* .members */
+    1, /* .membersSize */
+    455, /* .binaryEncodingId */
+    CloseSecureChannelResponse_members /* .members */
 },
-/* CreateSubscriptionResponse */
+/* SignedSoftwareCertificate */
 {
-    UA_TYPENAME("CreateSubscriptionResponse") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {788}}, /* .typeId */
-    sizeof(UA_CreateSubscriptionResponse), /* .memSize */
-    UA_TYPES_CREATESUBSCRIPTIONRESPONSE, /* .typeIndex */
+    UA_TYPENAME("SignedSoftwareCertificate") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {344}}, /* .typeId */
+    sizeof(UA_SignedSoftwareCertificate), /* .memSize */
+    UA_TYPES_SIGNEDSOFTWARECERTIFICATE, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    5, /* .membersSize */
-    790, /* .binaryEncodingId */
-    CreateSubscriptionResponse_members /* .members */
+    2, /* .membersSize */
+    346, /* .binaryEncodingId */
+    SignedSoftwareCertificate_members /* .members */
 },
-/* EnumDefinition */
+/* SignatureData */
 {
-    UA_TYPENAME("EnumDefinition") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {100}}, /* .typeId */
-    sizeof(UA_EnumDefinition), /* .memSize */
-    UA_TYPES_ENUMDEFINITION, /* .typeIndex */
+    UA_TYPENAME("SignatureData") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {456}}, /* .typeId */
+    sizeof(UA_SignatureData), /* .memSize */
+    UA_TYPES_SIGNATUREDATA, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    1, /* .membersSize */
-    123, /* .binaryEncodingId */
-    EnumDefinition_members /* .members */
+    2, /* .membersSize */
+    458, /* .binaryEncodingId */
+    SignatureData_members /* .members */
 },
-/* AxisScaleEnumeration */
+/* CreateSessionRequest */
 {
-    UA_TYPENAME("AxisScaleEnumeration") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {12077}}, /* .typeId */
-    sizeof(UA_AxisScaleEnumeration), /* .memSize */
-    UA_TYPES_INT32, /* .typeIndex */
-    UA_DATATYPEKIND_ENUM, /* .typeKind */
-    true, /* .pointerFree */
-    UA_BINARY_OVERLAYABLE_INTEGER, /* .overlayable */
-    0, /* .membersSize */
-    0, /* .binaryEncodingId */
-    AxisScaleEnumeration_members /* .members */
+    UA_TYPENAME("CreateSessionRequest") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {459}}, /* .typeId */
+    sizeof(UA_CreateSessionRequest), /* .memSize */
+    UA_TYPES_CREATESESSIONREQUEST, /* .typeIndex */
+    UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
+    false, /* .pointerFree */
+    false, /* .overlayable */
+    9, /* .membersSize */
+    461, /* .binaryEncodingId */
+    CreateSessionRequest_members /* .members */
 },
-/* BrowseDirection */
+/* CreateSessionResponse */
 {
-    UA_TYPENAME("BrowseDirection") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {510}}, /* .typeId */
-    sizeof(UA_BrowseDirection), /* .memSize */
-    UA_TYPES_INT32, /* .typeIndex */
-    UA_DATATYPEKIND_ENUM, /* .typeKind */
-    true, /* .pointerFree */
-    UA_BINARY_OVERLAYABLE_INTEGER, /* .overlayable */
-    0, /* .membersSize */
-    0, /* .binaryEncodingId */
-    BrowseDirection_members /* .members */
+    UA_TYPENAME("CreateSessionResponse") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {462}}, /* .typeId */
+    sizeof(UA_CreateSessionResponse), /* .memSize */
+    UA_TYPES_CREATESESSIONRESPONSE, /* .typeIndex */
+    UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
+    false, /* .pointerFree */
+    false, /* .overlayable */
+    10, /* .membersSize */
+    464, /* .binaryEncodingId */
+    CreateSessionResponse_members /* .members */
 },
-/* CallMethodRequest */
+/* UserIdentityToken */
 {
-    UA_TYPENAME("CallMethodRequest") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {704}}, /* .typeId */
-    sizeof(UA_CallMethodRequest), /* .memSize */
-    UA_TYPES_CALLMETHODREQUEST, /* .typeIndex */
+    UA_TYPENAME("UserIdentityToken") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {316}}, /* .typeId */
+    sizeof(UA_UserIdentityToken), /* .memSize */
+    UA_TYPES_USERIDENTITYTOKEN, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    3, /* .membersSize */
-    706, /* .binaryEncodingId */
-    CallMethodRequest_members /* .members */
+    1, /* .membersSize */
+    318, /* .binaryEncodingId */
+    UserIdentityToken_members /* .members */
 },
-/* ReadResponse */
+/* AnonymousIdentityToken */
 {
-    UA_TYPENAME("ReadResponse") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {632}}, /* .typeId */
-    sizeof(UA_ReadResponse), /* .memSize */
-    UA_TYPES_READRESPONSE, /* .typeIndex */
+    UA_TYPENAME("AnonymousIdentityToken") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {319}}, /* .typeId */
+    sizeof(UA_AnonymousIdentityToken), /* .memSize */
+    UA_TYPES_ANONYMOUSIDENTITYTOKEN, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    3, /* .membersSize */
-    634, /* .binaryEncodingId */
-    ReadResponse_members /* .members */
+    1, /* .membersSize */
+    321, /* .binaryEncodingId */
+    AnonymousIdentityToken_members /* .members */
 },
-/* TimestampsToReturn */
+/* UserNameIdentityToken */
 {
-    UA_TYPENAME("TimestampsToReturn") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {625}}, /* .typeId */
-    sizeof(UA_TimestampsToReturn), /* .memSize */
-    UA_TYPES_INT32, /* .typeIndex */
-    UA_DATATYPEKIND_ENUM, /* .typeKind */
-    true, /* .pointerFree */
-    UA_BINARY_OVERLAYABLE_INTEGER, /* .overlayable */
-    0, /* .membersSize */
-    0, /* .binaryEncodingId */
-    TimestampsToReturn_members /* .members */
+    UA_TYPENAME("UserNameIdentityToken") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {322}}, /* .typeId */
+    sizeof(UA_UserNameIdentityToken), /* .memSize */
+    UA_TYPES_USERNAMEIDENTITYTOKEN, /* .typeIndex */
+    UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
+    false, /* .pointerFree */
+    false, /* .overlayable */
+    4, /* .membersSize */
+    324, /* .binaryEncodingId */
+    UserNameIdentityToken_members /* .members */
 },
-/* NodeClass */
+/* X509IdentityToken */
 {
-    UA_TYPENAME("NodeClass") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {257}}, /* .typeId */
-    sizeof(UA_NodeClass), /* .memSize */
-    UA_TYPES_INT32, /* .typeIndex */
-    UA_DATATYPEKIND_ENUM, /* .typeKind */
-    true, /* .pointerFree */
-    UA_BINARY_OVERLAYABLE_INTEGER, /* .overlayable */
-    0, /* .membersSize */
-    0, /* .binaryEncodingId */
-    NodeClass_members /* .members */
+    UA_TYPENAME("X509IdentityToken") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {325}}, /* .typeId */
+    sizeof(UA_X509IdentityToken), /* .memSize */
+    UA_TYPES_X509IDENTITYTOKEN, /* .typeIndex */
+    UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
+    false, /* .pointerFree */
+    false, /* .overlayable */
+    2, /* .membersSize */
+    327, /* .binaryEncodingId */
+    X509IdentityToken_members /* .members */
 },
-/* ObjectTypeAttributes */
+/* IssuedIdentityToken */
 {
-    UA_TYPENAME("ObjectTypeAttributes") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {361}}, /* .typeId */
-    sizeof(UA_ObjectTypeAttributes), /* .memSize */
-    UA_TYPES_OBJECTTYPEATTRIBUTES, /* .typeIndex */
+    UA_TYPENAME("IssuedIdentityToken") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {938}}, /* .typeId */
+    sizeof(UA_IssuedIdentityToken), /* .memSize */
+    UA_TYPES_ISSUEDIDENTITYTOKEN, /* .typeIndex */
+    UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
+    false, /* .pointerFree */
+    false, /* .overlayable */
+    3, /* .membersSize */
+    940, /* .binaryEncodingId */
+    IssuedIdentityToken_members /* .members */
+},
+/* ActivateSessionRequest */
+{
+    UA_TYPENAME("ActivateSessionRequest") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {465}}, /* .typeId */
+    sizeof(UA_ActivateSessionRequest), /* .memSize */
+    UA_TYPES_ACTIVATESESSIONREQUEST, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
     6, /* .membersSize */
-    363, /* .binaryEncodingId */
-    ObjectTypeAttributes_members /* .members */
+    467, /* .binaryEncodingId */
+    ActivateSessionRequest_members /* .members */
 },
-/* SecurityTokenRequestType */
+/* ActivateSessionResponse */
 {
-    UA_TYPENAME("SecurityTokenRequestType") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {315}}, /* .typeId */
-    sizeof(UA_SecurityTokenRequestType), /* .memSize */
-    UA_TYPES_INT32, /* .typeIndex */
-    UA_DATATYPEKIND_ENUM, /* .typeKind */
-    true, /* .pointerFree */
-    UA_BINARY_OVERLAYABLE_INTEGER, /* .overlayable */
-    0, /* .membersSize */
-    0, /* .binaryEncodingId */
-    SecurityTokenRequestType_members /* .members */
+    UA_TYPENAME("ActivateSessionResponse") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {468}}, /* .typeId */
+    sizeof(UA_ActivateSessionResponse), /* .memSize */
+    UA_TYPES_ACTIVATESESSIONRESPONSE, /* .typeIndex */
+    UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
+    false, /* .pointerFree */
+    false, /* .overlayable */
+    4, /* .membersSize */
+    470, /* .binaryEncodingId */
+    ActivateSessionResponse_members /* .members */
+},
+/* CloseSessionRequest */
+{
+    UA_TYPENAME("CloseSessionRequest") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {471}}, /* .typeId */
+    sizeof(UA_CloseSessionRequest), /* .memSize */
+    UA_TYPES_CLOSESESSIONREQUEST, /* .typeIndex */
+    UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
+    false, /* .pointerFree */
+    false, /* .overlayable */
+    2, /* .membersSize */
+    473, /* .binaryEncodingId */
+    CloseSessionRequest_members /* .members */
 },
 /* CloseSessionResponse */
 {
@@ -16329,135 +17101,148 @@ const UA_DataType UA_TYPES[UA_TYPES_COUNT] = {
     476, /* .binaryEncodingId */
     CloseSessionResponse_members /* .members */
 },
-/* SetPublishingModeRequest */
+/* NodeAttributesMask */
 {
-    UA_TYPENAME("SetPublishingModeRequest") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {797}}, /* .typeId */
-    sizeof(UA_SetPublishingModeRequest), /* .memSize */
-    UA_TYPES_SETPUBLISHINGMODEREQUEST, /* .typeIndex */
+    UA_TYPENAME("NodeAttributesMask") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {348}}, /* .typeId */
+    sizeof(UA_NodeAttributesMask), /* .memSize */
+    UA_TYPES_INT32, /* .typeIndex */
+    UA_DATATYPEKIND_ENUM, /* .typeKind */
+    true, /* .pointerFree */
+    UA_BINARY_OVERLAYABLE_INTEGER, /* .overlayable */
+    0, /* .membersSize */
+    0, /* .binaryEncodingId */
+    NodeAttributesMask_members /* .members */
+},
+/* NodeAttributes */
+{
+    UA_TYPENAME("NodeAttributes") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {349}}, /* .typeId */
+    sizeof(UA_NodeAttributes), /* .memSize */
+    UA_TYPES_NODEATTRIBUTES, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    3, /* .membersSize */
-    799, /* .binaryEncodingId */
-    SetPublishingModeRequest_members /* .members */
+    5, /* .membersSize */
+    351, /* .binaryEncodingId */
+    NodeAttributes_members /* .members */
 },
-/* IssuedIdentityToken */
+/* ObjectAttributes */
 {
-    UA_TYPENAME("IssuedIdentityToken") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {938}}, /* .typeId */
-    sizeof(UA_IssuedIdentityToken), /* .memSize */
-    UA_TYPES_ISSUEDIDENTITYTOKEN, /* .typeIndex */
+    UA_TYPENAME("ObjectAttributes") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {352}}, /* .typeId */
+    sizeof(UA_ObjectAttributes), /* .memSize */
+    UA_TYPES_OBJECTATTRIBUTES, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    3, /* .membersSize */
-    940, /* .binaryEncodingId */
-    IssuedIdentityToken_members /* .members */
+    6, /* .membersSize */
+    354, /* .binaryEncodingId */
+    ObjectAttributes_members /* .members */
 },
-/* DeleteMonitoredItemsResponse */
+/* VariableAttributes */
 {
-    UA_TYPENAME("DeleteMonitoredItemsResponse") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {782}}, /* .typeId */
-    sizeof(UA_DeleteMonitoredItemsResponse), /* .memSize */
-    UA_TYPES_DELETEMONITOREDITEMSRESPONSE, /* .typeIndex */
+    UA_TYPENAME("VariableAttributes") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {355}}, /* .typeId */
+    sizeof(UA_VariableAttributes), /* .memSize */
+    UA_TYPES_VARIABLEATTRIBUTES, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    3, /* .membersSize */
-    784, /* .binaryEncodingId */
-    DeleteMonitoredItemsResponse_members /* .members */
+    13, /* .membersSize */
+    357, /* .binaryEncodingId */
+    VariableAttributes_members /* .members */
 },
-/* ApplicationType */
+/* MethodAttributes */
 {
-    UA_TYPENAME("ApplicationType") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {307}}, /* .typeId */
-    sizeof(UA_ApplicationType), /* .memSize */
-    UA_TYPES_INT32, /* .typeIndex */
-    UA_DATATYPEKIND_ENUM, /* .typeKind */
-    true, /* .pointerFree */
-    UA_BINARY_OVERLAYABLE_INTEGER, /* .overlayable */
-    0, /* .membersSize */
-    0, /* .binaryEncodingId */
-    ApplicationType_members /* .members */
+    UA_TYPENAME("MethodAttributes") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {358}}, /* .typeId */
+    sizeof(UA_MethodAttributes), /* .memSize */
+    UA_TYPES_METHODATTRIBUTES, /* .typeIndex */
+    UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
+    false, /* .pointerFree */
+    false, /* .overlayable */
+    7, /* .membersSize */
+    360, /* .binaryEncodingId */
+    MethodAttributes_members /* .members */
 },
-/* BrowseNextRequest */
+/* ObjectTypeAttributes */
 {
-    UA_TYPENAME("BrowseNextRequest") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {531}}, /* .typeId */
-    sizeof(UA_BrowseNextRequest), /* .memSize */
-    UA_TYPES_BROWSENEXTREQUEST, /* .typeIndex */
+    UA_TYPENAME("ObjectTypeAttributes") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {361}}, /* .typeId */
+    sizeof(UA_ObjectTypeAttributes), /* .memSize */
+    UA_TYPES_OBJECTTYPEATTRIBUTES, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    3, /* .membersSize */
-    533, /* .binaryEncodingId */
-    BrowseNextRequest_members /* .members */
+    6, /* .membersSize */
+    363, /* .binaryEncodingId */
+    ObjectTypeAttributes_members /* .members */
 },
-/* ModifySubscriptionRequest */
+/* VariableTypeAttributes */
 {
-    UA_TYPENAME("ModifySubscriptionRequest") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {791}}, /* .typeId */
-    sizeof(UA_ModifySubscriptionRequest), /* .memSize */
-    UA_TYPES_MODIFYSUBSCRIPTIONREQUEST, /* .typeIndex */
+    UA_TYPENAME("VariableTypeAttributes") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {364}}, /* .typeId */
+    sizeof(UA_VariableTypeAttributes), /* .memSize */
+    UA_TYPES_VARIABLETYPEATTRIBUTES, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    7, /* .membersSize */
-    793, /* .binaryEncodingId */
-    ModifySubscriptionRequest_members /* .members */
+    10, /* .membersSize */
+    366, /* .binaryEncodingId */
+    VariableTypeAttributes_members /* .members */
 },
-/* BrowseDescription */
+/* ReferenceTypeAttributes */
 {
-    UA_TYPENAME("BrowseDescription") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {514}}, /* .typeId */
-    sizeof(UA_BrowseDescription), /* .memSize */
-    UA_TYPES_BROWSEDESCRIPTION, /* .typeIndex */
+    UA_TYPENAME("ReferenceTypeAttributes") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {367}}, /* .typeId */
+    sizeof(UA_ReferenceTypeAttributes), /* .memSize */
+    UA_TYPES_REFERENCETYPEATTRIBUTES, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    6, /* .membersSize */
-    516, /* .binaryEncodingId */
-    BrowseDescription_members /* .members */
+    8, /* .membersSize */
+    369, /* .binaryEncodingId */
+    ReferenceTypeAttributes_members /* .members */
 },
-/* SignedSoftwareCertificate */
+/* DataTypeAttributes */
 {
-    UA_TYPENAME("SignedSoftwareCertificate") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {344}}, /* .typeId */
-    sizeof(UA_SignedSoftwareCertificate), /* .memSize */
-    UA_TYPES_SIGNEDSOFTWARECERTIFICATE, /* .typeIndex */
+    UA_TYPENAME("DataTypeAttributes") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {370}}, /* .typeId */
+    sizeof(UA_DataTypeAttributes), /* .memSize */
+    UA_TYPES_DATATYPEATTRIBUTES, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    2, /* .membersSize */
-    346, /* .binaryEncodingId */
-    SignedSoftwareCertificate_members /* .members */
+    6, /* .membersSize */
+    372, /* .binaryEncodingId */
+    DataTypeAttributes_members /* .members */
 },
-/* BrowsePathTarget */
+/* ViewAttributes */
 {
-    UA_TYPENAME("BrowsePathTarget") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {546}}, /* .typeId */
-    sizeof(UA_BrowsePathTarget), /* .memSize */
-    UA_TYPES_BROWSEPATHTARGET, /* .typeIndex */
+    UA_TYPENAME("ViewAttributes") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {373}}, /* .typeId */
+    sizeof(UA_ViewAttributes), /* .memSize */
+    UA_TYPES_VIEWATTRIBUTES, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    2, /* .membersSize */
-    548, /* .binaryEncodingId */
-    BrowsePathTarget_members /* .members */
+    7, /* .membersSize */
+    375, /* .binaryEncodingId */
+    ViewAttributes_members /* .members */
 },
-/* WriteResponse */
+/* AddNodesItem */
 {
-    UA_TYPENAME("WriteResponse") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {674}}, /* .typeId */
-    sizeof(UA_WriteResponse), /* .memSize */
-    UA_TYPES_WRITERESPONSE, /* .typeIndex */
+    UA_TYPENAME("AddNodesItem") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {376}}, /* .typeId */
+    sizeof(UA_AddNodesItem), /* .memSize */
+    UA_TYPES_ADDNODESITEM, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    3, /* .membersSize */
-    676, /* .binaryEncodingId */
-    WriteResponse_members /* .members */
+    7, /* .membersSize */
+    378, /* .binaryEncodingId */
+    AddNodesItem_members /* .members */
 },
 /* AddNodesResult */
 {
@@ -16472,6 +17257,32 @@ const UA_DataType UA_TYPES[UA_TYPES_COUNT] = {
     485, /* .binaryEncodingId */
     AddNodesResult_members /* .members */
 },
+/* AddNodesRequest */
+{
+    UA_TYPENAME("AddNodesRequest") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {486}}, /* .typeId */
+    sizeof(UA_AddNodesRequest), /* .memSize */
+    UA_TYPES_ADDNODESREQUEST, /* .typeIndex */
+    UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
+    false, /* .pointerFree */
+    false, /* .overlayable */
+    2, /* .membersSize */
+    488, /* .binaryEncodingId */
+    AddNodesRequest_members /* .members */
+},
+/* AddNodesResponse */
+{
+    UA_TYPENAME("AddNodesResponse") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {489}}, /* .typeId */
+    sizeof(UA_AddNodesResponse), /* .memSize */
+    UA_TYPES_ADDNODESRESPONSE, /* .typeIndex */
+    UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
+    false, /* .pointerFree */
+    false, /* .overlayable */
+    3, /* .membersSize */
+    491, /* .binaryEncodingId */
+    AddNodesResponse_members /* .members */
+},
 /* AddReferencesItem */
 {
     UA_TYPENAME("AddReferencesItem") /* .typeName */
@@ -16485,57 +17296,70 @@ const UA_DataType UA_TYPES[UA_TYPES_COUNT] = {
     381, /* .binaryEncodingId */
     AddReferencesItem_members /* .members */
 },
-/* DeleteReferencesResponse */
+/* AddReferencesRequest */
 {
-    UA_TYPENAME("DeleteReferencesResponse") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {507}}, /* .typeId */
-    sizeof(UA_DeleteReferencesResponse), /* .memSize */
-    UA_TYPES_DELETEREFERENCESRESPONSE, /* .typeIndex */
+    UA_TYPENAME("AddReferencesRequest") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {492}}, /* .typeId */
+    sizeof(UA_AddReferencesRequest), /* .memSize */
+    UA_TYPES_ADDREFERENCESREQUEST, /* .typeIndex */
+    UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
+    false, /* .pointerFree */
+    false, /* .overlayable */
+    2, /* .membersSize */
+    494, /* .binaryEncodingId */
+    AddReferencesRequest_members /* .members */
+},
+/* AddReferencesResponse */
+{
+    UA_TYPENAME("AddReferencesResponse") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {495}}, /* .typeId */
+    sizeof(UA_AddReferencesResponse), /* .memSize */
+    UA_TYPES_ADDREFERENCESRESPONSE, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
     3, /* .membersSize */
-    509, /* .binaryEncodingId */
-    DeleteReferencesResponse_members /* .members */
+    497, /* .binaryEncodingId */
+    AddReferencesResponse_members /* .members */
 },
-/* RelativePathElement */
+/* DeleteNodesItem */
 {
-    UA_TYPENAME("RelativePathElement") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {537}}, /* .typeId */
-    sizeof(UA_RelativePathElement), /* .memSize */
-    UA_TYPES_RELATIVEPATHELEMENT, /* .typeIndex */
+    UA_TYPENAME("DeleteNodesItem") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {382}}, /* .typeId */
+    sizeof(UA_DeleteNodesItem), /* .memSize */
+    UA_TYPES_DELETENODESITEM, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    4, /* .membersSize */
-    539, /* .binaryEncodingId */
-    RelativePathElement_members /* .members */
+    2, /* .membersSize */
+    384, /* .binaryEncodingId */
+    DeleteNodesItem_members /* .members */
 },
-/* SubscriptionAcknowledgement */
+/* DeleteNodesRequest */
 {
-    UA_TYPENAME("SubscriptionAcknowledgement") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {821}}, /* .typeId */
-    sizeof(UA_SubscriptionAcknowledgement), /* .memSize */
-    UA_TYPES_SUBSCRIPTIONACKNOWLEDGEMENT, /* .typeIndex */
+    UA_TYPENAME("DeleteNodesRequest") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {498}}, /* .typeId */
+    sizeof(UA_DeleteNodesRequest), /* .memSize */
+    UA_TYPES_DELETENODESREQUEST, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
-    true, /* .pointerFree */
+    false, /* .pointerFree */
     false, /* .overlayable */
     2, /* .membersSize */
-    823, /* .binaryEncodingId */
-    SubscriptionAcknowledgement_members /* .members */
+    500, /* .binaryEncodingId */
+    DeleteNodesRequest_members /* .members */
 },
-/* CreateMonitoredItemsResponse */
+/* DeleteNodesResponse */
 {
-    UA_TYPENAME("CreateMonitoredItemsResponse") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {752}}, /* .typeId */
-    sizeof(UA_CreateMonitoredItemsResponse), /* .memSize */
-    UA_TYPES_CREATEMONITOREDITEMSRESPONSE, /* .typeIndex */
+    UA_TYPENAME("DeleteNodesResponse") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {501}}, /* .typeId */
+    sizeof(UA_DeleteNodesResponse), /* .memSize */
+    UA_TYPES_DELETENODESRESPONSE, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
     3, /* .membersSize */
-    754, /* .binaryEncodingId */
-    CreateMonitoredItemsResponse_members /* .members */
+    503, /* .binaryEncodingId */
+    DeleteNodesResponse_members /* .members */
 },
 /* DeleteReferencesItem */
 {
@@ -16550,161 +17374,174 @@ const UA_DataType UA_TYPES[UA_TYPES_COUNT] = {
     387, /* .binaryEncodingId */
     DeleteReferencesItem_members /* .members */
 },
-/* WriteValue */
-{
-    UA_TYPENAME("WriteValue") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {668}}, /* .typeId */
-    sizeof(UA_WriteValue), /* .memSize */
-    UA_TYPES_WRITEVALUE, /* .typeIndex */
-    UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
-    false, /* .pointerFree */
-    false, /* .overlayable */
-    4, /* .membersSize */
-    670, /* .binaryEncodingId */
-    WriteValue_members /* .members */
-},
-/* DataTypeAttributes */
+/* DeleteReferencesRequest */
 {
-    UA_TYPENAME("DataTypeAttributes") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {370}}, /* .typeId */
-    sizeof(UA_DataTypeAttributes), /* .memSize */
-    UA_TYPES_DATATYPEATTRIBUTES, /* .typeIndex */
+    UA_TYPENAME("DeleteReferencesRequest") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {504}}, /* .typeId */
+    sizeof(UA_DeleteReferencesRequest), /* .memSize */
+    UA_TYPES_DELETEREFERENCESREQUEST, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    6, /* .membersSize */
-    372, /* .binaryEncodingId */
-    DataTypeAttributes_members /* .members */
+    2, /* .membersSize */
+    506, /* .binaryEncodingId */
+    DeleteReferencesRequest_members /* .members */
 },
-/* AddReferencesResponse */
+/* DeleteReferencesResponse */
 {
-    UA_TYPENAME("AddReferencesResponse") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {495}}, /* .typeId */
-    sizeof(UA_AddReferencesResponse), /* .memSize */
-    UA_TYPES_ADDREFERENCESRESPONSE, /* .typeIndex */
+    UA_TYPENAME("DeleteReferencesResponse") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {507}}, /* .typeId */
+    sizeof(UA_DeleteReferencesResponse), /* .memSize */
+    UA_TYPES_DELETEREFERENCESRESPONSE, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
     3, /* .membersSize */
-    497, /* .binaryEncodingId */
-    AddReferencesResponse_members /* .members */
+    509, /* .binaryEncodingId */
+    DeleteReferencesResponse_members /* .members */
 },
-/* DeadbandType */
+/* BrowseDirection */
 {
-    UA_TYPENAME("DeadbandType") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {718}}, /* .typeId */
-    sizeof(UA_DeadbandType), /* .memSize */
+    UA_TYPENAME("BrowseDirection") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {510}}, /* .typeId */
+    sizeof(UA_BrowseDirection), /* .memSize */
     UA_TYPES_INT32, /* .typeIndex */
     UA_DATATYPEKIND_ENUM, /* .typeKind */
     true, /* .pointerFree */
     UA_BINARY_OVERLAYABLE_INTEGER, /* .overlayable */
     0, /* .membersSize */
     0, /* .binaryEncodingId */
-    DeadbandType_members /* .members */
+    BrowseDirection_members /* .members */
 },
-/* DataChangeTrigger */
+/* ViewDescription */
 {
-    UA_TYPENAME("DataChangeTrigger") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {717}}, /* .typeId */
-    sizeof(UA_DataChangeTrigger), /* .memSize */
+    UA_TYPENAME("ViewDescription") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {511}}, /* .typeId */
+    sizeof(UA_ViewDescription), /* .memSize */
+    UA_TYPES_VIEWDESCRIPTION, /* .typeIndex */
+    UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
+    false, /* .pointerFree */
+    false, /* .overlayable */
+    3, /* .membersSize */
+    513, /* .binaryEncodingId */
+    ViewDescription_members /* .members */
+},
+/* BrowseDescription */
+{
+    UA_TYPENAME("BrowseDescription") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {514}}, /* .typeId */
+    sizeof(UA_BrowseDescription), /* .memSize */
+    UA_TYPES_BROWSEDESCRIPTION, /* .typeIndex */
+    UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
+    false, /* .pointerFree */
+    false, /* .overlayable */
+    6, /* .membersSize */
+    516, /* .binaryEncodingId */
+    BrowseDescription_members /* .members */
+},
+/* BrowseResultMask */
+{
+    UA_TYPENAME("BrowseResultMask") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {517}}, /* .typeId */
+    sizeof(UA_BrowseResultMask), /* .memSize */
     UA_TYPES_INT32, /* .typeIndex */
     UA_DATATYPEKIND_ENUM, /* .typeKind */
     true, /* .pointerFree */
     UA_BINARY_OVERLAYABLE_INTEGER, /* .overlayable */
     0, /* .membersSize */
     0, /* .binaryEncodingId */
-    DataChangeTrigger_members /* .members */
+    BrowseResultMask_members /* .members */
 },
-/* BuildInfo */
+/* ReferenceDescription */
 {
-    UA_TYPENAME("BuildInfo") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {338}}, /* .typeId */
-    sizeof(UA_BuildInfo), /* .memSize */
-    UA_TYPES_BUILDINFO, /* .typeIndex */
+    UA_TYPENAME("ReferenceDescription") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {518}}, /* .typeId */
+    sizeof(UA_ReferenceDescription), /* .memSize */
+    UA_TYPES_REFERENCEDESCRIPTION, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    6, /* .membersSize */
-    340, /* .binaryEncodingId */
-    BuildInfo_members /* .members */
+    7, /* .membersSize */
+    520, /* .binaryEncodingId */
+    ReferenceDescription_members /* .members */
 },
-/* FilterOperand */
+/* BrowseResult */
 {
-    UA_TYPENAME("FilterOperand") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {589}}, /* .typeId */
-    sizeof(UA_FilterOperand), /* .memSize */
-    UA_TYPES_FILTEROPERAND, /* .typeIndex */
+    UA_TYPENAME("BrowseResult") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {522}}, /* .typeId */
+    sizeof(UA_BrowseResult), /* .memSize */
+    UA_TYPES_BROWSERESULT, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
-    true, /* .pointerFree */
+    false, /* .pointerFree */
     false, /* .overlayable */
-    0, /* .membersSize */
-    591, /* .binaryEncodingId */
-    FilterOperand_members /* .members */
+    3, /* .membersSize */
+    524, /* .binaryEncodingId */
+    BrowseResult_members /* .members */
 },
-/* MonitoringParameters */
+/* BrowseRequest */
 {
-    UA_TYPENAME("MonitoringParameters") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {740}}, /* .typeId */
-    sizeof(UA_MonitoringParameters), /* .memSize */
-    UA_TYPES_MONITORINGPARAMETERS, /* .typeIndex */
+    UA_TYPENAME("BrowseRequest") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {525}}, /* .typeId */
+    sizeof(UA_BrowseRequest), /* .memSize */
+    UA_TYPES_BROWSEREQUEST, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    5, /* .membersSize */
-    742, /* .binaryEncodingId */
-    MonitoringParameters_members /* .members */
+    4, /* .membersSize */
+    527, /* .binaryEncodingId */
+    BrowseRequest_members /* .members */
 },
-/* DoubleComplexNumberType */
+/* BrowseResponse */
 {
-    UA_TYPENAME("DoubleComplexNumberType") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {12172}}, /* .typeId */
-    sizeof(UA_DoubleComplexNumberType), /* .memSize */
-    UA_TYPES_DOUBLECOMPLEXNUMBERTYPE, /* .typeIndex */
+    UA_TYPENAME("BrowseResponse") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {528}}, /* .typeId */
+    sizeof(UA_BrowseResponse), /* .memSize */
+    UA_TYPES_BROWSERESPONSE, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
-    true, /* .pointerFree */
+    false, /* .pointerFree */
     false, /* .overlayable */
-    2, /* .membersSize */
-    12182, /* .binaryEncodingId */
-    DoubleComplexNumberType_members /* .members */
+    3, /* .membersSize */
+    530, /* .binaryEncodingId */
+    BrowseResponse_members /* .members */
 },
-/* DeleteNodesItem */
+/* BrowseNextRequest */
 {
-    UA_TYPENAME("DeleteNodesItem") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {382}}, /* .typeId */
-    sizeof(UA_DeleteNodesItem), /* .memSize */
-    UA_TYPES_DELETENODESITEM, /* .typeIndex */
+    UA_TYPENAME("BrowseNextRequest") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {531}}, /* .typeId */
+    sizeof(UA_BrowseNextRequest), /* .memSize */
+    UA_TYPES_BROWSENEXTREQUEST, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    2, /* .membersSize */
-    384, /* .binaryEncodingId */
-    DeleteNodesItem_members /* .members */
+    3, /* .membersSize */
+    533, /* .binaryEncodingId */
+    BrowseNextRequest_members /* .members */
 },
-/* ReadValueId */
+/* BrowseNextResponse */
 {
-    UA_TYPENAME("ReadValueId") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {626}}, /* .typeId */
-    sizeof(UA_ReadValueId), /* .memSize */
-    UA_TYPES_READVALUEID, /* .typeIndex */
+    UA_TYPENAME("BrowseNextResponse") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {534}}, /* .typeId */
+    sizeof(UA_BrowseNextResponse), /* .memSize */
+    UA_TYPES_BROWSENEXTRESPONSE, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    4, /* .membersSize */
-    628, /* .binaryEncodingId */
-    ReadValueId_members /* .members */
+    3, /* .membersSize */
+    536, /* .binaryEncodingId */
+    BrowseNextResponse_members /* .members */
 },
-/* CallRequest */
+/* RelativePathElement */
 {
-    UA_TYPENAME("CallRequest") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {710}}, /* .typeId */
-    sizeof(UA_CallRequest), /* .memSize */
-    UA_TYPES_CALLREQUEST, /* .typeIndex */
+    UA_TYPENAME("RelativePathElement") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {537}}, /* .typeId */
+    sizeof(UA_RelativePathElement), /* .memSize */
+    UA_TYPES_RELATIVEPATHELEMENT, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    2, /* .membersSize */
-    712, /* .binaryEncodingId */
-    CallRequest_members /* .members */
+    4, /* .membersSize */
+    539, /* .binaryEncodingId */
+    RelativePathElement_members /* .members */
 },
 /* RelativePath */
 {
@@ -16719,70 +17556,109 @@ const UA_DataType UA_TYPES[UA_TYPES_COUNT] = {
     542, /* .binaryEncodingId */
     RelativePath_members /* .members */
 },
-/* DeleteNodesRequest */
+/* BrowsePath */
 {
-    UA_TYPENAME("DeleteNodesRequest") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {498}}, /* .typeId */
-    sizeof(UA_DeleteNodesRequest), /* .memSize */
-    UA_TYPES_DELETENODESREQUEST, /* .typeIndex */
+    UA_TYPENAME("BrowsePath") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {543}}, /* .typeId */
+    sizeof(UA_BrowsePath), /* .memSize */
+    UA_TYPES_BROWSEPATH, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
     2, /* .membersSize */
-    500, /* .binaryEncodingId */
-    DeleteNodesRequest_members /* .members */
+    545, /* .binaryEncodingId */
+    BrowsePath_members /* .members */
 },
-/* MonitoredItemModifyRequest */
+/* BrowsePathTarget */
 {
-    UA_TYPENAME("MonitoredItemModifyRequest") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {755}}, /* .typeId */
-    sizeof(UA_MonitoredItemModifyRequest), /* .memSize */
-    UA_TYPES_MONITOREDITEMMODIFYREQUEST, /* .typeIndex */
+    UA_TYPENAME("BrowsePathTarget") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {546}}, /* .typeId */
+    sizeof(UA_BrowsePathTarget), /* .memSize */
+    UA_TYPES_BROWSEPATHTARGET, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
     2, /* .membersSize */
-    757, /* .binaryEncodingId */
-    MonitoredItemModifyRequest_members /* .members */
+    548, /* .binaryEncodingId */
+    BrowsePathTarget_members /* .members */
 },
-/* UserTokenType */
+/* BrowsePathResult */
 {
-    UA_TYPENAME("UserTokenType") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {303}}, /* .typeId */
-    sizeof(UA_UserTokenType), /* .memSize */
-    UA_TYPES_INT32, /* .typeIndex */
-    UA_DATATYPEKIND_ENUM, /* .typeKind */
-    true, /* .pointerFree */
-    UA_BINARY_OVERLAYABLE_INTEGER, /* .overlayable */
-    0, /* .membersSize */
-    0, /* .binaryEncodingId */
-    UserTokenType_members /* .members */
+    UA_TYPENAME("BrowsePathResult") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {549}}, /* .typeId */
+    sizeof(UA_BrowsePathResult), /* .memSize */
+    UA_TYPES_BROWSEPATHRESULT, /* .typeIndex */
+    UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
+    false, /* .pointerFree */
+    false, /* .overlayable */
+    2, /* .membersSize */
+    551, /* .binaryEncodingId */
+    BrowsePathResult_members /* .members */
 },
-/* AggregateConfiguration */
+/* TranslateBrowsePathsToNodeIdsRequest */
 {
-    UA_TYPENAME("AggregateConfiguration") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {948}}, /* .typeId */
-    sizeof(UA_AggregateConfiguration), /* .memSize */
-    UA_TYPES_AGGREGATECONFIGURATION, /* .typeIndex */
+    UA_TYPENAME("TranslateBrowsePathsToNodeIdsRequest") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {552}}, /* .typeId */
+    sizeof(UA_TranslateBrowsePathsToNodeIdsRequest), /* .memSize */
+    UA_TYPES_TRANSLATEBROWSEPATHSTONODEIDSREQUEST, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
-    true, /* .pointerFree */
+    false, /* .pointerFree */
     false, /* .overlayable */
-    5, /* .membersSize */
-    950, /* .binaryEncodingId */
-    AggregateConfiguration_members /* .members */
+    2, /* .membersSize */
+    554, /* .binaryEncodingId */
+    TranslateBrowsePathsToNodeIdsRequest_members /* .members */
 },
-/* LocaleId */
+/* TranslateBrowsePathsToNodeIdsResponse */
 {
-    UA_TYPENAME("LocaleId") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {295}}, /* .typeId */
-    sizeof(UA_LocaleId), /* .memSize */
-    UA_TYPES_LOCALEID, /* .typeIndex */
-    UA_DATATYPEKIND_STRING, /* .typeKind */
+    UA_TYPENAME("TranslateBrowsePathsToNodeIdsResponse") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {555}}, /* .typeId */
+    sizeof(UA_TranslateBrowsePathsToNodeIdsResponse), /* .memSize */
+    UA_TYPES_TRANSLATEBROWSEPATHSTONODEIDSRESPONSE, /* .typeIndex */
+    UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    0, /* .membersSize */
-    0, /* .binaryEncodingId */
-    LocaleId_members /* .members */
+    3, /* .membersSize */
+    557, /* .binaryEncodingId */
+    TranslateBrowsePathsToNodeIdsResponse_members /* .members */
+},
+/* RegisterNodesRequest */
+{
+    UA_TYPENAME("RegisterNodesRequest") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {558}}, /* .typeId */
+    sizeof(UA_RegisterNodesRequest), /* .memSize */
+    UA_TYPES_REGISTERNODESREQUEST, /* .typeIndex */
+    UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
+    false, /* .pointerFree */
+    false, /* .overlayable */
+    2, /* .membersSize */
+    560, /* .binaryEncodingId */
+    RegisterNodesRequest_members /* .members */
+},
+/* RegisterNodesResponse */
+{
+    UA_TYPENAME("RegisterNodesResponse") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {561}}, /* .typeId */
+    sizeof(UA_RegisterNodesResponse), /* .memSize */
+    UA_TYPES_REGISTERNODESRESPONSE, /* .typeIndex */
+    UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
+    false, /* .pointerFree */
+    false, /* .overlayable */
+    2, /* .membersSize */
+    563, /* .binaryEncodingId */
+    RegisterNodesResponse_members /* .members */
+},
+/* UnregisterNodesRequest */
+{
+    UA_TYPENAME("UnregisterNodesRequest") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {564}}, /* .typeId */
+    sizeof(UA_UnregisterNodesRequest), /* .memSize */
+    UA_TYPES_UNREGISTERNODESREQUEST, /* .typeIndex */
+    UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
+    false, /* .pointerFree */
+    false, /* .overlayable */
+    2, /* .membersSize */
+    566, /* .binaryEncodingId */
+    UnregisterNodesRequest_members /* .members */
 },
 /* UnregisterNodesResponse */
 {
@@ -16797,6 +17673,123 @@ const UA_DataType UA_TYPES[UA_TYPES_COUNT] = {
     569, /* .binaryEncodingId */
     UnregisterNodesResponse_members /* .members */
 },
+/* FilterOperator */
+{
+    UA_TYPENAME("FilterOperator") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {576}}, /* .typeId */
+    sizeof(UA_FilterOperator), /* .memSize */
+    UA_TYPES_INT32, /* .typeIndex */
+    UA_DATATYPEKIND_ENUM, /* .typeKind */
+    true, /* .pointerFree */
+    UA_BINARY_OVERLAYABLE_INTEGER, /* .overlayable */
+    0, /* .membersSize */
+    0, /* .binaryEncodingId */
+    FilterOperator_members /* .members */
+},
+/* ContentFilterElement */
+{
+    UA_TYPENAME("ContentFilterElement") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {583}}, /* .typeId */
+    sizeof(UA_ContentFilterElement), /* .memSize */
+    UA_TYPES_CONTENTFILTERELEMENT, /* .typeIndex */
+    UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
+    false, /* .pointerFree */
+    false, /* .overlayable */
+    2, /* .membersSize */
+    585, /* .binaryEncodingId */
+    ContentFilterElement_members /* .members */
+},
+/* ContentFilter */
+{
+    UA_TYPENAME("ContentFilter") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {586}}, /* .typeId */
+    sizeof(UA_ContentFilter), /* .memSize */
+    UA_TYPES_CONTENTFILTER, /* .typeIndex */
+    UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
+    false, /* .pointerFree */
+    false, /* .overlayable */
+    1, /* .membersSize */
+    588, /* .binaryEncodingId */
+    ContentFilter_members /* .members */
+},
+/* FilterOperand */
+{
+    UA_TYPENAME("FilterOperand") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {589}}, /* .typeId */
+    sizeof(UA_FilterOperand), /* .memSize */
+    UA_TYPES_FILTEROPERAND, /* .typeIndex */
+    UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
+    true, /* .pointerFree */
+    false, /* .overlayable */
+    0, /* .membersSize */
+    591, /* .binaryEncodingId */
+    FilterOperand_members /* .members */
+},
+/* ElementOperand */
+{
+    UA_TYPENAME("ElementOperand") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {592}}, /* .typeId */
+    sizeof(UA_ElementOperand), /* .memSize */
+    UA_TYPES_ELEMENTOPERAND, /* .typeIndex */
+    UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
+    true, /* .pointerFree */
+    false, /* .overlayable */
+    1, /* .membersSize */
+    594, /* .binaryEncodingId */
+    ElementOperand_members /* .members */
+},
+/* LiteralOperand */
+{
+    UA_TYPENAME("LiteralOperand") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {595}}, /* .typeId */
+    sizeof(UA_LiteralOperand), /* .memSize */
+    UA_TYPES_LITERALOPERAND, /* .typeIndex */
+    UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
+    false, /* .pointerFree */
+    false, /* .overlayable */
+    1, /* .membersSize */
+    597, /* .binaryEncodingId */
+    LiteralOperand_members /* .members */
+},
+/* AttributeOperand */
+{
+    UA_TYPENAME("AttributeOperand") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {598}}, /* .typeId */
+    sizeof(UA_AttributeOperand), /* .memSize */
+    UA_TYPES_ATTRIBUTEOPERAND, /* .typeIndex */
+    UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
+    false, /* .pointerFree */
+    false, /* .overlayable */
+    5, /* .membersSize */
+    600, /* .binaryEncodingId */
+    AttributeOperand_members /* .members */
+},
+/* SimpleAttributeOperand */
+{
+    UA_TYPENAME("SimpleAttributeOperand") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {601}}, /* .typeId */
+    sizeof(UA_SimpleAttributeOperand), /* .memSize */
+    UA_TYPES_SIMPLEATTRIBUTEOPERAND, /* .typeIndex */
+    UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
+    false, /* .pointerFree */
+    false, /* .overlayable */
+    4, /* .membersSize */
+    603, /* .binaryEncodingId */
+    SimpleAttributeOperand_members /* .members */
+},
+/* ContentFilterElementResult */
+{
+    UA_TYPENAME("ContentFilterElementResult") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {604}}, /* .typeId */
+    sizeof(UA_ContentFilterElementResult), /* .memSize */
+    UA_TYPES_CONTENTFILTERELEMENTRESULT, /* .typeIndex */
+    UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
+    false, /* .pointerFree */
+    false, /* .overlayable */
+    3, /* .membersSize */
+    606, /* .binaryEncodingId */
+    ContentFilterElementResult_members /* .members */
+},
 /* ContentFilterResult */
 {
     UA_TYPENAME("ContentFilterResult") /* .typeName */
@@ -16810,486 +17803,538 @@ const UA_DataType UA_TYPES[UA_TYPES_COUNT] = {
     609, /* .binaryEncodingId */
     ContentFilterResult_members /* .members */
 },
-/* UserTokenPolicy */
+/* TimestampsToReturn */
 {
-    UA_TYPENAME("UserTokenPolicy") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {304}}, /* .typeId */
-    sizeof(UA_UserTokenPolicy), /* .memSize */
-    UA_TYPES_USERTOKENPOLICY, /* .typeIndex */
+    UA_TYPENAME("TimestampsToReturn") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {625}}, /* .typeId */
+    sizeof(UA_TimestampsToReturn), /* .memSize */
+    UA_TYPES_INT32, /* .typeIndex */
+    UA_DATATYPEKIND_ENUM, /* .typeKind */
+    true, /* .pointerFree */
+    UA_BINARY_OVERLAYABLE_INTEGER, /* .overlayable */
+    0, /* .membersSize */
+    0, /* .binaryEncodingId */
+    TimestampsToReturn_members /* .members */
+},
+/* ReadValueId */
+{
+    UA_TYPENAME("ReadValueId") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {626}}, /* .typeId */
+    sizeof(UA_ReadValueId), /* .memSize */
+    UA_TYPES_READVALUEID, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    5, /* .membersSize */
-    306, /* .binaryEncodingId */
-    UserTokenPolicy_members /* .members */
+    4, /* .membersSize */
+    628, /* .binaryEncodingId */
+    ReadValueId_members /* .members */
 },
-/* DeleteMonitoredItemsRequest */
+/* ReadRequest */
 {
-    UA_TYPENAME("DeleteMonitoredItemsRequest") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {779}}, /* .typeId */
-    sizeof(UA_DeleteMonitoredItemsRequest), /* .memSize */
-    UA_TYPES_DELETEMONITOREDITEMSREQUEST, /* .typeIndex */
+    UA_TYPENAME("ReadRequest") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {629}}, /* .typeId */
+    sizeof(UA_ReadRequest), /* .memSize */
+    UA_TYPES_READREQUEST, /* .typeIndex */
+    UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
+    false, /* .pointerFree */
+    false, /* .overlayable */
+    4, /* .membersSize */
+    631, /* .binaryEncodingId */
+    ReadRequest_members /* .members */
+},
+/* ReadResponse */
+{
+    UA_TYPENAME("ReadResponse") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {632}}, /* .typeId */
+    sizeof(UA_ReadResponse), /* .memSize */
+    UA_TYPES_READRESPONSE, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
     3, /* .membersSize */
-    781, /* .binaryEncodingId */
-    DeleteMonitoredItemsRequest_members /* .members */
+    634, /* .binaryEncodingId */
+    ReadResponse_members /* .members */
 },
-/* SetMonitoringModeRequest */
+/* HistoryReadValueId */
 {
-    UA_TYPENAME("SetMonitoringModeRequest") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {767}}, /* .typeId */
-    sizeof(UA_SetMonitoringModeRequest), /* .memSize */
-    UA_TYPES_SETMONITORINGMODEREQUEST, /* .typeIndex */
+    UA_TYPENAME("HistoryReadValueId") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {635}}, /* .typeId */
+    sizeof(UA_HistoryReadValueId), /* .memSize */
+    UA_TYPES_HISTORYREADVALUEID, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
     4, /* .membersSize */
-    769, /* .binaryEncodingId */
-    SetMonitoringModeRequest_members /* .members */
+    637, /* .binaryEncodingId */
+    HistoryReadValueId_members /* .members */
 },
-/* Duration */
+/* HistoryReadResult */
 {
-    UA_TYPENAME("Duration") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {290}}, /* .typeId */
-    sizeof(UA_Duration), /* .memSize */
-    UA_TYPES_DURATION, /* .typeIndex */
-    UA_DATATYPEKIND_DOUBLE, /* .typeKind */
+    UA_TYPENAME("HistoryReadResult") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {638}}, /* .typeId */
+    sizeof(UA_HistoryReadResult), /* .memSize */
+    UA_TYPES_HISTORYREADRESULT, /* .typeIndex */
+    UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    0, /* .membersSize */
-    0, /* .binaryEncodingId */
-    Duration_members /* .members */
+    3, /* .membersSize */
+    640, /* .binaryEncodingId */
+    HistoryReadResult_members /* .members */
 },
-/* ReferenceTypeAttributes */
+/* ReadRawModifiedDetails */
 {
-    UA_TYPENAME("ReferenceTypeAttributes") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {367}}, /* .typeId */
-    sizeof(UA_ReferenceTypeAttributes), /* .memSize */
-    UA_TYPES_REFERENCETYPEATTRIBUTES, /* .typeIndex */
+    UA_TYPENAME("ReadRawModifiedDetails") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {647}}, /* .typeId */
+    sizeof(UA_ReadRawModifiedDetails), /* .memSize */
+    UA_TYPES_READRAWMODIFIEDDETAILS, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
-    false, /* .pointerFree */
+    true, /* .pointerFree */
     false, /* .overlayable */
-    8, /* .membersSize */
-    369, /* .binaryEncodingId */
-    ReferenceTypeAttributes_members /* .members */
+    5, /* .membersSize */
+    649, /* .binaryEncodingId */
+    ReadRawModifiedDetails_members /* .members */
 },
-/* GetEndpointsRequest */
+/* ReadAtTimeDetails */
 {
-    UA_TYPENAME("GetEndpointsRequest") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {426}}, /* .typeId */
-    sizeof(UA_GetEndpointsRequest), /* .memSize */
-    UA_TYPES_GETENDPOINTSREQUEST, /* .typeIndex */
+    UA_TYPENAME("ReadAtTimeDetails") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {653}}, /* .typeId */
+    sizeof(UA_ReadAtTimeDetails), /* .memSize */
+    UA_TYPES_READATTIMEDETAILS, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    4, /* .membersSize */
-    428, /* .binaryEncodingId */
-    GetEndpointsRequest_members /* .members */
+    2, /* .membersSize */
+    655, /* .binaryEncodingId */
+    ReadAtTimeDetails_members /* .members */
 },
-/* CloseSecureChannelResponse */
+/* HistoryData */
 {
-    UA_TYPENAME("CloseSecureChannelResponse") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {453}}, /* .typeId */
-    sizeof(UA_CloseSecureChannelResponse), /* .memSize */
-    UA_TYPES_CLOSESECURECHANNELRESPONSE, /* .typeIndex */
+    UA_TYPENAME("HistoryData") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {656}}, /* .typeId */
+    sizeof(UA_HistoryData), /* .memSize */
+    UA_TYPES_HISTORYDATA, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
     1, /* .membersSize */
-    455, /* .binaryEncodingId */
-    CloseSecureChannelResponse_members /* .members */
+    658, /* .binaryEncodingId */
+    HistoryData_members /* .members */
 },
-/* ViewDescription */
+/* HistoryReadRequest */
 {
-    UA_TYPENAME("ViewDescription") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {511}}, /* .typeId */
-    sizeof(UA_ViewDescription), /* .memSize */
-    UA_TYPES_VIEWDESCRIPTION, /* .typeIndex */
+    UA_TYPENAME("HistoryReadRequest") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {662}}, /* .typeId */
+    sizeof(UA_HistoryReadRequest), /* .memSize */
+    UA_TYPES_HISTORYREADREQUEST, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    3, /* .membersSize */
-    513, /* .binaryEncodingId */
-    ViewDescription_members /* .members */
+    5, /* .membersSize */
+    664, /* .binaryEncodingId */
+    HistoryReadRequest_members /* .members */
 },
-/* SetPublishingModeResponse */
+/* HistoryReadResponse */
 {
-    UA_TYPENAME("SetPublishingModeResponse") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {800}}, /* .typeId */
-    sizeof(UA_SetPublishingModeResponse), /* .memSize */
-    UA_TYPES_SETPUBLISHINGMODERESPONSE, /* .typeIndex */
+    UA_TYPENAME("HistoryReadResponse") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {665}}, /* .typeId */
+    sizeof(UA_HistoryReadResponse), /* .memSize */
+    UA_TYPES_HISTORYREADRESPONSE, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
     3, /* .membersSize */
-    802, /* .binaryEncodingId */
-    SetPublishingModeResponse_members /* .members */
+    667, /* .binaryEncodingId */
+    HistoryReadResponse_members /* .members */
 },
-/* StatusChangeNotification */
+/* WriteValue */
 {
-    UA_TYPENAME("StatusChangeNotification") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {818}}, /* .typeId */
-    sizeof(UA_StatusChangeNotification), /* .memSize */
-    UA_TYPES_STATUSCHANGENOTIFICATION, /* .typeIndex */
+    UA_TYPENAME("WriteValue") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {668}}, /* .typeId */
+    sizeof(UA_WriteValue), /* .memSize */
+    UA_TYPES_WRITEVALUE, /* .typeIndex */
+    UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
+    false, /* .pointerFree */
+    false, /* .overlayable */
+    4, /* .membersSize */
+    670, /* .binaryEncodingId */
+    WriteValue_members /* .members */
+},
+/* WriteRequest */
+{
+    UA_TYPENAME("WriteRequest") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {671}}, /* .typeId */
+    sizeof(UA_WriteRequest), /* .memSize */
+    UA_TYPES_WRITEREQUEST, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
     2, /* .membersSize */
-    820, /* .binaryEncodingId */
-    StatusChangeNotification_members /* .members */
+    673, /* .binaryEncodingId */
+    WriteRequest_members /* .members */
 },
-/* StructureField */
+/* WriteResponse */
 {
-    UA_TYPENAME("StructureField") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {101}}, /* .typeId */
-    sizeof(UA_StructureField), /* .memSize */
-    UA_TYPES_STRUCTUREFIELD, /* .typeIndex */
+    UA_TYPENAME("WriteResponse") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {674}}, /* .typeId */
+    sizeof(UA_WriteResponse), /* .memSize */
+    UA_TYPES_WRITERESPONSE, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    7, /* .membersSize */
-    14844, /* .binaryEncodingId */
-    StructureField_members /* .members */
+    3, /* .membersSize */
+    676, /* .binaryEncodingId */
+    WriteResponse_members /* .members */
 },
-/* NodeAttributesMask */
+/* HistoryUpdateType */
 {
-    UA_TYPENAME("NodeAttributesMask") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {348}}, /* .typeId */
-    sizeof(UA_NodeAttributesMask), /* .memSize */
+    UA_TYPENAME("HistoryUpdateType") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {11234}}, /* .typeId */
+    sizeof(UA_HistoryUpdateType), /* .memSize */
     UA_TYPES_INT32, /* .typeIndex */
     UA_DATATYPEKIND_ENUM, /* .typeKind */
     true, /* .pointerFree */
     UA_BINARY_OVERLAYABLE_INTEGER, /* .overlayable */
     0, /* .membersSize */
     0, /* .binaryEncodingId */
-    NodeAttributesMask_members /* .members */
+    HistoryUpdateType_members /* .members */
 },
-/* EventFilterResult */
+/* PerformUpdateType */
 {
-    UA_TYPENAME("EventFilterResult") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {734}}, /* .typeId */
-    sizeof(UA_EventFilterResult), /* .memSize */
-    UA_TYPES_EVENTFILTERRESULT, /* .typeIndex */
+    UA_TYPENAME("PerformUpdateType") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {11293}}, /* .typeId */
+    sizeof(UA_PerformUpdateType), /* .memSize */
+    UA_TYPES_INT32, /* .typeIndex */
+    UA_DATATYPEKIND_ENUM, /* .typeKind */
+    true, /* .pointerFree */
+    UA_BINARY_OVERLAYABLE_INTEGER, /* .overlayable */
+    0, /* .membersSize */
+    0, /* .binaryEncodingId */
+    PerformUpdateType_members /* .members */
+},
+/* UpdateDataDetails */
+{
+    UA_TYPENAME("UpdateDataDetails") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {680}}, /* .typeId */
+    sizeof(UA_UpdateDataDetails), /* .memSize */
+    UA_TYPES_UPDATEDATADETAILS, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
     3, /* .membersSize */
-    736, /* .binaryEncodingId */
-    EventFilterResult_members /* .members */
+    682, /* .binaryEncodingId */
+    UpdateDataDetails_members /* .members */
 },
-/* MonitoredItemCreateRequest */
+/* DeleteRawModifiedDetails */
 {
-    UA_TYPENAME("MonitoredItemCreateRequest") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {743}}, /* .typeId */
-    sizeof(UA_MonitoredItemCreateRequest), /* .memSize */
-    UA_TYPES_MONITOREDITEMCREATEREQUEST, /* .typeIndex */
+    UA_TYPENAME("DeleteRawModifiedDetails") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {686}}, /* .typeId */
+    sizeof(UA_DeleteRawModifiedDetails), /* .memSize */
+    UA_TYPES_DELETERAWMODIFIEDDETAILS, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    3, /* .membersSize */
-    745, /* .binaryEncodingId */
-    MonitoredItemCreateRequest_members /* .members */
+    4, /* .membersSize */
+    688, /* .binaryEncodingId */
+    DeleteRawModifiedDetails_members /* .members */
 },
-/* ComplexNumberType */
+/* HistoryUpdateResult */
 {
-    UA_TYPENAME("ComplexNumberType") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {12171}}, /* .typeId */
-    sizeof(UA_ComplexNumberType), /* .memSize */
-    UA_TYPES_COMPLEXNUMBERTYPE, /* .typeIndex */
+    UA_TYPENAME("HistoryUpdateResult") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {695}}, /* .typeId */
+    sizeof(UA_HistoryUpdateResult), /* .memSize */
+    UA_TYPES_HISTORYUPDATERESULT, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
-    true, /* .pointerFree */
+    false, /* .pointerFree */
     false, /* .overlayable */
-    2, /* .membersSize */
-    12181, /* .binaryEncodingId */
-    ComplexNumberType_members /* .members */
+    3, /* .membersSize */
+    697, /* .binaryEncodingId */
+    HistoryUpdateResult_members /* .members */
 },
-/* Range */
+/* HistoryUpdateRequest */
 {
-    UA_TYPENAME("Range") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {884}}, /* .typeId */
-    sizeof(UA_Range), /* .memSize */
-    UA_TYPES_RANGE, /* .typeIndex */
+    UA_TYPENAME("HistoryUpdateRequest") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {698}}, /* .typeId */
+    sizeof(UA_HistoryUpdateRequest), /* .memSize */
+    UA_TYPES_HISTORYUPDATEREQUEST, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
-    true, /* .pointerFree */
+    false, /* .pointerFree */
     false, /* .overlayable */
     2, /* .membersSize */
-    886, /* .binaryEncodingId */
-    Range_members /* .members */
+    700, /* .binaryEncodingId */
+    HistoryUpdateRequest_members /* .members */
 },
-/* DataChangeNotification */
+/* HistoryUpdateResponse */
 {
-    UA_TYPENAME("DataChangeNotification") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {809}}, /* .typeId */
-    sizeof(UA_DataChangeNotification), /* .memSize */
-    UA_TYPES_DATACHANGENOTIFICATION, /* .typeIndex */
+    UA_TYPENAME("HistoryUpdateResponse") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {701}}, /* .typeId */
+    sizeof(UA_HistoryUpdateResponse), /* .memSize */
+    UA_TYPES_HISTORYUPDATERESPONSE, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    2, /* .membersSize */
-    811, /* .binaryEncodingId */
-    DataChangeNotification_members /* .members */
+    3, /* .membersSize */
+    703, /* .binaryEncodingId */
+    HistoryUpdateResponse_members /* .members */
 },
-/* Argument */
+/* CallMethodRequest */
 {
-    UA_TYPENAME("Argument") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {296}}, /* .typeId */
-    sizeof(UA_Argument), /* .memSize */
-    UA_TYPES_ARGUMENT, /* .typeIndex */
+    UA_TYPENAME("CallMethodRequest") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {704}}, /* .typeId */
+    sizeof(UA_CallMethodRequest), /* .memSize */
+    UA_TYPES_CALLMETHODREQUEST, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    5, /* .membersSize */
-    298, /* .binaryEncodingId */
-    Argument_members /* .members */
+    3, /* .membersSize */
+    706, /* .binaryEncodingId */
+    CallMethodRequest_members /* .members */
 },
-/* ChannelSecurityToken */
+/* CallMethodResult */
 {
-    UA_TYPENAME("ChannelSecurityToken") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {441}}, /* .typeId */
-    sizeof(UA_ChannelSecurityToken), /* .memSize */
-    UA_TYPES_CHANNELSECURITYTOKEN, /* .typeIndex */
+    UA_TYPENAME("CallMethodResult") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {707}}, /* .typeId */
+    sizeof(UA_CallMethodResult), /* .memSize */
+    UA_TYPES_CALLMETHODRESULT, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
-    true, /* .pointerFree */
+    false, /* .pointerFree */
     false, /* .overlayable */
     4, /* .membersSize */
-    443, /* .binaryEncodingId */
-    ChannelSecurityToken_members /* .members */
-},
-/* ServerState */
-{
-    UA_TYPENAME("ServerState") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {852}}, /* .typeId */
-    sizeof(UA_ServerState), /* .memSize */
-    UA_TYPES_INT32, /* .typeIndex */
-    UA_DATATYPEKIND_ENUM, /* .typeKind */
-    true, /* .pointerFree */
-    UA_BINARY_OVERLAYABLE_INTEGER, /* .overlayable */
-    0, /* .membersSize */
-    0, /* .binaryEncodingId */
-    ServerState_members /* .members */
+    709, /* .binaryEncodingId */
+    CallMethodResult_members /* .members */
 },
-/* EventNotificationList */
+/* CallRequest */
 {
-    UA_TYPENAME("EventNotificationList") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {914}}, /* .typeId */
-    sizeof(UA_EventNotificationList), /* .memSize */
-    UA_TYPES_EVENTNOTIFICATIONLIST, /* .typeIndex */
+    UA_TYPENAME("CallRequest") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {710}}, /* .typeId */
+    sizeof(UA_CallRequest), /* .memSize */
+    UA_TYPES_CALLREQUEST, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    1, /* .membersSize */
-    916, /* .binaryEncodingId */
-    EventNotificationList_members /* .members */
+    2, /* .membersSize */
+    712, /* .binaryEncodingId */
+    CallRequest_members /* .members */
 },
-/* AnonymousIdentityToken */
+/* CallResponse */
 {
-    UA_TYPENAME("AnonymousIdentityToken") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {319}}, /* .typeId */
-    sizeof(UA_AnonymousIdentityToken), /* .memSize */
-    UA_TYPES_ANONYMOUSIDENTITYTOKEN, /* .typeIndex */
+    UA_TYPENAME("CallResponse") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {713}}, /* .typeId */
+    sizeof(UA_CallResponse), /* .memSize */
+    UA_TYPES_CALLRESPONSE, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    1, /* .membersSize */
-    321, /* .binaryEncodingId */
-    AnonymousIdentityToken_members /* .members */
+    3, /* .membersSize */
+    715, /* .binaryEncodingId */
+    CallResponse_members /* .members */
 },
-/* FilterOperator */
+/* MonitoringMode */
 {
-    UA_TYPENAME("FilterOperator") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {576}}, /* .typeId */
-    sizeof(UA_FilterOperator), /* .memSize */
+    UA_TYPENAME("MonitoringMode") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {716}}, /* .typeId */
+    sizeof(UA_MonitoringMode), /* .memSize */
     UA_TYPES_INT32, /* .typeIndex */
     UA_DATATYPEKIND_ENUM, /* .typeKind */
     true, /* .pointerFree */
     UA_BINARY_OVERLAYABLE_INTEGER, /* .overlayable */
     0, /* .membersSize */
     0, /* .binaryEncodingId */
-    FilterOperator_members /* .members */
+    MonitoringMode_members /* .members */
 },
-/* AggregateFilter */
+/* DataChangeTrigger */
 {
-    UA_TYPENAME("AggregateFilter") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {728}}, /* .typeId */
-    sizeof(UA_AggregateFilter), /* .memSize */
-    UA_TYPES_AGGREGATEFILTER, /* .typeIndex */
-    UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
-    false, /* .pointerFree */
-    false, /* .overlayable */
-    4, /* .membersSize */
-    730, /* .binaryEncodingId */
-    AggregateFilter_members /* .members */
+    UA_TYPENAME("DataChangeTrigger") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {717}}, /* .typeId */
+    sizeof(UA_DataChangeTrigger), /* .memSize */
+    UA_TYPES_INT32, /* .typeIndex */
+    UA_DATATYPEKIND_ENUM, /* .typeKind */
+    true, /* .pointerFree */
+    UA_BINARY_OVERLAYABLE_INTEGER, /* .overlayable */
+    0, /* .membersSize */
+    0, /* .binaryEncodingId */
+    DataChangeTrigger_members /* .members */
 },
-/* RepublishResponse */
+/* DeadbandType */
 {
-    UA_TYPENAME("RepublishResponse") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {833}}, /* .typeId */
-    sizeof(UA_RepublishResponse), /* .memSize */
-    UA_TYPES_REPUBLISHRESPONSE, /* .typeIndex */
-    UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
-    false, /* .pointerFree */
-    false, /* .overlayable */
-    2, /* .membersSize */
-    835, /* .binaryEncodingId */
-    RepublishResponse_members /* .members */
+    UA_TYPENAME("DeadbandType") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {718}}, /* .typeId */
+    sizeof(UA_DeadbandType), /* .memSize */
+    UA_TYPES_INT32, /* .typeIndex */
+    UA_DATATYPEKIND_ENUM, /* .typeKind */
+    true, /* .pointerFree */
+    UA_BINARY_OVERLAYABLE_INTEGER, /* .overlayable */
+    0, /* .membersSize */
+    0, /* .binaryEncodingId */
+    DeadbandType_members /* .members */
 },
-/* DeleteSubscriptionsResponse */
+/* DataChangeFilter */
 {
-    UA_TYPENAME("DeleteSubscriptionsResponse") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {848}}, /* .typeId */
-    sizeof(UA_DeleteSubscriptionsResponse), /* .memSize */
-    UA_TYPES_DELETESUBSCRIPTIONSRESPONSE, /* .typeIndex */
+    UA_TYPENAME("DataChangeFilter") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {722}}, /* .typeId */
+    sizeof(UA_DataChangeFilter), /* .memSize */
+    UA_TYPES_DATACHANGEFILTER, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
-    false, /* .pointerFree */
+    true, /* .pointerFree */
     false, /* .overlayable */
     3, /* .membersSize */
-    850, /* .binaryEncodingId */
-    DeleteSubscriptionsResponse_members /* .members */
+    724, /* .binaryEncodingId */
+    DataChangeFilter_members /* .members */
 },
-/* RegisterNodesRequest */
+/* EventFilter */
 {
-    UA_TYPENAME("RegisterNodesRequest") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {558}}, /* .typeId */
-    sizeof(UA_RegisterNodesRequest), /* .memSize */
-    UA_TYPES_REGISTERNODESREQUEST, /* .typeIndex */
+    UA_TYPENAME("EventFilter") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {725}}, /* .typeId */
+    sizeof(UA_EventFilter), /* .memSize */
+    UA_TYPES_EVENTFILTER, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
     2, /* .membersSize */
-    560, /* .binaryEncodingId */
-    RegisterNodesRequest_members /* .members */
+    727, /* .binaryEncodingId */
+    EventFilter_members /* .members */
 },
-/* StructureDefinition */
+/* AggregateConfiguration */
 {
-    UA_TYPENAME("StructureDefinition") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {99}}, /* .typeId */
-    sizeof(UA_StructureDefinition), /* .memSize */
-    UA_TYPES_STRUCTUREDEFINITION, /* .typeIndex */
+    UA_TYPENAME("AggregateConfiguration") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {948}}, /* .typeId */
+    sizeof(UA_AggregateConfiguration), /* .memSize */
+    UA_TYPES_AGGREGATECONFIGURATION, /* .typeIndex */
+    UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
+    true, /* .pointerFree */
+    false, /* .overlayable */
+    5, /* .membersSize */
+    950, /* .binaryEncodingId */
+    AggregateConfiguration_members /* .members */
+},
+/* AggregateFilter */
+{
+    UA_TYPENAME("AggregateFilter") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {728}}, /* .typeId */
+    sizeof(UA_AggregateFilter), /* .memSize */
+    UA_TYPES_AGGREGATEFILTER, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
     4, /* .membersSize */
-    122, /* .binaryEncodingId */
-    StructureDefinition_members /* .members */
+    730, /* .binaryEncodingId */
+    AggregateFilter_members /* .members */
 },
-/* MethodAttributes */
+/* EventFilterResult */
 {
-    UA_TYPENAME("MethodAttributes") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {358}}, /* .typeId */
-    sizeof(UA_MethodAttributes), /* .memSize */
-    UA_TYPES_METHODATTRIBUTES, /* .typeIndex */
+    UA_TYPENAME("EventFilterResult") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {734}}, /* .typeId */
+    sizeof(UA_EventFilterResult), /* .memSize */
+    UA_TYPES_EVENTFILTERRESULT, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    7, /* .membersSize */
-    360, /* .binaryEncodingId */
-    MethodAttributes_members /* .members */
+    3, /* .membersSize */
+    736, /* .binaryEncodingId */
+    EventFilterResult_members /* .members */
 },
-/* UserNameIdentityToken */
+/* MonitoringParameters */
 {
-    UA_TYPENAME("UserNameIdentityToken") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {322}}, /* .typeId */
-    sizeof(UA_UserNameIdentityToken), /* .memSize */
-    UA_TYPES_USERNAMEIDENTITYTOKEN, /* .typeIndex */
+    UA_TYPENAME("MonitoringParameters") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {740}}, /* .typeId */
+    sizeof(UA_MonitoringParameters), /* .memSize */
+    UA_TYPES_MONITORINGPARAMETERS, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    4, /* .membersSize */
-    324, /* .binaryEncodingId */
-    UserNameIdentityToken_members /* .members */
+    5, /* .membersSize */
+    742, /* .binaryEncodingId */
+    MonitoringParameters_members /* .members */
 },
-/* TimeZoneDataType */
+/* MonitoredItemCreateRequest */
 {
-    UA_TYPENAME("TimeZoneDataType") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {8912}}, /* .typeId */
-    sizeof(UA_TimeZoneDataType), /* .memSize */
-    UA_TYPES_TIMEZONEDATATYPE, /* .typeIndex */
+    UA_TYPENAME("MonitoredItemCreateRequest") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {743}}, /* .typeId */
+    sizeof(UA_MonitoredItemCreateRequest), /* .memSize */
+    UA_TYPES_MONITOREDITEMCREATEREQUEST, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
-    true, /* .pointerFree */
+    false, /* .pointerFree */
     false, /* .overlayable */
-    2, /* .membersSize */
-    8917, /* .binaryEncodingId */
-    TimeZoneDataType_members /* .members */
+    3, /* .membersSize */
+    745, /* .binaryEncodingId */
+    MonitoredItemCreateRequest_members /* .members */
 },
-/* UnregisterNodesRequest */
+/* MonitoredItemCreateResult */
 {
-    UA_TYPENAME("UnregisterNodesRequest") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {564}}, /* .typeId */
-    sizeof(UA_UnregisterNodesRequest), /* .memSize */
-    UA_TYPES_UNREGISTERNODESREQUEST, /* .typeIndex */
+    UA_TYPENAME("MonitoredItemCreateResult") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {746}}, /* .typeId */
+    sizeof(UA_MonitoredItemCreateResult), /* .memSize */
+    UA_TYPES_MONITOREDITEMCREATERESULT, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    2, /* .membersSize */
-    566, /* .binaryEncodingId */
-    UnregisterNodesRequest_members /* .members */
+    5, /* .membersSize */
+    748, /* .binaryEncodingId */
+    MonitoredItemCreateResult_members /* .members */
 },
-/* OpenSecureChannelResponse */
+/* CreateMonitoredItemsRequest */
 {
-    UA_TYPENAME("OpenSecureChannelResponse") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {447}}, /* .typeId */
-    sizeof(UA_OpenSecureChannelResponse), /* .memSize */
-    UA_TYPES_OPENSECURECHANNELRESPONSE, /* .typeIndex */
+    UA_TYPENAME("CreateMonitoredItemsRequest") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {749}}, /* .typeId */
+    sizeof(UA_CreateMonitoredItemsRequest), /* .memSize */
+    UA_TYPES_CREATEMONITOREDITEMSREQUEST, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
     4, /* .membersSize */
-    449, /* .binaryEncodingId */
-    OpenSecureChannelResponse_members /* .members */
+    751, /* .binaryEncodingId */
+    CreateMonitoredItemsRequest_members /* .members */
 },
-/* SetTriggeringResponse */
+/* CreateMonitoredItemsResponse */
 {
-    UA_TYPENAME("SetTriggeringResponse") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {776}}, /* .typeId */
-    sizeof(UA_SetTriggeringResponse), /* .memSize */
-    UA_TYPES_SETTRIGGERINGRESPONSE, /* .typeIndex */
+    UA_TYPENAME("CreateMonitoredItemsResponse") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {752}}, /* .typeId */
+    sizeof(UA_CreateMonitoredItemsResponse), /* .memSize */
+    UA_TYPES_CREATEMONITOREDITEMSRESPONSE, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    5, /* .membersSize */
-    778, /* .binaryEncodingId */
-    SetTriggeringResponse_members /* .members */
+    3, /* .membersSize */
+    754, /* .binaryEncodingId */
+    CreateMonitoredItemsResponse_members /* .members */
 },
-/* SimpleAttributeOperand */
+/* MonitoredItemModifyRequest */
 {
-    UA_TYPENAME("SimpleAttributeOperand") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {601}}, /* .typeId */
-    sizeof(UA_SimpleAttributeOperand), /* .memSize */
-    UA_TYPES_SIMPLEATTRIBUTEOPERAND, /* .typeIndex */
+    UA_TYPENAME("MonitoredItemModifyRequest") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {755}}, /* .typeId */
+    sizeof(UA_MonitoredItemModifyRequest), /* .memSize */
+    UA_TYPES_MONITOREDITEMMODIFYREQUEST, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    4, /* .membersSize */
-    603, /* .binaryEncodingId */
-    SimpleAttributeOperand_members /* .members */
+    2, /* .membersSize */
+    757, /* .binaryEncodingId */
+    MonitoredItemModifyRequest_members /* .members */
 },
-/* RepublishRequest */
+/* MonitoredItemModifyResult */
 {
-    UA_TYPENAME("RepublishRequest") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {830}}, /* .typeId */
-    sizeof(UA_RepublishRequest), /* .memSize */
-    UA_TYPES_REPUBLISHREQUEST, /* .typeIndex */
+    UA_TYPENAME("MonitoredItemModifyResult") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {758}}, /* .typeId */
+    sizeof(UA_MonitoredItemModifyResult), /* .memSize */
+    UA_TYPES_MONITOREDITEMMODIFYRESULT, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    3, /* .membersSize */
-    832, /* .binaryEncodingId */
-    RepublishRequest_members /* .members */
+    4, /* .membersSize */
+    760, /* .binaryEncodingId */
+    MonitoredItemModifyResult_members /* .members */
 },
-/* RegisterNodesResponse */
+/* ModifyMonitoredItemsRequest */
 {
-    UA_TYPENAME("RegisterNodesResponse") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {561}}, /* .typeId */
-    sizeof(UA_RegisterNodesResponse), /* .memSize */
-    UA_TYPES_REGISTERNODESRESPONSE, /* .typeIndex */
+    UA_TYPENAME("ModifyMonitoredItemsRequest") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {761}}, /* .typeId */
+    sizeof(UA_ModifyMonitoredItemsRequest), /* .memSize */
+    UA_TYPES_MODIFYMONITOREDITEMSREQUEST, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    2, /* .membersSize */
-    563, /* .binaryEncodingId */
-    RegisterNodesResponse_members /* .members */
+    4, /* .membersSize */
+    763, /* .binaryEncodingId */
+    ModifyMonitoredItemsRequest_members /* .members */
 },
 /* ModifyMonitoredItemsResponse */
 {
@@ -17304,96 +18349,83 @@ const UA_DataType UA_TYPES[UA_TYPES_COUNT] = {
     766, /* .binaryEncodingId */
     ModifyMonitoredItemsResponse_members /* .members */
 },
-/* DeleteSubscriptionsRequest */
+/* SetMonitoringModeRequest */
 {
-    UA_TYPENAME("DeleteSubscriptionsRequest") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {845}}, /* .typeId */
-    sizeof(UA_DeleteSubscriptionsRequest), /* .memSize */
-    UA_TYPES_DELETESUBSCRIPTIONSREQUEST, /* .typeIndex */
+    UA_TYPENAME("SetMonitoringModeRequest") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {767}}, /* .typeId */
+    sizeof(UA_SetMonitoringModeRequest), /* .memSize */
+    UA_TYPES_SETMONITORINGMODEREQUEST, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    2, /* .membersSize */
-    847, /* .binaryEncodingId */
-    DeleteSubscriptionsRequest_members /* .members */
-},
-/* RedundancySupport */
-{
-    UA_TYPENAME("RedundancySupport") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {851}}, /* .typeId */
-    sizeof(UA_RedundancySupport), /* .memSize */
-    UA_TYPES_INT32, /* .typeIndex */
-    UA_DATATYPEKIND_ENUM, /* .typeKind */
-    true, /* .pointerFree */
-    UA_BINARY_OVERLAYABLE_INTEGER, /* .overlayable */
-    0, /* .membersSize */
-    0, /* .binaryEncodingId */
-    RedundancySupport_members /* .members */
+    4, /* .membersSize */
+    769, /* .binaryEncodingId */
+    SetMonitoringModeRequest_members /* .members */
 },
-/* BrowsePath */
+/* SetMonitoringModeResponse */
 {
-    UA_TYPENAME("BrowsePath") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {543}}, /* .typeId */
-    sizeof(UA_BrowsePath), /* .memSize */
-    UA_TYPES_BROWSEPATH, /* .typeIndex */
+    UA_TYPENAME("SetMonitoringModeResponse") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {770}}, /* .typeId */
+    sizeof(UA_SetMonitoringModeResponse), /* .memSize */
+    UA_TYPES_SETMONITORINGMODERESPONSE, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    2, /* .membersSize */
-    545, /* .binaryEncodingId */
-    BrowsePath_members /* .members */
+    3, /* .membersSize */
+    772, /* .binaryEncodingId */
+    SetMonitoringModeResponse_members /* .members */
 },
-/* ObjectAttributes */
+/* SetTriggeringRequest */
 {
-    UA_TYPENAME("ObjectAttributes") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {352}}, /* .typeId */
-    sizeof(UA_ObjectAttributes), /* .memSize */
-    UA_TYPES_OBJECTATTRIBUTES, /* .typeIndex */
+    UA_TYPENAME("SetTriggeringRequest") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {773}}, /* .typeId */
+    sizeof(UA_SetTriggeringRequest), /* .memSize */
+    UA_TYPES_SETTRIGGERINGREQUEST, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    6, /* .membersSize */
-    354, /* .binaryEncodingId */
-    ObjectAttributes_members /* .members */
+    5, /* .membersSize */
+    775, /* .binaryEncodingId */
+    SetTriggeringRequest_members /* .members */
 },
-/* PublishRequest */
+/* SetTriggeringResponse */
 {
-    UA_TYPENAME("PublishRequest") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {824}}, /* .typeId */
-    sizeof(UA_PublishRequest), /* .memSize */
-    UA_TYPES_PUBLISHREQUEST, /* .typeIndex */
+    UA_TYPENAME("SetTriggeringResponse") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {776}}, /* .typeId */
+    sizeof(UA_SetTriggeringResponse), /* .memSize */
+    UA_TYPES_SETTRIGGERINGRESPONSE, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    2, /* .membersSize */
-    826, /* .binaryEncodingId */
-    PublishRequest_members /* .members */
+    5, /* .membersSize */
+    778, /* .binaryEncodingId */
+    SetTriggeringResponse_members /* .members */
 },
-/* FindServersRequest */
+/* DeleteMonitoredItemsRequest */
 {
-    UA_TYPENAME("FindServersRequest") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {420}}, /* .typeId */
-    sizeof(UA_FindServersRequest), /* .memSize */
-    UA_TYPES_FINDSERVERSREQUEST, /* .typeIndex */
+    UA_TYPENAME("DeleteMonitoredItemsRequest") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {779}}, /* .typeId */
+    sizeof(UA_DeleteMonitoredItemsRequest), /* .memSize */
+    UA_TYPES_DELETEMONITOREDITEMSREQUEST, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    4, /* .membersSize */
-    422, /* .binaryEncodingId */
-    FindServersRequest_members /* .members */
+    3, /* .membersSize */
+    781, /* .binaryEncodingId */
+    DeleteMonitoredItemsRequest_members /* .members */
 },
-/* ReferenceDescription */
+/* DeleteMonitoredItemsResponse */
 {
-    UA_TYPENAME("ReferenceDescription") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {518}}, /* .typeId */
-    sizeof(UA_ReferenceDescription), /* .memSize */
-    UA_TYPES_REFERENCEDESCRIPTION, /* .typeIndex */
+    UA_TYPENAME("DeleteMonitoredItemsResponse") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {782}}, /* .typeId */
+    sizeof(UA_DeleteMonitoredItemsResponse), /* .memSize */
+    UA_TYPES_DELETEMONITOREDITEMSRESPONSE, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    7, /* .membersSize */
-    520, /* .binaryEncodingId */
-    ReferenceDescription_members /* .members */
+    3, /* .membersSize */
+    784, /* .binaryEncodingId */
+    DeleteMonitoredItemsResponse_members /* .members */
 },
 /* CreateSubscriptionRequest */
 {
@@ -17408,495 +18440,520 @@ const UA_DataType UA_TYPES[UA_TYPES_COUNT] = {
     787, /* .binaryEncodingId */
     CreateSubscriptionRequest_members /* .members */
 },
-/* CallResponse */
+/* CreateSubscriptionResponse */
 {
-    UA_TYPENAME("CallResponse") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {713}}, /* .typeId */
-    sizeof(UA_CallResponse), /* .memSize */
-    UA_TYPES_CALLRESPONSE, /* .typeIndex */
+    UA_TYPENAME("CreateSubscriptionResponse") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {788}}, /* .typeId */
+    sizeof(UA_CreateSubscriptionResponse), /* .memSize */
+    UA_TYPES_CREATESUBSCRIPTIONRESPONSE, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    3, /* .membersSize */
-    715, /* .binaryEncodingId */
-    CallResponse_members /* .members */
+    5, /* .membersSize */
+    790, /* .binaryEncodingId */
+    CreateSubscriptionResponse_members /* .members */
 },
-/* DeleteNodesResponse */
+/* ModifySubscriptionRequest */
 {
-    UA_TYPENAME("DeleteNodesResponse") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {501}}, /* .typeId */
-    sizeof(UA_DeleteNodesResponse), /* .memSize */
-    UA_TYPES_DELETENODESRESPONSE, /* .typeIndex */
+    UA_TYPENAME("ModifySubscriptionRequest") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {791}}, /* .typeId */
+    sizeof(UA_ModifySubscriptionRequest), /* .memSize */
+    UA_TYPES_MODIFYSUBSCRIPTIONREQUEST, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    3, /* .membersSize */
-    503, /* .binaryEncodingId */
-    DeleteNodesResponse_members /* .members */
+    7, /* .membersSize */
+    793, /* .binaryEncodingId */
+    ModifySubscriptionRequest_members /* .members */
 },
-/* ModifyMonitoredItemsRequest */
+/* ModifySubscriptionResponse */
 {
-    UA_TYPENAME("ModifyMonitoredItemsRequest") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {761}}, /* .typeId */
-    sizeof(UA_ModifyMonitoredItemsRequest), /* .memSize */
-    UA_TYPES_MODIFYMONITOREDITEMSREQUEST, /* .typeIndex */
+    UA_TYPENAME("ModifySubscriptionResponse") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {794}}, /* .typeId */
+    sizeof(UA_ModifySubscriptionResponse), /* .memSize */
+    UA_TYPES_MODIFYSUBSCRIPTIONRESPONSE, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
     4, /* .membersSize */
-    763, /* .binaryEncodingId */
-    ModifyMonitoredItemsRequest_members /* .members */
+    796, /* .binaryEncodingId */
+    ModifySubscriptionResponse_members /* .members */
 },
-/* ServiceFault */
+/* SetPublishingModeRequest */
 {
-    UA_TYPENAME("ServiceFault") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {395}}, /* .typeId */
-    sizeof(UA_ServiceFault), /* .memSize */
-    UA_TYPES_SERVICEFAULT, /* .typeIndex */
+    UA_TYPENAME("SetPublishingModeRequest") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {797}}, /* .typeId */
+    sizeof(UA_SetPublishingModeRequest), /* .memSize */
+    UA_TYPES_SETPUBLISHINGMODEREQUEST, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    1, /* .membersSize */
-    397, /* .binaryEncodingId */
-    ServiceFault_members /* .members */
+    3, /* .membersSize */
+    799, /* .binaryEncodingId */
+    SetPublishingModeRequest_members /* .members */
 },
-/* PublishResponse */
+/* SetPublishingModeResponse */
 {
-    UA_TYPENAME("PublishResponse") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {827}}, /* .typeId */
-    sizeof(UA_PublishResponse), /* .memSize */
-    UA_TYPES_PUBLISHRESPONSE, /* .typeIndex */
+    UA_TYPENAME("SetPublishingModeResponse") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {800}}, /* .typeId */
+    sizeof(UA_SetPublishingModeResponse), /* .memSize */
+    UA_TYPES_SETPUBLISHINGMODERESPONSE, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    7, /* .membersSize */
-    829, /* .binaryEncodingId */
-    PublishResponse_members /* .members */
+    3, /* .membersSize */
+    802, /* .binaryEncodingId */
+    SetPublishingModeResponse_members /* .members */
 },
-/* CreateMonitoredItemsRequest */
+/* NotificationMessage */
 {
-    UA_TYPENAME("CreateMonitoredItemsRequest") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {749}}, /* .typeId */
-    sizeof(UA_CreateMonitoredItemsRequest), /* .memSize */
-    UA_TYPES_CREATEMONITOREDITEMSREQUEST, /* .typeIndex */
+    UA_TYPENAME("NotificationMessage") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {803}}, /* .typeId */
+    sizeof(UA_NotificationMessage), /* .memSize */
+    UA_TYPES_NOTIFICATIONMESSAGE, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    4, /* .membersSize */
-    751, /* .binaryEncodingId */
-    CreateMonitoredItemsRequest_members /* .members */
+    3, /* .membersSize */
+    805, /* .binaryEncodingId */
+    NotificationMessage_members /* .members */
 },
-/* OpenSecureChannelRequest */
+/* MonitoredItemNotification */
 {
-    UA_TYPENAME("OpenSecureChannelRequest") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {444}}, /* .typeId */
-    sizeof(UA_OpenSecureChannelRequest), /* .memSize */
-    UA_TYPES_OPENSECURECHANNELREQUEST, /* .typeIndex */
+    UA_TYPENAME("MonitoredItemNotification") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {806}}, /* .typeId */
+    sizeof(UA_MonitoredItemNotification), /* .memSize */
+    UA_TYPES_MONITOREDITEMNOTIFICATION, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    6, /* .membersSize */
-    446, /* .binaryEncodingId */
-    OpenSecureChannelRequest_members /* .members */
+    2, /* .membersSize */
+    808, /* .binaryEncodingId */
+    MonitoredItemNotification_members /* .members */
 },
-/* CloseSessionRequest */
+/* EventFieldList */
 {
-    UA_TYPENAME("CloseSessionRequest") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {471}}, /* .typeId */
-    sizeof(UA_CloseSessionRequest), /* .memSize */
-    UA_TYPES_CLOSESESSIONREQUEST, /* .typeIndex */
+    UA_TYPENAME("EventFieldList") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {917}}, /* .typeId */
+    sizeof(UA_EventFieldList), /* .memSize */
+    UA_TYPES_EVENTFIELDLIST, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
     2, /* .membersSize */
-    473, /* .binaryEncodingId */
-    CloseSessionRequest_members /* .members */
+    919, /* .binaryEncodingId */
+    EventFieldList_members /* .members */
 },
-/* SetTriggeringRequest */
+/* HistoryEventFieldList */
 {
-    UA_TYPENAME("SetTriggeringRequest") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {773}}, /* .typeId */
-    sizeof(UA_SetTriggeringRequest), /* .memSize */
-    UA_TYPES_SETTRIGGERINGREQUEST, /* .typeIndex */
+    UA_TYPENAME("HistoryEventFieldList") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {920}}, /* .typeId */
+    sizeof(UA_HistoryEventFieldList), /* .memSize */
+    UA_TYPES_HISTORYEVENTFIELDLIST, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    5, /* .membersSize */
-    775, /* .binaryEncodingId */
-    SetTriggeringRequest_members /* .members */
+    1, /* .membersSize */
+    922, /* .binaryEncodingId */
+    HistoryEventFieldList_members /* .members */
 },
-/* BrowseResult */
+/* StatusChangeNotification */
 {
-    UA_TYPENAME("BrowseResult") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {522}}, /* .typeId */
-    sizeof(UA_BrowseResult), /* .memSize */
-    UA_TYPES_BROWSERESULT, /* .typeIndex */
+    UA_TYPENAME("StatusChangeNotification") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {818}}, /* .typeId */
+    sizeof(UA_StatusChangeNotification), /* .memSize */
+    UA_TYPES_STATUSCHANGENOTIFICATION, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    3, /* .membersSize */
-    524, /* .binaryEncodingId */
-    BrowseResult_members /* .members */
+    2, /* .membersSize */
+    820, /* .binaryEncodingId */
+    StatusChangeNotification_members /* .members */
 },
-/* AddReferencesRequest */
+/* SubscriptionAcknowledgement */
 {
-    UA_TYPENAME("AddReferencesRequest") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {492}}, /* .typeId */
-    sizeof(UA_AddReferencesRequest), /* .memSize */
-    UA_TYPES_ADDREFERENCESREQUEST, /* .typeIndex */
+    UA_TYPENAME("SubscriptionAcknowledgement") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {821}}, /* .typeId */
+    sizeof(UA_SubscriptionAcknowledgement), /* .memSize */
+    UA_TYPES_SUBSCRIPTIONACKNOWLEDGEMENT, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
-    false, /* .pointerFree */
+    true, /* .pointerFree */
     false, /* .overlayable */
     2, /* .membersSize */
-    494, /* .binaryEncodingId */
-    AddReferencesRequest_members /* .members */
+    823, /* .binaryEncodingId */
+    SubscriptionAcknowledgement_members /* .members */
 },
-/* AddNodesItem */
+/* PublishRequest */
 {
-    UA_TYPENAME("AddNodesItem") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {376}}, /* .typeId */
-    sizeof(UA_AddNodesItem), /* .memSize */
-    UA_TYPES_ADDNODESITEM, /* .typeIndex */
+    UA_TYPENAME("PublishRequest") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {824}}, /* .typeId */
+    sizeof(UA_PublishRequest), /* .memSize */
+    UA_TYPES_PUBLISHREQUEST, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    7, /* .membersSize */
-    378, /* .binaryEncodingId */
-    AddNodesItem_members /* .members */
+    2, /* .membersSize */
+    826, /* .binaryEncodingId */
+    PublishRequest_members /* .members */
 },
-/* ServerStatusDataType */
+/* PublishResponse */
 {
-    UA_TYPENAME("ServerStatusDataType") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {862}}, /* .typeId */
-    sizeof(UA_ServerStatusDataType), /* .memSize */
-    UA_TYPES_SERVERSTATUSDATATYPE, /* .typeIndex */
+    UA_TYPENAME("PublishResponse") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {827}}, /* .typeId */
+    sizeof(UA_PublishResponse), /* .memSize */
+    UA_TYPES_PUBLISHRESPONSE, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    6, /* .membersSize */
-    864, /* .binaryEncodingId */
-    ServerStatusDataType_members /* .members */
+    7, /* .membersSize */
+    829, /* .binaryEncodingId */
+    PublishResponse_members /* .members */
 },
-/* BrowseNextResponse */
+/* RepublishRequest */
 {
-    UA_TYPENAME("BrowseNextResponse") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {534}}, /* .typeId */
-    sizeof(UA_BrowseNextResponse), /* .memSize */
-    UA_TYPES_BROWSENEXTRESPONSE, /* .typeIndex */
+    UA_TYPENAME("RepublishRequest") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {830}}, /* .typeId */
+    sizeof(UA_RepublishRequest), /* .memSize */
+    UA_TYPES_REPUBLISHREQUEST, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
     3, /* .membersSize */
-    536, /* .binaryEncodingId */
-    BrowseNextResponse_members /* .members */
+    832, /* .binaryEncodingId */
+    RepublishRequest_members /* .members */
 },
-/* AxisInformation */
+/* RepublishResponse */
 {
-    UA_TYPENAME("AxisInformation") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {12079}}, /* .typeId */
-    sizeof(UA_AxisInformation), /* .memSize */
-    UA_TYPES_AXISINFORMATION, /* .typeIndex */
+    UA_TYPENAME("RepublishResponse") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {833}}, /* .typeId */
+    sizeof(UA_RepublishResponse), /* .memSize */
+    UA_TYPES_REPUBLISHRESPONSE, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    5, /* .membersSize */
-    12089, /* .binaryEncodingId */
-    AxisInformation_members /* .members */
+    2, /* .membersSize */
+    835, /* .binaryEncodingId */
+    RepublishResponse_members /* .members */
 },
-/* ApplicationDescription */
+/* DeleteSubscriptionsRequest */
 {
-    UA_TYPENAME("ApplicationDescription") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {308}}, /* .typeId */
-    sizeof(UA_ApplicationDescription), /* .memSize */
-    UA_TYPES_APPLICATIONDESCRIPTION, /* .typeIndex */
+    UA_TYPENAME("DeleteSubscriptionsRequest") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {845}}, /* .typeId */
+    sizeof(UA_DeleteSubscriptionsRequest), /* .memSize */
+    UA_TYPES_DELETESUBSCRIPTIONSREQUEST, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    7, /* .membersSize */
-    310, /* .binaryEncodingId */
-    ApplicationDescription_members /* .members */
+    2, /* .membersSize */
+    847, /* .binaryEncodingId */
+    DeleteSubscriptionsRequest_members /* .members */
 },
-/* ReadRequest */
+/* DeleteSubscriptionsResponse */
 {
-    UA_TYPENAME("ReadRequest") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {629}}, /* .typeId */
-    sizeof(UA_ReadRequest), /* .memSize */
-    UA_TYPES_READREQUEST, /* .typeIndex */
+    UA_TYPENAME("DeleteSubscriptionsResponse") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {848}}, /* .typeId */
+    sizeof(UA_DeleteSubscriptionsResponse), /* .memSize */
+    UA_TYPES_DELETESUBSCRIPTIONSRESPONSE, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    4, /* .membersSize */
-    631, /* .binaryEncodingId */
-    ReadRequest_members /* .members */
+    3, /* .membersSize */
+    850, /* .binaryEncodingId */
+    DeleteSubscriptionsResponse_members /* .members */
 },
-/* ActivateSessionRequest */
+/* BuildInfo */
 {
-    UA_TYPENAME("ActivateSessionRequest") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {465}}, /* .typeId */
-    sizeof(UA_ActivateSessionRequest), /* .memSize */
-    UA_TYPES_ACTIVATESESSIONREQUEST, /* .typeIndex */
+    UA_TYPENAME("BuildInfo") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {338}}, /* .typeId */
+    sizeof(UA_BuildInfo), /* .memSize */
+    UA_TYPES_BUILDINFO, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
     6, /* .membersSize */
-    467, /* .binaryEncodingId */
-    ActivateSessionRequest_members /* .members */
+    340, /* .binaryEncodingId */
+    BuildInfo_members /* .members */
 },
-/* BrowsePathResult */
+/* RedundancySupport */
 {
-    UA_TYPENAME("BrowsePathResult") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {549}}, /* .typeId */
-    sizeof(UA_BrowsePathResult), /* .memSize */
-    UA_TYPES_BROWSEPATHRESULT, /* .typeIndex */
-    UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
-    false, /* .pointerFree */
-    false, /* .overlayable */
-    2, /* .membersSize */
-    551, /* .binaryEncodingId */
-    BrowsePathResult_members /* .members */
+    UA_TYPENAME("RedundancySupport") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {851}}, /* .typeId */
+    sizeof(UA_RedundancySupport), /* .memSize */
+    UA_TYPES_INT32, /* .typeIndex */
+    UA_DATATYPEKIND_ENUM, /* .typeKind */
+    true, /* .pointerFree */
+    UA_BINARY_OVERLAYABLE_INTEGER, /* .overlayable */
+    0, /* .membersSize */
+    0, /* .binaryEncodingId */
+    RedundancySupport_members /* .members */
 },
-/* AddNodesRequest */
+/* ServerState */
 {
-    UA_TYPENAME("AddNodesRequest") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {486}}, /* .typeId */
-    sizeof(UA_AddNodesRequest), /* .memSize */
-    UA_TYPES_ADDNODESREQUEST, /* .typeIndex */
-    UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
-    false, /* .pointerFree */
-    false, /* .overlayable */
-    2, /* .membersSize */
-    488, /* .binaryEncodingId */
-    AddNodesRequest_members /* .members */
+    UA_TYPENAME("ServerState") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {852}}, /* .typeId */
+    sizeof(UA_ServerState), /* .memSize */
+    UA_TYPES_INT32, /* .typeIndex */
+    UA_DATATYPEKIND_ENUM, /* .typeKind */
+    true, /* .pointerFree */
+    UA_BINARY_OVERLAYABLE_INTEGER, /* .overlayable */
+    0, /* .membersSize */
+    0, /* .binaryEncodingId */
+    ServerState_members /* .members */
 },
-/* BrowseRequest */
+/* ServerDiagnosticsSummaryDataType */
 {
-    UA_TYPENAME("BrowseRequest") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {525}}, /* .typeId */
-    sizeof(UA_BrowseRequest), /* .memSize */
-    UA_TYPES_BROWSEREQUEST, /* .typeIndex */
+    UA_TYPENAME("ServerDiagnosticsSummaryDataType") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {859}}, /* .typeId */
+    sizeof(UA_ServerDiagnosticsSummaryDataType), /* .memSize */
+    UA_TYPES_SERVERDIAGNOSTICSSUMMARYDATATYPE, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
-    false, /* .pointerFree */
+    true, /* .pointerFree */
     false, /* .overlayable */
-    4, /* .membersSize */
-    527, /* .binaryEncodingId */
-    BrowseRequest_members /* .members */
+    12, /* .membersSize */
+    861, /* .binaryEncodingId */
+    ServerDiagnosticsSummaryDataType_members /* .members */
 },
-/* WriteRequest */
+/* ServerStatusDataType */
 {
-    UA_TYPENAME("WriteRequest") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {671}}, /* .typeId */
-    sizeof(UA_WriteRequest), /* .memSize */
-    UA_TYPES_WRITEREQUEST, /* .typeIndex */
+    UA_TYPENAME("ServerStatusDataType") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {862}}, /* .typeId */
+    sizeof(UA_ServerStatusDataType), /* .memSize */
+    UA_TYPES_SERVERSTATUSDATATYPE, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    2, /* .membersSize */
-    673, /* .binaryEncodingId */
-    WriteRequest_members /* .members */
+    6, /* .membersSize */
+    864, /* .binaryEncodingId */
+    ServerStatusDataType_members /* .members */
 },
-/* AddNodesResponse */
+/* Range */
 {
-    UA_TYPENAME("AddNodesResponse") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {489}}, /* .typeId */
-    sizeof(UA_AddNodesResponse), /* .memSize */
-    UA_TYPES_ADDNODESRESPONSE, /* .typeIndex */
+    UA_TYPENAME("Range") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {884}}, /* .typeId */
+    sizeof(UA_Range), /* .memSize */
+    UA_TYPES_RANGE, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
-    false, /* .pointerFree */
+    true, /* .pointerFree */
     false, /* .overlayable */
-    3, /* .membersSize */
-    491, /* .binaryEncodingId */
-    AddNodesResponse_members /* .members */
+    2, /* .membersSize */
+    886, /* .binaryEncodingId */
+    Range_members /* .members */
 },
-/* AttributeOperand */
+/* EUInformation */
 {
-    UA_TYPENAME("AttributeOperand") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {598}}, /* .typeId */
-    sizeof(UA_AttributeOperand), /* .memSize */
-    UA_TYPES_ATTRIBUTEOPERAND, /* .typeIndex */
+    UA_TYPENAME("EUInformation") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {887}}, /* .typeId */
+    sizeof(UA_EUInformation), /* .memSize */
+    UA_TYPES_EUINFORMATION, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    5, /* .membersSize */
-    600, /* .binaryEncodingId */
-    AttributeOperand_members /* .members */
+    4, /* .membersSize */
+    889, /* .binaryEncodingId */
+    EUInformation_members /* .members */
 },
-/* DataChangeFilter */
+/* AxisScaleEnumeration */
 {
-    UA_TYPENAME("DataChangeFilter") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {722}}, /* .typeId */
-    sizeof(UA_DataChangeFilter), /* .memSize */
-    UA_TYPES_DATACHANGEFILTER, /* .typeIndex */
-    UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
+    UA_TYPENAME("AxisScaleEnumeration") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {12077}}, /* .typeId */
+    sizeof(UA_AxisScaleEnumeration), /* .memSize */
+    UA_TYPES_INT32, /* .typeIndex */
+    UA_DATATYPEKIND_ENUM, /* .typeKind */
     true, /* .pointerFree */
-    false, /* .overlayable */
-    3, /* .membersSize */
-    724, /* .binaryEncodingId */
-    DataChangeFilter_members /* .members */
+    UA_BINARY_OVERLAYABLE_INTEGER, /* .overlayable */
+    0, /* .membersSize */
+    0, /* .binaryEncodingId */
+    AxisScaleEnumeration_members /* .members */
 },
-/* EndpointDescription */
+/* ComplexNumberType */
 {
-    UA_TYPENAME("EndpointDescription") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {312}}, /* .typeId */
-    sizeof(UA_EndpointDescription), /* .memSize */
-    UA_TYPES_ENDPOINTDESCRIPTION, /* .typeIndex */
+    UA_TYPENAME("ComplexNumberType") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {12171}}, /* .typeId */
+    sizeof(UA_ComplexNumberType), /* .memSize */
+    UA_TYPES_COMPLEXNUMBERTYPE, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
-    false, /* .pointerFree */
+    true, /* .pointerFree */
     false, /* .overlayable */
-    8, /* .membersSize */
-    314, /* .binaryEncodingId */
-    EndpointDescription_members /* .members */
+    2, /* .membersSize */
+    12181, /* .binaryEncodingId */
+    ComplexNumberType_members /* .members */
 },
-/* DeleteReferencesRequest */
+/* DoubleComplexNumberType */
 {
-    UA_TYPENAME("DeleteReferencesRequest") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {504}}, /* .typeId */
-    sizeof(UA_DeleteReferencesRequest), /* .memSize */
-    UA_TYPES_DELETEREFERENCESREQUEST, /* .typeIndex */
+    UA_TYPENAME("DoubleComplexNumberType") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {12172}}, /* .typeId */
+    sizeof(UA_DoubleComplexNumberType), /* .memSize */
+    UA_TYPES_DOUBLECOMPLEXNUMBERTYPE, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
-    false, /* .pointerFree */
+    true, /* .pointerFree */
     false, /* .overlayable */
     2, /* .membersSize */
-    506, /* .binaryEncodingId */
-    DeleteReferencesRequest_members /* .members */
+    12182, /* .binaryEncodingId */
+    DoubleComplexNumberType_members /* .members */
 },
-/* TranslateBrowsePathsToNodeIdsRequest */
+/* AxisInformation */
 {
-    UA_TYPENAME("TranslateBrowsePathsToNodeIdsRequest") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {552}}, /* .typeId */
-    sizeof(UA_TranslateBrowsePathsToNodeIdsRequest), /* .memSize */
-    UA_TYPES_TRANSLATEBROWSEPATHSTONODEIDSREQUEST, /* .typeIndex */
+    UA_TYPENAME("AxisInformation") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {12079}}, /* .typeId */
+    sizeof(UA_AxisInformation), /* .memSize */
+    UA_TYPES_AXISINFORMATION, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    2, /* .membersSize */
-    554, /* .binaryEncodingId */
-    TranslateBrowsePathsToNodeIdsRequest_members /* .members */
+    5, /* .membersSize */
+    12089, /* .binaryEncodingId */
+    AxisInformation_members /* .members */
 },
-/* FindServersResponse */
+/* XVType */
 {
-    UA_TYPENAME("FindServersResponse") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {423}}, /* .typeId */
-    sizeof(UA_FindServersResponse), /* .memSize */
-    UA_TYPES_FINDSERVERSRESPONSE, /* .typeIndex */
+    UA_TYPENAME("XVType") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {12080}}, /* .typeId */
+    sizeof(UA_XVType), /* .memSize */
+    UA_TYPES_XVTYPE, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
-    false, /* .pointerFree */
+    true, /* .pointerFree */
     false, /* .overlayable */
     2, /* .membersSize */
-    425, /* .binaryEncodingId */
-    FindServersResponse_members /* .members */
+    12090, /* .binaryEncodingId */
+    XVType_members /* .members */
 },
-/* CreateSessionRequest */
+/* EnumDefinition */
 {
-    UA_TYPENAME("CreateSessionRequest") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {459}}, /* .typeId */
-    sizeof(UA_CreateSessionRequest), /* .memSize */
-    UA_TYPES_CREATESESSIONREQUEST, /* .typeIndex */
+    UA_TYPENAME("EnumDefinition") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {100}}, /* .typeId */
+    sizeof(UA_EnumDefinition), /* .memSize */
+    UA_TYPES_ENUMDEFINITION, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    9, /* .membersSize */
-    461, /* .binaryEncodingId */
-    CreateSessionRequest_members /* .members */
+    1, /* .membersSize */
+    123, /* .binaryEncodingId */
+    EnumDefinition_members /* .members */
 },
-/* ContentFilterElement */
+/* ReadEventDetails */
 {
-    UA_TYPENAME("ContentFilterElement") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {583}}, /* .typeId */
-    sizeof(UA_ContentFilterElement), /* .memSize */
-    UA_TYPES_CONTENTFILTERELEMENT, /* .typeIndex */
+    UA_TYPENAME("ReadEventDetails") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {644}}, /* .typeId */
+    sizeof(UA_ReadEventDetails), /* .memSize */
+    UA_TYPES_READEVENTDETAILS, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    2, /* .membersSize */
-    585, /* .binaryEncodingId */
-    ContentFilterElement_members /* .members */
+    4, /* .membersSize */
+    646, /* .binaryEncodingId */
+    ReadEventDetails_members /* .members */
 },
-/* TranslateBrowsePathsToNodeIdsResponse */
+/* ReadProcessedDetails */
 {
-    UA_TYPENAME("TranslateBrowsePathsToNodeIdsResponse") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {555}}, /* .typeId */
-    sizeof(UA_TranslateBrowsePathsToNodeIdsResponse), /* .memSize */
-    UA_TYPES_TRANSLATEBROWSEPATHSTONODEIDSRESPONSE, /* .typeIndex */
+    UA_TYPENAME("ReadProcessedDetails") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {650}}, /* .typeId */
+    sizeof(UA_ReadProcessedDetails), /* .memSize */
+    UA_TYPES_READPROCESSEDDETAILS, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    3, /* .membersSize */
-    557, /* .binaryEncodingId */
-    TranslateBrowsePathsToNodeIdsResponse_members /* .members */
+    5, /* .membersSize */
+    652, /* .binaryEncodingId */
+    ReadProcessedDetails_members /* .members */
 },
-/* BrowseResponse */
+/* ModificationInfo */
 {
-    UA_TYPENAME("BrowseResponse") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {528}}, /* .typeId */
-    sizeof(UA_BrowseResponse), /* .memSize */
-    UA_TYPES_BROWSERESPONSE, /* .typeIndex */
+    UA_TYPENAME("ModificationInfo") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {11216}}, /* .typeId */
+    sizeof(UA_ModificationInfo), /* .memSize */
+    UA_TYPES_MODIFICATIONINFO, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
     3, /* .membersSize */
-    530, /* .binaryEncodingId */
-    BrowseResponse_members /* .members */
+    11226, /* .binaryEncodingId */
+    ModificationInfo_members /* .members */
 },
-/* CreateSessionResponse */
+/* HistoryModifiedData */
 {
-    UA_TYPENAME("CreateSessionResponse") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {462}}, /* .typeId */
-    sizeof(UA_CreateSessionResponse), /* .memSize */
-    UA_TYPES_CREATESESSIONRESPONSE, /* .typeIndex */
+    UA_TYPENAME("HistoryModifiedData") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {11217}}, /* .typeId */
+    sizeof(UA_HistoryModifiedData), /* .memSize */
+    UA_TYPES_HISTORYMODIFIEDDATA, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    10, /* .membersSize */
-    464, /* .binaryEncodingId */
-    CreateSessionResponse_members /* .members */
+    2, /* .membersSize */
+    11227, /* .binaryEncodingId */
+    HistoryModifiedData_members /* .members */
 },
-/* ContentFilter */
+/* HistoryEvent */
 {
-    UA_TYPENAME("ContentFilter") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {586}}, /* .typeId */
-    sizeof(UA_ContentFilter), /* .memSize */
-    UA_TYPES_CONTENTFILTER, /* .typeIndex */
+    UA_TYPENAME("HistoryEvent") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {659}}, /* .typeId */
+    sizeof(UA_HistoryEvent), /* .memSize */
+    UA_TYPES_HISTORYEVENT, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
     1, /* .membersSize */
-    588, /* .binaryEncodingId */
-    ContentFilter_members /* .members */
+    661, /* .binaryEncodingId */
+    HistoryEvent_members /* .members */
 },
-/* GetEndpointsResponse */
+/* DataChangeNotification */
 {
-    UA_TYPENAME("GetEndpointsResponse") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {429}}, /* .typeId */
-    sizeof(UA_GetEndpointsResponse), /* .memSize */
-    UA_TYPES_GETENDPOINTSRESPONSE, /* .typeIndex */
+    UA_TYPENAME("DataChangeNotification") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {809}}, /* .typeId */
+    sizeof(UA_DataChangeNotification), /* .memSize */
+    UA_TYPES_DATACHANGENOTIFICATION, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
     2, /* .membersSize */
-    431, /* .binaryEncodingId */
-    GetEndpointsResponse_members /* .members */
+    811, /* .binaryEncodingId */
+    DataChangeNotification_members /* .members */
 },
-/* EventFilter */
+/* EventNotificationList */
 {
-    UA_TYPENAME("EventFilter") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {725}}, /* .typeId */
-    sizeof(UA_EventFilter), /* .memSize */
-    UA_TYPES_EVENTFILTER, /* .typeIndex */
+    UA_TYPENAME("EventNotificationList") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {914}}, /* .typeId */
+    sizeof(UA_EventNotificationList), /* .memSize */
+    UA_TYPES_EVENTNOTIFICATIONLIST, /* .typeIndex */
     UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
     false, /* .pointerFree */
     false, /* .overlayable */
-    2, /* .membersSize */
-    727, /* .binaryEncodingId */
-    EventFilter_members /* .members */
+    1, /* .membersSize */
+    916, /* .binaryEncodingId */
+    EventNotificationList_members /* .members */
 },
 };
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/build/src_generated/open62541/transport_generated.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/build/src_generated/open62541/transport_generated.c" ***********************************/
+
+/* Generated from Opc.Ua.Types.bsd, Custom.Opc.Ua.Transport.bsd with script /home/pdie/sonstiges/qtopcua/repos/open62541/tools/generate_datatypes.py
+ * on host mintaka by user pdie at 2021-06-21 11:34:37 */
+
+
+/* MessageType */
+#define MessageType_members NULL
 
-/* Generated from Opc.Ua.Types.bsd, Custom.Opc.Ua.Transport.bsd with script /home/jvoe/open62541/tools/generate_datatypes.py
- * on host rigel by user jvoe at 2020-09-09 11:33:50 */
+/* ChunkType */
+#define ChunkType_members NULL
 
+/* TcpMessageHeader */
+static UA_DataTypeMember TcpMessageHeader_members[2] = {
+{
+    UA_TYPENAME("MessageTypeAndChunkType") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    0, /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
+    false /* .isOptional */
+},
+{
+    UA_TYPENAME("MessageSize") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_TcpMessageHeader, messageSize) - offsetof(UA_TcpMessageHeader, messageTypeAndChunkType) - sizeof(UA_UInt32), /* .padding */
+    true, /* .namespaceZero */
+    false, /* .isArray */
+    false /* .isOptional */
+},};
 
 /* TcpHelloMessage */
 static UA_DataTypeMember TcpHelloMessage_members[6] = {
@@ -17949,10 +19006,10 @@ static UA_DataTypeMember TcpHelloMessage_members[6] = {
     false /* .isOptional */
 },};
 
-/* TcpErrorMessage */
-static UA_DataTypeMember TcpErrorMessage_members[2] = {
+/* TcpAcknowledgeMessage */
+static UA_DataTypeMember TcpAcknowledgeMessage_members[5] = {
 {
-    UA_TYPENAME("Error") /* .memberName */
+    UA_TYPENAME("ProtocolVersion") /* .memberName */
     UA_TYPES_UINT32, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
@@ -17960,48 +19017,42 @@ static UA_DataTypeMember TcpErrorMessage_members[2] = {
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("Reason") /* .memberName */
-    UA_TYPES_STRING, /* .memberTypeIndex */
-    offsetof(UA_TcpErrorMessage, reason) - offsetof(UA_TcpErrorMessage, error) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("ReceiveBufferSize") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_TcpAcknowledgeMessage, receiveBufferSize) - offsetof(UA_TcpAcknowledgeMessage, protocolVersion) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
-},};
-
-/* MessageType */
-#define MessageType_members NULL
-
-/* AsymmetricAlgorithmSecurityHeader */
-static UA_DataTypeMember AsymmetricAlgorithmSecurityHeader_members[3] = {
+},
 {
-    UA_TYPENAME("SecurityPolicyUri") /* .memberName */
-    UA_TYPES_BYTESTRING, /* .memberTypeIndex */
-    0, /* .padding */
+    UA_TYPENAME("SendBufferSize") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_TcpAcknowledgeMessage, sendBufferSize) - offsetof(UA_TcpAcknowledgeMessage, receiveBufferSize) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("SenderCertificate") /* .memberName */
-    UA_TYPES_BYTESTRING, /* .memberTypeIndex */
-    offsetof(UA_AsymmetricAlgorithmSecurityHeader, senderCertificate) - offsetof(UA_AsymmetricAlgorithmSecurityHeader, securityPolicyUri) - sizeof(UA_ByteString), /* .padding */
+    UA_TYPENAME("MaxMessageSize") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_TcpAcknowledgeMessage, maxMessageSize) - offsetof(UA_TcpAcknowledgeMessage, sendBufferSize) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("ReceiverCertificateThumbprint") /* .memberName */
-    UA_TYPES_BYTESTRING, /* .memberTypeIndex */
-    offsetof(UA_AsymmetricAlgorithmSecurityHeader, receiverCertificateThumbprint) - offsetof(UA_AsymmetricAlgorithmSecurityHeader, senderCertificate) - sizeof(UA_ByteString), /* .padding */
+    UA_TYPENAME("MaxChunkCount") /* .memberName */
+    UA_TYPES_UINT32, /* .memberTypeIndex */
+    offsetof(UA_TcpAcknowledgeMessage, maxChunkCount) - offsetof(UA_TcpAcknowledgeMessage, maxMessageSize) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },};
 
-/* TcpAcknowledgeMessage */
-static UA_DataTypeMember TcpAcknowledgeMessage_members[5] = {
+/* TcpErrorMessage */
+static UA_DataTypeMember TcpErrorMessage_members[2] = {
 {
-    UA_TYPENAME("ProtocolVersion") /* .memberName */
+    UA_TYPENAME("Error") /* .memberName */
     UA_TYPES_UINT32, /* .memberTypeIndex */
     0, /* .padding */
     true, /* .namespaceZero */
@@ -18009,33 +19060,36 @@ static UA_DataTypeMember TcpAcknowledgeMessage_members[5] = {
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("ReceiveBufferSize") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_TcpAcknowledgeMessage, receiveBufferSize) - offsetof(UA_TcpAcknowledgeMessage, protocolVersion) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("Reason") /* .memberName */
+    UA_TYPES_STRING, /* .memberTypeIndex */
+    offsetof(UA_TcpErrorMessage, reason) - offsetof(UA_TcpErrorMessage, error) - sizeof(UA_UInt32), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
-},
+},};
+
+/* AsymmetricAlgorithmSecurityHeader */
+static UA_DataTypeMember AsymmetricAlgorithmSecurityHeader_members[3] = {
 {
-    UA_TYPENAME("SendBufferSize") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_TcpAcknowledgeMessage, sendBufferSize) - offsetof(UA_TcpAcknowledgeMessage, receiveBufferSize) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("SecurityPolicyUri") /* .memberName */
+    UA_TYPES_BYTESTRING, /* .memberTypeIndex */
+    0, /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("MaxMessageSize") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_TcpAcknowledgeMessage, maxMessageSize) - offsetof(UA_TcpAcknowledgeMessage, sendBufferSize) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("SenderCertificate") /* .memberName */
+    UA_TYPES_BYTESTRING, /* .memberTypeIndex */
+    offsetof(UA_AsymmetricAlgorithmSecurityHeader, senderCertificate) - offsetof(UA_AsymmetricAlgorithmSecurityHeader, securityPolicyUri) - sizeof(UA_ByteString), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
 },
 {
-    UA_TYPENAME("MaxChunkCount") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_TcpAcknowledgeMessage, maxChunkCount) - offsetof(UA_TcpAcknowledgeMessage, maxMessageSize) - sizeof(UA_UInt32), /* .padding */
+    UA_TYPENAME("ReceiverCertificateThumbprint") /* .memberName */
+    UA_TYPES_BYTESTRING, /* .memberTypeIndex */
+    offsetof(UA_AsymmetricAlgorithmSecurityHeader, receiverCertificateThumbprint) - offsetof(UA_AsymmetricAlgorithmSecurityHeader, senderCertificate) - sizeof(UA_ByteString), /* .padding */
     true, /* .namespaceZero */
     false, /* .isArray */
     false /* .isOptional */
@@ -18059,29 +19113,46 @@ static UA_DataTypeMember SequenceHeader_members[2] = {
     false, /* .isArray */
     false /* .isOptional */
 },};
-
-/* TcpMessageHeader */
-static UA_DataTypeMember TcpMessageHeader_members[2] = {
+const UA_DataType UA_TRANSPORT[UA_TRANSPORT_COUNT] = {
+/* MessageType */
 {
-    UA_TYPENAME("MessageTypeAndChunkType") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    0, /* .padding */
-    true, /* .namespaceZero */
-    false, /* .isArray */
-    false /* .isOptional */
+    UA_TYPENAME("MessageType") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {0}}, /* .typeId */
+    sizeof(UA_MessageType), /* .memSize */
+    UA_TYPES_INT32, /* .typeIndex */
+    UA_DATATYPEKIND_ENUM, /* .typeKind */
+    true, /* .pointerFree */
+    UA_BINARY_OVERLAYABLE_INTEGER, /* .overlayable */
+    0, /* .membersSize */
+    0, /* .binaryEncodingId */
+    MessageType_members /* .members */
 },
-{
-    UA_TYPENAME("MessageSize") /* .memberName */
-    UA_TYPES_UINT32, /* .memberTypeIndex */
-    offsetof(UA_TcpMessageHeader, messageSize) - offsetof(UA_TcpMessageHeader, messageTypeAndChunkType) - sizeof(UA_UInt32), /* .padding */
-    true, /* .namespaceZero */
-    false, /* .isArray */
-    false /* .isOptional */
-},};
-
 /* ChunkType */
-#define ChunkType_members NULL
-const UA_DataType UA_TRANSPORT[UA_TRANSPORT_COUNT] = {
+{
+    UA_TYPENAME("ChunkType") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {0}}, /* .typeId */
+    sizeof(UA_ChunkType), /* .memSize */
+    UA_TYPES_INT32, /* .typeIndex */
+    UA_DATATYPEKIND_ENUM, /* .typeKind */
+    true, /* .pointerFree */
+    UA_BINARY_OVERLAYABLE_INTEGER, /* .overlayable */
+    0, /* .membersSize */
+    0, /* .binaryEncodingId */
+    ChunkType_members /* .members */
+},
+/* TcpMessageHeader */
+{
+    UA_TYPENAME("TcpMessageHeader") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {0}}, /* .typeId */
+    sizeof(UA_TcpMessageHeader), /* .memSize */
+    UA_TRANSPORT_TCPMESSAGEHEADER, /* .typeIndex */
+    UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
+    true, /* .pointerFree */
+    false, /* .overlayable */
+    2, /* .membersSize */
+    0, /* .binaryEncodingId */
+    TcpMessageHeader_members /* .members */
+},
 /* TcpHelloMessage */
 {
     UA_TYPENAME("TcpHelloMessage") /* .typeName */
@@ -18095,6 +19166,19 @@ const UA_DataType UA_TRANSPORT[UA_TRANSPORT_COUNT] = {
     0, /* .binaryEncodingId */
     TcpHelloMessage_members /* .members */
 },
+/* TcpAcknowledgeMessage */
+{
+    UA_TYPENAME("TcpAcknowledgeMessage") /* .typeName */
+    {0, UA_NODEIDTYPE_NUMERIC, {0}}, /* .typeId */
+    sizeof(UA_TcpAcknowledgeMessage), /* .memSize */
+    UA_TRANSPORT_TCPACKNOWLEDGEMESSAGE, /* .typeIndex */
+    UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
+    true, /* .pointerFree */
+    false, /* .overlayable */
+    5, /* .membersSize */
+    0, /* .binaryEncodingId */
+    TcpAcknowledgeMessage_members /* .members */
+},
 /* TcpErrorMessage */
 {
     UA_TYPENAME("TcpErrorMessage") /* .typeName */
@@ -18108,19 +19192,6 @@ const UA_DataType UA_TRANSPORT[UA_TRANSPORT_COUNT] = {
     0, /* .binaryEncodingId */
     TcpErrorMessage_members /* .members */
 },
-/* MessageType */
-{
-    UA_TYPENAME("MessageType") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {0}}, /* .typeId */
-    sizeof(UA_MessageType), /* .memSize */
-    UA_TYPES_INT32, /* .typeIndex */
-    UA_DATATYPEKIND_ENUM, /* .typeKind */
-    true, /* .pointerFree */
-    UA_BINARY_OVERLAYABLE_INTEGER, /* .overlayable */
-    0, /* .membersSize */
-    0, /* .binaryEncodingId */
-    MessageType_members /* .members */
-},
 /* AsymmetricAlgorithmSecurityHeader */
 {
     UA_TYPENAME("AsymmetricAlgorithmSecurityHeader") /* .typeName */
@@ -18134,19 +19205,6 @@ const UA_DataType UA_TRANSPORT[UA_TRANSPORT_COUNT] = {
     0, /* .binaryEncodingId */
     AsymmetricAlgorithmSecurityHeader_members /* .members */
 },
-/* TcpAcknowledgeMessage */
-{
-    UA_TYPENAME("TcpAcknowledgeMessage") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {0}}, /* .typeId */
-    sizeof(UA_TcpAcknowledgeMessage), /* .memSize */
-    UA_TRANSPORT_TCPACKNOWLEDGEMESSAGE, /* .typeIndex */
-    UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
-    true, /* .pointerFree */
-    false, /* .overlayable */
-    5, /* .membersSize */
-    0, /* .binaryEncodingId */
-    TcpAcknowledgeMessage_members /* .members */
-},
 /* SequenceHeader */
 {
     UA_TYPENAME("SequenceHeader") /* .typeName */
@@ -18160,40 +19218,14 @@ const UA_DataType UA_TRANSPORT[UA_TRANSPORT_COUNT] = {
     0, /* .binaryEncodingId */
     SequenceHeader_members /* .members */
 },
-/* TcpMessageHeader */
-{
-    UA_TYPENAME("TcpMessageHeader") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {0}}, /* .typeId */
-    sizeof(UA_TcpMessageHeader), /* .memSize */
-    UA_TRANSPORT_TCPMESSAGEHEADER, /* .typeIndex */
-    UA_DATATYPEKIND_STRUCTURE, /* .typeKind */
-    true, /* .pointerFree */
-    false, /* .overlayable */
-    2, /* .membersSize */
-    0, /* .binaryEncodingId */
-    TcpMessageHeader_members /* .members */
-},
-/* ChunkType */
-{
-    UA_TYPENAME("ChunkType") /* .typeName */
-    {0, UA_NODEIDTYPE_NUMERIC, {0}}, /* .typeId */
-    sizeof(UA_ChunkType), /* .memSize */
-    UA_TYPES_INT32, /* .typeIndex */
-    UA_DATATYPEKIND_ENUM, /* .typeKind */
-    true, /* .pointerFree */
-    UA_BINARY_OVERLAYABLE_INTEGER, /* .overlayable */
-    0, /* .membersSize */
-    0, /* .binaryEncodingId */
-    ChunkType_members /* .members */
-},
 };
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/build/src_generated/open62541/statuscodes.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/build/src_generated/open62541/statuscodes.c" ***********************************/
 
 /**********************************************************
  * Autogenerated -- do not modify
- * Generated from /home/jvoe/open62541/tools/schema/StatusCode.csv with script /home/jvoe/open62541/tools/generate_statuscode_descriptions.py
+ * Generated from /home/pdie/sonstiges/qtopcua/repos/open62541/tools/schema/StatusCode.csv with script /home/pdie/sonstiges/qtopcua/repos/open62541/tools/generate_statuscode_descriptions.py
  *********************************************************/
 
 
@@ -18459,7 +19491,7 @@ const char * UA_StatusCode_name(UA_StatusCode code) {
 
 #endif
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/ua_util.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/ua_util.c" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -18757,7 +19789,7 @@ UA_NodeId_print(const UA_NodeId *id, UA_String *output) {
     return UA_STATUSCODE_GOOD;
 }
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/ua_workqueue.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/ua_workqueue.c" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -19020,7 +20052,7 @@ void UA_WorkQueue_manuallyProcessDelayed(UA_WorkQueue *wq) {
 #endif
 }
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/ua_timer.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/ua_timer.c" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -19217,7 +20249,7 @@ UA_Timer_deleteMembers(UA_Timer *t) {
     ZIP_INIT(&t->root);
 }
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/ua_connection.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/ua_connection.c" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -19289,7 +20321,7 @@ UA_Connection_attachSecureChannel(UA_Connection *connection, UA_SecureChannel *c
         UA_atomic_xchg((void**)&connection->channel, (void*)channel);
 }
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/ua_securechannel.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/ua_securechannel.c" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -20194,7 +21226,7 @@ UA_SecureChannel_receive(UA_SecureChannel *channel, void *application,
     return retval;
 }
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/ua_securechannel_crypto.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/ua_securechannel_crypto.c" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -20837,7 +21869,7 @@ UA_SecurityPolicy_getRemoteAsymEncryptionBufferLengthOverhead(const UA_SecurityP
     return maxNumberOfBlocks * (encryptedBlockSize - plainTextBlockSize);
 }
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/server/ua_session.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/server/ua_session.c" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -20991,7 +22023,7 @@ UA_Session_queuePublishReq(UA_Session *session, UA_PublishResponseEntry* entry,
 
 #endif
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/server/ua_nodes.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/server/ua_nodes.c" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -21769,7 +22801,7 @@ void UA_Node_deleteReferences(UA_Node *node) {
     UA_Node_deleteReferencesSubset(node, 0, NULL);
 }
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/server/ua_server.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/server/ua_server.c" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -22558,7 +23590,7 @@ UA_Server_AccessControl_allowHistoryUpdateDeleteRawModified(UA_Server *server,
 }
 #endif /* UA_ENABLE_HISTORIZING */
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/server/ua_server_ns0.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/server/ua_server_ns0.c" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -23657,7 +24689,7 @@ UA_Server_initNS0(UA_Server *server) {
     return UA_STATUSCODE_GOOD;
 }
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/server/ua_server_config.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/server/ua_server_config.c" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -23776,7 +24808,7 @@ UA_ServerConfig_addPubSubTransportLayer(UA_ServerConfig *config,
 }
 #endif /* UA_ENABLE_PUBSUB */
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/server/ua_server_binary.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/server/ua_server_binary.c" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -24665,7 +25697,7 @@ UA_Server_removeConnection(UA_Server *server, UA_Connection *connection) {
 #endif
 }
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/server/ua_server_utils.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/server/ua_server_utils.c" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -25051,7 +26083,7 @@ const UA_ViewAttributes UA_ViewAttributes_default = {
 };
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/server/ua_server_discovery.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/server/ua_server_discovery.c" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -25190,7 +26222,7 @@ UA_Server_unregister_discovery(UA_Server *server, UA_Client *client) {
 
 #endif /* UA_ENABLE_DISCOVERY */
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/server/ua_server_async.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/server/ua_server_async.c" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -25617,7 +26649,7 @@ UA_Server_processServiceOperationsAsync(UA_Server *server, UA_Session *session,
 
 #endif
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/pubsub/ua_pubsub_networkmessage.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/pubsub/ua_pubsub_networkmessage.c" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -27034,7 +28066,7 @@ void UA_DataSetMessage_free(const UA_DataSetMessage* p) {
 }
 #endif /* UA_ENABLE_PUBSUB */
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/pubsub/ua_pubsub_writer.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/pubsub/ua_pubsub_writer.c" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -29144,7 +30176,7 @@ UA_WriterGroup_addPublishCallback(UA_Server *server, UA_WriterGroup *writerGroup
 
 #endif /* UA_ENABLE_PUBSUB */
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/pubsub/ua_pubsub_reader.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/pubsub/ua_pubsub_reader.c" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -29854,7 +30886,7 @@ UA_Server_processNetworkMessage(UA_Server *server, UA_NetworkMessage *pMsg,
 
 #endif /* UA_ENABLE_PUBSUB */
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/pubsub/ua_pubsub_manager.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/pubsub/ua_pubsub_manager.c" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -30191,7 +31223,7 @@ UA_PubSubManager_removeRepeatedPubSubCallback(UA_Server *server, UA_UInt64 callb
 
 #endif /* UA_ENABLE_PUBSUB */
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/pubsub/ua_pubsub_ns0.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/pubsub/ua_pubsub_ns0.c" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -31347,7 +32379,7 @@ UA_Server_initPubSubNS0(UA_Server *server) {
 
 #endif /* UA_ENABLE_PUBSUB_INFORMATIONMODEL */
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/server/ua_services_view.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/server/ua_services_view.c" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -32545,7 +33577,7 @@ void Service_UnregisterNodes(UA_Server *server, UA_Session *session,
     }
 }
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/server/ua_services_method.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/server/ua_services_method.c" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -32990,7 +34022,7 @@ UA_Server_call(UA_Server *server, const UA_CallMethodRequest *request) {
 
 #endif /* UA_ENABLE_METHODCALLS */
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/server/ua_services_session.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/server/ua_services_session.c" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -33745,7 +34777,7 @@ Service_CloseSession(UA_Server *server, UA_SecureChannel *channel,
                                        UA_DIAGNOSTICEVENT_CLOSE);
 }
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/server/ua_services_attribute.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/server/ua_services_attribute.c" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -35540,7 +36572,7 @@ UA_Server_writeObjectProperty_scalar(UA_Server *server, const UA_NodeId objectId
     return retval;
 }
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/server/ua_services_discovery.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/server/ua_services_discovery.c" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -36291,7 +37323,7 @@ UA_Server_setRegisterServerCallback(UA_Server *server,
 
 #endif /* UA_ENABLE_DISCOVERY */
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/server/ua_services_subscription.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/server/ua_services_subscription.c" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -36654,7 +37686,7 @@ Service_Republish(UA_Server *server, UA_Session *session,
 
 #endif /* UA_ENABLE_SUBSCRIPTIONS */
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/server/ua_services_monitoreditem.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/server/ua_services_monitoreditem.c" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -37287,7 +38319,7 @@ UA_Server_deleteMonitoredItem(UA_Server *server, UA_UInt32 monitoredItemId) {
 
 #endif /* UA_ENABLE_SUBSCRIPTIONS */
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/server/ua_services_securechannel.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/server/ua_services_securechannel.c" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -37665,7 +38697,7 @@ Service_CloseSecureChannel(UA_Server *server, UA_SecureChannel *channel) {
                         UA_DIAGNOSTICEVENT_CLOSE);
 }
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/server/ua_services_nodemanagement.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/server/ua_services_nodemanagement.c" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -39943,7 +40975,7 @@ UA_Server_setNodeTypeLifecycle(UA_Server *server, UA_NodeId nodeId,
     return retval;
 }
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/server/ua_services_discovery_multicast.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/server/ua_services_discovery_multicast.c" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -40547,7 +41579,7 @@ iterateMulticastDiscoveryServer(UA_Server* server, UA_DateTime *nextRepeat,
 
 #endif /* defined(UA_ENABLE_DISCOVERY) && defined(UA_ENABLE_DISCOVERY_MULTICAST) */
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/client/ua_client.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/client/ua_client.c" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -41252,7 +42284,7 @@ UA_Client_run_iterate(UA_Client *client, UA_UInt32 timeout) {
     return client->connectStatus;
 }
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/client/ua_client_connect.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/client/ua_client_connect.c" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -42508,7 +43540,7 @@ UA_Client_disconnect(UA_Client *client) {
 }
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/client/ua_client_discovery.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/client/ua_client_discovery.c" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -42685,7 +43717,7 @@ UA_Client_findServersOnNetwork(UA_Client *client, const char *serverUrl,
 
 #endif
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/client/ua_client_highlevel.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/client/ua_client_highlevel.c" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -43635,7 +44667,7 @@ UA_Cient_translateBrowsePathsToNodeIds_async(UA_Client *client, char **paths,
     return UA_STATUSCODE_BADNOTIMPLEMENTED;
 }
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/client/ua_client_subscriptions.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/client/ua_client_subscriptions.c" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -44918,7 +45950,7 @@ UA_Client_Subscriptions_backgroundPublish(UA_Client *client) {
 
 #endif /* UA_ENABLE_SUBSCRIPTIONS */
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/deps/libc_time.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/deps/libc_time.c" ***********************************/
 
 /* Originally released by the musl project (http://www.musl-libc.org/) under the
  * MIT license. Taken from the file /src/time/__secs_to_tm.c */
@@ -45067,7 +46099,7 @@ long long __tm_to_secs(const struct mytm *tm) {
     return t;
 }
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/deps/pcg_basic.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/deps/pcg_basic.c" ***********************************/
 
 /*
  * PCG Random Number Generation for C.
@@ -45109,7 +46141,7 @@ uint32_t pcg32_random_r(pcg32_random_t* rng) {
     return (xorshifted >> rot) | (xorshifted << ((~rot + 1u) & 31)); /* was (xorshifted >> rot) | (xorshifted << ((-rot) & 31)) */
 }
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/deps/base64.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/deps/base64.c" ***********************************/
 
 /*
  * Base64 encoding: Copyright (c) 2005-2011, Jouni Malinen <j@w1.fi>
@@ -45225,7 +46257,7 @@ UA_unbase64(const unsigned char *src, size_t len, size_t *out_len) {
     return str;
 }
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/build/src_generated/open62541/namespace0_generated.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/build/src_generated/open62541/namespace0_generated.c" ***********************************/
 
 /* WARNING: This is a generated file.
  * Any manual changes will be overwritten. */
@@ -45278,129 +46310,132 @@ UA_NODEID_NUMERIC(ns[0], 17603)
 );
 }
 
-/* ExpandedNodeId - ns=0;i=18 */
+/* HasHistoricalConfiguration - ns=0;i=56 */
 
 static UA_StatusCode function_namespace0_generated_2_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-UA_DataTypeAttributes attr = UA_DataTypeAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "ExpandedNodeId");
-retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_DATATYPE,
-UA_NODEID_NUMERIC(ns[0], 18),
-UA_NODEID_NUMERIC(ns[0], 24),
+UA_ReferenceTypeAttributes attr = UA_ReferenceTypeAttributes_default;
+attr.inverseName  = UA_LOCALIZEDTEXT("", "HistoricalConfigurationOf");
+attr.displayName = UA_LOCALIZEDTEXT("", "HasHistoricalConfiguration");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_REFERENCETYPE,
+UA_NODEID_NUMERIC(ns[0], 56),
+UA_NODEID_NUMERIC(ns[0], 44),
 UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "ExpandedNodeId"),
+UA_QUALIFIEDNAME(ns[0], "HasHistoricalConfiguration"),
  UA_NODEID_NULL,
-(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES],NULL, NULL);
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_REFERENCETYPEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
 static UA_StatusCode function_namespace0_generated_2_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 18)
+UA_NODEID_NUMERIC(ns[0], 56)
 );
 }
 
-/* StatusCode - ns=0;i=19 */
+/* HasEffect - ns=0;i=54 */
 
 static UA_StatusCode function_namespace0_generated_3_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-UA_DataTypeAttributes attr = UA_DataTypeAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "StatusCode");
-retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_DATATYPE,
-UA_NODEID_NUMERIC(ns[0], 19),
-UA_NODEID_NUMERIC(ns[0], 24),
+UA_ReferenceTypeAttributes attr = UA_ReferenceTypeAttributes_default;
+attr.inverseName  = UA_LOCALIZEDTEXT("", "MayBeEffectedBy");
+attr.displayName = UA_LOCALIZEDTEXT("", "HasEffect");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_REFERENCETYPE,
+UA_NODEID_NUMERIC(ns[0], 54),
+UA_NODEID_NUMERIC(ns[0], 32),
 UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "StatusCode"),
+UA_QUALIFIEDNAME(ns[0], "HasEffect"),
  UA_NODEID_NULL,
-(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES],NULL, NULL);
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_REFERENCETYPEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
 static UA_StatusCode function_namespace0_generated_3_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 19)
+UA_NODEID_NUMERIC(ns[0], 54)
 );
 }
 
-/* ByteString - ns=0;i=15 */
+/* HasCause - ns=0;i=53 */
 
 static UA_StatusCode function_namespace0_generated_4_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-UA_DataTypeAttributes attr = UA_DataTypeAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "ByteString");
-retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_DATATYPE,
-UA_NODEID_NUMERIC(ns[0], 15),
-UA_NODEID_NUMERIC(ns[0], 24),
+UA_ReferenceTypeAttributes attr = UA_ReferenceTypeAttributes_default;
+attr.inverseName  = UA_LOCALIZEDTEXT("", "MayBeCausedBy");
+attr.displayName = UA_LOCALIZEDTEXT("", "HasCause");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_REFERENCETYPE,
+UA_NODEID_NUMERIC(ns[0], 53),
+UA_NODEID_NUMERIC(ns[0], 32),
 UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "ByteString"),
+UA_QUALIFIEDNAME(ns[0], "HasCause"),
  UA_NODEID_NULL,
-(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES],NULL, NULL);
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_REFERENCETYPEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
 static UA_StatusCode function_namespace0_generated_4_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 15)
+UA_NODEID_NUMERIC(ns[0], 53)
 );
 }
 
-/* Image - ns=0;i=30 */
+/* ToState - ns=0;i=52 */
 
 static UA_StatusCode function_namespace0_generated_5_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-UA_DataTypeAttributes attr = UA_DataTypeAttributes_default;
-attr.isAbstract = true;
-attr.displayName = UA_LOCALIZEDTEXT("", "Image");
-retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_DATATYPE,
-UA_NODEID_NUMERIC(ns[0], 30),
-UA_NODEID_NUMERIC(ns[0], 15),
+UA_ReferenceTypeAttributes attr = UA_ReferenceTypeAttributes_default;
+attr.inverseName  = UA_LOCALIZEDTEXT("", "FromTransition");
+attr.displayName = UA_LOCALIZEDTEXT("", "ToState");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_REFERENCETYPE,
+UA_NODEID_NUMERIC(ns[0], 52),
+UA_NODEID_NUMERIC(ns[0], 32),
 UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "Image"),
+UA_QUALIFIEDNAME(ns[0], "ToState"),
  UA_NODEID_NULL,
-(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES],NULL, NULL);
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_REFERENCETYPEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
 static UA_StatusCode function_namespace0_generated_5_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 30)
+UA_NODEID_NUMERIC(ns[0], 52)
 );
 }
 
-/* DataValue - ns=0;i=23 */
+/* FromState - ns=0;i=51 */
 
 static UA_StatusCode function_namespace0_generated_6_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-UA_DataTypeAttributes attr = UA_DataTypeAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "DataValue");
-retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_DATATYPE,
-UA_NODEID_NUMERIC(ns[0], 23),
-UA_NODEID_NUMERIC(ns[0], 24),
+UA_ReferenceTypeAttributes attr = UA_ReferenceTypeAttributes_default;
+attr.inverseName  = UA_LOCALIZEDTEXT("", "ToTransition");
+attr.displayName = UA_LOCALIZEDTEXT("", "FromState");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_REFERENCETYPE,
+UA_NODEID_NUMERIC(ns[0], 51),
+UA_NODEID_NUMERIC(ns[0], 32),
 UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "DataValue"),
+UA_QUALIFIEDNAME(ns[0], "FromState"),
  UA_NODEID_NULL,
-(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES],NULL, NULL);
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_REFERENCETYPEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
 static UA_StatusCode function_namespace0_generated_6_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 23)
+UA_NODEID_NUMERIC(ns[0], 51)
 );
 }
 
-/* Structure - ns=0;i=22 */
+/* DiagnosticInfo - ns=0;i=25 */
 
 static UA_StatusCode function_namespace0_generated_7_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_DataTypeAttributes attr = UA_DataTypeAttributes_default;
-attr.isAbstract = true;
-attr.displayName = UA_LOCALIZEDTEXT("", "Structure");
+attr.displayName = UA_LOCALIZEDTEXT("", "DiagnosticInfo");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_DATATYPE,
-UA_NODEID_NUMERIC(ns[0], 22),
+UA_NODEID_NUMERIC(ns[0], 25),
 UA_NODEID_NUMERIC(ns[0], 24),
 UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "Structure"),
+UA_QUALIFIEDNAME(ns[0], "DiagnosticInfo"),
  UA_NODEID_NULL,
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES],NULL, NULL);
 return retVal;
@@ -45408,22 +46443,21 @@ return retVal;
 
 static UA_StatusCode function_namespace0_generated_7_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 22)
+UA_NODEID_NUMERIC(ns[0], 25)
 );
 }
 
-/* Union - ns=0;i=12756 */
+/* DataValue - ns=0;i=23 */
 
 static UA_StatusCode function_namespace0_generated_8_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_DataTypeAttributes attr = UA_DataTypeAttributes_default;
-attr.isAbstract = true;
-attr.displayName = UA_LOCALIZEDTEXT("", "Union");
+attr.displayName = UA_LOCALIZEDTEXT("", "DataValue");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_DATATYPE,
-UA_NODEID_NUMERIC(ns[0], 12756),
-UA_NODEID_NUMERIC(ns[0], 22),
+UA_NODEID_NUMERIC(ns[0], 23),
+UA_NODEID_NUMERIC(ns[0], 24),
 UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "Union"),
+UA_QUALIFIEDNAME(ns[0], "DataValue"),
  UA_NODEID_NULL,
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES],NULL, NULL);
 return retVal;
@@ -45431,21 +46465,22 @@ return retVal;
 
 static UA_StatusCode function_namespace0_generated_8_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 12756)
+UA_NODEID_NUMERIC(ns[0], 23)
 );
 }
 
-/* BuildInfo - ns=0;i=338 */
+/* Structure - ns=0;i=22 */
 
 static UA_StatusCode function_namespace0_generated_9_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_DataTypeAttributes attr = UA_DataTypeAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "BuildInfo");
+attr.isAbstract = true;
+attr.displayName = UA_LOCALIZEDTEXT("", "Structure");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_DATATYPE,
-UA_NODEID_NUMERIC(ns[0], 338),
 UA_NODEID_NUMERIC(ns[0], 22),
+UA_NODEID_NUMERIC(ns[0], 24),
 UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "BuildInfo"),
+UA_QUALIFIEDNAME(ns[0], "Structure"),
  UA_NODEID_NULL,
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES],NULL, NULL);
 return retVal;
@@ -45453,7 +46488,7 @@ return retVal;
 
 static UA_StatusCode function_namespace0_generated_9_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 338)
+UA_NODEID_NUMERIC(ns[0], 22)
 );
 }
 
@@ -45479,17 +46514,17 @@ UA_NODEID_NUMERIC(ns[0], 862)
 );
 }
 
-/* TimeZoneDataType - ns=0;i=8912 */
+/* EnumValueType - ns=0;i=7594 */
 
 static UA_StatusCode function_namespace0_generated_11_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_DataTypeAttributes attr = UA_DataTypeAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "TimeZoneDataType");
+attr.displayName = UA_LOCALIZEDTEXT("", "EnumValueType");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_DATATYPE,
-UA_NODEID_NUMERIC(ns[0], 8912),
+UA_NODEID_NUMERIC(ns[0], 7594),
 UA_NODEID_NUMERIC(ns[0], 22),
 UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "TimeZoneDataType"),
+UA_QUALIFIEDNAME(ns[0], "EnumValueType"),
  UA_NODEID_NULL,
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES],NULL, NULL);
 return retVal;
@@ -45497,21 +46532,22 @@ return retVal;
 
 static UA_StatusCode function_namespace0_generated_11_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 8912)
+UA_NODEID_NUMERIC(ns[0], 7594)
 );
 }
 
-/* Range - ns=0;i=884 */
+/* Union - ns=0;i=12756 */
 
 static UA_StatusCode function_namespace0_generated_12_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_DataTypeAttributes attr = UA_DataTypeAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "Range");
+attr.isAbstract = true;
+attr.displayName = UA_LOCALIZEDTEXT("", "Union");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_DATATYPE,
-UA_NODEID_NUMERIC(ns[0], 884),
+UA_NODEID_NUMERIC(ns[0], 12756),
 UA_NODEID_NUMERIC(ns[0], 22),
 UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "Range"),
+UA_QUALIFIEDNAME(ns[0], "Union"),
  UA_NODEID_NULL,
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES],NULL, NULL);
 return retVal;
@@ -45519,7 +46555,7 @@ return retVal;
 
 static UA_StatusCode function_namespace0_generated_12_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 884)
+UA_NODEID_NUMERIC(ns[0], 12756)
 );
 }
 
@@ -45545,17 +46581,17 @@ UA_NODEID_NUMERIC(ns[0], 887)
 );
 }
 
-/* EnumValueType - ns=0;i=7594 */
+/* TimeZoneDataType - ns=0;i=8912 */
 
 static UA_StatusCode function_namespace0_generated_14_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_DataTypeAttributes attr = UA_DataTypeAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "EnumValueType");
+attr.displayName = UA_LOCALIZEDTEXT("", "TimeZoneDataType");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_DATATYPE,
-UA_NODEID_NUMERIC(ns[0], 7594),
+UA_NODEID_NUMERIC(ns[0], 8912),
 UA_NODEID_NUMERIC(ns[0], 22),
 UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "EnumValueType"),
+UA_QUALIFIEDNAME(ns[0], "TimeZoneDataType"),
  UA_NODEID_NULL,
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES],NULL, NULL);
 return retVal;
@@ -45563,21 +46599,21 @@ return retVal;
 
 static UA_StatusCode function_namespace0_generated_14_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 7594)
+UA_NODEID_NUMERIC(ns[0], 8912)
 );
 }
 
-/* ServerDiagnosticsSummaryDataType - ns=0;i=859 */
+/* SignedSoftwareCertificate - ns=0;i=344 */
 
 static UA_StatusCode function_namespace0_generated_15_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_DataTypeAttributes attr = UA_DataTypeAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "ServerDiagnosticsSummaryDataType");
+attr.displayName = UA_LOCALIZEDTEXT("", "SignedSoftwareCertificate");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_DATATYPE,
-UA_NODEID_NUMERIC(ns[0], 859),
+UA_NODEID_NUMERIC(ns[0], 344),
 UA_NODEID_NUMERIC(ns[0], 22),
 UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "ServerDiagnosticsSummaryDataType"),
+UA_QUALIFIEDNAME(ns[0], "SignedSoftwareCertificate"),
  UA_NODEID_NULL,
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES],NULL, NULL);
 return retVal;
@@ -45585,21 +46621,21 @@ return retVal;
 
 static UA_StatusCode function_namespace0_generated_15_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 859)
+UA_NODEID_NUMERIC(ns[0], 344)
 );
 }
 
-/* SignedSoftwareCertificate - ns=0;i=344 */
+/* ServerDiagnosticsSummaryDataType - ns=0;i=859 */
 
 static UA_StatusCode function_namespace0_generated_16_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_DataTypeAttributes attr = UA_DataTypeAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "SignedSoftwareCertificate");
+attr.displayName = UA_LOCALIZEDTEXT("", "ServerDiagnosticsSummaryDataType");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_DATATYPE,
-UA_NODEID_NUMERIC(ns[0], 344),
+UA_NODEID_NUMERIC(ns[0], 859),
 UA_NODEID_NUMERIC(ns[0], 22),
 UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "SignedSoftwareCertificate"),
+UA_QUALIFIEDNAME(ns[0], "ServerDiagnosticsSummaryDataType"),
  UA_NODEID_NULL,
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES],NULL, NULL);
 return retVal;
@@ -45607,7 +46643,7 @@ return retVal;
 
 static UA_StatusCode function_namespace0_generated_16_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 344)
+UA_NODEID_NUMERIC(ns[0], 859)
 );
 }
 
@@ -45633,17 +46669,17 @@ UA_NODEID_NUMERIC(ns[0], 296)
 );
 }
 
-/* LocalizedText - ns=0;i=21 */
+/* Range - ns=0;i=884 */
 
 static UA_StatusCode function_namespace0_generated_18_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_DataTypeAttributes attr = UA_DataTypeAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "LocalizedText");
+attr.displayName = UA_LOCALIZEDTEXT("", "Range");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_DATATYPE,
-UA_NODEID_NUMERIC(ns[0], 21),
-UA_NODEID_NUMERIC(ns[0], 24),
+UA_NODEID_NUMERIC(ns[0], 884),
+UA_NODEID_NUMERIC(ns[0], 22),
 UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "LocalizedText"),
+UA_QUALIFIEDNAME(ns[0], "Range"),
  UA_NODEID_NULL,
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES],NULL, NULL);
 return retVal;
@@ -45651,21 +46687,21 @@ return retVal;
 
 static UA_StatusCode function_namespace0_generated_18_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 21)
+UA_NODEID_NUMERIC(ns[0], 884)
 );
 }
 
-/* QualifiedName - ns=0;i=20 */
+/* BuildInfo - ns=0;i=338 */
 
 static UA_StatusCode function_namespace0_generated_19_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_DataTypeAttributes attr = UA_DataTypeAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "QualifiedName");
+attr.displayName = UA_LOCALIZEDTEXT("", "BuildInfo");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_DATATYPE,
-UA_NODEID_NUMERIC(ns[0], 20),
-UA_NODEID_NUMERIC(ns[0], 24),
+UA_NODEID_NUMERIC(ns[0], 338),
+UA_NODEID_NUMERIC(ns[0], 22),
 UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "QualifiedName"),
+UA_QUALIFIEDNAME(ns[0], "BuildInfo"),
  UA_NODEID_NULL,
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES],NULL, NULL);
 return retVal;
@@ -45673,22 +46709,21 @@ return retVal;
 
 static UA_StatusCode function_namespace0_generated_19_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 20)
+UA_NODEID_NUMERIC(ns[0], 338)
 );
 }
 
-/* Number - ns=0;i=26 */
+/* LocalizedText - ns=0;i=21 */
 
 static UA_StatusCode function_namespace0_generated_20_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_DataTypeAttributes attr = UA_DataTypeAttributes_default;
-attr.isAbstract = true;
-attr.displayName = UA_LOCALIZEDTEXT("", "Number");
+attr.displayName = UA_LOCALIZEDTEXT("", "LocalizedText");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_DATATYPE,
-UA_NODEID_NUMERIC(ns[0], 26),
+UA_NODEID_NUMERIC(ns[0], 21),
 UA_NODEID_NUMERIC(ns[0], 24),
 UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "Number"),
+UA_QUALIFIEDNAME(ns[0], "LocalizedText"),
  UA_NODEID_NULL,
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES],NULL, NULL);
 return retVal;
@@ -45696,21 +46731,21 @@ return retVal;
 
 static UA_StatusCode function_namespace0_generated_20_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 26)
+UA_NODEID_NUMERIC(ns[0], 21)
 );
 }
 
-/* Decimal - ns=0;i=50 */
+/* QualifiedName - ns=0;i=20 */
 
 static UA_StatusCode function_namespace0_generated_21_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_DataTypeAttributes attr = UA_DataTypeAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "Decimal");
+attr.displayName = UA_LOCALIZEDTEXT("", "QualifiedName");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_DATATYPE,
-UA_NODEID_NUMERIC(ns[0], 50),
-UA_NODEID_NUMERIC(ns[0], 26),
+UA_NODEID_NUMERIC(ns[0], 20),
+UA_NODEID_NUMERIC(ns[0], 24),
 UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "Decimal"),
+UA_QUALIFIEDNAME(ns[0], "QualifiedName"),
  UA_NODEID_NULL,
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES],NULL, NULL);
 return retVal;
@@ -45718,22 +46753,21 @@ return retVal;
 
 static UA_StatusCode function_namespace0_generated_21_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 50)
+UA_NODEID_NUMERIC(ns[0], 20)
 );
 }
 
-/* UInteger - ns=0;i=28 */
+/* StatusCode - ns=0;i=19 */
 
 static UA_StatusCode function_namespace0_generated_22_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_DataTypeAttributes attr = UA_DataTypeAttributes_default;
-attr.isAbstract = true;
-attr.displayName = UA_LOCALIZEDTEXT("", "UInteger");
+attr.displayName = UA_LOCALIZEDTEXT("", "StatusCode");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_DATATYPE,
-UA_NODEID_NUMERIC(ns[0], 28),
-UA_NODEID_NUMERIC(ns[0], 26),
+UA_NODEID_NUMERIC(ns[0], 19),
+UA_NODEID_NUMERIC(ns[0], 24),
 UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "UInteger"),
+UA_QUALIFIEDNAME(ns[0], "StatusCode"),
  UA_NODEID_NULL,
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES],NULL, NULL);
 return retVal;
@@ -45741,21 +46775,21 @@ return retVal;
 
 static UA_StatusCode function_namespace0_generated_22_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 28)
+UA_NODEID_NUMERIC(ns[0], 19)
 );
 }
 
-/* UInt16 - ns=0;i=5 */
+/* ExpandedNodeId - ns=0;i=18 */
 
 static UA_StatusCode function_namespace0_generated_23_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_DataTypeAttributes attr = UA_DataTypeAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "UInt16");
+attr.displayName = UA_LOCALIZEDTEXT("", "ExpandedNodeId");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_DATATYPE,
-UA_NODEID_NUMERIC(ns[0], 5),
-UA_NODEID_NUMERIC(ns[0], 28),
+UA_NODEID_NUMERIC(ns[0], 18),
+UA_NODEID_NUMERIC(ns[0], 24),
 UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "UInt16"),
+UA_QUALIFIEDNAME(ns[0], "ExpandedNodeId"),
  UA_NODEID_NULL,
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES],NULL, NULL);
 return retVal;
@@ -45763,21 +46797,21 @@ return retVal;
 
 static UA_StatusCode function_namespace0_generated_23_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 5)
+UA_NODEID_NUMERIC(ns[0], 18)
 );
 }
 
-/* UInt32 - ns=0;i=7 */
+/* NodeId - ns=0;i=17 */
 
 static UA_StatusCode function_namespace0_generated_24_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_DataTypeAttributes attr = UA_DataTypeAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "UInt32");
+attr.displayName = UA_LOCALIZEDTEXT("", "NodeId");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_DATATYPE,
-UA_NODEID_NUMERIC(ns[0], 7),
-UA_NODEID_NUMERIC(ns[0], 28),
+UA_NODEID_NUMERIC(ns[0], 17),
+UA_NODEID_NUMERIC(ns[0], 24),
 UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "UInt32"),
+UA_QUALIFIEDNAME(ns[0], "NodeId"),
  UA_NODEID_NULL,
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES],NULL, NULL);
 return retVal;
@@ -45785,21 +46819,21 @@ return retVal;
 
 static UA_StatusCode function_namespace0_generated_24_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 7)
+UA_NODEID_NUMERIC(ns[0], 17)
 );
 }
 
-/* UInt64 - ns=0;i=9 */
+/* XmlElement - ns=0;i=16 */
 
 static UA_StatusCode function_namespace0_generated_25_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_DataTypeAttributes attr = UA_DataTypeAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "UInt64");
+attr.displayName = UA_LOCALIZEDTEXT("", "XmlElement");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_DATATYPE,
-UA_NODEID_NUMERIC(ns[0], 9),
-UA_NODEID_NUMERIC(ns[0], 28),
+UA_NODEID_NUMERIC(ns[0], 16),
+UA_NODEID_NUMERIC(ns[0], 24),
 UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "UInt64"),
+UA_QUALIFIEDNAME(ns[0], "XmlElement"),
  UA_NODEID_NULL,
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES],NULL, NULL);
 return retVal;
@@ -45807,21 +46841,21 @@ return retVal;
 
 static UA_StatusCode function_namespace0_generated_25_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 9)
+UA_NODEID_NUMERIC(ns[0], 16)
 );
 }
 
-/* Byte - ns=0;i=3 */
+/* ByteString - ns=0;i=15 */
 
 static UA_StatusCode function_namespace0_generated_26_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_DataTypeAttributes attr = UA_DataTypeAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "Byte");
+attr.displayName = UA_LOCALIZEDTEXT("", "ByteString");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_DATATYPE,
-UA_NODEID_NUMERIC(ns[0], 3),
-UA_NODEID_NUMERIC(ns[0], 28),
+UA_NODEID_NUMERIC(ns[0], 15),
+UA_NODEID_NUMERIC(ns[0], 24),
 UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "Byte"),
+UA_QUALIFIEDNAME(ns[0], "ByteString"),
  UA_NODEID_NULL,
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES],NULL, NULL);
 return retVal;
@@ -45829,22 +46863,22 @@ return retVal;
 
 static UA_StatusCode function_namespace0_generated_26_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 3)
+UA_NODEID_NUMERIC(ns[0], 15)
 );
 }
 
-/* Integer - ns=0;i=27 */
+/* Image - ns=0;i=30 */
 
 static UA_StatusCode function_namespace0_generated_27_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_DataTypeAttributes attr = UA_DataTypeAttributes_default;
 attr.isAbstract = true;
-attr.displayName = UA_LOCALIZEDTEXT("", "Integer");
+attr.displayName = UA_LOCALIZEDTEXT("", "Image");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_DATATYPE,
-UA_NODEID_NUMERIC(ns[0], 27),
-UA_NODEID_NUMERIC(ns[0], 26),
+UA_NODEID_NUMERIC(ns[0], 30),
+UA_NODEID_NUMERIC(ns[0], 15),
 UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "Integer"),
+UA_QUALIFIEDNAME(ns[0], "Image"),
  UA_NODEID_NULL,
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES],NULL, NULL);
 return retVal;
@@ -45852,21 +46886,21 @@ return retVal;
 
 static UA_StatusCode function_namespace0_generated_27_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 27)
+UA_NODEID_NUMERIC(ns[0], 30)
 );
 }
 
-/* SByte - ns=0;i=2 */
+/* Guid - ns=0;i=14 */
 
 static UA_StatusCode function_namespace0_generated_28_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_DataTypeAttributes attr = UA_DataTypeAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "SByte");
+attr.displayName = UA_LOCALIZEDTEXT("", "Guid");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_DATATYPE,
-UA_NODEID_NUMERIC(ns[0], 2),
-UA_NODEID_NUMERIC(ns[0], 27),
+UA_NODEID_NUMERIC(ns[0], 14),
+UA_NODEID_NUMERIC(ns[0], 24),
 UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "SByte"),
+UA_QUALIFIEDNAME(ns[0], "Guid"),
  UA_NODEID_NULL,
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES],NULL, NULL);
 return retVal;
@@ -45874,21 +46908,21 @@ return retVal;
 
 static UA_StatusCode function_namespace0_generated_28_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2)
+UA_NODEID_NUMERIC(ns[0], 14)
 );
 }
 
-/* Int64 - ns=0;i=8 */
+/* DateTime - ns=0;i=13 */
 
 static UA_StatusCode function_namespace0_generated_29_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_DataTypeAttributes attr = UA_DataTypeAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "Int64");
+attr.displayName = UA_LOCALIZEDTEXT("", "DateTime");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_DATATYPE,
-UA_NODEID_NUMERIC(ns[0], 8),
-UA_NODEID_NUMERIC(ns[0], 27),
+UA_NODEID_NUMERIC(ns[0], 13),
+UA_NODEID_NUMERIC(ns[0], 24),
 UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "Int64"),
+UA_QUALIFIEDNAME(ns[0], "DateTime"),
  UA_NODEID_NULL,
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES],NULL, NULL);
 return retVal;
@@ -45896,21 +46930,21 @@ return retVal;
 
 static UA_StatusCode function_namespace0_generated_29_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 8)
+UA_NODEID_NUMERIC(ns[0], 13)
 );
 }
 
-/* Int32 - ns=0;i=6 */
+/* UtcTime - ns=0;i=294 */
 
 static UA_StatusCode function_namespace0_generated_30_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_DataTypeAttributes attr = UA_DataTypeAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "Int32");
+attr.displayName = UA_LOCALIZEDTEXT("", "UtcTime");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_DATATYPE,
-UA_NODEID_NUMERIC(ns[0], 6),
-UA_NODEID_NUMERIC(ns[0], 27),
+UA_NODEID_NUMERIC(ns[0], 294),
+UA_NODEID_NUMERIC(ns[0], 13),
 UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "Int32"),
+UA_QUALIFIEDNAME(ns[0], "UtcTime"),
  UA_NODEID_NULL,
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES],NULL, NULL);
 return retVal;
@@ -45918,21 +46952,21 @@ return retVal;
 
 static UA_StatusCode function_namespace0_generated_30_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 6)
+UA_NODEID_NUMERIC(ns[0], 294)
 );
 }
 
-/* Int16 - ns=0;i=4 */
+/* String - ns=0;i=12 */
 
 static UA_StatusCode function_namespace0_generated_31_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_DataTypeAttributes attr = UA_DataTypeAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "Int16");
+attr.displayName = UA_LOCALIZEDTEXT("", "String");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_DATATYPE,
-UA_NODEID_NUMERIC(ns[0], 4),
-UA_NODEID_NUMERIC(ns[0], 27),
+UA_NODEID_NUMERIC(ns[0], 12),
+UA_NODEID_NUMERIC(ns[0], 24),
 UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "Int16"),
+UA_QUALIFIEDNAME(ns[0], "String"),
  UA_NODEID_NULL,
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES],NULL, NULL);
 return retVal;
@@ -45940,21 +46974,21 @@ return retVal;
 
 static UA_StatusCode function_namespace0_generated_31_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 4)
+UA_NODEID_NUMERIC(ns[0], 12)
 );
 }
 
-/* Float - ns=0;i=10 */
+/* LocaleId - ns=0;i=295 */
 
 static UA_StatusCode function_namespace0_generated_32_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_DataTypeAttributes attr = UA_DataTypeAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "Float");
+attr.displayName = UA_LOCALIZEDTEXT("", "LocaleId");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_DATATYPE,
-UA_NODEID_NUMERIC(ns[0], 10),
-UA_NODEID_NUMERIC(ns[0], 26),
+UA_NODEID_NUMERIC(ns[0], 295),
+UA_NODEID_NUMERIC(ns[0], 12),
 UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "Float"),
+UA_QUALIFIEDNAME(ns[0], "LocaleId"),
  UA_NODEID_NULL,
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES],NULL, NULL);
 return retVal;
@@ -45962,21 +46996,21 @@ return retVal;
 
 static UA_StatusCode function_namespace0_generated_32_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 10)
+UA_NODEID_NUMERIC(ns[0], 295)
 );
 }
 
-/* Double - ns=0;i=11 */
+/* Boolean - ns=0;i=1 */
 
 static UA_StatusCode function_namespace0_generated_33_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_DataTypeAttributes attr = UA_DataTypeAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "Double");
+attr.displayName = UA_LOCALIZEDTEXT("", "Boolean");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_DATATYPE,
-UA_NODEID_NUMERIC(ns[0], 11),
-UA_NODEID_NUMERIC(ns[0], 26),
+UA_NODEID_NUMERIC(ns[0], 1),
+UA_NODEID_NUMERIC(ns[0], 24),
 UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "Double"),
+UA_QUALIFIEDNAME(ns[0], "Boolean"),
  UA_NODEID_NULL,
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES],NULL, NULL);
 return retVal;
@@ -45984,21 +47018,22 @@ return retVal;
 
 static UA_StatusCode function_namespace0_generated_33_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 11)
+UA_NODEID_NUMERIC(ns[0], 1)
 );
 }
 
-/* Duration - ns=0;i=290 */
+/* Enumeration - ns=0;i=29 */
 
 static UA_StatusCode function_namespace0_generated_34_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_DataTypeAttributes attr = UA_DataTypeAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "Duration");
+attr.isAbstract = true;
+attr.displayName = UA_LOCALIZEDTEXT("", "Enumeration");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_DATATYPE,
-UA_NODEID_NUMERIC(ns[0], 290),
-UA_NODEID_NUMERIC(ns[0], 11),
+UA_NODEID_NUMERIC(ns[0], 29),
+UA_NODEID_NUMERIC(ns[0], 24),
 UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "Duration"),
+UA_QUALIFIEDNAME(ns[0], "Enumeration"),
  UA_NODEID_NULL,
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES],NULL, NULL);
 return retVal;
@@ -46006,21 +47041,21 @@ return retVal;
 
 static UA_StatusCode function_namespace0_generated_34_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 290)
+UA_NODEID_NUMERIC(ns[0], 29)
 );
 }
 
-/* DiagnosticInfo - ns=0;i=25 */
+/* NamingRuleType - ns=0;i=120 */
 
 static UA_StatusCode function_namespace0_generated_35_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_DataTypeAttributes attr = UA_DataTypeAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "DiagnosticInfo");
+attr.displayName = UA_LOCALIZEDTEXT("", "NamingRuleType");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_DATATYPE,
-UA_NODEID_NUMERIC(ns[0], 25),
-UA_NODEID_NUMERIC(ns[0], 24),
+UA_NODEID_NUMERIC(ns[0], 120),
+UA_NODEID_NUMERIC(ns[0], 29),
 UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "DiagnosticInfo"),
+UA_QUALIFIEDNAME(ns[0], "NamingRuleType"),
  UA_NODEID_NULL,
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES],NULL, NULL);
 return retVal;
@@ -46028,30 +47063,58 @@ return retVal;
 
 static UA_StatusCode function_namespace0_generated_35_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 25)
+UA_NODEID_NUMERIC(ns[0], 120)
 );
 }
 
-/* Enumeration - ns=0;i=29 */
+/* EnumValues - ns=0;i=12169 */
 
 static UA_StatusCode function_namespace0_generated_36_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-UA_DataTypeAttributes attr = UA_DataTypeAttributes_default;
-attr.isAbstract = true;
-attr.displayName = UA_LOCALIZEDTEXT("", "Enumeration");
-retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_DATATYPE,
-UA_NODEID_NUMERIC(ns[0], 29),
-UA_NODEID_NUMERIC(ns[0], 24),
-UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "Enumeration"),
- UA_NODEID_NULL,
-(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES],NULL, NULL);
+UA_VariableAttributes attr = UA_VariableAttributes_default;
+attr.minimumSamplingInterval = 0.000000;
+attr.userAccessLevel = 1;
+attr.accessLevel = 1;
+attr.valueRank = 1;
+attr.arrayDimensionsSize = 1;
+UA_UInt32 arrayDimensions[1];
+arrayDimensions[0] = 0;
+attr.arrayDimensions = &arrayDimensions[0];
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 7594);
+UA_EnumValueType variablenode_ns_0_i_12169_variant_DataContents[3];
+
+UA_init(&variablenode_ns_0_i_12169_variant_DataContents[0], &UA_TYPES[UA_TYPES_ENUMVALUETYPE]);
+variablenode_ns_0_i_12169_variant_DataContents[0].value = (UA_Int64) 1;
+variablenode_ns_0_i_12169_variant_DataContents[0].displayName = UA_LOCALIZEDTEXT("", "Mandatory");
+variablenode_ns_0_i_12169_variant_DataContents[0].description = UA_LOCALIZEDTEXT("", "The BrowseName must appear in all instances of the type.");
+
+UA_init(&variablenode_ns_0_i_12169_variant_DataContents[1], &UA_TYPES[UA_TYPES_ENUMVALUETYPE]);
+variablenode_ns_0_i_12169_variant_DataContents[1].value = (UA_Int64) 2;
+variablenode_ns_0_i_12169_variant_DataContents[1].displayName = UA_LOCALIZEDTEXT("", "Optional");
+variablenode_ns_0_i_12169_variant_DataContents[1].description = UA_LOCALIZEDTEXT("", "The BrowseName may appear in an instance of the type.");
+
+UA_init(&variablenode_ns_0_i_12169_variant_DataContents[2], &UA_TYPES[UA_TYPES_ENUMVALUETYPE]);
+variablenode_ns_0_i_12169_variant_DataContents[2].value = (UA_Int64) 3;
+variablenode_ns_0_i_12169_variant_DataContents[2].displayName = UA_LOCALIZEDTEXT("", "Constraint");
+variablenode_ns_0_i_12169_variant_DataContents[2].description = UA_LOCALIZEDTEXT("", "The modelling rule defines a constraint and the BrowseName is not used in an instance of the type.");
+UA_Variant_setArray(&attr.value, &variablenode_ns_0_i_12169_variant_DataContents, (UA_Int32) 3, &UA_TYPES[UA_TYPES_ENUMVALUETYPE]);
+attr.displayName = UA_LOCALIZEDTEXT("", "EnumValues");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
+UA_NODEID_NUMERIC(ns[0], 12169),
+UA_NODEID_NUMERIC(ns[0], 120),
+UA_NODEID_NUMERIC(ns[0], 46),
+UA_QUALIFIEDNAME(ns[0], "EnumValues"),
+UA_NODEID_NUMERIC(ns[0], 68),
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
+
+
+
 return retVal;
 }
 
 static UA_StatusCode function_namespace0_generated_36_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 29)
+UA_NODEID_NUMERIC(ns[0], 12169)
 );
 }
 
@@ -46113,17 +47176,17 @@ UA_NODEID_NUMERIC(ns[0], 12078)
 );
 }
 
-/* NamingRuleType - ns=0;i=120 */
+/* ServerState - ns=0;i=852 */
 
 static UA_StatusCode function_namespace0_generated_39_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_DataTypeAttributes attr = UA_DataTypeAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "NamingRuleType");
+attr.displayName = UA_LOCALIZEDTEXT("", "ServerState");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_DATATYPE,
-UA_NODEID_NUMERIC(ns[0], 120),
+UA_NODEID_NUMERIC(ns[0], 852),
 UA_NODEID_NUMERIC(ns[0], 29),
 UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "NamingRuleType"),
+UA_QUALIFIEDNAME(ns[0], "ServerState"),
  UA_NODEID_NULL,
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES],NULL, NULL);
 return retVal;
@@ -46131,64 +47194,13 @@ return retVal;
 
 static UA_StatusCode function_namespace0_generated_39_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 120)
-);
-}
-
-/* EnumValues - ns=0;i=12169 */
-
-static UA_StatusCode function_namespace0_generated_40_begin(UA_Server *server, UA_UInt16* ns) {
-UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-UA_VariableAttributes attr = UA_VariableAttributes_default;
-attr.minimumSamplingInterval = 0.000000;
-attr.userAccessLevel = 1;
-attr.accessLevel = 1;
-attr.valueRank = 1;
-attr.arrayDimensionsSize = 1;
-UA_UInt32 arrayDimensions[1];
-arrayDimensions[0] = 0;
-attr.arrayDimensions = &arrayDimensions[0];
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 7594);
-UA_EnumValueType variablenode_ns_0_i_12169_variant_DataContents[3];
-
-UA_init(&variablenode_ns_0_i_12169_variant_DataContents[0], &UA_TYPES[UA_TYPES_ENUMVALUETYPE]);
-variablenode_ns_0_i_12169_variant_DataContents[0].value = (UA_Int64) 1;
-variablenode_ns_0_i_12169_variant_DataContents[0].displayName = UA_LOCALIZEDTEXT("", "Mandatory");
-variablenode_ns_0_i_12169_variant_DataContents[0].description = UA_LOCALIZEDTEXT("", "The BrowseName must appear in all instances of the type.");
-
-UA_init(&variablenode_ns_0_i_12169_variant_DataContents[1], &UA_TYPES[UA_TYPES_ENUMVALUETYPE]);
-variablenode_ns_0_i_12169_variant_DataContents[1].value = (UA_Int64) 2;
-variablenode_ns_0_i_12169_variant_DataContents[1].displayName = UA_LOCALIZEDTEXT("", "Optional");
-variablenode_ns_0_i_12169_variant_DataContents[1].description = UA_LOCALIZEDTEXT("", "The BrowseName may appear in an instance of the type.");
-
-UA_init(&variablenode_ns_0_i_12169_variant_DataContents[2], &UA_TYPES[UA_TYPES_ENUMVALUETYPE]);
-variablenode_ns_0_i_12169_variant_DataContents[2].value = (UA_Int64) 3;
-variablenode_ns_0_i_12169_variant_DataContents[2].displayName = UA_LOCALIZEDTEXT("", "Constraint");
-variablenode_ns_0_i_12169_variant_DataContents[2].description = UA_LOCALIZEDTEXT("", "The modelling rule defines a constraint and the BrowseName is not used in an instance of the type.");
-UA_Variant_setArray(&attr.value, &variablenode_ns_0_i_12169_variant_DataContents, (UA_Int32) 3, &UA_TYPES[UA_TYPES_ENUMVALUETYPE]);
-attr.displayName = UA_LOCALIZEDTEXT("", "EnumValues");
-retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 12169),
-UA_NODEID_NUMERIC(ns[0], 120),
-UA_NODEID_NUMERIC(ns[0], 46),
-UA_QUALIFIEDNAME(ns[0], "EnumValues"),
-UA_NODEID_NUMERIC(ns[0], 68),
-(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
-
-
-
-return retVal;
-}
-
-static UA_StatusCode function_namespace0_generated_40_finish(UA_Server *server, UA_UInt16* ns) {
-return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 12169)
+UA_NODEID_NUMERIC(ns[0], 852)
 );
 }
 
 /* RedundancySupport - ns=0;i=851 */
 
-static UA_StatusCode function_namespace0_generated_41_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_40_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_DataTypeAttributes attr = UA_DataTypeAttributes_default;
 attr.displayName = UA_LOCALIZEDTEXT("", "RedundancySupport");
@@ -46202,7 +47214,7 @@ UA_QUALIFIEDNAME(ns[0], "RedundancySupport"),
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_41_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_40_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
 UA_NODEID_NUMERIC(ns[0], 851)
 );
@@ -46210,7 +47222,7 @@ UA_NODEID_NUMERIC(ns[0], 851)
 
 /* EnumStrings - ns=0;i=7611 */
 
-static UA_StatusCode function_namespace0_generated_42_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_41_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -46241,23 +47253,47 @@ UA_NODEID_NUMERIC(ns[0], 68),
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_42_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_41_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
 UA_NODEID_NUMERIC(ns[0], 7611)
 );
 }
 
-/* ServerState - ns=0;i=852 */
+/* Number - ns=0;i=26 */
+
+static UA_StatusCode function_namespace0_generated_42_begin(UA_Server *server, UA_UInt16* ns) {
+UA_StatusCode retVal = UA_STATUSCODE_GOOD;
+UA_DataTypeAttributes attr = UA_DataTypeAttributes_default;
+attr.isAbstract = true;
+attr.displayName = UA_LOCALIZEDTEXT("", "Number");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_DATATYPE,
+UA_NODEID_NUMERIC(ns[0], 26),
+UA_NODEID_NUMERIC(ns[0], 24),
+UA_NODEID_NUMERIC(ns[0], 45),
+UA_QUALIFIEDNAME(ns[0], "Number"),
+ UA_NODEID_NULL,
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES],NULL, NULL);
+return retVal;
+}
+
+static UA_StatusCode function_namespace0_generated_42_finish(UA_Server *server, UA_UInt16* ns) {
+return UA_Server_addNode_finish(server, 
+UA_NODEID_NUMERIC(ns[0], 26)
+);
+}
+
+/* UInteger - ns=0;i=28 */
 
 static UA_StatusCode function_namespace0_generated_43_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_DataTypeAttributes attr = UA_DataTypeAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "ServerState");
+attr.isAbstract = true;
+attr.displayName = UA_LOCALIZEDTEXT("", "UInteger");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_DATATYPE,
-UA_NODEID_NUMERIC(ns[0], 852),
-UA_NODEID_NUMERIC(ns[0], 29),
+UA_NODEID_NUMERIC(ns[0], 28),
+UA_NODEID_NUMERIC(ns[0], 26),
 UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "ServerState"),
+UA_QUALIFIEDNAME(ns[0], "UInteger"),
  UA_NODEID_NULL,
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES],NULL, NULL);
 return retVal;
@@ -46265,136 +47301,132 @@ return retVal;
 
 static UA_StatusCode function_namespace0_generated_43_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 852)
+UA_NODEID_NUMERIC(ns[0], 28)
 );
 }
 
-/* HasHistoricalConfiguration - ns=0;i=56 */
+/* UInt64 - ns=0;i=9 */
 
 static UA_StatusCode function_namespace0_generated_44_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-UA_ReferenceTypeAttributes attr = UA_ReferenceTypeAttributes_default;
-attr.inverseName  = UA_LOCALIZEDTEXT("", "HistoricalConfigurationOf");
-attr.displayName = UA_LOCALIZEDTEXT("", "HasHistoricalConfiguration");
-retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_REFERENCETYPE,
-UA_NODEID_NUMERIC(ns[0], 56),
-UA_NODEID_NUMERIC(ns[0], 44),
+UA_DataTypeAttributes attr = UA_DataTypeAttributes_default;
+attr.displayName = UA_LOCALIZEDTEXT("", "UInt64");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_DATATYPE,
+UA_NODEID_NUMERIC(ns[0], 9),
+UA_NODEID_NUMERIC(ns[0], 28),
 UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "HasHistoricalConfiguration"),
+UA_QUALIFIEDNAME(ns[0], "UInt64"),
  UA_NODEID_NULL,
-(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_REFERENCETYPEATTRIBUTES],NULL, NULL);
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
 static UA_StatusCode function_namespace0_generated_44_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 56)
+UA_NODEID_NUMERIC(ns[0], 9)
 );
 }
 
-/* HasEffect - ns=0;i=54 */
+/* Byte - ns=0;i=3 */
 
 static UA_StatusCode function_namespace0_generated_45_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-UA_ReferenceTypeAttributes attr = UA_ReferenceTypeAttributes_default;
-attr.inverseName  = UA_LOCALIZEDTEXT("", "MayBeEffectedBy");
-attr.displayName = UA_LOCALIZEDTEXT("", "HasEffect");
-retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_REFERENCETYPE,
-UA_NODEID_NUMERIC(ns[0], 54),
-UA_NODEID_NUMERIC(ns[0], 32),
+UA_DataTypeAttributes attr = UA_DataTypeAttributes_default;
+attr.displayName = UA_LOCALIZEDTEXT("", "Byte");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_DATATYPE,
+UA_NODEID_NUMERIC(ns[0], 3),
+UA_NODEID_NUMERIC(ns[0], 28),
 UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "HasEffect"),
+UA_QUALIFIEDNAME(ns[0], "Byte"),
  UA_NODEID_NULL,
-(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_REFERENCETYPEATTRIBUTES],NULL, NULL);
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
 static UA_StatusCode function_namespace0_generated_45_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 54)
+UA_NODEID_NUMERIC(ns[0], 3)
 );
 }
 
-/* ToState - ns=0;i=52 */
+/* UInt32 - ns=0;i=7 */
 
 static UA_StatusCode function_namespace0_generated_46_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-UA_ReferenceTypeAttributes attr = UA_ReferenceTypeAttributes_default;
-attr.inverseName  = UA_LOCALIZEDTEXT("", "FromTransition");
-attr.displayName = UA_LOCALIZEDTEXT("", "ToState");
-retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_REFERENCETYPE,
-UA_NODEID_NUMERIC(ns[0], 52),
-UA_NODEID_NUMERIC(ns[0], 32),
+UA_DataTypeAttributes attr = UA_DataTypeAttributes_default;
+attr.displayName = UA_LOCALIZEDTEXT("", "UInt32");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_DATATYPE,
+UA_NODEID_NUMERIC(ns[0], 7),
+UA_NODEID_NUMERIC(ns[0], 28),
 UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "ToState"),
+UA_QUALIFIEDNAME(ns[0], "UInt32"),
  UA_NODEID_NULL,
-(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_REFERENCETYPEATTRIBUTES],NULL, NULL);
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
 static UA_StatusCode function_namespace0_generated_46_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 52)
+UA_NODEID_NUMERIC(ns[0], 7)
 );
 }
 
-/* HasCause - ns=0;i=53 */
+/* UInt16 - ns=0;i=5 */
 
 static UA_StatusCode function_namespace0_generated_47_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-UA_ReferenceTypeAttributes attr = UA_ReferenceTypeAttributes_default;
-attr.inverseName  = UA_LOCALIZEDTEXT("", "MayBeCausedBy");
-attr.displayName = UA_LOCALIZEDTEXT("", "HasCause");
-retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_REFERENCETYPE,
-UA_NODEID_NUMERIC(ns[0], 53),
-UA_NODEID_NUMERIC(ns[0], 32),
+UA_DataTypeAttributes attr = UA_DataTypeAttributes_default;
+attr.displayName = UA_LOCALIZEDTEXT("", "UInt16");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_DATATYPE,
+UA_NODEID_NUMERIC(ns[0], 5),
+UA_NODEID_NUMERIC(ns[0], 28),
 UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "HasCause"),
+UA_QUALIFIEDNAME(ns[0], "UInt16"),
  UA_NODEID_NULL,
-(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_REFERENCETYPEATTRIBUTES],NULL, NULL);
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
 static UA_StatusCode function_namespace0_generated_47_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 53)
+UA_NODEID_NUMERIC(ns[0], 5)
 );
 }
 
-/* FromState - ns=0;i=51 */
+/* Integer - ns=0;i=27 */
 
 static UA_StatusCode function_namespace0_generated_48_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-UA_ReferenceTypeAttributes attr = UA_ReferenceTypeAttributes_default;
-attr.inverseName  = UA_LOCALIZEDTEXT("", "ToTransition");
-attr.displayName = UA_LOCALIZEDTEXT("", "FromState");
-retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_REFERENCETYPE,
-UA_NODEID_NUMERIC(ns[0], 51),
-UA_NODEID_NUMERIC(ns[0], 32),
+UA_DataTypeAttributes attr = UA_DataTypeAttributes_default;
+attr.isAbstract = true;
+attr.displayName = UA_LOCALIZEDTEXT("", "Integer");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_DATATYPE,
+UA_NODEID_NUMERIC(ns[0], 27),
+UA_NODEID_NUMERIC(ns[0], 26),
 UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "FromState"),
+UA_QUALIFIEDNAME(ns[0], "Integer"),
  UA_NODEID_NULL,
-(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_REFERENCETYPEATTRIBUTES],NULL, NULL);
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
 static UA_StatusCode function_namespace0_generated_48_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 51)
+UA_NODEID_NUMERIC(ns[0], 27)
 );
 }
 
-/* String - ns=0;i=12 */
+/* Int16 - ns=0;i=4 */
 
 static UA_StatusCode function_namespace0_generated_49_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_DataTypeAttributes attr = UA_DataTypeAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "String");
+attr.displayName = UA_LOCALIZEDTEXT("", "Int16");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_DATATYPE,
-UA_NODEID_NUMERIC(ns[0], 12),
-UA_NODEID_NUMERIC(ns[0], 24),
+UA_NODEID_NUMERIC(ns[0], 4),
+UA_NODEID_NUMERIC(ns[0], 27),
 UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "String"),
+UA_QUALIFIEDNAME(ns[0], "Int16"),
  UA_NODEID_NULL,
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES],NULL, NULL);
 return retVal;
@@ -46402,21 +47434,21 @@ return retVal;
 
 static UA_StatusCode function_namespace0_generated_49_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 12)
+UA_NODEID_NUMERIC(ns[0], 4)
 );
 }
 
-/* LocaleId - ns=0;i=295 */
+/* Int32 - ns=0;i=6 */
 
 static UA_StatusCode function_namespace0_generated_50_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_DataTypeAttributes attr = UA_DataTypeAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "LocaleId");
+attr.displayName = UA_LOCALIZEDTEXT("", "Int32");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_DATATYPE,
-UA_NODEID_NUMERIC(ns[0], 295),
-UA_NODEID_NUMERIC(ns[0], 12),
+UA_NODEID_NUMERIC(ns[0], 6),
+UA_NODEID_NUMERIC(ns[0], 27),
 UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "LocaleId"),
+UA_QUALIFIEDNAME(ns[0], "Int32"),
  UA_NODEID_NULL,
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES],NULL, NULL);
 return retVal;
@@ -46424,21 +47456,21 @@ return retVal;
 
 static UA_StatusCode function_namespace0_generated_50_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 295)
+UA_NODEID_NUMERIC(ns[0], 6)
 );
 }
 
-/* DateTime - ns=0;i=13 */
+/* Int64 - ns=0;i=8 */
 
 static UA_StatusCode function_namespace0_generated_51_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_DataTypeAttributes attr = UA_DataTypeAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "DateTime");
+attr.displayName = UA_LOCALIZEDTEXT("", "Int64");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_DATATYPE,
-UA_NODEID_NUMERIC(ns[0], 13),
-UA_NODEID_NUMERIC(ns[0], 24),
+UA_NODEID_NUMERIC(ns[0], 8),
+UA_NODEID_NUMERIC(ns[0], 27),
 UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "DateTime"),
+UA_QUALIFIEDNAME(ns[0], "Int64"),
  UA_NODEID_NULL,
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES],NULL, NULL);
 return retVal;
@@ -46446,21 +47478,21 @@ return retVal;
 
 static UA_StatusCode function_namespace0_generated_51_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 13)
+UA_NODEID_NUMERIC(ns[0], 8)
 );
 }
 
-/* UtcTime - ns=0;i=294 */
+/* SByte - ns=0;i=2 */
 
 static UA_StatusCode function_namespace0_generated_52_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_DataTypeAttributes attr = UA_DataTypeAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "UtcTime");
+attr.displayName = UA_LOCALIZEDTEXT("", "SByte");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_DATATYPE,
-UA_NODEID_NUMERIC(ns[0], 294),
-UA_NODEID_NUMERIC(ns[0], 13),
+UA_NODEID_NUMERIC(ns[0], 2),
+UA_NODEID_NUMERIC(ns[0], 27),
 UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "UtcTime"),
+UA_QUALIFIEDNAME(ns[0], "SByte"),
  UA_NODEID_NULL,
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES],NULL, NULL);
 return retVal;
@@ -46468,21 +47500,21 @@ return retVal;
 
 static UA_StatusCode function_namespace0_generated_52_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 294)
+UA_NODEID_NUMERIC(ns[0], 2)
 );
 }
 
-/* NodeId - ns=0;i=17 */
+/* Float - ns=0;i=10 */
 
 static UA_StatusCode function_namespace0_generated_53_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_DataTypeAttributes attr = UA_DataTypeAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "NodeId");
+attr.displayName = UA_LOCALIZEDTEXT("", "Float");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_DATATYPE,
-UA_NODEID_NUMERIC(ns[0], 17),
-UA_NODEID_NUMERIC(ns[0], 24),
+UA_NODEID_NUMERIC(ns[0], 10),
+UA_NODEID_NUMERIC(ns[0], 26),
 UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "NodeId"),
+UA_QUALIFIEDNAME(ns[0], "Float"),
  UA_NODEID_NULL,
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES],NULL, NULL);
 return retVal;
@@ -46490,21 +47522,21 @@ return retVal;
 
 static UA_StatusCode function_namespace0_generated_53_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 17)
+UA_NODEID_NUMERIC(ns[0], 10)
 );
 }
 
-/* Boolean - ns=0;i=1 */
+/* Decimal - ns=0;i=50 */
 
 static UA_StatusCode function_namespace0_generated_54_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_DataTypeAttributes attr = UA_DataTypeAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "Boolean");
+attr.displayName = UA_LOCALIZEDTEXT("", "Decimal");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_DATATYPE,
-UA_NODEID_NUMERIC(ns[0], 1),
-UA_NODEID_NUMERIC(ns[0], 24),
+UA_NODEID_NUMERIC(ns[0], 50),
+UA_NODEID_NUMERIC(ns[0], 26),
 UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "Boolean"),
+UA_QUALIFIEDNAME(ns[0], "Decimal"),
  UA_NODEID_NULL,
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES],NULL, NULL);
 return retVal;
@@ -46512,21 +47544,21 @@ return retVal;
 
 static UA_StatusCode function_namespace0_generated_54_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 1)
+UA_NODEID_NUMERIC(ns[0], 50)
 );
 }
 
-/* XmlElement - ns=0;i=16 */
+/* Double - ns=0;i=11 */
 
 static UA_StatusCode function_namespace0_generated_55_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_DataTypeAttributes attr = UA_DataTypeAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "XmlElement");
+attr.displayName = UA_LOCALIZEDTEXT("", "Double");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_DATATYPE,
-UA_NODEID_NUMERIC(ns[0], 16),
-UA_NODEID_NUMERIC(ns[0], 24),
+UA_NODEID_NUMERIC(ns[0], 11),
+UA_NODEID_NUMERIC(ns[0], 26),
 UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "XmlElement"),
+UA_QUALIFIEDNAME(ns[0], "Double"),
  UA_NODEID_NULL,
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES],NULL, NULL);
 return retVal;
@@ -46534,21 +47566,21 @@ return retVal;
 
 static UA_StatusCode function_namespace0_generated_55_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 16)
+UA_NODEID_NUMERIC(ns[0], 11)
 );
 }
 
-/* Guid - ns=0;i=14 */
+/* Duration - ns=0;i=290 */
 
 static UA_StatusCode function_namespace0_generated_56_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_DataTypeAttributes attr = UA_DataTypeAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "Guid");
+attr.displayName = UA_LOCALIZEDTEXT("", "Duration");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_DATATYPE,
-UA_NODEID_NUMERIC(ns[0], 14),
-UA_NODEID_NUMERIC(ns[0], 24),
+UA_NODEID_NUMERIC(ns[0], 290),
+UA_NODEID_NUMERIC(ns[0], 11),
 UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "Guid"),
+UA_QUALIFIEDNAME(ns[0], "Duration"),
  UA_NODEID_NULL,
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES],NULL, NULL);
 return retVal;
@@ -46556,124 +47588,147 @@ return retVal;
 
 static UA_StatusCode function_namespace0_generated_56_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 14)
+UA_NODEID_NUMERIC(ns[0], 290)
 );
 }
 
-/* ServerDiagnosticsType - ns=0;i=2020 */
+/* DataItemType - ns=0;i=2365 */
 
 static UA_StatusCode function_namespace0_generated_57_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-UA_ObjectTypeAttributes attr = UA_ObjectTypeAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "ServerDiagnosticsType");
-retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_OBJECTTYPE,
-UA_NODEID_NUMERIC(ns[0], 2020),
-UA_NODEID_NUMERIC(ns[0], 58),
+UA_VariableTypeAttributes attr = UA_VariableTypeAttributes_default;
+attr.valueRank = -2;
+/* DataType inherited */
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 24);
+attr.displayName = UA_LOCALIZEDTEXT("", "DataItemType");
+#ifdef UA_ENABLE_NODESET_COMPILER_DESCRIPTIONS
+attr.description = UA_LOCALIZEDTEXT("", "A variable that contains live automation data.");
+#endif
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLETYPE,
+UA_NODEID_NUMERIC(ns[0], 2365),
+UA_NODEID_NUMERIC(ns[0], 63),
 UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "ServerDiagnosticsType"),
- UA_NODEID_NULL,
-(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_OBJECTTYPEATTRIBUTES],NULL, NULL);
+UA_QUALIFIEDNAME(ns[0], "DataItemType"),
+UA_NODEID_NUMERIC(ns[0], 0),
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLETYPEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
 static UA_StatusCode function_namespace0_generated_57_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2020)
+UA_NODEID_NUMERIC(ns[0], 2365)
 );
 }
 
-/* Default Binary - ns=0;i=3062 */
+/* AnalogItemType - ns=0;i=2368 */
 
 static UA_StatusCode function_namespace0_generated_58_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-UA_ObjectAttributes attr = UA_ObjectAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "Default Binary");
-retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_OBJECT,
-UA_NODEID_NUMERIC(ns[0], 3062),
-UA_NODEID_NUMERIC(ns[0], 0),
+UA_VariableTypeAttributes attr = UA_VariableTypeAttributes_default;
+attr.valueRank = -2;
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 26);
+attr.displayName = UA_LOCALIZEDTEXT("", "AnalogItemType");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLETYPE,
+UA_NODEID_NUMERIC(ns[0], 2368),
+UA_NODEID_NUMERIC(ns[0], 2365),
+UA_NODEID_NUMERIC(ns[0], 45),
+UA_QUALIFIEDNAME(ns[0], "AnalogItemType"),
 UA_NODEID_NUMERIC(ns[0], 0),
-UA_QUALIFIEDNAME(ns[0], "Default Binary"),
-UA_NODEID_NUMERIC(ns[0], 58),
-(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES],NULL, NULL);
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLETYPEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
 static UA_StatusCode function_namespace0_generated_58_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 3062)
+UA_NODEID_NUMERIC(ns[0], 2368)
 );
 }
 
-/* Default XML - ns=0;i=3063 */
+/* InstrumentRange - ns=0;i=2370 */
 
 static UA_StatusCode function_namespace0_generated_59_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-UA_ObjectAttributes attr = UA_ObjectAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "Default XML");
-retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_OBJECT,
-UA_NODEID_NUMERIC(ns[0], 3063),
-UA_NODEID_NUMERIC(ns[0], 0),
-UA_NODEID_NUMERIC(ns[0], 0),
-UA_QUALIFIEDNAME(ns[0], "Default XML"),
-UA_NODEID_NUMERIC(ns[0], 58),
-(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES],NULL, NULL);
+UA_VariableAttributes attr = UA_VariableAttributes_default;
+attr.minimumSamplingInterval = 0.000000;
+attr.userAccessLevel = 1;
+attr.accessLevel = 1;
+/* Value rank inherited */
+attr.valueRank = -1;
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 884);
+attr.displayName = UA_LOCALIZEDTEXT("", "InstrumentRange");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
+UA_NODEID_NUMERIC(ns[0], 2370),
+UA_NODEID_NUMERIC(ns[0], 2368),
+UA_NODEID_NUMERIC(ns[0], 46),
+UA_QUALIFIEDNAME(ns[0], "InstrumentRange"),
+UA_NODEID_NUMERIC(ns[0], 68),
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
 static UA_StatusCode function_namespace0_generated_59_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 3063)
+UA_NODEID_NUMERIC(ns[0], 2370)
 );
 }
 
-/* ServerStatusType - ns=0;i=2138 */
+/* EngineeringUnits - ns=0;i=2371 */
 
 static UA_StatusCode function_namespace0_generated_60_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-UA_VariableTypeAttributes attr = UA_VariableTypeAttributes_default;
+UA_VariableAttributes attr = UA_VariableAttributes_default;
+attr.minimumSamplingInterval = 0.000000;
+attr.userAccessLevel = 1;
+attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 862);
-attr.displayName = UA_LOCALIZEDTEXT("", "ServerStatusType");
-retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLETYPE,
-UA_NODEID_NUMERIC(ns[0], 2138),
-UA_NODEID_NUMERIC(ns[0], 63),
-UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "ServerStatusType"),
-UA_NODEID_NUMERIC(ns[0], 0),
-(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLETYPEATTRIBUTES],NULL, NULL);
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 887);
+attr.displayName = UA_LOCALIZEDTEXT("", "EngineeringUnits");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
+UA_NODEID_NUMERIC(ns[0], 2371),
+UA_NODEID_NUMERIC(ns[0], 2368),
+UA_NODEID_NUMERIC(ns[0], 46),
+UA_QUALIFIEDNAME(ns[0], "EngineeringUnits"),
+UA_NODEID_NUMERIC(ns[0], 68),
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
 static UA_StatusCode function_namespace0_generated_60_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2138)
+UA_NODEID_NUMERIC(ns[0], 2371)
 );
 }
 
-/* VendorServerInfoType - ns=0;i=2033 */
+/* EURange - ns=0;i=2369 */
 
 static UA_StatusCode function_namespace0_generated_61_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-UA_ObjectTypeAttributes attr = UA_ObjectTypeAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "VendorServerInfoType");
-retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_OBJECTTYPE,
-UA_NODEID_NUMERIC(ns[0], 2033),
-UA_NODEID_NUMERIC(ns[0], 58),
-UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "VendorServerInfoType"),
- UA_NODEID_NULL,
-(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_OBJECTTYPEATTRIBUTES],NULL, NULL);
+UA_VariableAttributes attr = UA_VariableAttributes_default;
+attr.minimumSamplingInterval = 0.000000;
+attr.userAccessLevel = 3;
+attr.accessLevel = 3;
+/* Value rank inherited */
+attr.valueRank = -1;
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 884);
+attr.displayName = UA_LOCALIZEDTEXT("", "EURange");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
+UA_NODEID_NUMERIC(ns[0], 2369),
+UA_NODEID_NUMERIC(ns[0], 2368),
+UA_NODEID_NUMERIC(ns[0], 46),
+UA_QUALIFIEDNAME(ns[0], "EURange"),
+UA_NODEID_NUMERIC(ns[0], 68),
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
 static UA_StatusCode function_namespace0_generated_61_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2033)
+UA_NODEID_NUMERIC(ns[0], 2369)
 );
 }
 
-/* LocalTime - ns=0;i=3190 */
+/* ValuePrecision - ns=0;i=2367 */
 
 static UA_StatusCode function_namespace0_generated_62_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
@@ -46683,16 +47738,16 @@ attr.userAccessLevel = 1;
 attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 8912);
-attr.displayName = UA_LOCALIZEDTEXT("", "LocalTime");
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 11);
+attr.displayName = UA_LOCALIZEDTEXT("", "ValuePrecision");
 #ifdef UA_ENABLE_NODESET_COMPILER_DESCRIPTIONS
-attr.description = UA_LOCALIZEDTEXT("", "Information about the local time where the event originated.");
+attr.description = UA_LOCALIZEDTEXT("", "The maximum precision that the server can maintain for the item based on restrictions in the target environment.");
 #endif
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 3190),
-UA_NODEID_NUMERIC(ns[0], 2041),
+UA_NODEID_NUMERIC(ns[0], 2367),
+UA_NODEID_NUMERIC(ns[0], 2365),
 UA_NODEID_NUMERIC(ns[0], 46),
-UA_QUALIFIEDNAME(ns[0], "LocalTime"),
+UA_QUALIFIEDNAME(ns[0], "ValuePrecision"),
 UA_NODEID_NUMERIC(ns[0], 68),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
 return retVal;
@@ -46700,24 +47755,25 @@ return retVal;
 
 static UA_StatusCode function_namespace0_generated_62_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 3190)
+UA_NODEID_NUMERIC(ns[0], 2367)
 );
 }
 
-/* DataTypeDescriptionType - ns=0;i=69 */
+/* DiscreteItemType - ns=0;i=2372 */
 
 static UA_StatusCode function_namespace0_generated_63_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableTypeAttributes attr = UA_VariableTypeAttributes_default;
-/* Value rank inherited */
-attr.valueRank = -1;
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 12);
-attr.displayName = UA_LOCALIZEDTEXT("", "DataTypeDescriptionType");
+attr.isAbstract = true;
+attr.valueRank = -2;
+/* DataType inherited */
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 24);
+attr.displayName = UA_LOCALIZEDTEXT("", "DiscreteItemType");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLETYPE,
-UA_NODEID_NUMERIC(ns[0], 69),
-UA_NODEID_NUMERIC(ns[0], 63),
+UA_NODEID_NUMERIC(ns[0], 2372),
+UA_NODEID_NUMERIC(ns[0], 2365),
 UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "DataTypeDescriptionType"),
+UA_QUALIFIEDNAME(ns[0], "DiscreteItemType"),
 UA_NODEID_NUMERIC(ns[0], 0),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLETYPEATTRIBUTES],NULL, NULL);
 return retVal;
@@ -46725,39 +47781,35 @@ return retVal;
 
 static UA_StatusCode function_namespace0_generated_63_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 69)
+UA_NODEID_NUMERIC(ns[0], 2372)
 );
 }
 
-/* DictionaryFragment - ns=0;i=105 */
+/* MultiStateValueDiscreteType - ns=0;i=11238 */
 
 static UA_StatusCode function_namespace0_generated_64_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-UA_VariableAttributes attr = UA_VariableAttributes_default;
-attr.minimumSamplingInterval = 0.000000;
-attr.userAccessLevel = 1;
-attr.accessLevel = 1;
-/* Value rank inherited */
-attr.valueRank = -1;
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 15);
-attr.displayName = UA_LOCALIZEDTEXT("", "DictionaryFragment");
-retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 105),
-UA_NODEID_NUMERIC(ns[0], 69),
-UA_NODEID_NUMERIC(ns[0], 46),
-UA_QUALIFIEDNAME(ns[0], "DictionaryFragment"),
-UA_NODEID_NUMERIC(ns[0], 68),
-(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
+UA_VariableTypeAttributes attr = UA_VariableTypeAttributes_default;
+attr.valueRank = -2;
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 26);
+attr.displayName = UA_LOCALIZEDTEXT("", "MultiStateValueDiscreteType");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLETYPE,
+UA_NODEID_NUMERIC(ns[0], 11238),
+UA_NODEID_NUMERIC(ns[0], 2372),
+UA_NODEID_NUMERIC(ns[0], 45),
+UA_QUALIFIEDNAME(ns[0], "MultiStateValueDiscreteType"),
+UA_NODEID_NUMERIC(ns[0], 0),
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLETYPEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
 static UA_StatusCode function_namespace0_generated_64_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 105)
+UA_NODEID_NUMERIC(ns[0], 11238)
 );
 }
 
-/* DataTypeVersion - ns=0;i=104 */
+/* ValueAsText - ns=0;i=11461 */
 
 static UA_StatusCode function_namespace0_generated_65_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
@@ -46767,13 +47819,13 @@ attr.userAccessLevel = 1;
 attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 12);
-attr.displayName = UA_LOCALIZEDTEXT("", "DataTypeVersion");
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 21);
+attr.displayName = UA_LOCALIZEDTEXT("", "ValueAsText");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 104),
-UA_NODEID_NUMERIC(ns[0], 69),
+UA_NODEID_NUMERIC(ns[0], 11461),
+UA_NODEID_NUMERIC(ns[0], 11238),
 UA_NODEID_NUMERIC(ns[0], 46),
-UA_QUALIFIEDNAME(ns[0], "DataTypeVersion"),
+UA_QUALIFIEDNAME(ns[0], "ValueAsText"),
 UA_NODEID_NUMERIC(ns[0], 68),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
 return retVal;
@@ -46781,11 +47833,11 @@ return retVal;
 
 static UA_StatusCode function_namespace0_generated_65_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 104)
+UA_NODEID_NUMERIC(ns[0], 11461)
 );
 }
 
-/* SourceName - ns=0;i=2045 */
+/* EnumValues - ns=0;i=11241 */
 
 static UA_StatusCode function_namespace0_generated_66_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
@@ -46793,18 +47845,18 @@ UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
 attr.userAccessLevel = 1;
 attr.accessLevel = 1;
-/* Value rank inherited */
-attr.valueRank = -1;
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 12);
-attr.displayName = UA_LOCALIZEDTEXT("", "SourceName");
-#ifdef UA_ENABLE_NODESET_COMPILER_DESCRIPTIONS
-attr.description = UA_LOCALIZEDTEXT("", "A description of the source of the event.");
-#endif
+attr.valueRank = 1;
+attr.arrayDimensionsSize = 1;
+UA_UInt32 arrayDimensions[1];
+arrayDimensions[0] = 0;
+attr.arrayDimensions = &arrayDimensions[0];
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 7594);
+attr.displayName = UA_LOCALIZEDTEXT("", "EnumValues");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 2045),
-UA_NODEID_NUMERIC(ns[0], 2041),
+UA_NODEID_NUMERIC(ns[0], 11241),
+UA_NODEID_NUMERIC(ns[0], 11238),
 UA_NODEID_NUMERIC(ns[0], 46),
-UA_QUALIFIEDNAME(ns[0], "SourceName"),
+UA_QUALIFIEDNAME(ns[0], "EnumValues"),
 UA_NODEID_NUMERIC(ns[0], 68),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
 return retVal;
@@ -46812,42 +47864,35 @@ return retVal;
 
 static UA_StatusCode function_namespace0_generated_66_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2045)
+UA_NODEID_NUMERIC(ns[0], 11241)
 );
 }
 
-/* SourceNode - ns=0;i=2044 */
+/* MultiStateDiscreteType - ns=0;i=2376 */
 
 static UA_StatusCode function_namespace0_generated_67_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-UA_VariableAttributes attr = UA_VariableAttributes_default;
-attr.minimumSamplingInterval = 0.000000;
-attr.userAccessLevel = 1;
-attr.accessLevel = 1;
-/* Value rank inherited */
-attr.valueRank = -1;
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 17);
-attr.displayName = UA_LOCALIZEDTEXT("", "SourceNode");
-#ifdef UA_ENABLE_NODESET_COMPILER_DESCRIPTIONS
-attr.description = UA_LOCALIZEDTEXT("", "The source of the event.");
-#endif
-retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 2044),
-UA_NODEID_NUMERIC(ns[0], 2041),
-UA_NODEID_NUMERIC(ns[0], 46),
-UA_QUALIFIEDNAME(ns[0], "SourceNode"),
-UA_NODEID_NUMERIC(ns[0], 68),
-(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
+UA_VariableTypeAttributes attr = UA_VariableTypeAttributes_default;
+attr.valueRank = -2;
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 28);
+attr.displayName = UA_LOCALIZEDTEXT("", "MultiStateDiscreteType");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLETYPE,
+UA_NODEID_NUMERIC(ns[0], 2376),
+UA_NODEID_NUMERIC(ns[0], 2372),
+UA_NODEID_NUMERIC(ns[0], 45),
+UA_QUALIFIEDNAME(ns[0], "MultiStateDiscreteType"),
+UA_NODEID_NUMERIC(ns[0], 0),
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLETYPEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
 static UA_StatusCode function_namespace0_generated_67_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2044)
+UA_NODEID_NUMERIC(ns[0], 2376)
 );
 }
 
-/* ReceiveTime - ns=0;i=2047 */
+/* EnumStrings - ns=0;i=2377 */
 
 static UA_StatusCode function_namespace0_generated_68_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
@@ -46855,18 +47900,18 @@ UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
 attr.userAccessLevel = 1;
 attr.accessLevel = 1;
-/* Value rank inherited */
-attr.valueRank = -1;
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 294);
-attr.displayName = UA_LOCALIZEDTEXT("", "ReceiveTime");
-#ifdef UA_ENABLE_NODESET_COMPILER_DESCRIPTIONS
-attr.description = UA_LOCALIZEDTEXT("", "When the server received the event from the underlying system.");
-#endif
+attr.valueRank = 1;
+attr.arrayDimensionsSize = 1;
+UA_UInt32 arrayDimensions[1];
+arrayDimensions[0] = 0;
+attr.arrayDimensions = &arrayDimensions[0];
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 21);
+attr.displayName = UA_LOCALIZEDTEXT("", "EnumStrings");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 2047),
-UA_NODEID_NUMERIC(ns[0], 2041),
+UA_NODEID_NUMERIC(ns[0], 2377),
+UA_NODEID_NUMERIC(ns[0], 2376),
 UA_NODEID_NUMERIC(ns[0], 46),
-UA_QUALIFIEDNAME(ns[0], "ReceiveTime"),
+UA_QUALIFIEDNAME(ns[0], "EnumStrings"),
 UA_NODEID_NUMERIC(ns[0], 68),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
 return retVal;
@@ -46874,42 +47919,35 @@ return retVal;
 
 static UA_StatusCode function_namespace0_generated_68_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2047)
+UA_NODEID_NUMERIC(ns[0], 2377)
 );
 }
 
-/* Time - ns=0;i=2046 */
+/* TwoStateDiscreteType - ns=0;i=2373 */
 
 static UA_StatusCode function_namespace0_generated_69_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-UA_VariableAttributes attr = UA_VariableAttributes_default;
-attr.minimumSamplingInterval = 0.000000;
-attr.userAccessLevel = 1;
-attr.accessLevel = 1;
-/* Value rank inherited */
-attr.valueRank = -1;
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 294);
-attr.displayName = UA_LOCALIZEDTEXT("", "Time");
-#ifdef UA_ENABLE_NODESET_COMPILER_DESCRIPTIONS
-attr.description = UA_LOCALIZEDTEXT("", "When the event occurred.");
-#endif
-retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 2046),
-UA_NODEID_NUMERIC(ns[0], 2041),
-UA_NODEID_NUMERIC(ns[0], 46),
-UA_QUALIFIEDNAME(ns[0], "Time"),
-UA_NODEID_NUMERIC(ns[0], 68),
-(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
+UA_VariableTypeAttributes attr = UA_VariableTypeAttributes_default;
+attr.valueRank = -2;
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 1);
+attr.displayName = UA_LOCALIZEDTEXT("", "TwoStateDiscreteType");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLETYPE,
+UA_NODEID_NUMERIC(ns[0], 2373),
+UA_NODEID_NUMERIC(ns[0], 2372),
+UA_NODEID_NUMERIC(ns[0], 45),
+UA_QUALIFIEDNAME(ns[0], "TwoStateDiscreteType"),
+UA_NODEID_NUMERIC(ns[0], 0),
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLETYPEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
 static UA_StatusCode function_namespace0_generated_69_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2046)
+UA_NODEID_NUMERIC(ns[0], 2373)
 );
 }
 
-/* EventType - ns=0;i=2043 */
+/* FalseState - ns=0;i=2374 */
 
 static UA_StatusCode function_namespace0_generated_70_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
@@ -46919,16 +47957,13 @@ attr.userAccessLevel = 1;
 attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 17);
-attr.displayName = UA_LOCALIZEDTEXT("", "EventType");
-#ifdef UA_ENABLE_NODESET_COMPILER_DESCRIPTIONS
-attr.description = UA_LOCALIZEDTEXT("", "The identifier for the event type.");
-#endif
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 21);
+attr.displayName = UA_LOCALIZEDTEXT("", "FalseState");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 2043),
-UA_NODEID_NUMERIC(ns[0], 2041),
+UA_NODEID_NUMERIC(ns[0], 2374),
+UA_NODEID_NUMERIC(ns[0], 2373),
 UA_NODEID_NUMERIC(ns[0], 46),
-UA_QUALIFIEDNAME(ns[0], "EventType"),
+UA_QUALIFIEDNAME(ns[0], "FalseState"),
 UA_NODEID_NUMERIC(ns[0], 68),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
 return retVal;
@@ -46936,11 +47971,11 @@ return retVal;
 
 static UA_StatusCode function_namespace0_generated_70_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2043)
+UA_NODEID_NUMERIC(ns[0], 2374)
 );
 }
 
-/* EventId - ns=0;i=2042 */
+/* TrueState - ns=0;i=2375 */
 
 static UA_StatusCode function_namespace0_generated_71_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
@@ -46950,16 +47985,13 @@ attr.userAccessLevel = 1;
 attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 15);
-attr.displayName = UA_LOCALIZEDTEXT("", "EventId");
-#ifdef UA_ENABLE_NODESET_COMPILER_DESCRIPTIONS
-attr.description = UA_LOCALIZEDTEXT("", "A globally unique identifier for the event.");
-#endif
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 21);
+attr.displayName = UA_LOCALIZEDTEXT("", "TrueState");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 2042),
-UA_NODEID_NUMERIC(ns[0], 2041),
+UA_NODEID_NUMERIC(ns[0], 2375),
+UA_NODEID_NUMERIC(ns[0], 2373),
 UA_NODEID_NUMERIC(ns[0], 46),
-UA_QUALIFIEDNAME(ns[0], "EventId"),
+UA_QUALIFIEDNAME(ns[0], "TrueState"),
 UA_NODEID_NUMERIC(ns[0], 68),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
 return retVal;
@@ -46967,39 +47999,14 @@ return retVal;
 
 static UA_StatusCode function_namespace0_generated_71_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2042)
+UA_NODEID_NUMERIC(ns[0], 2375)
 );
 }
 
-/* DataTypeDictionaryType - ns=0;i=72 */
+/* Definition - ns=0;i=2366 */
 
 static UA_StatusCode function_namespace0_generated_72_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-UA_VariableTypeAttributes attr = UA_VariableTypeAttributes_default;
-/* Value rank inherited */
-attr.valueRank = -1;
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 15);
-attr.displayName = UA_LOCALIZEDTEXT("", "DataTypeDictionaryType");
-retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLETYPE,
-UA_NODEID_NUMERIC(ns[0], 72),
-UA_NODEID_NUMERIC(ns[0], 63),
-UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "DataTypeDictionaryType"),
-UA_NODEID_NUMERIC(ns[0], 0),
-(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLETYPEATTRIBUTES],NULL, NULL);
-return retVal;
-}
-
-static UA_StatusCode function_namespace0_generated_72_finish(UA_Server *server, UA_UInt16* ns) {
-return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 72)
-);
-}
-
-/* NamespaceUri - ns=0;i=107 */
-
-static UA_StatusCode function_namespace0_generated_73_begin(UA_Server *server, UA_UInt16* ns) {
-UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
 attr.userAccessLevel = 1;
@@ -47007,99 +48014,134 @@ attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
 attr.dataType = UA_NODEID_NUMERIC(ns[0], 12);
-attr.displayName = UA_LOCALIZEDTEXT("", "NamespaceUri");
+attr.displayName = UA_LOCALIZEDTEXT("", "Definition");
 #ifdef UA_ENABLE_NODESET_COMPILER_DESCRIPTIONS
-attr.description = UA_LOCALIZEDTEXT("", "A URI that uniquely identifies the dictionary.");
+attr.description = UA_LOCALIZEDTEXT("", "A vendor-specific, human readable string that specifies how the value of this DataItem is calculated.");
 #endif
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 107),
-UA_NODEID_NUMERIC(ns[0], 72),
+UA_NODEID_NUMERIC(ns[0], 2366),
+UA_NODEID_NUMERIC(ns[0], 2365),
 UA_NODEID_NUMERIC(ns[0], 46),
-UA_QUALIFIEDNAME(ns[0], "NamespaceUri"),
+UA_QUALIFIEDNAME(ns[0], "Definition"),
 UA_NODEID_NUMERIC(ns[0], 68),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_73_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_72_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 107)
+UA_NODEID_NUMERIC(ns[0], 2366)
 );
 }
 
-/* DataTypeVersion - ns=0;i=106 */
+/* HistoryServerCapabilitiesType - ns=0;i=2330 */
 
-static UA_StatusCode function_namespace0_generated_74_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_73_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-UA_VariableAttributes attr = UA_VariableAttributes_default;
-attr.minimumSamplingInterval = 0.000000;
-attr.userAccessLevel = 1;
-attr.accessLevel = 1;
-/* Value rank inherited */
-attr.valueRank = -1;
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 12);
-attr.displayName = UA_LOCALIZEDTEXT("", "DataTypeVersion");
-retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 106),
-UA_NODEID_NUMERIC(ns[0], 72),
-UA_NODEID_NUMERIC(ns[0], 46),
-UA_QUALIFIEDNAME(ns[0], "DataTypeVersion"),
-UA_NODEID_NUMERIC(ns[0], 68),
-(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
+UA_ObjectTypeAttributes attr = UA_ObjectTypeAttributes_default;
+attr.displayName = UA_LOCALIZEDTEXT("", "HistoryServerCapabilitiesType");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_OBJECTTYPE,
+UA_NODEID_NUMERIC(ns[0], 2330),
+UA_NODEID_NUMERIC(ns[0], 58),
+UA_NODEID_NUMERIC(ns[0], 45),
+UA_QUALIFIEDNAME(ns[0], "HistoryServerCapabilitiesType"),
+ UA_NODEID_NULL,
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_OBJECTTYPEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_74_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_73_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 106)
+UA_NODEID_NUMERIC(ns[0], 2330)
 );
 }
 
-/* DataTypeSystemType - ns=0;i=75 */
+/* EventQueueOverflowEventType - ns=0;i=3035 */
 
-static UA_StatusCode function_namespace0_generated_75_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_74_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_ObjectTypeAttributes attr = UA_ObjectTypeAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "DataTypeSystemType");
+attr.isAbstract = true;
+attr.displayName = UA_LOCALIZEDTEXT("", "EventQueueOverflowEventType");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_OBJECTTYPE,
-UA_NODEID_NUMERIC(ns[0], 75),
-UA_NODEID_NUMERIC(ns[0], 58),
+UA_NODEID_NUMERIC(ns[0], 3035),
+UA_NODEID_NUMERIC(ns[0], 2041),
 UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "DataTypeSystemType"),
+UA_QUALIFIEDNAME(ns[0], "EventQueueOverflowEventType"),
  UA_NODEID_NULL,
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_OBJECTTYPEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
+static UA_StatusCode function_namespace0_generated_74_finish(UA_Server *server, UA_UInt16* ns) {
+return UA_Server_addNode_finish(server, 
+UA_NODEID_NUMERIC(ns[0], 3035)
+);
+}
+
+/* Severity - ns=0;i=2051 */
+
+static UA_StatusCode function_namespace0_generated_75_begin(UA_Server *server, UA_UInt16* ns) {
+UA_StatusCode retVal = UA_STATUSCODE_GOOD;
+UA_VariableAttributes attr = UA_VariableAttributes_default;
+attr.minimumSamplingInterval = 0.000000;
+attr.userAccessLevel = 1;
+attr.accessLevel = 1;
+/* Value rank inherited */
+attr.valueRank = -1;
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 5);
+attr.displayName = UA_LOCALIZEDTEXT("", "Severity");
+#ifdef UA_ENABLE_NODESET_COMPILER_DESCRIPTIONS
+attr.description = UA_LOCALIZEDTEXT("", "Indicates how urgent an event is.");
+#endif
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
+UA_NODEID_NUMERIC(ns[0], 2051),
+UA_NODEID_NUMERIC(ns[0], 2041),
+UA_NODEID_NUMERIC(ns[0], 46),
+UA_QUALIFIEDNAME(ns[0], "Severity"),
+UA_NODEID_NUMERIC(ns[0], 68),
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
+return retVal;
+}
+
 static UA_StatusCode function_namespace0_generated_75_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 75)
+UA_NODEID_NUMERIC(ns[0], 2051)
 );
 }
 
-/* OPC Binary - ns=0;i=93 */
+/* Message - ns=0;i=2050 */
 
 static UA_StatusCode function_namespace0_generated_76_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-UA_ObjectAttributes attr = UA_ObjectAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "OPC Binary");
-retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_OBJECT,
-UA_NODEID_NUMERIC(ns[0], 93),
-UA_NODEID_NUMERIC(ns[0], 90),
-UA_NODEID_NUMERIC(ns[0], 35),
-UA_QUALIFIEDNAME(ns[0], "OPC Binary"),
-UA_NODEID_NUMERIC(ns[0], 75),
-(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES],NULL, NULL);
+UA_VariableAttributes attr = UA_VariableAttributes_default;
+attr.minimumSamplingInterval = 0.000000;
+attr.userAccessLevel = 1;
+attr.accessLevel = 1;
+/* Value rank inherited */
+attr.valueRank = -1;
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 21);
+attr.displayName = UA_LOCALIZEDTEXT("", "Message");
+#ifdef UA_ENABLE_NODESET_COMPILER_DESCRIPTIONS
+attr.description = UA_LOCALIZEDTEXT("", "A localized description of the event.");
+#endif
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
+UA_NODEID_NUMERIC(ns[0], 2050),
+UA_NODEID_NUMERIC(ns[0], 2041),
+UA_NODEID_NUMERIC(ns[0], 46),
+UA_QUALIFIEDNAME(ns[0], "Message"),
+UA_NODEID_NUMERIC(ns[0], 68),
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
 static UA_StatusCode function_namespace0_generated_76_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 93)
+UA_NODEID_NUMERIC(ns[0], 2050)
 );
 }
 
-/* Opc.Ua - ns=0;i=7617 */
+/* LocalTime - ns=0;i=3190 */
 
 static UA_StatusCode function_namespace0_generated_77_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
@@ -47109,33 +48151,28 @@ attr.userAccessLevel = 1;
 attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 15);
-UA_ByteString *variablenode_ns_0_i_7617_variant_DataContents =  UA_ByteString_new();
-if (!variablenode_ns_0_i_7617_variant_DataContents) return UA_STATUSCODE_BADOUTOFMEMORY;
-UA_ByteString_init(variablenode_ns_0_i_7617_variant_DataContents);
-*variablenode_ns_0_i_7617_variant_DataContents = UA_BYTESTRING_NULL;
-UA_Variant_setScalar(&attr.value, variablenode_ns_0_i_7617_variant_DataContents, &UA_TYPES[UA_TYPES_BYTESTRING]);
-attr.displayName = UA_LOCALIZEDTEXT("", "Opc.Ua");
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 8912);
+attr.displayName = UA_LOCALIZEDTEXT("", "LocalTime");
+#ifdef UA_ENABLE_NODESET_COMPILER_DESCRIPTIONS
+attr.description = UA_LOCALIZEDTEXT("", "Information about the local time where the event originated.");
+#endif
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 7617),
-UA_NODEID_NUMERIC(ns[0], 93),
-UA_NODEID_NUMERIC(ns[0], 47),
-UA_QUALIFIEDNAME(ns[0], "Opc.Ua"),
-UA_NODEID_NUMERIC(ns[0], 72),
+UA_NODEID_NUMERIC(ns[0], 3190),
+UA_NODEID_NUMERIC(ns[0], 2041),
+UA_NODEID_NUMERIC(ns[0], 46),
+UA_QUALIFIEDNAME(ns[0], "LocalTime"),
+UA_NODEID_NUMERIC(ns[0], 68),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
-variablenode_ns_0_i_7617_variant_DataContents->data = NULL;
-variablenode_ns_0_i_7617_variant_DataContents->length = 0;
-UA_ByteString_delete(variablenode_ns_0_i_7617_variant_DataContents);
 return retVal;
 }
 
 static UA_StatusCode function_namespace0_generated_77_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 7617)
+UA_NODEID_NUMERIC(ns[0], 3190)
 );
 }
 
-/* Argument - ns=0;i=7650 */
+/* ReceiveTime - ns=0;i=2047 */
 
 static UA_StatusCode function_namespace0_generated_78_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
@@ -47145,31 +48182,28 @@ attr.userAccessLevel = 1;
 attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 12);
-UA_String *variablenode_ns_0_i_7650_variant_DataContents =  UA_String_new();
-if (!variablenode_ns_0_i_7650_variant_DataContents) return UA_STATUSCODE_BADOUTOFMEMORY;
-UA_String_init(variablenode_ns_0_i_7650_variant_DataContents);
-*variablenode_ns_0_i_7650_variant_DataContents = UA_STRING_ALLOC("Argument");
-UA_Variant_setScalar(&attr.value, variablenode_ns_0_i_7650_variant_DataContents, &UA_TYPES[UA_TYPES_STRING]);
-attr.displayName = UA_LOCALIZEDTEXT("", "Argument");
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 294);
+attr.displayName = UA_LOCALIZEDTEXT("", "ReceiveTime");
+#ifdef UA_ENABLE_NODESET_COMPILER_DESCRIPTIONS
+attr.description = UA_LOCALIZEDTEXT("", "When the server received the event from the underlying system.");
+#endif
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 7650),
-UA_NODEID_NUMERIC(ns[0], 7617),
-UA_NODEID_NUMERIC(ns[0], 47),
-UA_QUALIFIEDNAME(ns[0], "Argument"),
-UA_NODEID_NUMERIC(ns[0], 69),
+UA_NODEID_NUMERIC(ns[0], 2047),
+UA_NODEID_NUMERIC(ns[0], 2041),
+UA_NODEID_NUMERIC(ns[0], 46),
+UA_QUALIFIEDNAME(ns[0], "ReceiveTime"),
+UA_NODEID_NUMERIC(ns[0], 68),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
-UA_String_delete(variablenode_ns_0_i_7650_variant_DataContents);
 return retVal;
 }
 
 static UA_StatusCode function_namespace0_generated_78_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 7650)
+UA_NODEID_NUMERIC(ns[0], 2047)
 );
 }
 
-/* EnumValueType - ns=0;i=7656 */
+/* Time - ns=0;i=2046 */
 
 static UA_StatusCode function_namespace0_generated_79_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
@@ -47179,258 +48213,123 @@ attr.userAccessLevel = 1;
 attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 12);
-UA_String *variablenode_ns_0_i_7656_variant_DataContents =  UA_String_new();
-if (!variablenode_ns_0_i_7656_variant_DataContents) return UA_STATUSCODE_BADOUTOFMEMORY;
-UA_String_init(variablenode_ns_0_i_7656_variant_DataContents);
-*variablenode_ns_0_i_7656_variant_DataContents = UA_STRING_ALLOC("EnumValueType");
-UA_Variant_setScalar(&attr.value, variablenode_ns_0_i_7656_variant_DataContents, &UA_TYPES[UA_TYPES_STRING]);
-attr.displayName = UA_LOCALIZEDTEXT("", "EnumValueType");
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 294);
+attr.displayName = UA_LOCALIZEDTEXT("", "Time");
+#ifdef UA_ENABLE_NODESET_COMPILER_DESCRIPTIONS
+attr.description = UA_LOCALIZEDTEXT("", "When the event occurred.");
+#endif
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 7656),
-UA_NODEID_NUMERIC(ns[0], 7617),
-UA_NODEID_NUMERIC(ns[0], 47),
-UA_QUALIFIEDNAME(ns[0], "EnumValueType"),
-UA_NODEID_NUMERIC(ns[0], 69),
+UA_NODEID_NUMERIC(ns[0], 2046),
+UA_NODEID_NUMERIC(ns[0], 2041),
+UA_NODEID_NUMERIC(ns[0], 46),
+UA_QUALIFIEDNAME(ns[0], "Time"),
+UA_NODEID_NUMERIC(ns[0], 68),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
-UA_String_delete(variablenode_ns_0_i_7656_variant_DataContents);
 return retVal;
 }
 
 static UA_StatusCode function_namespace0_generated_79_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 7656)
+UA_NODEID_NUMERIC(ns[0], 2046)
 );
 }
 
-/* XML Schema - ns=0;i=92 */
+/* SourceName - ns=0;i=2045 */
 
 static UA_StatusCode function_namespace0_generated_80_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-UA_ObjectAttributes attr = UA_ObjectAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "XML Schema");
-retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_OBJECT,
-UA_NODEID_NUMERIC(ns[0], 92),
-UA_NODEID_NUMERIC(ns[0], 90),
-UA_NODEID_NUMERIC(ns[0], 35),
-UA_QUALIFIEDNAME(ns[0], "XML Schema"),
-UA_NODEID_NUMERIC(ns[0], 75),
-(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES],NULL, NULL);
+UA_VariableAttributes attr = UA_VariableAttributes_default;
+attr.minimumSamplingInterval = 0.000000;
+attr.userAccessLevel = 1;
+attr.accessLevel = 1;
+/* Value rank inherited */
+attr.valueRank = -1;
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 12);
+attr.displayName = UA_LOCALIZEDTEXT("", "SourceName");
+#ifdef UA_ENABLE_NODESET_COMPILER_DESCRIPTIONS
+attr.description = UA_LOCALIZEDTEXT("", "A description of the source of the event.");
+#endif
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
+UA_NODEID_NUMERIC(ns[0], 2045),
+UA_NODEID_NUMERIC(ns[0], 2041),
+UA_NODEID_NUMERIC(ns[0], 46),
+UA_QUALIFIEDNAME(ns[0], "SourceName"),
+UA_NODEID_NUMERIC(ns[0], 68),
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
 static UA_StatusCode function_namespace0_generated_80_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 92)
+UA_NODEID_NUMERIC(ns[0], 2045)
 );
 }
 
-/* DataTypeEncodingType - ns=0;i=76 */
+/* SourceNode - ns=0;i=2044 */
 
 static UA_StatusCode function_namespace0_generated_81_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-UA_ObjectTypeAttributes attr = UA_ObjectTypeAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "DataTypeEncodingType");
-retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_OBJECTTYPE,
-UA_NODEID_NUMERIC(ns[0], 76),
-UA_NODEID_NUMERIC(ns[0], 58),
-UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "DataTypeEncodingType"),
- UA_NODEID_NULL,
-(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_OBJECTTYPEATTRIBUTES],NULL, NULL);
+UA_VariableAttributes attr = UA_VariableAttributes_default;
+attr.minimumSamplingInterval = 0.000000;
+attr.userAccessLevel = 1;
+attr.accessLevel = 1;
+/* Value rank inherited */
+attr.valueRank = -1;
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 17);
+attr.displayName = UA_LOCALIZEDTEXT("", "SourceNode");
+#ifdef UA_ENABLE_NODESET_COMPILER_DESCRIPTIONS
+attr.description = UA_LOCALIZEDTEXT("", "The source of the event.");
+#endif
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
+UA_NODEID_NUMERIC(ns[0], 2044),
+UA_NODEID_NUMERIC(ns[0], 2041),
+UA_NODEID_NUMERIC(ns[0], 46),
+UA_QUALIFIEDNAME(ns[0], "SourceNode"),
+UA_NODEID_NUMERIC(ns[0], 68),
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
 static UA_StatusCode function_namespace0_generated_81_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 76)
+UA_NODEID_NUMERIC(ns[0], 2044)
 );
 }
 
-/* Default JSON - ns=0;i=15375 */
+/* EventType - ns=0;i=2043 */
 
 static UA_StatusCode function_namespace0_generated_82_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-UA_ObjectAttributes attr = UA_ObjectAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "Default JSON");
-retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_OBJECT,
-UA_NODEID_NUMERIC(ns[0], 15375),
-UA_NODEID_NUMERIC(ns[0], 0),
-UA_NODEID_NUMERIC(ns[0], 0),
-UA_QUALIFIEDNAME(ns[0], "Default JSON"),
-UA_NODEID_NUMERIC(ns[0], 76),
-(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES],NULL, NULL);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 15375), UA_NODEID_NUMERIC(ns[0], 38), UA_EXPANDEDNODEID_NUMERIC(ns[0], 884), false);
-return retVal;
-}
-
-static UA_StatusCode function_namespace0_generated_82_finish(UA_Server *server, UA_UInt16* ns) {
-return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 15375)
-);
-}
-
-/* Default JSON - ns=0;i=15376 */
-
-static UA_StatusCode function_namespace0_generated_83_begin(UA_Server *server, UA_UInt16* ns) {
-UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-UA_ObjectAttributes attr = UA_ObjectAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "Default JSON");
-retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_OBJECT,
-UA_NODEID_NUMERIC(ns[0], 15376),
-UA_NODEID_NUMERIC(ns[0], 0),
-UA_NODEID_NUMERIC(ns[0], 0),
-UA_QUALIFIEDNAME(ns[0], "Default JSON"),
-UA_NODEID_NUMERIC(ns[0], 76),
-(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES],NULL, NULL);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 15376), UA_NODEID_NUMERIC(ns[0], 38), UA_EXPANDEDNODEID_NUMERIC(ns[0], 887), false);
-return retVal;
-}
-
-static UA_StatusCode function_namespace0_generated_83_finish(UA_Server *server, UA_UInt16* ns) {
-return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 15376)
-);
-}
-
-/* Default Binary - ns=0;i=8251 */
-
-static UA_StatusCode function_namespace0_generated_84_begin(UA_Server *server, UA_UInt16* ns) {
-UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-UA_ObjectAttributes attr = UA_ObjectAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "Default Binary");
-retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_OBJECT,
-UA_NODEID_NUMERIC(ns[0], 8251),
-UA_NODEID_NUMERIC(ns[0], 0),
-UA_NODEID_NUMERIC(ns[0], 0),
-UA_QUALIFIEDNAME(ns[0], "Default Binary"),
-UA_NODEID_NUMERIC(ns[0], 76),
-(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES],NULL, NULL);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 8251), UA_NODEID_NUMERIC(ns[0], 38), UA_EXPANDEDNODEID_NUMERIC(ns[0], 7594), false);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 8251), UA_NODEID_NUMERIC(ns[0], 39), UA_EXPANDEDNODEID_NUMERIC(ns[0], 7656), true);
-return retVal;
-}
-
-static UA_StatusCode function_namespace0_generated_84_finish(UA_Server *server, UA_UInt16* ns) {
-return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 8251)
-);
-}
-
-/* Default Binary - ns=0;i=298 */
-
-static UA_StatusCode function_namespace0_generated_85_begin(UA_Server *server, UA_UInt16* ns) {
-UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-UA_ObjectAttributes attr = UA_ObjectAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "Default Binary");
-retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_OBJECT,
-UA_NODEID_NUMERIC(ns[0], 298),
-UA_NODEID_NUMERIC(ns[0], 0),
-UA_NODEID_NUMERIC(ns[0], 0),
-UA_QUALIFIEDNAME(ns[0], "Default Binary"),
-UA_NODEID_NUMERIC(ns[0], 76),
-(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES],NULL, NULL);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 298), UA_NODEID_NUMERIC(ns[0], 38), UA_EXPANDEDNODEID_NUMERIC(ns[0], 296), false);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 298), UA_NODEID_NUMERIC(ns[0], 39), UA_EXPANDEDNODEID_NUMERIC(ns[0], 7650), true);
-return retVal;
-}
-
-static UA_StatusCode function_namespace0_generated_85_finish(UA_Server *server, UA_UInt16* ns) {
-return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 298)
-);
-}
-
-/* ModellingRuleType - ns=0;i=77 */
-
-static UA_StatusCode function_namespace0_generated_86_begin(UA_Server *server, UA_UInt16* ns) {
-UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-UA_ObjectTypeAttributes attr = UA_ObjectTypeAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "ModellingRuleType");
-retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_OBJECTTYPE,
-UA_NODEID_NUMERIC(ns[0], 77),
-UA_NODEID_NUMERIC(ns[0], 58),
-UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "ModellingRuleType"),
- UA_NODEID_NULL,
-(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_OBJECTTYPEATTRIBUTES],NULL, NULL);
-return retVal;
-}
-
-static UA_StatusCode function_namespace0_generated_86_finish(UA_Server *server, UA_UInt16* ns) {
-return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 77)
-);
-}
-
-/* Mandatory - ns=0;i=78 */
-
-static UA_StatusCode function_namespace0_generated_87_begin(UA_Server *server, UA_UInt16* ns) {
-UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-UA_ObjectAttributes attr = UA_ObjectAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "Mandatory");
-retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_OBJECT,
-UA_NODEID_NUMERIC(ns[0], 78),
-UA_NODEID_NUMERIC(ns[0], 0),
-UA_NODEID_NUMERIC(ns[0], 0),
-UA_QUALIFIEDNAME(ns[0], "Mandatory"),
-UA_NODEID_NUMERIC(ns[0], 77),
-(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES],NULL, NULL);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 78), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 2043), false);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 78), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 2044), false);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 78), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 2045), false);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 78), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 2046), false);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 78), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 2047), false);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 78), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 7611), false);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 78), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 12078), false);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 78), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 12169), false);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 78), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 2042), false);
-return retVal;
-}
-
-static UA_StatusCode function_namespace0_generated_87_finish(UA_Server *server, UA_UInt16* ns) {
-return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 78)
-);
-}
-
-/* NamingRule - ns=0;i=112 */
-
-static UA_StatusCode function_namespace0_generated_88_begin(UA_Server *server, UA_UInt16* ns) {
-UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
 attr.userAccessLevel = 1;
 attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 120);
-UA_Int32 *variablenode_ns_0_i_112_variant_DataContents =  UA_Int32_new();
-if (!variablenode_ns_0_i_112_variant_DataContents) return UA_STATUSCODE_BADOUTOFMEMORY;
-UA_Int32_init(variablenode_ns_0_i_112_variant_DataContents);
-*variablenode_ns_0_i_112_variant_DataContents = (UA_Int32) 1;
-UA_Variant_setScalar(&attr.value, variablenode_ns_0_i_112_variant_DataContents, &UA_TYPES[UA_TYPES_INT32]);
-attr.displayName = UA_LOCALIZEDTEXT("", "NamingRule");
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 17);
+attr.displayName = UA_LOCALIZEDTEXT("", "EventType");
+#ifdef UA_ENABLE_NODESET_COMPILER_DESCRIPTIONS
+attr.description = UA_LOCALIZEDTEXT("", "The identifier for the event type.");
+#endif
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 112),
-UA_NODEID_NUMERIC(ns[0], 78),
+UA_NODEID_NUMERIC(ns[0], 2043),
+UA_NODEID_NUMERIC(ns[0], 2041),
 UA_NODEID_NUMERIC(ns[0], 46),
-UA_QUALIFIEDNAME(ns[0], "NamingRule"),
+UA_QUALIFIEDNAME(ns[0], "EventType"),
 UA_NODEID_NUMERIC(ns[0], 68),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
-UA_Int32_delete(variablenode_ns_0_i_112_variant_DataContents);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_88_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_82_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 112)
+UA_NODEID_NUMERIC(ns[0], 2043)
 );
 }
 
-/* NamingRule - ns=0;i=111 */
+/* EventId - ns=0;i=2042 */
 
-static UA_StatusCode function_namespace0_generated_89_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_83_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -47438,95 +48337,76 @@ attr.userAccessLevel = 1;
 attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 120);
-UA_Int32 *variablenode_ns_0_i_111_variant_DataContents =  UA_Int32_new();
-if (!variablenode_ns_0_i_111_variant_DataContents) return UA_STATUSCODE_BADOUTOFMEMORY;
-UA_Int32_init(variablenode_ns_0_i_111_variant_DataContents);
-*variablenode_ns_0_i_111_variant_DataContents = (UA_Int32) 1;
-UA_Variant_setScalar(&attr.value, variablenode_ns_0_i_111_variant_DataContents, &UA_TYPES[UA_TYPES_INT32]);
-attr.displayName = UA_LOCALIZEDTEXT("", "NamingRule");
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 15);
+attr.displayName = UA_LOCALIZEDTEXT("", "EventId");
+#ifdef UA_ENABLE_NODESET_COMPILER_DESCRIPTIONS
+attr.description = UA_LOCALIZEDTEXT("", "A globally unique identifier for the event.");
+#endif
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 111),
-UA_NODEID_NUMERIC(ns[0], 77),
+UA_NODEID_NUMERIC(ns[0], 2042),
+UA_NODEID_NUMERIC(ns[0], 2041),
 UA_NODEID_NUMERIC(ns[0], 46),
-UA_QUALIFIEDNAME(ns[0], "NamingRule"),
+UA_QUALIFIEDNAME(ns[0], "EventId"),
 UA_NODEID_NUMERIC(ns[0], 68),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
-UA_Int32_delete(variablenode_ns_0_i_111_variant_DataContents);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 111), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 78), true);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_89_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_83_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 111)
+UA_NODEID_NUMERIC(ns[0], 2042)
 );
 }
 
-/* Optional - ns=0;i=80 */
+/* InterfaceTypes - ns=0;i=17708 */
 
-static UA_StatusCode function_namespace0_generated_90_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_84_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_ObjectAttributes attr = UA_ObjectAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "Optional");
+attr.displayName = UA_LOCALIZEDTEXT("", "InterfaceTypes");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_OBJECT,
-UA_NODEID_NUMERIC(ns[0], 80),
-UA_NODEID_NUMERIC(ns[0], 0),
-UA_NODEID_NUMERIC(ns[0], 0),
-UA_QUALIFIEDNAME(ns[0], "Optional"),
-UA_NODEID_NUMERIC(ns[0], 77),
+UA_NODEID_NUMERIC(ns[0], 17708),
+UA_NODEID_NUMERIC(ns[0], 86),
+UA_NODEID_NUMERIC(ns[0], 35),
+UA_QUALIFIEDNAME(ns[0], "InterfaceTypes"),
+UA_NODEID_NUMERIC(ns[0], 61),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES],NULL, NULL);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 80), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 3190), false);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 80), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 104), false);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 80), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 105), false);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 80), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 107), false);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 80), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 106), false);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_90_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_84_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 80)
+UA_NODEID_NUMERIC(ns[0], 17708)
 );
 }
 
-/* NamingRule - ns=0;i=113 */
+/* BaseInterfaceType - ns=0;i=17602 */
 
-static UA_StatusCode function_namespace0_generated_91_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_85_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-UA_VariableAttributes attr = UA_VariableAttributes_default;
-attr.minimumSamplingInterval = 0.000000;
-attr.userAccessLevel = 1;
-attr.accessLevel = 1;
-/* Value rank inherited */
-attr.valueRank = -1;
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 120);
-UA_Int32 *variablenode_ns_0_i_113_variant_DataContents =  UA_Int32_new();
-if (!variablenode_ns_0_i_113_variant_DataContents) return UA_STATUSCODE_BADOUTOFMEMORY;
-UA_Int32_init(variablenode_ns_0_i_113_variant_DataContents);
-*variablenode_ns_0_i_113_variant_DataContents = (UA_Int32) 2;
-UA_Variant_setScalar(&attr.value, variablenode_ns_0_i_113_variant_DataContents, &UA_TYPES[UA_TYPES_INT32]);
-attr.displayName = UA_LOCALIZEDTEXT("", "NamingRule");
-retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 113),
-UA_NODEID_NUMERIC(ns[0], 80),
-UA_NODEID_NUMERIC(ns[0], 46),
-UA_QUALIFIEDNAME(ns[0], "NamingRule"),
-UA_NODEID_NUMERIC(ns[0], 68),
-(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
-UA_Int32_delete(variablenode_ns_0_i_113_variant_DataContents);
+UA_ObjectTypeAttributes attr = UA_ObjectTypeAttributes_default;
+attr.isAbstract = true;
+attr.displayName = UA_LOCALIZEDTEXT("", "BaseInterfaceType");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_OBJECTTYPE,
+UA_NODEID_NUMERIC(ns[0], 17602),
+UA_NODEID_NUMERIC(ns[0], 58),
+UA_NODEID_NUMERIC(ns[0], 45),
+UA_QUALIFIEDNAME(ns[0], "BaseInterfaceType"),
+ UA_NODEID_NULL,
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_OBJECTTYPEATTRIBUTES],NULL, NULL);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 17602), UA_NODEID_NUMERIC(ns[0], 35), UA_EXPANDEDNODEID_NUMERIC(ns[0], 17708), false);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_91_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_85_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 113)
+UA_NODEID_NUMERIC(ns[0], 17602)
 );
 }
 
 /* ServerDiagnosticsSummaryType - ns=0;i=2150 */
 
-static UA_StatusCode function_namespace0_generated_92_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_86_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableTypeAttributes attr = UA_VariableTypeAttributes_default;
 /* Value rank inherited */
@@ -47543,7 +48423,7 @@ UA_NODEID_NUMERIC(ns[0], 0),
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_92_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_86_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
 UA_NODEID_NUMERIC(ns[0], 2150)
 );
@@ -47551,7 +48431,7 @@ UA_NODEID_NUMERIC(ns[0], 2150)
 
 /* PublishingIntervalCount - ns=0;i=2159 */
 
-static UA_StatusCode function_namespace0_generated_93_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_87_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -47568,11 +48448,10 @@ UA_NODEID_NUMERIC(ns[0], 47),
 UA_QUALIFIEDNAME(ns[0], "PublishingIntervalCount"),
 UA_NODEID_NUMERIC(ns[0], 63),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 2159), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 78), true);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_93_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_87_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
 UA_NODEID_NUMERIC(ns[0], 2159)
 );
@@ -47580,7 +48459,7 @@ UA_NODEID_NUMERIC(ns[0], 2159)
 
 /* SecurityRejectedSessionCount - ns=0;i=2154 */
 
-static UA_StatusCode function_namespace0_generated_94_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_88_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -47597,19 +48476,18 @@ UA_NODEID_NUMERIC(ns[0], 47),
 UA_QUALIFIEDNAME(ns[0], "SecurityRejectedSessionCount"),
 UA_NODEID_NUMERIC(ns[0], 63),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 2154), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 78), true);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_94_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_88_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
 UA_NODEID_NUMERIC(ns[0], 2154)
 );
 }
 
-/* SecurityRejectedRequestsCount - ns=0;i=2162 */
+/* SessionAbortCount - ns=0;i=2157 */
 
-static UA_StatusCode function_namespace0_generated_95_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_89_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -47618,27 +48496,26 @@ attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
 attr.dataType = UA_NODEID_NUMERIC(ns[0], 7);
-attr.displayName = UA_LOCALIZEDTEXT("", "SecurityRejectedRequestsCount");
+attr.displayName = UA_LOCALIZEDTEXT("", "SessionAbortCount");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 2162),
+UA_NODEID_NUMERIC(ns[0], 2157),
 UA_NODEID_NUMERIC(ns[0], 2150),
 UA_NODEID_NUMERIC(ns[0], 47),
-UA_QUALIFIEDNAME(ns[0], "SecurityRejectedRequestsCount"),
+UA_QUALIFIEDNAME(ns[0], "SessionAbortCount"),
 UA_NODEID_NUMERIC(ns[0], 63),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 2162), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 78), true);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_95_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_89_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2162)
+UA_NODEID_NUMERIC(ns[0], 2157)
 );
 }
 
-/* RejectedRequestsCount - ns=0;i=2163 */
+/* ServerViewCount - ns=0;i=2151 */
 
-static UA_StatusCode function_namespace0_generated_96_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_90_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -47647,27 +48524,26 @@ attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
 attr.dataType = UA_NODEID_NUMERIC(ns[0], 7);
-attr.displayName = UA_LOCALIZEDTEXT("", "RejectedRequestsCount");
+attr.displayName = UA_LOCALIZEDTEXT("", "ServerViewCount");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 2163),
+UA_NODEID_NUMERIC(ns[0], 2151),
 UA_NODEID_NUMERIC(ns[0], 2150),
 UA_NODEID_NUMERIC(ns[0], 47),
-UA_QUALIFIEDNAME(ns[0], "RejectedRequestsCount"),
+UA_QUALIFIEDNAME(ns[0], "ServerViewCount"),
 UA_NODEID_NUMERIC(ns[0], 63),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 2163), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 78), true);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_96_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_90_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2163)
+UA_NODEID_NUMERIC(ns[0], 2151)
 );
 }
 
-/* RejectedSessionCount - ns=0;i=2155 */
+/* RejectedRequestsCount - ns=0;i=2163 */
 
-static UA_StatusCode function_namespace0_generated_97_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_91_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -47676,27 +48552,26 @@ attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
 attr.dataType = UA_NODEID_NUMERIC(ns[0], 7);
-attr.displayName = UA_LOCALIZEDTEXT("", "RejectedSessionCount");
+attr.displayName = UA_LOCALIZEDTEXT("", "RejectedRequestsCount");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 2155),
+UA_NODEID_NUMERIC(ns[0], 2163),
 UA_NODEID_NUMERIC(ns[0], 2150),
 UA_NODEID_NUMERIC(ns[0], 47),
-UA_QUALIFIEDNAME(ns[0], "RejectedSessionCount"),
+UA_QUALIFIEDNAME(ns[0], "RejectedRequestsCount"),
 UA_NODEID_NUMERIC(ns[0], 63),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 2155), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 78), true);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_97_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_91_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2155)
+UA_NODEID_NUMERIC(ns[0], 2163)
 );
 }
 
-/* CumulatedSubscriptionCount - ns=0;i=2161 */
+/* SessionTimeoutCount - ns=0;i=2156 */
 
-static UA_StatusCode function_namespace0_generated_98_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_92_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -47705,27 +48580,26 @@ attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
 attr.dataType = UA_NODEID_NUMERIC(ns[0], 7);
-attr.displayName = UA_LOCALIZEDTEXT("", "CumulatedSubscriptionCount");
+attr.displayName = UA_LOCALIZEDTEXT("", "SessionTimeoutCount");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 2161),
+UA_NODEID_NUMERIC(ns[0], 2156),
 UA_NODEID_NUMERIC(ns[0], 2150),
 UA_NODEID_NUMERIC(ns[0], 47),
-UA_QUALIFIEDNAME(ns[0], "CumulatedSubscriptionCount"),
+UA_QUALIFIEDNAME(ns[0], "SessionTimeoutCount"),
 UA_NODEID_NUMERIC(ns[0], 63),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 2161), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 78), true);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_98_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_92_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2161)
+UA_NODEID_NUMERIC(ns[0], 2156)
 );
 }
 
-/* CumulatedSessionCount - ns=0;i=2153 */
+/* CurrentSessionCount - ns=0;i=2152 */
 
-static UA_StatusCode function_namespace0_generated_99_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_93_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -47734,27 +48608,26 @@ attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
 attr.dataType = UA_NODEID_NUMERIC(ns[0], 7);
-attr.displayName = UA_LOCALIZEDTEXT("", "CumulatedSessionCount");
+attr.displayName = UA_LOCALIZEDTEXT("", "CurrentSessionCount");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 2153),
+UA_NODEID_NUMERIC(ns[0], 2152),
 UA_NODEID_NUMERIC(ns[0], 2150),
 UA_NODEID_NUMERIC(ns[0], 47),
-UA_QUALIFIEDNAME(ns[0], "CumulatedSessionCount"),
+UA_QUALIFIEDNAME(ns[0], "CurrentSessionCount"),
 UA_NODEID_NUMERIC(ns[0], 63),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 2153), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 78), true);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_99_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_93_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2153)
+UA_NODEID_NUMERIC(ns[0], 2152)
 );
 }
 
-/* CurrentSessionCount - ns=0;i=2152 */
+/* CumulatedSubscriptionCount - ns=0;i=2161 */
 
-static UA_StatusCode function_namespace0_generated_100_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_94_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -47763,27 +48636,26 @@ attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
 attr.dataType = UA_NODEID_NUMERIC(ns[0], 7);
-attr.displayName = UA_LOCALIZEDTEXT("", "CurrentSessionCount");
+attr.displayName = UA_LOCALIZEDTEXT("", "CumulatedSubscriptionCount");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 2152),
+UA_NODEID_NUMERIC(ns[0], 2161),
 UA_NODEID_NUMERIC(ns[0], 2150),
 UA_NODEID_NUMERIC(ns[0], 47),
-UA_QUALIFIEDNAME(ns[0], "CurrentSessionCount"),
+UA_QUALIFIEDNAME(ns[0], "CumulatedSubscriptionCount"),
 UA_NODEID_NUMERIC(ns[0], 63),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 2152), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 78), true);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_100_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_94_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2152)
+UA_NODEID_NUMERIC(ns[0], 2161)
 );
 }
 
-/* ServerViewCount - ns=0;i=2151 */
+/* SecurityRejectedRequestsCount - ns=0;i=2162 */
 
-static UA_StatusCode function_namespace0_generated_101_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_95_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -47792,27 +48664,26 @@ attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
 attr.dataType = UA_NODEID_NUMERIC(ns[0], 7);
-attr.displayName = UA_LOCALIZEDTEXT("", "ServerViewCount");
+attr.displayName = UA_LOCALIZEDTEXT("", "SecurityRejectedRequestsCount");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 2151),
+UA_NODEID_NUMERIC(ns[0], 2162),
 UA_NODEID_NUMERIC(ns[0], 2150),
 UA_NODEID_NUMERIC(ns[0], 47),
-UA_QUALIFIEDNAME(ns[0], "ServerViewCount"),
+UA_QUALIFIEDNAME(ns[0], "SecurityRejectedRequestsCount"),
 UA_NODEID_NUMERIC(ns[0], 63),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 2151), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 78), true);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_101_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_95_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2151)
+UA_NODEID_NUMERIC(ns[0], 2162)
 );
 }
 
-/* SessionTimeoutCount - ns=0;i=2156 */
+/* CumulatedSessionCount - ns=0;i=2153 */
 
-static UA_StatusCode function_namespace0_generated_102_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_96_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -47821,27 +48692,26 @@ attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
 attr.dataType = UA_NODEID_NUMERIC(ns[0], 7);
-attr.displayName = UA_LOCALIZEDTEXT("", "SessionTimeoutCount");
+attr.displayName = UA_LOCALIZEDTEXT("", "CumulatedSessionCount");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 2156),
+UA_NODEID_NUMERIC(ns[0], 2153),
 UA_NODEID_NUMERIC(ns[0], 2150),
 UA_NODEID_NUMERIC(ns[0], 47),
-UA_QUALIFIEDNAME(ns[0], "SessionTimeoutCount"),
+UA_QUALIFIEDNAME(ns[0], "CumulatedSessionCount"),
 UA_NODEID_NUMERIC(ns[0], 63),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 2156), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 78), true);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_102_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_96_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2156)
+UA_NODEID_NUMERIC(ns[0], 2153)
 );
 }
 
 /* CurrentSubscriptionCount - ns=0;i=2160 */
 
-static UA_StatusCode function_namespace0_generated_103_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_97_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -47858,19 +48728,18 @@ UA_NODEID_NUMERIC(ns[0], 47),
 UA_QUALIFIEDNAME(ns[0], "CurrentSubscriptionCount"),
 UA_NODEID_NUMERIC(ns[0], 63),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 2160), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 78), true);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_103_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_97_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
 UA_NODEID_NUMERIC(ns[0], 2160)
 );
 }
 
-/* SessionAbortCount - ns=0;i=2157 */
+/* RejectedSessionCount - ns=0;i=2155 */
 
-static UA_StatusCode function_namespace0_generated_104_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_98_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -47879,101 +48748,98 @@ attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
 attr.dataType = UA_NODEID_NUMERIC(ns[0], 7);
-attr.displayName = UA_LOCALIZEDTEXT("", "SessionAbortCount");
+attr.displayName = UA_LOCALIZEDTEXT("", "RejectedSessionCount");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 2157),
+UA_NODEID_NUMERIC(ns[0], 2155),
 UA_NODEID_NUMERIC(ns[0], 2150),
 UA_NODEID_NUMERIC(ns[0], 47),
-UA_QUALIFIEDNAME(ns[0], "SessionAbortCount"),
+UA_QUALIFIEDNAME(ns[0], "RejectedSessionCount"),
 UA_NODEID_NUMERIC(ns[0], 63),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 2157), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 78), true);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_104_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_98_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2157)
+UA_NODEID_NUMERIC(ns[0], 2155)
 );
 }
 
-/* ServerRedundancyType - ns=0;i=2034 */
+/* BuildInfoType - ns=0;i=3051 */
 
-static UA_StatusCode function_namespace0_generated_105_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_99_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-UA_ObjectTypeAttributes attr = UA_ObjectTypeAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "ServerRedundancyType");
-retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_OBJECTTYPE,
-UA_NODEID_NUMERIC(ns[0], 2034),
-UA_NODEID_NUMERIC(ns[0], 58),
+UA_VariableTypeAttributes attr = UA_VariableTypeAttributes_default;
+/* Value rank inherited */
+attr.valueRank = -1;
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 338);
+attr.displayName = UA_LOCALIZEDTEXT("", "BuildInfoType");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLETYPE,
+UA_NODEID_NUMERIC(ns[0], 3051),
+UA_NODEID_NUMERIC(ns[0], 63),
 UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "ServerRedundancyType"),
- UA_NODEID_NULL,
-(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_OBJECTTYPEATTRIBUTES],NULL, NULL);
+UA_QUALIFIEDNAME(ns[0], "BuildInfoType"),
+UA_NODEID_NUMERIC(ns[0], 0),
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLETYPEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_105_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_99_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2034)
+UA_NODEID_NUMERIC(ns[0], 3051)
 );
 }
 
-/* RedundancySupport - ns=0;i=2035 */
+/* ServerStatusType - ns=0;i=2138 */
 
-static UA_StatusCode function_namespace0_generated_106_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_100_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-UA_VariableAttributes attr = UA_VariableAttributes_default;
-attr.minimumSamplingInterval = 0.000000;
-attr.userAccessLevel = 1;
-attr.accessLevel = 1;
+UA_VariableTypeAttributes attr = UA_VariableTypeAttributes_default;
 /* Value rank inherited */
 attr.valueRank = -1;
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 851);
-attr.displayName = UA_LOCALIZEDTEXT("", "RedundancySupport");
-retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 2035),
-UA_NODEID_NUMERIC(ns[0], 2034),
-UA_NODEID_NUMERIC(ns[0], 46),
-UA_QUALIFIEDNAME(ns[0], "RedundancySupport"),
-UA_NODEID_NUMERIC(ns[0], 68),
-(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 2035), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 78), true);
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 862);
+attr.displayName = UA_LOCALIZEDTEXT("", "ServerStatusType");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLETYPE,
+UA_NODEID_NUMERIC(ns[0], 2138),
+UA_NODEID_NUMERIC(ns[0], 63),
+UA_NODEID_NUMERIC(ns[0], 45),
+UA_QUALIFIEDNAME(ns[0], "ServerStatusType"),
+UA_NODEID_NUMERIC(ns[0], 0),
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLETYPEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_106_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_100_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2035)
+UA_NODEID_NUMERIC(ns[0], 2138)
 );
 }
 
-/* EventQueueOverflowEventType - ns=0;i=3035 */
+/* OperationLimitsType - ns=0;i=11564 */
 
-static UA_StatusCode function_namespace0_generated_107_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_101_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_ObjectTypeAttributes attr = UA_ObjectTypeAttributes_default;
-attr.isAbstract = true;
-attr.displayName = UA_LOCALIZEDTEXT("", "EventQueueOverflowEventType");
+attr.displayName = UA_LOCALIZEDTEXT("", "OperationLimitsType");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_OBJECTTYPE,
-UA_NODEID_NUMERIC(ns[0], 3035),
-UA_NODEID_NUMERIC(ns[0], 2041),
+UA_NODEID_NUMERIC(ns[0], 11564),
+UA_NODEID_NUMERIC(ns[0], 61),
 UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "EventQueueOverflowEventType"),
+UA_QUALIFIEDNAME(ns[0], "OperationLimitsType"),
  UA_NODEID_NULL,
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_OBJECTTYPEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_107_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_101_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 3035)
+UA_NODEID_NUMERIC(ns[0], 11564)
 );
 }
 
-/* Message - ns=0;i=2050 */
+/* MaxNodesPerMethodCall - ns=0;i=11569 */
 
-static UA_StatusCode function_namespace0_generated_108_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_102_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -47981,31 +48847,27 @@ attr.userAccessLevel = 1;
 attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 21);
-attr.displayName = UA_LOCALIZEDTEXT("", "Message");
-#ifdef UA_ENABLE_NODESET_COMPILER_DESCRIPTIONS
-attr.description = UA_LOCALIZEDTEXT("", "A localized description of the event.");
-#endif
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 7);
+attr.displayName = UA_LOCALIZEDTEXT("", "MaxNodesPerMethodCall");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 2050),
-UA_NODEID_NUMERIC(ns[0], 2041),
+UA_NODEID_NUMERIC(ns[0], 11569),
+UA_NODEID_NUMERIC(ns[0], 11564),
 UA_NODEID_NUMERIC(ns[0], 46),
-UA_QUALIFIEDNAME(ns[0], "Message"),
+UA_QUALIFIEDNAME(ns[0], "MaxNodesPerMethodCall"),
 UA_NODEID_NUMERIC(ns[0], 68),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 2050), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 78), true);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_108_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_102_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2050)
+UA_NODEID_NUMERIC(ns[0], 11569)
 );
 }
 
-/* Severity - ns=0;i=2051 */
+/* MaxNodesPerWrite - ns=0;i=11567 */
 
-static UA_StatusCode function_namespace0_generated_109_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_103_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -48013,84 +48875,55 @@ attr.userAccessLevel = 1;
 attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 5);
-attr.displayName = UA_LOCALIZEDTEXT("", "Severity");
-#ifdef UA_ENABLE_NODESET_COMPILER_DESCRIPTIONS
-attr.description = UA_LOCALIZEDTEXT("", "Indicates how urgent an event is.");
-#endif
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 7);
+attr.displayName = UA_LOCALIZEDTEXT("", "MaxNodesPerWrite");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 2051),
-UA_NODEID_NUMERIC(ns[0], 2041),
+UA_NODEID_NUMERIC(ns[0], 11567),
+UA_NODEID_NUMERIC(ns[0], 11564),
 UA_NODEID_NUMERIC(ns[0], 46),
-UA_QUALIFIEDNAME(ns[0], "Severity"),
+UA_QUALIFIEDNAME(ns[0], "MaxNodesPerWrite"),
 UA_NODEID_NUMERIC(ns[0], 68),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 2051), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 78), true);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_109_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_103_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2051)
+UA_NODEID_NUMERIC(ns[0], 11567)
 );
 }
 
-/* BuildInfoType - ns=0;i=3051 */
+/* MaxNodesPerRead - ns=0;i=11565 */
 
-static UA_StatusCode function_namespace0_generated_110_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_104_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-UA_VariableTypeAttributes attr = UA_VariableTypeAttributes_default;
+UA_VariableAttributes attr = UA_VariableAttributes_default;
+attr.minimumSamplingInterval = 0.000000;
+attr.userAccessLevel = 1;
+attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 338);
-attr.displayName = UA_LOCALIZEDTEXT("", "BuildInfoType");
-retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLETYPE,
-UA_NODEID_NUMERIC(ns[0], 3051),
-UA_NODEID_NUMERIC(ns[0], 63),
-UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "BuildInfoType"),
-UA_NODEID_NUMERIC(ns[0], 0),
-(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLETYPEATTRIBUTES],NULL, NULL);
-return retVal;
-}
-
-static UA_StatusCode function_namespace0_generated_110_finish(UA_Server *server, UA_UInt16* ns) {
-return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 3051)
-);
-}
-
-/* DataItemType - ns=0;i=2365 */
-
-static UA_StatusCode function_namespace0_generated_111_begin(UA_Server *server, UA_UInt16* ns) {
-UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-UA_VariableTypeAttributes attr = UA_VariableTypeAttributes_default;
-attr.valueRank = -2;
-/* DataType inherited */
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 24);
-attr.displayName = UA_LOCALIZEDTEXT("", "DataItemType");
-#ifdef UA_ENABLE_NODESET_COMPILER_DESCRIPTIONS
-attr.description = UA_LOCALIZEDTEXT("", "A variable that contains live automation data.");
-#endif
-retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLETYPE,
-UA_NODEID_NUMERIC(ns[0], 2365),
-UA_NODEID_NUMERIC(ns[0], 63),
-UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "DataItemType"),
-UA_NODEID_NUMERIC(ns[0], 0),
-(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLETYPEATTRIBUTES],NULL, NULL);
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 7);
+attr.displayName = UA_LOCALIZEDTEXT("", "MaxNodesPerRead");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
+UA_NODEID_NUMERIC(ns[0], 11565),
+UA_NODEID_NUMERIC(ns[0], 11564),
+UA_NODEID_NUMERIC(ns[0], 46),
+UA_QUALIFIEDNAME(ns[0], "MaxNodesPerRead"),
+UA_NODEID_NUMERIC(ns[0], 68),
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_111_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_104_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2365)
+UA_NODEID_NUMERIC(ns[0], 11565)
 );
 }
 
-/* ValuePrecision - ns=0;i=2367 */
+/* MaxNodesPerTranslateBrowsePathsToNodeIds - ns=0;i=11572 */
 
-static UA_StatusCode function_namespace0_generated_112_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_105_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -48098,31 +48931,27 @@ attr.userAccessLevel = 1;
 attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 11);
-attr.displayName = UA_LOCALIZEDTEXT("", "ValuePrecision");
-#ifdef UA_ENABLE_NODESET_COMPILER_DESCRIPTIONS
-attr.description = UA_LOCALIZEDTEXT("", "The maximum precision that the server can maintain for the item based on restrictions in the target environment.");
-#endif
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 7);
+attr.displayName = UA_LOCALIZEDTEXT("", "MaxNodesPerTranslateBrowsePathsToNodeIds");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 2367),
-UA_NODEID_NUMERIC(ns[0], 2365),
+UA_NODEID_NUMERIC(ns[0], 11572),
+UA_NODEID_NUMERIC(ns[0], 11564),
 UA_NODEID_NUMERIC(ns[0], 46),
-UA_QUALIFIEDNAME(ns[0], "ValuePrecision"),
+UA_QUALIFIEDNAME(ns[0], "MaxNodesPerTranslateBrowsePathsToNodeIds"),
 UA_NODEID_NUMERIC(ns[0], 68),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 2367), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 80), true);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_112_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_105_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2367)
+UA_NODEID_NUMERIC(ns[0], 11572)
 );
 }
 
-/* Definition - ns=0;i=2366 */
+/* MaxMonitoredItemsPerCall - ns=0;i=11574 */
 
-static UA_StatusCode function_namespace0_generated_113_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_106_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -48130,55 +48959,27 @@ attr.userAccessLevel = 1;
 attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 12);
-attr.displayName = UA_LOCALIZEDTEXT("", "Definition");
-#ifdef UA_ENABLE_NODESET_COMPILER_DESCRIPTIONS
-attr.description = UA_LOCALIZEDTEXT("", "A vendor-specific, human readable string that specifies how the value of this DataItem is calculated.");
-#endif
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 7);
+attr.displayName = UA_LOCALIZEDTEXT("", "MaxMonitoredItemsPerCall");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 2366),
-UA_NODEID_NUMERIC(ns[0], 2365),
+UA_NODEID_NUMERIC(ns[0], 11574),
+UA_NODEID_NUMERIC(ns[0], 11564),
 UA_NODEID_NUMERIC(ns[0], 46),
-UA_QUALIFIEDNAME(ns[0], "Definition"),
+UA_QUALIFIEDNAME(ns[0], "MaxMonitoredItemsPerCall"),
 UA_NODEID_NUMERIC(ns[0], 68),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 2366), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 80), true);
-return retVal;
-}
-
-static UA_StatusCode function_namespace0_generated_113_finish(UA_Server *server, UA_UInt16* ns) {
-return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2366)
-);
-}
-
-/* AnalogItemType - ns=0;i=2368 */
-
-static UA_StatusCode function_namespace0_generated_114_begin(UA_Server *server, UA_UInt16* ns) {
-UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-UA_VariableTypeAttributes attr = UA_VariableTypeAttributes_default;
-attr.valueRank = -2;
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 26);
-attr.displayName = UA_LOCALIZEDTEXT("", "AnalogItemType");
-retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLETYPE,
-UA_NODEID_NUMERIC(ns[0], 2368),
-UA_NODEID_NUMERIC(ns[0], 2365),
-UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "AnalogItemType"),
-UA_NODEID_NUMERIC(ns[0], 0),
-(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLETYPEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_114_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_106_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2368)
+UA_NODEID_NUMERIC(ns[0], 11574)
 );
 }
 
-/* EngineeringUnits - ns=0;i=2371 */
+/* MaxNodesPerRegisterNodes - ns=0;i=11571 */
 
-static UA_StatusCode function_namespace0_generated_115_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_107_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -48186,28 +48987,27 @@ attr.userAccessLevel = 1;
 attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 887);
-attr.displayName = UA_LOCALIZEDTEXT("", "EngineeringUnits");
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 7);
+attr.displayName = UA_LOCALIZEDTEXT("", "MaxNodesPerRegisterNodes");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 2371),
-UA_NODEID_NUMERIC(ns[0], 2368),
+UA_NODEID_NUMERIC(ns[0], 11571),
+UA_NODEID_NUMERIC(ns[0], 11564),
 UA_NODEID_NUMERIC(ns[0], 46),
-UA_QUALIFIEDNAME(ns[0], "EngineeringUnits"),
+UA_QUALIFIEDNAME(ns[0], "MaxNodesPerRegisterNodes"),
 UA_NODEID_NUMERIC(ns[0], 68),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 2371), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 80), true);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_115_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_107_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2371)
+UA_NODEID_NUMERIC(ns[0], 11571)
 );
 }
 
-/* InstrumentRange - ns=0;i=2370 */
+/* MaxNodesPerNodeManagement - ns=0;i=11573 */
 
-static UA_StatusCode function_namespace0_generated_116_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_108_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -48215,136 +49015,77 @@ attr.userAccessLevel = 1;
 attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 884);
-attr.displayName = UA_LOCALIZEDTEXT("", "InstrumentRange");
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 7);
+attr.displayName = UA_LOCALIZEDTEXT("", "MaxNodesPerNodeManagement");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 2370),
-UA_NODEID_NUMERIC(ns[0], 2368),
+UA_NODEID_NUMERIC(ns[0], 11573),
+UA_NODEID_NUMERIC(ns[0], 11564),
 UA_NODEID_NUMERIC(ns[0], 46),
-UA_QUALIFIEDNAME(ns[0], "InstrumentRange"),
+UA_QUALIFIEDNAME(ns[0], "MaxNodesPerNodeManagement"),
 UA_NODEID_NUMERIC(ns[0], 68),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 2370), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 80), true);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_116_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_108_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2370)
+UA_NODEID_NUMERIC(ns[0], 11573)
 );
 }
 
-/* EURange - ns=0;i=2369 */
+/* MaxNodesPerBrowse - ns=0;i=11570 */
 
-static UA_StatusCode function_namespace0_generated_117_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_109_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
-attr.userAccessLevel = 3;
-attr.accessLevel = 3;
+attr.userAccessLevel = 1;
+attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 884);
-attr.displayName = UA_LOCALIZEDTEXT("", "EURange");
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 7);
+attr.displayName = UA_LOCALIZEDTEXT("", "MaxNodesPerBrowse");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 2369),
-UA_NODEID_NUMERIC(ns[0], 2368),
+UA_NODEID_NUMERIC(ns[0], 11570),
+UA_NODEID_NUMERIC(ns[0], 11564),
 UA_NODEID_NUMERIC(ns[0], 46),
-UA_QUALIFIEDNAME(ns[0], "EURange"),
+UA_QUALIFIEDNAME(ns[0], "MaxNodesPerBrowse"),
 UA_NODEID_NUMERIC(ns[0], 68),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 2369), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 78), true);
-return retVal;
-}
-
-static UA_StatusCode function_namespace0_generated_117_finish(UA_Server *server, UA_UInt16* ns) {
-return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2369)
-);
-}
-
-/* DiscreteItemType - ns=0;i=2372 */
-
-static UA_StatusCode function_namespace0_generated_118_begin(UA_Server *server, UA_UInt16* ns) {
-UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-UA_VariableTypeAttributes attr = UA_VariableTypeAttributes_default;
-attr.isAbstract = true;
-attr.valueRank = -2;
-/* DataType inherited */
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 24);
-attr.displayName = UA_LOCALIZEDTEXT("", "DiscreteItemType");
-retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLETYPE,
-UA_NODEID_NUMERIC(ns[0], 2372),
-UA_NODEID_NUMERIC(ns[0], 2365),
-UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "DiscreteItemType"),
-UA_NODEID_NUMERIC(ns[0], 0),
-(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLETYPEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_118_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_109_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2372)
+UA_NODEID_NUMERIC(ns[0], 11570)
 );
 }
 
-/* TwoStateDiscreteType - ns=0;i=2373 */
+/* ServerRedundancyType - ns=0;i=2034 */
 
-static UA_StatusCode function_namespace0_generated_119_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_110_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-UA_VariableTypeAttributes attr = UA_VariableTypeAttributes_default;
-attr.valueRank = -2;
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 1);
-attr.displayName = UA_LOCALIZEDTEXT("", "TwoStateDiscreteType");
-retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLETYPE,
-UA_NODEID_NUMERIC(ns[0], 2373),
-UA_NODEID_NUMERIC(ns[0], 2372),
+UA_ObjectTypeAttributes attr = UA_ObjectTypeAttributes_default;
+attr.displayName = UA_LOCALIZEDTEXT("", "ServerRedundancyType");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_OBJECTTYPE,
+UA_NODEID_NUMERIC(ns[0], 2034),
+UA_NODEID_NUMERIC(ns[0], 58),
 UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "TwoStateDiscreteType"),
-UA_NODEID_NUMERIC(ns[0], 0),
-(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLETYPEATTRIBUTES],NULL, NULL);
-return retVal;
-}
-
-static UA_StatusCode function_namespace0_generated_119_finish(UA_Server *server, UA_UInt16* ns) {
-return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2373)
-);
-}
-
-/* TrueState - ns=0;i=2375 */
-
-static UA_StatusCode function_namespace0_generated_120_begin(UA_Server *server, UA_UInt16* ns) {
-UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-UA_VariableAttributes attr = UA_VariableAttributes_default;
-attr.minimumSamplingInterval = 0.000000;
-attr.userAccessLevel = 1;
-attr.accessLevel = 1;
-/* Value rank inherited */
-attr.valueRank = -1;
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 21);
-attr.displayName = UA_LOCALIZEDTEXT("", "TrueState");
-retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 2375),
-UA_NODEID_NUMERIC(ns[0], 2373),
-UA_NODEID_NUMERIC(ns[0], 46),
-UA_QUALIFIEDNAME(ns[0], "TrueState"),
-UA_NODEID_NUMERIC(ns[0], 68),
-(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 2375), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 78), true);
+UA_QUALIFIEDNAME(ns[0], "ServerRedundancyType"),
+ UA_NODEID_NULL,
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_OBJECTTYPEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_120_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_110_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2375)
+UA_NODEID_NUMERIC(ns[0], 2034)
 );
 }
 
-/* FalseState - ns=0;i=2374 */
+/* RedundancySupport - ns=0;i=2035 */
 
-static UA_StatusCode function_namespace0_generated_121_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_111_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -48352,169 +49093,115 @@ attr.userAccessLevel = 1;
 attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 21);
-attr.displayName = UA_LOCALIZEDTEXT("", "FalseState");
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 851);
+attr.displayName = UA_LOCALIZEDTEXT("", "RedundancySupport");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 2374),
-UA_NODEID_NUMERIC(ns[0], 2373),
+UA_NODEID_NUMERIC(ns[0], 2035),
+UA_NODEID_NUMERIC(ns[0], 2034),
 UA_NODEID_NUMERIC(ns[0], 46),
-UA_QUALIFIEDNAME(ns[0], "FalseState"),
+UA_QUALIFIEDNAME(ns[0], "RedundancySupport"),
 UA_NODEID_NUMERIC(ns[0], 68),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 2374), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 78), true);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_121_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_111_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2374)
+UA_NODEID_NUMERIC(ns[0], 2035)
 );
 }
 
-/* MultiStateDiscreteType - ns=0;i=2376 */
+/* VendorServerInfoType - ns=0;i=2033 */
 
-static UA_StatusCode function_namespace0_generated_122_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_112_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-UA_VariableTypeAttributes attr = UA_VariableTypeAttributes_default;
-attr.valueRank = -2;
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 28);
-attr.displayName = UA_LOCALIZEDTEXT("", "MultiStateDiscreteType");
-retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLETYPE,
-UA_NODEID_NUMERIC(ns[0], 2376),
-UA_NODEID_NUMERIC(ns[0], 2372),
+UA_ObjectTypeAttributes attr = UA_ObjectTypeAttributes_default;
+attr.displayName = UA_LOCALIZEDTEXT("", "VendorServerInfoType");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_OBJECTTYPE,
+UA_NODEID_NUMERIC(ns[0], 2033),
+UA_NODEID_NUMERIC(ns[0], 58),
 UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "MultiStateDiscreteType"),
-UA_NODEID_NUMERIC(ns[0], 0),
-(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLETYPEATTRIBUTES],NULL, NULL);
-return retVal;
-}
-
-static UA_StatusCode function_namespace0_generated_122_finish(UA_Server *server, UA_UInt16* ns) {
-return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2376)
-);
-}
-
-/* EnumStrings - ns=0;i=2377 */
-
-static UA_StatusCode function_namespace0_generated_123_begin(UA_Server *server, UA_UInt16* ns) {
-UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-UA_VariableAttributes attr = UA_VariableAttributes_default;
-attr.minimumSamplingInterval = 0.000000;
-attr.userAccessLevel = 1;
-attr.accessLevel = 1;
-attr.valueRank = 1;
-attr.arrayDimensionsSize = 1;
-UA_UInt32 arrayDimensions[1];
-arrayDimensions[0] = 0;
-attr.arrayDimensions = &arrayDimensions[0];
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 21);
-attr.displayName = UA_LOCALIZEDTEXT("", "EnumStrings");
-retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 2377),
-UA_NODEID_NUMERIC(ns[0], 2376),
-UA_NODEID_NUMERIC(ns[0], 46),
-UA_QUALIFIEDNAME(ns[0], "EnumStrings"),
-UA_NODEID_NUMERIC(ns[0], 68),
-(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 2377), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 78), true);
+UA_QUALIFIEDNAME(ns[0], "VendorServerInfoType"),
+ UA_NODEID_NULL,
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_OBJECTTYPEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_123_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_112_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2377)
+UA_NODEID_NUMERIC(ns[0], 2033)
 );
 }
 
-/* MultiStateValueDiscreteType - ns=0;i=11238 */
+/* ServerDiagnosticsType - ns=0;i=2020 */
 
-static UA_StatusCode function_namespace0_generated_124_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_113_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-UA_VariableTypeAttributes attr = UA_VariableTypeAttributes_default;
-attr.valueRank = -2;
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 26);
-attr.displayName = UA_LOCALIZEDTEXT("", "MultiStateValueDiscreteType");
-retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLETYPE,
-UA_NODEID_NUMERIC(ns[0], 11238),
-UA_NODEID_NUMERIC(ns[0], 2372),
+UA_ObjectTypeAttributes attr = UA_ObjectTypeAttributes_default;
+attr.displayName = UA_LOCALIZEDTEXT("", "ServerDiagnosticsType");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_OBJECTTYPE,
+UA_NODEID_NUMERIC(ns[0], 2020),
+UA_NODEID_NUMERIC(ns[0], 58),
 UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "MultiStateValueDiscreteType"),
-UA_NODEID_NUMERIC(ns[0], 0),
-(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLETYPEATTRIBUTES],NULL, NULL);
+UA_QUALIFIEDNAME(ns[0], "ServerDiagnosticsType"),
+ UA_NODEID_NULL,
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_OBJECTTYPEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_124_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_113_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 11238)
+UA_NODEID_NUMERIC(ns[0], 2020)
 );
 }
 
-/* ValueAsText - ns=0;i=11461 */
+/* ServerCapabilitiesType - ns=0;i=2013 */
 
-static UA_StatusCode function_namespace0_generated_125_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_114_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-UA_VariableAttributes attr = UA_VariableAttributes_default;
-attr.minimumSamplingInterval = 0.000000;
-attr.userAccessLevel = 1;
-attr.accessLevel = 1;
-/* Value rank inherited */
-attr.valueRank = -1;
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 21);
-attr.displayName = UA_LOCALIZEDTEXT("", "ValueAsText");
-retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 11461),
-UA_NODEID_NUMERIC(ns[0], 11238),
-UA_NODEID_NUMERIC(ns[0], 46),
-UA_QUALIFIEDNAME(ns[0], "ValueAsText"),
-UA_NODEID_NUMERIC(ns[0], 68),
-(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 11461), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 78), true);
+UA_ObjectTypeAttributes attr = UA_ObjectTypeAttributes_default;
+attr.displayName = UA_LOCALIZEDTEXT("", "ServerCapabilitiesType");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_OBJECTTYPE,
+UA_NODEID_NUMERIC(ns[0], 2013),
+UA_NODEID_NUMERIC(ns[0], 58),
+UA_NODEID_NUMERIC(ns[0], 45),
+UA_QUALIFIEDNAME(ns[0], "ServerCapabilitiesType"),
+ UA_NODEID_NULL,
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_OBJECTTYPEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_125_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_114_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 11461)
+UA_NODEID_NUMERIC(ns[0], 2013)
 );
 }
 
-/* EnumValues - ns=0;i=11241 */
+/* OperationLimits - ns=0;i=11551 */
 
-static UA_StatusCode function_namespace0_generated_126_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_115_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-UA_VariableAttributes attr = UA_VariableAttributes_default;
-attr.minimumSamplingInterval = 0.000000;
-attr.userAccessLevel = 1;
-attr.accessLevel = 1;
-attr.valueRank = 1;
-attr.arrayDimensionsSize = 1;
-UA_UInt32 arrayDimensions[1];
-arrayDimensions[0] = 0;
-attr.arrayDimensions = &arrayDimensions[0];
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 7594);
-attr.displayName = UA_LOCALIZEDTEXT("", "EnumValues");
-retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 11241),
-UA_NODEID_NUMERIC(ns[0], 11238),
-UA_NODEID_NUMERIC(ns[0], 46),
-UA_QUALIFIEDNAME(ns[0], "EnumValues"),
-UA_NODEID_NUMERIC(ns[0], 68),
-(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 11241), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 78), true);
+UA_ObjectAttributes attr = UA_ObjectAttributes_default;
+attr.displayName = UA_LOCALIZEDTEXT("", "OperationLimits");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_OBJECT,
+UA_NODEID_NUMERIC(ns[0], 11551),
+UA_NODEID_NUMERIC(ns[0], 2013),
+UA_NODEID_NUMERIC(ns[0], 47),
+UA_QUALIFIEDNAME(ns[0], "OperationLimits"),
+UA_NODEID_NUMERIC(ns[0], 11564),
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_126_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_115_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 11241)
+UA_NODEID_NUMERIC(ns[0], 11551)
 );
 }
 
 /* ServerType - ns=0;i=2004 */
 
-static UA_StatusCode function_namespace0_generated_127_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_116_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_ObjectTypeAttributes attr = UA_ObjectTypeAttributes_default;
 attr.displayName = UA_LOCALIZEDTEXT("", "ServerType");
@@ -48528,7 +49215,7 @@ UA_QUALIFIEDNAME(ns[0], "ServerType"),
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_127_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_116_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
 UA_NODEID_NUMERIC(ns[0], 2004)
 );
@@ -48536,7 +49223,7 @@ UA_NODEID_NUMERIC(ns[0], 2004)
 
 /* Server - ns=0;i=2253 */
 
-static UA_StatusCode function_namespace0_generated_128_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_117_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_ObjectAttributes attr = UA_ObjectAttributes_default;
 attr.eventNotifier = true;
@@ -48551,7 +49238,7 @@ UA_NODEID_NUMERIC(ns[0], 2004),
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_128_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_117_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
 UA_NODEID_NUMERIC(ns[0], 2253)
 );
@@ -48559,7 +49246,7 @@ UA_NODEID_NUMERIC(ns[0], 2253)
 
 /* Auditing - ns=0;i=2994 */
 
-static UA_StatusCode function_namespace0_generated_129_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_118_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 1000.000000;
@@ -48579,15 +49266,96 @@ UA_NODEID_NUMERIC(ns[0], 68),
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_129_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_118_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
 UA_NODEID_NUMERIC(ns[0], 2994)
 );
 }
 
+/* ServiceLevel - ns=0;i=2267 */
+
+static UA_StatusCode function_namespace0_generated_119_begin(UA_Server *server, UA_UInt16* ns) {
+UA_StatusCode retVal = UA_STATUSCODE_GOOD;
+UA_VariableAttributes attr = UA_VariableAttributes_default;
+attr.minimumSamplingInterval = 1000.000000;
+attr.userAccessLevel = 1;
+attr.accessLevel = 1;
+/* Value rank inherited */
+attr.valueRank = -1;
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 3);
+attr.displayName = UA_LOCALIZEDTEXT("", "ServiceLevel");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
+UA_NODEID_NUMERIC(ns[0], 2267),
+UA_NODEID_NUMERIC(ns[0], 2253),
+UA_NODEID_NUMERIC(ns[0], 46),
+UA_QUALIFIEDNAME(ns[0], "ServiceLevel"),
+UA_NODEID_NUMERIC(ns[0], 68),
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
+return retVal;
+}
+
+static UA_StatusCode function_namespace0_generated_119_finish(UA_Server *server, UA_UInt16* ns) {
+return UA_Server_addNode_finish(server, 
+UA_NODEID_NUMERIC(ns[0], 2267)
+);
+}
+
+/* VendorServerInfo - ns=0;i=2295 */
+
+static UA_StatusCode function_namespace0_generated_120_begin(UA_Server *server, UA_UInt16* ns) {
+UA_StatusCode retVal = UA_STATUSCODE_GOOD;
+UA_ObjectAttributes attr = UA_ObjectAttributes_default;
+attr.displayName = UA_LOCALIZEDTEXT("", "VendorServerInfo");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_OBJECT,
+UA_NODEID_NUMERIC(ns[0], 2295),
+UA_NODEID_NUMERIC(ns[0], 2253),
+UA_NODEID_NUMERIC(ns[0], 47),
+UA_QUALIFIEDNAME(ns[0], "VendorServerInfo"),
+UA_NODEID_NUMERIC(ns[0], 2033),
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES],NULL, NULL);
+return retVal;
+}
+
+static UA_StatusCode function_namespace0_generated_120_finish(UA_Server *server, UA_UInt16* ns) {
+return UA_Server_addNode_finish(server, 
+UA_NODEID_NUMERIC(ns[0], 2295)
+);
+}
+
+/* NamespaceArray - ns=0;i=2255 */
+
+static UA_StatusCode function_namespace0_generated_121_begin(UA_Server *server, UA_UInt16* ns) {
+UA_StatusCode retVal = UA_STATUSCODE_GOOD;
+UA_VariableAttributes attr = UA_VariableAttributes_default;
+attr.minimumSamplingInterval = 1000.000000;
+attr.userAccessLevel = 1;
+attr.accessLevel = 1;
+attr.valueRank = 1;
+attr.arrayDimensionsSize = 1;
+UA_UInt32 arrayDimensions[1];
+arrayDimensions[0] = 0;
+attr.arrayDimensions = &arrayDimensions[0];
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 12);
+attr.displayName = UA_LOCALIZEDTEXT("", "NamespaceArray");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
+UA_NODEID_NUMERIC(ns[0], 2255),
+UA_NODEID_NUMERIC(ns[0], 2253),
+UA_NODEID_NUMERIC(ns[0], 46),
+UA_QUALIFIEDNAME(ns[0], "NamespaceArray"),
+UA_NODEID_NUMERIC(ns[0], 68),
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
+return retVal;
+}
+
+static UA_StatusCode function_namespace0_generated_121_finish(UA_Server *server, UA_UInt16* ns) {
+return UA_Server_addNode_finish(server, 
+UA_NODEID_NUMERIC(ns[0], 2255)
+);
+}
+
 /* GetMonitoredItems - ns=0;i=11492 */
 
-static UA_StatusCode function_namespace0_generated_130_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_122_begin(UA_Server *server, UA_UInt16* ns) {
 #ifdef UA_ENABLE_METHODCALLS
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_MethodAttributes attr = UA_MethodAttributes_default;
@@ -48607,7 +49375,7 @@ return UA_STATUSCODE_GOOD;
 #endif /* UA_ENABLE_METHODCALLS */
 }
 
-static UA_StatusCode function_namespace0_generated_130_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_122_finish(UA_Server *server, UA_UInt16* ns) {
 #ifdef UA_ENABLE_METHODCALLS
 return UA_Server_addMethodNode_finish(server, 
 UA_NODEID_NUMERIC(ns[0], 11492)
@@ -48619,7 +49387,7 @@ return UA_STATUSCODE_GOOD;
 
 /* OutputArguments - ns=0;i=11494 */
 
-static UA_StatusCode function_namespace0_generated_131_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_123_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -48666,7 +49434,7 @@ UA_NODEID_NUMERIC(ns[0], 68),
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_131_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_123_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
 UA_NODEID_NUMERIC(ns[0], 11494)
 );
@@ -48674,7 +49442,7 @@ UA_NODEID_NUMERIC(ns[0], 11494)
 
 /* InputArguments - ns=0;i=11493 */
 
-static UA_StatusCode function_namespace0_generated_132_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_124_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -48705,7 +49473,7 @@ UA_NODEID_NUMERIC(ns[0], 68),
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_132_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_124_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
 UA_NODEID_NUMERIC(ns[0], 11493)
 );
@@ -48713,7 +49481,7 @@ UA_NODEID_NUMERIC(ns[0], 11493)
 
 /* ServerStatus - ns=0;i=2256 */
 
-static UA_StatusCode function_namespace0_generated_133_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_125_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 1000.000000;
@@ -48733,15 +49501,15 @@ UA_NODEID_NUMERIC(ns[0], 2138),
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_133_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_125_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
 UA_NODEID_NUMERIC(ns[0], 2256)
 );
 }
 
-/* BuildInfo - ns=0;i=2260 */
+/* ShutdownReason - ns=0;i=2993 */
 
-static UA_StatusCode function_namespace0_generated_134_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_126_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -48749,55 +49517,55 @@ attr.userAccessLevel = 1;
 attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 338);
-attr.displayName = UA_LOCALIZEDTEXT("", "BuildInfo");
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 21);
+attr.displayName = UA_LOCALIZEDTEXT("", "ShutdownReason");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 2260),
+UA_NODEID_NUMERIC(ns[0], 2993),
 UA_NODEID_NUMERIC(ns[0], 2256),
 UA_NODEID_NUMERIC(ns[0], 47),
-UA_QUALIFIEDNAME(ns[0], "BuildInfo"),
-UA_NODEID_NUMERIC(ns[0], 3051),
+UA_QUALIFIEDNAME(ns[0], "ShutdownReason"),
+UA_NODEID_NUMERIC(ns[0], 63),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_134_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_126_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2260)
+UA_NODEID_NUMERIC(ns[0], 2993)
 );
 }
 
-/* BuildDate - ns=0;i=2266 */
+/* BuildInfo - ns=0;i=2260 */
 
-static UA_StatusCode function_namespace0_generated_135_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_127_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
-attr.minimumSamplingInterval = 1000.000000;
+attr.minimumSamplingInterval = 0.000000;
 attr.userAccessLevel = 1;
 attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 294);
-attr.displayName = UA_LOCALIZEDTEXT("", "BuildDate");
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 338);
+attr.displayName = UA_LOCALIZEDTEXT("", "BuildInfo");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 2266),
 UA_NODEID_NUMERIC(ns[0], 2260),
+UA_NODEID_NUMERIC(ns[0], 2256),
 UA_NODEID_NUMERIC(ns[0], 47),
-UA_QUALIFIEDNAME(ns[0], "BuildDate"),
-UA_NODEID_NUMERIC(ns[0], 63),
+UA_QUALIFIEDNAME(ns[0], "BuildInfo"),
+UA_NODEID_NUMERIC(ns[0], 3051),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_135_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_127_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2266)
+UA_NODEID_NUMERIC(ns[0], 2260)
 );
 }
 
-/* BuildNumber - ns=0;i=2265 */
+/* ProductUri - ns=0;i=2262 */
 
-static UA_StatusCode function_namespace0_generated_136_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_128_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 1000.000000;
@@ -48806,26 +49574,26 @@ attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
 attr.dataType = UA_NODEID_NUMERIC(ns[0], 12);
-attr.displayName = UA_LOCALIZEDTEXT("", "BuildNumber");
+attr.displayName = UA_LOCALIZEDTEXT("", "ProductUri");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 2265),
+UA_NODEID_NUMERIC(ns[0], 2262),
 UA_NODEID_NUMERIC(ns[0], 2260),
 UA_NODEID_NUMERIC(ns[0], 47),
-UA_QUALIFIEDNAME(ns[0], "BuildNumber"),
+UA_QUALIFIEDNAME(ns[0], "ProductUri"),
 UA_NODEID_NUMERIC(ns[0], 63),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_136_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_128_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2265)
+UA_NODEID_NUMERIC(ns[0], 2262)
 );
 }
 
-/* SoftwareVersion - ns=0;i=2264 */
+/* ProductName - ns=0;i=2261 */
 
-static UA_StatusCode function_namespace0_generated_137_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_129_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 1000.000000;
@@ -48834,26 +49602,26 @@ attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
 attr.dataType = UA_NODEID_NUMERIC(ns[0], 12);
-attr.displayName = UA_LOCALIZEDTEXT("", "SoftwareVersion");
+attr.displayName = UA_LOCALIZEDTEXT("", "ProductName");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 2264),
+UA_NODEID_NUMERIC(ns[0], 2261),
 UA_NODEID_NUMERIC(ns[0], 2260),
 UA_NODEID_NUMERIC(ns[0], 47),
-UA_QUALIFIEDNAME(ns[0], "SoftwareVersion"),
+UA_QUALIFIEDNAME(ns[0], "ProductName"),
 UA_NODEID_NUMERIC(ns[0], 63),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_137_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_129_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2264)
+UA_NODEID_NUMERIC(ns[0], 2261)
 );
 }
 
-/* ManufacturerName - ns=0;i=2263 */
+/* BuildDate - ns=0;i=2266 */
 
-static UA_StatusCode function_namespace0_generated_138_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_130_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 1000.000000;
@@ -48861,27 +49629,27 @@ attr.userAccessLevel = 1;
 attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 12);
-attr.displayName = UA_LOCALIZEDTEXT("", "ManufacturerName");
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 294);
+attr.displayName = UA_LOCALIZEDTEXT("", "BuildDate");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 2263),
+UA_NODEID_NUMERIC(ns[0], 2266),
 UA_NODEID_NUMERIC(ns[0], 2260),
 UA_NODEID_NUMERIC(ns[0], 47),
-UA_QUALIFIEDNAME(ns[0], "ManufacturerName"),
+UA_QUALIFIEDNAME(ns[0], "BuildDate"),
 UA_NODEID_NUMERIC(ns[0], 63),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_138_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_130_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2263)
+UA_NODEID_NUMERIC(ns[0], 2266)
 );
 }
 
-/* ProductUri - ns=0;i=2262 */
+/* BuildNumber - ns=0;i=2265 */
 
-static UA_StatusCode function_namespace0_generated_139_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_131_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 1000.000000;
@@ -48890,26 +49658,26 @@ attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
 attr.dataType = UA_NODEID_NUMERIC(ns[0], 12);
-attr.displayName = UA_LOCALIZEDTEXT("", "ProductUri");
+attr.displayName = UA_LOCALIZEDTEXT("", "BuildNumber");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 2262),
+UA_NODEID_NUMERIC(ns[0], 2265),
 UA_NODEID_NUMERIC(ns[0], 2260),
 UA_NODEID_NUMERIC(ns[0], 47),
-UA_QUALIFIEDNAME(ns[0], "ProductUri"),
+UA_QUALIFIEDNAME(ns[0], "BuildNumber"),
 UA_NODEID_NUMERIC(ns[0], 63),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_139_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_131_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2262)
+UA_NODEID_NUMERIC(ns[0], 2265)
 );
 }
 
-/* ProductName - ns=0;i=2261 */
+/* ManufacturerName - ns=0;i=2263 */
 
-static UA_StatusCode function_namespace0_generated_140_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_132_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 1000.000000;
@@ -48918,54 +49686,54 @@ attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
 attr.dataType = UA_NODEID_NUMERIC(ns[0], 12);
-attr.displayName = UA_LOCALIZEDTEXT("", "ProductName");
+attr.displayName = UA_LOCALIZEDTEXT("", "ManufacturerName");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 2261),
+UA_NODEID_NUMERIC(ns[0], 2263),
 UA_NODEID_NUMERIC(ns[0], 2260),
 UA_NODEID_NUMERIC(ns[0], 47),
-UA_QUALIFIEDNAME(ns[0], "ProductName"),
+UA_QUALIFIEDNAME(ns[0], "ManufacturerName"),
 UA_NODEID_NUMERIC(ns[0], 63),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_140_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_132_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2261)
+UA_NODEID_NUMERIC(ns[0], 2263)
 );
 }
 
-/* ShutdownReason - ns=0;i=2993 */
+/* SoftwareVersion - ns=0;i=2264 */
 
-static UA_StatusCode function_namespace0_generated_141_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_133_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
-attr.minimumSamplingInterval = 0.000000;
+attr.minimumSamplingInterval = 1000.000000;
 attr.userAccessLevel = 1;
 attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 21);
-attr.displayName = UA_LOCALIZEDTEXT("", "ShutdownReason");
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 12);
+attr.displayName = UA_LOCALIZEDTEXT("", "SoftwareVersion");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 2993),
-UA_NODEID_NUMERIC(ns[0], 2256),
+UA_NODEID_NUMERIC(ns[0], 2264),
+UA_NODEID_NUMERIC(ns[0], 2260),
 UA_NODEID_NUMERIC(ns[0], 47),
-UA_QUALIFIEDNAME(ns[0], "ShutdownReason"),
+UA_QUALIFIEDNAME(ns[0], "SoftwareVersion"),
 UA_NODEID_NUMERIC(ns[0], 63),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_141_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_133_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2993)
+UA_NODEID_NUMERIC(ns[0], 2264)
 );
 }
 
-/* State - ns=0;i=2259 */
+/* SecondsTillShutdown - ns=0;i=2992 */
 
-static UA_StatusCode function_namespace0_generated_142_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_134_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -48973,27 +49741,27 @@ attr.userAccessLevel = 1;
 attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 852);
-attr.displayName = UA_LOCALIZEDTEXT("", "State");
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 7);
+attr.displayName = UA_LOCALIZEDTEXT("", "SecondsTillShutdown");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 2259),
+UA_NODEID_NUMERIC(ns[0], 2992),
 UA_NODEID_NUMERIC(ns[0], 2256),
 UA_NODEID_NUMERIC(ns[0], 47),
-UA_QUALIFIEDNAME(ns[0], "State"),
+UA_QUALIFIEDNAME(ns[0], "SecondsTillShutdown"),
 UA_NODEID_NUMERIC(ns[0], 63),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_142_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_134_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2259)
+UA_NODEID_NUMERIC(ns[0], 2992)
 );
 }
 
-/* CurrentTime - ns=0;i=2258 */
+/* StartTime - ns=0;i=2257 */
 
-static UA_StatusCode function_namespace0_generated_143_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_135_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -49002,26 +49770,26 @@ attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
 attr.dataType = UA_NODEID_NUMERIC(ns[0], 294);
-attr.displayName = UA_LOCALIZEDTEXT("", "CurrentTime");
+attr.displayName = UA_LOCALIZEDTEXT("", "StartTime");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 2258),
+UA_NODEID_NUMERIC(ns[0], 2257),
 UA_NODEID_NUMERIC(ns[0], 2256),
 UA_NODEID_NUMERIC(ns[0], 47),
-UA_QUALIFIEDNAME(ns[0], "CurrentTime"),
+UA_QUALIFIEDNAME(ns[0], "StartTime"),
 UA_NODEID_NUMERIC(ns[0], 63),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_143_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_135_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2258)
+UA_NODEID_NUMERIC(ns[0], 2257)
 );
 }
 
-/* StartTime - ns=0;i=2257 */
+/* CurrentTime - ns=0;i=2258 */
 
-static UA_StatusCode function_namespace0_generated_144_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_136_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -49030,26 +49798,26 @@ attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
 attr.dataType = UA_NODEID_NUMERIC(ns[0], 294);
-attr.displayName = UA_LOCALIZEDTEXT("", "StartTime");
+attr.displayName = UA_LOCALIZEDTEXT("", "CurrentTime");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 2257),
+UA_NODEID_NUMERIC(ns[0], 2258),
 UA_NODEID_NUMERIC(ns[0], 2256),
 UA_NODEID_NUMERIC(ns[0], 47),
-UA_QUALIFIEDNAME(ns[0], "StartTime"),
+UA_QUALIFIEDNAME(ns[0], "CurrentTime"),
 UA_NODEID_NUMERIC(ns[0], 63),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_144_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_136_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2257)
+UA_NODEID_NUMERIC(ns[0], 2258)
 );
 }
 
-/* SecondsTillShutdown - ns=0;i=2992 */
+/* State - ns=0;i=2259 */
 
-static UA_StatusCode function_namespace0_generated_145_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_137_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -49057,27 +49825,27 @@ attr.userAccessLevel = 1;
 attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 7);
-attr.displayName = UA_LOCALIZEDTEXT("", "SecondsTillShutdown");
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 852);
+attr.displayName = UA_LOCALIZEDTEXT("", "State");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 2992),
+UA_NODEID_NUMERIC(ns[0], 2259),
 UA_NODEID_NUMERIC(ns[0], 2256),
 UA_NODEID_NUMERIC(ns[0], 47),
-UA_QUALIFIEDNAME(ns[0], "SecondsTillShutdown"),
+UA_QUALIFIEDNAME(ns[0], "State"),
 UA_NODEID_NUMERIC(ns[0], 63),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_145_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_137_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2992)
+UA_NODEID_NUMERIC(ns[0], 2259)
 );
 }
 
 /* ServerDiagnostics - ns=0;i=2274 */
 
-static UA_StatusCode function_namespace0_generated_146_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_138_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_ObjectAttributes attr = UA_ObjectAttributes_default;
 attr.displayName = UA_LOCALIZEDTEXT("", "ServerDiagnostics");
@@ -49091,7 +49859,7 @@ UA_NODEID_NUMERIC(ns[0], 2020),
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_146_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_138_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
 UA_NODEID_NUMERIC(ns[0], 2274)
 );
@@ -49099,7 +49867,7 @@ UA_NODEID_NUMERIC(ns[0], 2274)
 
 /* ServerDiagnosticsSummary - ns=0;i=2275 */
 
-static UA_StatusCode function_namespace0_generated_147_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_139_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -49119,15 +49887,15 @@ UA_NODEID_NUMERIC(ns[0], 2150),
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_147_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_139_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
 UA_NODEID_NUMERIC(ns[0], 2275)
 );
 }
 
-/* SecurityRejectedRequestsCount - ns=0;i=2287 */
+/* RejectedSessionCount - ns=0;i=3705 */
 
-static UA_StatusCode function_namespace0_generated_148_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_140_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -49136,26 +49904,26 @@ attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
 attr.dataType = UA_NODEID_NUMERIC(ns[0], 7);
-attr.displayName = UA_LOCALIZEDTEXT("", "SecurityRejectedRequestsCount");
+attr.displayName = UA_LOCALIZEDTEXT("", "RejectedSessionCount");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 2287),
+UA_NODEID_NUMERIC(ns[0], 3705),
 UA_NODEID_NUMERIC(ns[0], 2275),
 UA_NODEID_NUMERIC(ns[0], 47),
-UA_QUALIFIEDNAME(ns[0], "SecurityRejectedRequestsCount"),
+UA_QUALIFIEDNAME(ns[0], "RejectedSessionCount"),
 UA_NODEID_NUMERIC(ns[0], 63),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_148_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_140_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2287)
+UA_NODEID_NUMERIC(ns[0], 3705)
 );
 }
 
-/* CumulatedSubscriptionCount - ns=0;i=2286 */
+/* SessionTimeoutCount - ns=0;i=2281 */
 
-static UA_StatusCode function_namespace0_generated_149_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_141_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -49164,26 +49932,26 @@ attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
 attr.dataType = UA_NODEID_NUMERIC(ns[0], 7);
-attr.displayName = UA_LOCALIZEDTEXT("", "CumulatedSubscriptionCount");
+attr.displayName = UA_LOCALIZEDTEXT("", "SessionTimeoutCount");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 2286),
+UA_NODEID_NUMERIC(ns[0], 2281),
 UA_NODEID_NUMERIC(ns[0], 2275),
 UA_NODEID_NUMERIC(ns[0], 47),
-UA_QUALIFIEDNAME(ns[0], "CumulatedSubscriptionCount"),
+UA_QUALIFIEDNAME(ns[0], "SessionTimeoutCount"),
 UA_NODEID_NUMERIC(ns[0], 63),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_149_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_141_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2286)
+UA_NODEID_NUMERIC(ns[0], 2281)
 );
 }
 
-/* CurrentSubscriptionCount - ns=0;i=2285 */
+/* CumulatedSessionCount - ns=0;i=2278 */
 
-static UA_StatusCode function_namespace0_generated_150_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_142_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -49192,26 +49960,26 @@ attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
 attr.dataType = UA_NODEID_NUMERIC(ns[0], 7);
-attr.displayName = UA_LOCALIZEDTEXT("", "CurrentSubscriptionCount");
+attr.displayName = UA_LOCALIZEDTEXT("", "CumulatedSessionCount");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 2285),
+UA_NODEID_NUMERIC(ns[0], 2278),
 UA_NODEID_NUMERIC(ns[0], 2275),
 UA_NODEID_NUMERIC(ns[0], 47),
-UA_QUALIFIEDNAME(ns[0], "CurrentSubscriptionCount"),
+UA_QUALIFIEDNAME(ns[0], "CumulatedSessionCount"),
 UA_NODEID_NUMERIC(ns[0], 63),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_150_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_142_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2285)
+UA_NODEID_NUMERIC(ns[0], 2278)
 );
 }
 
 /* PublishingIntervalCount - ns=0;i=2284 */
 
-static UA_StatusCode function_namespace0_generated_151_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_143_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -49231,15 +49999,15 @@ UA_NODEID_NUMERIC(ns[0], 63),
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_151_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_143_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
 UA_NODEID_NUMERIC(ns[0], 2284)
 );
 }
 
-/* SessionAbortCount - ns=0;i=2282 */
+/* SecurityRejectedRequestsCount - ns=0;i=2287 */
 
-static UA_StatusCode function_namespace0_generated_152_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_144_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -49248,26 +50016,26 @@ attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
 attr.dataType = UA_NODEID_NUMERIC(ns[0], 7);
-attr.displayName = UA_LOCALIZEDTEXT("", "SessionAbortCount");
+attr.displayName = UA_LOCALIZEDTEXT("", "SecurityRejectedRequestsCount");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 2282),
+UA_NODEID_NUMERIC(ns[0], 2287),
 UA_NODEID_NUMERIC(ns[0], 2275),
 UA_NODEID_NUMERIC(ns[0], 47),
-UA_QUALIFIEDNAME(ns[0], "SessionAbortCount"),
+UA_QUALIFIEDNAME(ns[0], "SecurityRejectedRequestsCount"),
 UA_NODEID_NUMERIC(ns[0], 63),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_152_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_144_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2282)
+UA_NODEID_NUMERIC(ns[0], 2287)
 );
 }
 
-/* SessionTimeoutCount - ns=0;i=2281 */
+/* SessionAbortCount - ns=0;i=2282 */
 
-static UA_StatusCode function_namespace0_generated_153_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_145_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -49276,26 +50044,26 @@ attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
 attr.dataType = UA_NODEID_NUMERIC(ns[0], 7);
-attr.displayName = UA_LOCALIZEDTEXT("", "SessionTimeoutCount");
+attr.displayName = UA_LOCALIZEDTEXT("", "SessionAbortCount");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 2281),
+UA_NODEID_NUMERIC(ns[0], 2282),
 UA_NODEID_NUMERIC(ns[0], 2275),
 UA_NODEID_NUMERIC(ns[0], 47),
-UA_QUALIFIEDNAME(ns[0], "SessionTimeoutCount"),
+UA_QUALIFIEDNAME(ns[0], "SessionAbortCount"),
 UA_NODEID_NUMERIC(ns[0], 63),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_153_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_145_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2281)
+UA_NODEID_NUMERIC(ns[0], 2282)
 );
 }
 
-/* RejectedSessionCount - ns=0;i=3705 */
+/* RejectedRequestsCount - ns=0;i=2288 */
 
-static UA_StatusCode function_namespace0_generated_154_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_146_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -49304,26 +50072,26 @@ attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
 attr.dataType = UA_NODEID_NUMERIC(ns[0], 7);
-attr.displayName = UA_LOCALIZEDTEXT("", "RejectedSessionCount");
+attr.displayName = UA_LOCALIZEDTEXT("", "RejectedRequestsCount");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 3705),
+UA_NODEID_NUMERIC(ns[0], 2288),
 UA_NODEID_NUMERIC(ns[0], 2275),
 UA_NODEID_NUMERIC(ns[0], 47),
-UA_QUALIFIEDNAME(ns[0], "RejectedSessionCount"),
+UA_QUALIFIEDNAME(ns[0], "RejectedRequestsCount"),
 UA_NODEID_NUMERIC(ns[0], 63),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_154_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_146_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 3705)
+UA_NODEID_NUMERIC(ns[0], 2288)
 );
 }
 
-/* RejectedRequestsCount - ns=0;i=2288 */
+/* ServerViewCount - ns=0;i=2276 */
 
-static UA_StatusCode function_namespace0_generated_155_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_147_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -49332,26 +50100,26 @@ attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
 attr.dataType = UA_NODEID_NUMERIC(ns[0], 7);
-attr.displayName = UA_LOCALIZEDTEXT("", "RejectedRequestsCount");
+attr.displayName = UA_LOCALIZEDTEXT("", "ServerViewCount");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 2288),
+UA_NODEID_NUMERIC(ns[0], 2276),
 UA_NODEID_NUMERIC(ns[0], 2275),
 UA_NODEID_NUMERIC(ns[0], 47),
-UA_QUALIFIEDNAME(ns[0], "RejectedRequestsCount"),
+UA_QUALIFIEDNAME(ns[0], "ServerViewCount"),
 UA_NODEID_NUMERIC(ns[0], 63),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_155_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_147_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2288)
+UA_NODEID_NUMERIC(ns[0], 2276)
 );
 }
 
-/* ServerViewCount - ns=0;i=2276 */
+/* CurrentSubscriptionCount - ns=0;i=2285 */
 
-static UA_StatusCode function_namespace0_generated_156_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_148_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -49360,26 +50128,26 @@ attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
 attr.dataType = UA_NODEID_NUMERIC(ns[0], 7);
-attr.displayName = UA_LOCALIZEDTEXT("", "ServerViewCount");
+attr.displayName = UA_LOCALIZEDTEXT("", "CurrentSubscriptionCount");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 2276),
+UA_NODEID_NUMERIC(ns[0], 2285),
 UA_NODEID_NUMERIC(ns[0], 2275),
 UA_NODEID_NUMERIC(ns[0], 47),
-UA_QUALIFIEDNAME(ns[0], "ServerViewCount"),
+UA_QUALIFIEDNAME(ns[0], "CurrentSubscriptionCount"),
 UA_NODEID_NUMERIC(ns[0], 63),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_156_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_148_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2276)
+UA_NODEID_NUMERIC(ns[0], 2285)
 );
 }
 
 /* CurrentSessionCount - ns=0;i=2277 */
 
-static UA_StatusCode function_namespace0_generated_157_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_149_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -49399,15 +50167,15 @@ UA_NODEID_NUMERIC(ns[0], 63),
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_157_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_149_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
 UA_NODEID_NUMERIC(ns[0], 2277)
 );
 }
 
-/* CumulatedSessionCount - ns=0;i=2278 */
+/* SecurityRejectedSessionCount - ns=0;i=2279 */
 
-static UA_StatusCode function_namespace0_generated_158_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_150_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -49416,26 +50184,26 @@ attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
 attr.dataType = UA_NODEID_NUMERIC(ns[0], 7);
-attr.displayName = UA_LOCALIZEDTEXT("", "CumulatedSessionCount");
+attr.displayName = UA_LOCALIZEDTEXT("", "SecurityRejectedSessionCount");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 2278),
+UA_NODEID_NUMERIC(ns[0], 2279),
 UA_NODEID_NUMERIC(ns[0], 2275),
 UA_NODEID_NUMERIC(ns[0], 47),
-UA_QUALIFIEDNAME(ns[0], "CumulatedSessionCount"),
+UA_QUALIFIEDNAME(ns[0], "SecurityRejectedSessionCount"),
 UA_NODEID_NUMERIC(ns[0], 63),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_158_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_150_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2278)
+UA_NODEID_NUMERIC(ns[0], 2279)
 );
 }
 
-/* SecurityRejectedSessionCount - ns=0;i=2279 */
+/* CumulatedSubscriptionCount - ns=0;i=2286 */
 
-static UA_StatusCode function_namespace0_generated_159_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_151_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -49444,26 +50212,26 @@ attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
 attr.dataType = UA_NODEID_NUMERIC(ns[0], 7);
-attr.displayName = UA_LOCALIZEDTEXT("", "SecurityRejectedSessionCount");
+attr.displayName = UA_LOCALIZEDTEXT("", "CumulatedSubscriptionCount");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 2279),
+UA_NODEID_NUMERIC(ns[0], 2286),
 UA_NODEID_NUMERIC(ns[0], 2275),
 UA_NODEID_NUMERIC(ns[0], 47),
-UA_QUALIFIEDNAME(ns[0], "SecurityRejectedSessionCount"),
+UA_QUALIFIEDNAME(ns[0], "CumulatedSubscriptionCount"),
 UA_NODEID_NUMERIC(ns[0], 63),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_159_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_151_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2279)
+UA_NODEID_NUMERIC(ns[0], 2286)
 );
 }
 
 /* EnabledFlag - ns=0;i=2294 */
 
-static UA_StatusCode function_namespace0_generated_160_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_152_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -49483,68 +50251,65 @@ UA_NODEID_NUMERIC(ns[0], 68),
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_160_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_152_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
 UA_NODEID_NUMERIC(ns[0], 2294)
 );
 }
 
-/* VendorServerInfo - ns=0;i=2295 */
+/* ServerRedundancy - ns=0;i=2296 */
 
-static UA_StatusCode function_namespace0_generated_161_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_153_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_ObjectAttributes attr = UA_ObjectAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "VendorServerInfo");
+attr.displayName = UA_LOCALIZEDTEXT("", "ServerRedundancy");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_OBJECT,
-UA_NODEID_NUMERIC(ns[0], 2295),
+UA_NODEID_NUMERIC(ns[0], 2296),
 UA_NODEID_NUMERIC(ns[0], 2253),
 UA_NODEID_NUMERIC(ns[0], 47),
-UA_QUALIFIEDNAME(ns[0], "VendorServerInfo"),
-UA_NODEID_NUMERIC(ns[0], 2033),
+UA_QUALIFIEDNAME(ns[0], "ServerRedundancy"),
+UA_NODEID_NUMERIC(ns[0], 2034),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_161_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_153_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2295)
+UA_NODEID_NUMERIC(ns[0], 2296)
 );
 }
 
-/* NamespaceArray - ns=0;i=2255 */
+/* RedundancySupport - ns=0;i=3709 */
 
-static UA_StatusCode function_namespace0_generated_162_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_154_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
-attr.minimumSamplingInterval = 1000.000000;
+attr.minimumSamplingInterval = 0.000000;
 attr.userAccessLevel = 1;
 attr.accessLevel = 1;
-attr.valueRank = 1;
-attr.arrayDimensionsSize = 1;
-UA_UInt32 arrayDimensions[1];
-arrayDimensions[0] = 0;
-attr.arrayDimensions = &arrayDimensions[0];
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 12);
-attr.displayName = UA_LOCALIZEDTEXT("", "NamespaceArray");
+/* Value rank inherited */
+attr.valueRank = -1;
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 851);
+attr.displayName = UA_LOCALIZEDTEXT("", "RedundancySupport");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 2255),
-UA_NODEID_NUMERIC(ns[0], 2253),
+UA_NODEID_NUMERIC(ns[0], 3709),
+UA_NODEID_NUMERIC(ns[0], 2296),
 UA_NODEID_NUMERIC(ns[0], 46),
-UA_QUALIFIEDNAME(ns[0], "NamespaceArray"),
+UA_QUALIFIEDNAME(ns[0], "RedundancySupport"),
 UA_NODEID_NUMERIC(ns[0], 68),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_162_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_154_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2255)
+UA_NODEID_NUMERIC(ns[0], 3709)
 );
 }
 
 /* ServerArray - ns=0;i=2254 */
 
-static UA_StatusCode function_namespace0_generated_163_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_155_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 1000.000000;
@@ -49567,65 +50332,37 @@ UA_NODEID_NUMERIC(ns[0], 68),
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_163_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_155_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
 UA_NODEID_NUMERIC(ns[0], 2254)
 );
 }
 
-/* ServiceLevel - ns=0;i=2267 */
-
-static UA_StatusCode function_namespace0_generated_164_begin(UA_Server *server, UA_UInt16* ns) {
-UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-UA_VariableAttributes attr = UA_VariableAttributes_default;
-attr.minimumSamplingInterval = 1000.000000;
-attr.userAccessLevel = 1;
-attr.accessLevel = 1;
-/* Value rank inherited */
-attr.valueRank = -1;
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 3);
-attr.displayName = UA_LOCALIZEDTEXT("", "ServiceLevel");
-retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 2267),
-UA_NODEID_NUMERIC(ns[0], 2253),
-UA_NODEID_NUMERIC(ns[0], 46),
-UA_QUALIFIEDNAME(ns[0], "ServiceLevel"),
-UA_NODEID_NUMERIC(ns[0], 68),
-(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
-return retVal;
-}
-
-static UA_StatusCode function_namespace0_generated_164_finish(UA_Server *server, UA_UInt16* ns) {
-return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2267)
-);
-}
-
-/* ServerRedundancy - ns=0;i=2296 */
+/* ServerCapabilities - ns=0;i=2268 */
 
-static UA_StatusCode function_namespace0_generated_165_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_156_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_ObjectAttributes attr = UA_ObjectAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "ServerRedundancy");
+attr.displayName = UA_LOCALIZEDTEXT("", "ServerCapabilities");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_OBJECT,
-UA_NODEID_NUMERIC(ns[0], 2296),
+UA_NODEID_NUMERIC(ns[0], 2268),
 UA_NODEID_NUMERIC(ns[0], 2253),
 UA_NODEID_NUMERIC(ns[0], 47),
-UA_QUALIFIEDNAME(ns[0], "ServerRedundancy"),
-UA_NODEID_NUMERIC(ns[0], 2034),
+UA_QUALIFIEDNAME(ns[0], "ServerCapabilities"),
+UA_NODEID_NUMERIC(ns[0], 2013),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_165_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_156_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2296)
+UA_NODEID_NUMERIC(ns[0], 2268)
 );
 }
 
-/* RedundancySupport - ns=0;i=3709 */
+/* MaxBrowseContinuationPoints - ns=0;i=2735 */
 
-static UA_StatusCode function_namespace0_generated_166_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_157_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -49633,118 +50370,127 @@ attr.userAccessLevel = 1;
 attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 851);
-attr.displayName = UA_LOCALIZEDTEXT("", "RedundancySupport");
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 5);
+attr.displayName = UA_LOCALIZEDTEXT("", "MaxBrowseContinuationPoints");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 3709),
-UA_NODEID_NUMERIC(ns[0], 2296),
+UA_NODEID_NUMERIC(ns[0], 2735),
+UA_NODEID_NUMERIC(ns[0], 2268),
 UA_NODEID_NUMERIC(ns[0], 46),
-UA_QUALIFIEDNAME(ns[0], "RedundancySupport"),
+UA_QUALIFIEDNAME(ns[0], "MaxBrowseContinuationPoints"),
 UA_NODEID_NUMERIC(ns[0], 68),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_166_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_157_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 3709)
+UA_NODEID_NUMERIC(ns[0], 2735)
 );
 }
 
-/* VendorServerInfo - ns=0;i=2011 */
+/* ModellingRules - ns=0;i=2996 */
 
-static UA_StatusCode function_namespace0_generated_167_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_158_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_ObjectAttributes attr = UA_ObjectAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "VendorServerInfo");
+attr.displayName = UA_LOCALIZEDTEXT("", "ModellingRules");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_OBJECT,
-UA_NODEID_NUMERIC(ns[0], 2011),
-UA_NODEID_NUMERIC(ns[0], 2004),
+UA_NODEID_NUMERIC(ns[0], 2996),
+UA_NODEID_NUMERIC(ns[0], 2268),
 UA_NODEID_NUMERIC(ns[0], 47),
-UA_QUALIFIEDNAME(ns[0], "VendorServerInfo"),
-UA_NODEID_NUMERIC(ns[0], 2033),
+UA_QUALIFIEDNAME(ns[0], "ModellingRules"),
+UA_NODEID_NUMERIC(ns[0], 61),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES],NULL, NULL);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 2011), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 78), true);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_167_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_158_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2011)
+UA_NODEID_NUMERIC(ns[0], 2996)
 );
 }
 
-/* InterfaceTypes - ns=0;i=17708 */
+/* OperationLimits - ns=0;i=11704 */
 
-static UA_StatusCode function_namespace0_generated_168_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_159_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_ObjectAttributes attr = UA_ObjectAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "InterfaceTypes");
+attr.displayName = UA_LOCALIZEDTEXT("", "OperationLimits");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_OBJECT,
-UA_NODEID_NUMERIC(ns[0], 17708),
-UA_NODEID_NUMERIC(ns[0], 86),
-UA_NODEID_NUMERIC(ns[0], 35),
-UA_QUALIFIEDNAME(ns[0], "InterfaceTypes"),
-UA_NODEID_NUMERIC(ns[0], 61),
+UA_NODEID_NUMERIC(ns[0], 11704),
+UA_NODEID_NUMERIC(ns[0], 2268),
+UA_NODEID_NUMERIC(ns[0], 47),
+UA_QUALIFIEDNAME(ns[0], "OperationLimits"),
+UA_NODEID_NUMERIC(ns[0], 11564),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_168_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_159_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 17708)
+UA_NODEID_NUMERIC(ns[0], 11704)
 );
 }
 
-/* BaseInterfaceType - ns=0;i=17602 */
+/* MaxNodesPerNodeManagement - ns=0;i=11713 */
 
-static UA_StatusCode function_namespace0_generated_169_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_160_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-UA_ObjectTypeAttributes attr = UA_ObjectTypeAttributes_default;
-attr.isAbstract = true;
-attr.displayName = UA_LOCALIZEDTEXT("", "BaseInterfaceType");
-retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_OBJECTTYPE,
-UA_NODEID_NUMERIC(ns[0], 17602),
-UA_NODEID_NUMERIC(ns[0], 58),
-UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "BaseInterfaceType"),
- UA_NODEID_NULL,
-(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_OBJECTTYPEATTRIBUTES],NULL, NULL);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 17602), UA_NODEID_NUMERIC(ns[0], 35), UA_EXPANDEDNODEID_NUMERIC(ns[0], 17708), false);
+UA_VariableAttributes attr = UA_VariableAttributes_default;
+attr.minimumSamplingInterval = 0.000000;
+attr.userAccessLevel = 1;
+attr.accessLevel = 1;
+/* Value rank inherited */
+attr.valueRank = -1;
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 7);
+attr.displayName = UA_LOCALIZEDTEXT("", "MaxNodesPerNodeManagement");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
+UA_NODEID_NUMERIC(ns[0], 11713),
+UA_NODEID_NUMERIC(ns[0], 11704),
+UA_NODEID_NUMERIC(ns[0], 46),
+UA_QUALIFIEDNAME(ns[0], "MaxNodesPerNodeManagement"),
+UA_NODEID_NUMERIC(ns[0], 68),
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_169_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_160_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 17602)
+UA_NODEID_NUMERIC(ns[0], 11713)
 );
 }
 
-/* OperationLimitsType - ns=0;i=11564 */
+/* MaxNodesPerWrite - ns=0;i=11707 */
 
-static UA_StatusCode function_namespace0_generated_170_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_161_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-UA_ObjectTypeAttributes attr = UA_ObjectTypeAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "OperationLimitsType");
-retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_OBJECTTYPE,
-UA_NODEID_NUMERIC(ns[0], 11564),
-UA_NODEID_NUMERIC(ns[0], 61),
-UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "OperationLimitsType"),
- UA_NODEID_NULL,
-(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_OBJECTTYPEATTRIBUTES],NULL, NULL);
+UA_VariableAttributes attr = UA_VariableAttributes_default;
+attr.minimumSamplingInterval = 0.000000;
+attr.userAccessLevel = 1;
+attr.accessLevel = 1;
+/* Value rank inherited */
+attr.valueRank = -1;
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 7);
+attr.displayName = UA_LOCALIZEDTEXT("", "MaxNodesPerWrite");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
+UA_NODEID_NUMERIC(ns[0], 11707),
+UA_NODEID_NUMERIC(ns[0], 11704),
+UA_NODEID_NUMERIC(ns[0], 46),
+UA_QUALIFIEDNAME(ns[0], "MaxNodesPerWrite"),
+UA_NODEID_NUMERIC(ns[0], 68),
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_170_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_161_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 11564)
+UA_NODEID_NUMERIC(ns[0], 11707)
 );
 }
 
-/* MaxNodesPerWrite - ns=0;i=11567 */
+/* MaxNodesPerRead - ns=0;i=11705 */
 
-static UA_StatusCode function_namespace0_generated_171_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_162_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -49753,27 +50499,26 @@ attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
 attr.dataType = UA_NODEID_NUMERIC(ns[0], 7);
-attr.displayName = UA_LOCALIZEDTEXT("", "MaxNodesPerWrite");
+attr.displayName = UA_LOCALIZEDTEXT("", "MaxNodesPerRead");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 11567),
-UA_NODEID_NUMERIC(ns[0], 11564),
+UA_NODEID_NUMERIC(ns[0], 11705),
+UA_NODEID_NUMERIC(ns[0], 11704),
 UA_NODEID_NUMERIC(ns[0], 46),
-UA_QUALIFIEDNAME(ns[0], "MaxNodesPerWrite"),
+UA_QUALIFIEDNAME(ns[0], "MaxNodesPerRead"),
 UA_NODEID_NUMERIC(ns[0], 68),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 11567), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 80), true);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_171_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_162_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 11567)
+UA_NODEID_NUMERIC(ns[0], 11705)
 );
 }
 
-/* MaxNodesPerRead - ns=0;i=11565 */
+/* MaxNodesPerBrowse - ns=0;i=11710 */
 
-static UA_StatusCode function_namespace0_generated_172_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_163_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -49782,27 +50527,26 @@ attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
 attr.dataType = UA_NODEID_NUMERIC(ns[0], 7);
-attr.displayName = UA_LOCALIZEDTEXT("", "MaxNodesPerRead");
+attr.displayName = UA_LOCALIZEDTEXT("", "MaxNodesPerBrowse");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 11565),
-UA_NODEID_NUMERIC(ns[0], 11564),
+UA_NODEID_NUMERIC(ns[0], 11710),
+UA_NODEID_NUMERIC(ns[0], 11704),
 UA_NODEID_NUMERIC(ns[0], 46),
-UA_QUALIFIEDNAME(ns[0], "MaxNodesPerRead"),
+UA_QUALIFIEDNAME(ns[0], "MaxNodesPerBrowse"),
 UA_NODEID_NUMERIC(ns[0], 68),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 11565), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 80), true);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_172_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_163_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 11565)
+UA_NODEID_NUMERIC(ns[0], 11710)
 );
 }
 
-/* MaxNodesPerMethodCall - ns=0;i=11569 */
+/* MaxMonitoredItemsPerCall - ns=0;i=11714 */
 
-static UA_StatusCode function_namespace0_generated_173_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_164_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -49811,27 +50555,26 @@ attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
 attr.dataType = UA_NODEID_NUMERIC(ns[0], 7);
-attr.displayName = UA_LOCALIZEDTEXT("", "MaxNodesPerMethodCall");
+attr.displayName = UA_LOCALIZEDTEXT("", "MaxMonitoredItemsPerCall");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 11569),
-UA_NODEID_NUMERIC(ns[0], 11564),
+UA_NODEID_NUMERIC(ns[0], 11714),
+UA_NODEID_NUMERIC(ns[0], 11704),
 UA_NODEID_NUMERIC(ns[0], 46),
-UA_QUALIFIEDNAME(ns[0], "MaxNodesPerMethodCall"),
+UA_QUALIFIEDNAME(ns[0], "MaxMonitoredItemsPerCall"),
 UA_NODEID_NUMERIC(ns[0], 68),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 11569), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 80), true);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_173_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_164_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 11569)
+UA_NODEID_NUMERIC(ns[0], 11714)
 );
 }
 
-/* MaxNodesPerRegisterNodes - ns=0;i=11571 */
+/* MaxNodesPerTranslateBrowsePathsToNodeIds - ns=0;i=11712 */
 
-static UA_StatusCode function_namespace0_generated_174_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_165_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -49840,27 +50583,26 @@ attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
 attr.dataType = UA_NODEID_NUMERIC(ns[0], 7);
-attr.displayName = UA_LOCALIZEDTEXT("", "MaxNodesPerRegisterNodes");
+attr.displayName = UA_LOCALIZEDTEXT("", "MaxNodesPerTranslateBrowsePathsToNodeIds");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 11571),
-UA_NODEID_NUMERIC(ns[0], 11564),
+UA_NODEID_NUMERIC(ns[0], 11712),
+UA_NODEID_NUMERIC(ns[0], 11704),
 UA_NODEID_NUMERIC(ns[0], 46),
-UA_QUALIFIEDNAME(ns[0], "MaxNodesPerRegisterNodes"),
+UA_QUALIFIEDNAME(ns[0], "MaxNodesPerTranslateBrowsePathsToNodeIds"),
 UA_NODEID_NUMERIC(ns[0], 68),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 11571), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 80), true);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_174_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_165_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 11571)
+UA_NODEID_NUMERIC(ns[0], 11712)
 );
 }
 
-/* MaxNodesPerBrowse - ns=0;i=11570 */
+/* MaxNodesPerRegisterNodes - ns=0;i=11711 */
 
-static UA_StatusCode function_namespace0_generated_175_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_166_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -49869,27 +50611,26 @@ attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
 attr.dataType = UA_NODEID_NUMERIC(ns[0], 7);
-attr.displayName = UA_LOCALIZEDTEXT("", "MaxNodesPerBrowse");
+attr.displayName = UA_LOCALIZEDTEXT("", "MaxNodesPerRegisterNodes");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 11570),
-UA_NODEID_NUMERIC(ns[0], 11564),
+UA_NODEID_NUMERIC(ns[0], 11711),
+UA_NODEID_NUMERIC(ns[0], 11704),
 UA_NODEID_NUMERIC(ns[0], 46),
-UA_QUALIFIEDNAME(ns[0], "MaxNodesPerBrowse"),
+UA_QUALIFIEDNAME(ns[0], "MaxNodesPerRegisterNodes"),
 UA_NODEID_NUMERIC(ns[0], 68),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 11570), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 80), true);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_175_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_166_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 11570)
+UA_NODEID_NUMERIC(ns[0], 11711)
 );
 }
 
-/* MaxNodesPerNodeManagement - ns=0;i=11573 */
+/* MaxNodesPerMethodCall - ns=0;i=11709 */
 
-static UA_StatusCode function_namespace0_generated_176_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_167_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -49898,27 +50639,26 @@ attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
 attr.dataType = UA_NODEID_NUMERIC(ns[0], 7);
-attr.displayName = UA_LOCALIZEDTEXT("", "MaxNodesPerNodeManagement");
+attr.displayName = UA_LOCALIZEDTEXT("", "MaxNodesPerMethodCall");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 11573),
-UA_NODEID_NUMERIC(ns[0], 11564),
+UA_NODEID_NUMERIC(ns[0], 11709),
+UA_NODEID_NUMERIC(ns[0], 11704),
 UA_NODEID_NUMERIC(ns[0], 46),
-UA_QUALIFIEDNAME(ns[0], "MaxNodesPerNodeManagement"),
+UA_QUALIFIEDNAME(ns[0], "MaxNodesPerMethodCall"),
 UA_NODEID_NUMERIC(ns[0], 68),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 11573), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 80), true);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_176_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_167_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 11573)
+UA_NODEID_NUMERIC(ns[0], 11709)
 );
 }
 
-/* MaxNodesPerTranslateBrowsePathsToNodeIds - ns=0;i=11572 */
+/* MaxHistoryContinuationPoints - ns=0;i=2737 */
 
-static UA_StatusCode function_namespace0_generated_177_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_168_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -49926,124 +50666,139 @@ attr.userAccessLevel = 1;
 attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 7);
-attr.displayName = UA_LOCALIZEDTEXT("", "MaxNodesPerTranslateBrowsePathsToNodeIds");
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 5);
+attr.displayName = UA_LOCALIZEDTEXT("", "MaxHistoryContinuationPoints");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 11572),
-UA_NODEID_NUMERIC(ns[0], 11564),
+UA_NODEID_NUMERIC(ns[0], 2737),
+UA_NODEID_NUMERIC(ns[0], 2268),
 UA_NODEID_NUMERIC(ns[0], 46),
-UA_QUALIFIEDNAME(ns[0], "MaxNodesPerTranslateBrowsePathsToNodeIds"),
+UA_QUALIFIEDNAME(ns[0], "MaxHistoryContinuationPoints"),
 UA_NODEID_NUMERIC(ns[0], 68),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 11572), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 80), true);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_177_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_168_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 11572)
+UA_NODEID_NUMERIC(ns[0], 2737)
 );
 }
 
-/* MaxMonitoredItemsPerCall - ns=0;i=11574 */
+/* SoftwareCertificates - ns=0;i=3704 */
 
-static UA_StatusCode function_namespace0_generated_178_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_169_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
 attr.userAccessLevel = 1;
 attr.accessLevel = 1;
-/* Value rank inherited */
-attr.valueRank = -1;
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 7);
-attr.displayName = UA_LOCALIZEDTEXT("", "MaxMonitoredItemsPerCall");
+attr.valueRank = 1;
+attr.arrayDimensionsSize = 1;
+UA_UInt32 arrayDimensions[1];
+arrayDimensions[0] = 0;
+attr.arrayDimensions = &arrayDimensions[0];
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 344);
+attr.displayName = UA_LOCALIZEDTEXT("", "SoftwareCertificates");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 11574),
-UA_NODEID_NUMERIC(ns[0], 11564),
+UA_NODEID_NUMERIC(ns[0], 3704),
+UA_NODEID_NUMERIC(ns[0], 2268),
 UA_NODEID_NUMERIC(ns[0], 46),
-UA_QUALIFIEDNAME(ns[0], "MaxMonitoredItemsPerCall"),
+UA_QUALIFIEDNAME(ns[0], "SoftwareCertificates"),
 UA_NODEID_NUMERIC(ns[0], 68),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 11574), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 80), true);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_178_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_169_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 11574)
+UA_NODEID_NUMERIC(ns[0], 3704)
 );
 }
 
-/* ServerCapabilitiesType - ns=0;i=2013 */
+/* LocaleIdArray - ns=0;i=2271 */
 
-static UA_StatusCode function_namespace0_generated_179_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_170_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-UA_ObjectTypeAttributes attr = UA_ObjectTypeAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "ServerCapabilitiesType");
-retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_OBJECTTYPE,
-UA_NODEID_NUMERIC(ns[0], 2013),
-UA_NODEID_NUMERIC(ns[0], 58),
-UA_NODEID_NUMERIC(ns[0], 45),
-UA_QUALIFIEDNAME(ns[0], "ServerCapabilitiesType"),
- UA_NODEID_NULL,
-(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_OBJECTTYPEATTRIBUTES],NULL, NULL);
+UA_VariableAttributes attr = UA_VariableAttributes_default;
+attr.minimumSamplingInterval = 0.000000;
+attr.userAccessLevel = 1;
+attr.accessLevel = 1;
+attr.valueRank = 1;
+attr.arrayDimensionsSize = 1;
+UA_UInt32 arrayDimensions[1];
+arrayDimensions[0] = 0;
+attr.arrayDimensions = &arrayDimensions[0];
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 295);
+attr.displayName = UA_LOCALIZEDTEXT("", "LocaleIdArray");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
+UA_NODEID_NUMERIC(ns[0], 2271),
+UA_NODEID_NUMERIC(ns[0], 2268),
+UA_NODEID_NUMERIC(ns[0], 46),
+UA_QUALIFIEDNAME(ns[0], "LocaleIdArray"),
+UA_NODEID_NUMERIC(ns[0], 68),
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_179_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_170_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2013)
+UA_NODEID_NUMERIC(ns[0], 2271)
 );
 }
 
-/* OperationLimits - ns=0;i=11551 */
+/* MaxQueryContinuationPoints - ns=0;i=2736 */
 
-static UA_StatusCode function_namespace0_generated_180_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_171_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-UA_ObjectAttributes attr = UA_ObjectAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "OperationLimits");
-retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_OBJECT,
-UA_NODEID_NUMERIC(ns[0], 11551),
-UA_NODEID_NUMERIC(ns[0], 2013),
-UA_NODEID_NUMERIC(ns[0], 47),
-UA_QUALIFIEDNAME(ns[0], "OperationLimits"),
-UA_NODEID_NUMERIC(ns[0], 11564),
-(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES],NULL, NULL);
-retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 11551), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 80), true);
+UA_VariableAttributes attr = UA_VariableAttributes_default;
+attr.minimumSamplingInterval = 0.000000;
+attr.userAccessLevel = 1;
+attr.accessLevel = 1;
+/* Value rank inherited */
+attr.valueRank = -1;
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 5);
+attr.displayName = UA_LOCALIZEDTEXT("", "MaxQueryContinuationPoints");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
+UA_NODEID_NUMERIC(ns[0], 2736),
+UA_NODEID_NUMERIC(ns[0], 2268),
+UA_NODEID_NUMERIC(ns[0], 46),
+UA_QUALIFIEDNAME(ns[0], "MaxQueryContinuationPoints"),
+UA_NODEID_NUMERIC(ns[0], 68),
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_180_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_171_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 11551)
+UA_NODEID_NUMERIC(ns[0], 2736)
 );
 }
 
-/* ServerCapabilities - ns=0;i=2268 */
+/* AggregateFunctions - ns=0;i=2997 */
 
-static UA_StatusCode function_namespace0_generated_181_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_172_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_ObjectAttributes attr = UA_ObjectAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "ServerCapabilities");
+attr.displayName = UA_LOCALIZEDTEXT("", "AggregateFunctions");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_OBJECT,
+UA_NODEID_NUMERIC(ns[0], 2997),
 UA_NODEID_NUMERIC(ns[0], 2268),
-UA_NODEID_NUMERIC(ns[0], 2253),
 UA_NODEID_NUMERIC(ns[0], 47),
-UA_QUALIFIEDNAME(ns[0], "ServerCapabilities"),
-UA_NODEID_NUMERIC(ns[0], 2013),
+UA_QUALIFIEDNAME(ns[0], "AggregateFunctions"),
+UA_NODEID_NUMERIC(ns[0], 61),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_181_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_172_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2268)
+UA_NODEID_NUMERIC(ns[0], 2997)
 );
 }
 
 /* ServerProfileArray - ns=0;i=2269 */
 
-static UA_StatusCode function_namespace0_generated_182_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_173_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -50066,81 +50821,143 @@ UA_NODEID_NUMERIC(ns[0], 68),
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_182_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_173_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
 UA_NODEID_NUMERIC(ns[0], 2269)
 );
 }
 
-/* AggregateFunctions - ns=0;i=2997 */
+/* HistoryServerCapabilities - ns=0;i=11192 */
 
-static UA_StatusCode function_namespace0_generated_183_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_174_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_ObjectAttributes attr = UA_ObjectAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "AggregateFunctions");
+attr.displayName = UA_LOCALIZEDTEXT("", "HistoryServerCapabilities");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_OBJECT,
-UA_NODEID_NUMERIC(ns[0], 2997),
+UA_NODEID_NUMERIC(ns[0], 11192),
 UA_NODEID_NUMERIC(ns[0], 2268),
 UA_NODEID_NUMERIC(ns[0], 47),
-UA_QUALIFIEDNAME(ns[0], "AggregateFunctions"),
-UA_NODEID_NUMERIC(ns[0], 61),
+UA_QUALIFIEDNAME(ns[0], "HistoryServerCapabilities"),
+UA_NODEID_NUMERIC(ns[0], 2330),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_183_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_174_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2997)
+UA_NODEID_NUMERIC(ns[0], 11192)
 );
 }
 
-/* ModellingRules - ns=0;i=2996 */
+/* MaxReturnDataValues - ns=0;i=11273 */
 
-static UA_StatusCode function_namespace0_generated_184_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_175_begin(UA_Server *server, UA_UInt16* ns) {
+UA_StatusCode retVal = UA_STATUSCODE_GOOD;
+UA_VariableAttributes attr = UA_VariableAttributes_default;
+attr.minimumSamplingInterval = 0.000000;
+attr.userAccessLevel = 1;
+attr.accessLevel = 1;
+/* Value rank inherited */
+attr.valueRank = -1;
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 7);
+attr.displayName = UA_LOCALIZEDTEXT("", "MaxReturnDataValues");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
+UA_NODEID_NUMERIC(ns[0], 11273),
+UA_NODEID_NUMERIC(ns[0], 11192),
+UA_NODEID_NUMERIC(ns[0], 46),
+UA_QUALIFIEDNAME(ns[0], "MaxReturnDataValues"),
+UA_NODEID_NUMERIC(ns[0], 68),
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
+return retVal;
+}
+
+static UA_StatusCode function_namespace0_generated_175_finish(UA_Server *server, UA_UInt16* ns) {
+return UA_Server_addNode_finish(server, 
+UA_NODEID_NUMERIC(ns[0], 11273)
+);
+}
+
+/* InsertAnnotationCapability - ns=0;i=11275 */
+
+static UA_StatusCode function_namespace0_generated_176_begin(UA_Server *server, UA_UInt16* ns) {
+UA_StatusCode retVal = UA_STATUSCODE_GOOD;
+UA_VariableAttributes attr = UA_VariableAttributes_default;
+attr.minimumSamplingInterval = 0.000000;
+attr.userAccessLevel = 1;
+attr.accessLevel = 1;
+/* Value rank inherited */
+attr.valueRank = -1;
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 1);
+attr.displayName = UA_LOCALIZEDTEXT("", "InsertAnnotationCapability");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
+UA_NODEID_NUMERIC(ns[0], 11275),
+UA_NODEID_NUMERIC(ns[0], 11192),
+UA_NODEID_NUMERIC(ns[0], 46),
+UA_QUALIFIEDNAME(ns[0], "InsertAnnotationCapability"),
+UA_NODEID_NUMERIC(ns[0], 68),
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
+return retVal;
+}
+
+static UA_StatusCode function_namespace0_generated_176_finish(UA_Server *server, UA_UInt16* ns) {
+return UA_Server_addNode_finish(server, 
+UA_NODEID_NUMERIC(ns[0], 11275)
+);
+}
+
+/* AggregateFunctions - ns=0;i=11201 */
+
+static UA_StatusCode function_namespace0_generated_177_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_ObjectAttributes attr = UA_ObjectAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "ModellingRules");
+attr.displayName = UA_LOCALIZEDTEXT("", "AggregateFunctions");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_OBJECT,
-UA_NODEID_NUMERIC(ns[0], 2996),
-UA_NODEID_NUMERIC(ns[0], 2268),
+UA_NODEID_NUMERIC(ns[0], 11201),
+UA_NODEID_NUMERIC(ns[0], 11192),
 UA_NODEID_NUMERIC(ns[0], 47),
-UA_QUALIFIEDNAME(ns[0], "ModellingRules"),
+UA_QUALIFIEDNAME(ns[0], "AggregateFunctions"),
 UA_NODEID_NUMERIC(ns[0], 61),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_184_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_177_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2996)
+UA_NODEID_NUMERIC(ns[0], 11201)
 );
 }
 
-/* OperationLimits - ns=0;i=11704 */
+/* ReplaceDataCapability - ns=0;i=11197 */
 
-static UA_StatusCode function_namespace0_generated_185_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_178_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
-UA_ObjectAttributes attr = UA_ObjectAttributes_default;
-attr.displayName = UA_LOCALIZEDTEXT("", "OperationLimits");
-retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_OBJECT,
-UA_NODEID_NUMERIC(ns[0], 11704),
-UA_NODEID_NUMERIC(ns[0], 2268),
-UA_NODEID_NUMERIC(ns[0], 47),
-UA_QUALIFIEDNAME(ns[0], "OperationLimits"),
-UA_NODEID_NUMERIC(ns[0], 11564),
-(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES],NULL, NULL);
+UA_VariableAttributes attr = UA_VariableAttributes_default;
+attr.minimumSamplingInterval = 0.000000;
+attr.userAccessLevel = 1;
+attr.accessLevel = 1;
+/* Value rank inherited */
+attr.valueRank = -1;
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 1);
+attr.displayName = UA_LOCALIZEDTEXT("", "ReplaceDataCapability");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
+UA_NODEID_NUMERIC(ns[0], 11197),
+UA_NODEID_NUMERIC(ns[0], 11192),
+UA_NODEID_NUMERIC(ns[0], 46),
+UA_QUALIFIEDNAME(ns[0], "ReplaceDataCapability"),
+UA_NODEID_NUMERIC(ns[0], 68),
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_185_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_178_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 11704)
+UA_NODEID_NUMERIC(ns[0], 11197)
 );
 }
 
-/* MaxNodesPerWrite - ns=0;i=11707 */
+/* DeleteRawCapability - ns=0;i=11199 */
 
-static UA_StatusCode function_namespace0_generated_186_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_179_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -50148,27 +50965,27 @@ attr.userAccessLevel = 1;
 attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 7);
-attr.displayName = UA_LOCALIZEDTEXT("", "MaxNodesPerWrite");
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 1);
+attr.displayName = UA_LOCALIZEDTEXT("", "DeleteRawCapability");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 11707),
-UA_NODEID_NUMERIC(ns[0], 11704),
+UA_NODEID_NUMERIC(ns[0], 11199),
+UA_NODEID_NUMERIC(ns[0], 11192),
 UA_NODEID_NUMERIC(ns[0], 46),
-UA_QUALIFIEDNAME(ns[0], "MaxNodesPerWrite"),
+UA_QUALIFIEDNAME(ns[0], "DeleteRawCapability"),
 UA_NODEID_NUMERIC(ns[0], 68),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_186_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_179_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 11707)
+UA_NODEID_NUMERIC(ns[0], 11199)
 );
 }
 
-/* MaxNodesPerRead - ns=0;i=11705 */
+/* UpdateDataCapability - ns=0;i=11198 */
 
-static UA_StatusCode function_namespace0_generated_187_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_180_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -50176,27 +50993,27 @@ attr.userAccessLevel = 1;
 attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 7);
-attr.displayName = UA_LOCALIZEDTEXT("", "MaxNodesPerRead");
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 1);
+attr.displayName = UA_LOCALIZEDTEXT("", "UpdateDataCapability");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 11705),
-UA_NODEID_NUMERIC(ns[0], 11704),
+UA_NODEID_NUMERIC(ns[0], 11198),
+UA_NODEID_NUMERIC(ns[0], 11192),
 UA_NODEID_NUMERIC(ns[0], 46),
-UA_QUALIFIEDNAME(ns[0], "MaxNodesPerRead"),
+UA_QUALIFIEDNAME(ns[0], "UpdateDataCapability"),
 UA_NODEID_NUMERIC(ns[0], 68),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_187_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_180_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 11705)
+UA_NODEID_NUMERIC(ns[0], 11198)
 );
 }
 
-/* MaxMonitoredItemsPerCall - ns=0;i=11714 */
+/* InsertDataCapability - ns=0;i=11196 */
 
-static UA_StatusCode function_namespace0_generated_188_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_181_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -50204,27 +51021,27 @@ attr.userAccessLevel = 1;
 attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 7);
-attr.displayName = UA_LOCALIZEDTEXT("", "MaxMonitoredItemsPerCall");
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 1);
+attr.displayName = UA_LOCALIZEDTEXT("", "InsertDataCapability");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 11714),
-UA_NODEID_NUMERIC(ns[0], 11704),
+UA_NODEID_NUMERIC(ns[0], 11196),
+UA_NODEID_NUMERIC(ns[0], 11192),
 UA_NODEID_NUMERIC(ns[0], 46),
-UA_QUALIFIEDNAME(ns[0], "MaxMonitoredItemsPerCall"),
+UA_QUALIFIEDNAME(ns[0], "InsertDataCapability"),
 UA_NODEID_NUMERIC(ns[0], 68),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_188_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_181_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 11714)
+UA_NODEID_NUMERIC(ns[0], 11196)
 );
 }
 
-/* MaxNodesPerRegisterNodes - ns=0;i=11711 */
+/* ReplaceEventCapability - ns=0;i=11282 */
 
-static UA_StatusCode function_namespace0_generated_189_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_182_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -50232,27 +51049,27 @@ attr.userAccessLevel = 1;
 attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 7);
-attr.displayName = UA_LOCALIZEDTEXT("", "MaxNodesPerRegisterNodes");
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 1);
+attr.displayName = UA_LOCALIZEDTEXT("", "ReplaceEventCapability");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 11711),
-UA_NODEID_NUMERIC(ns[0], 11704),
+UA_NODEID_NUMERIC(ns[0], 11282),
+UA_NODEID_NUMERIC(ns[0], 11192),
 UA_NODEID_NUMERIC(ns[0], 46),
-UA_QUALIFIEDNAME(ns[0], "MaxNodesPerRegisterNodes"),
+UA_QUALIFIEDNAME(ns[0], "ReplaceEventCapability"),
 UA_NODEID_NUMERIC(ns[0], 68),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_189_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_182_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 11711)
+UA_NODEID_NUMERIC(ns[0], 11282)
 );
 }
 
-/* MaxNodesPerBrowse - ns=0;i=11710 */
+/* AccessHistoryEventsCapability - ns=0;i=11242 */
 
-static UA_StatusCode function_namespace0_generated_190_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_183_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -50260,27 +51077,27 @@ attr.userAccessLevel = 1;
 attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 7);
-attr.displayName = UA_LOCALIZEDTEXT("", "MaxNodesPerBrowse");
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 1);
+attr.displayName = UA_LOCALIZEDTEXT("", "AccessHistoryEventsCapability");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 11710),
-UA_NODEID_NUMERIC(ns[0], 11704),
+UA_NODEID_NUMERIC(ns[0], 11242),
+UA_NODEID_NUMERIC(ns[0], 11192),
 UA_NODEID_NUMERIC(ns[0], 46),
-UA_QUALIFIEDNAME(ns[0], "MaxNodesPerBrowse"),
+UA_QUALIFIEDNAME(ns[0], "AccessHistoryEventsCapability"),
 UA_NODEID_NUMERIC(ns[0], 68),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_190_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_183_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 11710)
+UA_NODEID_NUMERIC(ns[0], 11242)
 );
 }
 
-/* MaxNodesPerNodeManagement - ns=0;i=11713 */
+/* MaxReturnEventValues - ns=0;i=11274 */
 
-static UA_StatusCode function_namespace0_generated_191_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_184_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -50289,26 +51106,26 @@ attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
 attr.dataType = UA_NODEID_NUMERIC(ns[0], 7);
-attr.displayName = UA_LOCALIZEDTEXT("", "MaxNodesPerNodeManagement");
+attr.displayName = UA_LOCALIZEDTEXT("", "MaxReturnEventValues");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 11713),
-UA_NODEID_NUMERIC(ns[0], 11704),
+UA_NODEID_NUMERIC(ns[0], 11274),
+UA_NODEID_NUMERIC(ns[0], 11192),
 UA_NODEID_NUMERIC(ns[0], 46),
-UA_QUALIFIEDNAME(ns[0], "MaxNodesPerNodeManagement"),
+UA_QUALIFIEDNAME(ns[0], "MaxReturnEventValues"),
 UA_NODEID_NUMERIC(ns[0], 68),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_191_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_184_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 11713)
+UA_NODEID_NUMERIC(ns[0], 11274)
 );
 }
 
-/* MaxNodesPerTranslateBrowsePathsToNodeIds - ns=0;i=11712 */
+/* AccessHistoryDataCapability - ns=0;i=11193 */
 
-static UA_StatusCode function_namespace0_generated_192_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_185_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -50316,27 +51133,27 @@ attr.userAccessLevel = 1;
 attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 7);
-attr.displayName = UA_LOCALIZEDTEXT("", "MaxNodesPerTranslateBrowsePathsToNodeIds");
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 1);
+attr.displayName = UA_LOCALIZEDTEXT("", "AccessHistoryDataCapability");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 11712),
-UA_NODEID_NUMERIC(ns[0], 11704),
+UA_NODEID_NUMERIC(ns[0], 11193),
+UA_NODEID_NUMERIC(ns[0], 11192),
 UA_NODEID_NUMERIC(ns[0], 46),
-UA_QUALIFIEDNAME(ns[0], "MaxNodesPerTranslateBrowsePathsToNodeIds"),
+UA_QUALIFIEDNAME(ns[0], "AccessHistoryDataCapability"),
 UA_NODEID_NUMERIC(ns[0], 68),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_192_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_185_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 11712)
+UA_NODEID_NUMERIC(ns[0], 11193)
 );
 }
 
-/* MaxNodesPerMethodCall - ns=0;i=11709 */
+/* DeleteEventCapability - ns=0;i=11502 */
 
-static UA_StatusCode function_namespace0_generated_193_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_186_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -50344,58 +51161,111 @@ attr.userAccessLevel = 1;
 attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 7);
-attr.displayName = UA_LOCALIZEDTEXT("", "MaxNodesPerMethodCall");
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 1);
+attr.displayName = UA_LOCALIZEDTEXT("", "DeleteEventCapability");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 11709),
-UA_NODEID_NUMERIC(ns[0], 11704),
+UA_NODEID_NUMERIC(ns[0], 11502),
+UA_NODEID_NUMERIC(ns[0], 11192),
 UA_NODEID_NUMERIC(ns[0], 46),
-UA_QUALIFIEDNAME(ns[0], "MaxNodesPerMethodCall"),
+UA_QUALIFIEDNAME(ns[0], "DeleteEventCapability"),
 UA_NODEID_NUMERIC(ns[0], 68),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_193_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_186_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 11709)
+UA_NODEID_NUMERIC(ns[0], 11502)
 );
 }
 
-/* SoftwareCertificates - ns=0;i=3704 */
+/* InsertEventCapability - ns=0;i=11281 */
 
-static UA_StatusCode function_namespace0_generated_194_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_187_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
 attr.userAccessLevel = 1;
 attr.accessLevel = 1;
-attr.valueRank = 1;
-attr.arrayDimensionsSize = 1;
-UA_UInt32 arrayDimensions[1];
-arrayDimensions[0] = 0;
-attr.arrayDimensions = &arrayDimensions[0];
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 344);
-attr.displayName = UA_LOCALIZEDTEXT("", "SoftwareCertificates");
+/* Value rank inherited */
+attr.valueRank = -1;
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 1);
+attr.displayName = UA_LOCALIZEDTEXT("", "InsertEventCapability");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 3704),
-UA_NODEID_NUMERIC(ns[0], 2268),
+UA_NODEID_NUMERIC(ns[0], 11281),
+UA_NODEID_NUMERIC(ns[0], 11192),
 UA_NODEID_NUMERIC(ns[0], 46),
-UA_QUALIFIEDNAME(ns[0], "SoftwareCertificates"),
+UA_QUALIFIEDNAME(ns[0], "InsertEventCapability"),
 UA_NODEID_NUMERIC(ns[0], 68),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_194_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_187_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 3704)
+UA_NODEID_NUMERIC(ns[0], 11281)
+);
+}
+
+/* DeleteAtTimeCapability - ns=0;i=11200 */
+
+static UA_StatusCode function_namespace0_generated_188_begin(UA_Server *server, UA_UInt16* ns) {
+UA_StatusCode retVal = UA_STATUSCODE_GOOD;
+UA_VariableAttributes attr = UA_VariableAttributes_default;
+attr.minimumSamplingInterval = 0.000000;
+attr.userAccessLevel = 1;
+attr.accessLevel = 1;
+/* Value rank inherited */
+attr.valueRank = -1;
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 1);
+attr.displayName = UA_LOCALIZEDTEXT("", "DeleteAtTimeCapability");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
+UA_NODEID_NUMERIC(ns[0], 11200),
+UA_NODEID_NUMERIC(ns[0], 11192),
+UA_NODEID_NUMERIC(ns[0], 46),
+UA_QUALIFIEDNAME(ns[0], "DeleteAtTimeCapability"),
+UA_NODEID_NUMERIC(ns[0], 68),
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
+return retVal;
+}
+
+static UA_StatusCode function_namespace0_generated_188_finish(UA_Server *server, UA_UInt16* ns) {
+return UA_Server_addNode_finish(server, 
+UA_NODEID_NUMERIC(ns[0], 11200)
+);
+}
+
+/* UpdateEventCapability - ns=0;i=11283 */
+
+static UA_StatusCode function_namespace0_generated_189_begin(UA_Server *server, UA_UInt16* ns) {
+UA_StatusCode retVal = UA_STATUSCODE_GOOD;
+UA_VariableAttributes attr = UA_VariableAttributes_default;
+attr.minimumSamplingInterval = 0.000000;
+attr.userAccessLevel = 1;
+attr.accessLevel = 1;
+/* Value rank inherited */
+attr.valueRank = -1;
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 1);
+attr.displayName = UA_LOCALIZEDTEXT("", "UpdateEventCapability");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
+UA_NODEID_NUMERIC(ns[0], 11283),
+UA_NODEID_NUMERIC(ns[0], 11192),
+UA_NODEID_NUMERIC(ns[0], 46),
+UA_QUALIFIEDNAME(ns[0], "UpdateEventCapability"),
+UA_NODEID_NUMERIC(ns[0], 68),
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
+return retVal;
+}
+
+static UA_StatusCode function_namespace0_generated_189_finish(UA_Server *server, UA_UInt16* ns) {
+return UA_Server_addNode_finish(server, 
+UA_NODEID_NUMERIC(ns[0], 11283)
 );
 }
 
 /* MinSupportedSampleRate - ns=0;i=2272 */
 
-static UA_StatusCode function_namespace0_generated_195_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_190_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -50415,44 +51285,215 @@ UA_NODEID_NUMERIC(ns[0], 68),
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_195_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_190_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
 UA_NODEID_NUMERIC(ns[0], 2272)
 );
 }
 
-/* LocaleIdArray - ns=0;i=2271 */
+/* VendorServerInfo - ns=0;i=2011 */
 
-static UA_StatusCode function_namespace0_generated_196_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_191_begin(UA_Server *server, UA_UInt16* ns) {
+UA_StatusCode retVal = UA_STATUSCODE_GOOD;
+UA_ObjectAttributes attr = UA_ObjectAttributes_default;
+attr.displayName = UA_LOCALIZEDTEXT("", "VendorServerInfo");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_OBJECT,
+UA_NODEID_NUMERIC(ns[0], 2011),
+UA_NODEID_NUMERIC(ns[0], 2004),
+UA_NODEID_NUMERIC(ns[0], 47),
+UA_QUALIFIEDNAME(ns[0], "VendorServerInfo"),
+UA_NODEID_NUMERIC(ns[0], 2033),
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES],NULL, NULL);
+return retVal;
+}
+
+static UA_StatusCode function_namespace0_generated_191_finish(UA_Server *server, UA_UInt16* ns) {
+return UA_Server_addNode_finish(server, 
+UA_NODEID_NUMERIC(ns[0], 2011)
+);
+}
+
+/* ModellingRuleType - ns=0;i=77 */
+
+static UA_StatusCode function_namespace0_generated_192_begin(UA_Server *server, UA_UInt16* ns) {
+UA_StatusCode retVal = UA_STATUSCODE_GOOD;
+UA_ObjectTypeAttributes attr = UA_ObjectTypeAttributes_default;
+attr.displayName = UA_LOCALIZEDTEXT("", "ModellingRuleType");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_OBJECTTYPE,
+UA_NODEID_NUMERIC(ns[0], 77),
+UA_NODEID_NUMERIC(ns[0], 58),
+UA_NODEID_NUMERIC(ns[0], 45),
+UA_QUALIFIEDNAME(ns[0], "ModellingRuleType"),
+ UA_NODEID_NULL,
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_OBJECTTYPEATTRIBUTES],NULL, NULL);
+return retVal;
+}
+
+static UA_StatusCode function_namespace0_generated_192_finish(UA_Server *server, UA_UInt16* ns) {
+return UA_Server_addNode_finish(server, 
+UA_NODEID_NUMERIC(ns[0], 77)
+);
+}
+
+/* NamingRule - ns=0;i=111 */
+
+static UA_StatusCode function_namespace0_generated_193_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
 attr.userAccessLevel = 1;
 attr.accessLevel = 1;
-attr.valueRank = 1;
-attr.arrayDimensionsSize = 1;
-UA_UInt32 arrayDimensions[1];
-arrayDimensions[0] = 0;
-attr.arrayDimensions = &arrayDimensions[0];
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 295);
-attr.displayName = UA_LOCALIZEDTEXT("", "LocaleIdArray");
+/* Value rank inherited */
+attr.valueRank = -1;
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 120);
+UA_Int32 *variablenode_ns_0_i_111_variant_DataContents =  UA_Int32_new();
+if (!variablenode_ns_0_i_111_variant_DataContents) return UA_STATUSCODE_BADOUTOFMEMORY;
+UA_Int32_init(variablenode_ns_0_i_111_variant_DataContents);
+*variablenode_ns_0_i_111_variant_DataContents = (UA_Int32) 1;
+UA_Variant_setScalar(&attr.value, variablenode_ns_0_i_111_variant_DataContents, &UA_TYPES[UA_TYPES_INT32]);
+attr.displayName = UA_LOCALIZEDTEXT("", "NamingRule");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 2271),
-UA_NODEID_NUMERIC(ns[0], 2268),
+UA_NODEID_NUMERIC(ns[0], 111),
+UA_NODEID_NUMERIC(ns[0], 77),
 UA_NODEID_NUMERIC(ns[0], 46),
-UA_QUALIFIEDNAME(ns[0], "LocaleIdArray"),
+UA_QUALIFIEDNAME(ns[0], "NamingRule"),
 UA_NODEID_NUMERIC(ns[0], 68),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
+UA_Int32_delete(variablenode_ns_0_i_111_variant_DataContents);
+return retVal;
+}
+
+static UA_StatusCode function_namespace0_generated_193_finish(UA_Server *server, UA_UInt16* ns) {
+return UA_Server_addNode_finish(server, 
+UA_NODEID_NUMERIC(ns[0], 111)
+);
+}
+
+/* Optional - ns=0;i=80 */
+
+static UA_StatusCode function_namespace0_generated_194_begin(UA_Server *server, UA_UInt16* ns) {
+UA_StatusCode retVal = UA_STATUSCODE_GOOD;
+UA_ObjectAttributes attr = UA_ObjectAttributes_default;
+attr.displayName = UA_LOCALIZEDTEXT("", "Optional");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_OBJECT,
+UA_NODEID_NUMERIC(ns[0], 80),
+UA_NODEID_NUMERIC(ns[0], 0),
+UA_NODEID_NUMERIC(ns[0], 0),
+UA_QUALIFIEDNAME(ns[0], "Optional"),
+UA_NODEID_NUMERIC(ns[0], 77),
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES],NULL, NULL);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 80), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 11571), false);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 80), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 11574), false);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 80), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 2366), false);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 80), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 2371), false);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 80), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 2370), false);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 80), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 11569), false);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 80), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 3190), false);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 80), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 11565), false);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 80), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 11567), false);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 80), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 11570), false);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 80), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 11573), false);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 80), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 11551), false);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 80), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 11572), false);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 80), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 2367), false);
+return retVal;
+}
+
+static UA_StatusCode function_namespace0_generated_194_finish(UA_Server *server, UA_UInt16* ns) {
+return UA_Server_addNode_finish(server, 
+UA_NODEID_NUMERIC(ns[0], 80)
+);
+}
+
+/* NamingRule - ns=0;i=113 */
+
+static UA_StatusCode function_namespace0_generated_195_begin(UA_Server *server, UA_UInt16* ns) {
+UA_StatusCode retVal = UA_STATUSCODE_GOOD;
+UA_VariableAttributes attr = UA_VariableAttributes_default;
+attr.minimumSamplingInterval = 0.000000;
+attr.userAccessLevel = 1;
+attr.accessLevel = 1;
+/* Value rank inherited */
+attr.valueRank = -1;
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 120);
+UA_Int32 *variablenode_ns_0_i_113_variant_DataContents =  UA_Int32_new();
+if (!variablenode_ns_0_i_113_variant_DataContents) return UA_STATUSCODE_BADOUTOFMEMORY;
+UA_Int32_init(variablenode_ns_0_i_113_variant_DataContents);
+*variablenode_ns_0_i_113_variant_DataContents = (UA_Int32) 2;
+UA_Variant_setScalar(&attr.value, variablenode_ns_0_i_113_variant_DataContents, &UA_TYPES[UA_TYPES_INT32]);
+attr.displayName = UA_LOCALIZEDTEXT("", "NamingRule");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
+UA_NODEID_NUMERIC(ns[0], 113),
+UA_NODEID_NUMERIC(ns[0], 80),
+UA_NODEID_NUMERIC(ns[0], 46),
+UA_QUALIFIEDNAME(ns[0], "NamingRule"),
+UA_NODEID_NUMERIC(ns[0], 68),
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
+UA_Int32_delete(variablenode_ns_0_i_113_variant_DataContents);
+return retVal;
+}
+
+static UA_StatusCode function_namespace0_generated_195_finish(UA_Server *server, UA_UInt16* ns) {
+return UA_Server_addNode_finish(server, 
+UA_NODEID_NUMERIC(ns[0], 113)
+);
+}
+
+/* Mandatory - ns=0;i=78 */
+
+static UA_StatusCode function_namespace0_generated_196_begin(UA_Server *server, UA_UInt16* ns) {
+UA_StatusCode retVal = UA_STATUSCODE_GOOD;
+UA_ObjectAttributes attr = UA_ObjectAttributes_default;
+attr.displayName = UA_LOCALIZEDTEXT("", "Mandatory");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_OBJECT,
+UA_NODEID_NUMERIC(ns[0], 78),
+UA_NODEID_NUMERIC(ns[0], 0),
+UA_NODEID_NUMERIC(ns[0], 0),
+UA_QUALIFIEDNAME(ns[0], "Mandatory"),
+UA_NODEID_NUMERIC(ns[0], 77),
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES],NULL, NULL);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 78), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 2152), false);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 78), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 2011), false);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 78), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 2151), false);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 78), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 2051), false);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 78), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 2157), false);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 78), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 2047), false);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 78), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 2045), false);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 78), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 111), false);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 78), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 2043), false);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 78), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 2035), false);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 78), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 2160), false);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 78), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 11241), false);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 78), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 2159), false);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 78), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 2162), false);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 78), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 2154), false);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 78), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 11461), false);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 78), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 2155), false);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 78), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 12169), false);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 78), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 2163), false);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 78), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 2369), false);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 78), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 7611), false);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 78), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 2046), false);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 78), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 2374), false);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 78), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 2377), false);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 78), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 2044), false);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 78), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 2050), false);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 78), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 2375), false);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 78), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 2153), false);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 78), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 2161), false);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 78), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 2156), false);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 78), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 2042), false);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 78), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 12078), false);
 return retVal;
 }
 
 static UA_StatusCode function_namespace0_generated_196_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2271)
+UA_NODEID_NUMERIC(ns[0], 78)
 );
 }
 
-/* MaxQueryContinuationPoints - ns=0;i=2736 */
+/* NamingRule - ns=0;i=112 */
 
 static UA_StatusCode function_namespace0_generated_197_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
@@ -50462,55 +51503,306 @@ attr.userAccessLevel = 1;
 attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 5);
-attr.displayName = UA_LOCALIZEDTEXT("", "MaxQueryContinuationPoints");
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 120);
+UA_Int32 *variablenode_ns_0_i_112_variant_DataContents =  UA_Int32_new();
+if (!variablenode_ns_0_i_112_variant_DataContents) return UA_STATUSCODE_BADOUTOFMEMORY;
+UA_Int32_init(variablenode_ns_0_i_112_variant_DataContents);
+*variablenode_ns_0_i_112_variant_DataContents = (UA_Int32) 1;
+UA_Variant_setScalar(&attr.value, variablenode_ns_0_i_112_variant_DataContents, &UA_TYPES[UA_TYPES_INT32]);
+attr.displayName = UA_LOCALIZEDTEXT("", "NamingRule");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 2736),
-UA_NODEID_NUMERIC(ns[0], 2268),
+UA_NODEID_NUMERIC(ns[0], 112),
+UA_NODEID_NUMERIC(ns[0], 78),
 UA_NODEID_NUMERIC(ns[0], 46),
-UA_QUALIFIEDNAME(ns[0], "MaxQueryContinuationPoints"),
+UA_QUALIFIEDNAME(ns[0], "NamingRule"),
 UA_NODEID_NUMERIC(ns[0], 68),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
+UA_Int32_delete(variablenode_ns_0_i_112_variant_DataContents);
 return retVal;
 }
 
 static UA_StatusCode function_namespace0_generated_197_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2736)
+UA_NODEID_NUMERIC(ns[0], 112)
 );
 }
 
-/* MaxHistoryContinuationPoints - ns=0;i=2737 */
+/* DataTypeEncodingType - ns=0;i=76 */
 
 static UA_StatusCode function_namespace0_generated_198_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
+UA_ObjectTypeAttributes attr = UA_ObjectTypeAttributes_default;
+attr.displayName = UA_LOCALIZEDTEXT("", "DataTypeEncodingType");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_OBJECTTYPE,
+UA_NODEID_NUMERIC(ns[0], 76),
+UA_NODEID_NUMERIC(ns[0], 58),
+UA_NODEID_NUMERIC(ns[0], 45),
+UA_QUALIFIEDNAME(ns[0], "DataTypeEncodingType"),
+ UA_NODEID_NULL,
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_OBJECTTYPEATTRIBUTES],NULL, NULL);
+return retVal;
+}
+
+static UA_StatusCode function_namespace0_generated_198_finish(UA_Server *server, UA_UInt16* ns) {
+return UA_Server_addNode_finish(server, 
+UA_NODEID_NUMERIC(ns[0], 76)
+);
+}
+
+/* Default JSON - ns=0;i=15375 */
+
+static UA_StatusCode function_namespace0_generated_199_begin(UA_Server *server, UA_UInt16* ns) {
+UA_StatusCode retVal = UA_STATUSCODE_GOOD;
+UA_ObjectAttributes attr = UA_ObjectAttributes_default;
+attr.displayName = UA_LOCALIZEDTEXT("", "Default JSON");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_OBJECT,
+UA_NODEID_NUMERIC(ns[0], 15375),
+UA_NODEID_NUMERIC(ns[0], 0),
+UA_NODEID_NUMERIC(ns[0], 0),
+UA_QUALIFIEDNAME(ns[0], "Default JSON"),
+UA_NODEID_NUMERIC(ns[0], 76),
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES],NULL, NULL);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 15375), UA_NODEID_NUMERIC(ns[0], 38), UA_EXPANDEDNODEID_NUMERIC(ns[0], 884), false);
+return retVal;
+}
+
+static UA_StatusCode function_namespace0_generated_199_finish(UA_Server *server, UA_UInt16* ns) {
+return UA_Server_addNode_finish(server, 
+UA_NODEID_NUMERIC(ns[0], 15375)
+);
+}
+
+/* Default Binary - ns=0;i=8251 */
+
+static UA_StatusCode function_namespace0_generated_200_begin(UA_Server *server, UA_UInt16* ns) {
+UA_StatusCode retVal = UA_STATUSCODE_GOOD;
+UA_ObjectAttributes attr = UA_ObjectAttributes_default;
+attr.displayName = UA_LOCALIZEDTEXT("", "Default Binary");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_OBJECT,
+UA_NODEID_NUMERIC(ns[0], 8251),
+UA_NODEID_NUMERIC(ns[0], 0),
+UA_NODEID_NUMERIC(ns[0], 0),
+UA_QUALIFIEDNAME(ns[0], "Default Binary"),
+UA_NODEID_NUMERIC(ns[0], 76),
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES],NULL, NULL);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 8251), UA_NODEID_NUMERIC(ns[0], 38), UA_EXPANDEDNODEID_NUMERIC(ns[0], 7594), false);
+return retVal;
+}
+
+static UA_StatusCode function_namespace0_generated_200_finish(UA_Server *server, UA_UInt16* ns) {
+return UA_Server_addNode_finish(server, 
+UA_NODEID_NUMERIC(ns[0], 8251)
+);
+}
+
+/* Default Binary - ns=0;i=298 */
+
+static UA_StatusCode function_namespace0_generated_201_begin(UA_Server *server, UA_UInt16* ns) {
+UA_StatusCode retVal = UA_STATUSCODE_GOOD;
+UA_ObjectAttributes attr = UA_ObjectAttributes_default;
+attr.displayName = UA_LOCALIZEDTEXT("", "Default Binary");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_OBJECT,
+UA_NODEID_NUMERIC(ns[0], 298),
+UA_NODEID_NUMERIC(ns[0], 0),
+UA_NODEID_NUMERIC(ns[0], 0),
+UA_QUALIFIEDNAME(ns[0], "Default Binary"),
+UA_NODEID_NUMERIC(ns[0], 76),
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES],NULL, NULL);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 298), UA_NODEID_NUMERIC(ns[0], 38), UA_EXPANDEDNODEID_NUMERIC(ns[0], 296), false);
+return retVal;
+}
+
+static UA_StatusCode function_namespace0_generated_201_finish(UA_Server *server, UA_UInt16* ns) {
+return UA_Server_addNode_finish(server, 
+UA_NODEID_NUMERIC(ns[0], 298)
+);
+}
+
+/* Default JSON - ns=0;i=15376 */
+
+static UA_StatusCode function_namespace0_generated_202_begin(UA_Server *server, UA_UInt16* ns) {
+UA_StatusCode retVal = UA_STATUSCODE_GOOD;
+UA_ObjectAttributes attr = UA_ObjectAttributes_default;
+attr.displayName = UA_LOCALIZEDTEXT("", "Default JSON");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_OBJECT,
+UA_NODEID_NUMERIC(ns[0], 15376),
+UA_NODEID_NUMERIC(ns[0], 0),
+UA_NODEID_NUMERIC(ns[0], 0),
+UA_QUALIFIEDNAME(ns[0], "Default JSON"),
+UA_NODEID_NUMERIC(ns[0], 76),
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES],NULL, NULL);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 15376), UA_NODEID_NUMERIC(ns[0], 38), UA_EXPANDEDNODEID_NUMERIC(ns[0], 887), false);
+return retVal;
+}
+
+static UA_StatusCode function_namespace0_generated_202_finish(UA_Server *server, UA_UInt16* ns) {
+return UA_Server_addNode_finish(server, 
+UA_NODEID_NUMERIC(ns[0], 15376)
+);
+}
+
+/* DataTypeSystemType - ns=0;i=75 */
+
+static UA_StatusCode function_namespace0_generated_203_begin(UA_Server *server, UA_UInt16* ns) {
+UA_StatusCode retVal = UA_STATUSCODE_GOOD;
+UA_ObjectTypeAttributes attr = UA_ObjectTypeAttributes_default;
+attr.displayName = UA_LOCALIZEDTEXT("", "DataTypeSystemType");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_OBJECTTYPE,
+UA_NODEID_NUMERIC(ns[0], 75),
+UA_NODEID_NUMERIC(ns[0], 58),
+UA_NODEID_NUMERIC(ns[0], 45),
+UA_QUALIFIEDNAME(ns[0], "DataTypeSystemType"),
+ UA_NODEID_NULL,
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_OBJECTTYPEATTRIBUTES],NULL, NULL);
+return retVal;
+}
+
+static UA_StatusCode function_namespace0_generated_203_finish(UA_Server *server, UA_UInt16* ns) {
+return UA_Server_addNode_finish(server, 
+UA_NODEID_NUMERIC(ns[0], 75)
+);
+}
+
+/* XML Schema - ns=0;i=92 */
+
+static UA_StatusCode function_namespace0_generated_204_begin(UA_Server *server, UA_UInt16* ns) {
+UA_StatusCode retVal = UA_STATUSCODE_GOOD;
+UA_ObjectAttributes attr = UA_ObjectAttributes_default;
+attr.displayName = UA_LOCALIZEDTEXT("", "XML Schema");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_OBJECT,
+UA_NODEID_NUMERIC(ns[0], 92),
+UA_NODEID_NUMERIC(ns[0], 90),
+UA_NODEID_NUMERIC(ns[0], 35),
+UA_QUALIFIEDNAME(ns[0], "XML Schema"),
+UA_NODEID_NUMERIC(ns[0], 75),
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES],NULL, NULL);
+return retVal;
+}
+
+static UA_StatusCode function_namespace0_generated_204_finish(UA_Server *server, UA_UInt16* ns) {
+return UA_Server_addNode_finish(server, 
+UA_NODEID_NUMERIC(ns[0], 92)
+);
+}
+
+/* OPC Binary - ns=0;i=93 */
+
+static UA_StatusCode function_namespace0_generated_205_begin(UA_Server *server, UA_UInt16* ns) {
+UA_StatusCode retVal = UA_STATUSCODE_GOOD;
+UA_ObjectAttributes attr = UA_ObjectAttributes_default;
+attr.displayName = UA_LOCALIZEDTEXT("", "OPC Binary");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_OBJECT,
+UA_NODEID_NUMERIC(ns[0], 93),
+UA_NODEID_NUMERIC(ns[0], 90),
+UA_NODEID_NUMERIC(ns[0], 35),
+UA_QUALIFIEDNAME(ns[0], "OPC Binary"),
+UA_NODEID_NUMERIC(ns[0], 75),
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES],NULL, NULL);
+return retVal;
+}
+
+static UA_StatusCode function_namespace0_generated_205_finish(UA_Server *server, UA_UInt16* ns) {
+return UA_Server_addNode_finish(server, 
+UA_NODEID_NUMERIC(ns[0], 93)
+);
+}
+
+/* DataTypeDictionaryType - ns=0;i=72 */
+
+static UA_StatusCode function_namespace0_generated_206_begin(UA_Server *server, UA_UInt16* ns) {
+UA_StatusCode retVal = UA_STATUSCODE_GOOD;
+UA_VariableTypeAttributes attr = UA_VariableTypeAttributes_default;
+/* Value rank inherited */
+attr.valueRank = -1;
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 15);
+attr.displayName = UA_LOCALIZEDTEXT("", "DataTypeDictionaryType");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLETYPE,
+UA_NODEID_NUMERIC(ns[0], 72),
+UA_NODEID_NUMERIC(ns[0], 63),
+UA_NODEID_NUMERIC(ns[0], 45),
+UA_QUALIFIEDNAME(ns[0], "DataTypeDictionaryType"),
+UA_NODEID_NUMERIC(ns[0], 0),
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLETYPEATTRIBUTES],NULL, NULL);
+return retVal;
+}
+
+static UA_StatusCode function_namespace0_generated_206_finish(UA_Server *server, UA_UInt16* ns) {
+return UA_Server_addNode_finish(server, 
+UA_NODEID_NUMERIC(ns[0], 72)
+);
+}
+
+/* Opc.Ua - ns=0;i=7617 */
+
+static UA_StatusCode function_namespace0_generated_207_begin(UA_Server *server, UA_UInt16* ns) {
+UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
 attr.userAccessLevel = 1;
 attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 5);
-attr.displayName = UA_LOCALIZEDTEXT("", "MaxHistoryContinuationPoints");
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 15);
+UA_ByteString *variablenode_ns_0_i_7617_variant_DataContents =  UA_ByteString_new();
+if (!variablenode_ns_0_i_7617_variant_DataContents) return UA_STATUSCODE_BADOUTOFMEMORY;
+UA_ByteString_init(variablenode_ns_0_i_7617_variant_DataContents);
+*variablenode_ns_0_i_7617_variant_DataContents = UA_BYTESTRING_NULL;
+UA_Variant_setScalar(&attr.value, variablenode_ns_0_i_7617_variant_DataContents, &UA_TYPES[UA_TYPES_BYTESTRING]);
+attr.displayName = UA_LOCALIZEDTEXT("", "Opc.Ua");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 2737),
-UA_NODEID_NUMERIC(ns[0], 2268),
+UA_NODEID_NUMERIC(ns[0], 7617),
+UA_NODEID_NUMERIC(ns[0], 93),
+UA_NODEID_NUMERIC(ns[0], 47),
+UA_QUALIFIEDNAME(ns[0], "Opc.Ua"),
+UA_NODEID_NUMERIC(ns[0], 72),
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
+variablenode_ns_0_i_7617_variant_DataContents->data = NULL;
+variablenode_ns_0_i_7617_variant_DataContents->length = 0;
+UA_ByteString_delete(variablenode_ns_0_i_7617_variant_DataContents);
+return retVal;
+}
+
+static UA_StatusCode function_namespace0_generated_207_finish(UA_Server *server, UA_UInt16* ns) {
+return UA_Server_addNode_finish(server, 
+UA_NODEID_NUMERIC(ns[0], 7617)
+);
+}
+
+/* NamespaceUri - ns=0;i=107 */
+
+static UA_StatusCode function_namespace0_generated_208_begin(UA_Server *server, UA_UInt16* ns) {
+UA_StatusCode retVal = UA_STATUSCODE_GOOD;
+UA_VariableAttributes attr = UA_VariableAttributes_default;
+attr.minimumSamplingInterval = 0.000000;
+attr.userAccessLevel = 1;
+attr.accessLevel = 1;
+/* Value rank inherited */
+attr.valueRank = -1;
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 12);
+attr.displayName = UA_LOCALIZEDTEXT("", "NamespaceUri");
+#ifdef UA_ENABLE_NODESET_COMPILER_DESCRIPTIONS
+attr.description = UA_LOCALIZEDTEXT("", "A URI that uniquely identifies the dictionary.");
+#endif
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
+UA_NODEID_NUMERIC(ns[0], 107),
+UA_NODEID_NUMERIC(ns[0], 72),
 UA_NODEID_NUMERIC(ns[0], 46),
-UA_QUALIFIEDNAME(ns[0], "MaxHistoryContinuationPoints"),
+UA_QUALIFIEDNAME(ns[0], "NamespaceUri"),
 UA_NODEID_NUMERIC(ns[0], 68),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 107), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 80), true);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_198_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_208_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2737)
+UA_NODEID_NUMERIC(ns[0], 107)
 );
 }
 
-/* MaxBrowseContinuationPoints - ns=0;i=2735 */
+/* DataTypeVersion - ns=0;i=106 */
 
-static UA_StatusCode function_namespace0_generated_199_begin(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_209_begin(UA_Server *server, UA_UInt16* ns) {
 UA_StatusCode retVal = UA_STATUSCODE_GOOD;
 UA_VariableAttributes attr = UA_VariableAttributes_default;
 attr.minimumSamplingInterval = 0.000000;
@@ -50518,21 +51810,219 @@ attr.userAccessLevel = 1;
 attr.accessLevel = 1;
 /* Value rank inherited */
 attr.valueRank = -1;
-attr.dataType = UA_NODEID_NUMERIC(ns[0], 5);
-attr.displayName = UA_LOCALIZEDTEXT("", "MaxBrowseContinuationPoints");
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 12);
+attr.displayName = UA_LOCALIZEDTEXT("", "DataTypeVersion");
 retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
-UA_NODEID_NUMERIC(ns[0], 2735),
-UA_NODEID_NUMERIC(ns[0], 2268),
+UA_NODEID_NUMERIC(ns[0], 106),
+UA_NODEID_NUMERIC(ns[0], 72),
 UA_NODEID_NUMERIC(ns[0], 46),
-UA_QUALIFIEDNAME(ns[0], "MaxBrowseContinuationPoints"),
+UA_QUALIFIEDNAME(ns[0], "DataTypeVersion"),
 UA_NODEID_NUMERIC(ns[0], 68),
 (const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 106), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 80), true);
 return retVal;
 }
 
-static UA_StatusCode function_namespace0_generated_199_finish(UA_Server *server, UA_UInt16* ns) {
+static UA_StatusCode function_namespace0_generated_209_finish(UA_Server *server, UA_UInt16* ns) {
 return UA_Server_addNode_finish(server, 
-UA_NODEID_NUMERIC(ns[0], 2735)
+UA_NODEID_NUMERIC(ns[0], 106)
+);
+}
+
+/* DataTypeDescriptionType - ns=0;i=69 */
+
+static UA_StatusCode function_namespace0_generated_210_begin(UA_Server *server, UA_UInt16* ns) {
+UA_StatusCode retVal = UA_STATUSCODE_GOOD;
+UA_VariableTypeAttributes attr = UA_VariableTypeAttributes_default;
+/* Value rank inherited */
+attr.valueRank = -1;
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 12);
+attr.displayName = UA_LOCALIZEDTEXT("", "DataTypeDescriptionType");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLETYPE,
+UA_NODEID_NUMERIC(ns[0], 69),
+UA_NODEID_NUMERIC(ns[0], 63),
+UA_NODEID_NUMERIC(ns[0], 45),
+UA_QUALIFIEDNAME(ns[0], "DataTypeDescriptionType"),
+UA_NODEID_NUMERIC(ns[0], 0),
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLETYPEATTRIBUTES],NULL, NULL);
+return retVal;
+}
+
+static UA_StatusCode function_namespace0_generated_210_finish(UA_Server *server, UA_UInt16* ns) {
+return UA_Server_addNode_finish(server, 
+UA_NODEID_NUMERIC(ns[0], 69)
+);
+}
+
+/* DictionaryFragment - ns=0;i=105 */
+
+static UA_StatusCode function_namespace0_generated_211_begin(UA_Server *server, UA_UInt16* ns) {
+UA_StatusCode retVal = UA_STATUSCODE_GOOD;
+UA_VariableAttributes attr = UA_VariableAttributes_default;
+attr.minimumSamplingInterval = 0.000000;
+attr.userAccessLevel = 1;
+attr.accessLevel = 1;
+/* Value rank inherited */
+attr.valueRank = -1;
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 15);
+attr.displayName = UA_LOCALIZEDTEXT("", "DictionaryFragment");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
+UA_NODEID_NUMERIC(ns[0], 105),
+UA_NODEID_NUMERIC(ns[0], 69),
+UA_NODEID_NUMERIC(ns[0], 46),
+UA_QUALIFIEDNAME(ns[0], "DictionaryFragment"),
+UA_NODEID_NUMERIC(ns[0], 68),
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 105), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 80), true);
+return retVal;
+}
+
+static UA_StatusCode function_namespace0_generated_211_finish(UA_Server *server, UA_UInt16* ns) {
+return UA_Server_addNode_finish(server, 
+UA_NODEID_NUMERIC(ns[0], 105)
+);
+}
+
+/* EnumValueType - ns=0;i=7656 */
+
+static UA_StatusCode function_namespace0_generated_212_begin(UA_Server *server, UA_UInt16* ns) {
+UA_StatusCode retVal = UA_STATUSCODE_GOOD;
+UA_VariableAttributes attr = UA_VariableAttributes_default;
+attr.minimumSamplingInterval = 0.000000;
+attr.userAccessLevel = 1;
+attr.accessLevel = 1;
+/* Value rank inherited */
+attr.valueRank = -1;
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 12);
+UA_String *variablenode_ns_0_i_7656_variant_DataContents =  UA_String_new();
+if (!variablenode_ns_0_i_7656_variant_DataContents) return UA_STATUSCODE_BADOUTOFMEMORY;
+UA_String_init(variablenode_ns_0_i_7656_variant_DataContents);
+*variablenode_ns_0_i_7656_variant_DataContents = UA_STRING_ALLOC("EnumValueType");
+UA_Variant_setScalar(&attr.value, variablenode_ns_0_i_7656_variant_DataContents, &UA_TYPES[UA_TYPES_STRING]);
+attr.displayName = UA_LOCALIZEDTEXT("", "EnumValueType");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
+UA_NODEID_NUMERIC(ns[0], 7656),
+UA_NODEID_NUMERIC(ns[0], 7617),
+UA_NODEID_NUMERIC(ns[0], 47),
+UA_QUALIFIEDNAME(ns[0], "EnumValueType"),
+UA_NODEID_NUMERIC(ns[0], 69),
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
+UA_String_delete(variablenode_ns_0_i_7656_variant_DataContents);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 7656), UA_NODEID_NUMERIC(ns[0], 39), UA_EXPANDEDNODEID_NUMERIC(ns[0], 8251), false);
+return retVal;
+}
+
+static UA_StatusCode function_namespace0_generated_212_finish(UA_Server *server, UA_UInt16* ns) {
+return UA_Server_addNode_finish(server, 
+UA_NODEID_NUMERIC(ns[0], 7656)
+);
+}
+
+/* DataTypeVersion - ns=0;i=104 */
+
+static UA_StatusCode function_namespace0_generated_213_begin(UA_Server *server, UA_UInt16* ns) {
+UA_StatusCode retVal = UA_STATUSCODE_GOOD;
+UA_VariableAttributes attr = UA_VariableAttributes_default;
+attr.minimumSamplingInterval = 0.000000;
+attr.userAccessLevel = 1;
+attr.accessLevel = 1;
+/* Value rank inherited */
+attr.valueRank = -1;
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 12);
+attr.displayName = UA_LOCALIZEDTEXT("", "DataTypeVersion");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
+UA_NODEID_NUMERIC(ns[0], 104),
+UA_NODEID_NUMERIC(ns[0], 69),
+UA_NODEID_NUMERIC(ns[0], 46),
+UA_QUALIFIEDNAME(ns[0], "DataTypeVersion"),
+UA_NODEID_NUMERIC(ns[0], 68),
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 104), UA_NODEID_NUMERIC(ns[0], 37), UA_EXPANDEDNODEID_NUMERIC(ns[0], 80), true);
+return retVal;
+}
+
+static UA_StatusCode function_namespace0_generated_213_finish(UA_Server *server, UA_UInt16* ns) {
+return UA_Server_addNode_finish(server, 
+UA_NODEID_NUMERIC(ns[0], 104)
+);
+}
+
+/* Argument - ns=0;i=7650 */
+
+static UA_StatusCode function_namespace0_generated_214_begin(UA_Server *server, UA_UInt16* ns) {
+UA_StatusCode retVal = UA_STATUSCODE_GOOD;
+UA_VariableAttributes attr = UA_VariableAttributes_default;
+attr.minimumSamplingInterval = 0.000000;
+attr.userAccessLevel = 1;
+attr.accessLevel = 1;
+/* Value rank inherited */
+attr.valueRank = -1;
+attr.dataType = UA_NODEID_NUMERIC(ns[0], 12);
+UA_String *variablenode_ns_0_i_7650_variant_DataContents =  UA_String_new();
+if (!variablenode_ns_0_i_7650_variant_DataContents) return UA_STATUSCODE_BADOUTOFMEMORY;
+UA_String_init(variablenode_ns_0_i_7650_variant_DataContents);
+*variablenode_ns_0_i_7650_variant_DataContents = UA_STRING_ALLOC("Argument");
+UA_Variant_setScalar(&attr.value, variablenode_ns_0_i_7650_variant_DataContents, &UA_TYPES[UA_TYPES_STRING]);
+attr.displayName = UA_LOCALIZEDTEXT("", "Argument");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_VARIABLE,
+UA_NODEID_NUMERIC(ns[0], 7650),
+UA_NODEID_NUMERIC(ns[0], 7617),
+UA_NODEID_NUMERIC(ns[0], 47),
+UA_QUALIFIEDNAME(ns[0], "Argument"),
+UA_NODEID_NUMERIC(ns[0], 69),
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES],NULL, NULL);
+UA_String_delete(variablenode_ns_0_i_7650_variant_DataContents);
+retVal |= UA_Server_addReference(server, UA_NODEID_NUMERIC(ns[0], 7650), UA_NODEID_NUMERIC(ns[0], 39), UA_EXPANDEDNODEID_NUMERIC(ns[0], 298), false);
+return retVal;
+}
+
+static UA_StatusCode function_namespace0_generated_214_finish(UA_Server *server, UA_UInt16* ns) {
+return UA_Server_addNode_finish(server, 
+UA_NODEID_NUMERIC(ns[0], 7650)
+);
+}
+
+/* Default XML - ns=0;i=3063 */
+
+static UA_StatusCode function_namespace0_generated_215_begin(UA_Server *server, UA_UInt16* ns) {
+UA_StatusCode retVal = UA_STATUSCODE_GOOD;
+UA_ObjectAttributes attr = UA_ObjectAttributes_default;
+attr.displayName = UA_LOCALIZEDTEXT("", "Default XML");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_OBJECT,
+UA_NODEID_NUMERIC(ns[0], 3063),
+UA_NODEID_NUMERIC(ns[0], 0),
+UA_NODEID_NUMERIC(ns[0], 0),
+UA_QUALIFIEDNAME(ns[0], "Default XML"),
+UA_NODEID_NUMERIC(ns[0], 58),
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES],NULL, NULL);
+return retVal;
+}
+
+static UA_StatusCode function_namespace0_generated_215_finish(UA_Server *server, UA_UInt16* ns) {
+return UA_Server_addNode_finish(server, 
+UA_NODEID_NUMERIC(ns[0], 3063)
+);
+}
+
+/* Default Binary - ns=0;i=3062 */
+
+static UA_StatusCode function_namespace0_generated_216_begin(UA_Server *server, UA_UInt16* ns) {
+UA_StatusCode retVal = UA_STATUSCODE_GOOD;
+UA_ObjectAttributes attr = UA_ObjectAttributes_default;
+attr.displayName = UA_LOCALIZEDTEXT("", "Default Binary");
+retVal |= UA_Server_addNode_begin(server, UA_NODECLASS_OBJECT,
+UA_NODEID_NUMERIC(ns[0], 3062),
+UA_NODEID_NUMERIC(ns[0], 0),
+UA_NODEID_NUMERIC(ns[0], 0),
+UA_QUALIFIEDNAME(ns[0], "Default Binary"),
+UA_NODEID_NUMERIC(ns[0], 58),
+(const UA_NodeAttributes*)&attr, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES],NULL, NULL);
+return retVal;
+}
+
+static UA_StatusCode function_namespace0_generated_216_finish(UA_Server *server, UA_UInt16* ns) {
+return UA_Server_addNode_finish(server, 
+UA_NODEID_NUMERIC(ns[0], 3062)
 );
 }
 
@@ -50742,6 +52232,40 @@ bool dummy = (
 !(retVal = function_namespace0_generated_197_begin(server, ns)) &&
 !(retVal = function_namespace0_generated_198_begin(server, ns)) &&
 !(retVal = function_namespace0_generated_199_begin(server, ns)) &&
+!(retVal = function_namespace0_generated_200_begin(server, ns)) &&
+!(retVal = function_namespace0_generated_201_begin(server, ns)) &&
+!(retVal = function_namespace0_generated_202_begin(server, ns)) &&
+!(retVal = function_namespace0_generated_203_begin(server, ns)) &&
+!(retVal = function_namespace0_generated_204_begin(server, ns)) &&
+!(retVal = function_namespace0_generated_205_begin(server, ns)) &&
+!(retVal = function_namespace0_generated_206_begin(server, ns)) &&
+!(retVal = function_namespace0_generated_207_begin(server, ns)) &&
+!(retVal = function_namespace0_generated_208_begin(server, ns)) &&
+!(retVal = function_namespace0_generated_209_begin(server, ns)) &&
+!(retVal = function_namespace0_generated_210_begin(server, ns)) &&
+!(retVal = function_namespace0_generated_211_begin(server, ns)) &&
+!(retVal = function_namespace0_generated_212_begin(server, ns)) &&
+!(retVal = function_namespace0_generated_213_begin(server, ns)) &&
+!(retVal = function_namespace0_generated_214_begin(server, ns)) &&
+!(retVal = function_namespace0_generated_215_begin(server, ns)) &&
+!(retVal = function_namespace0_generated_216_begin(server, ns)) &&
+!(retVal = function_namespace0_generated_216_finish(server, ns)) &&
+!(retVal = function_namespace0_generated_215_finish(server, ns)) &&
+!(retVal = function_namespace0_generated_214_finish(server, ns)) &&
+!(retVal = function_namespace0_generated_213_finish(server, ns)) &&
+!(retVal = function_namespace0_generated_212_finish(server, ns)) &&
+!(retVal = function_namespace0_generated_211_finish(server, ns)) &&
+!(retVal = function_namespace0_generated_210_finish(server, ns)) &&
+!(retVal = function_namespace0_generated_209_finish(server, ns)) &&
+!(retVal = function_namespace0_generated_208_finish(server, ns)) &&
+!(retVal = function_namespace0_generated_207_finish(server, ns)) &&
+!(retVal = function_namespace0_generated_206_finish(server, ns)) &&
+!(retVal = function_namespace0_generated_205_finish(server, ns)) &&
+!(retVal = function_namespace0_generated_204_finish(server, ns)) &&
+!(retVal = function_namespace0_generated_203_finish(server, ns)) &&
+!(retVal = function_namespace0_generated_202_finish(server, ns)) &&
+!(retVal = function_namespace0_generated_201_finish(server, ns)) &&
+!(retVal = function_namespace0_generated_200_finish(server, ns)) &&
 !(retVal = function_namespace0_generated_199_finish(server, ns)) &&
 !(retVal = function_namespace0_generated_198_finish(server, ns)) &&
 !(retVal = function_namespace0_generated_197_finish(server, ns)) &&
@@ -50946,7 +52470,7 @@ bool dummy = (
 return retVal;
 }
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/ua_types_lex.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/ua_types_lex.c" ***********************************/
 
 /* Generated by re2c 1.1.1 */
 /* This Source Code Form is subject to the terms of the Mozilla Public
@@ -51888,7 +53412,7 @@ UA_RelativePath_parse(UA_RelativePath *rp, const UA_String str) {
     return res;
 }
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/server/ua_subscription.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/server/ua_subscription.c" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -52511,7 +54035,7 @@ UA_Subscription_answerPublishRequestsNoSubscription(UA_Server *server, UA_Sessio
 
 #endif /* UA_ENABLE_SUBSCRIPTIONS */
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/server/ua_subscription_monitoreditem.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/server/ua_subscription_monitoreditem.c" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -52900,7 +54424,7 @@ UA_MonitoredItem_unregisterSampleCallback(UA_Server *server, UA_MonitoredItem *m
 
 #endif /* UA_ENABLE_SUBSCRIPTIONS */
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/server/ua_subscription_datachange.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/server/ua_subscription_datachange.c" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -53230,7 +54754,7 @@ monitoredItem_sampleCallback(UA_Server *server, UA_MonitoredItem *monitoredItem)
 
 #endif /* UA_ENABLE_SUBSCRIPTIONS */
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/src/server/ua_subscription_events.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/src/server/ua_subscription_events.c" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -53971,7 +55495,7 @@ UA_Server_triggerEvent(UA_Server *server, const UA_NodeId eventNodeId,
 
 #endif /* UA_ENABLE_SUBSCRIPTIONS_EVENTS */
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/plugins/ua_log_stdout.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/plugins/ua_log_stdout.c" ***********************************/
 
 /* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
  * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
@@ -54065,7 +55589,7 @@ UA_Logger UA_Log_Stdout_withLevel(UA_LogLevel minlevel)
     return logger;
 }
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/plugins/ua_accesscontrol_default.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/plugins/ua_accesscontrol_default.c" ***********************************/
 
 /* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
  * See http://creativecommons.org/publicdomain/zero/1.0/ for more information. 
@@ -54379,7 +55903,7 @@ UA_AccessControl_default(UA_ServerConfig *config, UA_Boolean allowAnonymous,
     return UA_STATUSCODE_GOOD;
 }
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/plugins/ua_pki_default.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/plugins/ua_pki_default.c" ***********************************/
 
 /* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
  * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
@@ -55009,7 +56533,7 @@ UA_CertificateVerification_CertFolders(UA_CertificateVerification *cv,
 
 #endif
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/plugins/ua_nodestore_ziptree.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/plugins/ua_nodestore_ziptree.c" ***********************************/
 
 /* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
  * See http://creativecommons.org/publicdomain/zero/1.0/ for more information. 
@@ -55334,7 +56858,7 @@ UA_Nodestore_ZipTree(UA_Nodestore *ns) {
     return UA_STATUSCODE_GOOD;
 }
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/plugins/ua_nodestore_hashmap.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/plugins/ua_nodestore_hashmap.c" ***********************************/
 
 /* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
  * See http://creativecommons.org/publicdomain/zero/1.0/ for more information. 
@@ -55792,7 +57316,7 @@ UA_Nodestore_HashMap(UA_Nodestore *ns) {
     return UA_STATUSCODE_GOOD;
 }
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/plugins/ua_config_default.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/plugins/ua_config_default.c" ***********************************/
 
 /* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
  * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
@@ -56603,7 +58127,7 @@ UA_ClientConfig_setDefaultEncryption(UA_ClientConfig *config,
 }
 #endif
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/plugins/securityPolicies/ua_securitypolicy_none.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/plugins/securityPolicies/ua_securitypolicy_none.c" ***********************************/
 
 /* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
  * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
@@ -56790,7 +58314,7 @@ UA_SecurityPolicy_None(UA_SecurityPolicy *policy, const UA_ByteString localCerti
     return UA_STATUSCODE_GOOD;
 }
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/plugins/ua_log_syslog.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/plugins/ua_log_syslog.c" ***********************************/
 
 /* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
  * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
@@ -56877,7 +58401,7 @@ UA_Log_Syslog_withLevel(UA_LogLevel minlevel) {
 
 #endif
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/plugins/securityPolicies/securitypolicy_mbedtls_common.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/plugins/securityPolicies/securitypolicy_mbedtls_common.h" ***********************************/
 
 /* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
  * See http://creativecommons.org/publicdomain/zero/1.0/ for more information. 
@@ -56953,7 +58477,7 @@ _UA_END_DECLS
 #endif
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/plugins/securityPolicies/securitypolicy_mbedtls_common.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/plugins/securityPolicies/securitypolicy_mbedtls_common.c" ***********************************/
 
 
 #ifdef UA_ENABLE_ENCRYPTION_MBEDTLS
@@ -57250,7 +58774,7 @@ UA_ByteString UA_mbedTLS_CopyDataFormatAware(const UA_ByteString *data)
 
 #endif
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/plugins/securityPolicies/ua_securitypolicy_basic128rsa15.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/plugins/securityPolicies/ua_securitypolicy_basic128rsa15.c" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -58126,7 +59650,7 @@ UA_SecurityPolicy_Basic128Rsa15(UA_SecurityPolicy *policy, const UA_ByteString l
 
 #endif
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/plugins/securityPolicies/ua_securitypolicy_basic256.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/plugins/securityPolicies/ua_securitypolicy_basic256.c" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -58949,7 +60473,7 @@ UA_SecurityPolicy_Basic256(UA_SecurityPolicy *policy, const UA_ByteString localC
 
 #endif
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/plugins/securityPolicies/ua_securitypolicy_basic256sha256.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/plugins/securityPolicies/ua_securitypolicy_basic256sha256.c" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -59816,7 +61340,7 @@ UA_SecurityPolicy_Basic256Sha256(UA_SecurityPolicy *policy, const UA_ByteString
 
 #endif
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/plugins/securityPolicies/openssl/securitypolicy_openssl_common.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/plugins/securityPolicies/openssl/securitypolicy_openssl_common.h" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -59961,7 +61485,7 @@ _UA_END_DECLS
 #endif /* UA_ENABLE_ENCRYPTION_OPENSSL */
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/plugins/securityPolicies/openssl/securitypolicy_openssl_common.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/plugins/securityPolicies/openssl/securitypolicy_openssl_common.c" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -60923,7 +62447,7 @@ UA_OpenSSL_LoadLocalCertificate(const UA_ByteString *certificate, UA_ByteString
 
 #endif
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/plugins/securityPolicies/openssl/ua_openssl_basic128rsa15.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/plugins/securityPolicies/openssl/ua_openssl_basic128rsa15.c" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -61575,7 +63099,7 @@ UA_SecurityPolicy_Basic128Rsa15 (UA_SecurityPolicy * policy,
 
 #endif
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/plugins/securityPolicies/openssl/ua_openssl_basic256.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/plugins/securityPolicies/openssl/ua_openssl_basic256.c" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -62228,7 +63752,7 @@ UA_SecurityPolicy_Basic256 (UA_SecurityPolicy * policy,
 
 #endif
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/plugins/securityPolicies/openssl/ua_openssl_basic256sha256.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/plugins/securityPolicies/openssl/ua_openssl_basic256sha256.c" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -62895,7 +64419,7 @@ UA_SecurityPolicy_Basic256Sha256(UA_SecurityPolicy * policy,
 
 #endif
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/plugins/securityPolicies/openssl/ua_pki_openssl.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/plugins/securityPolicies/openssl/ua_pki_openssl.c" ***********************************/
 
 /* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
  * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
@@ -63541,7 +65065,1473 @@ UA_CertificateVerification_CertFolders(UA_CertificateVerification * cv,
 
 #endif  /* end of UA_ENABLE_ENCRYPTION_OPENSSL */
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/arch/posix/ua_clock.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/plugins/historydata/ua_history_data_backend_memory.c" ***********************************/
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ *    Copyright 2018 (c) basysKom GmbH <opensource@basyskom.com> (Author: Peter Rustler)
+ */
+
+
+#include <limits.h>
+#include <string.h>
+
+typedef struct {
+    UA_DateTime timestamp;
+    UA_DataValue value;
+} UA_DataValueMemoryStoreItem;
+
+static void
+UA_DataValueMemoryStoreItem_deleteMembers(UA_DataValueMemoryStoreItem* item) {
+    UA_DateTime_deleteMembers(&item->timestamp);
+    UA_DataValue_deleteMembers(&item->value);
+}
+
+typedef struct {
+    UA_NodeId nodeId;
+    UA_DataValueMemoryStoreItem **dataStore;
+    size_t storeEnd;
+    size_t storeSize;
+} UA_NodeIdStoreContextItem_backend_memory;
+
+static void
+UA_NodeIdStoreContextItem_deleteMembers(UA_NodeIdStoreContextItem_backend_memory* item) {
+    UA_NodeId_deleteMembers(&item->nodeId);
+    for (size_t i = 0; i < item->storeEnd; ++i) {
+        UA_DataValueMemoryStoreItem_deleteMembers(item->dataStore[i]);
+        UA_free(item->dataStore[i]);
+    }
+    UA_free(item->dataStore);
+}
+
+typedef struct {
+    UA_NodeIdStoreContextItem_backend_memory *dataStore;
+    size_t storeEnd;
+    size_t storeSize;
+    size_t initialStoreSize;
+} UA_MemoryStoreContext;
+
+static void
+UA_MemoryStoreContext_deleteMembers(UA_MemoryStoreContext* ctx) {
+    for (size_t i = 0; i < ctx->storeEnd; ++i) {
+        UA_NodeIdStoreContextItem_deleteMembers(&ctx->dataStore[i]);
+    }
+    UA_free(ctx->dataStore);
+    memset(ctx, 0, sizeof(UA_MemoryStoreContext));
+}
+
+static UA_NodeIdStoreContextItem_backend_memory *
+getNewNodeIdContext_backend_memory(UA_MemoryStoreContext* context,
+                                   UA_Server *server,
+                                   const UA_NodeId *nodeId) {
+    UA_MemoryStoreContext *ctx = (UA_MemoryStoreContext*)context;
+    if (ctx->storeEnd >= ctx->storeSize) {
+        size_t newStoreSize = ctx->storeSize * 2;
+        if (newStoreSize == 0)
+            return NULL;
+        ctx->dataStore = (UA_NodeIdStoreContextItem_backend_memory*)UA_realloc(ctx->dataStore,  (newStoreSize * sizeof(UA_NodeIdStoreContextItem_backend_memory)));
+        if (!ctx->dataStore) {
+            ctx->storeSize = 0;
+            return NULL;
+        }
+        ctx->storeSize = newStoreSize;
+    }
+    UA_NodeIdStoreContextItem_backend_memory *item = &ctx->dataStore[ctx->storeEnd];
+    UA_NodeId_copy(nodeId, &item->nodeId);
+    UA_DataValueMemoryStoreItem ** store = (UA_DataValueMemoryStoreItem **)UA_calloc(ctx->initialStoreSize, sizeof(UA_DataValueMemoryStoreItem*));
+    if (!store) {
+        UA_NodeIdStoreContextItem_deleteMembers(item);
+        return NULL;
+    }
+    item->dataStore = store;
+    item->storeSize = ctx->initialStoreSize;
+    item->storeEnd = 0;
+    ++ctx->storeEnd;
+    return item;
+}
+
+static UA_NodeIdStoreContextItem_backend_memory *
+getNodeIdStoreContextItem_backend_memory(UA_MemoryStoreContext* context,
+                                         UA_Server *server,
+                                         const UA_NodeId *nodeId)
+{
+    for (size_t i = 0; i < context->storeEnd; ++i) {
+        if (UA_NodeId_equal(nodeId, &context->dataStore[i].nodeId)) {
+            return &context->dataStore[i];
+        }
+    }
+    return getNewNodeIdContext_backend_memory(context, server, nodeId);
+}
+
+static UA_Boolean
+binarySearch_backend_memory(const UA_NodeIdStoreContextItem_backend_memory* item,
+                            const UA_DateTime timestamp,
+                            size_t *index) {
+    if (item->storeEnd == 0) {
+        *index = item->storeEnd;
+        return false;
+    }
+    size_t min = 0;
+    size_t max = item->storeEnd - 1;
+    while (min <= max) {
+        *index = (min + max) / 2;
+        if (item->dataStore[*index]->timestamp == timestamp) {
+            return true;
+        } else if (item->dataStore[*index]->timestamp < timestamp) {
+            if (*index == item->storeEnd - 1) {
+                *index = item->storeEnd;
+                return false;
+            }
+            min = *index + 1;
+        } else {
+            if (*index == 0)
+                return false;
+            max = *index - 1;
+        }
+    }
+    *index = min;
+    return false;
+
+}
+
+static size_t
+resultSize_backend_memory(UA_Server *server,
+                          void *context,
+                          const UA_NodeId *sessionId,
+                          void *sessionContext,
+                          const UA_NodeId * nodeId,
+                          size_t startIndex,
+                          size_t endIndex) {
+    const UA_NodeIdStoreContextItem_backend_memory* item = getNodeIdStoreContextItem_backend_memory((UA_MemoryStoreContext*)context, server, nodeId);
+    if (item->storeEnd == 0
+            || startIndex == item->storeEnd
+            || endIndex == item->storeEnd)
+        return 0;
+    return endIndex - startIndex + 1;
+}
+
+static size_t
+getDateTimeMatch_backend_memory(UA_Server *server,
+                                void *context,
+                                const UA_NodeId *sessionId,
+                                void *sessionContext,
+                                const UA_NodeId * nodeId,
+                                const UA_DateTime timestamp,
+                                const MatchStrategy strategy) {
+    const UA_NodeIdStoreContextItem_backend_memory* item = getNodeIdStoreContextItem_backend_memory((UA_MemoryStoreContext*)context, server, nodeId);
+    size_t current;
+    UA_Boolean retval = binarySearch_backend_memory(item, timestamp, &current);
+
+    if ((strategy == MATCH_EQUAL
+         || strategy == MATCH_EQUAL_OR_AFTER
+         || strategy == MATCH_EQUAL_OR_BEFORE)
+            && retval)
+        return current;
+    switch (strategy) {
+    case MATCH_AFTER:
+        if (retval)
+            return current+1;
+        return current;
+    case MATCH_EQUAL_OR_AFTER:
+        return current;
+    case MATCH_EQUAL_OR_BEFORE:
+        // retval == true aka "equal" is handled before
+        // Fall through if !retval
+    case MATCH_BEFORE:
+        if (current > 0)
+            return current-1;
+        else
+            return item->storeEnd;
+    default:
+        break;
+    }
+    return item->storeEnd;
+}
+
+
+static UA_StatusCode
+serverSetHistoryData_backend_memory(UA_Server *server,
+                                    void *context,
+                                    const UA_NodeId *sessionId,
+                                    void *sessionContext,
+                                    const UA_NodeId * nodeId,
+                                    UA_Boolean historizing,
+                                    const UA_DataValue *value)
+{
+    UA_NodeIdStoreContextItem_backend_memory *item = getNodeIdStoreContextItem_backend_memory((UA_MemoryStoreContext*)context, server, nodeId);
+
+    if (item->storeEnd >= item->storeSize) {
+        size_t newStoreSize = item->storeSize == 0 ? INITIAL_MEMORY_STORE_SIZE : item->storeSize * 2;
+        item->dataStore = (UA_DataValueMemoryStoreItem **)UA_realloc(item->dataStore,  (newStoreSize * sizeof(UA_DataValueMemoryStoreItem*)));
+        if (!item->dataStore) {
+            item->storeSize = 0;
+            return UA_STATUSCODE_BADOUTOFMEMORY;
+        }
+        item->storeSize = newStoreSize;
+    }
+    UA_DateTime timestamp = 0;
+    if (value->hasSourceTimestamp) {
+        timestamp = value->sourceTimestamp;
+    } else if (value->hasServerTimestamp) {
+        timestamp = value->serverTimestamp;
+    } else {
+        timestamp = UA_DateTime_now();
+    }
+    UA_DataValueMemoryStoreItem *newItem = (UA_DataValueMemoryStoreItem *)UA_calloc(1, sizeof(UA_DataValueMemoryStoreItem));
+    newItem->timestamp = timestamp;
+    UA_DataValue_copy(value, &newItem->value);
+    size_t index = getDateTimeMatch_backend_memory(server,
+                                                   context,
+                                                   NULL,
+                                                   NULL,
+                                                   nodeId,
+                                                   timestamp,
+                                                   MATCH_EQUAL_OR_AFTER);
+    if (item->storeEnd > 0 && index < item->storeEnd) {
+        memmove(&item->dataStore[index+1], &item->dataStore[index], sizeof(UA_DataValueMemoryStoreItem*) * (item->storeEnd - index));
+    }
+    item->dataStore[index] = newItem;
+    ++item->storeEnd;
+    return UA_STATUSCODE_GOOD;
+}
+
+static void
+UA_MemoryStoreContext_delete(UA_MemoryStoreContext* ctx) {
+    UA_MemoryStoreContext_deleteMembers(ctx);
+    UA_free(ctx);
+}
+
+static size_t
+getEnd_backend_memory(UA_Server *server,
+                      void *context,
+                      const UA_NodeId *sessionId,
+                      void *sessionContext,
+                      const UA_NodeId * nodeId) {
+    const UA_NodeIdStoreContextItem_backend_memory* item = getNodeIdStoreContextItem_backend_memory((UA_MemoryStoreContext*)context, server, nodeId);;
+    return item->storeEnd;
+}
+
+static size_t
+lastIndex_backend_memory(UA_Server *server,
+                         void *context,
+                         const UA_NodeId *sessionId,
+                         void *sessionContext,
+                         const UA_NodeId * nodeId) {
+    const UA_NodeIdStoreContextItem_backend_memory* item = getNodeIdStoreContextItem_backend_memory((UA_MemoryStoreContext*)context, server, nodeId);;
+    if (item->storeEnd == 0)
+        return 0;
+    return item->storeEnd - 1;
+}
+
+static size_t
+firstIndex_backend_memory(UA_Server *server,
+                          void *context,
+                          const UA_NodeId *sessionId,
+                          void *sessionContext,
+                          const UA_NodeId * nodeId) {
+    return 0;
+}
+
+static UA_Boolean
+boundSupported_backend_memory(UA_Server *server,
+                              void *context,
+                              const UA_NodeId *sessionId,
+                              void *sessionContext,
+                              const UA_NodeId * nodeId) {
+    return true;
+}
+
+static UA_Boolean
+timestampsToReturnSupported_backend_memory(UA_Server *server,
+                                           void *context,
+                                           const UA_NodeId *sessionId,
+                                           void *sessionContext,
+                                           const UA_NodeId *nodeId,
+                                           const UA_TimestampsToReturn timestampsToReturn) {
+    const UA_NodeIdStoreContextItem_backend_memory* item = getNodeIdStoreContextItem_backend_memory((UA_MemoryStoreContext*)context, server, nodeId);;
+    if (item->storeEnd == 0) {
+        return true;
+    }
+    if (timestampsToReturn == UA_TIMESTAMPSTORETURN_NEITHER
+            || timestampsToReturn == UA_TIMESTAMPSTORETURN_INVALID
+            || (timestampsToReturn == UA_TIMESTAMPSTORETURN_SERVER
+                && !item->dataStore[0]->value.hasServerTimestamp)
+            || (timestampsToReturn == UA_TIMESTAMPSTORETURN_SOURCE
+                && !item->dataStore[0]->value.hasSourceTimestamp)
+            || (timestampsToReturn == UA_TIMESTAMPSTORETURN_BOTH
+                && !(item->dataStore[0]->value.hasSourceTimestamp
+                     && item->dataStore[0]->value.hasServerTimestamp))) {
+        return false;
+    }
+    return true;
+}
+
+static const UA_DataValue*
+getDataValue_backend_memory(UA_Server *server,
+                            void *context,
+                            const UA_NodeId *sessionId,
+                            void *sessionContext,
+                            const UA_NodeId * nodeId, size_t index) {
+    const UA_NodeIdStoreContextItem_backend_memory* item = getNodeIdStoreContextItem_backend_memory((UA_MemoryStoreContext*)context, server, nodeId);;
+    return &item->dataStore[index]->value;
+}
+
+static UA_StatusCode
+UA_DataValue_backend_copyRange(const UA_DataValue *src, UA_DataValue *dst,
+                               const UA_NumericRange range)
+{
+    memcpy(dst, src, sizeof(UA_DataValue));
+    if (src->hasValue)
+        return UA_Variant_copyRange(&src->value, &dst->value, range);
+    return UA_STATUSCODE_BADDATAUNAVAILABLE;
+}
+
+static UA_StatusCode
+copyDataValues_backend_memory(UA_Server *server,
+                              void *context,
+                              const UA_NodeId *sessionId,
+                              void *sessionContext,
+                              const UA_NodeId * nodeId,
+                              size_t startIndex,
+                              size_t endIndex,
+                              UA_Boolean reverse,
+                              size_t maxValues,
+                              UA_NumericRange range,
+                              UA_Boolean releaseContinuationPoints,
+                              const UA_ByteString *continuationPoint,
+                              UA_ByteString *outContinuationPoint,
+                              size_t * providedValues,
+                              UA_DataValue * values)
+{
+    size_t skip = 0;
+    if (continuationPoint->length > 0) {
+        if (continuationPoint->length == sizeof(size_t)) {
+            skip = *((size_t*)(continuationPoint->data));
+        } else {
+            return UA_STATUSCODE_BADCONTINUATIONPOINTINVALID;
+        }
+    }
+    const UA_NodeIdStoreContextItem_backend_memory* item = getNodeIdStoreContextItem_backend_memory((UA_MemoryStoreContext*)context, server, nodeId);;
+    size_t index = startIndex;
+    size_t counter = 0;
+    size_t skipedValues = 0;
+    if (reverse) {
+        while (index >= endIndex && index < item->storeEnd && counter < maxValues) {
+            if (skipedValues++ >= skip) {
+                if (range.dimensionsSize > 0) {
+                    UA_DataValue_backend_copyRange(&item->dataStore[index]->value, &values[counter], range);
+                } else {
+                    UA_DataValue_copy(&item->dataStore[index]->value, &values[counter]);
+                }
+                ++counter;
+            }
+            --index;
+        }
+    } else {
+        while (index <= endIndex && counter < maxValues) {
+            if (skipedValues++ >= skip) {
+                if (range.dimensionsSize > 0) {
+                    UA_DataValue_backend_copyRange(&item->dataStore[index]->value, &values[counter], range);
+                } else {
+                    UA_DataValue_copy(&item->dataStore[index]->value, &values[counter]);
+                }
+                ++counter;
+            }
+            ++index;
+        }
+    }
+
+    if (providedValues)
+        *providedValues = counter;
+
+    if ((!reverse && (endIndex-startIndex-skip+1) > counter) || (reverse && (startIndex-endIndex-skip+1) > counter)) {
+        outContinuationPoint->length = sizeof(size_t);
+        size_t t = sizeof(size_t);
+        outContinuationPoint->data = (UA_Byte*)UA_malloc(t);
+        *((size_t*)(outContinuationPoint->data)) = skip + counter;
+    }
+
+    return UA_STATUSCODE_GOOD;
+}
+
+static UA_StatusCode
+insertDataValue_backend_memory(UA_Server *server,
+                   void *hdbContext,
+                   const UA_NodeId *sessionId,
+                   void *sessionContext,
+                   const UA_NodeId *nodeId,
+                   const UA_DataValue *value)
+{
+    if (!value->hasSourceTimestamp && !value->hasServerTimestamp)
+        return UA_STATUSCODE_BADINVALIDTIMESTAMP;
+    const UA_DateTime timestamp = value->hasSourceTimestamp ? value->sourceTimestamp : value->serverTimestamp;
+    UA_NodeIdStoreContextItem_backend_memory* item = getNodeIdStoreContextItem_backend_memory((UA_MemoryStoreContext*)hdbContext, server, nodeId);
+
+    size_t index = getDateTimeMatch_backend_memory(server,
+                                    hdbContext,
+                                    sessionId,
+                                    sessionContext,
+                                    nodeId,
+                                    timestamp,
+                                    MATCH_EQUAL_OR_AFTER);
+    if (item->storeEnd != index && item->dataStore[index]->timestamp == timestamp)
+        return UA_STATUSCODE_BADENTRYEXISTS;
+
+    if (item->storeEnd >= item->storeSize) {
+        size_t newStoreSize = item->storeSize == 0 ? INITIAL_MEMORY_STORE_SIZE : item->storeSize * 2;
+        item->dataStore = (UA_DataValueMemoryStoreItem **)UA_realloc(item->dataStore,  (newStoreSize * sizeof(UA_DataValueMemoryStoreItem*)));
+        if (!item->dataStore) {
+            item->storeSize = 0;
+            return UA_STATUSCODE_BADOUTOFMEMORY;
+        }
+        item->storeSize = newStoreSize;
+    }
+    UA_DataValueMemoryStoreItem *newItem = (UA_DataValueMemoryStoreItem *)UA_calloc(1, sizeof(UA_DataValueMemoryStoreItem));
+    newItem->timestamp = timestamp;
+    UA_DataValue_copy(value, &newItem->value);
+    if (item->storeEnd > 0 && index < item->storeEnd) {
+        memmove(&item->dataStore[index+1], &item->dataStore[index], sizeof(UA_DataValueMemoryStoreItem*) * (item->storeEnd - index));
+    }
+    item->dataStore[index] = newItem;
+    ++item->storeEnd;
+    return UA_STATUSCODE_GOOD;
+}
+
+static UA_StatusCode
+replaceDataValue_backend_memory(UA_Server *server,
+                    void *hdbContext,
+                    const UA_NodeId *sessionId,
+                    void *sessionContext,
+                    const UA_NodeId *nodeId,
+                    const UA_DataValue *value)
+{
+    if (!value->hasSourceTimestamp && !value->hasServerTimestamp)
+        return UA_STATUSCODE_BADINVALIDTIMESTAMP;
+    const UA_DateTime timestamp = value->hasSourceTimestamp ? value->sourceTimestamp : value->serverTimestamp;
+    UA_NodeIdStoreContextItem_backend_memory* item = getNodeIdStoreContextItem_backend_memory((UA_MemoryStoreContext*)hdbContext, server, nodeId);
+
+    size_t index = getDateTimeMatch_backend_memory(server,
+                                    hdbContext,
+                                    sessionId,
+                                    sessionContext,
+                                    nodeId,
+                                    timestamp,
+                                    MATCH_EQUAL);
+    if (index == item->storeEnd)
+        return UA_STATUSCODE_BADNOENTRYEXISTS;
+    UA_DataValue_deleteMembers(&item->dataStore[index]->value);
+    UA_DataValue_copy(value, &item->dataStore[index]->value);
+    return UA_STATUSCODE_GOOD;
+}
+
+static UA_StatusCode
+updateDataValue_backend_memory(UA_Server *server,
+                   void *hdbContext,
+                   const UA_NodeId *sessionId,
+                   void *sessionContext,
+                   const UA_NodeId *nodeId,
+                   const UA_DataValue *value)
+{
+    // we first try to replace, because it is cheap
+    UA_StatusCode ret = replaceDataValue_backend_memory(server,
+                                                        hdbContext,
+                                                        sessionId,
+                                                        sessionContext,
+                                                        nodeId,
+                                                        value);
+    if (ret == UA_STATUSCODE_GOOD)
+        return UA_STATUSCODE_GOODENTRYREPLACED;
+
+    ret = insertDataValue_backend_memory(server,
+                                          hdbContext,
+                                          sessionId,
+                                          sessionContext,
+                                          nodeId,
+                                          value);
+    if (ret == UA_STATUSCODE_GOOD)
+        return UA_STATUSCODE_GOODENTRYINSERTED;
+
+    return ret;
+}
+
+static UA_StatusCode
+removeDataValue_backend_memory(UA_Server *server,
+                               void *hdbContext,
+                               const UA_NodeId *sessionId,
+                               void *sessionContext,
+                               const UA_NodeId *nodeId,
+                               UA_DateTime startTimestamp,
+                               UA_DateTime endTimestamp)
+{
+    UA_NodeIdStoreContextItem_backend_memory* item = getNodeIdStoreContextItem_backend_memory((UA_MemoryStoreContext*)hdbContext, server, nodeId);
+    size_t storeEnd = item->storeEnd;
+    // The first index which will be deleted
+    size_t index1;
+    // the first index which is not deleted
+    size_t index2;
+    if (startTimestamp > endTimestamp) {
+        return UA_STATUSCODE_BADTIMESTAMPNOTSUPPORTED;
+    }
+    if (startTimestamp == endTimestamp) {
+        index1 = getDateTimeMatch_backend_memory(server,
+                                        hdbContext,
+                                        sessionId,
+                                        sessionContext,
+                                        nodeId,
+                                        startTimestamp,
+                                        MATCH_EQUAL);
+        if (index1 == storeEnd)
+            return UA_STATUSCODE_BADNODATA;
+        index2 = index1 + 1;
+    } else {
+        index1 = getDateTimeMatch_backend_memory(server,
+                                        hdbContext,
+                                        sessionId,
+                                        sessionContext,
+                                        nodeId,
+                                        startTimestamp,
+                                        MATCH_EQUAL_OR_AFTER);
+        index2 = getDateTimeMatch_backend_memory(server,
+                                        hdbContext,
+                                        sessionId,
+                                        sessionContext,
+                                        nodeId,
+                                        endTimestamp,
+                                        MATCH_BEFORE);
+        if (index2 == storeEnd || index1 == storeEnd || index1 > index2 )
+            return UA_STATUSCODE_BADNODATA;
+        ++index2;
+    }
+#ifndef __clang_analyzer__
+    for (size_t i = index1; i < index2; ++i) {
+        UA_DataValueMemoryStoreItem_deleteMembers(item->dataStore[i]);
+        UA_free(item->dataStore[i]);
+    }
+    memmove(&item->dataStore[index1], &item->dataStore[index2], sizeof(UA_DataValueMemoryStoreItem*) * (item->storeEnd - index2));
+    item->storeEnd -= index2 - index1;
+#else
+    (void)index1;
+    (void)index2;
+#endif
+    return UA_STATUSCODE_GOOD;
+}
+
+static void
+deleteMembers_backend_memory(UA_HistoryDataBackend *backend)
+{
+    if (backend == NULL || backend->context == NULL)
+        return;
+    UA_MemoryStoreContext_deleteMembers((UA_MemoryStoreContext*)backend->context);
+}
+
+
+
+UA_HistoryDataBackend
+UA_HistoryDataBackend_Memory(size_t initialNodeIdStoreSize, size_t initialDataStoreSize) {
+    if (initialNodeIdStoreSize == 0)
+        initialNodeIdStoreSize = 1;
+    if (initialDataStoreSize == 0)
+        initialDataStoreSize = 1;
+    UA_HistoryDataBackend result;
+    memset(&result, 0, sizeof(UA_HistoryDataBackend));
+    UA_MemoryStoreContext *ctx = (UA_MemoryStoreContext *)UA_calloc(1, sizeof(UA_MemoryStoreContext));
+    if (!ctx)
+        return result;
+    ctx->dataStore = (UA_NodeIdStoreContextItem_backend_memory*)UA_calloc(initialNodeIdStoreSize, sizeof(UA_NodeIdStoreContextItem_backend_memory));
+    ctx->initialStoreSize = initialDataStoreSize;
+    ctx->storeSize = initialNodeIdStoreSize;
+    ctx->storeEnd = 0;
+    result.serverSetHistoryData = &serverSetHistoryData_backend_memory;
+    result.resultSize = &resultSize_backend_memory;
+    result.getEnd = &getEnd_backend_memory;
+    result.lastIndex = &lastIndex_backend_memory;
+    result.firstIndex = &firstIndex_backend_memory;
+    result.getDateTimeMatch = &getDateTimeMatch_backend_memory;
+    result.copyDataValues = &copyDataValues_backend_memory;
+    result.getDataValue = &getDataValue_backend_memory;
+    result.boundSupported = &boundSupported_backend_memory;
+    result.timestampsToReturnSupported = &timestampsToReturnSupported_backend_memory;
+    result.insertDataValue =  &insertDataValue_backend_memory;
+    result.updateDataValue =  &updateDataValue_backend_memory;
+    result.replaceDataValue =  &replaceDataValue_backend_memory;
+    result.removeDataValue =  &removeDataValue_backend_memory;
+    result.deleteMembers = &deleteMembers_backend_memory;
+    result.getHistoryData = NULL;
+    result.context = ctx;
+    return result;
+}
+
+void
+UA_HistoryDataBackend_Memory_deleteMembers(UA_HistoryDataBackend *backend)
+{
+    UA_MemoryStoreContext *ctx = (UA_MemoryStoreContext*)backend->context;
+    UA_MemoryStoreContext_delete(ctx);
+    memset(backend, 0, sizeof(UA_HistoryDataBackend));
+}
+
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/plugins/historydata/ua_history_data_gathering_default.c" ***********************************/
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ *    Copyright 2018 (c) basysKom GmbH <opensource@basyskom.com> (Author: Peter Rustler)
+ */
+
+
+#include <string.h>
+
+typedef struct {
+    UA_NodeId nodeId;
+    UA_HistorizingNodeIdSettings setting;
+    UA_MonitoredItemCreateResult monitoredResult;
+} UA_NodeIdStoreContextItem_gathering_default;
+
+typedef struct {
+    UA_NodeIdStoreContextItem_gathering_default *dataStore;
+    size_t storeEnd;
+    size_t storeSize;
+} UA_NodeIdStoreContext;
+
+static void
+dataChangeCallback_gathering_default(UA_Server *server,
+                                     UA_UInt32 monitoredItemId,
+                                     void *monitoredItemContext,
+                                     const UA_NodeId *nodeId,
+                                     void *nodeContext,
+                                     UA_UInt32 attributeId,
+                                     const UA_DataValue *value)
+{
+    UA_NodeIdStoreContextItem_gathering_default *context = (UA_NodeIdStoreContextItem_gathering_default*)monitoredItemContext;
+    context->setting.historizingBackend.serverSetHistoryData(server,
+                                                             context->setting.historizingBackend.context,
+                                                             NULL,
+                                                             NULL,
+                                                             nodeId,
+                                                             UA_TRUE,
+                                                             value);
+}
+
+static UA_NodeIdStoreContextItem_gathering_default*
+getNodeIdStoreContextItem_gathering_default(UA_NodeIdStoreContext *context,
+                                            const UA_NodeId *nodeId)
+{
+    for (size_t i = 0; i < context->storeEnd; ++i) {
+        if (UA_NodeId_equal(&context->dataStore[i].nodeId, nodeId)) {
+            return &context->dataStore[i];
+        }
+    }
+    return NULL;
+}
+
+static UA_StatusCode
+startPoll(UA_Server *server, UA_NodeIdStoreContextItem_gathering_default *item)
+{
+    UA_MonitoredItemCreateRequest monitorRequest =
+            UA_MonitoredItemCreateRequest_default(item->nodeId);
+    monitorRequest.requestedParameters.samplingInterval = (double)item->setting.pollingInterval;
+    monitorRequest.monitoringMode = UA_MONITORINGMODE_REPORTING;
+    item->monitoredResult =
+            UA_Server_createDataChangeMonitoredItem(server,
+                                                    UA_TIMESTAMPSTORETURN_BOTH,
+                                                    monitorRequest,
+                                                    item,
+                                                    &dataChangeCallback_gathering_default);
+    return item->monitoredResult.statusCode;
+}
+
+static UA_StatusCode
+stopPoll(UA_Server *server, UA_NodeIdStoreContextItem_gathering_default *item)
+{
+    UA_StatusCode retval = UA_Server_deleteMonitoredItem(server, item->monitoredResult.monitoredItemId);
+    UA_MonitoredItemCreateResult_init(&item->monitoredResult);
+    return retval;
+}
+
+static UA_StatusCode
+stopPoll_gathering_default(UA_Server *server,
+                           void *context,
+                           const UA_NodeId *nodeId)
+{
+    UA_NodeIdStoreContext *ctx = (UA_NodeIdStoreContext *)context;
+    UA_NodeIdStoreContextItem_gathering_default *item = getNodeIdStoreContextItem_gathering_default(ctx, nodeId);
+    if (!item) {
+        return UA_STATUSCODE_BADNODEIDUNKNOWN;
+    }
+    if (item->setting.historizingUpdateStrategy != UA_HISTORIZINGUPDATESTRATEGY_POLL)
+        return UA_STATUSCODE_BADNODEIDINVALID;
+    if (item->monitoredResult.monitoredItemId == 0)
+        return UA_STATUSCODE_BADMONITOREDITEMIDINVALID;
+    return stopPoll(server, item);
+}
+
+static UA_StatusCode
+startPoll_gathering_default(UA_Server *server,
+                            void *context,
+                            const UA_NodeId *nodeId)
+{
+    UA_NodeIdStoreContext *ctx = (UA_NodeIdStoreContext *)context;
+    UA_NodeIdStoreContextItem_gathering_default *item = getNodeIdStoreContextItem_gathering_default(ctx, nodeId);
+    if (!item) {
+        return UA_STATUSCODE_BADNODEIDUNKNOWN;
+    }
+    if (item->setting.historizingUpdateStrategy != UA_HISTORIZINGUPDATESTRATEGY_POLL)
+        return UA_STATUSCODE_BADNODEIDINVALID;
+    if (item->monitoredResult.monitoredItemId > 0)
+        return UA_STATUSCODE_BADMONITOREDITEMIDINVALID;
+    return startPoll(server, item);
+}
+
+static UA_StatusCode
+registerNodeId_gathering_default(UA_Server *server,
+                                 void *context,
+                                 const UA_NodeId *nodeId,
+                                 const UA_HistorizingNodeIdSettings setting)
+{
+    UA_NodeIdStoreContext *ctx = (UA_NodeIdStoreContext*)context;
+    if (getNodeIdStoreContextItem_gathering_default(ctx, nodeId)) {
+        return UA_STATUSCODE_BADNODEIDEXISTS;
+    }
+    if (ctx->storeEnd >= ctx->storeSize) {
+        size_t newStoreSize = ctx->storeSize * 2;
+        ctx->dataStore = (UA_NodeIdStoreContextItem_gathering_default*)UA_realloc(ctx->dataStore,  (newStoreSize * sizeof(UA_NodeIdStoreContextItem_gathering_default)));
+        if (!ctx->dataStore) {
+            ctx->storeSize = 0;
+            return UA_STATUSCODE_BADOUTOFMEMORY;
+        }
+        ctx->storeSize = newStoreSize;
+    }
+    UA_NodeId_copy(nodeId, &ctx->dataStore[ctx->storeEnd].nodeId);
+    size_t current = ctx->storeEnd;
+    ctx->dataStore[current].setting = setting;
+    ++ctx->storeEnd;
+    return UA_STATUSCODE_GOOD;
+}
+
+static const UA_HistorizingNodeIdSettings*
+getHistorizingSetting_gathering_default(UA_Server *server,
+                                        void *context,
+                                        const UA_NodeId *nodeId)
+{
+    UA_NodeIdStoreContext *ctx = (UA_NodeIdStoreContext*)context;
+    UA_NodeIdStoreContextItem_gathering_default *item = getNodeIdStoreContextItem_gathering_default(ctx, nodeId);
+    if (item) {
+        return &item->setting;
+    }
+    return NULL;
+}
+
+static void
+deleteMembers_gathering_default(UA_HistoryDataGathering *gathering)
+{
+    if (gathering == NULL || gathering->context == NULL)
+        return;
+    UA_NodeIdStoreContext *ctx = (UA_NodeIdStoreContext*)gathering->context;
+    for (size_t i = 0; i < ctx->storeEnd; ++i) {
+        UA_NodeId_deleteMembers(&ctx->dataStore[i].nodeId);
+        // There is still a monitored item present for this gathering
+        // You need to remove it with UA_Server_deleteMonitoredItem
+        UA_assert(ctx->dataStore[i].monitoredResult.monitoredItemId == 0);
+    }
+    UA_free(ctx->dataStore);
+    UA_free(gathering->context);
+}
+
+static UA_Boolean
+updateNodeIdSetting_gathering_default(UA_Server *server,
+                                      void *context,
+                                      const UA_NodeId *nodeId,
+                                      const UA_HistorizingNodeIdSettings setting)
+{
+    UA_NodeIdStoreContext *ctx = (UA_NodeIdStoreContext*)context;
+    UA_NodeIdStoreContextItem_gathering_default *item = getNodeIdStoreContextItem_gathering_default(ctx, nodeId);
+    if (!item) {
+        return false;
+    }
+    stopPoll_gathering_default(server, context, nodeId);
+    item->setting = setting;
+    return true;
+}
+
+static void
+setValue_gathering_default(UA_Server *server,
+                           void *context,
+                           const UA_NodeId *sessionId,
+                           void *sessionContext,
+                           const UA_NodeId *nodeId,
+                           UA_Boolean historizing,
+                           const UA_DataValue *value)
+{
+    UA_NodeIdStoreContext *ctx = (UA_NodeIdStoreContext*)context;
+    UA_NodeIdStoreContextItem_gathering_default *item = getNodeIdStoreContextItem_gathering_default(ctx, nodeId);
+    if (!item) {
+        return;
+    }
+    if (item->setting.historizingUpdateStrategy == UA_HISTORIZINGUPDATESTRATEGY_VALUESET) {
+        item->setting.historizingBackend.serverSetHistoryData(server,
+                                                              item->setting.historizingBackend.context,
+                                                              sessionId,
+                                                              sessionContext,
+                                                              nodeId,
+                                                              historizing,
+                                                              value);
+    }
+}
+
+UA_HistoryDataGathering
+UA_HistoryDataGathering_Default(size_t initialNodeIdStoreSize)
+{
+    UA_HistoryDataGathering gathering;
+    memset(&gathering, 0, sizeof(UA_HistoryDataGathering));
+    gathering.setValue = &setValue_gathering_default;
+    gathering.getHistorizingSetting = &getHistorizingSetting_gathering_default;
+    gathering.registerNodeId = &registerNodeId_gathering_default;
+    gathering.startPoll = &startPoll_gathering_default;
+    gathering.stopPoll = &stopPoll_gathering_default;
+    gathering.deleteMembers = &deleteMembers_gathering_default;
+    gathering.updateNodeIdSetting = &updateNodeIdSetting_gathering_default;
+    UA_NodeIdStoreContext *context = (UA_NodeIdStoreContext*)UA_calloc(1, sizeof(UA_NodeIdStoreContext));
+    context->storeEnd = 0;
+    context->storeSize = initialNodeIdStoreSize;
+    context->dataStore = (UA_NodeIdStoreContextItem_gathering_default*)UA_calloc(initialNodeIdStoreSize, sizeof(UA_NodeIdStoreContextItem_gathering_default));
+    gathering.context = context;
+    return gathering;
+}
+
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/plugins/historydata/ua_history_database_default.c" ***********************************/
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ *    Copyright 2018 (c) basysKom GmbH <opensource@basyskom.com> (Author: Peter Rustler)
+ */
+
+
+#include <limits.h>
+
+typedef struct {
+    UA_HistoryDataGathering gathering;
+} UA_HistoryDatabaseContext_default;
+
+static size_t
+getResultSize_service_default(const UA_HistoryDataBackend* backend,
+                              UA_Server *server,
+                              const UA_NodeId *sessionId,
+                              void* sessionContext,
+                              const UA_NodeId *nodeId,
+                              UA_DateTime start,
+                              UA_DateTime end,
+                              UA_UInt32 numValuesPerNode,
+                              UA_Boolean returnBounds,
+                              size_t *startIndex,
+                              size_t *endIndex,
+                              UA_Boolean *addFirst,
+                              UA_Boolean *addLast,
+                              UA_Boolean *reverse)
+{
+    size_t storeEnd = backend->getEnd(server, backend->context, sessionId, sessionContext, nodeId);
+    size_t firstIndex = backend->firstIndex(server, backend->context, sessionId, sessionContext, nodeId);
+    size_t lastIndex = backend->lastIndex(server, backend->context, sessionId, sessionContext, nodeId);
+    *startIndex = storeEnd;
+    *endIndex = storeEnd;
+    *addFirst = false;
+    *addLast = false;
+    if (end == LLONG_MIN) {
+        *reverse = false;
+    } else if (start == LLONG_MIN) {
+        *reverse = true;
+    } else {
+        *reverse = end < start;
+    }
+    UA_Boolean equal = start == end;
+    size_t size = 0;
+    if (lastIndex != storeEnd) {
+        if (equal) {
+            if (returnBounds) {
+                *startIndex = backend->getDateTimeMatch(server, backend->context, sessionId, sessionContext, nodeId, start, MATCH_EQUAL_OR_BEFORE);
+                if (*startIndex == storeEnd) {
+                    *startIndex = backend->getDateTimeMatch(server, backend->context, sessionId, sessionContext, nodeId, start, MATCH_AFTER);
+                    *addFirst = true;
+                }
+                *endIndex = backend->getDateTimeMatch(server, backend->context, sessionId, sessionContext, nodeId, start, MATCH_AFTER);
+                size = backend->resultSize(server, backend->context, sessionId, sessionContext, nodeId, *startIndex, *endIndex);
+            } else {
+                *startIndex = backend->getDateTimeMatch(server, backend->context, sessionId, sessionContext, nodeId, start, MATCH_EQUAL);
+                *endIndex = *startIndex;
+                if (*startIndex == storeEnd)
+                    size = 0;
+                else
+                    size = 1;
+            }
+        } else if (start == LLONG_MIN) {
+            *endIndex = firstIndex;
+            if (returnBounds) {
+                *addLast = true;
+                *startIndex = backend->getDateTimeMatch(server, backend->context, sessionId, sessionContext, nodeId, end, MATCH_EQUAL_OR_AFTER);
+                if (*startIndex == storeEnd) {
+                    *startIndex = backend->getDateTimeMatch(server, backend->context, sessionId, sessionContext, nodeId, end, MATCH_EQUAL_OR_BEFORE);
+                    *addFirst = true;
+                }
+            } else {
+                *startIndex = backend->getDateTimeMatch(server, backend->context, sessionId, sessionContext, nodeId, end, MATCH_EQUAL_OR_BEFORE);
+            }
+            size = backend->resultSize(server, backend->context, sessionId, sessionContext, nodeId, *endIndex, *startIndex);
+        } else if (end == LLONG_MIN) {
+            *endIndex = lastIndex;
+            if (returnBounds) {
+                *addLast = true;
+                *startIndex = backend->getDateTimeMatch(server, backend->context, sessionId, sessionContext, nodeId, start, MATCH_EQUAL_OR_BEFORE);
+                if (*startIndex == storeEnd) {
+                    *startIndex = backend->getDateTimeMatch(server, backend->context, sessionId, sessionContext, nodeId, start, MATCH_AFTER);
+                    *addFirst = true;
+                }
+            } else {
+                *startIndex = backend->getDateTimeMatch(server, backend->context, sessionId, sessionContext, nodeId, start, MATCH_EQUAL_OR_AFTER);
+            }
+            size = backend->resultSize(server, backend->context, sessionId, sessionContext, nodeId, *startIndex, *endIndex);
+        } else if (*reverse) {
+            if (returnBounds) {
+                *startIndex = backend->getDateTimeMatch(server, backend->context, sessionId, sessionContext, nodeId, start, MATCH_EQUAL_OR_AFTER);
+                if (*startIndex == storeEnd) {
+                    *addFirst = true;
+                    *startIndex = backend->getDateTimeMatch(server, backend->context, sessionId, sessionContext, nodeId, start, MATCH_BEFORE);
+                }
+                *endIndex = backend->getDateTimeMatch(server, backend->context, sessionId, sessionContext, nodeId, end, MATCH_EQUAL_OR_BEFORE);
+                if (*endIndex == storeEnd) {
+                    *addLast = true;
+                    *endIndex = backend->getDateTimeMatch(server, backend->context, sessionId, sessionContext, nodeId, end, MATCH_AFTER);
+                }
+            } else {
+                *startIndex = backend->getDateTimeMatch(server, backend->context, sessionId, sessionContext, nodeId, start, MATCH_EQUAL_OR_BEFORE);
+                *endIndex = backend->getDateTimeMatch(server, backend->context, sessionId, sessionContext, nodeId, end, MATCH_AFTER);
+            }
+            size = backend->resultSize(server, backend->context, sessionId, sessionContext, nodeId, *endIndex, *startIndex);
+        } else {
+            if (returnBounds) {
+                *startIndex = backend->getDateTimeMatch(server, backend->context, sessionId, sessionContext, nodeId, start, MATCH_EQUAL_OR_BEFORE);
+                if (*startIndex == storeEnd) {
+                    *addFirst = true;
+                    *startIndex = backend->getDateTimeMatch(server, backend->context, sessionId, sessionContext, nodeId, start, MATCH_AFTER);
+                }
+                *endIndex = backend->getDateTimeMatch(server, backend->context, sessionId, sessionContext, nodeId, end, MATCH_EQUAL_OR_AFTER);
+                if (*endIndex == storeEnd) {
+                    *addLast = true;
+                    *endIndex = backend->getDateTimeMatch(server, backend->context, sessionId, sessionContext, nodeId, end, MATCH_BEFORE);
+                }
+            } else {
+                *startIndex = backend->getDateTimeMatch(server, backend->context, sessionId, sessionContext, nodeId, start, MATCH_EQUAL_OR_AFTER);
+                *endIndex = backend->getDateTimeMatch(server, backend->context, sessionId, sessionContext, nodeId, end, MATCH_BEFORE);
+            }
+            size = backend->resultSize(server, backend->context, sessionId, sessionContext, nodeId, *startIndex, *endIndex);
+        }
+    } else if (returnBounds) {
+        *addLast = true;
+        *addFirst = true;
+    }
+
+    if (*addLast)
+        ++size;
+    if (*addFirst)
+        ++size;
+
+    if (numValuesPerNode > 0 && size > numValuesPerNode) {
+        size = numValuesPerNode;
+        *addLast = false;
+    }
+    return size;
+}
+
+static UA_StatusCode
+getHistoryData_service_default(const UA_HistoryDataBackend* backend,
+                               const UA_DateTime start,
+                               const UA_DateTime end,
+                               UA_Server *server,
+                               const UA_NodeId *sessionId,
+                               void *sessionContext,
+                               const UA_NodeId* nodeId,
+                               size_t maxSize,
+                               UA_UInt32 numValuesPerNode,
+                               UA_Boolean returnBounds,
+                               UA_TimestampsToReturn timestampsToReturn,
+                               UA_NumericRange range,
+                               UA_Boolean releaseContinuationPoints,
+                               const UA_ByteString *continuationPoint,
+                               UA_ByteString *outContinuationPoint,
+                               size_t *resultSize,
+                               UA_DataValue ** result)
+{
+    size_t skip = 0;
+    UA_ByteString backendContinuationPoint;
+    UA_ByteString_init(&backendContinuationPoint);
+    if (continuationPoint->length > 0) {
+        if (continuationPoint->length >= sizeof(size_t)) {
+            skip = *((size_t*)(continuationPoint->data));
+            if (continuationPoint->length > 0) {
+                backendContinuationPoint.length = continuationPoint->length - sizeof(size_t);
+                backendContinuationPoint.data = continuationPoint->data + sizeof(size_t);
+            }
+        } else {
+            return UA_STATUSCODE_BADCONTINUATIONPOINTINVALID;
+        }
+    }
+
+    size_t storeEnd = backend->getEnd(server, backend->context, sessionId, sessionContext, nodeId);
+    size_t startIndex;
+    size_t endIndex;
+    UA_Boolean addFirst;
+    UA_Boolean addLast;
+    UA_Boolean reverse;
+    size_t _resultSize = getResultSize_service_default(backend,
+                                                       server,
+                                                       sessionId,
+                                                       sessionContext,
+                                                       nodeId,
+                                                       start,
+                                                       end,
+                                                       numValuesPerNode == 0 ? 0 : numValuesPerNode + (UA_UInt32)skip,
+                                                       returnBounds,
+                                                       &startIndex,
+                                                       &endIndex,
+                                                       &addFirst,
+                                                       &addLast,
+                                                       &reverse);
+    *resultSize = _resultSize - skip;
+    if (*resultSize > maxSize) {
+        *resultSize = maxSize;
+    }
+    UA_DataValue *outResult= (UA_DataValue*)UA_Array_new(*resultSize, &UA_TYPES[UA_TYPES_DATAVALUE]);
+    if (!outResult) {
+        *resultSize = 0;
+        return UA_STATUSCODE_BADOUTOFMEMORY;
+    }
+    *result = outResult;
+
+    size_t counter = 0;
+    if (addFirst) {
+        if (skip == 0) {
+            outResult[counter].hasStatus = true;
+            outResult[counter].status = UA_STATUSCODE_BADBOUNDNOTFOUND;
+            outResult[counter].hasSourceTimestamp = true;
+            if (start == LLONG_MIN) {
+                outResult[counter].sourceTimestamp = end;
+            } else {
+                outResult[counter].sourceTimestamp = start;
+            }
+            ++counter;
+        }
+    }
+    UA_ByteString backendOutContinuationPoint;
+    UA_ByteString_init(&backendOutContinuationPoint);
+    if (endIndex != storeEnd && startIndex != storeEnd) {
+        size_t retval = 0;
+
+        size_t valueSize = *resultSize - counter;
+        if (valueSize + skip > _resultSize - addFirst - addLast) {
+            if (skip == 0) {
+                valueSize = _resultSize - addFirst - addLast;
+            } else {
+                valueSize = _resultSize - skip - addLast;
+            }
+
+        }
+
+        UA_StatusCode ret = UA_STATUSCODE_GOOD;
+        if (valueSize > 0)
+            ret = backend->copyDataValues(server,
+                                          backend->context,
+                                          sessionId,
+                                          sessionContext,
+                                          nodeId,
+                                          startIndex,
+                                          endIndex,
+                                          reverse,
+                                          valueSize,
+                                          range,
+                                          releaseContinuationPoints,
+                                          &backendContinuationPoint,
+                                          &backendOutContinuationPoint,
+                                          &retval,
+                                          &outResult[counter]);
+        if (ret != UA_STATUSCODE_GOOD) {
+            UA_Array_delete(outResult, *resultSize, &UA_TYPES[UA_TYPES_DATAVALUE]);
+            *result = NULL;
+            *resultSize = 0;
+            return ret;
+        }
+        counter += retval;
+    }
+    if (addLast && counter < *resultSize) {
+        outResult[counter].hasStatus = true;
+        outResult[counter].status = UA_STATUSCODE_BADBOUNDNOTFOUND;
+        outResult[counter].hasSourceTimestamp = true;
+        if (start == LLONG_MIN && storeEnd != backend->firstIndex(server, backend->context, sessionId, sessionContext, nodeId)) {
+            outResult[counter].sourceTimestamp = backend->getDataValue(server, backend->context, sessionId, sessionContext, nodeId, endIndex)->sourceTimestamp - UA_DATETIME_SEC;
+        } else if (end == LLONG_MIN && storeEnd != backend->firstIndex(server, backend->context, sessionId, sessionContext, nodeId)) {
+            outResult[counter].sourceTimestamp = backend->getDataValue(server, backend->context, sessionId, sessionContext, nodeId, endIndex)->sourceTimestamp + UA_DATETIME_SEC;
+        } else {
+            outResult[counter].sourceTimestamp = end;
+        }
+    }
+    // there are more values
+    if (skip + *resultSize < _resultSize
+            // there are not more values for this request, but there are more values in database
+            || (backendOutContinuationPoint.length > 0
+                && numValuesPerNode != 0)
+            // we deliver just one value which is a FIRST/LAST value
+            || (skip == 0
+                && addFirst == true
+                && *resultSize == 1)) {
+        if(UA_ByteString_allocBuffer(outContinuationPoint, backendOutContinuationPoint.length + sizeof(size_t))
+                != UA_STATUSCODE_GOOD) {
+            return UA_STATUSCODE_BADOUTOFMEMORY;
+        }
+        *((size_t*)(outContinuationPoint->data)) = skip + *resultSize;
+        if(backendOutContinuationPoint.length > 0)
+            memcpy(outContinuationPoint->data + sizeof(size_t), backendOutContinuationPoint.data, backendOutContinuationPoint.length);
+    }
+    UA_ByteString_deleteMembers(&backendOutContinuationPoint);
+    return UA_STATUSCODE_GOOD;
+}
+
+static void
+updateData_service_default(UA_Server *server,
+                           void *hdbContext,
+                           const UA_NodeId *sessionId,
+                           void *sessionContext,
+                           const UA_RequestHeader *requestHeader,
+                           const UA_UpdateDataDetails *details,
+                           UA_HistoryUpdateResult *result)
+{
+    UA_HistoryDatabaseContext_default *ctx = (UA_HistoryDatabaseContext_default*)hdbContext;
+    UA_Byte accessLevel = 0;
+    UA_Server_readAccessLevel(server,
+                              details->nodeId,
+                              &accessLevel);
+    if (!(accessLevel & UA_ACCESSLEVELMASK_HISTORYWRITE)) {
+        result->statusCode = UA_STATUSCODE_BADUSERACCESSDENIED;
+        return;
+    }
+
+    UA_Boolean historizing = false;
+    UA_Server_readHistorizing(server,
+                              details->nodeId,
+                              &historizing);
+    if (!historizing) {
+        result->statusCode = UA_STATUSCODE_BADHISTORYOPERATIONINVALID;
+        return;
+    }
+    const UA_HistorizingNodeIdSettings *setting = ctx->gathering.getHistorizingSetting(
+                server,
+                ctx->gathering.context,
+                &details->nodeId);
+
+    if (!setting) {
+        result->statusCode = UA_STATUSCODE_BADHISTORYOPERATIONINVALID;
+        return;
+    }
+
+    result->operationResultsSize = details->updateValuesSize;
+    result->operationResults = (UA_StatusCode*)UA_Array_new(result->operationResultsSize, &UA_TYPES[UA_TYPES_STATUSCODE]);
+    for (size_t i = 0; i < details->updateValuesSize; ++i) {
+        if (!UA_Server_AccessControl_allowHistoryUpdateUpdateData(server,
+                                                                  sessionId,
+                                                                  sessionContext,
+                                                                  &details->nodeId,
+                                                                  details->performInsertReplace,
+                                                                  &details->updateValues[i])) {
+            result->operationResults[i] = UA_STATUSCODE_BADUSERACCESSDENIED;
+            continue;
+        }
+        switch (details->performInsertReplace) {
+        case UA_PERFORMUPDATETYPE_INSERT:
+            if (!setting->historizingBackend.insertDataValue) {
+                result->operationResults[i] = UA_STATUSCODE_BADHISTORYOPERATIONUNSUPPORTED;
+                continue;
+            }
+            result->operationResults[i]
+                    = setting->historizingBackend.insertDataValue(server,
+                                                                  setting->historizingBackend.context,
+                                                                  sessionId,
+                                                                  sessionContext,
+                                                                  &details->nodeId,
+                                                                  &details->updateValues[i]);
+            continue;
+        case UA_PERFORMUPDATETYPE_REPLACE:
+            if (!setting->historizingBackend.replaceDataValue) {
+                result->operationResults[i] = UA_STATUSCODE_BADHISTORYOPERATIONUNSUPPORTED;
+                continue;
+            }
+            result->operationResults[i]
+                    = setting->historizingBackend.replaceDataValue(server,
+                                                                   setting->historizingBackend.context,
+                                                                   sessionId,
+                                                                   sessionContext,
+                                                                   &details->nodeId,
+                                                                   &details->updateValues[i]);
+            continue;
+        case UA_PERFORMUPDATETYPE_UPDATE:
+            if (!setting->historizingBackend.updateDataValue) {
+                result->operationResults[i] = UA_STATUSCODE_BADHISTORYOPERATIONUNSUPPORTED;
+                continue;
+            }
+            result->operationResults[i]
+                    = setting->historizingBackend.updateDataValue(server,
+                                                                  setting->historizingBackend.context,
+                                                                  sessionId,
+                                                                  sessionContext,
+                                                                  &details->nodeId,
+                                                                  &details->updateValues[i]);
+            continue;
+        default:
+            result->operationResults[i] = UA_STATUSCODE_BADHISTORYOPERATIONINVALID;
+            continue;
+        }
+    }
+}
+
+
+static void
+deleteRawModified_service_default(UA_Server *server,
+                                  void *hdbContext,
+                                  const UA_NodeId *sessionId,
+                                  void *sessionContext,
+                                  const UA_RequestHeader *requestHeader,
+                                  const UA_DeleteRawModifiedDetails *details,
+                                  UA_HistoryUpdateResult *result)
+{
+    if (details->isDeleteModified) {
+        result->statusCode = UA_STATUSCODE_BADHISTORYOPERATIONUNSUPPORTED;
+        return;
+    }
+    UA_HistoryDatabaseContext_default *ctx = (UA_HistoryDatabaseContext_default*)hdbContext;
+    UA_Byte accessLevel = 0;
+    UA_Server_readAccessLevel(server,
+                              details->nodeId,
+                              &accessLevel);
+    if (!(accessLevel & UA_ACCESSLEVELMASK_HISTORYWRITE)) {
+        result->statusCode = UA_STATUSCODE_BADUSERACCESSDENIED;
+        return;
+    }
+
+    UA_Boolean historizing = false;
+    UA_Server_readHistorizing(server,
+                              details->nodeId,
+                              &historizing);
+    if (!historizing) {
+        result->statusCode = UA_STATUSCODE_BADHISTORYOPERATIONINVALID;
+        return;
+    }
+    const UA_HistorizingNodeIdSettings *setting = ctx->gathering.getHistorizingSetting(
+                server,
+                ctx->gathering.context,
+                &details->nodeId);
+
+    if (!setting) {
+        result->statusCode = UA_STATUSCODE_BADHISTORYOPERATIONINVALID;
+        return;
+    }
+    if (!setting->historizingBackend.removeDataValue) {
+        result->statusCode = UA_STATUSCODE_BADHISTORYOPERATIONUNSUPPORTED;
+        return;
+    }
+
+    if (!UA_Server_AccessControl_allowHistoryUpdateDeleteRawModified(server,
+                                                                     sessionId,
+                                                                     sessionContext,
+                                                                     &details->nodeId,
+                                                                     details->startTime,
+                                                                     details->endTime,
+                                                                     details->isDeleteModified)) {
+        result->statusCode = UA_STATUSCODE_BADUSERACCESSDENIED;
+        return;
+    }
+
+    result->statusCode
+            = setting->historizingBackend.removeDataValue(server,
+                                                          setting->historizingBackend.context,
+                                                          sessionId,
+                                                          sessionContext,
+                                                          &details->nodeId,
+                                                          details->startTime,
+                                                          details->endTime);
+}
+
+static void
+readRaw_service_default(UA_Server *server,
+                        void *context,
+                        const UA_NodeId *sessionId,
+                        void *sessionContext,
+                        const UA_RequestHeader *requestHeader,
+                        const UA_ReadRawModifiedDetails *historyReadDetails,
+                        UA_TimestampsToReturn timestampsToReturn,
+                        UA_Boolean releaseContinuationPoints,
+                        size_t nodesToReadSize,
+                        const UA_HistoryReadValueId *nodesToRead,
+                        UA_HistoryReadResponse *response,
+                        UA_HistoryData * const * const historyData)
+{
+    UA_HistoryDatabaseContext_default *ctx = (UA_HistoryDatabaseContext_default*)context;
+    for (size_t i = 0; i < nodesToReadSize; ++i) {
+        UA_Byte accessLevel = 0;
+        UA_Server_readAccessLevel(server,
+                                  nodesToRead[i].nodeId,
+                                  &accessLevel);
+        if (!(accessLevel & UA_ACCESSLEVELMASK_HISTORYREAD)) {
+            response->results[i].statusCode = UA_STATUSCODE_BADUSERACCESSDENIED;
+            continue;
+        }
+
+        UA_Boolean historizing = false;
+        UA_Server_readHistorizing(server,
+                                  nodesToRead[i].nodeId,
+                                  &historizing);
+        if (!historizing) {
+            response->results[i].statusCode = UA_STATUSCODE_BADHISTORYOPERATIONINVALID;
+            continue;
+        }
+
+        const UA_HistorizingNodeIdSettings *setting = ctx->gathering.getHistorizingSetting(
+                    server,
+                    ctx->gathering.context,
+                    &nodesToRead[i].nodeId);
+
+        if (!setting) {
+            response->results[i].statusCode = UA_STATUSCODE_BADHISTORYOPERATIONINVALID;
+            continue;
+        }
+
+        if (historyReadDetails->returnBounds && !setting->historizingBackend.boundSupported(
+                    server,
+                    setting->historizingBackend.context,
+                    sessionId,
+                    sessionContext,
+                    &nodesToRead[i].nodeId)) {
+            response->results[i].statusCode = UA_STATUSCODE_BADBOUNDNOTSUPPORTED;
+            continue;
+        }
+
+        if (!setting->historizingBackend.timestampsToReturnSupported(
+                    server,
+                    setting->historizingBackend.context,
+                    sessionId,
+                    sessionContext,
+                    &nodesToRead[i].nodeId,
+                    timestampsToReturn)) {
+            response->results[i].statusCode = UA_STATUSCODE_BADTIMESTAMPNOTSUPPORTED;
+            continue;
+        }
+
+        UA_NumericRange range;
+        range.dimensionsSize = 0;
+        range.dimensions = NULL;
+        if (nodesToRead[i].indexRange.length > 0) {
+            UA_StatusCode rangeParseResult = UA_NumericRange_parse(&range, nodesToRead[i].indexRange);
+            if (rangeParseResult != UA_STATUSCODE_GOOD) {
+                response->results[i].statusCode = rangeParseResult;
+                continue;
+            }
+        }
+
+        UA_StatusCode getHistoryDataStatusCode;
+        if (setting->historizingBackend.getHistoryData) {
+            getHistoryDataStatusCode = setting->historizingBackend.getHistoryData(
+                        server,
+                        sessionId,
+                        sessionContext,
+                        &setting->historizingBackend,
+                        historyReadDetails->startTime,
+                        historyReadDetails->endTime,
+                        &nodesToRead[i].nodeId,
+                        setting->maxHistoryDataResponseSize,
+                        historyReadDetails->numValuesPerNode,
+                        historyReadDetails->returnBounds,
+                        timestampsToReturn,
+                        range,
+                        releaseContinuationPoints,
+                        &nodesToRead[i].continuationPoint,
+                        &response->results[i].continuationPoint,
+                        historyData[i]);
+        } else {
+            getHistoryDataStatusCode = getHistoryData_service_default(
+                        &setting->historizingBackend,
+                        historyReadDetails->startTime,
+                        historyReadDetails->endTime,
+                        server,
+                        sessionId,
+                        sessionContext,
+                        &nodesToRead[i].nodeId,
+                        setting->maxHistoryDataResponseSize,
+                        historyReadDetails->numValuesPerNode,
+                        historyReadDetails->returnBounds,
+                        timestampsToReturn,
+                        range,
+                        releaseContinuationPoints,
+                        &nodesToRead[i].continuationPoint,
+                        &response->results[i].continuationPoint,
+                        &historyData[i]->dataValuesSize,
+                        &historyData[i]->dataValues);
+        }
+        if (getHistoryDataStatusCode != UA_STATUSCODE_GOOD) {
+            response->results[i].statusCode = getHistoryDataStatusCode;
+            continue;
+        }
+    }
+    response->responseHeader.serviceResult = UA_STATUSCODE_GOOD;
+    return;
+}
+
+static void
+setValue_service_default(UA_Server *server,
+                         void *context,
+                         const UA_NodeId *sessionId,
+                         void *sessionContext,
+                         const UA_NodeId *nodeId,
+                         UA_Boolean historizing,
+                         const UA_DataValue *value)
+{
+    UA_HistoryDatabaseContext_default *ctx = (UA_HistoryDatabaseContext_default*)context;
+    if (ctx->gathering.setValue)
+        ctx->gathering.setValue(server,
+                                ctx->gathering.context,
+                                sessionId,
+                                sessionContext,
+                                nodeId,
+                                historizing,
+                                value);
+}
+
+static void
+clear_service_default(UA_HistoryDatabase *hdb)
+{
+    if (hdb == NULL || hdb->context == NULL)
+        return;
+    UA_HistoryDatabaseContext_default *ctx = (UA_HistoryDatabaseContext_default*)hdb->context;
+    ctx->gathering.deleteMembers(&ctx->gathering);
+    UA_free(ctx);
+}
+
+UA_HistoryDatabase
+UA_HistoryDatabase_default(UA_HistoryDataGathering gathering)
+{
+    UA_HistoryDatabase hdb;
+    memset(&hdb, 0, sizeof(UA_HistoryDatabase));
+    UA_HistoryDatabaseContext_default *context =
+            (UA_HistoryDatabaseContext_default*)
+            UA_calloc(1, sizeof(UA_HistoryDatabaseContext_default));
+    context->gathering = gathering;
+    hdb.context = context;
+    hdb.readRaw = &readRaw_service_default;
+    hdb.setValue = &setValue_service_default;
+    hdb.updateData = &updateData_service_default;
+    hdb.deleteRawModified = &deleteRawModified_service_default;
+    hdb.clear = clear_service_default;
+    return hdb;
+}
+
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/arch/posix/ua_clock.c" ***********************************/
 
 /* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
  * See http://creativecommons.org/publicdomain/zero/1.0/ for more information. 
@@ -63603,7 +66593,7 @@ UA_DateTime UA_DateTime_nowMonotonic(void) {
 
 #endif /* UA_ARCHITECTURE_POSIX */
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/arch/posix/ua_architecture_functions.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/arch/posix/ua_architecture_functions.c" ***********************************/
 
 /* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
  * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
@@ -63644,7 +66634,7 @@ void UA_deinitialize_architecture_network(void){
 
 #endif /* UA_ARCHITECTURE_POSIX */
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/arch/win32/ua_clock.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/arch/win32/ua_clock.c" ***********************************/
 
 /* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
  * See http://creativecommons.org/publicdomain/zero/1.0/ for more information. 
@@ -63711,7 +66701,7 @@ UA_DateTime UA_DateTime_nowMonotonic(void) {
 
 #endif /* UA_ARCHITECTURE_WIN32 */
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/arch/win32/ua_architecture_functions.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/arch/win32/ua_architecture_functions.c" ***********************************/
 
 /* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
  * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
@@ -63747,7 +66737,7 @@ void UA_deinitialize_architecture_network(void){
 
 #endif /* UA_ARCHITECTURE_WIN32 */
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/arch/network_tcp.c" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/arch/network_tcp.c" ***********************************/
 
 /* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
  * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
diff --git a/src/3rdparty/open62541/open62541.h b/src/3rdparty/open62541/open62541.h
index 7514fbb..7089942 100644
--- a/src/3rdparty/open62541/open62541.h
+++ b/src/3rdparty/open62541/open62541.h
@@ -1,6 +1,6 @@
 /* THIS IS A SINGLE-FILE DISTRIBUTION CONCATENATED FROM THE OPEN62541 SOURCES
  * visit http://open62541.org/ for information about this software
- * Git-Revision: v1.1.2-8-ge941fc2
+ * Git-Revision: v1.1.2-8-ge941fc23
  */
 
 /*
@@ -18,7 +18,7 @@
 #ifndef OPEN62541_H_
 #define OPEN62541_H_
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/build/src_generated/open62541/config.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/build/src_generated/open62541/config.h" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -31,8 +31,8 @@
 #define UA_OPEN62541_VER_MAJOR 1
 #define UA_OPEN62541_VER_MINOR 1
 #define UA_OPEN62541_VER_PATCH 2
-#define UA_OPEN62541_VER_LABEL "-8-ge941fc2" /* Release candidate label, etc. */
-#define UA_OPEN62541_VER_COMMIT "v1.1.2-8-ge941fc2"
+#define UA_OPEN62541_VER_LABEL "-8-ge941fc23" /* Release candidate label, etc. */
+#define UA_OPEN62541_VER_COMMIT "v1.1.2-8-ge941fc23"
 
 /**
  * Feature Options
@@ -55,10 +55,10 @@
 /* #undef UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS */
 #define UA_ENABLE_DA
 /* #undef UA_ENABLE_ENCRYPTION */
-/* #undef UA_ENABLE_HISTORIZING */
+#define UA_ENABLE_HISTORIZING
 #define UA_ENABLE_PARSING
 /* #undef UA_ENABLE_MICRO_EMB_DEV_PROFILE */
-/* #undef UA_ENABLE_EXPERIMENTAL_HISTORIZING */
+#define UA_ENABLE_EXPERIMENTAL_HISTORIZING
 #define UA_ENABLE_SUBSCRIPTIONS_EVENTS
 /* #undef UA_ENABLE_JSON_ENCODING */
 /* #undef UA_ENABLE_PUBSUB_MQTT */
@@ -134,7 +134,7 @@
 
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/include/open62541/architecture_base.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/include/open62541/architecture_base.h" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -173,7 +173,7 @@ void UA_free(void* ptr); //de-allocate memory previously allocated with UA_mallo
 
 #endif //ARCH_UA_ARCHITECTURE_BASE_H
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/arch/win32/ua_architecture.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/arch/win32/ua_architecture.h" ***********************************/
 
 /* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
  * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
@@ -350,7 +350,7 @@ void UA_free(void* ptr); //de-allocate memory previously allocated with UA_mallo
 
 #endif /* UA_ARCHITECTURE_WIN32 */
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/arch/posix/ua_architecture.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/arch/posix/ua_architecture.h" ***********************************/
 
 /* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
  * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
@@ -639,7 +639,7 @@ extern void * (*UA_globalRealloc)(void *ptr, size_t size);
 
 #endif /* UA_ARCHITECTURE_POSIX */
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/deps/ms_stdint.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/deps/ms_stdint.h" ***********************************/
 
 // ISO C9x  compliant stdint.h for Microsoft Visual Studio
 // Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 
@@ -896,7 +896,7 @@ typedef uint64_t  uintmax_t;
 
 #endif // !defined(_MSC_VER) || _MSC_VER >= 1600 ]
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/include/open62541/architecture_definitions.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/include/open62541/architecture_definitions.h" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -1307,11 +1307,11 @@ UA_atomic_subSize(volatile size_t *addr, size_t decrease) {
 }
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/build/src_generated/open62541/statuscodes.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/build/src_generated/open62541/statuscodes.h" ***********************************/
 
 /*---------------------------------------------------------
  * Autogenerated -- do not modify
- * Generated from /home/jvoe/open62541/tools/schema/StatusCode.csv with script /home/jvoe/open62541/tools/generate_statuscode_descriptions.py
+ * Generated from /home/pdie/sonstiges/qtopcua/repos/open62541/tools/schema/StatusCode.csv with script /home/pdie/sonstiges/qtopcua/repos/open62541/tools/generate_statuscode_descriptions.py
  *-------------------------------------------------------*/
 
 /**
@@ -2035,11 +2035,11 @@ UA_atomic_subSize(volatile size_t *addr, size_t decrease) {
 #define UA_STATUSCODE_BADMAXCONNECTIONSREACHED 0x80B70000
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/build/src_generated/open62541/nodeids.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/build/src_generated/open62541/nodeids.h" ***********************************/
 
 /*---------------------------------------------------------
  * Autogenerated -- do not modify
- * Generated from /home/jvoe/open62541/tools/schema/NodeIds.csv with script /home/jvoe/open62541/tools/generate_nodeid_header.py
+ * Generated from /home/pdie/sonstiges/qtopcua/repos/open62541/tools/schema/NodeIds.csv with script /home/pdie/sonstiges/qtopcua/repos/open62541/tools/generate_nodeid_header.py
  *-------------------------------------------------------*/
 
 #ifndef UA_NODEIDS_NS0_H_
@@ -2049,7 +2049,7 @@ UA_atomic_subSize(volatile size_t *addr, size_t decrease) {
  * Namespace Zero NodeIds
  * ----------------------
  * Numeric identifiers of standard-defined nodes in namespace zero. The
- * following definitions are autogenerated from the ``/home/jvoe/open62541/tools/schema/NodeIds.csv`` file */
+ * following definitions are autogenerated from the ``/home/pdie/sonstiges/qtopcua/repos/open62541/tools/schema/NodeIds.csv`` file */
 
 #define UA_NS0ID_BOOLEAN 1 /* DataType */
 #define UA_NS0ID_SBYTE 2 /* DataType */
@@ -12760,7 +12760,7 @@ UA_atomic_subSize(volatile size_t *addr, size_t decrease) {
 #define UA_NS0ID_DATAGRAMWRITERGROUPTRANSPORTDATATYPE_ENCODING_DEFAULTJSON 21203 /* Object */
 #endif /* UA_NODEIDS_NS0_H_ */ 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/include/open62541/common.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/include/open62541/common.h" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -12974,7 +12974,7 @@ typedef struct {
 _UA_END_DECLS
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/include/open62541/types.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/include/open62541/types.h" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -14097,10 +14097,10 @@ typedef struct UA_DataTypeArray {
 _UA_END_DECLS
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/build/src_generated/open62541/types_generated.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/build/src_generated/open62541/types_generated.h" ***********************************/
 
-/* Generated from Opc.Ua.Types.bsd with script /home/jvoe/open62541/tools/generate_datatypes.py
- * on host rigel by user jvoe at 2020-09-09 11:33:49 */
+/* Generated from Opc.Ua.Types.bsd with script /home/pdie/sonstiges/qtopcua/repos/open62541/tools/generate_datatypes.py
+ * on host mintaka by user pdie at 2021-06-21 11:34:37 */
 
 
 #ifdef UA_ENABLE_AMALGAMATION
@@ -14115,7 +14115,7 @@ _UA_BEGIN_DECLS
  * Every type is assigned an index in an array containing the type descriptions.
  * These descriptions are used during type handling (copying, deletion,
  * binary encoding, ...). */
-#define UA_TYPES_COUNT 188
+#define UA_TYPES_COUNT 208
 extern UA_EXPORT const UA_DataType UA_TYPES[UA_TYPES_COUNT];
 
 /**
@@ -14269,64 +14269,84 @@ extern UA_EXPORT const UA_DataType UA_TYPES[UA_TYPES_COUNT];
 #define UA_TYPES_DIAGNOSTICINFO 24
 
 /**
- * ViewAttributes
- * ^^^^^^^^^^^^^^
- * The attributes for a view node. */
-typedef struct {
-    UA_UInt32 specifiedAttributes;
-    UA_LocalizedText displayName;
-    UA_LocalizedText description;
-    UA_UInt32 writeMask;
-    UA_UInt32 userWriteMask;
-    UA_Boolean containsNoLoops;
-    UA_Byte eventNotifier;
-} UA_ViewAttributes;
+ * NodeClass
+ * ^^^^^^^^^
+ * A mask specifying the class of the node. */
+typedef enum {
+    UA_NODECLASS_UNSPECIFIED = 0,
+    UA_NODECLASS_OBJECT = 1,
+    UA_NODECLASS_VARIABLE = 2,
+    UA_NODECLASS_METHOD = 4,
+    UA_NODECLASS_OBJECTTYPE = 8,
+    UA_NODECLASS_VARIABLETYPE = 16,
+    UA_NODECLASS_REFERENCETYPE = 32,
+    UA_NODECLASS_DATATYPE = 64,
+    UA_NODECLASS_VIEW = 128,
+    __UA_NODECLASS_FORCE32BIT = 0x7fffffff
+} UA_NodeClass;
+UA_STATIC_ASSERT(sizeof(UA_NodeClass) == sizeof(UA_Int32), enum_must_be_32bit);
 
-#define UA_TYPES_VIEWATTRIBUTES 25
+#define UA_TYPES_NODECLASS 25
 
 /**
- * XVType
- * ^^^^^^
+ * StructureType
+ * ^^^^^^^^^^^^^
  */
-typedef struct {
-    UA_Double x;
-    UA_Float value;
-} UA_XVType;
+typedef enum {
+    UA_STRUCTURETYPE_STRUCTURE = 0,
+    UA_STRUCTURETYPE_STRUCTUREWITHOPTIONALFIELDS = 1,
+    UA_STRUCTURETYPE_UNION = 2,
+    __UA_STRUCTURETYPE_FORCE32BIT = 0x7fffffff
+} UA_StructureType;
+UA_STATIC_ASSERT(sizeof(UA_StructureType) == sizeof(UA_Int32), enum_must_be_32bit);
 
-#define UA_TYPES_XVTYPE 26
+#define UA_TYPES_STRUCTURETYPE 26
 
 /**
- * ElementOperand
+ * StructureField
  * ^^^^^^^^^^^^^^
  */
 typedef struct {
-    UA_UInt32 index;
-} UA_ElementOperand;
+    UA_String name;
+    UA_LocalizedText description;
+    UA_NodeId dataType;
+    UA_Int32 valueRank;
+    size_t arrayDimensionsSize;
+    UA_UInt32 *arrayDimensions;
+    UA_UInt32 maxStringLength;
+    UA_Boolean isOptional;
+} UA_StructureField;
 
-#define UA_TYPES_ELEMENTOPERAND 27
+#define UA_TYPES_STRUCTUREFIELD 27
 
 /**
- * VariableAttributes
- * ^^^^^^^^^^^^^^^^^^
- * The attributes for a variable node. */
+ * StructureDefinition
+ * ^^^^^^^^^^^^^^^^^^^
+ */
 typedef struct {
-    UA_UInt32 specifiedAttributes;
-    UA_LocalizedText displayName;
-    UA_LocalizedText description;
-    UA_UInt32 writeMask;
-    UA_UInt32 userWriteMask;
-    UA_Variant value;
+    UA_NodeId defaultEncodingId;
+    UA_NodeId baseDataType;
+    UA_StructureType structureType;
+    size_t fieldsSize;
+    UA_StructureField *fields;
+} UA_StructureDefinition;
+
+#define UA_TYPES_STRUCTUREDEFINITION 28
+
+/**
+ * Argument
+ * ^^^^^^^^
+ * An argument for a method. */
+typedef struct {
+    UA_String name;
     UA_NodeId dataType;
     UA_Int32 valueRank;
     size_t arrayDimensionsSize;
     UA_UInt32 *arrayDimensions;
-    UA_Byte accessLevel;
-    UA_Byte userAccessLevel;
-    UA_Double minimumSamplingInterval;
-    UA_Boolean historizing;
-} UA_VariableAttributes;
+    UA_LocalizedText description;
+} UA_Argument;
 
-#define UA_TYPES_VARIABLEATTRIBUTES 28
+#define UA_TYPES_ARGUMENT 29
 
 /**
  * EnumValueType
@@ -14338,91 +14358,156 @@ typedef struct {
     UA_LocalizedText description;
 } UA_EnumValueType;
 
-#define UA_TYPES_ENUMVALUETYPE 29
+#define UA_TYPES_ENUMVALUETYPE 30
 
 /**
- * EventFieldList
- * ^^^^^^^^^^^^^^
+ * EnumField
+ * ^^^^^^^^^
  */
 typedef struct {
-    UA_UInt32 clientHandle;
-    size_t eventFieldsSize;
-    UA_Variant *eventFields;
-} UA_EventFieldList;
+    UA_Int64 value;
+    UA_LocalizedText displayName;
+    UA_LocalizedText description;
+    UA_String name;
+} UA_EnumField;
 
-#define UA_TYPES_EVENTFIELDLIST 30
+#define UA_TYPES_ENUMFIELD 31
 
 /**
- * MonitoredItemCreateResult
- * ^^^^^^^^^^^^^^^^^^^^^^^^^
+ * Duration
+ * ^^^^^^^^
+ * A period of time measured in milliseconds. */
+typedef UA_Double UA_Duration;
+
+#define UA_TYPES_DURATION 32
+
+/**
+ * UtcTime
+ * ^^^^^^^
+ * A date/time value specified in Universal Coordinated Time (UTC). */
+typedef UA_DateTime UA_UtcTime;
+
+#define UA_TYPES_UTCTIME 33
+
+/**
+ * LocaleId
+ * ^^^^^^^^
+ * An identifier for a user locale. */
+typedef UA_String UA_LocaleId;
+
+#define UA_TYPES_LOCALEID 34
+
+/**
+ * TimeZoneDataType
+ * ^^^^^^^^^^^^^^^^
  */
 typedef struct {
-    UA_StatusCode statusCode;
-    UA_UInt32 monitoredItemId;
-    UA_Double revisedSamplingInterval;
-    UA_UInt32 revisedQueueSize;
-    UA_ExtensionObject filterResult;
-} UA_MonitoredItemCreateResult;
+    UA_Int16 offset;
+    UA_Boolean daylightSavingInOffset;
+} UA_TimeZoneDataType;
 
-#define UA_TYPES_MONITOREDITEMCREATERESULT 31
+#define UA_TYPES_TIMEZONEDATATYPE 35
 
 /**
- * EUInformation
+ * ApplicationType
+ * ^^^^^^^^^^^^^^^
+ * The types of applications. */
+typedef enum {
+    UA_APPLICATIONTYPE_SERVER = 0,
+    UA_APPLICATIONTYPE_CLIENT = 1,
+    UA_APPLICATIONTYPE_CLIENTANDSERVER = 2,
+    UA_APPLICATIONTYPE_DISCOVERYSERVER = 3,
+    __UA_APPLICATIONTYPE_FORCE32BIT = 0x7fffffff
+} UA_ApplicationType;
+UA_STATIC_ASSERT(sizeof(UA_ApplicationType) == sizeof(UA_Int32), enum_must_be_32bit);
+
+#define UA_TYPES_APPLICATIONTYPE 36
+
+/**
+ * ApplicationDescription
+ * ^^^^^^^^^^^^^^^^^^^^^^
+ * Describes an application and how to find it. */
+typedef struct {
+    UA_String applicationUri;
+    UA_String productUri;
+    UA_LocalizedText applicationName;
+    UA_ApplicationType applicationType;
+    UA_String gatewayServerUri;
+    UA_String discoveryProfileUri;
+    size_t discoveryUrlsSize;
+    UA_String *discoveryUrls;
+} UA_ApplicationDescription;
+
+#define UA_TYPES_APPLICATIONDESCRIPTION 37
+
+/**
+ * RequestHeader
  * ^^^^^^^^^^^^^
- */
+ * The header passed with every server request. */
 typedef struct {
-    UA_String namespaceUri;
-    UA_Int32 unitId;
-    UA_LocalizedText displayName;
-    UA_LocalizedText description;
-} UA_EUInformation;
+    UA_NodeId authenticationToken;
+    UA_DateTime timestamp;
+    UA_UInt32 requestHandle;
+    UA_UInt32 returnDiagnostics;
+    UA_String auditEntryId;
+    UA_UInt32 timeoutHint;
+    UA_ExtensionObject additionalHeader;
+} UA_RequestHeader;
 
-#define UA_TYPES_EUINFORMATION 32
+#define UA_TYPES_REQUESTHEADER 38
 
 /**
- * ServerDiagnosticsSummaryDataType
- * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- */
+ * ResponseHeader
+ * ^^^^^^^^^^^^^^
+ * The header passed with every server response. */
 typedef struct {
-    UA_UInt32 serverViewCount;
-    UA_UInt32 currentSessionCount;
-    UA_UInt32 cumulatedSessionCount;
-    UA_UInt32 securityRejectedSessionCount;
-    UA_UInt32 rejectedSessionCount;
-    UA_UInt32 sessionTimeoutCount;
-    UA_UInt32 sessionAbortCount;
-    UA_UInt32 currentSubscriptionCount;
-    UA_UInt32 cumulatedSubscriptionCount;
-    UA_UInt32 publishingIntervalCount;
-    UA_UInt32 securityRejectedRequestsCount;
-    UA_UInt32 rejectedRequestsCount;
-} UA_ServerDiagnosticsSummaryDataType;
+    UA_DateTime timestamp;
+    UA_UInt32 requestHandle;
+    UA_StatusCode serviceResult;
+    UA_DiagnosticInfo serviceDiagnostics;
+    size_t stringTableSize;
+    UA_String *stringTable;
+    UA_ExtensionObject additionalHeader;
+} UA_ResponseHeader;
 
-#define UA_TYPES_SERVERDIAGNOSTICSSUMMARYDATATYPE 33
+#define UA_TYPES_RESPONSEHEADER 39
 
 /**
- * ContentFilterElementResult
- * ^^^^^^^^^^^^^^^^^^^^^^^^^^
- */
+ * ServiceFault
+ * ^^^^^^^^^^^^
+ * The response returned by all services when there is a service level error. */
 typedef struct {
-    UA_StatusCode statusCode;
-    size_t operandStatusCodesSize;
-    UA_StatusCode *operandStatusCodes;
-    size_t operandDiagnosticInfosSize;
-    UA_DiagnosticInfo *operandDiagnosticInfos;
-} UA_ContentFilterElementResult;
+    UA_ResponseHeader responseHeader;
+} UA_ServiceFault;
 
-#define UA_TYPES_CONTENTFILTERELEMENTRESULT 34
+#define UA_TYPES_SERVICEFAULT 40
 
 /**
- * LiteralOperand
- * ^^^^^^^^^^^^^^
- */
+ * FindServersRequest
+ * ^^^^^^^^^^^^^^^^^^
+ * Finds the servers known to the discovery server. */
 typedef struct {
-    UA_Variant value;
-} UA_LiteralOperand;
+    UA_RequestHeader requestHeader;
+    UA_String endpointUrl;
+    size_t localeIdsSize;
+    UA_String *localeIds;
+    size_t serverUrisSize;
+    UA_String *serverUris;
+} UA_FindServersRequest;
 
-#define UA_TYPES_LITERALOPERAND 35
+#define UA_TYPES_FINDSERVERSREQUEST 41
+
+/**
+ * FindServersResponse
+ * ^^^^^^^^^^^^^^^^^^^
+ * Finds the servers known to the discovery server. */
+typedef struct {
+    UA_ResponseHeader responseHeader;
+    size_t serversSize;
+    UA_ApplicationDescription *servers;
+} UA_FindServersResponse;
+
+#define UA_TYPES_FINDSERVERSRESPONSE 42
 
 /**
  * MessageSecurityMode
@@ -14437,15 +14522,216 @@ typedef enum {
 } UA_MessageSecurityMode;
 UA_STATIC_ASSERT(sizeof(UA_MessageSecurityMode) == sizeof(UA_Int32), enum_must_be_32bit);
 
-#define UA_TYPES_MESSAGESECURITYMODE 36
+#define UA_TYPES_MESSAGESECURITYMODE 43
 
 /**
- * UtcTime
- * ^^^^^^^
- * A date/time value specified in Universal Coordinated Time (UTC). */
-typedef UA_DateTime UA_UtcTime;
+ * UserTokenType
+ * ^^^^^^^^^^^^^
+ * The possible user token types. */
+typedef enum {
+    UA_USERTOKENTYPE_ANONYMOUS = 0,
+    UA_USERTOKENTYPE_USERNAME = 1,
+    UA_USERTOKENTYPE_CERTIFICATE = 2,
+    UA_USERTOKENTYPE_ISSUEDTOKEN = 3,
+    __UA_USERTOKENTYPE_FORCE32BIT = 0x7fffffff
+} UA_UserTokenType;
+UA_STATIC_ASSERT(sizeof(UA_UserTokenType) == sizeof(UA_Int32), enum_must_be_32bit);
+
+#define UA_TYPES_USERTOKENTYPE 44
+
+/**
+ * UserTokenPolicy
+ * ^^^^^^^^^^^^^^^
+ * Describes a user token that can be used with a server. */
+typedef struct {
+    UA_String policyId;
+    UA_UserTokenType tokenType;
+    UA_String issuedTokenType;
+    UA_String issuerEndpointUrl;
+    UA_String securityPolicyUri;
+} UA_UserTokenPolicy;
+
+#define UA_TYPES_USERTOKENPOLICY 45
+
+/**
+ * EndpointDescription
+ * ^^^^^^^^^^^^^^^^^^^
+ * The description of a endpoint that can be used to access a server. */
+typedef struct {
+    UA_String endpointUrl;
+    UA_ApplicationDescription server;
+    UA_ByteString serverCertificate;
+    UA_MessageSecurityMode securityMode;
+    UA_String securityPolicyUri;
+    size_t userIdentityTokensSize;
+    UA_UserTokenPolicy *userIdentityTokens;
+    UA_String transportProfileUri;
+    UA_Byte securityLevel;
+} UA_EndpointDescription;
+
+#define UA_TYPES_ENDPOINTDESCRIPTION 46
+
+/**
+ * GetEndpointsRequest
+ * ^^^^^^^^^^^^^^^^^^^
+ * Gets the endpoints used by the server. */
+typedef struct {
+    UA_RequestHeader requestHeader;
+    UA_String endpointUrl;
+    size_t localeIdsSize;
+    UA_String *localeIds;
+    size_t profileUrisSize;
+    UA_String *profileUris;
+} UA_GetEndpointsRequest;
+
+#define UA_TYPES_GETENDPOINTSREQUEST 47
+
+/**
+ * GetEndpointsResponse
+ * ^^^^^^^^^^^^^^^^^^^^
+ * Gets the endpoints used by the server. */
+typedef struct {
+    UA_ResponseHeader responseHeader;
+    size_t endpointsSize;
+    UA_EndpointDescription *endpoints;
+} UA_GetEndpointsResponse;
+
+#define UA_TYPES_GETENDPOINTSRESPONSE 48
+
+/**
+ * SecurityTokenRequestType
+ * ^^^^^^^^^^^^^^^^^^^^^^^^
+ * Indicates whether a token if being created or renewed. */
+typedef enum {
+    UA_SECURITYTOKENREQUESTTYPE_ISSUE = 0,
+    UA_SECURITYTOKENREQUESTTYPE_RENEW = 1,
+    __UA_SECURITYTOKENREQUESTTYPE_FORCE32BIT = 0x7fffffff
+} UA_SecurityTokenRequestType;
+UA_STATIC_ASSERT(sizeof(UA_SecurityTokenRequestType) == sizeof(UA_Int32), enum_must_be_32bit);
+
+#define UA_TYPES_SECURITYTOKENREQUESTTYPE 49
+
+/**
+ * ChannelSecurityToken
+ * ^^^^^^^^^^^^^^^^^^^^
+ * The token that identifies a set of keys for an active secure channel. */
+typedef struct {
+    UA_UInt32 channelId;
+    UA_UInt32 tokenId;
+    UA_DateTime createdAt;
+    UA_UInt32 revisedLifetime;
+} UA_ChannelSecurityToken;
+
+#define UA_TYPES_CHANNELSECURITYTOKEN 50
+
+/**
+ * OpenSecureChannelRequest
+ * ^^^^^^^^^^^^^^^^^^^^^^^^
+ * Creates a secure channel with a server. */
+typedef struct {
+    UA_RequestHeader requestHeader;
+    UA_UInt32 clientProtocolVersion;
+    UA_SecurityTokenRequestType requestType;
+    UA_MessageSecurityMode securityMode;
+    UA_ByteString clientNonce;
+    UA_UInt32 requestedLifetime;
+} UA_OpenSecureChannelRequest;
+
+#define UA_TYPES_OPENSECURECHANNELREQUEST 51
+
+/**
+ * OpenSecureChannelResponse
+ * ^^^^^^^^^^^^^^^^^^^^^^^^^
+ * Creates a secure channel with a server. */
+typedef struct {
+    UA_ResponseHeader responseHeader;
+    UA_UInt32 serverProtocolVersion;
+    UA_ChannelSecurityToken securityToken;
+    UA_ByteString serverNonce;
+} UA_OpenSecureChannelResponse;
+
+#define UA_TYPES_OPENSECURECHANNELRESPONSE 52
+
+/**
+ * CloseSecureChannelRequest
+ * ^^^^^^^^^^^^^^^^^^^^^^^^^
+ * Closes a secure channel. */
+typedef struct {
+    UA_RequestHeader requestHeader;
+} UA_CloseSecureChannelRequest;
+
+#define UA_TYPES_CLOSESECURECHANNELREQUEST 53
+
+/**
+ * CloseSecureChannelResponse
+ * ^^^^^^^^^^^^^^^^^^^^^^^^^^
+ * Closes a secure channel. */
+typedef struct {
+    UA_ResponseHeader responseHeader;
+} UA_CloseSecureChannelResponse;
+
+#define UA_TYPES_CLOSESECURECHANNELRESPONSE 54
+
+/**
+ * SignedSoftwareCertificate
+ * ^^^^^^^^^^^^^^^^^^^^^^^^^
+ * A software certificate with a digital signature. */
+typedef struct {
+    UA_ByteString certificateData;
+    UA_ByteString signature;
+} UA_SignedSoftwareCertificate;
+
+#define UA_TYPES_SIGNEDSOFTWARECERTIFICATE 55
+
+/**
+ * SignatureData
+ * ^^^^^^^^^^^^^
+ * A digital signature. */
+typedef struct {
+    UA_String algorithm;
+    UA_ByteString signature;
+} UA_SignatureData;
+
+#define UA_TYPES_SIGNATUREDATA 56
+
+/**
+ * CreateSessionRequest
+ * ^^^^^^^^^^^^^^^^^^^^
+ * Creates a new session with the server. */
+typedef struct {
+    UA_RequestHeader requestHeader;
+    UA_ApplicationDescription clientDescription;
+    UA_String serverUri;
+    UA_String endpointUrl;
+    UA_String sessionName;
+    UA_ByteString clientNonce;
+    UA_ByteString clientCertificate;
+    UA_Double requestedSessionTimeout;
+    UA_UInt32 maxResponseMessageSize;
+} UA_CreateSessionRequest;
 
-#define UA_TYPES_UTCTIME 37
+#define UA_TYPES_CREATESESSIONREQUEST 57
+
+/**
+ * CreateSessionResponse
+ * ^^^^^^^^^^^^^^^^^^^^^
+ * Creates a new session with the server. */
+typedef struct {
+    UA_ResponseHeader responseHeader;
+    UA_NodeId sessionId;
+    UA_NodeId authenticationToken;
+    UA_Double revisedSessionTimeout;
+    UA_ByteString serverNonce;
+    UA_ByteString serverCertificate;
+    size_t serverEndpointsSize;
+    UA_EndpointDescription *serverEndpoints;
+    size_t serverSoftwareCertificatesSize;
+    UA_SignedSoftwareCertificate *serverSoftwareCertificates;
+    UA_SignatureData serverSignature;
+    UA_UInt32 maxRequestMessageSize;
+} UA_CreateSessionResponse;
+
+#define UA_TYPES_CREATESESSIONRESPONSE 58
 
 /**
  * UserIdentityToken
@@ -14455,7 +14741,30 @@ typedef struct {
     UA_String policyId;
 } UA_UserIdentityToken;
 
-#define UA_TYPES_USERIDENTITYTOKEN 38
+#define UA_TYPES_USERIDENTITYTOKEN 59
+
+/**
+ * AnonymousIdentityToken
+ * ^^^^^^^^^^^^^^^^^^^^^^
+ * A token representing an anonymous user. */
+typedef struct {
+    UA_String policyId;
+} UA_AnonymousIdentityToken;
+
+#define UA_TYPES_ANONYMOUSIDENTITYTOKEN 60
+
+/**
+ * UserNameIdentityToken
+ * ^^^^^^^^^^^^^^^^^^^^^
+ * A token representing a user identified by a user name and password. */
+typedef struct {
+    UA_String policyId;
+    UA_String userName;
+    UA_ByteString password;
+    UA_String encryptionAlgorithm;
+} UA_UserNameIdentityToken;
+
+#define UA_TYPES_USERNAMEIDENTITYTOKEN 61
 
 /**
  * X509IdentityToken
@@ -14466,72 +14775,118 @@ typedef struct {
     UA_ByteString certificateData;
 } UA_X509IdentityToken;
 
-#define UA_TYPES_X509IDENTITYTOKEN 39
+#define UA_TYPES_X509IDENTITYTOKEN 62
 
 /**
- * MonitoredItemNotification
- * ^^^^^^^^^^^^^^^^^^^^^^^^^
- */
+ * IssuedIdentityToken
+ * ^^^^^^^^^^^^^^^^^^^
+ * A token representing a user identified by a WS-Security XML token. */
 typedef struct {
-    UA_UInt32 clientHandle;
-    UA_DataValue value;
-} UA_MonitoredItemNotification;
+    UA_String policyId;
+    UA_ByteString tokenData;
+    UA_String encryptionAlgorithm;
+} UA_IssuedIdentityToken;
 
-#define UA_TYPES_MONITOREDITEMNOTIFICATION 40
+#define UA_TYPES_ISSUEDIDENTITYTOKEN 63
 
 /**
- * StructureType
- * ^^^^^^^^^^^^^
- */
-typedef enum {
-    UA_STRUCTURETYPE_STRUCTURE = 0,
-    UA_STRUCTURETYPE_STRUCTUREWITHOPTIONALFIELDS = 1,
-    UA_STRUCTURETYPE_UNION = 2,
-    __UA_STRUCTURETYPE_FORCE32BIT = 0x7fffffff
-} UA_StructureType;
-UA_STATIC_ASSERT(sizeof(UA_StructureType) == sizeof(UA_Int32), enum_must_be_32bit);
+ * ActivateSessionRequest
+ * ^^^^^^^^^^^^^^^^^^^^^^
+ * Activates a session with the server. */
+typedef struct {
+    UA_RequestHeader requestHeader;
+    UA_SignatureData clientSignature;
+    size_t clientSoftwareCertificatesSize;
+    UA_SignedSoftwareCertificate *clientSoftwareCertificates;
+    size_t localeIdsSize;
+    UA_String *localeIds;
+    UA_ExtensionObject userIdentityToken;
+    UA_SignatureData userTokenSignature;
+} UA_ActivateSessionRequest;
 
-#define UA_TYPES_STRUCTURETYPE 41
+#define UA_TYPES_ACTIVATESESSIONREQUEST 64
 
 /**
- * ResponseHeader
- * ^^^^^^^^^^^^^^
- * The header passed with every server response. */
+ * ActivateSessionResponse
+ * ^^^^^^^^^^^^^^^^^^^^^^^
+ * Activates a session with the server. */
 typedef struct {
-    UA_DateTime timestamp;
-    UA_UInt32 requestHandle;
-    UA_StatusCode serviceResult;
-    UA_DiagnosticInfo serviceDiagnostics;
-    size_t stringTableSize;
-    UA_String *stringTable;
-    UA_ExtensionObject additionalHeader;
-} UA_ResponseHeader;
+    UA_ResponseHeader responseHeader;
+    UA_ByteString serverNonce;
+    size_t resultsSize;
+    UA_StatusCode *results;
+    size_t diagnosticInfosSize;
+    UA_DiagnosticInfo *diagnosticInfos;
+} UA_ActivateSessionResponse;
 
-#define UA_TYPES_RESPONSEHEADER 42
+#define UA_TYPES_ACTIVATESESSIONRESPONSE 65
 
 /**
- * SignatureData
- * ^^^^^^^^^^^^^
- * A digital signature. */
+ * CloseSessionRequest
+ * ^^^^^^^^^^^^^^^^^^^
+ * Closes a session with the server. */
 typedef struct {
-    UA_String algorithm;
-    UA_ByteString signature;
-} UA_SignatureData;
+    UA_RequestHeader requestHeader;
+    UA_Boolean deleteSubscriptions;
+} UA_CloseSessionRequest;
 
-#define UA_TYPES_SIGNATUREDATA 43
+#define UA_TYPES_CLOSESESSIONREQUEST 66
 
 /**
- * ModifySubscriptionResponse
- * ^^^^^^^^^^^^^^^^^^^^^^^^^^
- */
+ * CloseSessionResponse
+ * ^^^^^^^^^^^^^^^^^^^^
+ * Closes a session with the server. */
 typedef struct {
     UA_ResponseHeader responseHeader;
-    UA_Double revisedPublishingInterval;
-    UA_UInt32 revisedLifetimeCount;
-    UA_UInt32 revisedMaxKeepAliveCount;
-} UA_ModifySubscriptionResponse;
+} UA_CloseSessionResponse;
+
+#define UA_TYPES_CLOSESESSIONRESPONSE 67
+
+/**
+ * NodeAttributesMask
+ * ^^^^^^^^^^^^^^^^^^
+ * The bits used to specify default attributes for a new node. */
+typedef enum {
+    UA_NODEATTRIBUTESMASK_NONE = 0,
+    UA_NODEATTRIBUTESMASK_ACCESSLEVEL = 1,
+    UA_NODEATTRIBUTESMASK_ARRAYDIMENSIONS = 2,
+    UA_NODEATTRIBUTESMASK_BROWSENAME = 4,
+    UA_NODEATTRIBUTESMASK_CONTAINSNOLOOPS = 8,
+    UA_NODEATTRIBUTESMASK_DATATYPE = 16,
+    UA_NODEATTRIBUTESMASK_DESCRIPTION = 32,
+    UA_NODEATTRIBUTESMASK_DISPLAYNAME = 64,
+    UA_NODEATTRIBUTESMASK_EVENTNOTIFIER = 128,
+    UA_NODEATTRIBUTESMASK_EXECUTABLE = 256,
+    UA_NODEATTRIBUTESMASK_HISTORIZING = 512,
+    UA_NODEATTRIBUTESMASK_INVERSENAME = 1024,
+    UA_NODEATTRIBUTESMASK_ISABSTRACT = 2048,
+    UA_NODEATTRIBUTESMASK_MINIMUMSAMPLINGINTERVAL = 4096,
+    UA_NODEATTRIBUTESMASK_NODECLASS = 8192,
+    UA_NODEATTRIBUTESMASK_NODEID = 16384,
+    UA_NODEATTRIBUTESMASK_SYMMETRIC = 32768,
+    UA_NODEATTRIBUTESMASK_USERACCESSLEVEL = 65536,
+    UA_NODEATTRIBUTESMASK_USEREXECUTABLE = 131072,
+    UA_NODEATTRIBUTESMASK_USERWRITEMASK = 262144,
+    UA_NODEATTRIBUTESMASK_VALUERANK = 524288,
+    UA_NODEATTRIBUTESMASK_WRITEMASK = 1048576,
+    UA_NODEATTRIBUTESMASK_VALUE = 2097152,
+    UA_NODEATTRIBUTESMASK_DATATYPEDEFINITION = 4194304,
+    UA_NODEATTRIBUTESMASK_ROLEPERMISSIONS = 8388608,
+    UA_NODEATTRIBUTESMASK_ACCESSRESTRICTIONS = 16777216,
+    UA_NODEATTRIBUTESMASK_ALL = 33554431,
+    UA_NODEATTRIBUTESMASK_BASENODE = 26501220,
+    UA_NODEATTRIBUTESMASK_OBJECT = 26501348,
+    UA_NODEATTRIBUTESMASK_OBJECTTYPE = 26503268,
+    UA_NODEATTRIBUTESMASK_VARIABLE = 26571383,
+    UA_NODEATTRIBUTESMASK_VARIABLETYPE = 28600438,
+    UA_NODEATTRIBUTESMASK_METHOD = 26632548,
+    UA_NODEATTRIBUTESMASK_REFERENCETYPE = 26537060,
+    UA_NODEATTRIBUTESMASK_VIEW = 26501356,
+    __UA_NODEATTRIBUTESMASK_FORCE32BIT = 0x7fffffff
+} UA_NodeAttributesMask;
+UA_STATIC_ASSERT(sizeof(UA_NodeAttributesMask) == sizeof(UA_Int32), enum_must_be_32bit);
 
-#define UA_TYPES_MODIFYSUBSCRIPTIONRESPONSE 44
+#define UA_TYPES_NODEATTRIBUTESMASK 68
 
 /**
  * NodeAttributes
@@ -14545,35 +14900,76 @@ typedef struct {
     UA_UInt32 userWriteMask;
 } UA_NodeAttributes;
 
-#define UA_TYPES_NODEATTRIBUTES 45
+#define UA_TYPES_NODEATTRIBUTES 69
 
 /**
- * ActivateSessionResponse
- * ^^^^^^^^^^^^^^^^^^^^^^^
- * Activates a session with the server. */
+ * ObjectAttributes
+ * ^^^^^^^^^^^^^^^^
+ * The attributes for an object node. */
 typedef struct {
-    UA_ResponseHeader responseHeader;
-    UA_ByteString serverNonce;
-    size_t resultsSize;
-    UA_StatusCode *results;
-    size_t diagnosticInfosSize;
-    UA_DiagnosticInfo *diagnosticInfos;
-} UA_ActivateSessionResponse;
+    UA_UInt32 specifiedAttributes;
+    UA_LocalizedText displayName;
+    UA_LocalizedText description;
+    UA_UInt32 writeMask;
+    UA_UInt32 userWriteMask;
+    UA_Byte eventNotifier;
+} UA_ObjectAttributes;
 
-#define UA_TYPES_ACTIVATESESSIONRESPONSE 46
+#define UA_TYPES_OBJECTATTRIBUTES 70
 
 /**
- * EnumField
- * ^^^^^^^^^
- */
+ * VariableAttributes
+ * ^^^^^^^^^^^^^^^^^^
+ * The attributes for a variable node. */
 typedef struct {
-    UA_Int64 value;
+    UA_UInt32 specifiedAttributes;
     UA_LocalizedText displayName;
     UA_LocalizedText description;
-    UA_String name;
-} UA_EnumField;
+    UA_UInt32 writeMask;
+    UA_UInt32 userWriteMask;
+    UA_Variant value;
+    UA_NodeId dataType;
+    UA_Int32 valueRank;
+    size_t arrayDimensionsSize;
+    UA_UInt32 *arrayDimensions;
+    UA_Byte accessLevel;
+    UA_Byte userAccessLevel;
+    UA_Double minimumSamplingInterval;
+    UA_Boolean historizing;
+} UA_VariableAttributes;
+
+#define UA_TYPES_VARIABLEATTRIBUTES 71
+
+/**
+ * MethodAttributes
+ * ^^^^^^^^^^^^^^^^
+ * The attributes for a method node. */
+typedef struct {
+    UA_UInt32 specifiedAttributes;
+    UA_LocalizedText displayName;
+    UA_LocalizedText description;
+    UA_UInt32 writeMask;
+    UA_UInt32 userWriteMask;
+    UA_Boolean executable;
+    UA_Boolean userExecutable;
+} UA_MethodAttributes;
 
-#define UA_TYPES_ENUMFIELD 47
+#define UA_TYPES_METHODATTRIBUTES 72
+
+/**
+ * ObjectTypeAttributes
+ * ^^^^^^^^^^^^^^^^^^^^
+ * The attributes for an object type node. */
+typedef struct {
+    UA_UInt32 specifiedAttributes;
+    UA_LocalizedText displayName;
+    UA_LocalizedText description;
+    UA_UInt32 writeMask;
+    UA_UInt32 userWriteMask;
+    UA_Boolean isAbstract;
+} UA_ObjectTypeAttributes;
+
+#define UA_TYPES_OBJECTTYPEATTRIBUTES 73
 
 /**
  * VariableTypeAttributes
@@ -14593,163 +14989,226 @@ typedef struct {
     UA_Boolean isAbstract;
 } UA_VariableTypeAttributes;
 
-#define UA_TYPES_VARIABLETYPEATTRIBUTES 48
+#define UA_TYPES_VARIABLETYPEATTRIBUTES 74
 
 /**
- * CallMethodResult
- * ^^^^^^^^^^^^^^^^
- */
+ * ReferenceTypeAttributes
+ * ^^^^^^^^^^^^^^^^^^^^^^^
+ * The attributes for a reference type node. */
 typedef struct {
-    UA_StatusCode statusCode;
-    size_t inputArgumentResultsSize;
-    UA_StatusCode *inputArgumentResults;
-    size_t inputArgumentDiagnosticInfosSize;
-    UA_DiagnosticInfo *inputArgumentDiagnosticInfos;
-    size_t outputArgumentsSize;
-    UA_Variant *outputArguments;
-} UA_CallMethodResult;
+    UA_UInt32 specifiedAttributes;
+    UA_LocalizedText displayName;
+    UA_LocalizedText description;
+    UA_UInt32 writeMask;
+    UA_UInt32 userWriteMask;
+    UA_Boolean isAbstract;
+    UA_Boolean symmetric;
+    UA_LocalizedText inverseName;
+} UA_ReferenceTypeAttributes;
 
-#define UA_TYPES_CALLMETHODRESULT 49
+#define UA_TYPES_REFERENCETYPEATTRIBUTES 75
 
 /**
- * MonitoringMode
+ * DataTypeAttributes
+ * ^^^^^^^^^^^^^^^^^^
+ * The attributes for a data type node. */
+typedef struct {
+    UA_UInt32 specifiedAttributes;
+    UA_LocalizedText displayName;
+    UA_LocalizedText description;
+    UA_UInt32 writeMask;
+    UA_UInt32 userWriteMask;
+    UA_Boolean isAbstract;
+} UA_DataTypeAttributes;
+
+#define UA_TYPES_DATATYPEATTRIBUTES 76
+
+/**
+ * ViewAttributes
  * ^^^^^^^^^^^^^^
- */
-typedef enum {
-    UA_MONITORINGMODE_DISABLED = 0,
-    UA_MONITORINGMODE_SAMPLING = 1,
-    UA_MONITORINGMODE_REPORTING = 2,
-    __UA_MONITORINGMODE_FORCE32BIT = 0x7fffffff
-} UA_MonitoringMode;
-UA_STATIC_ASSERT(sizeof(UA_MonitoringMode) == sizeof(UA_Int32), enum_must_be_32bit);
+ * The attributes for a view node. */
+typedef struct {
+    UA_UInt32 specifiedAttributes;
+    UA_LocalizedText displayName;
+    UA_LocalizedText description;
+    UA_UInt32 writeMask;
+    UA_UInt32 userWriteMask;
+    UA_Boolean containsNoLoops;
+    UA_Byte eventNotifier;
+} UA_ViewAttributes;
 
-#define UA_TYPES_MONITORINGMODE 50
+#define UA_TYPES_VIEWATTRIBUTES 77
 
 /**
- * SetMonitoringModeResponse
- * ^^^^^^^^^^^^^^^^^^^^^^^^^
- */
+ * AddNodesItem
+ * ^^^^^^^^^^^^
+ * A request to add a node to the server address space. */
+typedef struct {
+    UA_ExpandedNodeId parentNodeId;
+    UA_NodeId referenceTypeId;
+    UA_ExpandedNodeId requestedNewNodeId;
+    UA_QualifiedName browseName;
+    UA_NodeClass nodeClass;
+    UA_ExtensionObject nodeAttributes;
+    UA_ExpandedNodeId typeDefinition;
+} UA_AddNodesItem;
+
+#define UA_TYPES_ADDNODESITEM 78
+
+/**
+ * AddNodesResult
+ * ^^^^^^^^^^^^^^
+ * A result of an add node operation. */
+typedef struct {
+    UA_StatusCode statusCode;
+    UA_NodeId addedNodeId;
+} UA_AddNodesResult;
+
+#define UA_TYPES_ADDNODESRESULT 79
+
+/**
+ * AddNodesRequest
+ * ^^^^^^^^^^^^^^^
+ * Adds one or more nodes to the server address space. */
+typedef struct {
+    UA_RequestHeader requestHeader;
+    size_t nodesToAddSize;
+    UA_AddNodesItem *nodesToAdd;
+} UA_AddNodesRequest;
+
+#define UA_TYPES_ADDNODESREQUEST 80
+
+/**
+ * AddNodesResponse
+ * ^^^^^^^^^^^^^^^^
+ * Adds one or more nodes to the server address space. */
 typedef struct {
     UA_ResponseHeader responseHeader;
     size_t resultsSize;
-    UA_StatusCode *results;
+    UA_AddNodesResult *results;
     size_t diagnosticInfosSize;
     UA_DiagnosticInfo *diagnosticInfos;
-} UA_SetMonitoringModeResponse;
+} UA_AddNodesResponse;
 
-#define UA_TYPES_SETMONITORINGMODERESPONSE 51
+#define UA_TYPES_ADDNODESRESPONSE 81
 
 /**
- * BrowseResultMask
- * ^^^^^^^^^^^^^^^^
- * A bit mask which specifies what should be returned in a browse response. */
-typedef enum {
-    UA_BROWSERESULTMASK_NONE = 0,
-    UA_BROWSERESULTMASK_REFERENCETYPEID = 1,
-    UA_BROWSERESULTMASK_ISFORWARD = 2,
-    UA_BROWSERESULTMASK_NODECLASS = 4,
-    UA_BROWSERESULTMASK_BROWSENAME = 8,
-    UA_BROWSERESULTMASK_DISPLAYNAME = 16,
-    UA_BROWSERESULTMASK_TYPEDEFINITION = 32,
-    UA_BROWSERESULTMASK_ALL = 63,
-    UA_BROWSERESULTMASK_REFERENCETYPEINFO = 3,
-    UA_BROWSERESULTMASK_TARGETINFO = 60,
-    __UA_BROWSERESULTMASK_FORCE32BIT = 0x7fffffff
-} UA_BrowseResultMask;
-UA_STATIC_ASSERT(sizeof(UA_BrowseResultMask) == sizeof(UA_Int32), enum_must_be_32bit);
+ * AddReferencesItem
+ * ^^^^^^^^^^^^^^^^^
+ * A request to add a reference to the server address space. */
+typedef struct {
+    UA_NodeId sourceNodeId;
+    UA_NodeId referenceTypeId;
+    UA_Boolean isForward;
+    UA_String targetServerUri;
+    UA_ExpandedNodeId targetNodeId;
+    UA_NodeClass targetNodeClass;
+} UA_AddReferencesItem;
 
-#define UA_TYPES_BROWSERESULTMASK 52
+#define UA_TYPES_ADDREFERENCESITEM 82
 
 /**
- * RequestHeader
- * ^^^^^^^^^^^^^
- * The header passed with every server request. */
+ * AddReferencesRequest
+ * ^^^^^^^^^^^^^^^^^^^^
+ * Adds one or more references to the server address space. */
 typedef struct {
-    UA_NodeId authenticationToken;
-    UA_DateTime timestamp;
-    UA_UInt32 requestHandle;
-    UA_UInt32 returnDiagnostics;
-    UA_String auditEntryId;
-    UA_UInt32 timeoutHint;
-    UA_ExtensionObject additionalHeader;
-} UA_RequestHeader;
+    UA_RequestHeader requestHeader;
+    size_t referencesToAddSize;
+    UA_AddReferencesItem *referencesToAdd;
+} UA_AddReferencesRequest;
 
-#define UA_TYPES_REQUESTHEADER 53
+#define UA_TYPES_ADDREFERENCESREQUEST 83
 
 /**
- * MonitoredItemModifyResult
- * ^^^^^^^^^^^^^^^^^^^^^^^^^
- */
+ * AddReferencesResponse
+ * ^^^^^^^^^^^^^^^^^^^^^
+ * Adds one or more references to the server address space. */
 typedef struct {
-    UA_StatusCode statusCode;
-    UA_Double revisedSamplingInterval;
-    UA_UInt32 revisedQueueSize;
-    UA_ExtensionObject filterResult;
-} UA_MonitoredItemModifyResult;
+    UA_ResponseHeader responseHeader;
+    size_t resultsSize;
+    UA_StatusCode *results;
+    size_t diagnosticInfosSize;
+    UA_DiagnosticInfo *diagnosticInfos;
+} UA_AddReferencesResponse;
 
-#define UA_TYPES_MONITOREDITEMMODIFYRESULT 54
+#define UA_TYPES_ADDREFERENCESRESPONSE 84
 
 /**
- * CloseSecureChannelRequest
- * ^^^^^^^^^^^^^^^^^^^^^^^^^
- * Closes a secure channel. */
+ * DeleteNodesItem
+ * ^^^^^^^^^^^^^^^
+ * A request to delete a node to the server address space. */
+typedef struct {
+    UA_NodeId nodeId;
+    UA_Boolean deleteTargetReferences;
+} UA_DeleteNodesItem;
+
+#define UA_TYPES_DELETENODESITEM 85
+
+/**
+ * DeleteNodesRequest
+ * ^^^^^^^^^^^^^^^^^^
+ * Delete one or more nodes from the server address space. */
 typedef struct {
     UA_RequestHeader requestHeader;
-} UA_CloseSecureChannelRequest;
+    size_t nodesToDeleteSize;
+    UA_DeleteNodesItem *nodesToDelete;
+} UA_DeleteNodesRequest;
 
-#define UA_TYPES_CLOSESECURECHANNELREQUEST 55
+#define UA_TYPES_DELETENODESREQUEST 86
 
 /**
- * NotificationMessage
+ * DeleteNodesResponse
  * ^^^^^^^^^^^^^^^^^^^
- */
+ * Delete one or more nodes from the server address space. */
 typedef struct {
-    UA_UInt32 sequenceNumber;
-    UA_DateTime publishTime;
-    size_t notificationDataSize;
-    UA_ExtensionObject *notificationData;
-} UA_NotificationMessage;
+    UA_ResponseHeader responseHeader;
+    size_t resultsSize;
+    UA_StatusCode *results;
+    size_t diagnosticInfosSize;
+    UA_DiagnosticInfo *diagnosticInfos;
+} UA_DeleteNodesResponse;
 
-#define UA_TYPES_NOTIFICATIONMESSAGE 56
+#define UA_TYPES_DELETENODESRESPONSE 87
 
 /**
- * CreateSubscriptionResponse
- * ^^^^^^^^^^^^^^^^^^^^^^^^^^
- */
+ * DeleteReferencesItem
+ * ^^^^^^^^^^^^^^^^^^^^
+ * A request to delete a node from the server address space. */
 typedef struct {
-    UA_ResponseHeader responseHeader;
-    UA_UInt32 subscriptionId;
-    UA_Double revisedPublishingInterval;
-    UA_UInt32 revisedLifetimeCount;
-    UA_UInt32 revisedMaxKeepAliveCount;
-} UA_CreateSubscriptionResponse;
+    UA_NodeId sourceNodeId;
+    UA_NodeId referenceTypeId;
+    UA_Boolean isForward;
+    UA_ExpandedNodeId targetNodeId;
+    UA_Boolean deleteBidirectional;
+} UA_DeleteReferencesItem;
 
-#define UA_TYPES_CREATESUBSCRIPTIONRESPONSE 57
+#define UA_TYPES_DELETEREFERENCESITEM 88
 
 /**
- * EnumDefinition
- * ^^^^^^^^^^^^^^
- */
+ * DeleteReferencesRequest
+ * ^^^^^^^^^^^^^^^^^^^^^^^
+ * Delete one or more references from the server address space. */
 typedef struct {
-    size_t fieldsSize;
-    UA_EnumField *fields;
-} UA_EnumDefinition;
+    UA_RequestHeader requestHeader;
+    size_t referencesToDeleteSize;
+    UA_DeleteReferencesItem *referencesToDelete;
+} UA_DeleteReferencesRequest;
 
-#define UA_TYPES_ENUMDEFINITION 58
+#define UA_TYPES_DELETEREFERENCESREQUEST 89
 
 /**
- * AxisScaleEnumeration
- * ^^^^^^^^^^^^^^^^^^^^
- */
-typedef enum {
-    UA_AXISSCALEENUMERATION_LINEAR = 0,
-    UA_AXISSCALEENUMERATION_LOG = 1,
-    UA_AXISSCALEENUMERATION_LN = 2,
-    __UA_AXISSCALEENUMERATION_FORCE32BIT = 0x7fffffff
-} UA_AxisScaleEnumeration;
-UA_STATIC_ASSERT(sizeof(UA_AxisScaleEnumeration) == sizeof(UA_Int32), enum_must_be_32bit);
+ * DeleteReferencesResponse
+ * ^^^^^^^^^^^^^^^^^^^^^^^^
+ * Delete one or more references from the server address space. */
+typedef struct {
+    UA_ResponseHeader responseHeader;
+    size_t resultsSize;
+    UA_StatusCode *results;
+    size_t diagnosticInfosSize;
+    UA_DiagnosticInfo *diagnosticInfos;
+} UA_DeleteReferencesResponse;
 
-#define UA_TYPES_AXISSCALEENUMERATION 59
+#define UA_TYPES_DELETEREFERENCESRESPONSE 90
 
 /**
  * BrowseDirection
@@ -14764,162 +15223,112 @@ typedef enum {
 } UA_BrowseDirection;
 UA_STATIC_ASSERT(sizeof(UA_BrowseDirection) == sizeof(UA_Int32), enum_must_be_32bit);
 
-#define UA_TYPES_BROWSEDIRECTION 60
+#define UA_TYPES_BROWSEDIRECTION 91
 
 /**
- * CallMethodRequest
- * ^^^^^^^^^^^^^^^^^
- */
+ * ViewDescription
+ * ^^^^^^^^^^^^^^^
+ * The view to browse. */
 typedef struct {
-    UA_NodeId objectId;
-    UA_NodeId methodId;
-    size_t inputArgumentsSize;
-    UA_Variant *inputArguments;
-} UA_CallMethodRequest;
+    UA_NodeId viewId;
+    UA_DateTime timestamp;
+    UA_UInt32 viewVersion;
+} UA_ViewDescription;
 
-#define UA_TYPES_CALLMETHODREQUEST 61
+#define UA_TYPES_VIEWDESCRIPTION 92
 
 /**
- * ReadResponse
- * ^^^^^^^^^^^^
- */
+ * BrowseDescription
+ * ^^^^^^^^^^^^^^^^^
+ * A request to browse the the references from a node. */
 typedef struct {
-    UA_ResponseHeader responseHeader;
-    size_t resultsSize;
-    UA_DataValue *results;
-    size_t diagnosticInfosSize;
-    UA_DiagnosticInfo *diagnosticInfos;
-} UA_ReadResponse;
-
-#define UA_TYPES_READRESPONSE 62
-
-/**
- * TimestampsToReturn
- * ^^^^^^^^^^^^^^^^^^
- */
-typedef enum {
-    UA_TIMESTAMPSTORETURN_SOURCE = 0,
-    UA_TIMESTAMPSTORETURN_SERVER = 1,
-    UA_TIMESTAMPSTORETURN_BOTH = 2,
-    UA_TIMESTAMPSTORETURN_NEITHER = 3,
-    UA_TIMESTAMPSTORETURN_INVALID = 4,
-    __UA_TIMESTAMPSTORETURN_FORCE32BIT = 0x7fffffff
-} UA_TimestampsToReturn;
-UA_STATIC_ASSERT(sizeof(UA_TimestampsToReturn) == sizeof(UA_Int32), enum_must_be_32bit);
+    UA_NodeId nodeId;
+    UA_BrowseDirection browseDirection;
+    UA_NodeId referenceTypeId;
+    UA_Boolean includeSubtypes;
+    UA_UInt32 nodeClassMask;
+    UA_UInt32 resultMask;
+} UA_BrowseDescription;
 
-#define UA_TYPES_TIMESTAMPSTORETURN 63
+#define UA_TYPES_BROWSEDESCRIPTION 93
 
 /**
- * NodeClass
- * ^^^^^^^^^
- * A mask specifying the class of the node. */
+ * BrowseResultMask
+ * ^^^^^^^^^^^^^^^^
+ * A bit mask which specifies what should be returned in a browse response. */
 typedef enum {
-    UA_NODECLASS_UNSPECIFIED = 0,
-    UA_NODECLASS_OBJECT = 1,
-    UA_NODECLASS_VARIABLE = 2,
-    UA_NODECLASS_METHOD = 4,
-    UA_NODECLASS_OBJECTTYPE = 8,
-    UA_NODECLASS_VARIABLETYPE = 16,
-    UA_NODECLASS_REFERENCETYPE = 32,
-    UA_NODECLASS_DATATYPE = 64,
-    UA_NODECLASS_VIEW = 128,
-    __UA_NODECLASS_FORCE32BIT = 0x7fffffff
-} UA_NodeClass;
-UA_STATIC_ASSERT(sizeof(UA_NodeClass) == sizeof(UA_Int32), enum_must_be_32bit);
+    UA_BROWSERESULTMASK_NONE = 0,
+    UA_BROWSERESULTMASK_REFERENCETYPEID = 1,
+    UA_BROWSERESULTMASK_ISFORWARD = 2,
+    UA_BROWSERESULTMASK_NODECLASS = 4,
+    UA_BROWSERESULTMASK_BROWSENAME = 8,
+    UA_BROWSERESULTMASK_DISPLAYNAME = 16,
+    UA_BROWSERESULTMASK_TYPEDEFINITION = 32,
+    UA_BROWSERESULTMASK_ALL = 63,
+    UA_BROWSERESULTMASK_REFERENCETYPEINFO = 3,
+    UA_BROWSERESULTMASK_TARGETINFO = 60,
+    __UA_BROWSERESULTMASK_FORCE32BIT = 0x7fffffff
+} UA_BrowseResultMask;
+UA_STATIC_ASSERT(sizeof(UA_BrowseResultMask) == sizeof(UA_Int32), enum_must_be_32bit);
 
-#define UA_TYPES_NODECLASS 64
+#define UA_TYPES_BROWSERESULTMASK 94
 
 /**
- * ObjectTypeAttributes
+ * ReferenceDescription
  * ^^^^^^^^^^^^^^^^^^^^
- * The attributes for an object type node. */
+ * The description of a reference. */
 typedef struct {
-    UA_UInt32 specifiedAttributes;
+    UA_NodeId referenceTypeId;
+    UA_Boolean isForward;
+    UA_ExpandedNodeId nodeId;
+    UA_QualifiedName browseName;
     UA_LocalizedText displayName;
-    UA_LocalizedText description;
-    UA_UInt32 writeMask;
-    UA_UInt32 userWriteMask;
-    UA_Boolean isAbstract;
-} UA_ObjectTypeAttributes;
-
-#define UA_TYPES_OBJECTTYPEATTRIBUTES 65
-
-/**
- * SecurityTokenRequestType
- * ^^^^^^^^^^^^^^^^^^^^^^^^
- * Indicates whether a token if being created or renewed. */
-typedef enum {
-    UA_SECURITYTOKENREQUESTTYPE_ISSUE = 0,
-    UA_SECURITYTOKENREQUESTTYPE_RENEW = 1,
-    __UA_SECURITYTOKENREQUESTTYPE_FORCE32BIT = 0x7fffffff
-} UA_SecurityTokenRequestType;
-UA_STATIC_ASSERT(sizeof(UA_SecurityTokenRequestType) == sizeof(UA_Int32), enum_must_be_32bit);
+    UA_NodeClass nodeClass;
+    UA_ExpandedNodeId typeDefinition;
+} UA_ReferenceDescription;
 
-#define UA_TYPES_SECURITYTOKENREQUESTTYPE 66
+#define UA_TYPES_REFERENCEDESCRIPTION 95
 
 /**
- * CloseSessionResponse
- * ^^^^^^^^^^^^^^^^^^^^
- * Closes a session with the server. */
+ * BrowseResult
+ * ^^^^^^^^^^^^
+ * The result of a browse operation. */
 typedef struct {
-    UA_ResponseHeader responseHeader;
-} UA_CloseSessionResponse;
+    UA_StatusCode statusCode;
+    UA_ByteString continuationPoint;
+    size_t referencesSize;
+    UA_ReferenceDescription *references;
+} UA_BrowseResult;
 
-#define UA_TYPES_CLOSESESSIONRESPONSE 67
+#define UA_TYPES_BROWSERESULT 96
 
 /**
- * SetPublishingModeRequest
- * ^^^^^^^^^^^^^^^^^^^^^^^^
- */
+ * BrowseRequest
+ * ^^^^^^^^^^^^^
+ * Browse the references for one or more nodes from the server address space. */
 typedef struct {
     UA_RequestHeader requestHeader;
-    UA_Boolean publishingEnabled;
-    size_t subscriptionIdsSize;
-    UA_UInt32 *subscriptionIds;
-} UA_SetPublishingModeRequest;
-
-#define UA_TYPES_SETPUBLISHINGMODEREQUEST 68
-
-/**
- * IssuedIdentityToken
- * ^^^^^^^^^^^^^^^^^^^
- * A token representing a user identified by a WS-Security XML token. */
-typedef struct {
-    UA_String policyId;
-    UA_ByteString tokenData;
-    UA_String encryptionAlgorithm;
-} UA_IssuedIdentityToken;
+    UA_ViewDescription view;
+    UA_UInt32 requestedMaxReferencesPerNode;
+    size_t nodesToBrowseSize;
+    UA_BrowseDescription *nodesToBrowse;
+} UA_BrowseRequest;
 
-#define UA_TYPES_ISSUEDIDENTITYTOKEN 69
+#define UA_TYPES_BROWSEREQUEST 97
 
 /**
- * DeleteMonitoredItemsResponse
- * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- */
+ * BrowseResponse
+ * ^^^^^^^^^^^^^^
+ * Browse the references for one or more nodes from the server address space. */
 typedef struct {
     UA_ResponseHeader responseHeader;
     size_t resultsSize;
-    UA_StatusCode *results;
+    UA_BrowseResult *results;
     size_t diagnosticInfosSize;
     UA_DiagnosticInfo *diagnosticInfos;
-} UA_DeleteMonitoredItemsResponse;
-
-#define UA_TYPES_DELETEMONITOREDITEMSRESPONSE 70
-
-/**
- * ApplicationType
- * ^^^^^^^^^^^^^^^
- * The types of applications. */
-typedef enum {
-    UA_APPLICATIONTYPE_SERVER = 0,
-    UA_APPLICATIONTYPE_CLIENT = 1,
-    UA_APPLICATIONTYPE_CLIENTANDSERVER = 2,
-    UA_APPLICATIONTYPE_DISCOVERYSERVER = 3,
-    __UA_APPLICATIONTYPE_FORCE32BIT = 0x7fffffff
-} UA_ApplicationType;
-UA_STATIC_ASSERT(sizeof(UA_ApplicationType) == sizeof(UA_Int32), enum_must_be_32bit);
+} UA_BrowseResponse;
 
-#define UA_TYPES_APPLICATIONTYPE 71
+#define UA_TYPES_BROWSERESPONSE 98
 
 /**
  * BrowseNextRequest
@@ -14932,49 +15341,56 @@ typedef struct {
     UA_ByteString *continuationPoints;
 } UA_BrowseNextRequest;
 
-#define UA_TYPES_BROWSENEXTREQUEST 72
+#define UA_TYPES_BROWSENEXTREQUEST 99
 
 /**
- * ModifySubscriptionRequest
- * ^^^^^^^^^^^^^^^^^^^^^^^^^
- */
+ * BrowseNextResponse
+ * ^^^^^^^^^^^^^^^^^^
+ * Continues one or more browse operations. */
 typedef struct {
-    UA_RequestHeader requestHeader;
-    UA_UInt32 subscriptionId;
-    UA_Double requestedPublishingInterval;
-    UA_UInt32 requestedLifetimeCount;
-    UA_UInt32 requestedMaxKeepAliveCount;
-    UA_UInt32 maxNotificationsPerPublish;
-    UA_Byte priority;
-} UA_ModifySubscriptionRequest;
+    UA_ResponseHeader responseHeader;
+    size_t resultsSize;
+    UA_BrowseResult *results;
+    size_t diagnosticInfosSize;
+    UA_DiagnosticInfo *diagnosticInfos;
+} UA_BrowseNextResponse;
 
-#define UA_TYPES_MODIFYSUBSCRIPTIONREQUEST 73
+#define UA_TYPES_BROWSENEXTRESPONSE 100
 
 /**
- * BrowseDescription
- * ^^^^^^^^^^^^^^^^^
- * A request to browse the the references from a node. */
+ * RelativePathElement
+ * ^^^^^^^^^^^^^^^^^^^
+ * An element in a relative path. */
 typedef struct {
-    UA_NodeId nodeId;
-    UA_BrowseDirection browseDirection;
     UA_NodeId referenceTypeId;
+    UA_Boolean isInverse;
     UA_Boolean includeSubtypes;
-    UA_UInt32 nodeClassMask;
-    UA_UInt32 resultMask;
-} UA_BrowseDescription;
+    UA_QualifiedName targetName;
+} UA_RelativePathElement;
 
-#define UA_TYPES_BROWSEDESCRIPTION 74
+#define UA_TYPES_RELATIVEPATHELEMENT 101
 
 /**
- * SignedSoftwareCertificate
- * ^^^^^^^^^^^^^^^^^^^^^^^^^
- * A software certificate with a digital signature. */
+ * RelativePath
+ * ^^^^^^^^^^^^
+ * A relative path constructed from reference types and browse names. */
 typedef struct {
-    UA_ByteString certificateData;
-    UA_ByteString signature;
-} UA_SignedSoftwareCertificate;
+    size_t elementsSize;
+    UA_RelativePathElement *elements;
+} UA_RelativePath;
+
+#define UA_TYPES_RELATIVEPATH 102
 
-#define UA_TYPES_SIGNEDSOFTWARECERTIFICATE 75
+/**
+ * BrowsePath
+ * ^^^^^^^^^^
+ * A request to translate a path into a node id. */
+typedef struct {
+    UA_NodeId startingNode;
+    UA_RelativePath relativePath;
+} UA_BrowsePath;
+
+#define UA_TYPES_BROWSEPATH 103
 
 /**
  * BrowsePathTarget
@@ -14985,242 +15401,242 @@ typedef struct {
     UA_UInt32 remainingPathIndex;
 } UA_BrowsePathTarget;
 
-#define UA_TYPES_BROWSEPATHTARGET 76
+#define UA_TYPES_BROWSEPATHTARGET 104
 
 /**
- * WriteResponse
- * ^^^^^^^^^^^^^
- */
-typedef struct {
-    UA_ResponseHeader responseHeader;
-    size_t resultsSize;
-    UA_StatusCode *results;
-    size_t diagnosticInfosSize;
-    UA_DiagnosticInfo *diagnosticInfos;
-} UA_WriteResponse;
-
-#define UA_TYPES_WRITERESPONSE 77
-
-/**
- * AddNodesResult
- * ^^^^^^^^^^^^^^
- * A result of an add node operation. */
+ * BrowsePathResult
+ * ^^^^^^^^^^^^^^^^
+ * The result of a translate opearation. */
 typedef struct {
     UA_StatusCode statusCode;
-    UA_NodeId addedNodeId;
-} UA_AddNodesResult;
+    size_t targetsSize;
+    UA_BrowsePathTarget *targets;
+} UA_BrowsePathResult;
 
-#define UA_TYPES_ADDNODESRESULT 78
+#define UA_TYPES_BROWSEPATHRESULT 105
 
 /**
- * AddReferencesItem
- * ^^^^^^^^^^^^^^^^^
- * A request to add a reference to the server address space. */
+ * TranslateBrowsePathsToNodeIdsRequest
+ * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ * Translates one or more paths in the server address space. */
 typedef struct {
-    UA_NodeId sourceNodeId;
-    UA_NodeId referenceTypeId;
-    UA_Boolean isForward;
-    UA_String targetServerUri;
-    UA_ExpandedNodeId targetNodeId;
-    UA_NodeClass targetNodeClass;
-} UA_AddReferencesItem;
+    UA_RequestHeader requestHeader;
+    size_t browsePathsSize;
+    UA_BrowsePath *browsePaths;
+} UA_TranslateBrowsePathsToNodeIdsRequest;
 
-#define UA_TYPES_ADDREFERENCESITEM 79
+#define UA_TYPES_TRANSLATEBROWSEPATHSTONODEIDSREQUEST 106
 
 /**
- * DeleteReferencesResponse
- * ^^^^^^^^^^^^^^^^^^^^^^^^
- * Delete one or more references from the server address space. */
+ * TranslateBrowsePathsToNodeIdsResponse
+ * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ * Translates one or more paths in the server address space. */
 typedef struct {
     UA_ResponseHeader responseHeader;
     size_t resultsSize;
-    UA_StatusCode *results;
+    UA_BrowsePathResult *results;
     size_t diagnosticInfosSize;
     UA_DiagnosticInfo *diagnosticInfos;
-} UA_DeleteReferencesResponse;
+} UA_TranslateBrowsePathsToNodeIdsResponse;
 
-#define UA_TYPES_DELETEREFERENCESRESPONSE 80
+#define UA_TYPES_TRANSLATEBROWSEPATHSTONODEIDSRESPONSE 107
 
 /**
- * RelativePathElement
- * ^^^^^^^^^^^^^^^^^^^
- * An element in a relative path. */
+ * RegisterNodesRequest
+ * ^^^^^^^^^^^^^^^^^^^^
+ * Registers one or more nodes for repeated use within a session. */
 typedef struct {
-    UA_NodeId referenceTypeId;
-    UA_Boolean isInverse;
-    UA_Boolean includeSubtypes;
-    UA_QualifiedName targetName;
-} UA_RelativePathElement;
+    UA_RequestHeader requestHeader;
+    size_t nodesToRegisterSize;
+    UA_NodeId *nodesToRegister;
+} UA_RegisterNodesRequest;
 
-#define UA_TYPES_RELATIVEPATHELEMENT 81
+#define UA_TYPES_REGISTERNODESREQUEST 108
 
 /**
- * SubscriptionAcknowledgement
- * ^^^^^^^^^^^^^^^^^^^^^^^^^^^
- */
+ * RegisterNodesResponse
+ * ^^^^^^^^^^^^^^^^^^^^^
+ * Registers one or more nodes for repeated use within a session. */
 typedef struct {
-    UA_UInt32 subscriptionId;
-    UA_UInt32 sequenceNumber;
-} UA_SubscriptionAcknowledgement;
+    UA_ResponseHeader responseHeader;
+    size_t registeredNodeIdsSize;
+    UA_NodeId *registeredNodeIds;
+} UA_RegisterNodesResponse;
 
-#define UA_TYPES_SUBSCRIPTIONACKNOWLEDGEMENT 82
+#define UA_TYPES_REGISTERNODESRESPONSE 109
 
 /**
- * CreateMonitoredItemsResponse
- * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- */
+ * UnregisterNodesRequest
+ * ^^^^^^^^^^^^^^^^^^^^^^
+ * Unregisters one or more previously registered nodes. */
 typedef struct {
-    UA_ResponseHeader responseHeader;
-    size_t resultsSize;
-    UA_MonitoredItemCreateResult *results;
-    size_t diagnosticInfosSize;
-    UA_DiagnosticInfo *diagnosticInfos;
-} UA_CreateMonitoredItemsResponse;
+    UA_RequestHeader requestHeader;
+    size_t nodesToUnregisterSize;
+    UA_NodeId *nodesToUnregister;
+} UA_UnregisterNodesRequest;
 
-#define UA_TYPES_CREATEMONITOREDITEMSRESPONSE 83
+#define UA_TYPES_UNREGISTERNODESREQUEST 110
 
 /**
- * DeleteReferencesItem
- * ^^^^^^^^^^^^^^^^^^^^
- * A request to delete a node from the server address space. */
+ * UnregisterNodesResponse
+ * ^^^^^^^^^^^^^^^^^^^^^^^
+ * Unregisters one or more previously registered nodes. */
 typedef struct {
-    UA_NodeId sourceNodeId;
-    UA_NodeId referenceTypeId;
-    UA_Boolean isForward;
-    UA_ExpandedNodeId targetNodeId;
-    UA_Boolean deleteBidirectional;
-} UA_DeleteReferencesItem;
+    UA_ResponseHeader responseHeader;
+} UA_UnregisterNodesResponse;
 
-#define UA_TYPES_DELETEREFERENCESITEM 84
+#define UA_TYPES_UNREGISTERNODESRESPONSE 111
 
 /**
- * WriteValue
- * ^^^^^^^^^^
+ * FilterOperator
+ * ^^^^^^^^^^^^^^
  */
-typedef struct {
-    UA_NodeId nodeId;
-    UA_UInt32 attributeId;
-    UA_String indexRange;
-    UA_DataValue value;
-} UA_WriteValue;
+typedef enum {
+    UA_FILTEROPERATOR_EQUALS = 0,
+    UA_FILTEROPERATOR_ISNULL = 1,
+    UA_FILTEROPERATOR_GREATERTHAN = 2,
+    UA_FILTEROPERATOR_LESSTHAN = 3,
+    UA_FILTEROPERATOR_GREATERTHANOREQUAL = 4,
+    UA_FILTEROPERATOR_LESSTHANOREQUAL = 5,
+    UA_FILTEROPERATOR_LIKE = 6,
+    UA_FILTEROPERATOR_NOT = 7,
+    UA_FILTEROPERATOR_BETWEEN = 8,
+    UA_FILTEROPERATOR_INLIST = 9,
+    UA_FILTEROPERATOR_AND = 10,
+    UA_FILTEROPERATOR_OR = 11,
+    UA_FILTEROPERATOR_CAST = 12,
+    UA_FILTEROPERATOR_INVIEW = 13,
+    UA_FILTEROPERATOR_OFTYPE = 14,
+    UA_FILTEROPERATOR_RELATEDTO = 15,
+    UA_FILTEROPERATOR_BITWISEAND = 16,
+    UA_FILTEROPERATOR_BITWISEOR = 17,
+    __UA_FILTEROPERATOR_FORCE32BIT = 0x7fffffff
+} UA_FilterOperator;
+UA_STATIC_ASSERT(sizeof(UA_FilterOperator) == sizeof(UA_Int32), enum_must_be_32bit);
 
-#define UA_TYPES_WRITEVALUE 85
+#define UA_TYPES_FILTEROPERATOR 112
 
 /**
- * DataTypeAttributes
- * ^^^^^^^^^^^^^^^^^^
- * The attributes for a data type node. */
+ * ContentFilterElement
+ * ^^^^^^^^^^^^^^^^^^^^
+ */
 typedef struct {
-    UA_UInt32 specifiedAttributes;
-    UA_LocalizedText displayName;
-    UA_LocalizedText description;
-    UA_UInt32 writeMask;
-    UA_UInt32 userWriteMask;
-    UA_Boolean isAbstract;
-} UA_DataTypeAttributes;
+    UA_FilterOperator filterOperator;
+    size_t filterOperandsSize;
+    UA_ExtensionObject *filterOperands;
+} UA_ContentFilterElement;
 
-#define UA_TYPES_DATATYPEATTRIBUTES 86
+#define UA_TYPES_CONTENTFILTERELEMENT 113
 
 /**
- * AddReferencesResponse
- * ^^^^^^^^^^^^^^^^^^^^^
- * Adds one or more references to the server address space. */
+ * ContentFilter
+ * ^^^^^^^^^^^^^
+ */
 typedef struct {
-    UA_ResponseHeader responseHeader;
-    size_t resultsSize;
-    UA_StatusCode *results;
-    size_t diagnosticInfosSize;
-    UA_DiagnosticInfo *diagnosticInfos;
-} UA_AddReferencesResponse;
+    size_t elementsSize;
+    UA_ContentFilterElement *elements;
+} UA_ContentFilter;
 
-#define UA_TYPES_ADDREFERENCESRESPONSE 87
+#define UA_TYPES_CONTENTFILTER 114
 
 /**
- * DeadbandType
- * ^^^^^^^^^^^^
+ * FilterOperand
+ * ^^^^^^^^^^^^^
  */
-typedef enum {
-    UA_DEADBANDTYPE_NONE = 0,
-    UA_DEADBANDTYPE_ABSOLUTE = 1,
-    UA_DEADBANDTYPE_PERCENT = 2,
-    __UA_DEADBANDTYPE_FORCE32BIT = 0x7fffffff
-} UA_DeadbandType;
-UA_STATIC_ASSERT(sizeof(UA_DeadbandType) == sizeof(UA_Int32), enum_must_be_32bit);
+typedef void * UA_FilterOperand;
 
-#define UA_TYPES_DEADBANDTYPE 88
+#define UA_TYPES_FILTEROPERAND 115
 
 /**
- * DataChangeTrigger
- * ^^^^^^^^^^^^^^^^^
+ * ElementOperand
+ * ^^^^^^^^^^^^^^
  */
-typedef enum {
-    UA_DATACHANGETRIGGER_STATUS = 0,
-    UA_DATACHANGETRIGGER_STATUSVALUE = 1,
-    UA_DATACHANGETRIGGER_STATUSVALUETIMESTAMP = 2,
-    __UA_DATACHANGETRIGGER_FORCE32BIT = 0x7fffffff
-} UA_DataChangeTrigger;
-UA_STATIC_ASSERT(sizeof(UA_DataChangeTrigger) == sizeof(UA_Int32), enum_must_be_32bit);
+typedef struct {
+    UA_UInt32 index;
+} UA_ElementOperand;
 
-#define UA_TYPES_DATACHANGETRIGGER 89
+#define UA_TYPES_ELEMENTOPERAND 116
 
 /**
- * BuildInfo
- * ^^^^^^^^^
+ * LiteralOperand
+ * ^^^^^^^^^^^^^^
  */
 typedef struct {
-    UA_String productUri;
-    UA_String manufacturerName;
-    UA_String productName;
-    UA_String softwareVersion;
-    UA_String buildNumber;
-    UA_DateTime buildDate;
-} UA_BuildInfo;
+    UA_Variant value;
+} UA_LiteralOperand;
 
-#define UA_TYPES_BUILDINFO 90
+#define UA_TYPES_LITERALOPERAND 117
 
 /**
- * FilterOperand
- * ^^^^^^^^^^^^^
+ * AttributeOperand
+ * ^^^^^^^^^^^^^^^^
  */
-typedef void * UA_FilterOperand;
+typedef struct {
+    UA_NodeId nodeId;
+    UA_String alias;
+    UA_RelativePath browsePath;
+    UA_UInt32 attributeId;
+    UA_String indexRange;
+} UA_AttributeOperand;
 
-#define UA_TYPES_FILTEROPERAND 91
+#define UA_TYPES_ATTRIBUTEOPERAND 118
 
 /**
- * MonitoringParameters
- * ^^^^^^^^^^^^^^^^^^^^
+ * SimpleAttributeOperand
+ * ^^^^^^^^^^^^^^^^^^^^^^
  */
 typedef struct {
-    UA_UInt32 clientHandle;
-    UA_Double samplingInterval;
-    UA_ExtensionObject filter;
-    UA_UInt32 queueSize;
-    UA_Boolean discardOldest;
-} UA_MonitoringParameters;
+    UA_NodeId typeDefinitionId;
+    size_t browsePathSize;
+    UA_QualifiedName *browsePath;
+    UA_UInt32 attributeId;
+    UA_String indexRange;
+} UA_SimpleAttributeOperand;
 
-#define UA_TYPES_MONITORINGPARAMETERS 92
+#define UA_TYPES_SIMPLEATTRIBUTEOPERAND 119
 
 /**
- * DoubleComplexNumberType
- * ^^^^^^^^^^^^^^^^^^^^^^^
+ * ContentFilterElementResult
+ * ^^^^^^^^^^^^^^^^^^^^^^^^^^
  */
 typedef struct {
-    UA_Double real;
-    UA_Double imaginary;
-} UA_DoubleComplexNumberType;
+    UA_StatusCode statusCode;
+    size_t operandStatusCodesSize;
+    UA_StatusCode *operandStatusCodes;
+    size_t operandDiagnosticInfosSize;
+    UA_DiagnosticInfo *operandDiagnosticInfos;
+} UA_ContentFilterElementResult;
 
-#define UA_TYPES_DOUBLECOMPLEXNUMBERTYPE 93
+#define UA_TYPES_CONTENTFILTERELEMENTRESULT 120
 
 /**
- * DeleteNodesItem
- * ^^^^^^^^^^^^^^^
- * A request to delete a node to the server address space. */
+ * ContentFilterResult
+ * ^^^^^^^^^^^^^^^^^^^
+ */
 typedef struct {
-    UA_NodeId nodeId;
-    UA_Boolean deleteTargetReferences;
-} UA_DeleteNodesItem;
+    size_t elementResultsSize;
+    UA_ContentFilterElementResult *elementResults;
+    size_t elementDiagnosticInfosSize;
+    UA_DiagnosticInfo *elementDiagnosticInfos;
+} UA_ContentFilterResult;
 
-#define UA_TYPES_DELETENODESITEM 94
+#define UA_TYPES_CONTENTFILTERRESULT 121
+
+/**
+ * TimestampsToReturn
+ * ^^^^^^^^^^^^^^^^^^
+ */
+typedef enum {
+    UA_TIMESTAMPSTORETURN_SOURCE = 0,
+    UA_TIMESTAMPSTORETURN_SERVER = 1,
+    UA_TIMESTAMPSTORETURN_BOTH = 2,
+    UA_TIMESTAMPSTORETURN_NEITHER = 3,
+    UA_TIMESTAMPSTORETURN_INVALID = 4,
+    __UA_TIMESTAMPSTORETURN_FORCE32BIT = 0x7fffffff
+} UA_TimestampsToReturn;
+UA_STATIC_ASSERT(sizeof(UA_TimestampsToReturn) == sizeof(UA_Int32), enum_must_be_32bit);
+
+#define UA_TYPES_TIMESTAMPSTORETURN 122
 
 /**
  * ReadValueId
@@ -15233,591 +15649,587 @@ typedef struct {
     UA_QualifiedName dataEncoding;
 } UA_ReadValueId;
 
-#define UA_TYPES_READVALUEID 95
+#define UA_TYPES_READVALUEID 123
 
 /**
- * CallRequest
+ * ReadRequest
  * ^^^^^^^^^^^
  */
 typedef struct {
     UA_RequestHeader requestHeader;
-    size_t methodsToCallSize;
-    UA_CallMethodRequest *methodsToCall;
-} UA_CallRequest;
+    UA_Double maxAge;
+    UA_TimestampsToReturn timestampsToReturn;
+    size_t nodesToReadSize;
+    UA_ReadValueId *nodesToRead;
+} UA_ReadRequest;
 
-#define UA_TYPES_CALLREQUEST 96
+#define UA_TYPES_READREQUEST 124
 
 /**
- * RelativePath
+ * ReadResponse
  * ^^^^^^^^^^^^
- * A relative path constructed from reference types and browse names. */
+ */
 typedef struct {
-    size_t elementsSize;
-    UA_RelativePathElement *elements;
-} UA_RelativePath;
+    UA_ResponseHeader responseHeader;
+    size_t resultsSize;
+    UA_DataValue *results;
+    size_t diagnosticInfosSize;
+    UA_DiagnosticInfo *diagnosticInfos;
+} UA_ReadResponse;
 
-#define UA_TYPES_RELATIVEPATH 97
+#define UA_TYPES_READRESPONSE 125
 
 /**
- * DeleteNodesRequest
+ * HistoryReadValueId
  * ^^^^^^^^^^^^^^^^^^
- * Delete one or more nodes from the server address space. */
+ */
 typedef struct {
-    UA_RequestHeader requestHeader;
-    size_t nodesToDeleteSize;
-    UA_DeleteNodesItem *nodesToDelete;
-} UA_DeleteNodesRequest;
+    UA_NodeId nodeId;
+    UA_String indexRange;
+    UA_QualifiedName dataEncoding;
+    UA_ByteString continuationPoint;
+} UA_HistoryReadValueId;
 
-#define UA_TYPES_DELETENODESREQUEST 98
+#define UA_TYPES_HISTORYREADVALUEID 126
 
 /**
- * MonitoredItemModifyRequest
- * ^^^^^^^^^^^^^^^^^^^^^^^^^^
+ * HistoryReadResult
+ * ^^^^^^^^^^^^^^^^^
  */
 typedef struct {
-    UA_UInt32 monitoredItemId;
-    UA_MonitoringParameters requestedParameters;
-} UA_MonitoredItemModifyRequest;
+    UA_StatusCode statusCode;
+    UA_ByteString continuationPoint;
+    UA_ExtensionObject historyData;
+} UA_HistoryReadResult;
 
-#define UA_TYPES_MONITOREDITEMMODIFYREQUEST 99
+#define UA_TYPES_HISTORYREADRESULT 127
 
 /**
- * UserTokenType
- * ^^^^^^^^^^^^^
- * The possible user token types. */
-typedef enum {
-    UA_USERTOKENTYPE_ANONYMOUS = 0,
-    UA_USERTOKENTYPE_USERNAME = 1,
-    UA_USERTOKENTYPE_CERTIFICATE = 2,
-    UA_USERTOKENTYPE_ISSUEDTOKEN = 3,
-    __UA_USERTOKENTYPE_FORCE32BIT = 0x7fffffff
-} UA_UserTokenType;
-UA_STATIC_ASSERT(sizeof(UA_UserTokenType) == sizeof(UA_Int32), enum_must_be_32bit);
+ * ReadRawModifiedDetails
+ * ^^^^^^^^^^^^^^^^^^^^^^
+ */
+typedef struct {
+    UA_Boolean isReadModified;
+    UA_DateTime startTime;
+    UA_DateTime endTime;
+    UA_UInt32 numValuesPerNode;
+    UA_Boolean returnBounds;
+} UA_ReadRawModifiedDetails;
 
-#define UA_TYPES_USERTOKENTYPE 100
+#define UA_TYPES_READRAWMODIFIEDDETAILS 128
 
 /**
- * AggregateConfiguration
- * ^^^^^^^^^^^^^^^^^^^^^^
+ * ReadAtTimeDetails
+ * ^^^^^^^^^^^^^^^^^
  */
 typedef struct {
-    UA_Boolean useServerCapabilitiesDefaults;
-    UA_Boolean treatUncertainAsBad;
-    UA_Byte percentDataBad;
-    UA_Byte percentDataGood;
-    UA_Boolean useSlopedExtrapolation;
-} UA_AggregateConfiguration;
+    size_t reqTimesSize;
+    UA_DateTime *reqTimes;
+    UA_Boolean useSimpleBounds;
+} UA_ReadAtTimeDetails;
 
-#define UA_TYPES_AGGREGATECONFIGURATION 101
+#define UA_TYPES_READATTIMEDETAILS 129
 
 /**
- * LocaleId
- * ^^^^^^^^
- * An identifier for a user locale. */
-typedef UA_String UA_LocaleId;
+ * HistoryData
+ * ^^^^^^^^^^^
+ */
+typedef struct {
+    size_t dataValuesSize;
+    UA_DataValue *dataValues;
+} UA_HistoryData;
 
-#define UA_TYPES_LOCALEID 102
+#define UA_TYPES_HISTORYDATA 130
 
 /**
- * UnregisterNodesResponse
- * ^^^^^^^^^^^^^^^^^^^^^^^
- * Unregisters one or more previously registered nodes. */
+ * HistoryReadRequest
+ * ^^^^^^^^^^^^^^^^^^
+ */
 typedef struct {
-    UA_ResponseHeader responseHeader;
-} UA_UnregisterNodesResponse;
+    UA_RequestHeader requestHeader;
+    UA_ExtensionObject historyReadDetails;
+    UA_TimestampsToReturn timestampsToReturn;
+    UA_Boolean releaseContinuationPoints;
+    size_t nodesToReadSize;
+    UA_HistoryReadValueId *nodesToRead;
+} UA_HistoryReadRequest;
 
-#define UA_TYPES_UNREGISTERNODESRESPONSE 103
+#define UA_TYPES_HISTORYREADREQUEST 131
 
 /**
- * ContentFilterResult
+ * HistoryReadResponse
  * ^^^^^^^^^^^^^^^^^^^
  */
 typedef struct {
-    size_t elementResultsSize;
-    UA_ContentFilterElementResult *elementResults;
-    size_t elementDiagnosticInfosSize;
-    UA_DiagnosticInfo *elementDiagnosticInfos;
-} UA_ContentFilterResult;
+    UA_ResponseHeader responseHeader;
+    size_t resultsSize;
+    UA_HistoryReadResult *results;
+    size_t diagnosticInfosSize;
+    UA_DiagnosticInfo *diagnosticInfos;
+} UA_HistoryReadResponse;
 
-#define UA_TYPES_CONTENTFILTERRESULT 104
+#define UA_TYPES_HISTORYREADRESPONSE 132
 
 /**
- * UserTokenPolicy
- * ^^^^^^^^^^^^^^^
- * Describes a user token that can be used with a server. */
+ * WriteValue
+ * ^^^^^^^^^^
+ */
 typedef struct {
-    UA_String policyId;
-    UA_UserTokenType tokenType;
-    UA_String issuedTokenType;
-    UA_String issuerEndpointUrl;
-    UA_String securityPolicyUri;
-} UA_UserTokenPolicy;
+    UA_NodeId nodeId;
+    UA_UInt32 attributeId;
+    UA_String indexRange;
+    UA_DataValue value;
+} UA_WriteValue;
 
-#define UA_TYPES_USERTOKENPOLICY 105
+#define UA_TYPES_WRITEVALUE 133
 
 /**
- * DeleteMonitoredItemsRequest
- * ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ * WriteRequest
+ * ^^^^^^^^^^^^
  */
 typedef struct {
     UA_RequestHeader requestHeader;
-    UA_UInt32 subscriptionId;
-    size_t monitoredItemIdsSize;
-    UA_UInt32 *monitoredItemIds;
-} UA_DeleteMonitoredItemsRequest;
+    size_t nodesToWriteSize;
+    UA_WriteValue *nodesToWrite;
+} UA_WriteRequest;
 
-#define UA_TYPES_DELETEMONITOREDITEMSREQUEST 106
+#define UA_TYPES_WRITEREQUEST 134
 
 /**
- * SetMonitoringModeRequest
- * ^^^^^^^^^^^^^^^^^^^^^^^^
+ * WriteResponse
+ * ^^^^^^^^^^^^^
  */
 typedef struct {
-    UA_RequestHeader requestHeader;
-    UA_UInt32 subscriptionId;
-    UA_MonitoringMode monitoringMode;
-    size_t monitoredItemIdsSize;
-    UA_UInt32 *monitoredItemIds;
-} UA_SetMonitoringModeRequest;
+    UA_ResponseHeader responseHeader;
+    size_t resultsSize;
+    UA_StatusCode *results;
+    size_t diagnosticInfosSize;
+    UA_DiagnosticInfo *diagnosticInfos;
+} UA_WriteResponse;
 
-#define UA_TYPES_SETMONITORINGMODEREQUEST 107
+#define UA_TYPES_WRITERESPONSE 135
 
 /**
- * Duration
- * ^^^^^^^^
- * A period of time measured in milliseconds. */
-typedef UA_Double UA_Duration;
+ * HistoryUpdateType
+ * ^^^^^^^^^^^^^^^^^
+ */
+typedef enum {
+    UA_HISTORYUPDATETYPE_INSERT = 1,
+    UA_HISTORYUPDATETYPE_REPLACE = 2,
+    UA_HISTORYUPDATETYPE_UPDATE = 3,
+    UA_HISTORYUPDATETYPE_DELETE = 4,
+    __UA_HISTORYUPDATETYPE_FORCE32BIT = 0x7fffffff
+} UA_HistoryUpdateType;
+UA_STATIC_ASSERT(sizeof(UA_HistoryUpdateType) == sizeof(UA_Int32), enum_must_be_32bit);
 
-#define UA_TYPES_DURATION 108
+#define UA_TYPES_HISTORYUPDATETYPE 136
 
 /**
- * ReferenceTypeAttributes
- * ^^^^^^^^^^^^^^^^^^^^^^^
- * The attributes for a reference type node. */
+ * PerformUpdateType
+ * ^^^^^^^^^^^^^^^^^
+ */
+typedef enum {
+    UA_PERFORMUPDATETYPE_INSERT = 1,
+    UA_PERFORMUPDATETYPE_REPLACE = 2,
+    UA_PERFORMUPDATETYPE_UPDATE = 3,
+    UA_PERFORMUPDATETYPE_REMOVE = 4,
+    __UA_PERFORMUPDATETYPE_FORCE32BIT = 0x7fffffff
+} UA_PerformUpdateType;
+UA_STATIC_ASSERT(sizeof(UA_PerformUpdateType) == sizeof(UA_Int32), enum_must_be_32bit);
+
+#define UA_TYPES_PERFORMUPDATETYPE 137
+
+/**
+ * UpdateDataDetails
+ * ^^^^^^^^^^^^^^^^^
+ */
 typedef struct {
-    UA_UInt32 specifiedAttributes;
-    UA_LocalizedText displayName;
-    UA_LocalizedText description;
-    UA_UInt32 writeMask;
-    UA_UInt32 userWriteMask;
-    UA_Boolean isAbstract;
-    UA_Boolean symmetric;
-    UA_LocalizedText inverseName;
-} UA_ReferenceTypeAttributes;
+    UA_NodeId nodeId;
+    UA_PerformUpdateType performInsertReplace;
+    size_t updateValuesSize;
+    UA_DataValue *updateValues;
+} UA_UpdateDataDetails;
 
-#define UA_TYPES_REFERENCETYPEATTRIBUTES 109
+#define UA_TYPES_UPDATEDATADETAILS 138
 
 /**
- * GetEndpointsRequest
- * ^^^^^^^^^^^^^^^^^^^
- * Gets the endpoints used by the server. */
+ * DeleteRawModifiedDetails
+ * ^^^^^^^^^^^^^^^^^^^^^^^^
+ */
 typedef struct {
-    UA_RequestHeader requestHeader;
-    UA_String endpointUrl;
-    size_t localeIdsSize;
-    UA_String *localeIds;
-    size_t profileUrisSize;
-    UA_String *profileUris;
-} UA_GetEndpointsRequest;
+    UA_NodeId nodeId;
+    UA_Boolean isDeleteModified;
+    UA_DateTime startTime;
+    UA_DateTime endTime;
+} UA_DeleteRawModifiedDetails;
 
-#define UA_TYPES_GETENDPOINTSREQUEST 110
+#define UA_TYPES_DELETERAWMODIFIEDDETAILS 139
 
 /**
- * CloseSecureChannelResponse
- * ^^^^^^^^^^^^^^^^^^^^^^^^^^
- * Closes a secure channel. */
+ * HistoryUpdateResult
+ * ^^^^^^^^^^^^^^^^^^^
+ */
 typedef struct {
-    UA_ResponseHeader responseHeader;
-} UA_CloseSecureChannelResponse;
+    UA_StatusCode statusCode;
+    size_t operationResultsSize;
+    UA_StatusCode *operationResults;
+    size_t diagnosticInfosSize;
+    UA_DiagnosticInfo *diagnosticInfos;
+} UA_HistoryUpdateResult;
 
-#define UA_TYPES_CLOSESECURECHANNELRESPONSE 111
+#define UA_TYPES_HISTORYUPDATERESULT 140
 
 /**
- * ViewDescription
- * ^^^^^^^^^^^^^^^
- * The view to browse. */
+ * HistoryUpdateRequest
+ * ^^^^^^^^^^^^^^^^^^^^
+ */
 typedef struct {
-    UA_NodeId viewId;
-    UA_DateTime timestamp;
-    UA_UInt32 viewVersion;
-} UA_ViewDescription;
+    UA_RequestHeader requestHeader;
+    size_t historyUpdateDetailsSize;
+    UA_ExtensionObject *historyUpdateDetails;
+} UA_HistoryUpdateRequest;
 
-#define UA_TYPES_VIEWDESCRIPTION 112
+#define UA_TYPES_HISTORYUPDATEREQUEST 141
 
 /**
- * SetPublishingModeResponse
- * ^^^^^^^^^^^^^^^^^^^^^^^^^
+ * HistoryUpdateResponse
+ * ^^^^^^^^^^^^^^^^^^^^^
  */
 typedef struct {
     UA_ResponseHeader responseHeader;
     size_t resultsSize;
-    UA_StatusCode *results;
+    UA_HistoryUpdateResult *results;
     size_t diagnosticInfosSize;
     UA_DiagnosticInfo *diagnosticInfos;
-} UA_SetPublishingModeResponse;
+} UA_HistoryUpdateResponse;
 
-#define UA_TYPES_SETPUBLISHINGMODERESPONSE 113
+#define UA_TYPES_HISTORYUPDATERESPONSE 142
 
 /**
- * StatusChangeNotification
- * ^^^^^^^^^^^^^^^^^^^^^^^^
+ * CallMethodRequest
+ * ^^^^^^^^^^^^^^^^^
  */
 typedef struct {
-    UA_StatusCode status;
-    UA_DiagnosticInfo diagnosticInfo;
-} UA_StatusChangeNotification;
+    UA_NodeId objectId;
+    UA_NodeId methodId;
+    size_t inputArgumentsSize;
+    UA_Variant *inputArguments;
+} UA_CallMethodRequest;
 
-#define UA_TYPES_STATUSCHANGENOTIFICATION 114
+#define UA_TYPES_CALLMETHODREQUEST 143
 
 /**
- * StructureField
- * ^^^^^^^^^^^^^^
+ * CallMethodResult
+ * ^^^^^^^^^^^^^^^^
  */
 typedef struct {
-    UA_String name;
-    UA_LocalizedText description;
-    UA_NodeId dataType;
-    UA_Int32 valueRank;
-    size_t arrayDimensionsSize;
-    UA_UInt32 *arrayDimensions;
-    UA_UInt32 maxStringLength;
-    UA_Boolean isOptional;
-} UA_StructureField;
+    UA_StatusCode statusCode;
+    size_t inputArgumentResultsSize;
+    UA_StatusCode *inputArgumentResults;
+    size_t inputArgumentDiagnosticInfosSize;
+    UA_DiagnosticInfo *inputArgumentDiagnosticInfos;
+    size_t outputArgumentsSize;
+    UA_Variant *outputArguments;
+} UA_CallMethodResult;
 
-#define UA_TYPES_STRUCTUREFIELD 115
+#define UA_TYPES_CALLMETHODRESULT 144
 
 /**
- * NodeAttributesMask
- * ^^^^^^^^^^^^^^^^^^
- * The bits used to specify default attributes for a new node. */
-typedef enum {
-    UA_NODEATTRIBUTESMASK_NONE = 0,
-    UA_NODEATTRIBUTESMASK_ACCESSLEVEL = 1,
-    UA_NODEATTRIBUTESMASK_ARRAYDIMENSIONS = 2,
-    UA_NODEATTRIBUTESMASK_BROWSENAME = 4,
-    UA_NODEATTRIBUTESMASK_CONTAINSNOLOOPS = 8,
-    UA_NODEATTRIBUTESMASK_DATATYPE = 16,
-    UA_NODEATTRIBUTESMASK_DESCRIPTION = 32,
-    UA_NODEATTRIBUTESMASK_DISPLAYNAME = 64,
-    UA_NODEATTRIBUTESMASK_EVENTNOTIFIER = 128,
-    UA_NODEATTRIBUTESMASK_EXECUTABLE = 256,
-    UA_NODEATTRIBUTESMASK_HISTORIZING = 512,
-    UA_NODEATTRIBUTESMASK_INVERSENAME = 1024,
-    UA_NODEATTRIBUTESMASK_ISABSTRACT = 2048,
-    UA_NODEATTRIBUTESMASK_MINIMUMSAMPLINGINTERVAL = 4096,
-    UA_NODEATTRIBUTESMASK_NODECLASS = 8192,
-    UA_NODEATTRIBUTESMASK_NODEID = 16384,
-    UA_NODEATTRIBUTESMASK_SYMMETRIC = 32768,
-    UA_NODEATTRIBUTESMASK_USERACCESSLEVEL = 65536,
-    UA_NODEATTRIBUTESMASK_USEREXECUTABLE = 131072,
-    UA_NODEATTRIBUTESMASK_USERWRITEMASK = 262144,
-    UA_NODEATTRIBUTESMASK_VALUERANK = 524288,
-    UA_NODEATTRIBUTESMASK_WRITEMASK = 1048576,
-    UA_NODEATTRIBUTESMASK_VALUE = 2097152,
-    UA_NODEATTRIBUTESMASK_DATATYPEDEFINITION = 4194304,
-    UA_NODEATTRIBUTESMASK_ROLEPERMISSIONS = 8388608,
-    UA_NODEATTRIBUTESMASK_ACCESSRESTRICTIONS = 16777216,
-    UA_NODEATTRIBUTESMASK_ALL = 33554431,
-    UA_NODEATTRIBUTESMASK_BASENODE = 26501220,
-    UA_NODEATTRIBUTESMASK_OBJECT = 26501348,
-    UA_NODEATTRIBUTESMASK_OBJECTTYPE = 26503268,
-    UA_NODEATTRIBUTESMASK_VARIABLE = 26571383,
-    UA_NODEATTRIBUTESMASK_VARIABLETYPE = 28600438,
-    UA_NODEATTRIBUTESMASK_METHOD = 26632548,
-    UA_NODEATTRIBUTESMASK_REFERENCETYPE = 26537060,
-    UA_NODEATTRIBUTESMASK_VIEW = 26501356,
-    __UA_NODEATTRIBUTESMASK_FORCE32BIT = 0x7fffffff
-} UA_NodeAttributesMask;
-UA_STATIC_ASSERT(sizeof(UA_NodeAttributesMask) == sizeof(UA_Int32), enum_must_be_32bit);
+ * CallRequest
+ * ^^^^^^^^^^^
+ */
+typedef struct {
+    UA_RequestHeader requestHeader;
+    size_t methodsToCallSize;
+    UA_CallMethodRequest *methodsToCall;
+} UA_CallRequest;
 
-#define UA_TYPES_NODEATTRIBUTESMASK 116
+#define UA_TYPES_CALLREQUEST 145
 
 /**
- * EventFilterResult
- * ^^^^^^^^^^^^^^^^^
+ * CallResponse
+ * ^^^^^^^^^^^^
  */
 typedef struct {
-    size_t selectClauseResultsSize;
-    UA_StatusCode *selectClauseResults;
-    size_t selectClauseDiagnosticInfosSize;
-    UA_DiagnosticInfo *selectClauseDiagnosticInfos;
-    UA_ContentFilterResult whereClauseResult;
-} UA_EventFilterResult;
+    UA_ResponseHeader responseHeader;
+    size_t resultsSize;
+    UA_CallMethodResult *results;
+    size_t diagnosticInfosSize;
+    UA_DiagnosticInfo *diagnosticInfos;
+} UA_CallResponse;
 
-#define UA_TYPES_EVENTFILTERRESULT 117
+#define UA_TYPES_CALLRESPONSE 146
 
 /**
- * MonitoredItemCreateRequest
- * ^^^^^^^^^^^^^^^^^^^^^^^^^^
+ * MonitoringMode
+ * ^^^^^^^^^^^^^^
  */
-typedef struct {
-    UA_ReadValueId itemToMonitor;
-    UA_MonitoringMode monitoringMode;
-    UA_MonitoringParameters requestedParameters;
-} UA_MonitoredItemCreateRequest;
+typedef enum {
+    UA_MONITORINGMODE_DISABLED = 0,
+    UA_MONITORINGMODE_SAMPLING = 1,
+    UA_MONITORINGMODE_REPORTING = 2,
+    __UA_MONITORINGMODE_FORCE32BIT = 0x7fffffff
+} UA_MonitoringMode;
+UA_STATIC_ASSERT(sizeof(UA_MonitoringMode) == sizeof(UA_Int32), enum_must_be_32bit);
 
-#define UA_TYPES_MONITOREDITEMCREATEREQUEST 118
+#define UA_TYPES_MONITORINGMODE 147
 
 /**
- * ComplexNumberType
+ * DataChangeTrigger
  * ^^^^^^^^^^^^^^^^^
  */
-typedef struct {
-    UA_Float real;
-    UA_Float imaginary;
-} UA_ComplexNumberType;
+typedef enum {
+    UA_DATACHANGETRIGGER_STATUS = 0,
+    UA_DATACHANGETRIGGER_STATUSVALUE = 1,
+    UA_DATACHANGETRIGGER_STATUSVALUETIMESTAMP = 2,
+    __UA_DATACHANGETRIGGER_FORCE32BIT = 0x7fffffff
+} UA_DataChangeTrigger;
+UA_STATIC_ASSERT(sizeof(UA_DataChangeTrigger) == sizeof(UA_Int32), enum_must_be_32bit);
 
-#define UA_TYPES_COMPLEXNUMBERTYPE 119
+#define UA_TYPES_DATACHANGETRIGGER 148
 
 /**
- * Range
- * ^^^^^
+ * DeadbandType
+ * ^^^^^^^^^^^^
  */
-typedef struct {
-    UA_Double low;
-    UA_Double high;
-} UA_Range;
+typedef enum {
+    UA_DEADBANDTYPE_NONE = 0,
+    UA_DEADBANDTYPE_ABSOLUTE = 1,
+    UA_DEADBANDTYPE_PERCENT = 2,
+    __UA_DEADBANDTYPE_FORCE32BIT = 0x7fffffff
+} UA_DeadbandType;
+UA_STATIC_ASSERT(sizeof(UA_DeadbandType) == sizeof(UA_Int32), enum_must_be_32bit);
 
-#define UA_TYPES_RANGE 120
+#define UA_TYPES_DEADBANDTYPE 149
 
 /**
- * DataChangeNotification
- * ^^^^^^^^^^^^^^^^^^^^^^
+ * DataChangeFilter
+ * ^^^^^^^^^^^^^^^^
  */
 typedef struct {
-    size_t monitoredItemsSize;
-    UA_MonitoredItemNotification *monitoredItems;
-    size_t diagnosticInfosSize;
-    UA_DiagnosticInfo *diagnosticInfos;
-} UA_DataChangeNotification;
+    UA_DataChangeTrigger trigger;
+    UA_UInt32 deadbandType;
+    UA_Double deadbandValue;
+} UA_DataChangeFilter;
 
-#define UA_TYPES_DATACHANGENOTIFICATION 121
+#define UA_TYPES_DATACHANGEFILTER 150
 
 /**
- * Argument
- * ^^^^^^^^
- * An argument for a method. */
+ * EventFilter
+ * ^^^^^^^^^^^
+ */
 typedef struct {
-    UA_String name;
-    UA_NodeId dataType;
-    UA_Int32 valueRank;
-    size_t arrayDimensionsSize;
-    UA_UInt32 *arrayDimensions;
-    UA_LocalizedText description;
-} UA_Argument;
+    size_t selectClausesSize;
+    UA_SimpleAttributeOperand *selectClauses;
+    UA_ContentFilter whereClause;
+} UA_EventFilter;
 
-#define UA_TYPES_ARGUMENT 122
+#define UA_TYPES_EVENTFILTER 151
 
 /**
- * ChannelSecurityToken
- * ^^^^^^^^^^^^^^^^^^^^
- * The token that identifies a set of keys for an active secure channel. */
+ * AggregateConfiguration
+ * ^^^^^^^^^^^^^^^^^^^^^^
+ */
 typedef struct {
-    UA_UInt32 channelId;
-    UA_UInt32 tokenId;
-    UA_DateTime createdAt;
-    UA_UInt32 revisedLifetime;
-} UA_ChannelSecurityToken;
+    UA_Boolean useServerCapabilitiesDefaults;
+    UA_Boolean treatUncertainAsBad;
+    UA_Byte percentDataBad;
+    UA_Byte percentDataGood;
+    UA_Boolean useSlopedExtrapolation;
+} UA_AggregateConfiguration;
 
-#define UA_TYPES_CHANNELSECURITYTOKEN 123
+#define UA_TYPES_AGGREGATECONFIGURATION 152
 
 /**
- * ServerState
- * ^^^^^^^^^^^
+ * AggregateFilter
+ * ^^^^^^^^^^^^^^^
  */
-typedef enum {
-    UA_SERVERSTATE_RUNNING = 0,
-    UA_SERVERSTATE_FAILED = 1,
-    UA_SERVERSTATE_NOCONFIGURATION = 2,
-    UA_SERVERSTATE_SUSPENDED = 3,
-    UA_SERVERSTATE_SHUTDOWN = 4,
-    UA_SERVERSTATE_TEST = 5,
-    UA_SERVERSTATE_COMMUNICATIONFAULT = 6,
-    UA_SERVERSTATE_UNKNOWN = 7,
-    __UA_SERVERSTATE_FORCE32BIT = 0x7fffffff
-} UA_ServerState;
-UA_STATIC_ASSERT(sizeof(UA_ServerState) == sizeof(UA_Int32), enum_must_be_32bit);
+typedef struct {
+    UA_DateTime startTime;
+    UA_NodeId aggregateType;
+    UA_Double processingInterval;
+    UA_AggregateConfiguration aggregateConfiguration;
+} UA_AggregateFilter;
 
-#define UA_TYPES_SERVERSTATE 124
+#define UA_TYPES_AGGREGATEFILTER 153
 
 /**
- * EventNotificationList
- * ^^^^^^^^^^^^^^^^^^^^^
+ * EventFilterResult
+ * ^^^^^^^^^^^^^^^^^
  */
 typedef struct {
-    size_t eventsSize;
-    UA_EventFieldList *events;
-} UA_EventNotificationList;
+    size_t selectClauseResultsSize;
+    UA_StatusCode *selectClauseResults;
+    size_t selectClauseDiagnosticInfosSize;
+    UA_DiagnosticInfo *selectClauseDiagnosticInfos;
+    UA_ContentFilterResult whereClauseResult;
+} UA_EventFilterResult;
 
-#define UA_TYPES_EVENTNOTIFICATIONLIST 125
+#define UA_TYPES_EVENTFILTERRESULT 154
 
 /**
- * AnonymousIdentityToken
- * ^^^^^^^^^^^^^^^^^^^^^^
- * A token representing an anonymous user. */
+ * MonitoringParameters
+ * ^^^^^^^^^^^^^^^^^^^^
+ */
 typedef struct {
-    UA_String policyId;
-} UA_AnonymousIdentityToken;
+    UA_UInt32 clientHandle;
+    UA_Double samplingInterval;
+    UA_ExtensionObject filter;
+    UA_UInt32 queueSize;
+    UA_Boolean discardOldest;
+} UA_MonitoringParameters;
 
-#define UA_TYPES_ANONYMOUSIDENTITYTOKEN 126
+#define UA_TYPES_MONITORINGPARAMETERS 155
 
 /**
- * FilterOperator
- * ^^^^^^^^^^^^^^
+ * MonitoredItemCreateRequest
+ * ^^^^^^^^^^^^^^^^^^^^^^^^^^
  */
-typedef enum {
-    UA_FILTEROPERATOR_EQUALS = 0,
-    UA_FILTEROPERATOR_ISNULL = 1,
-    UA_FILTEROPERATOR_GREATERTHAN = 2,
-    UA_FILTEROPERATOR_LESSTHAN = 3,
-    UA_FILTEROPERATOR_GREATERTHANOREQUAL = 4,
-    UA_FILTEROPERATOR_LESSTHANOREQUAL = 5,
-    UA_FILTEROPERATOR_LIKE = 6,
-    UA_FILTEROPERATOR_NOT = 7,
-    UA_FILTEROPERATOR_BETWEEN = 8,
-    UA_FILTEROPERATOR_INLIST = 9,
-    UA_FILTEROPERATOR_AND = 10,
-    UA_FILTEROPERATOR_OR = 11,
-    UA_FILTEROPERATOR_CAST = 12,
-    UA_FILTEROPERATOR_INVIEW = 13,
-    UA_FILTEROPERATOR_OFTYPE = 14,
-    UA_FILTEROPERATOR_RELATEDTO = 15,
-    UA_FILTEROPERATOR_BITWISEAND = 16,
-    UA_FILTEROPERATOR_BITWISEOR = 17,
-    __UA_FILTEROPERATOR_FORCE32BIT = 0x7fffffff
-} UA_FilterOperator;
-UA_STATIC_ASSERT(sizeof(UA_FilterOperator) == sizeof(UA_Int32), enum_must_be_32bit);
+typedef struct {
+    UA_ReadValueId itemToMonitor;
+    UA_MonitoringMode monitoringMode;
+    UA_MonitoringParameters requestedParameters;
+} UA_MonitoredItemCreateRequest;
 
-#define UA_TYPES_FILTEROPERATOR 127
+#define UA_TYPES_MONITOREDITEMCREATEREQUEST 156
 
 /**
- * AggregateFilter
- * ^^^^^^^^^^^^^^^
+ * MonitoredItemCreateResult
+ * ^^^^^^^^^^^^^^^^^^^^^^^^^
  */
 typedef struct {
-    UA_DateTime startTime;
-    UA_NodeId aggregateType;
-    UA_Double processingInterval;
-    UA_AggregateConfiguration aggregateConfiguration;
-} UA_AggregateFilter;
+    UA_StatusCode statusCode;
+    UA_UInt32 monitoredItemId;
+    UA_Double revisedSamplingInterval;
+    UA_UInt32 revisedQueueSize;
+    UA_ExtensionObject filterResult;
+} UA_MonitoredItemCreateResult;
 
-#define UA_TYPES_AGGREGATEFILTER 128
+#define UA_TYPES_MONITOREDITEMCREATERESULT 157
 
 /**
- * RepublishResponse
- * ^^^^^^^^^^^^^^^^^
+ * CreateMonitoredItemsRequest
+ * ^^^^^^^^^^^^^^^^^^^^^^^^^^^
  */
 typedef struct {
-    UA_ResponseHeader responseHeader;
-    UA_NotificationMessage notificationMessage;
-} UA_RepublishResponse;
+    UA_RequestHeader requestHeader;
+    UA_UInt32 subscriptionId;
+    UA_TimestampsToReturn timestampsToReturn;
+    size_t itemsToCreateSize;
+    UA_MonitoredItemCreateRequest *itemsToCreate;
+} UA_CreateMonitoredItemsRequest;
 
-#define UA_TYPES_REPUBLISHRESPONSE 129
+#define UA_TYPES_CREATEMONITOREDITEMSREQUEST 158
 
 /**
- * DeleteSubscriptionsResponse
- * ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ * CreateMonitoredItemsResponse
+ * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  */
 typedef struct {
     UA_ResponseHeader responseHeader;
     size_t resultsSize;
-    UA_StatusCode *results;
+    UA_MonitoredItemCreateResult *results;
     size_t diagnosticInfosSize;
     UA_DiagnosticInfo *diagnosticInfos;
-} UA_DeleteSubscriptionsResponse;
+} UA_CreateMonitoredItemsResponse;
 
-#define UA_TYPES_DELETESUBSCRIPTIONSRESPONSE 130
+#define UA_TYPES_CREATEMONITOREDITEMSRESPONSE 159
 
 /**
- * RegisterNodesRequest
- * ^^^^^^^^^^^^^^^^^^^^
- * Registers one or more nodes for repeated use within a session. */
+ * MonitoredItemModifyRequest
+ * ^^^^^^^^^^^^^^^^^^^^^^^^^^
+ */
 typedef struct {
-    UA_RequestHeader requestHeader;
-    size_t nodesToRegisterSize;
-    UA_NodeId *nodesToRegister;
-} UA_RegisterNodesRequest;
+    UA_UInt32 monitoredItemId;
+    UA_MonitoringParameters requestedParameters;
+} UA_MonitoredItemModifyRequest;
 
-#define UA_TYPES_REGISTERNODESREQUEST 131
+#define UA_TYPES_MONITOREDITEMMODIFYREQUEST 160
 
 /**
- * StructureDefinition
- * ^^^^^^^^^^^^^^^^^^^
+ * MonitoredItemModifyResult
+ * ^^^^^^^^^^^^^^^^^^^^^^^^^
  */
 typedef struct {
-    UA_NodeId defaultEncodingId;
-    UA_NodeId baseDataType;
-    UA_StructureType structureType;
-    size_t fieldsSize;
-    UA_StructureField *fields;
-} UA_StructureDefinition;
+    UA_StatusCode statusCode;
+    UA_Double revisedSamplingInterval;
+    UA_UInt32 revisedQueueSize;
+    UA_ExtensionObject filterResult;
+} UA_MonitoredItemModifyResult;
 
-#define UA_TYPES_STRUCTUREDEFINITION 132
+#define UA_TYPES_MONITOREDITEMMODIFYRESULT 161
 
 /**
- * MethodAttributes
- * ^^^^^^^^^^^^^^^^
- * The attributes for a method node. */
+ * ModifyMonitoredItemsRequest
+ * ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ */
 typedef struct {
-    UA_UInt32 specifiedAttributes;
-    UA_LocalizedText displayName;
-    UA_LocalizedText description;
-    UA_UInt32 writeMask;
-    UA_UInt32 userWriteMask;
-    UA_Boolean executable;
-    UA_Boolean userExecutable;
-} UA_MethodAttributes;
+    UA_RequestHeader requestHeader;
+    UA_UInt32 subscriptionId;
+    UA_TimestampsToReturn timestampsToReturn;
+    size_t itemsToModifySize;
+    UA_MonitoredItemModifyRequest *itemsToModify;
+} UA_ModifyMonitoredItemsRequest;
 
-#define UA_TYPES_METHODATTRIBUTES 133
+#define UA_TYPES_MODIFYMONITOREDITEMSREQUEST 162
 
 /**
- * UserNameIdentityToken
- * ^^^^^^^^^^^^^^^^^^^^^
- * A token representing a user identified by a user name and password. */
+ * ModifyMonitoredItemsResponse
+ * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ */
 typedef struct {
-    UA_String policyId;
-    UA_String userName;
-    UA_ByteString password;
-    UA_String encryptionAlgorithm;
-} UA_UserNameIdentityToken;
+    UA_ResponseHeader responseHeader;
+    size_t resultsSize;
+    UA_MonitoredItemModifyResult *results;
+    size_t diagnosticInfosSize;
+    UA_DiagnosticInfo *diagnosticInfos;
+} UA_ModifyMonitoredItemsResponse;
 
-#define UA_TYPES_USERNAMEIDENTITYTOKEN 134
+#define UA_TYPES_MODIFYMONITOREDITEMSRESPONSE 163
 
 /**
- * TimeZoneDataType
- * ^^^^^^^^^^^^^^^^
+ * SetMonitoringModeRequest
+ * ^^^^^^^^^^^^^^^^^^^^^^^^
  */
 typedef struct {
-    UA_Int16 offset;
-    UA_Boolean daylightSavingInOffset;
-} UA_TimeZoneDataType;
+    UA_RequestHeader requestHeader;
+    UA_UInt32 subscriptionId;
+    UA_MonitoringMode monitoringMode;
+    size_t monitoredItemIdsSize;
+    UA_UInt32 *monitoredItemIds;
+} UA_SetMonitoringModeRequest;
 
-#define UA_TYPES_TIMEZONEDATATYPE 135
+#define UA_TYPES_SETMONITORINGMODEREQUEST 164
 
 /**
- * UnregisterNodesRequest
- * ^^^^^^^^^^^^^^^^^^^^^^
- * Unregisters one or more previously registered nodes. */
+ * SetMonitoringModeResponse
+ * ^^^^^^^^^^^^^^^^^^^^^^^^^
+ */
 typedef struct {
-    UA_RequestHeader requestHeader;
-    size_t nodesToUnregisterSize;
-    UA_NodeId *nodesToUnregister;
-} UA_UnregisterNodesRequest;
+    UA_ResponseHeader responseHeader;
+    size_t resultsSize;
+    UA_StatusCode *results;
+    size_t diagnosticInfosSize;
+    UA_DiagnosticInfo *diagnosticInfos;
+} UA_SetMonitoringModeResponse;
 
-#define UA_TYPES_UNREGISTERNODESREQUEST 136
+#define UA_TYPES_SETMONITORINGMODERESPONSE 165
 
 /**
- * OpenSecureChannelResponse
- * ^^^^^^^^^^^^^^^^^^^^^^^^^
- * Creates a secure channel with a server. */
+ * SetTriggeringRequest
+ * ^^^^^^^^^^^^^^^^^^^^
+ */
 typedef struct {
-    UA_ResponseHeader responseHeader;
-    UA_UInt32 serverProtocolVersion;
-    UA_ChannelSecurityToken securityToken;
-    UA_ByteString serverNonce;
-} UA_OpenSecureChannelResponse;
+    UA_RequestHeader requestHeader;
+    UA_UInt32 subscriptionId;
+    UA_UInt32 triggeringItemId;
+    size_t linksToAddSize;
+    UA_UInt32 *linksToAdd;
+    size_t linksToRemoveSize;
+    UA_UInt32 *linksToRemove;
+} UA_SetTriggeringRequest;
 
-#define UA_TYPES_OPENSECURECHANNELRESPONSE 137
+#define UA_TYPES_SETTRIGGERINGREQUEST 166
 
 /**
  * SetTriggeringResponse
@@ -15835,225 +16247,201 @@ typedef struct {
     UA_DiagnosticInfo *removeDiagnosticInfos;
 } UA_SetTriggeringResponse;
 
-#define UA_TYPES_SETTRIGGERINGRESPONSE 138
-
-/**
- * SimpleAttributeOperand
- * ^^^^^^^^^^^^^^^^^^^^^^
- */
-typedef struct {
-    UA_NodeId typeDefinitionId;
-    size_t browsePathSize;
-    UA_QualifiedName *browsePath;
-    UA_UInt32 attributeId;
-    UA_String indexRange;
-} UA_SimpleAttributeOperand;
-
-#define UA_TYPES_SIMPLEATTRIBUTEOPERAND 139
+#define UA_TYPES_SETTRIGGERINGRESPONSE 167
 
 /**
- * RepublishRequest
- * ^^^^^^^^^^^^^^^^
+ * DeleteMonitoredItemsRequest
+ * ^^^^^^^^^^^^^^^^^^^^^^^^^^^
  */
 typedef struct {
     UA_RequestHeader requestHeader;
     UA_UInt32 subscriptionId;
-    UA_UInt32 retransmitSequenceNumber;
-} UA_RepublishRequest;
-
-#define UA_TYPES_REPUBLISHREQUEST 140
-
-/**
- * RegisterNodesResponse
- * ^^^^^^^^^^^^^^^^^^^^^
- * Registers one or more nodes for repeated use within a session. */
-typedef struct {
-    UA_ResponseHeader responseHeader;
-    size_t registeredNodeIdsSize;
-    UA_NodeId *registeredNodeIds;
-} UA_RegisterNodesResponse;
+    size_t monitoredItemIdsSize;
+    UA_UInt32 *monitoredItemIds;
+} UA_DeleteMonitoredItemsRequest;
 
-#define UA_TYPES_REGISTERNODESRESPONSE 141
+#define UA_TYPES_DELETEMONITOREDITEMSREQUEST 168
 
 /**
- * ModifyMonitoredItemsResponse
+ * DeleteMonitoredItemsResponse
  * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  */
 typedef struct {
     UA_ResponseHeader responseHeader;
     size_t resultsSize;
-    UA_MonitoredItemModifyResult *results;
+    UA_StatusCode *results;
     size_t diagnosticInfosSize;
     UA_DiagnosticInfo *diagnosticInfos;
-} UA_ModifyMonitoredItemsResponse;
+} UA_DeleteMonitoredItemsResponse;
 
-#define UA_TYPES_MODIFYMONITOREDITEMSRESPONSE 142
+#define UA_TYPES_DELETEMONITOREDITEMSRESPONSE 169
 
 /**
- * DeleteSubscriptionsRequest
- * ^^^^^^^^^^^^^^^^^^^^^^^^^^
+ * CreateSubscriptionRequest
+ * ^^^^^^^^^^^^^^^^^^^^^^^^^
  */
 typedef struct {
     UA_RequestHeader requestHeader;
-    size_t subscriptionIdsSize;
-    UA_UInt32 *subscriptionIds;
-} UA_DeleteSubscriptionsRequest;
+    UA_Double requestedPublishingInterval;
+    UA_UInt32 requestedLifetimeCount;
+    UA_UInt32 requestedMaxKeepAliveCount;
+    UA_UInt32 maxNotificationsPerPublish;
+    UA_Boolean publishingEnabled;
+    UA_Byte priority;
+} UA_CreateSubscriptionRequest;
 
-#define UA_TYPES_DELETESUBSCRIPTIONSREQUEST 143
+#define UA_TYPES_CREATESUBSCRIPTIONREQUEST 170
 
 /**
- * RedundancySupport
- * ^^^^^^^^^^^^^^^^^
+ * CreateSubscriptionResponse
+ * ^^^^^^^^^^^^^^^^^^^^^^^^^^
  */
-typedef enum {
-    UA_REDUNDANCYSUPPORT_NONE = 0,
-    UA_REDUNDANCYSUPPORT_COLD = 1,
-    UA_REDUNDANCYSUPPORT_WARM = 2,
-    UA_REDUNDANCYSUPPORT_HOT = 3,
-    UA_REDUNDANCYSUPPORT_TRANSPARENT = 4,
-    UA_REDUNDANCYSUPPORT_HOTANDMIRRORED = 5,
-    __UA_REDUNDANCYSUPPORT_FORCE32BIT = 0x7fffffff
-} UA_RedundancySupport;
-UA_STATIC_ASSERT(sizeof(UA_RedundancySupport) == sizeof(UA_Int32), enum_must_be_32bit);
+typedef struct {
+    UA_ResponseHeader responseHeader;
+    UA_UInt32 subscriptionId;
+    UA_Double revisedPublishingInterval;
+    UA_UInt32 revisedLifetimeCount;
+    UA_UInt32 revisedMaxKeepAliveCount;
+} UA_CreateSubscriptionResponse;
 
-#define UA_TYPES_REDUNDANCYSUPPORT 144
+#define UA_TYPES_CREATESUBSCRIPTIONRESPONSE 171
 
 /**
- * BrowsePath
- * ^^^^^^^^^^
- * A request to translate a path into a node id. */
+ * ModifySubscriptionRequest
+ * ^^^^^^^^^^^^^^^^^^^^^^^^^
+ */
 typedef struct {
-    UA_NodeId startingNode;
-    UA_RelativePath relativePath;
-} UA_BrowsePath;
+    UA_RequestHeader requestHeader;
+    UA_UInt32 subscriptionId;
+    UA_Double requestedPublishingInterval;
+    UA_UInt32 requestedLifetimeCount;
+    UA_UInt32 requestedMaxKeepAliveCount;
+    UA_UInt32 maxNotificationsPerPublish;
+    UA_Byte priority;
+} UA_ModifySubscriptionRequest;
 
-#define UA_TYPES_BROWSEPATH 145
+#define UA_TYPES_MODIFYSUBSCRIPTIONREQUEST 172
 
 /**
- * ObjectAttributes
- * ^^^^^^^^^^^^^^^^
- * The attributes for an object node. */
+ * ModifySubscriptionResponse
+ * ^^^^^^^^^^^^^^^^^^^^^^^^^^
+ */
 typedef struct {
-    UA_UInt32 specifiedAttributes;
-    UA_LocalizedText displayName;
-    UA_LocalizedText description;
-    UA_UInt32 writeMask;
-    UA_UInt32 userWriteMask;
-    UA_Byte eventNotifier;
-} UA_ObjectAttributes;
+    UA_ResponseHeader responseHeader;
+    UA_Double revisedPublishingInterval;
+    UA_UInt32 revisedLifetimeCount;
+    UA_UInt32 revisedMaxKeepAliveCount;
+} UA_ModifySubscriptionResponse;
 
-#define UA_TYPES_OBJECTATTRIBUTES 146
+#define UA_TYPES_MODIFYSUBSCRIPTIONRESPONSE 173
 
 /**
- * PublishRequest
- * ^^^^^^^^^^^^^^
+ * SetPublishingModeRequest
+ * ^^^^^^^^^^^^^^^^^^^^^^^^
  */
 typedef struct {
     UA_RequestHeader requestHeader;
-    size_t subscriptionAcknowledgementsSize;
-    UA_SubscriptionAcknowledgement *subscriptionAcknowledgements;
-} UA_PublishRequest;
+    UA_Boolean publishingEnabled;
+    size_t subscriptionIdsSize;
+    UA_UInt32 *subscriptionIds;
+} UA_SetPublishingModeRequest;
 
-#define UA_TYPES_PUBLISHREQUEST 147
+#define UA_TYPES_SETPUBLISHINGMODEREQUEST 174
 
 /**
- * FindServersRequest
- * ^^^^^^^^^^^^^^^^^^
- * Finds the servers known to the discovery server. */
+ * SetPublishingModeResponse
+ * ^^^^^^^^^^^^^^^^^^^^^^^^^
+ */
 typedef struct {
-    UA_RequestHeader requestHeader;
-    UA_String endpointUrl;
-    size_t localeIdsSize;
-    UA_String *localeIds;
-    size_t serverUrisSize;
-    UA_String *serverUris;
-} UA_FindServersRequest;
+    UA_ResponseHeader responseHeader;
+    size_t resultsSize;
+    UA_StatusCode *results;
+    size_t diagnosticInfosSize;
+    UA_DiagnosticInfo *diagnosticInfos;
+} UA_SetPublishingModeResponse;
 
-#define UA_TYPES_FINDSERVERSREQUEST 148
+#define UA_TYPES_SETPUBLISHINGMODERESPONSE 175
 
 /**
- * ReferenceDescription
- * ^^^^^^^^^^^^^^^^^^^^
- * The description of a reference. */
+ * NotificationMessage
+ * ^^^^^^^^^^^^^^^^^^^
+ */
 typedef struct {
-    UA_NodeId referenceTypeId;
-    UA_Boolean isForward;
-    UA_ExpandedNodeId nodeId;
-    UA_QualifiedName browseName;
-    UA_LocalizedText displayName;
-    UA_NodeClass nodeClass;
-    UA_ExpandedNodeId typeDefinition;
-} UA_ReferenceDescription;
+    UA_UInt32 sequenceNumber;
+    UA_DateTime publishTime;
+    size_t notificationDataSize;
+    UA_ExtensionObject *notificationData;
+} UA_NotificationMessage;
 
-#define UA_TYPES_REFERENCEDESCRIPTION 149
+#define UA_TYPES_NOTIFICATIONMESSAGE 176
 
 /**
- * CreateSubscriptionRequest
+ * MonitoredItemNotification
  * ^^^^^^^^^^^^^^^^^^^^^^^^^
  */
 typedef struct {
-    UA_RequestHeader requestHeader;
-    UA_Double requestedPublishingInterval;
-    UA_UInt32 requestedLifetimeCount;
-    UA_UInt32 requestedMaxKeepAliveCount;
-    UA_UInt32 maxNotificationsPerPublish;
-    UA_Boolean publishingEnabled;
-    UA_Byte priority;
-} UA_CreateSubscriptionRequest;
+    UA_UInt32 clientHandle;
+    UA_DataValue value;
+} UA_MonitoredItemNotification;
 
-#define UA_TYPES_CREATESUBSCRIPTIONREQUEST 150
+#define UA_TYPES_MONITOREDITEMNOTIFICATION 177
 
 /**
- * CallResponse
- * ^^^^^^^^^^^^
+ * EventFieldList
+ * ^^^^^^^^^^^^^^
  */
 typedef struct {
-    UA_ResponseHeader responseHeader;
-    size_t resultsSize;
-    UA_CallMethodResult *results;
-    size_t diagnosticInfosSize;
-    UA_DiagnosticInfo *diagnosticInfos;
-} UA_CallResponse;
+    UA_UInt32 clientHandle;
+    size_t eventFieldsSize;
+    UA_Variant *eventFields;
+} UA_EventFieldList;
 
-#define UA_TYPES_CALLRESPONSE 151
+#define UA_TYPES_EVENTFIELDLIST 178
 
 /**
- * DeleteNodesResponse
- * ^^^^^^^^^^^^^^^^^^^
- * Delete one or more nodes from the server address space. */
+ * HistoryEventFieldList
+ * ^^^^^^^^^^^^^^^^^^^^^
+ */
 typedef struct {
-    UA_ResponseHeader responseHeader;
-    size_t resultsSize;
-    UA_StatusCode *results;
-    size_t diagnosticInfosSize;
-    UA_DiagnosticInfo *diagnosticInfos;
-} UA_DeleteNodesResponse;
+    size_t eventFieldsSize;
+    UA_Variant *eventFields;
+} UA_HistoryEventFieldList;
 
-#define UA_TYPES_DELETENODESRESPONSE 152
+#define UA_TYPES_HISTORYEVENTFIELDLIST 179
 
 /**
- * ModifyMonitoredItemsRequest
+ * StatusChangeNotification
+ * ^^^^^^^^^^^^^^^^^^^^^^^^
+ */
+typedef struct {
+    UA_StatusCode status;
+    UA_DiagnosticInfo diagnosticInfo;
+} UA_StatusChangeNotification;
+
+#define UA_TYPES_STATUSCHANGENOTIFICATION 180
+
+/**
+ * SubscriptionAcknowledgement
  * ^^^^^^^^^^^^^^^^^^^^^^^^^^^
  */
 typedef struct {
-    UA_RequestHeader requestHeader;
     UA_UInt32 subscriptionId;
-    UA_TimestampsToReturn timestampsToReturn;
-    size_t itemsToModifySize;
-    UA_MonitoredItemModifyRequest *itemsToModify;
-} UA_ModifyMonitoredItemsRequest;
+    UA_UInt32 sequenceNumber;
+} UA_SubscriptionAcknowledgement;
 
-#define UA_TYPES_MODIFYMONITOREDITEMSREQUEST 153
+#define UA_TYPES_SUBSCRIPTIONACKNOWLEDGEMENT 181
 
 /**
- * ServiceFault
- * ^^^^^^^^^^^^
- * The response returned by all services when there is a service level error. */
+ * PublishRequest
+ * ^^^^^^^^^^^^^^
+ */
 typedef struct {
-    UA_ResponseHeader responseHeader;
-} UA_ServiceFault;
+    UA_RequestHeader requestHeader;
+    size_t subscriptionAcknowledgementsSize;
+    UA_SubscriptionAcknowledgement *subscriptionAcknowledgements;
+} UA_PublishRequest;
 
-#define UA_TYPES_SERVICEFAULT 154
+#define UA_TYPES_PUBLISHREQUEST 182
 
 /**
  * PublishResponse
@@ -16072,104 +16460,128 @@ typedef struct {
     UA_DiagnosticInfo *diagnosticInfos;
 } UA_PublishResponse;
 
-#define UA_TYPES_PUBLISHRESPONSE 155
+#define UA_TYPES_PUBLISHRESPONSE 183
 
 /**
- * CreateMonitoredItemsRequest
- * ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ * RepublishRequest
+ * ^^^^^^^^^^^^^^^^
  */
 typedef struct {
     UA_RequestHeader requestHeader;
     UA_UInt32 subscriptionId;
-    UA_TimestampsToReturn timestampsToReturn;
-    size_t itemsToCreateSize;
-    UA_MonitoredItemCreateRequest *itemsToCreate;
-} UA_CreateMonitoredItemsRequest;
+    UA_UInt32 retransmitSequenceNumber;
+} UA_RepublishRequest;
 
-#define UA_TYPES_CREATEMONITOREDITEMSREQUEST 156
+#define UA_TYPES_REPUBLISHREQUEST 184
 
 /**
- * OpenSecureChannelRequest
- * ^^^^^^^^^^^^^^^^^^^^^^^^
- * Creates a secure channel with a server. */
+ * RepublishResponse
+ * ^^^^^^^^^^^^^^^^^
+ */
 typedef struct {
-    UA_RequestHeader requestHeader;
-    UA_UInt32 clientProtocolVersion;
-    UA_SecurityTokenRequestType requestType;
-    UA_MessageSecurityMode securityMode;
-    UA_ByteString clientNonce;
-    UA_UInt32 requestedLifetime;
-} UA_OpenSecureChannelRequest;
+    UA_ResponseHeader responseHeader;
+    UA_NotificationMessage notificationMessage;
+} UA_RepublishResponse;
 
-#define UA_TYPES_OPENSECURECHANNELREQUEST 157
+#define UA_TYPES_REPUBLISHRESPONSE 185
 
 /**
- * CloseSessionRequest
- * ^^^^^^^^^^^^^^^^^^^
- * Closes a session with the server. */
+ * DeleteSubscriptionsRequest
+ * ^^^^^^^^^^^^^^^^^^^^^^^^^^
+ */
 typedef struct {
     UA_RequestHeader requestHeader;
-    UA_Boolean deleteSubscriptions;
-} UA_CloseSessionRequest;
+    size_t subscriptionIdsSize;
+    UA_UInt32 *subscriptionIds;
+} UA_DeleteSubscriptionsRequest;
 
-#define UA_TYPES_CLOSESESSIONREQUEST 158
+#define UA_TYPES_DELETESUBSCRIPTIONSREQUEST 186
 
 /**
- * SetTriggeringRequest
- * ^^^^^^^^^^^^^^^^^^^^
+ * DeleteSubscriptionsResponse
+ * ^^^^^^^^^^^^^^^^^^^^^^^^^^^
  */
 typedef struct {
-    UA_RequestHeader requestHeader;
-    UA_UInt32 subscriptionId;
-    UA_UInt32 triggeringItemId;
-    size_t linksToAddSize;
-    UA_UInt32 *linksToAdd;
-    size_t linksToRemoveSize;
-    UA_UInt32 *linksToRemove;
-} UA_SetTriggeringRequest;
+    UA_ResponseHeader responseHeader;
+    size_t resultsSize;
+    UA_StatusCode *results;
+    size_t diagnosticInfosSize;
+    UA_DiagnosticInfo *diagnosticInfos;
+} UA_DeleteSubscriptionsResponse;
 
-#define UA_TYPES_SETTRIGGERINGREQUEST 159
+#define UA_TYPES_DELETESUBSCRIPTIONSRESPONSE 187
 
 /**
- * BrowseResult
- * ^^^^^^^^^^^^
- * The result of a browse operation. */
+ * BuildInfo
+ * ^^^^^^^^^
+ */
 typedef struct {
-    UA_StatusCode statusCode;
-    UA_ByteString continuationPoint;
-    size_t referencesSize;
-    UA_ReferenceDescription *references;
-} UA_BrowseResult;
+    UA_String productUri;
+    UA_String manufacturerName;
+    UA_String productName;
+    UA_String softwareVersion;
+    UA_String buildNumber;
+    UA_DateTime buildDate;
+} UA_BuildInfo;
 
-#define UA_TYPES_BROWSERESULT 160
+#define UA_TYPES_BUILDINFO 188
 
 /**
- * AddReferencesRequest
- * ^^^^^^^^^^^^^^^^^^^^
- * Adds one or more references to the server address space. */
-typedef struct {
-    UA_RequestHeader requestHeader;
-    size_t referencesToAddSize;
-    UA_AddReferencesItem *referencesToAdd;
-} UA_AddReferencesRequest;
+ * RedundancySupport
+ * ^^^^^^^^^^^^^^^^^
+ */
+typedef enum {
+    UA_REDUNDANCYSUPPORT_NONE = 0,
+    UA_REDUNDANCYSUPPORT_COLD = 1,
+    UA_REDUNDANCYSUPPORT_WARM = 2,
+    UA_REDUNDANCYSUPPORT_HOT = 3,
+    UA_REDUNDANCYSUPPORT_TRANSPARENT = 4,
+    UA_REDUNDANCYSUPPORT_HOTANDMIRRORED = 5,
+    __UA_REDUNDANCYSUPPORT_FORCE32BIT = 0x7fffffff
+} UA_RedundancySupport;
+UA_STATIC_ASSERT(sizeof(UA_RedundancySupport) == sizeof(UA_Int32), enum_must_be_32bit);
 
-#define UA_TYPES_ADDREFERENCESREQUEST 161
+#define UA_TYPES_REDUNDANCYSUPPORT 189
 
 /**
- * AddNodesItem
- * ^^^^^^^^^^^^
- * A request to add a node to the server address space. */
+ * ServerState
+ * ^^^^^^^^^^^
+ */
+typedef enum {
+    UA_SERVERSTATE_RUNNING = 0,
+    UA_SERVERSTATE_FAILED = 1,
+    UA_SERVERSTATE_NOCONFIGURATION = 2,
+    UA_SERVERSTATE_SUSPENDED = 3,
+    UA_SERVERSTATE_SHUTDOWN = 4,
+    UA_SERVERSTATE_TEST = 5,
+    UA_SERVERSTATE_COMMUNICATIONFAULT = 6,
+    UA_SERVERSTATE_UNKNOWN = 7,
+    __UA_SERVERSTATE_FORCE32BIT = 0x7fffffff
+} UA_ServerState;
+UA_STATIC_ASSERT(sizeof(UA_ServerState) == sizeof(UA_Int32), enum_must_be_32bit);
+
+#define UA_TYPES_SERVERSTATE 190
+
+/**
+ * ServerDiagnosticsSummaryDataType
+ * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ */
 typedef struct {
-    UA_ExpandedNodeId parentNodeId;
-    UA_NodeId referenceTypeId;
-    UA_ExpandedNodeId requestedNewNodeId;
-    UA_QualifiedName browseName;
-    UA_NodeClass nodeClass;
-    UA_ExtensionObject nodeAttributes;
-    UA_ExpandedNodeId typeDefinition;
-} UA_AddNodesItem;
+    UA_UInt32 serverViewCount;
+    UA_UInt32 currentSessionCount;
+    UA_UInt32 cumulatedSessionCount;
+    UA_UInt32 securityRejectedSessionCount;
+    UA_UInt32 rejectedSessionCount;
+    UA_UInt32 sessionTimeoutCount;
+    UA_UInt32 sessionAbortCount;
+    UA_UInt32 currentSubscriptionCount;
+    UA_UInt32 cumulatedSubscriptionCount;
+    UA_UInt32 publishingIntervalCount;
+    UA_UInt32 securityRejectedRequestsCount;
+    UA_UInt32 rejectedRequestsCount;
+} UA_ServerDiagnosticsSummaryDataType;
 
-#define UA_TYPES_ADDNODESITEM 162
+#define UA_TYPES_SERVERDIAGNOSTICSSUMMARYDATATYPE 191
 
 /**
  * ServerStatusDataType
@@ -16184,351 +16596,201 @@ typedef struct {
     UA_LocalizedText shutdownReason;
 } UA_ServerStatusDataType;
 
-#define UA_TYPES_SERVERSTATUSDATATYPE 163
+#define UA_TYPES_SERVERSTATUSDATATYPE 192
 
 /**
- * BrowseNextResponse
- * ^^^^^^^^^^^^^^^^^^
- * Continues one or more browse operations. */
-typedef struct {
-    UA_ResponseHeader responseHeader;
-    size_t resultsSize;
-    UA_BrowseResult *results;
-    size_t diagnosticInfosSize;
-    UA_DiagnosticInfo *diagnosticInfos;
-} UA_BrowseNextResponse;
-
-#define UA_TYPES_BROWSENEXTRESPONSE 164
-
-/**
- * AxisInformation
- * ^^^^^^^^^^^^^^^
+ * Range
+ * ^^^^^
  */
 typedef struct {
-    UA_EUInformation engineeringUnits;
-    UA_Range eURange;
-    UA_LocalizedText title;
-    UA_AxisScaleEnumeration axisScaleType;
-    size_t axisStepsSize;
-    UA_Double *axisSteps;
-} UA_AxisInformation;
+    UA_Double low;
+    UA_Double high;
+} UA_Range;
 
-#define UA_TYPES_AXISINFORMATION 165
+#define UA_TYPES_RANGE 193
 
 /**
- * ApplicationDescription
- * ^^^^^^^^^^^^^^^^^^^^^^
- * Describes an application and how to find it. */
+ * EUInformation
+ * ^^^^^^^^^^^^^
+ */
 typedef struct {
-    UA_String applicationUri;
-    UA_String productUri;
-    UA_LocalizedText applicationName;
-    UA_ApplicationType applicationType;
-    UA_String gatewayServerUri;
-    UA_String discoveryProfileUri;
-    size_t discoveryUrlsSize;
-    UA_String *discoveryUrls;
-} UA_ApplicationDescription;
+    UA_String namespaceUri;
+    UA_Int32 unitId;
+    UA_LocalizedText displayName;
+    UA_LocalizedText description;
+} UA_EUInformation;
 
-#define UA_TYPES_APPLICATIONDESCRIPTION 166
+#define UA_TYPES_EUINFORMATION 194
 
 /**
- * ReadRequest
- * ^^^^^^^^^^^
+ * AxisScaleEnumeration
+ * ^^^^^^^^^^^^^^^^^^^^
  */
-typedef struct {
-    UA_RequestHeader requestHeader;
-    UA_Double maxAge;
-    UA_TimestampsToReturn timestampsToReturn;
-    size_t nodesToReadSize;
-    UA_ReadValueId *nodesToRead;
-} UA_ReadRequest;
+typedef enum {
+    UA_AXISSCALEENUMERATION_LINEAR = 0,
+    UA_AXISSCALEENUMERATION_LOG = 1,
+    UA_AXISSCALEENUMERATION_LN = 2,
+    __UA_AXISSCALEENUMERATION_FORCE32BIT = 0x7fffffff
+} UA_AxisScaleEnumeration;
+UA_STATIC_ASSERT(sizeof(UA_AxisScaleEnumeration) == sizeof(UA_Int32), enum_must_be_32bit);
 
-#define UA_TYPES_READREQUEST 167
+#define UA_TYPES_AXISSCALEENUMERATION 195
 
 /**
- * ActivateSessionRequest
- * ^^^^^^^^^^^^^^^^^^^^^^
- * Activates a session with the server. */
+ * ComplexNumberType
+ * ^^^^^^^^^^^^^^^^^
+ */
 typedef struct {
-    UA_RequestHeader requestHeader;
-    UA_SignatureData clientSignature;
-    size_t clientSoftwareCertificatesSize;
-    UA_SignedSoftwareCertificate *clientSoftwareCertificates;
-    size_t localeIdsSize;
-    UA_String *localeIds;
-    UA_ExtensionObject userIdentityToken;
-    UA_SignatureData userTokenSignature;
-} UA_ActivateSessionRequest;
+    UA_Float real;
+    UA_Float imaginary;
+} UA_ComplexNumberType;
 
-#define UA_TYPES_ACTIVATESESSIONREQUEST 168
+#define UA_TYPES_COMPLEXNUMBERTYPE 196
 
 /**
- * BrowsePathResult
- * ^^^^^^^^^^^^^^^^
- * The result of a translate opearation. */
+ * DoubleComplexNumberType
+ * ^^^^^^^^^^^^^^^^^^^^^^^
+ */
 typedef struct {
-    UA_StatusCode statusCode;
-    size_t targetsSize;
-    UA_BrowsePathTarget *targets;
-} UA_BrowsePathResult;
+    UA_Double real;
+    UA_Double imaginary;
+} UA_DoubleComplexNumberType;
 
-#define UA_TYPES_BROWSEPATHRESULT 169
+#define UA_TYPES_DOUBLECOMPLEXNUMBERTYPE 197
 
 /**
- * AddNodesRequest
+ * AxisInformation
  * ^^^^^^^^^^^^^^^
- * Adds one or more nodes to the server address space. */
+ */
 typedef struct {
-    UA_RequestHeader requestHeader;
-    size_t nodesToAddSize;
-    UA_AddNodesItem *nodesToAdd;
-} UA_AddNodesRequest;
+    UA_EUInformation engineeringUnits;
+    UA_Range eURange;
+    UA_LocalizedText title;
+    UA_AxisScaleEnumeration axisScaleType;
+    size_t axisStepsSize;
+    UA_Double *axisSteps;
+} UA_AxisInformation;
 
-#define UA_TYPES_ADDNODESREQUEST 170
+#define UA_TYPES_AXISINFORMATION 198
 
 /**
- * BrowseRequest
- * ^^^^^^^^^^^^^
- * Browse the references for one or more nodes from the server address space. */
+ * XVType
+ * ^^^^^^
+ */
 typedef struct {
-    UA_RequestHeader requestHeader;
-    UA_ViewDescription view;
-    UA_UInt32 requestedMaxReferencesPerNode;
-    size_t nodesToBrowseSize;
-    UA_BrowseDescription *nodesToBrowse;
-} UA_BrowseRequest;
+    UA_Double x;
+    UA_Float value;
+} UA_XVType;
 
-#define UA_TYPES_BROWSEREQUEST 171
+#define UA_TYPES_XVTYPE 199
 
 /**
- * WriteRequest
- * ^^^^^^^^^^^^
+ * EnumDefinition
+ * ^^^^^^^^^^^^^^
  */
 typedef struct {
-    UA_RequestHeader requestHeader;
-    size_t nodesToWriteSize;
-    UA_WriteValue *nodesToWrite;
-} UA_WriteRequest;
+    size_t fieldsSize;
+    UA_EnumField *fields;
+} UA_EnumDefinition;
 
-#define UA_TYPES_WRITEREQUEST 172
+#define UA_TYPES_ENUMDEFINITION 200
 
 /**
- * AddNodesResponse
+ * ReadEventDetails
  * ^^^^^^^^^^^^^^^^
- * Adds one or more nodes to the server address space. */
+ */
 typedef struct {
-    UA_ResponseHeader responseHeader;
-    size_t resultsSize;
-    UA_AddNodesResult *results;
-    size_t diagnosticInfosSize;
-    UA_DiagnosticInfo *diagnosticInfos;
-} UA_AddNodesResponse;
+    UA_UInt32 numValuesPerNode;
+    UA_DateTime startTime;
+    UA_DateTime endTime;
+    UA_EventFilter filter;
+} UA_ReadEventDetails;
 
-#define UA_TYPES_ADDNODESRESPONSE 173
+#define UA_TYPES_READEVENTDETAILS 201
 
 /**
- * AttributeOperand
- * ^^^^^^^^^^^^^^^^
+ * ReadProcessedDetails
+ * ^^^^^^^^^^^^^^^^^^^^
  */
 typedef struct {
-    UA_NodeId nodeId;
-    UA_String alias;
-    UA_RelativePath browsePath;
-    UA_UInt32 attributeId;
-    UA_String indexRange;
-} UA_AttributeOperand;
+    UA_DateTime startTime;
+    UA_DateTime endTime;
+    UA_Double processingInterval;
+    size_t aggregateTypeSize;
+    UA_NodeId *aggregateType;
+    UA_AggregateConfiguration aggregateConfiguration;
+} UA_ReadProcessedDetails;
 
-#define UA_TYPES_ATTRIBUTEOPERAND 174
+#define UA_TYPES_READPROCESSEDDETAILS 202
 
 /**
- * DataChangeFilter
+ * ModificationInfo
  * ^^^^^^^^^^^^^^^^
  */
 typedef struct {
-    UA_DataChangeTrigger trigger;
-    UA_UInt32 deadbandType;
-    UA_Double deadbandValue;
-} UA_DataChangeFilter;
-
-#define UA_TYPES_DATACHANGEFILTER 175
-
-/**
- * EndpointDescription
- * ^^^^^^^^^^^^^^^^^^^
- * The description of a endpoint that can be used to access a server. */
-typedef struct {
-    UA_String endpointUrl;
-    UA_ApplicationDescription server;
-    UA_ByteString serverCertificate;
-    UA_MessageSecurityMode securityMode;
-    UA_String securityPolicyUri;
-    size_t userIdentityTokensSize;
-    UA_UserTokenPolicy *userIdentityTokens;
-    UA_String transportProfileUri;
-    UA_Byte securityLevel;
-} UA_EndpointDescription;
-
-#define UA_TYPES_ENDPOINTDESCRIPTION 176
-
-/**
- * DeleteReferencesRequest
- * ^^^^^^^^^^^^^^^^^^^^^^^
- * Delete one or more references from the server address space. */
-typedef struct {
-    UA_RequestHeader requestHeader;
-    size_t referencesToDeleteSize;
-    UA_DeleteReferencesItem *referencesToDelete;
-} UA_DeleteReferencesRequest;
-
-#define UA_TYPES_DELETEREFERENCESREQUEST 177
-
-/**
- * TranslateBrowsePathsToNodeIdsRequest
- * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- * Translates one or more paths in the server address space. */
-typedef struct {
-    UA_RequestHeader requestHeader;
-    size_t browsePathsSize;
-    UA_BrowsePath *browsePaths;
-} UA_TranslateBrowsePathsToNodeIdsRequest;
+    UA_DateTime modificationTime;
+    UA_HistoryUpdateType updateType;
+    UA_String userName;
+} UA_ModificationInfo;
 
-#define UA_TYPES_TRANSLATEBROWSEPATHSTONODEIDSREQUEST 178
+#define UA_TYPES_MODIFICATIONINFO 203
 
 /**
- * FindServersResponse
+ * HistoryModifiedData
  * ^^^^^^^^^^^^^^^^^^^
- * Finds the servers known to the discovery server. */
-typedef struct {
-    UA_ResponseHeader responseHeader;
-    size_t serversSize;
-    UA_ApplicationDescription *servers;
-} UA_FindServersResponse;
-
-#define UA_TYPES_FINDSERVERSRESPONSE 179
-
-/**
- * CreateSessionRequest
- * ^^^^^^^^^^^^^^^^^^^^
- * Creates a new session with the server. */
-typedef struct {
-    UA_RequestHeader requestHeader;
-    UA_ApplicationDescription clientDescription;
-    UA_String serverUri;
-    UA_String endpointUrl;
-    UA_String sessionName;
-    UA_ByteString clientNonce;
-    UA_ByteString clientCertificate;
-    UA_Double requestedSessionTimeout;
-    UA_UInt32 maxResponseMessageSize;
-} UA_CreateSessionRequest;
-
-#define UA_TYPES_CREATESESSIONREQUEST 180
-
-/**
- * ContentFilterElement
- * ^^^^^^^^^^^^^^^^^^^^
  */
 typedef struct {
-    UA_FilterOperator filterOperator;
-    size_t filterOperandsSize;
-    UA_ExtensionObject *filterOperands;
-} UA_ContentFilterElement;
+    size_t dataValuesSize;
+    UA_DataValue *dataValues;
+    size_t modificationInfosSize;
+    UA_ModificationInfo *modificationInfos;
+} UA_HistoryModifiedData;
 
-#define UA_TYPES_CONTENTFILTERELEMENT 181
+#define UA_TYPES_HISTORYMODIFIEDDATA 204
 
 /**
- * TranslateBrowsePathsToNodeIdsResponse
- * ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- * Translates one or more paths in the server address space. */
+ * HistoryEvent
+ * ^^^^^^^^^^^^
+ */
 typedef struct {
-    UA_ResponseHeader responseHeader;
-    size_t resultsSize;
-    UA_BrowsePathResult *results;
-    size_t diagnosticInfosSize;
-    UA_DiagnosticInfo *diagnosticInfos;
-} UA_TranslateBrowsePathsToNodeIdsResponse;
+    size_t eventsSize;
+    UA_HistoryEventFieldList *events;
+} UA_HistoryEvent;
 
-#define UA_TYPES_TRANSLATEBROWSEPATHSTONODEIDSRESPONSE 182
+#define UA_TYPES_HISTORYEVENT 205
 
 /**
- * BrowseResponse
- * ^^^^^^^^^^^^^^
- * Browse the references for one or more nodes from the server address space. */
+ * DataChangeNotification
+ * ^^^^^^^^^^^^^^^^^^^^^^
+ */
 typedef struct {
-    UA_ResponseHeader responseHeader;
-    size_t resultsSize;
-    UA_BrowseResult *results;
+    size_t monitoredItemsSize;
+    UA_MonitoredItemNotification *monitoredItems;
     size_t diagnosticInfosSize;
     UA_DiagnosticInfo *diagnosticInfos;
-} UA_BrowseResponse;
+} UA_DataChangeNotification;
 
-#define UA_TYPES_BROWSERESPONSE 183
+#define UA_TYPES_DATACHANGENOTIFICATION 206
 
 /**
- * CreateSessionResponse
+ * EventNotificationList
  * ^^^^^^^^^^^^^^^^^^^^^
- * Creates a new session with the server. */
-typedef struct {
-    UA_ResponseHeader responseHeader;
-    UA_NodeId sessionId;
-    UA_NodeId authenticationToken;
-    UA_Double revisedSessionTimeout;
-    UA_ByteString serverNonce;
-    UA_ByteString serverCertificate;
-    size_t serverEndpointsSize;
-    UA_EndpointDescription *serverEndpoints;
-    size_t serverSoftwareCertificatesSize;
-    UA_SignedSoftwareCertificate *serverSoftwareCertificates;
-    UA_SignatureData serverSignature;
-    UA_UInt32 maxRequestMessageSize;
-} UA_CreateSessionResponse;
-
-#define UA_TYPES_CREATESESSIONRESPONSE 184
-
-/**
- * ContentFilter
- * ^^^^^^^^^^^^^
  */
 typedef struct {
-    size_t elementsSize;
-    UA_ContentFilterElement *elements;
-} UA_ContentFilter;
-
-#define UA_TYPES_CONTENTFILTER 185
-
-/**
- * GetEndpointsResponse
- * ^^^^^^^^^^^^^^^^^^^^
- * Gets the endpoints used by the server. */
-typedef struct {
-    UA_ResponseHeader responseHeader;
-    size_t endpointsSize;
-    UA_EndpointDescription *endpoints;
-} UA_GetEndpointsResponse;
-
-#define UA_TYPES_GETENDPOINTSRESPONSE 186
-
-/**
- * EventFilter
- * ^^^^^^^^^^^
- */
-typedef struct {
-    size_t selectClausesSize;
-    UA_SimpleAttributeOperand *selectClauses;
-    UA_ContentFilter whereClause;
-} UA_EventFilter;
+    size_t eventsSize;
+    UA_EventFieldList *events;
+} UA_EventNotificationList;
 
-#define UA_TYPES_EVENTFILTER 187
+#define UA_TYPES_EVENTNOTIFICATIONLIST 207
 
 
 _UA_END_DECLS
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/build/src_generated/open62541/types_generated_handling.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/build/src_generated/open62541/types_generated_handling.h" ***********************************/
 
-/* Generated from Opc.Ua.Types.bsd with script /home/jvoe/open62541/tools/generate_datatypes.py
- * on host rigel by user jvoe at 2020-09-09 11:33:49 */
+/* Generated from Opc.Ua.Types.bsd with script /home/pdie/sonstiges/qtopcua/repos/open62541/tools/generate_datatypes.py
+ * on host mintaka by user pdie at 2021-06-21 11:34:37 */
 
 
 
@@ -17316,1306 +17578,1306 @@ UA_DiagnosticInfo_delete(UA_DiagnosticInfo *p) {
     UA_delete(p, &UA_TYPES[UA_TYPES_DIAGNOSTICINFO]);
 }
 
-/* ViewAttributes */
+/* NodeClass */
 static UA_INLINE void
-UA_ViewAttributes_init(UA_ViewAttributes *p) {
-    memset(p, 0, sizeof(UA_ViewAttributes));
+UA_NodeClass_init(UA_NodeClass *p) {
+    memset(p, 0, sizeof(UA_NodeClass));
 }
 
-static UA_INLINE UA_ViewAttributes *
-UA_ViewAttributes_new(void) {
-    return (UA_ViewAttributes*)UA_new(&UA_TYPES[UA_TYPES_VIEWATTRIBUTES]);
+static UA_INLINE UA_NodeClass *
+UA_NodeClass_new(void) {
+    return (UA_NodeClass*)UA_new(&UA_TYPES[UA_TYPES_NODECLASS]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_ViewAttributes_copy(const UA_ViewAttributes *src, UA_ViewAttributes *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_VIEWATTRIBUTES]);
+UA_NodeClass_copy(const UA_NodeClass *src, UA_NodeClass *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_NODECLASS]);
 }
 
 static UA_INLINE void
-UA_ViewAttributes_deleteMembers(UA_ViewAttributes *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_VIEWATTRIBUTES]);
+UA_NodeClass_deleteMembers(UA_NodeClass *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_NODECLASS]);
 }
 
 static UA_INLINE void
-UA_ViewAttributes_clear(UA_ViewAttributes *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_VIEWATTRIBUTES]);
+UA_NodeClass_clear(UA_NodeClass *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_NODECLASS]);
 }
 
 static UA_INLINE void
-UA_ViewAttributes_delete(UA_ViewAttributes *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_VIEWATTRIBUTES]);
+UA_NodeClass_delete(UA_NodeClass *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_NODECLASS]);
 }
 
-/* XVType */
+/* StructureType */
 static UA_INLINE void
-UA_XVType_init(UA_XVType *p) {
-    memset(p, 0, sizeof(UA_XVType));
+UA_StructureType_init(UA_StructureType *p) {
+    memset(p, 0, sizeof(UA_StructureType));
 }
 
-static UA_INLINE UA_XVType *
-UA_XVType_new(void) {
-    return (UA_XVType*)UA_new(&UA_TYPES[UA_TYPES_XVTYPE]);
+static UA_INLINE UA_StructureType *
+UA_StructureType_new(void) {
+    return (UA_StructureType*)UA_new(&UA_TYPES[UA_TYPES_STRUCTURETYPE]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_XVType_copy(const UA_XVType *src, UA_XVType *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_XVTYPE]);
+UA_StructureType_copy(const UA_StructureType *src, UA_StructureType *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_STRUCTURETYPE]);
 }
 
 static UA_INLINE void
-UA_XVType_deleteMembers(UA_XVType *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_XVTYPE]);
+UA_StructureType_deleteMembers(UA_StructureType *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_STRUCTURETYPE]);
 }
 
 static UA_INLINE void
-UA_XVType_clear(UA_XVType *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_XVTYPE]);
+UA_StructureType_clear(UA_StructureType *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_STRUCTURETYPE]);
 }
 
 static UA_INLINE void
-UA_XVType_delete(UA_XVType *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_XVTYPE]);
+UA_StructureType_delete(UA_StructureType *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_STRUCTURETYPE]);
 }
 
-/* ElementOperand */
+/* StructureField */
 static UA_INLINE void
-UA_ElementOperand_init(UA_ElementOperand *p) {
-    memset(p, 0, sizeof(UA_ElementOperand));
+UA_StructureField_init(UA_StructureField *p) {
+    memset(p, 0, sizeof(UA_StructureField));
 }
 
-static UA_INLINE UA_ElementOperand *
-UA_ElementOperand_new(void) {
-    return (UA_ElementOperand*)UA_new(&UA_TYPES[UA_TYPES_ELEMENTOPERAND]);
+static UA_INLINE UA_StructureField *
+UA_StructureField_new(void) {
+    return (UA_StructureField*)UA_new(&UA_TYPES[UA_TYPES_STRUCTUREFIELD]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_ElementOperand_copy(const UA_ElementOperand *src, UA_ElementOperand *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_ELEMENTOPERAND]);
+UA_StructureField_copy(const UA_StructureField *src, UA_StructureField *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_STRUCTUREFIELD]);
 }
 
 static UA_INLINE void
-UA_ElementOperand_deleteMembers(UA_ElementOperand *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_ELEMENTOPERAND]);
+UA_StructureField_deleteMembers(UA_StructureField *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_STRUCTUREFIELD]);
 }
 
 static UA_INLINE void
-UA_ElementOperand_clear(UA_ElementOperand *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_ELEMENTOPERAND]);
+UA_StructureField_clear(UA_StructureField *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_STRUCTUREFIELD]);
 }
 
 static UA_INLINE void
-UA_ElementOperand_delete(UA_ElementOperand *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_ELEMENTOPERAND]);
+UA_StructureField_delete(UA_StructureField *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_STRUCTUREFIELD]);
 }
 
-/* VariableAttributes */
+/* StructureDefinition */
 static UA_INLINE void
-UA_VariableAttributes_init(UA_VariableAttributes *p) {
-    memset(p, 0, sizeof(UA_VariableAttributes));
+UA_StructureDefinition_init(UA_StructureDefinition *p) {
+    memset(p, 0, sizeof(UA_StructureDefinition));
 }
 
-static UA_INLINE UA_VariableAttributes *
-UA_VariableAttributes_new(void) {
-    return (UA_VariableAttributes*)UA_new(&UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES]);
+static UA_INLINE UA_StructureDefinition *
+UA_StructureDefinition_new(void) {
+    return (UA_StructureDefinition*)UA_new(&UA_TYPES[UA_TYPES_STRUCTUREDEFINITION]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_VariableAttributes_copy(const UA_VariableAttributes *src, UA_VariableAttributes *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES]);
+UA_StructureDefinition_copy(const UA_StructureDefinition *src, UA_StructureDefinition *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_STRUCTUREDEFINITION]);
 }
 
 static UA_INLINE void
-UA_VariableAttributes_deleteMembers(UA_VariableAttributes *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES]);
+UA_StructureDefinition_deleteMembers(UA_StructureDefinition *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_STRUCTUREDEFINITION]);
 }
 
 static UA_INLINE void
-UA_VariableAttributes_clear(UA_VariableAttributes *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES]);
+UA_StructureDefinition_clear(UA_StructureDefinition *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_STRUCTUREDEFINITION]);
 }
 
 static UA_INLINE void
-UA_VariableAttributes_delete(UA_VariableAttributes *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES]);
+UA_StructureDefinition_delete(UA_StructureDefinition *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_STRUCTUREDEFINITION]);
 }
 
-/* EnumValueType */
+/* Argument */
 static UA_INLINE void
-UA_EnumValueType_init(UA_EnumValueType *p) {
-    memset(p, 0, sizeof(UA_EnumValueType));
+UA_Argument_init(UA_Argument *p) {
+    memset(p, 0, sizeof(UA_Argument));
 }
 
-static UA_INLINE UA_EnumValueType *
-UA_EnumValueType_new(void) {
-    return (UA_EnumValueType*)UA_new(&UA_TYPES[UA_TYPES_ENUMVALUETYPE]);
+static UA_INLINE UA_Argument *
+UA_Argument_new(void) {
+    return (UA_Argument*)UA_new(&UA_TYPES[UA_TYPES_ARGUMENT]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_EnumValueType_copy(const UA_EnumValueType *src, UA_EnumValueType *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_ENUMVALUETYPE]);
+UA_Argument_copy(const UA_Argument *src, UA_Argument *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_ARGUMENT]);
 }
 
 static UA_INLINE void
-UA_EnumValueType_deleteMembers(UA_EnumValueType *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_ENUMVALUETYPE]);
+UA_Argument_deleteMembers(UA_Argument *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_ARGUMENT]);
 }
 
 static UA_INLINE void
-UA_EnumValueType_clear(UA_EnumValueType *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_ENUMVALUETYPE]);
+UA_Argument_clear(UA_Argument *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_ARGUMENT]);
 }
 
 static UA_INLINE void
-UA_EnumValueType_delete(UA_EnumValueType *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_ENUMVALUETYPE]);
+UA_Argument_delete(UA_Argument *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_ARGUMENT]);
 }
 
-/* EventFieldList */
+/* EnumValueType */
 static UA_INLINE void
-UA_EventFieldList_init(UA_EventFieldList *p) {
-    memset(p, 0, sizeof(UA_EventFieldList));
+UA_EnumValueType_init(UA_EnumValueType *p) {
+    memset(p, 0, sizeof(UA_EnumValueType));
 }
 
-static UA_INLINE UA_EventFieldList *
-UA_EventFieldList_new(void) {
-    return (UA_EventFieldList*)UA_new(&UA_TYPES[UA_TYPES_EVENTFIELDLIST]);
+static UA_INLINE UA_EnumValueType *
+UA_EnumValueType_new(void) {
+    return (UA_EnumValueType*)UA_new(&UA_TYPES[UA_TYPES_ENUMVALUETYPE]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_EventFieldList_copy(const UA_EventFieldList *src, UA_EventFieldList *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_EVENTFIELDLIST]);
+UA_EnumValueType_copy(const UA_EnumValueType *src, UA_EnumValueType *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_ENUMVALUETYPE]);
 }
 
 static UA_INLINE void
-UA_EventFieldList_deleteMembers(UA_EventFieldList *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_EVENTFIELDLIST]);
+UA_EnumValueType_deleteMembers(UA_EnumValueType *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_ENUMVALUETYPE]);
 }
 
 static UA_INLINE void
-UA_EventFieldList_clear(UA_EventFieldList *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_EVENTFIELDLIST]);
+UA_EnumValueType_clear(UA_EnumValueType *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_ENUMVALUETYPE]);
 }
 
 static UA_INLINE void
-UA_EventFieldList_delete(UA_EventFieldList *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_EVENTFIELDLIST]);
+UA_EnumValueType_delete(UA_EnumValueType *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_ENUMVALUETYPE]);
 }
 
-/* MonitoredItemCreateResult */
+/* EnumField */
 static UA_INLINE void
-UA_MonitoredItemCreateResult_init(UA_MonitoredItemCreateResult *p) {
-    memset(p, 0, sizeof(UA_MonitoredItemCreateResult));
+UA_EnumField_init(UA_EnumField *p) {
+    memset(p, 0, sizeof(UA_EnumField));
 }
 
-static UA_INLINE UA_MonitoredItemCreateResult *
-UA_MonitoredItemCreateResult_new(void) {
-    return (UA_MonitoredItemCreateResult*)UA_new(&UA_TYPES[UA_TYPES_MONITOREDITEMCREATERESULT]);
+static UA_INLINE UA_EnumField *
+UA_EnumField_new(void) {
+    return (UA_EnumField*)UA_new(&UA_TYPES[UA_TYPES_ENUMFIELD]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_MonitoredItemCreateResult_copy(const UA_MonitoredItemCreateResult *src, UA_MonitoredItemCreateResult *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_MONITOREDITEMCREATERESULT]);
+UA_EnumField_copy(const UA_EnumField *src, UA_EnumField *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_ENUMFIELD]);
 }
 
 static UA_INLINE void
-UA_MonitoredItemCreateResult_deleteMembers(UA_MonitoredItemCreateResult *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_MONITOREDITEMCREATERESULT]);
+UA_EnumField_deleteMembers(UA_EnumField *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_ENUMFIELD]);
 }
 
 static UA_INLINE void
-UA_MonitoredItemCreateResult_clear(UA_MonitoredItemCreateResult *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_MONITOREDITEMCREATERESULT]);
+UA_EnumField_clear(UA_EnumField *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_ENUMFIELD]);
 }
 
 static UA_INLINE void
-UA_MonitoredItemCreateResult_delete(UA_MonitoredItemCreateResult *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_MONITOREDITEMCREATERESULT]);
+UA_EnumField_delete(UA_EnumField *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_ENUMFIELD]);
 }
 
-/* EUInformation */
+/* Duration */
 static UA_INLINE void
-UA_EUInformation_init(UA_EUInformation *p) {
-    memset(p, 0, sizeof(UA_EUInformation));
+UA_Duration_init(UA_Duration *p) {
+    memset(p, 0, sizeof(UA_Duration));
 }
 
-static UA_INLINE UA_EUInformation *
-UA_EUInformation_new(void) {
-    return (UA_EUInformation*)UA_new(&UA_TYPES[UA_TYPES_EUINFORMATION]);
+static UA_INLINE UA_Duration *
+UA_Duration_new(void) {
+    return (UA_Duration*)UA_new(&UA_TYPES[UA_TYPES_DURATION]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_EUInformation_copy(const UA_EUInformation *src, UA_EUInformation *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_EUINFORMATION]);
+UA_Duration_copy(const UA_Duration *src, UA_Duration *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_DURATION]);
 }
 
 static UA_INLINE void
-UA_EUInformation_deleteMembers(UA_EUInformation *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_EUINFORMATION]);
+UA_Duration_deleteMembers(UA_Duration *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_DURATION]);
 }
 
 static UA_INLINE void
-UA_EUInformation_clear(UA_EUInformation *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_EUINFORMATION]);
+UA_Duration_clear(UA_Duration *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_DURATION]);
 }
 
 static UA_INLINE void
-UA_EUInformation_delete(UA_EUInformation *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_EUINFORMATION]);
+UA_Duration_delete(UA_Duration *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_DURATION]);
 }
 
-/* ServerDiagnosticsSummaryDataType */
+/* UtcTime */
 static UA_INLINE void
-UA_ServerDiagnosticsSummaryDataType_init(UA_ServerDiagnosticsSummaryDataType *p) {
-    memset(p, 0, sizeof(UA_ServerDiagnosticsSummaryDataType));
+UA_UtcTime_init(UA_UtcTime *p) {
+    memset(p, 0, sizeof(UA_UtcTime));
 }
 
-static UA_INLINE UA_ServerDiagnosticsSummaryDataType *
-UA_ServerDiagnosticsSummaryDataType_new(void) {
-    return (UA_ServerDiagnosticsSummaryDataType*)UA_new(&UA_TYPES[UA_TYPES_SERVERDIAGNOSTICSSUMMARYDATATYPE]);
+static UA_INLINE UA_UtcTime *
+UA_UtcTime_new(void) {
+    return (UA_UtcTime*)UA_new(&UA_TYPES[UA_TYPES_UTCTIME]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_ServerDiagnosticsSummaryDataType_copy(const UA_ServerDiagnosticsSummaryDataType *src, UA_ServerDiagnosticsSummaryDataType *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_SERVERDIAGNOSTICSSUMMARYDATATYPE]);
+UA_UtcTime_copy(const UA_UtcTime *src, UA_UtcTime *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_UTCTIME]);
 }
 
 static UA_INLINE void
-UA_ServerDiagnosticsSummaryDataType_deleteMembers(UA_ServerDiagnosticsSummaryDataType *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_SERVERDIAGNOSTICSSUMMARYDATATYPE]);
+UA_UtcTime_deleteMembers(UA_UtcTime *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_UTCTIME]);
 }
 
 static UA_INLINE void
-UA_ServerDiagnosticsSummaryDataType_clear(UA_ServerDiagnosticsSummaryDataType *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_SERVERDIAGNOSTICSSUMMARYDATATYPE]);
+UA_UtcTime_clear(UA_UtcTime *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_UTCTIME]);
 }
 
 static UA_INLINE void
-UA_ServerDiagnosticsSummaryDataType_delete(UA_ServerDiagnosticsSummaryDataType *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_SERVERDIAGNOSTICSSUMMARYDATATYPE]);
+UA_UtcTime_delete(UA_UtcTime *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_UTCTIME]);
 }
 
-/* ContentFilterElementResult */
+/* LocaleId */
 static UA_INLINE void
-UA_ContentFilterElementResult_init(UA_ContentFilterElementResult *p) {
-    memset(p, 0, sizeof(UA_ContentFilterElementResult));
+UA_LocaleId_init(UA_LocaleId *p) {
+    memset(p, 0, sizeof(UA_LocaleId));
 }
 
-static UA_INLINE UA_ContentFilterElementResult *
-UA_ContentFilterElementResult_new(void) {
-    return (UA_ContentFilterElementResult*)UA_new(&UA_TYPES[UA_TYPES_CONTENTFILTERELEMENTRESULT]);
+static UA_INLINE UA_LocaleId *
+UA_LocaleId_new(void) {
+    return (UA_LocaleId*)UA_new(&UA_TYPES[UA_TYPES_LOCALEID]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_ContentFilterElementResult_copy(const UA_ContentFilterElementResult *src, UA_ContentFilterElementResult *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_CONTENTFILTERELEMENTRESULT]);
+UA_LocaleId_copy(const UA_LocaleId *src, UA_LocaleId *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_LOCALEID]);
 }
 
 static UA_INLINE void
-UA_ContentFilterElementResult_deleteMembers(UA_ContentFilterElementResult *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_CONTENTFILTERELEMENTRESULT]);
+UA_LocaleId_deleteMembers(UA_LocaleId *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_LOCALEID]);
 }
 
 static UA_INLINE void
-UA_ContentFilterElementResult_clear(UA_ContentFilterElementResult *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_CONTENTFILTERELEMENTRESULT]);
+UA_LocaleId_clear(UA_LocaleId *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_LOCALEID]);
 }
 
 static UA_INLINE void
-UA_ContentFilterElementResult_delete(UA_ContentFilterElementResult *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_CONTENTFILTERELEMENTRESULT]);
+UA_LocaleId_delete(UA_LocaleId *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_LOCALEID]);
 }
 
-/* LiteralOperand */
+/* TimeZoneDataType */
 static UA_INLINE void
-UA_LiteralOperand_init(UA_LiteralOperand *p) {
-    memset(p, 0, sizeof(UA_LiteralOperand));
+UA_TimeZoneDataType_init(UA_TimeZoneDataType *p) {
+    memset(p, 0, sizeof(UA_TimeZoneDataType));
 }
 
-static UA_INLINE UA_LiteralOperand *
-UA_LiteralOperand_new(void) {
-    return (UA_LiteralOperand*)UA_new(&UA_TYPES[UA_TYPES_LITERALOPERAND]);
+static UA_INLINE UA_TimeZoneDataType *
+UA_TimeZoneDataType_new(void) {
+    return (UA_TimeZoneDataType*)UA_new(&UA_TYPES[UA_TYPES_TIMEZONEDATATYPE]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_LiteralOperand_copy(const UA_LiteralOperand *src, UA_LiteralOperand *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_LITERALOPERAND]);
+UA_TimeZoneDataType_copy(const UA_TimeZoneDataType *src, UA_TimeZoneDataType *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_TIMEZONEDATATYPE]);
 }
 
 static UA_INLINE void
-UA_LiteralOperand_deleteMembers(UA_LiteralOperand *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_LITERALOPERAND]);
+UA_TimeZoneDataType_deleteMembers(UA_TimeZoneDataType *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_TIMEZONEDATATYPE]);
 }
 
 static UA_INLINE void
-UA_LiteralOperand_clear(UA_LiteralOperand *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_LITERALOPERAND]);
+UA_TimeZoneDataType_clear(UA_TimeZoneDataType *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_TIMEZONEDATATYPE]);
 }
 
 static UA_INLINE void
-UA_LiteralOperand_delete(UA_LiteralOperand *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_LITERALOPERAND]);
+UA_TimeZoneDataType_delete(UA_TimeZoneDataType *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_TIMEZONEDATATYPE]);
 }
 
-/* MessageSecurityMode */
+/* ApplicationType */
 static UA_INLINE void
-UA_MessageSecurityMode_init(UA_MessageSecurityMode *p) {
-    memset(p, 0, sizeof(UA_MessageSecurityMode));
+UA_ApplicationType_init(UA_ApplicationType *p) {
+    memset(p, 0, sizeof(UA_ApplicationType));
 }
 
-static UA_INLINE UA_MessageSecurityMode *
-UA_MessageSecurityMode_new(void) {
-    return (UA_MessageSecurityMode*)UA_new(&UA_TYPES[UA_TYPES_MESSAGESECURITYMODE]);
+static UA_INLINE UA_ApplicationType *
+UA_ApplicationType_new(void) {
+    return (UA_ApplicationType*)UA_new(&UA_TYPES[UA_TYPES_APPLICATIONTYPE]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_MessageSecurityMode_copy(const UA_MessageSecurityMode *src, UA_MessageSecurityMode *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_MESSAGESECURITYMODE]);
+UA_ApplicationType_copy(const UA_ApplicationType *src, UA_ApplicationType *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_APPLICATIONTYPE]);
 }
 
 static UA_INLINE void
-UA_MessageSecurityMode_deleteMembers(UA_MessageSecurityMode *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_MESSAGESECURITYMODE]);
+UA_ApplicationType_deleteMembers(UA_ApplicationType *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_APPLICATIONTYPE]);
 }
 
 static UA_INLINE void
-UA_MessageSecurityMode_clear(UA_MessageSecurityMode *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_MESSAGESECURITYMODE]);
+UA_ApplicationType_clear(UA_ApplicationType *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_APPLICATIONTYPE]);
 }
 
 static UA_INLINE void
-UA_MessageSecurityMode_delete(UA_MessageSecurityMode *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_MESSAGESECURITYMODE]);
+UA_ApplicationType_delete(UA_ApplicationType *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_APPLICATIONTYPE]);
 }
 
-/* UtcTime */
+/* ApplicationDescription */
 static UA_INLINE void
-UA_UtcTime_init(UA_UtcTime *p) {
-    memset(p, 0, sizeof(UA_UtcTime));
+UA_ApplicationDescription_init(UA_ApplicationDescription *p) {
+    memset(p, 0, sizeof(UA_ApplicationDescription));
 }
 
-static UA_INLINE UA_UtcTime *
-UA_UtcTime_new(void) {
-    return (UA_UtcTime*)UA_new(&UA_TYPES[UA_TYPES_UTCTIME]);
+static UA_INLINE UA_ApplicationDescription *
+UA_ApplicationDescription_new(void) {
+    return (UA_ApplicationDescription*)UA_new(&UA_TYPES[UA_TYPES_APPLICATIONDESCRIPTION]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_UtcTime_copy(const UA_UtcTime *src, UA_UtcTime *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_UTCTIME]);
+UA_ApplicationDescription_copy(const UA_ApplicationDescription *src, UA_ApplicationDescription *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_APPLICATIONDESCRIPTION]);
 }
 
 static UA_INLINE void
-UA_UtcTime_deleteMembers(UA_UtcTime *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_UTCTIME]);
+UA_ApplicationDescription_deleteMembers(UA_ApplicationDescription *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_APPLICATIONDESCRIPTION]);
 }
 
 static UA_INLINE void
-UA_UtcTime_clear(UA_UtcTime *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_UTCTIME]);
+UA_ApplicationDescription_clear(UA_ApplicationDescription *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_APPLICATIONDESCRIPTION]);
 }
 
 static UA_INLINE void
-UA_UtcTime_delete(UA_UtcTime *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_UTCTIME]);
+UA_ApplicationDescription_delete(UA_ApplicationDescription *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_APPLICATIONDESCRIPTION]);
 }
 
-/* UserIdentityToken */
+/* RequestHeader */
 static UA_INLINE void
-UA_UserIdentityToken_init(UA_UserIdentityToken *p) {
-    memset(p, 0, sizeof(UA_UserIdentityToken));
+UA_RequestHeader_init(UA_RequestHeader *p) {
+    memset(p, 0, sizeof(UA_RequestHeader));
 }
 
-static UA_INLINE UA_UserIdentityToken *
-UA_UserIdentityToken_new(void) {
-    return (UA_UserIdentityToken*)UA_new(&UA_TYPES[UA_TYPES_USERIDENTITYTOKEN]);
+static UA_INLINE UA_RequestHeader *
+UA_RequestHeader_new(void) {
+    return (UA_RequestHeader*)UA_new(&UA_TYPES[UA_TYPES_REQUESTHEADER]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_UserIdentityToken_copy(const UA_UserIdentityToken *src, UA_UserIdentityToken *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_USERIDENTITYTOKEN]);
+UA_RequestHeader_copy(const UA_RequestHeader *src, UA_RequestHeader *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_REQUESTHEADER]);
 }
 
 static UA_INLINE void
-UA_UserIdentityToken_deleteMembers(UA_UserIdentityToken *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_USERIDENTITYTOKEN]);
+UA_RequestHeader_deleteMembers(UA_RequestHeader *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_REQUESTHEADER]);
 }
 
 static UA_INLINE void
-UA_UserIdentityToken_clear(UA_UserIdentityToken *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_USERIDENTITYTOKEN]);
+UA_RequestHeader_clear(UA_RequestHeader *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_REQUESTHEADER]);
 }
 
 static UA_INLINE void
-UA_UserIdentityToken_delete(UA_UserIdentityToken *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_USERIDENTITYTOKEN]);
+UA_RequestHeader_delete(UA_RequestHeader *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_REQUESTHEADER]);
 }
 
-/* X509IdentityToken */
+/* ResponseHeader */
 static UA_INLINE void
-UA_X509IdentityToken_init(UA_X509IdentityToken *p) {
-    memset(p, 0, sizeof(UA_X509IdentityToken));
+UA_ResponseHeader_init(UA_ResponseHeader *p) {
+    memset(p, 0, sizeof(UA_ResponseHeader));
 }
 
-static UA_INLINE UA_X509IdentityToken *
-UA_X509IdentityToken_new(void) {
-    return (UA_X509IdentityToken*)UA_new(&UA_TYPES[UA_TYPES_X509IDENTITYTOKEN]);
+static UA_INLINE UA_ResponseHeader *
+UA_ResponseHeader_new(void) {
+    return (UA_ResponseHeader*)UA_new(&UA_TYPES[UA_TYPES_RESPONSEHEADER]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_X509IdentityToken_copy(const UA_X509IdentityToken *src, UA_X509IdentityToken *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_X509IDENTITYTOKEN]);
+UA_ResponseHeader_copy(const UA_ResponseHeader *src, UA_ResponseHeader *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_RESPONSEHEADER]);
 }
 
 static UA_INLINE void
-UA_X509IdentityToken_deleteMembers(UA_X509IdentityToken *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_X509IDENTITYTOKEN]);
+UA_ResponseHeader_deleteMembers(UA_ResponseHeader *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_RESPONSEHEADER]);
 }
 
 static UA_INLINE void
-UA_X509IdentityToken_clear(UA_X509IdentityToken *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_X509IDENTITYTOKEN]);
+UA_ResponseHeader_clear(UA_ResponseHeader *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_RESPONSEHEADER]);
 }
 
 static UA_INLINE void
-UA_X509IdentityToken_delete(UA_X509IdentityToken *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_X509IDENTITYTOKEN]);
+UA_ResponseHeader_delete(UA_ResponseHeader *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_RESPONSEHEADER]);
 }
 
-/* MonitoredItemNotification */
+/* ServiceFault */
 static UA_INLINE void
-UA_MonitoredItemNotification_init(UA_MonitoredItemNotification *p) {
-    memset(p, 0, sizeof(UA_MonitoredItemNotification));
+UA_ServiceFault_init(UA_ServiceFault *p) {
+    memset(p, 0, sizeof(UA_ServiceFault));
 }
 
-static UA_INLINE UA_MonitoredItemNotification *
-UA_MonitoredItemNotification_new(void) {
-    return (UA_MonitoredItemNotification*)UA_new(&UA_TYPES[UA_TYPES_MONITOREDITEMNOTIFICATION]);
+static UA_INLINE UA_ServiceFault *
+UA_ServiceFault_new(void) {
+    return (UA_ServiceFault*)UA_new(&UA_TYPES[UA_TYPES_SERVICEFAULT]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_MonitoredItemNotification_copy(const UA_MonitoredItemNotification *src, UA_MonitoredItemNotification *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_MONITOREDITEMNOTIFICATION]);
+UA_ServiceFault_copy(const UA_ServiceFault *src, UA_ServiceFault *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_SERVICEFAULT]);
 }
 
 static UA_INLINE void
-UA_MonitoredItemNotification_deleteMembers(UA_MonitoredItemNotification *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_MONITOREDITEMNOTIFICATION]);
+UA_ServiceFault_deleteMembers(UA_ServiceFault *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_SERVICEFAULT]);
 }
 
 static UA_INLINE void
-UA_MonitoredItemNotification_clear(UA_MonitoredItemNotification *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_MONITOREDITEMNOTIFICATION]);
+UA_ServiceFault_clear(UA_ServiceFault *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_SERVICEFAULT]);
 }
 
 static UA_INLINE void
-UA_MonitoredItemNotification_delete(UA_MonitoredItemNotification *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_MONITOREDITEMNOTIFICATION]);
+UA_ServiceFault_delete(UA_ServiceFault *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_SERVICEFAULT]);
 }
 
-/* StructureType */
+/* FindServersRequest */
 static UA_INLINE void
-UA_StructureType_init(UA_StructureType *p) {
-    memset(p, 0, sizeof(UA_StructureType));
+UA_FindServersRequest_init(UA_FindServersRequest *p) {
+    memset(p, 0, sizeof(UA_FindServersRequest));
 }
 
-static UA_INLINE UA_StructureType *
-UA_StructureType_new(void) {
-    return (UA_StructureType*)UA_new(&UA_TYPES[UA_TYPES_STRUCTURETYPE]);
+static UA_INLINE UA_FindServersRequest *
+UA_FindServersRequest_new(void) {
+    return (UA_FindServersRequest*)UA_new(&UA_TYPES[UA_TYPES_FINDSERVERSREQUEST]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_StructureType_copy(const UA_StructureType *src, UA_StructureType *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_STRUCTURETYPE]);
+UA_FindServersRequest_copy(const UA_FindServersRequest *src, UA_FindServersRequest *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_FINDSERVERSREQUEST]);
 }
 
 static UA_INLINE void
-UA_StructureType_deleteMembers(UA_StructureType *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_STRUCTURETYPE]);
+UA_FindServersRequest_deleteMembers(UA_FindServersRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_FINDSERVERSREQUEST]);
 }
 
 static UA_INLINE void
-UA_StructureType_clear(UA_StructureType *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_STRUCTURETYPE]);
+UA_FindServersRequest_clear(UA_FindServersRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_FINDSERVERSREQUEST]);
 }
 
 static UA_INLINE void
-UA_StructureType_delete(UA_StructureType *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_STRUCTURETYPE]);
+UA_FindServersRequest_delete(UA_FindServersRequest *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_FINDSERVERSREQUEST]);
 }
 
-/* ResponseHeader */
+/* FindServersResponse */
 static UA_INLINE void
-UA_ResponseHeader_init(UA_ResponseHeader *p) {
-    memset(p, 0, sizeof(UA_ResponseHeader));
+UA_FindServersResponse_init(UA_FindServersResponse *p) {
+    memset(p, 0, sizeof(UA_FindServersResponse));
 }
 
-static UA_INLINE UA_ResponseHeader *
-UA_ResponseHeader_new(void) {
-    return (UA_ResponseHeader*)UA_new(&UA_TYPES[UA_TYPES_RESPONSEHEADER]);
+static UA_INLINE UA_FindServersResponse *
+UA_FindServersResponse_new(void) {
+    return (UA_FindServersResponse*)UA_new(&UA_TYPES[UA_TYPES_FINDSERVERSRESPONSE]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_ResponseHeader_copy(const UA_ResponseHeader *src, UA_ResponseHeader *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_RESPONSEHEADER]);
+UA_FindServersResponse_copy(const UA_FindServersResponse *src, UA_FindServersResponse *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_FINDSERVERSRESPONSE]);
 }
 
 static UA_INLINE void
-UA_ResponseHeader_deleteMembers(UA_ResponseHeader *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_RESPONSEHEADER]);
+UA_FindServersResponse_deleteMembers(UA_FindServersResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_FINDSERVERSRESPONSE]);
 }
 
 static UA_INLINE void
-UA_ResponseHeader_clear(UA_ResponseHeader *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_RESPONSEHEADER]);
+UA_FindServersResponse_clear(UA_FindServersResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_FINDSERVERSRESPONSE]);
 }
 
 static UA_INLINE void
-UA_ResponseHeader_delete(UA_ResponseHeader *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_RESPONSEHEADER]);
+UA_FindServersResponse_delete(UA_FindServersResponse *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_FINDSERVERSRESPONSE]);
 }
 
-/* SignatureData */
+/* MessageSecurityMode */
 static UA_INLINE void
-UA_SignatureData_init(UA_SignatureData *p) {
-    memset(p, 0, sizeof(UA_SignatureData));
+UA_MessageSecurityMode_init(UA_MessageSecurityMode *p) {
+    memset(p, 0, sizeof(UA_MessageSecurityMode));
 }
 
-static UA_INLINE UA_SignatureData *
-UA_SignatureData_new(void) {
-    return (UA_SignatureData*)UA_new(&UA_TYPES[UA_TYPES_SIGNATUREDATA]);
+static UA_INLINE UA_MessageSecurityMode *
+UA_MessageSecurityMode_new(void) {
+    return (UA_MessageSecurityMode*)UA_new(&UA_TYPES[UA_TYPES_MESSAGESECURITYMODE]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_SignatureData_copy(const UA_SignatureData *src, UA_SignatureData *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_SIGNATUREDATA]);
+UA_MessageSecurityMode_copy(const UA_MessageSecurityMode *src, UA_MessageSecurityMode *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_MESSAGESECURITYMODE]);
 }
 
 static UA_INLINE void
-UA_SignatureData_deleteMembers(UA_SignatureData *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_SIGNATUREDATA]);
+UA_MessageSecurityMode_deleteMembers(UA_MessageSecurityMode *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_MESSAGESECURITYMODE]);
 }
 
 static UA_INLINE void
-UA_SignatureData_clear(UA_SignatureData *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_SIGNATUREDATA]);
+UA_MessageSecurityMode_clear(UA_MessageSecurityMode *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_MESSAGESECURITYMODE]);
 }
 
 static UA_INLINE void
-UA_SignatureData_delete(UA_SignatureData *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_SIGNATUREDATA]);
+UA_MessageSecurityMode_delete(UA_MessageSecurityMode *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_MESSAGESECURITYMODE]);
 }
 
-/* ModifySubscriptionResponse */
+/* UserTokenType */
 static UA_INLINE void
-UA_ModifySubscriptionResponse_init(UA_ModifySubscriptionResponse *p) {
-    memset(p, 0, sizeof(UA_ModifySubscriptionResponse));
+UA_UserTokenType_init(UA_UserTokenType *p) {
+    memset(p, 0, sizeof(UA_UserTokenType));
 }
 
-static UA_INLINE UA_ModifySubscriptionResponse *
-UA_ModifySubscriptionResponse_new(void) {
-    return (UA_ModifySubscriptionResponse*)UA_new(&UA_TYPES[UA_TYPES_MODIFYSUBSCRIPTIONRESPONSE]);
+static UA_INLINE UA_UserTokenType *
+UA_UserTokenType_new(void) {
+    return (UA_UserTokenType*)UA_new(&UA_TYPES[UA_TYPES_USERTOKENTYPE]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_ModifySubscriptionResponse_copy(const UA_ModifySubscriptionResponse *src, UA_ModifySubscriptionResponse *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_MODIFYSUBSCRIPTIONRESPONSE]);
+UA_UserTokenType_copy(const UA_UserTokenType *src, UA_UserTokenType *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_USERTOKENTYPE]);
 }
 
 static UA_INLINE void
-UA_ModifySubscriptionResponse_deleteMembers(UA_ModifySubscriptionResponse *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_MODIFYSUBSCRIPTIONRESPONSE]);
+UA_UserTokenType_deleteMembers(UA_UserTokenType *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_USERTOKENTYPE]);
 }
 
 static UA_INLINE void
-UA_ModifySubscriptionResponse_clear(UA_ModifySubscriptionResponse *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_MODIFYSUBSCRIPTIONRESPONSE]);
+UA_UserTokenType_clear(UA_UserTokenType *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_USERTOKENTYPE]);
 }
 
 static UA_INLINE void
-UA_ModifySubscriptionResponse_delete(UA_ModifySubscriptionResponse *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_MODIFYSUBSCRIPTIONRESPONSE]);
+UA_UserTokenType_delete(UA_UserTokenType *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_USERTOKENTYPE]);
 }
 
-/* NodeAttributes */
+/* UserTokenPolicy */
 static UA_INLINE void
-UA_NodeAttributes_init(UA_NodeAttributes *p) {
-    memset(p, 0, sizeof(UA_NodeAttributes));
+UA_UserTokenPolicy_init(UA_UserTokenPolicy *p) {
+    memset(p, 0, sizeof(UA_UserTokenPolicy));
 }
 
-static UA_INLINE UA_NodeAttributes *
-UA_NodeAttributes_new(void) {
-    return (UA_NodeAttributes*)UA_new(&UA_TYPES[UA_TYPES_NODEATTRIBUTES]);
+static UA_INLINE UA_UserTokenPolicy *
+UA_UserTokenPolicy_new(void) {
+    return (UA_UserTokenPolicy*)UA_new(&UA_TYPES[UA_TYPES_USERTOKENPOLICY]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_NodeAttributes_copy(const UA_NodeAttributes *src, UA_NodeAttributes *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_NODEATTRIBUTES]);
+UA_UserTokenPolicy_copy(const UA_UserTokenPolicy *src, UA_UserTokenPolicy *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_USERTOKENPOLICY]);
 }
 
 static UA_INLINE void
-UA_NodeAttributes_deleteMembers(UA_NodeAttributes *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_NODEATTRIBUTES]);
+UA_UserTokenPolicy_deleteMembers(UA_UserTokenPolicy *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_USERTOKENPOLICY]);
 }
 
 static UA_INLINE void
-UA_NodeAttributes_clear(UA_NodeAttributes *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_NODEATTRIBUTES]);
+UA_UserTokenPolicy_clear(UA_UserTokenPolicy *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_USERTOKENPOLICY]);
 }
 
 static UA_INLINE void
-UA_NodeAttributes_delete(UA_NodeAttributes *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_NODEATTRIBUTES]);
+UA_UserTokenPolicy_delete(UA_UserTokenPolicy *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_USERTOKENPOLICY]);
 }
 
-/* ActivateSessionResponse */
+/* EndpointDescription */
 static UA_INLINE void
-UA_ActivateSessionResponse_init(UA_ActivateSessionResponse *p) {
-    memset(p, 0, sizeof(UA_ActivateSessionResponse));
+UA_EndpointDescription_init(UA_EndpointDescription *p) {
+    memset(p, 0, sizeof(UA_EndpointDescription));
 }
 
-static UA_INLINE UA_ActivateSessionResponse *
-UA_ActivateSessionResponse_new(void) {
-    return (UA_ActivateSessionResponse*)UA_new(&UA_TYPES[UA_TYPES_ACTIVATESESSIONRESPONSE]);
+static UA_INLINE UA_EndpointDescription *
+UA_EndpointDescription_new(void) {
+    return (UA_EndpointDescription*)UA_new(&UA_TYPES[UA_TYPES_ENDPOINTDESCRIPTION]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_ActivateSessionResponse_copy(const UA_ActivateSessionResponse *src, UA_ActivateSessionResponse *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_ACTIVATESESSIONRESPONSE]);
+UA_EndpointDescription_copy(const UA_EndpointDescription *src, UA_EndpointDescription *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_ENDPOINTDESCRIPTION]);
 }
 
 static UA_INLINE void
-UA_ActivateSessionResponse_deleteMembers(UA_ActivateSessionResponse *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_ACTIVATESESSIONRESPONSE]);
+UA_EndpointDescription_deleteMembers(UA_EndpointDescription *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_ENDPOINTDESCRIPTION]);
 }
 
 static UA_INLINE void
-UA_ActivateSessionResponse_clear(UA_ActivateSessionResponse *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_ACTIVATESESSIONRESPONSE]);
+UA_EndpointDescription_clear(UA_EndpointDescription *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_ENDPOINTDESCRIPTION]);
 }
 
 static UA_INLINE void
-UA_ActivateSessionResponse_delete(UA_ActivateSessionResponse *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_ACTIVATESESSIONRESPONSE]);
+UA_EndpointDescription_delete(UA_EndpointDescription *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_ENDPOINTDESCRIPTION]);
 }
 
-/* EnumField */
+/* GetEndpointsRequest */
 static UA_INLINE void
-UA_EnumField_init(UA_EnumField *p) {
-    memset(p, 0, sizeof(UA_EnumField));
+UA_GetEndpointsRequest_init(UA_GetEndpointsRequest *p) {
+    memset(p, 0, sizeof(UA_GetEndpointsRequest));
 }
 
-static UA_INLINE UA_EnumField *
-UA_EnumField_new(void) {
-    return (UA_EnumField*)UA_new(&UA_TYPES[UA_TYPES_ENUMFIELD]);
+static UA_INLINE UA_GetEndpointsRequest *
+UA_GetEndpointsRequest_new(void) {
+    return (UA_GetEndpointsRequest*)UA_new(&UA_TYPES[UA_TYPES_GETENDPOINTSREQUEST]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_EnumField_copy(const UA_EnumField *src, UA_EnumField *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_ENUMFIELD]);
+UA_GetEndpointsRequest_copy(const UA_GetEndpointsRequest *src, UA_GetEndpointsRequest *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_GETENDPOINTSREQUEST]);
 }
 
 static UA_INLINE void
-UA_EnumField_deleteMembers(UA_EnumField *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_ENUMFIELD]);
+UA_GetEndpointsRequest_deleteMembers(UA_GetEndpointsRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_GETENDPOINTSREQUEST]);
 }
 
 static UA_INLINE void
-UA_EnumField_clear(UA_EnumField *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_ENUMFIELD]);
+UA_GetEndpointsRequest_clear(UA_GetEndpointsRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_GETENDPOINTSREQUEST]);
 }
 
 static UA_INLINE void
-UA_EnumField_delete(UA_EnumField *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_ENUMFIELD]);
+UA_GetEndpointsRequest_delete(UA_GetEndpointsRequest *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_GETENDPOINTSREQUEST]);
 }
 
-/* VariableTypeAttributes */
+/* GetEndpointsResponse */
 static UA_INLINE void
-UA_VariableTypeAttributes_init(UA_VariableTypeAttributes *p) {
-    memset(p, 0, sizeof(UA_VariableTypeAttributes));
+UA_GetEndpointsResponse_init(UA_GetEndpointsResponse *p) {
+    memset(p, 0, sizeof(UA_GetEndpointsResponse));
 }
 
-static UA_INLINE UA_VariableTypeAttributes *
-UA_VariableTypeAttributes_new(void) {
-    return (UA_VariableTypeAttributes*)UA_new(&UA_TYPES[UA_TYPES_VARIABLETYPEATTRIBUTES]);
+static UA_INLINE UA_GetEndpointsResponse *
+UA_GetEndpointsResponse_new(void) {
+    return (UA_GetEndpointsResponse*)UA_new(&UA_TYPES[UA_TYPES_GETENDPOINTSRESPONSE]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_VariableTypeAttributes_copy(const UA_VariableTypeAttributes *src, UA_VariableTypeAttributes *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_VARIABLETYPEATTRIBUTES]);
+UA_GetEndpointsResponse_copy(const UA_GetEndpointsResponse *src, UA_GetEndpointsResponse *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_GETENDPOINTSRESPONSE]);
 }
 
 static UA_INLINE void
-UA_VariableTypeAttributes_deleteMembers(UA_VariableTypeAttributes *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_VARIABLETYPEATTRIBUTES]);
+UA_GetEndpointsResponse_deleteMembers(UA_GetEndpointsResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_GETENDPOINTSRESPONSE]);
 }
 
 static UA_INLINE void
-UA_VariableTypeAttributes_clear(UA_VariableTypeAttributes *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_VARIABLETYPEATTRIBUTES]);
+UA_GetEndpointsResponse_clear(UA_GetEndpointsResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_GETENDPOINTSRESPONSE]);
 }
 
 static UA_INLINE void
-UA_VariableTypeAttributes_delete(UA_VariableTypeAttributes *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_VARIABLETYPEATTRIBUTES]);
+UA_GetEndpointsResponse_delete(UA_GetEndpointsResponse *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_GETENDPOINTSRESPONSE]);
 }
 
-/* CallMethodResult */
+/* SecurityTokenRequestType */
 static UA_INLINE void
-UA_CallMethodResult_init(UA_CallMethodResult *p) {
-    memset(p, 0, sizeof(UA_CallMethodResult));
+UA_SecurityTokenRequestType_init(UA_SecurityTokenRequestType *p) {
+    memset(p, 0, sizeof(UA_SecurityTokenRequestType));
 }
 
-static UA_INLINE UA_CallMethodResult *
-UA_CallMethodResult_new(void) {
-    return (UA_CallMethodResult*)UA_new(&UA_TYPES[UA_TYPES_CALLMETHODRESULT]);
+static UA_INLINE UA_SecurityTokenRequestType *
+UA_SecurityTokenRequestType_new(void) {
+    return (UA_SecurityTokenRequestType*)UA_new(&UA_TYPES[UA_TYPES_SECURITYTOKENREQUESTTYPE]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_CallMethodResult_copy(const UA_CallMethodResult *src, UA_CallMethodResult *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_CALLMETHODRESULT]);
+UA_SecurityTokenRequestType_copy(const UA_SecurityTokenRequestType *src, UA_SecurityTokenRequestType *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_SECURITYTOKENREQUESTTYPE]);
 }
 
 static UA_INLINE void
-UA_CallMethodResult_deleteMembers(UA_CallMethodResult *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_CALLMETHODRESULT]);
+UA_SecurityTokenRequestType_deleteMembers(UA_SecurityTokenRequestType *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_SECURITYTOKENREQUESTTYPE]);
 }
 
 static UA_INLINE void
-UA_CallMethodResult_clear(UA_CallMethodResult *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_CALLMETHODRESULT]);
+UA_SecurityTokenRequestType_clear(UA_SecurityTokenRequestType *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_SECURITYTOKENREQUESTTYPE]);
 }
 
 static UA_INLINE void
-UA_CallMethodResult_delete(UA_CallMethodResult *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_CALLMETHODRESULT]);
+UA_SecurityTokenRequestType_delete(UA_SecurityTokenRequestType *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_SECURITYTOKENREQUESTTYPE]);
 }
 
-/* MonitoringMode */
+/* ChannelSecurityToken */
 static UA_INLINE void
-UA_MonitoringMode_init(UA_MonitoringMode *p) {
-    memset(p, 0, sizeof(UA_MonitoringMode));
+UA_ChannelSecurityToken_init(UA_ChannelSecurityToken *p) {
+    memset(p, 0, sizeof(UA_ChannelSecurityToken));
 }
 
-static UA_INLINE UA_MonitoringMode *
-UA_MonitoringMode_new(void) {
-    return (UA_MonitoringMode*)UA_new(&UA_TYPES[UA_TYPES_MONITORINGMODE]);
+static UA_INLINE UA_ChannelSecurityToken *
+UA_ChannelSecurityToken_new(void) {
+    return (UA_ChannelSecurityToken*)UA_new(&UA_TYPES[UA_TYPES_CHANNELSECURITYTOKEN]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_MonitoringMode_copy(const UA_MonitoringMode *src, UA_MonitoringMode *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_MONITORINGMODE]);
+UA_ChannelSecurityToken_copy(const UA_ChannelSecurityToken *src, UA_ChannelSecurityToken *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_CHANNELSECURITYTOKEN]);
 }
 
 static UA_INLINE void
-UA_MonitoringMode_deleteMembers(UA_MonitoringMode *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_MONITORINGMODE]);
+UA_ChannelSecurityToken_deleteMembers(UA_ChannelSecurityToken *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_CHANNELSECURITYTOKEN]);
 }
 
 static UA_INLINE void
-UA_MonitoringMode_clear(UA_MonitoringMode *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_MONITORINGMODE]);
+UA_ChannelSecurityToken_clear(UA_ChannelSecurityToken *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_CHANNELSECURITYTOKEN]);
 }
 
 static UA_INLINE void
-UA_MonitoringMode_delete(UA_MonitoringMode *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_MONITORINGMODE]);
+UA_ChannelSecurityToken_delete(UA_ChannelSecurityToken *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_CHANNELSECURITYTOKEN]);
 }
 
-/* SetMonitoringModeResponse */
+/* OpenSecureChannelRequest */
 static UA_INLINE void
-UA_SetMonitoringModeResponse_init(UA_SetMonitoringModeResponse *p) {
-    memset(p, 0, sizeof(UA_SetMonitoringModeResponse));
+UA_OpenSecureChannelRequest_init(UA_OpenSecureChannelRequest *p) {
+    memset(p, 0, sizeof(UA_OpenSecureChannelRequest));
 }
 
-static UA_INLINE UA_SetMonitoringModeResponse *
-UA_SetMonitoringModeResponse_new(void) {
-    return (UA_SetMonitoringModeResponse*)UA_new(&UA_TYPES[UA_TYPES_SETMONITORINGMODERESPONSE]);
+static UA_INLINE UA_OpenSecureChannelRequest *
+UA_OpenSecureChannelRequest_new(void) {
+    return (UA_OpenSecureChannelRequest*)UA_new(&UA_TYPES[UA_TYPES_OPENSECURECHANNELREQUEST]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_SetMonitoringModeResponse_copy(const UA_SetMonitoringModeResponse *src, UA_SetMonitoringModeResponse *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_SETMONITORINGMODERESPONSE]);
+UA_OpenSecureChannelRequest_copy(const UA_OpenSecureChannelRequest *src, UA_OpenSecureChannelRequest *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_OPENSECURECHANNELREQUEST]);
 }
 
 static UA_INLINE void
-UA_SetMonitoringModeResponse_deleteMembers(UA_SetMonitoringModeResponse *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_SETMONITORINGMODERESPONSE]);
+UA_OpenSecureChannelRequest_deleteMembers(UA_OpenSecureChannelRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_OPENSECURECHANNELREQUEST]);
 }
 
 static UA_INLINE void
-UA_SetMonitoringModeResponse_clear(UA_SetMonitoringModeResponse *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_SETMONITORINGMODERESPONSE]);
+UA_OpenSecureChannelRequest_clear(UA_OpenSecureChannelRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_OPENSECURECHANNELREQUEST]);
 }
 
 static UA_INLINE void
-UA_SetMonitoringModeResponse_delete(UA_SetMonitoringModeResponse *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_SETMONITORINGMODERESPONSE]);
+UA_OpenSecureChannelRequest_delete(UA_OpenSecureChannelRequest *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_OPENSECURECHANNELREQUEST]);
 }
 
-/* BrowseResultMask */
+/* OpenSecureChannelResponse */
 static UA_INLINE void
-UA_BrowseResultMask_init(UA_BrowseResultMask *p) {
-    memset(p, 0, sizeof(UA_BrowseResultMask));
+UA_OpenSecureChannelResponse_init(UA_OpenSecureChannelResponse *p) {
+    memset(p, 0, sizeof(UA_OpenSecureChannelResponse));
 }
 
-static UA_INLINE UA_BrowseResultMask *
-UA_BrowseResultMask_new(void) {
-    return (UA_BrowseResultMask*)UA_new(&UA_TYPES[UA_TYPES_BROWSERESULTMASK]);
+static UA_INLINE UA_OpenSecureChannelResponse *
+UA_OpenSecureChannelResponse_new(void) {
+    return (UA_OpenSecureChannelResponse*)UA_new(&UA_TYPES[UA_TYPES_OPENSECURECHANNELRESPONSE]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_BrowseResultMask_copy(const UA_BrowseResultMask *src, UA_BrowseResultMask *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_BROWSERESULTMASK]);
+UA_OpenSecureChannelResponse_copy(const UA_OpenSecureChannelResponse *src, UA_OpenSecureChannelResponse *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_OPENSECURECHANNELRESPONSE]);
 }
 
 static UA_INLINE void
-UA_BrowseResultMask_deleteMembers(UA_BrowseResultMask *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_BROWSERESULTMASK]);
+UA_OpenSecureChannelResponse_deleteMembers(UA_OpenSecureChannelResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_OPENSECURECHANNELRESPONSE]);
 }
 
 static UA_INLINE void
-UA_BrowseResultMask_clear(UA_BrowseResultMask *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_BROWSERESULTMASK]);
+UA_OpenSecureChannelResponse_clear(UA_OpenSecureChannelResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_OPENSECURECHANNELRESPONSE]);
 }
 
 static UA_INLINE void
-UA_BrowseResultMask_delete(UA_BrowseResultMask *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_BROWSERESULTMASK]);
+UA_OpenSecureChannelResponse_delete(UA_OpenSecureChannelResponse *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_OPENSECURECHANNELRESPONSE]);
 }
 
-/* RequestHeader */
+/* CloseSecureChannelRequest */
 static UA_INLINE void
-UA_RequestHeader_init(UA_RequestHeader *p) {
-    memset(p, 0, sizeof(UA_RequestHeader));
+UA_CloseSecureChannelRequest_init(UA_CloseSecureChannelRequest *p) {
+    memset(p, 0, sizeof(UA_CloseSecureChannelRequest));
 }
 
-static UA_INLINE UA_RequestHeader *
-UA_RequestHeader_new(void) {
-    return (UA_RequestHeader*)UA_new(&UA_TYPES[UA_TYPES_REQUESTHEADER]);
+static UA_INLINE UA_CloseSecureChannelRequest *
+UA_CloseSecureChannelRequest_new(void) {
+    return (UA_CloseSecureChannelRequest*)UA_new(&UA_TYPES[UA_TYPES_CLOSESECURECHANNELREQUEST]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_RequestHeader_copy(const UA_RequestHeader *src, UA_RequestHeader *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_REQUESTHEADER]);
+UA_CloseSecureChannelRequest_copy(const UA_CloseSecureChannelRequest *src, UA_CloseSecureChannelRequest *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_CLOSESECURECHANNELREQUEST]);
 }
 
 static UA_INLINE void
-UA_RequestHeader_deleteMembers(UA_RequestHeader *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_REQUESTHEADER]);
+UA_CloseSecureChannelRequest_deleteMembers(UA_CloseSecureChannelRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_CLOSESECURECHANNELREQUEST]);
 }
 
 static UA_INLINE void
-UA_RequestHeader_clear(UA_RequestHeader *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_REQUESTHEADER]);
+UA_CloseSecureChannelRequest_clear(UA_CloseSecureChannelRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_CLOSESECURECHANNELREQUEST]);
 }
 
 static UA_INLINE void
-UA_RequestHeader_delete(UA_RequestHeader *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_REQUESTHEADER]);
+UA_CloseSecureChannelRequest_delete(UA_CloseSecureChannelRequest *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_CLOSESECURECHANNELREQUEST]);
 }
 
-/* MonitoredItemModifyResult */
+/* CloseSecureChannelResponse */
 static UA_INLINE void
-UA_MonitoredItemModifyResult_init(UA_MonitoredItemModifyResult *p) {
-    memset(p, 0, sizeof(UA_MonitoredItemModifyResult));
+UA_CloseSecureChannelResponse_init(UA_CloseSecureChannelResponse *p) {
+    memset(p, 0, sizeof(UA_CloseSecureChannelResponse));
 }
 
-static UA_INLINE UA_MonitoredItemModifyResult *
-UA_MonitoredItemModifyResult_new(void) {
-    return (UA_MonitoredItemModifyResult*)UA_new(&UA_TYPES[UA_TYPES_MONITOREDITEMMODIFYRESULT]);
+static UA_INLINE UA_CloseSecureChannelResponse *
+UA_CloseSecureChannelResponse_new(void) {
+    return (UA_CloseSecureChannelResponse*)UA_new(&UA_TYPES[UA_TYPES_CLOSESECURECHANNELRESPONSE]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_MonitoredItemModifyResult_copy(const UA_MonitoredItemModifyResult *src, UA_MonitoredItemModifyResult *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_MONITOREDITEMMODIFYRESULT]);
+UA_CloseSecureChannelResponse_copy(const UA_CloseSecureChannelResponse *src, UA_CloseSecureChannelResponse *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_CLOSESECURECHANNELRESPONSE]);
 }
 
 static UA_INLINE void
-UA_MonitoredItemModifyResult_deleteMembers(UA_MonitoredItemModifyResult *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_MONITOREDITEMMODIFYRESULT]);
+UA_CloseSecureChannelResponse_deleteMembers(UA_CloseSecureChannelResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_CLOSESECURECHANNELRESPONSE]);
 }
 
 static UA_INLINE void
-UA_MonitoredItemModifyResult_clear(UA_MonitoredItemModifyResult *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_MONITOREDITEMMODIFYRESULT]);
+UA_CloseSecureChannelResponse_clear(UA_CloseSecureChannelResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_CLOSESECURECHANNELRESPONSE]);
 }
 
 static UA_INLINE void
-UA_MonitoredItemModifyResult_delete(UA_MonitoredItemModifyResult *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_MONITOREDITEMMODIFYRESULT]);
+UA_CloseSecureChannelResponse_delete(UA_CloseSecureChannelResponse *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_CLOSESECURECHANNELRESPONSE]);
 }
 
-/* CloseSecureChannelRequest */
+/* SignedSoftwareCertificate */
 static UA_INLINE void
-UA_CloseSecureChannelRequest_init(UA_CloseSecureChannelRequest *p) {
-    memset(p, 0, sizeof(UA_CloseSecureChannelRequest));
+UA_SignedSoftwareCertificate_init(UA_SignedSoftwareCertificate *p) {
+    memset(p, 0, sizeof(UA_SignedSoftwareCertificate));
 }
 
-static UA_INLINE UA_CloseSecureChannelRequest *
-UA_CloseSecureChannelRequest_new(void) {
-    return (UA_CloseSecureChannelRequest*)UA_new(&UA_TYPES[UA_TYPES_CLOSESECURECHANNELREQUEST]);
+static UA_INLINE UA_SignedSoftwareCertificate *
+UA_SignedSoftwareCertificate_new(void) {
+    return (UA_SignedSoftwareCertificate*)UA_new(&UA_TYPES[UA_TYPES_SIGNEDSOFTWARECERTIFICATE]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_CloseSecureChannelRequest_copy(const UA_CloseSecureChannelRequest *src, UA_CloseSecureChannelRequest *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_CLOSESECURECHANNELREQUEST]);
+UA_SignedSoftwareCertificate_copy(const UA_SignedSoftwareCertificate *src, UA_SignedSoftwareCertificate *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_SIGNEDSOFTWARECERTIFICATE]);
 }
 
 static UA_INLINE void
-UA_CloseSecureChannelRequest_deleteMembers(UA_CloseSecureChannelRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_CLOSESECURECHANNELREQUEST]);
+UA_SignedSoftwareCertificate_deleteMembers(UA_SignedSoftwareCertificate *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_SIGNEDSOFTWARECERTIFICATE]);
 }
 
 static UA_INLINE void
-UA_CloseSecureChannelRequest_clear(UA_CloseSecureChannelRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_CLOSESECURECHANNELREQUEST]);
+UA_SignedSoftwareCertificate_clear(UA_SignedSoftwareCertificate *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_SIGNEDSOFTWARECERTIFICATE]);
 }
 
 static UA_INLINE void
-UA_CloseSecureChannelRequest_delete(UA_CloseSecureChannelRequest *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_CLOSESECURECHANNELREQUEST]);
+UA_SignedSoftwareCertificate_delete(UA_SignedSoftwareCertificate *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_SIGNEDSOFTWARECERTIFICATE]);
 }
 
-/* NotificationMessage */
+/* SignatureData */
 static UA_INLINE void
-UA_NotificationMessage_init(UA_NotificationMessage *p) {
-    memset(p, 0, sizeof(UA_NotificationMessage));
+UA_SignatureData_init(UA_SignatureData *p) {
+    memset(p, 0, sizeof(UA_SignatureData));
 }
 
-static UA_INLINE UA_NotificationMessage *
-UA_NotificationMessage_new(void) {
-    return (UA_NotificationMessage*)UA_new(&UA_TYPES[UA_TYPES_NOTIFICATIONMESSAGE]);
+static UA_INLINE UA_SignatureData *
+UA_SignatureData_new(void) {
+    return (UA_SignatureData*)UA_new(&UA_TYPES[UA_TYPES_SIGNATUREDATA]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_NotificationMessage_copy(const UA_NotificationMessage *src, UA_NotificationMessage *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_NOTIFICATIONMESSAGE]);
+UA_SignatureData_copy(const UA_SignatureData *src, UA_SignatureData *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_SIGNATUREDATA]);
 }
 
 static UA_INLINE void
-UA_NotificationMessage_deleteMembers(UA_NotificationMessage *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_NOTIFICATIONMESSAGE]);
+UA_SignatureData_deleteMembers(UA_SignatureData *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_SIGNATUREDATA]);
 }
 
 static UA_INLINE void
-UA_NotificationMessage_clear(UA_NotificationMessage *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_NOTIFICATIONMESSAGE]);
+UA_SignatureData_clear(UA_SignatureData *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_SIGNATUREDATA]);
 }
 
 static UA_INLINE void
-UA_NotificationMessage_delete(UA_NotificationMessage *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_NOTIFICATIONMESSAGE]);
+UA_SignatureData_delete(UA_SignatureData *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_SIGNATUREDATA]);
 }
 
-/* CreateSubscriptionResponse */
+/* CreateSessionRequest */
 static UA_INLINE void
-UA_CreateSubscriptionResponse_init(UA_CreateSubscriptionResponse *p) {
-    memset(p, 0, sizeof(UA_CreateSubscriptionResponse));
+UA_CreateSessionRequest_init(UA_CreateSessionRequest *p) {
+    memset(p, 0, sizeof(UA_CreateSessionRequest));
 }
 
-static UA_INLINE UA_CreateSubscriptionResponse *
-UA_CreateSubscriptionResponse_new(void) {
-    return (UA_CreateSubscriptionResponse*)UA_new(&UA_TYPES[UA_TYPES_CREATESUBSCRIPTIONRESPONSE]);
+static UA_INLINE UA_CreateSessionRequest *
+UA_CreateSessionRequest_new(void) {
+    return (UA_CreateSessionRequest*)UA_new(&UA_TYPES[UA_TYPES_CREATESESSIONREQUEST]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_CreateSubscriptionResponse_copy(const UA_CreateSubscriptionResponse *src, UA_CreateSubscriptionResponse *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_CREATESUBSCRIPTIONRESPONSE]);
+UA_CreateSessionRequest_copy(const UA_CreateSessionRequest *src, UA_CreateSessionRequest *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_CREATESESSIONREQUEST]);
 }
 
 static UA_INLINE void
-UA_CreateSubscriptionResponse_deleteMembers(UA_CreateSubscriptionResponse *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_CREATESUBSCRIPTIONRESPONSE]);
+UA_CreateSessionRequest_deleteMembers(UA_CreateSessionRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_CREATESESSIONREQUEST]);
 }
 
 static UA_INLINE void
-UA_CreateSubscriptionResponse_clear(UA_CreateSubscriptionResponse *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_CREATESUBSCRIPTIONRESPONSE]);
+UA_CreateSessionRequest_clear(UA_CreateSessionRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_CREATESESSIONREQUEST]);
 }
 
 static UA_INLINE void
-UA_CreateSubscriptionResponse_delete(UA_CreateSubscriptionResponse *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_CREATESUBSCRIPTIONRESPONSE]);
+UA_CreateSessionRequest_delete(UA_CreateSessionRequest *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_CREATESESSIONREQUEST]);
 }
 
-/* EnumDefinition */
+/* CreateSessionResponse */
 static UA_INLINE void
-UA_EnumDefinition_init(UA_EnumDefinition *p) {
-    memset(p, 0, sizeof(UA_EnumDefinition));
+UA_CreateSessionResponse_init(UA_CreateSessionResponse *p) {
+    memset(p, 0, sizeof(UA_CreateSessionResponse));
 }
 
-static UA_INLINE UA_EnumDefinition *
-UA_EnumDefinition_new(void) {
-    return (UA_EnumDefinition*)UA_new(&UA_TYPES[UA_TYPES_ENUMDEFINITION]);
+static UA_INLINE UA_CreateSessionResponse *
+UA_CreateSessionResponse_new(void) {
+    return (UA_CreateSessionResponse*)UA_new(&UA_TYPES[UA_TYPES_CREATESESSIONRESPONSE]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_EnumDefinition_copy(const UA_EnumDefinition *src, UA_EnumDefinition *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_ENUMDEFINITION]);
+UA_CreateSessionResponse_copy(const UA_CreateSessionResponse *src, UA_CreateSessionResponse *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_CREATESESSIONRESPONSE]);
 }
 
 static UA_INLINE void
-UA_EnumDefinition_deleteMembers(UA_EnumDefinition *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_ENUMDEFINITION]);
+UA_CreateSessionResponse_deleteMembers(UA_CreateSessionResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_CREATESESSIONRESPONSE]);
 }
 
 static UA_INLINE void
-UA_EnumDefinition_clear(UA_EnumDefinition *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_ENUMDEFINITION]);
+UA_CreateSessionResponse_clear(UA_CreateSessionResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_CREATESESSIONRESPONSE]);
 }
 
 static UA_INLINE void
-UA_EnumDefinition_delete(UA_EnumDefinition *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_ENUMDEFINITION]);
+UA_CreateSessionResponse_delete(UA_CreateSessionResponse *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_CREATESESSIONRESPONSE]);
 }
 
-/* AxisScaleEnumeration */
+/* UserIdentityToken */
 static UA_INLINE void
-UA_AxisScaleEnumeration_init(UA_AxisScaleEnumeration *p) {
-    memset(p, 0, sizeof(UA_AxisScaleEnumeration));
+UA_UserIdentityToken_init(UA_UserIdentityToken *p) {
+    memset(p, 0, sizeof(UA_UserIdentityToken));
 }
 
-static UA_INLINE UA_AxisScaleEnumeration *
-UA_AxisScaleEnumeration_new(void) {
-    return (UA_AxisScaleEnumeration*)UA_new(&UA_TYPES[UA_TYPES_AXISSCALEENUMERATION]);
+static UA_INLINE UA_UserIdentityToken *
+UA_UserIdentityToken_new(void) {
+    return (UA_UserIdentityToken*)UA_new(&UA_TYPES[UA_TYPES_USERIDENTITYTOKEN]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_AxisScaleEnumeration_copy(const UA_AxisScaleEnumeration *src, UA_AxisScaleEnumeration *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_AXISSCALEENUMERATION]);
+UA_UserIdentityToken_copy(const UA_UserIdentityToken *src, UA_UserIdentityToken *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_USERIDENTITYTOKEN]);
 }
 
 static UA_INLINE void
-UA_AxisScaleEnumeration_deleteMembers(UA_AxisScaleEnumeration *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_AXISSCALEENUMERATION]);
+UA_UserIdentityToken_deleteMembers(UA_UserIdentityToken *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_USERIDENTITYTOKEN]);
 }
 
 static UA_INLINE void
-UA_AxisScaleEnumeration_clear(UA_AxisScaleEnumeration *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_AXISSCALEENUMERATION]);
+UA_UserIdentityToken_clear(UA_UserIdentityToken *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_USERIDENTITYTOKEN]);
 }
 
 static UA_INLINE void
-UA_AxisScaleEnumeration_delete(UA_AxisScaleEnumeration *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_AXISSCALEENUMERATION]);
+UA_UserIdentityToken_delete(UA_UserIdentityToken *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_USERIDENTITYTOKEN]);
 }
 
-/* BrowseDirection */
+/* AnonymousIdentityToken */
 static UA_INLINE void
-UA_BrowseDirection_init(UA_BrowseDirection *p) {
-    memset(p, 0, sizeof(UA_BrowseDirection));
+UA_AnonymousIdentityToken_init(UA_AnonymousIdentityToken *p) {
+    memset(p, 0, sizeof(UA_AnonymousIdentityToken));
 }
 
-static UA_INLINE UA_BrowseDirection *
-UA_BrowseDirection_new(void) {
-    return (UA_BrowseDirection*)UA_new(&UA_TYPES[UA_TYPES_BROWSEDIRECTION]);
+static UA_INLINE UA_AnonymousIdentityToken *
+UA_AnonymousIdentityToken_new(void) {
+    return (UA_AnonymousIdentityToken*)UA_new(&UA_TYPES[UA_TYPES_ANONYMOUSIDENTITYTOKEN]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_BrowseDirection_copy(const UA_BrowseDirection *src, UA_BrowseDirection *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_BROWSEDIRECTION]);
+UA_AnonymousIdentityToken_copy(const UA_AnonymousIdentityToken *src, UA_AnonymousIdentityToken *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_ANONYMOUSIDENTITYTOKEN]);
 }
 
 static UA_INLINE void
-UA_BrowseDirection_deleteMembers(UA_BrowseDirection *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_BROWSEDIRECTION]);
+UA_AnonymousIdentityToken_deleteMembers(UA_AnonymousIdentityToken *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_ANONYMOUSIDENTITYTOKEN]);
 }
 
 static UA_INLINE void
-UA_BrowseDirection_clear(UA_BrowseDirection *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_BROWSEDIRECTION]);
+UA_AnonymousIdentityToken_clear(UA_AnonymousIdentityToken *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_ANONYMOUSIDENTITYTOKEN]);
 }
 
 static UA_INLINE void
-UA_BrowseDirection_delete(UA_BrowseDirection *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_BROWSEDIRECTION]);
+UA_AnonymousIdentityToken_delete(UA_AnonymousIdentityToken *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_ANONYMOUSIDENTITYTOKEN]);
 }
 
-/* CallMethodRequest */
+/* UserNameIdentityToken */
 static UA_INLINE void
-UA_CallMethodRequest_init(UA_CallMethodRequest *p) {
-    memset(p, 0, sizeof(UA_CallMethodRequest));
+UA_UserNameIdentityToken_init(UA_UserNameIdentityToken *p) {
+    memset(p, 0, sizeof(UA_UserNameIdentityToken));
 }
 
-static UA_INLINE UA_CallMethodRequest *
-UA_CallMethodRequest_new(void) {
-    return (UA_CallMethodRequest*)UA_new(&UA_TYPES[UA_TYPES_CALLMETHODREQUEST]);
+static UA_INLINE UA_UserNameIdentityToken *
+UA_UserNameIdentityToken_new(void) {
+    return (UA_UserNameIdentityToken*)UA_new(&UA_TYPES[UA_TYPES_USERNAMEIDENTITYTOKEN]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_CallMethodRequest_copy(const UA_CallMethodRequest *src, UA_CallMethodRequest *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_CALLMETHODREQUEST]);
+UA_UserNameIdentityToken_copy(const UA_UserNameIdentityToken *src, UA_UserNameIdentityToken *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_USERNAMEIDENTITYTOKEN]);
 }
 
 static UA_INLINE void
-UA_CallMethodRequest_deleteMembers(UA_CallMethodRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_CALLMETHODREQUEST]);
+UA_UserNameIdentityToken_deleteMembers(UA_UserNameIdentityToken *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_USERNAMEIDENTITYTOKEN]);
 }
 
 static UA_INLINE void
-UA_CallMethodRequest_clear(UA_CallMethodRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_CALLMETHODREQUEST]);
+UA_UserNameIdentityToken_clear(UA_UserNameIdentityToken *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_USERNAMEIDENTITYTOKEN]);
 }
 
 static UA_INLINE void
-UA_CallMethodRequest_delete(UA_CallMethodRequest *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_CALLMETHODREQUEST]);
+UA_UserNameIdentityToken_delete(UA_UserNameIdentityToken *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_USERNAMEIDENTITYTOKEN]);
 }
 
-/* ReadResponse */
+/* X509IdentityToken */
 static UA_INLINE void
-UA_ReadResponse_init(UA_ReadResponse *p) {
-    memset(p, 0, sizeof(UA_ReadResponse));
+UA_X509IdentityToken_init(UA_X509IdentityToken *p) {
+    memset(p, 0, sizeof(UA_X509IdentityToken));
 }
 
-static UA_INLINE UA_ReadResponse *
-UA_ReadResponse_new(void) {
-    return (UA_ReadResponse*)UA_new(&UA_TYPES[UA_TYPES_READRESPONSE]);
+static UA_INLINE UA_X509IdentityToken *
+UA_X509IdentityToken_new(void) {
+    return (UA_X509IdentityToken*)UA_new(&UA_TYPES[UA_TYPES_X509IDENTITYTOKEN]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_ReadResponse_copy(const UA_ReadResponse *src, UA_ReadResponse *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_READRESPONSE]);
+UA_X509IdentityToken_copy(const UA_X509IdentityToken *src, UA_X509IdentityToken *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_X509IDENTITYTOKEN]);
 }
 
 static UA_INLINE void
-UA_ReadResponse_deleteMembers(UA_ReadResponse *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_READRESPONSE]);
+UA_X509IdentityToken_deleteMembers(UA_X509IdentityToken *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_X509IDENTITYTOKEN]);
 }
 
 static UA_INLINE void
-UA_ReadResponse_clear(UA_ReadResponse *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_READRESPONSE]);
+UA_X509IdentityToken_clear(UA_X509IdentityToken *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_X509IDENTITYTOKEN]);
 }
 
 static UA_INLINE void
-UA_ReadResponse_delete(UA_ReadResponse *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_READRESPONSE]);
+UA_X509IdentityToken_delete(UA_X509IdentityToken *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_X509IDENTITYTOKEN]);
 }
 
-/* TimestampsToReturn */
+/* IssuedIdentityToken */
 static UA_INLINE void
-UA_TimestampsToReturn_init(UA_TimestampsToReturn *p) {
-    memset(p, 0, sizeof(UA_TimestampsToReturn));
+UA_IssuedIdentityToken_init(UA_IssuedIdentityToken *p) {
+    memset(p, 0, sizeof(UA_IssuedIdentityToken));
 }
 
-static UA_INLINE UA_TimestampsToReturn *
-UA_TimestampsToReturn_new(void) {
-    return (UA_TimestampsToReturn*)UA_new(&UA_TYPES[UA_TYPES_TIMESTAMPSTORETURN]);
+static UA_INLINE UA_IssuedIdentityToken *
+UA_IssuedIdentityToken_new(void) {
+    return (UA_IssuedIdentityToken*)UA_new(&UA_TYPES[UA_TYPES_ISSUEDIDENTITYTOKEN]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_TimestampsToReturn_copy(const UA_TimestampsToReturn *src, UA_TimestampsToReturn *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_TIMESTAMPSTORETURN]);
+UA_IssuedIdentityToken_copy(const UA_IssuedIdentityToken *src, UA_IssuedIdentityToken *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_ISSUEDIDENTITYTOKEN]);
 }
 
 static UA_INLINE void
-UA_TimestampsToReturn_deleteMembers(UA_TimestampsToReturn *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_TIMESTAMPSTORETURN]);
+UA_IssuedIdentityToken_deleteMembers(UA_IssuedIdentityToken *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_ISSUEDIDENTITYTOKEN]);
 }
 
 static UA_INLINE void
-UA_TimestampsToReturn_clear(UA_TimestampsToReturn *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_TIMESTAMPSTORETURN]);
+UA_IssuedIdentityToken_clear(UA_IssuedIdentityToken *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_ISSUEDIDENTITYTOKEN]);
 }
 
 static UA_INLINE void
-UA_TimestampsToReturn_delete(UA_TimestampsToReturn *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_TIMESTAMPSTORETURN]);
+UA_IssuedIdentityToken_delete(UA_IssuedIdentityToken *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_ISSUEDIDENTITYTOKEN]);
 }
 
-/* NodeClass */
+/* ActivateSessionRequest */
 static UA_INLINE void
-UA_NodeClass_init(UA_NodeClass *p) {
-    memset(p, 0, sizeof(UA_NodeClass));
+UA_ActivateSessionRequest_init(UA_ActivateSessionRequest *p) {
+    memset(p, 0, sizeof(UA_ActivateSessionRequest));
 }
 
-static UA_INLINE UA_NodeClass *
-UA_NodeClass_new(void) {
-    return (UA_NodeClass*)UA_new(&UA_TYPES[UA_TYPES_NODECLASS]);
+static UA_INLINE UA_ActivateSessionRequest *
+UA_ActivateSessionRequest_new(void) {
+    return (UA_ActivateSessionRequest*)UA_new(&UA_TYPES[UA_TYPES_ACTIVATESESSIONREQUEST]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_NodeClass_copy(const UA_NodeClass *src, UA_NodeClass *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_NODECLASS]);
+UA_ActivateSessionRequest_copy(const UA_ActivateSessionRequest *src, UA_ActivateSessionRequest *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_ACTIVATESESSIONREQUEST]);
 }
 
 static UA_INLINE void
-UA_NodeClass_deleteMembers(UA_NodeClass *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_NODECLASS]);
+UA_ActivateSessionRequest_deleteMembers(UA_ActivateSessionRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_ACTIVATESESSIONREQUEST]);
 }
 
 static UA_INLINE void
-UA_NodeClass_clear(UA_NodeClass *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_NODECLASS]);
+UA_ActivateSessionRequest_clear(UA_ActivateSessionRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_ACTIVATESESSIONREQUEST]);
 }
 
 static UA_INLINE void
-UA_NodeClass_delete(UA_NodeClass *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_NODECLASS]);
+UA_ActivateSessionRequest_delete(UA_ActivateSessionRequest *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_ACTIVATESESSIONREQUEST]);
 }
 
-/* ObjectTypeAttributes */
+/* ActivateSessionResponse */
 static UA_INLINE void
-UA_ObjectTypeAttributes_init(UA_ObjectTypeAttributes *p) {
-    memset(p, 0, sizeof(UA_ObjectTypeAttributes));
+UA_ActivateSessionResponse_init(UA_ActivateSessionResponse *p) {
+    memset(p, 0, sizeof(UA_ActivateSessionResponse));
 }
 
-static UA_INLINE UA_ObjectTypeAttributes *
-UA_ObjectTypeAttributes_new(void) {
-    return (UA_ObjectTypeAttributes*)UA_new(&UA_TYPES[UA_TYPES_OBJECTTYPEATTRIBUTES]);
+static UA_INLINE UA_ActivateSessionResponse *
+UA_ActivateSessionResponse_new(void) {
+    return (UA_ActivateSessionResponse*)UA_new(&UA_TYPES[UA_TYPES_ACTIVATESESSIONRESPONSE]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_ObjectTypeAttributes_copy(const UA_ObjectTypeAttributes *src, UA_ObjectTypeAttributes *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_OBJECTTYPEATTRIBUTES]);
+UA_ActivateSessionResponse_copy(const UA_ActivateSessionResponse *src, UA_ActivateSessionResponse *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_ACTIVATESESSIONRESPONSE]);
 }
 
 static UA_INLINE void
-UA_ObjectTypeAttributes_deleteMembers(UA_ObjectTypeAttributes *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_OBJECTTYPEATTRIBUTES]);
+UA_ActivateSessionResponse_deleteMembers(UA_ActivateSessionResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_ACTIVATESESSIONRESPONSE]);
 }
 
 static UA_INLINE void
-UA_ObjectTypeAttributes_clear(UA_ObjectTypeAttributes *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_OBJECTTYPEATTRIBUTES]);
+UA_ActivateSessionResponse_clear(UA_ActivateSessionResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_ACTIVATESESSIONRESPONSE]);
 }
 
 static UA_INLINE void
-UA_ObjectTypeAttributes_delete(UA_ObjectTypeAttributes *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_OBJECTTYPEATTRIBUTES]);
+UA_ActivateSessionResponse_delete(UA_ActivateSessionResponse *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_ACTIVATESESSIONRESPONSE]);
 }
 
-/* SecurityTokenRequestType */
+/* CloseSessionRequest */
 static UA_INLINE void
-UA_SecurityTokenRequestType_init(UA_SecurityTokenRequestType *p) {
-    memset(p, 0, sizeof(UA_SecurityTokenRequestType));
+UA_CloseSessionRequest_init(UA_CloseSessionRequest *p) {
+    memset(p, 0, sizeof(UA_CloseSessionRequest));
 }
 
-static UA_INLINE UA_SecurityTokenRequestType *
-UA_SecurityTokenRequestType_new(void) {
-    return (UA_SecurityTokenRequestType*)UA_new(&UA_TYPES[UA_TYPES_SECURITYTOKENREQUESTTYPE]);
+static UA_INLINE UA_CloseSessionRequest *
+UA_CloseSessionRequest_new(void) {
+    return (UA_CloseSessionRequest*)UA_new(&UA_TYPES[UA_TYPES_CLOSESESSIONREQUEST]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_SecurityTokenRequestType_copy(const UA_SecurityTokenRequestType *src, UA_SecurityTokenRequestType *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_SECURITYTOKENREQUESTTYPE]);
+UA_CloseSessionRequest_copy(const UA_CloseSessionRequest *src, UA_CloseSessionRequest *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_CLOSESESSIONREQUEST]);
 }
 
 static UA_INLINE void
-UA_SecurityTokenRequestType_deleteMembers(UA_SecurityTokenRequestType *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_SECURITYTOKENREQUESTTYPE]);
+UA_CloseSessionRequest_deleteMembers(UA_CloseSessionRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_CLOSESESSIONREQUEST]);
 }
 
 static UA_INLINE void
-UA_SecurityTokenRequestType_clear(UA_SecurityTokenRequestType *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_SECURITYTOKENREQUESTTYPE]);
+UA_CloseSessionRequest_clear(UA_CloseSessionRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_CLOSESESSIONREQUEST]);
 }
 
 static UA_INLINE void
-UA_SecurityTokenRequestType_delete(UA_SecurityTokenRequestType *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_SECURITYTOKENREQUESTTYPE]);
+UA_CloseSessionRequest_delete(UA_CloseSessionRequest *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_CLOSESESSIONREQUEST]);
 }
 
 /* CloseSessionResponse */
@@ -18649,314 +18911,345 @@ UA_CloseSessionResponse_delete(UA_CloseSessionResponse *p) {
     UA_delete(p, &UA_TYPES[UA_TYPES_CLOSESESSIONRESPONSE]);
 }
 
-/* SetPublishingModeRequest */
+/* NodeAttributesMask */
 static UA_INLINE void
-UA_SetPublishingModeRequest_init(UA_SetPublishingModeRequest *p) {
-    memset(p, 0, sizeof(UA_SetPublishingModeRequest));
+UA_NodeAttributesMask_init(UA_NodeAttributesMask *p) {
+    memset(p, 0, sizeof(UA_NodeAttributesMask));
 }
 
-static UA_INLINE UA_SetPublishingModeRequest *
-UA_SetPublishingModeRequest_new(void) {
-    return (UA_SetPublishingModeRequest*)UA_new(&UA_TYPES[UA_TYPES_SETPUBLISHINGMODEREQUEST]);
+static UA_INLINE UA_NodeAttributesMask *
+UA_NodeAttributesMask_new(void) {
+    return (UA_NodeAttributesMask*)UA_new(&UA_TYPES[UA_TYPES_NODEATTRIBUTESMASK]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_SetPublishingModeRequest_copy(const UA_SetPublishingModeRequest *src, UA_SetPublishingModeRequest *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_SETPUBLISHINGMODEREQUEST]);
+UA_NodeAttributesMask_copy(const UA_NodeAttributesMask *src, UA_NodeAttributesMask *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_NODEATTRIBUTESMASK]);
 }
 
 static UA_INLINE void
-UA_SetPublishingModeRequest_deleteMembers(UA_SetPublishingModeRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_SETPUBLISHINGMODEREQUEST]);
+UA_NodeAttributesMask_deleteMembers(UA_NodeAttributesMask *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_NODEATTRIBUTESMASK]);
 }
 
 static UA_INLINE void
-UA_SetPublishingModeRequest_clear(UA_SetPublishingModeRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_SETPUBLISHINGMODEREQUEST]);
+UA_NodeAttributesMask_clear(UA_NodeAttributesMask *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_NODEATTRIBUTESMASK]);
 }
 
 static UA_INLINE void
-UA_SetPublishingModeRequest_delete(UA_SetPublishingModeRequest *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_SETPUBLISHINGMODEREQUEST]);
+UA_NodeAttributesMask_delete(UA_NodeAttributesMask *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_NODEATTRIBUTESMASK]);
 }
 
-/* IssuedIdentityToken */
+/* NodeAttributes */
 static UA_INLINE void
-UA_IssuedIdentityToken_init(UA_IssuedIdentityToken *p) {
-    memset(p, 0, sizeof(UA_IssuedIdentityToken));
+UA_NodeAttributes_init(UA_NodeAttributes *p) {
+    memset(p, 0, sizeof(UA_NodeAttributes));
 }
 
-static UA_INLINE UA_IssuedIdentityToken *
-UA_IssuedIdentityToken_new(void) {
-    return (UA_IssuedIdentityToken*)UA_new(&UA_TYPES[UA_TYPES_ISSUEDIDENTITYTOKEN]);
+static UA_INLINE UA_NodeAttributes *
+UA_NodeAttributes_new(void) {
+    return (UA_NodeAttributes*)UA_new(&UA_TYPES[UA_TYPES_NODEATTRIBUTES]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_IssuedIdentityToken_copy(const UA_IssuedIdentityToken *src, UA_IssuedIdentityToken *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_ISSUEDIDENTITYTOKEN]);
+UA_NodeAttributes_copy(const UA_NodeAttributes *src, UA_NodeAttributes *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_NODEATTRIBUTES]);
 }
 
 static UA_INLINE void
-UA_IssuedIdentityToken_deleteMembers(UA_IssuedIdentityToken *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_ISSUEDIDENTITYTOKEN]);
+UA_NodeAttributes_deleteMembers(UA_NodeAttributes *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_NODEATTRIBUTES]);
 }
 
 static UA_INLINE void
-UA_IssuedIdentityToken_clear(UA_IssuedIdentityToken *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_ISSUEDIDENTITYTOKEN]);
+UA_NodeAttributes_clear(UA_NodeAttributes *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_NODEATTRIBUTES]);
 }
 
 static UA_INLINE void
-UA_IssuedIdentityToken_delete(UA_IssuedIdentityToken *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_ISSUEDIDENTITYTOKEN]);
+UA_NodeAttributes_delete(UA_NodeAttributes *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_NODEATTRIBUTES]);
 }
 
-/* DeleteMonitoredItemsResponse */
+/* ObjectAttributes */
 static UA_INLINE void
-UA_DeleteMonitoredItemsResponse_init(UA_DeleteMonitoredItemsResponse *p) {
-    memset(p, 0, sizeof(UA_DeleteMonitoredItemsResponse));
+UA_ObjectAttributes_init(UA_ObjectAttributes *p) {
+    memset(p, 0, sizeof(UA_ObjectAttributes));
 }
 
-static UA_INLINE UA_DeleteMonitoredItemsResponse *
-UA_DeleteMonitoredItemsResponse_new(void) {
-    return (UA_DeleteMonitoredItemsResponse*)UA_new(&UA_TYPES[UA_TYPES_DELETEMONITOREDITEMSRESPONSE]);
+static UA_INLINE UA_ObjectAttributes *
+UA_ObjectAttributes_new(void) {
+    return (UA_ObjectAttributes*)UA_new(&UA_TYPES[UA_TYPES_OBJECTATTRIBUTES]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_DeleteMonitoredItemsResponse_copy(const UA_DeleteMonitoredItemsResponse *src, UA_DeleteMonitoredItemsResponse *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_DELETEMONITOREDITEMSRESPONSE]);
+UA_ObjectAttributes_copy(const UA_ObjectAttributes *src, UA_ObjectAttributes *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES]);
 }
 
 static UA_INLINE void
-UA_DeleteMonitoredItemsResponse_deleteMembers(UA_DeleteMonitoredItemsResponse *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_DELETEMONITOREDITEMSRESPONSE]);
+UA_ObjectAttributes_deleteMembers(UA_ObjectAttributes *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES]);
 }
 
 static UA_INLINE void
-UA_DeleteMonitoredItemsResponse_clear(UA_DeleteMonitoredItemsResponse *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_DELETEMONITOREDITEMSRESPONSE]);
+UA_ObjectAttributes_clear(UA_ObjectAttributes *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES]);
 }
 
 static UA_INLINE void
-UA_DeleteMonitoredItemsResponse_delete(UA_DeleteMonitoredItemsResponse *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_DELETEMONITOREDITEMSRESPONSE]);
+UA_ObjectAttributes_delete(UA_ObjectAttributes *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES]);
 }
 
-/* ApplicationType */
+/* VariableAttributes */
 static UA_INLINE void
-UA_ApplicationType_init(UA_ApplicationType *p) {
-    memset(p, 0, sizeof(UA_ApplicationType));
+UA_VariableAttributes_init(UA_VariableAttributes *p) {
+    memset(p, 0, sizeof(UA_VariableAttributes));
 }
 
-static UA_INLINE UA_ApplicationType *
-UA_ApplicationType_new(void) {
-    return (UA_ApplicationType*)UA_new(&UA_TYPES[UA_TYPES_APPLICATIONTYPE]);
+static UA_INLINE UA_VariableAttributes *
+UA_VariableAttributes_new(void) {
+    return (UA_VariableAttributes*)UA_new(&UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_ApplicationType_copy(const UA_ApplicationType *src, UA_ApplicationType *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_APPLICATIONTYPE]);
+UA_VariableAttributes_copy(const UA_VariableAttributes *src, UA_VariableAttributes *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES]);
 }
 
 static UA_INLINE void
-UA_ApplicationType_deleteMembers(UA_ApplicationType *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_APPLICATIONTYPE]);
+UA_VariableAttributes_deleteMembers(UA_VariableAttributes *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES]);
 }
 
 static UA_INLINE void
-UA_ApplicationType_clear(UA_ApplicationType *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_APPLICATIONTYPE]);
+UA_VariableAttributes_clear(UA_VariableAttributes *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES]);
 }
 
 static UA_INLINE void
-UA_ApplicationType_delete(UA_ApplicationType *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_APPLICATIONTYPE]);
+UA_VariableAttributes_delete(UA_VariableAttributes *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_VARIABLEATTRIBUTES]);
 }
 
-/* BrowseNextRequest */
+/* MethodAttributes */
 static UA_INLINE void
-UA_BrowseNextRequest_init(UA_BrowseNextRequest *p) {
-    memset(p, 0, sizeof(UA_BrowseNextRequest));
+UA_MethodAttributes_init(UA_MethodAttributes *p) {
+    memset(p, 0, sizeof(UA_MethodAttributes));
 }
 
-static UA_INLINE UA_BrowseNextRequest *
-UA_BrowseNextRequest_new(void) {
-    return (UA_BrowseNextRequest*)UA_new(&UA_TYPES[UA_TYPES_BROWSENEXTREQUEST]);
+static UA_INLINE UA_MethodAttributes *
+UA_MethodAttributes_new(void) {
+    return (UA_MethodAttributes*)UA_new(&UA_TYPES[UA_TYPES_METHODATTRIBUTES]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_BrowseNextRequest_copy(const UA_BrowseNextRequest *src, UA_BrowseNextRequest *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_BROWSENEXTREQUEST]);
+UA_MethodAttributes_copy(const UA_MethodAttributes *src, UA_MethodAttributes *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_METHODATTRIBUTES]);
 }
 
 static UA_INLINE void
-UA_BrowseNextRequest_deleteMembers(UA_BrowseNextRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_BROWSENEXTREQUEST]);
+UA_MethodAttributes_deleteMembers(UA_MethodAttributes *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_METHODATTRIBUTES]);
 }
 
 static UA_INLINE void
-UA_BrowseNextRequest_clear(UA_BrowseNextRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_BROWSENEXTREQUEST]);
+UA_MethodAttributes_clear(UA_MethodAttributes *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_METHODATTRIBUTES]);
 }
 
 static UA_INLINE void
-UA_BrowseNextRequest_delete(UA_BrowseNextRequest *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_BROWSENEXTREQUEST]);
+UA_MethodAttributes_delete(UA_MethodAttributes *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_METHODATTRIBUTES]);
 }
 
-/* ModifySubscriptionRequest */
+/* ObjectTypeAttributes */
 static UA_INLINE void
-UA_ModifySubscriptionRequest_init(UA_ModifySubscriptionRequest *p) {
-    memset(p, 0, sizeof(UA_ModifySubscriptionRequest));
+UA_ObjectTypeAttributes_init(UA_ObjectTypeAttributes *p) {
+    memset(p, 0, sizeof(UA_ObjectTypeAttributes));
 }
 
-static UA_INLINE UA_ModifySubscriptionRequest *
-UA_ModifySubscriptionRequest_new(void) {
-    return (UA_ModifySubscriptionRequest*)UA_new(&UA_TYPES[UA_TYPES_MODIFYSUBSCRIPTIONREQUEST]);
+static UA_INLINE UA_ObjectTypeAttributes *
+UA_ObjectTypeAttributes_new(void) {
+    return (UA_ObjectTypeAttributes*)UA_new(&UA_TYPES[UA_TYPES_OBJECTTYPEATTRIBUTES]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_ModifySubscriptionRequest_copy(const UA_ModifySubscriptionRequest *src, UA_ModifySubscriptionRequest *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_MODIFYSUBSCRIPTIONREQUEST]);
+UA_ObjectTypeAttributes_copy(const UA_ObjectTypeAttributes *src, UA_ObjectTypeAttributes *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_OBJECTTYPEATTRIBUTES]);
 }
 
 static UA_INLINE void
-UA_ModifySubscriptionRequest_deleteMembers(UA_ModifySubscriptionRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_MODIFYSUBSCRIPTIONREQUEST]);
+UA_ObjectTypeAttributes_deleteMembers(UA_ObjectTypeAttributes *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_OBJECTTYPEATTRIBUTES]);
 }
 
 static UA_INLINE void
-UA_ModifySubscriptionRequest_clear(UA_ModifySubscriptionRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_MODIFYSUBSCRIPTIONREQUEST]);
+UA_ObjectTypeAttributes_clear(UA_ObjectTypeAttributes *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_OBJECTTYPEATTRIBUTES]);
 }
 
 static UA_INLINE void
-UA_ModifySubscriptionRequest_delete(UA_ModifySubscriptionRequest *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_MODIFYSUBSCRIPTIONREQUEST]);
+UA_ObjectTypeAttributes_delete(UA_ObjectTypeAttributes *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_OBJECTTYPEATTRIBUTES]);
 }
 
-/* BrowseDescription */
+/* VariableTypeAttributes */
 static UA_INLINE void
-UA_BrowseDescription_init(UA_BrowseDescription *p) {
-    memset(p, 0, sizeof(UA_BrowseDescription));
+UA_VariableTypeAttributes_init(UA_VariableTypeAttributes *p) {
+    memset(p, 0, sizeof(UA_VariableTypeAttributes));
 }
 
-static UA_INLINE UA_BrowseDescription *
-UA_BrowseDescription_new(void) {
-    return (UA_BrowseDescription*)UA_new(&UA_TYPES[UA_TYPES_BROWSEDESCRIPTION]);
+static UA_INLINE UA_VariableTypeAttributes *
+UA_VariableTypeAttributes_new(void) {
+    return (UA_VariableTypeAttributes*)UA_new(&UA_TYPES[UA_TYPES_VARIABLETYPEATTRIBUTES]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_BrowseDescription_copy(const UA_BrowseDescription *src, UA_BrowseDescription *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_BROWSEDESCRIPTION]);
+UA_VariableTypeAttributes_copy(const UA_VariableTypeAttributes *src, UA_VariableTypeAttributes *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_VARIABLETYPEATTRIBUTES]);
 }
 
 static UA_INLINE void
-UA_BrowseDescription_deleteMembers(UA_BrowseDescription *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_BROWSEDESCRIPTION]);
+UA_VariableTypeAttributes_deleteMembers(UA_VariableTypeAttributes *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_VARIABLETYPEATTRIBUTES]);
 }
 
 static UA_INLINE void
-UA_BrowseDescription_clear(UA_BrowseDescription *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_BROWSEDESCRIPTION]);
+UA_VariableTypeAttributes_clear(UA_VariableTypeAttributes *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_VARIABLETYPEATTRIBUTES]);
 }
 
 static UA_INLINE void
-UA_BrowseDescription_delete(UA_BrowseDescription *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_BROWSEDESCRIPTION]);
+UA_VariableTypeAttributes_delete(UA_VariableTypeAttributes *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_VARIABLETYPEATTRIBUTES]);
 }
 
-/* SignedSoftwareCertificate */
+/* ReferenceTypeAttributes */
 static UA_INLINE void
-UA_SignedSoftwareCertificate_init(UA_SignedSoftwareCertificate *p) {
-    memset(p, 0, sizeof(UA_SignedSoftwareCertificate));
+UA_ReferenceTypeAttributes_init(UA_ReferenceTypeAttributes *p) {
+    memset(p, 0, sizeof(UA_ReferenceTypeAttributes));
 }
 
-static UA_INLINE UA_SignedSoftwareCertificate *
-UA_SignedSoftwareCertificate_new(void) {
-    return (UA_SignedSoftwareCertificate*)UA_new(&UA_TYPES[UA_TYPES_SIGNEDSOFTWARECERTIFICATE]);
+static UA_INLINE UA_ReferenceTypeAttributes *
+UA_ReferenceTypeAttributes_new(void) {
+    return (UA_ReferenceTypeAttributes*)UA_new(&UA_TYPES[UA_TYPES_REFERENCETYPEATTRIBUTES]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_SignedSoftwareCertificate_copy(const UA_SignedSoftwareCertificate *src, UA_SignedSoftwareCertificate *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_SIGNEDSOFTWARECERTIFICATE]);
+UA_ReferenceTypeAttributes_copy(const UA_ReferenceTypeAttributes *src, UA_ReferenceTypeAttributes *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_REFERENCETYPEATTRIBUTES]);
 }
 
 static UA_INLINE void
-UA_SignedSoftwareCertificate_deleteMembers(UA_SignedSoftwareCertificate *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_SIGNEDSOFTWARECERTIFICATE]);
+UA_ReferenceTypeAttributes_deleteMembers(UA_ReferenceTypeAttributes *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_REFERENCETYPEATTRIBUTES]);
 }
 
 static UA_INLINE void
-UA_SignedSoftwareCertificate_clear(UA_SignedSoftwareCertificate *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_SIGNEDSOFTWARECERTIFICATE]);
+UA_ReferenceTypeAttributes_clear(UA_ReferenceTypeAttributes *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_REFERENCETYPEATTRIBUTES]);
 }
 
 static UA_INLINE void
-UA_SignedSoftwareCertificate_delete(UA_SignedSoftwareCertificate *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_SIGNEDSOFTWARECERTIFICATE]);
+UA_ReferenceTypeAttributes_delete(UA_ReferenceTypeAttributes *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_REFERENCETYPEATTRIBUTES]);
 }
 
-/* BrowsePathTarget */
+/* DataTypeAttributes */
 static UA_INLINE void
-UA_BrowsePathTarget_init(UA_BrowsePathTarget *p) {
-    memset(p, 0, sizeof(UA_BrowsePathTarget));
+UA_DataTypeAttributes_init(UA_DataTypeAttributes *p) {
+    memset(p, 0, sizeof(UA_DataTypeAttributes));
 }
 
-static UA_INLINE UA_BrowsePathTarget *
-UA_BrowsePathTarget_new(void) {
-    return (UA_BrowsePathTarget*)UA_new(&UA_TYPES[UA_TYPES_BROWSEPATHTARGET]);
+static UA_INLINE UA_DataTypeAttributes *
+UA_DataTypeAttributes_new(void) {
+    return (UA_DataTypeAttributes*)UA_new(&UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_BrowsePathTarget_copy(const UA_BrowsePathTarget *src, UA_BrowsePathTarget *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_BROWSEPATHTARGET]);
+UA_DataTypeAttributes_copy(const UA_DataTypeAttributes *src, UA_DataTypeAttributes *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES]);
 }
 
 static UA_INLINE void
-UA_BrowsePathTarget_deleteMembers(UA_BrowsePathTarget *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_BROWSEPATHTARGET]);
+UA_DataTypeAttributes_deleteMembers(UA_DataTypeAttributes *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES]);
 }
 
 static UA_INLINE void
-UA_BrowsePathTarget_clear(UA_BrowsePathTarget *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_BROWSEPATHTARGET]);
+UA_DataTypeAttributes_clear(UA_DataTypeAttributes *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES]);
 }
 
 static UA_INLINE void
-UA_BrowsePathTarget_delete(UA_BrowsePathTarget *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_BROWSEPATHTARGET]);
+UA_DataTypeAttributes_delete(UA_DataTypeAttributes *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES]);
 }
 
-/* WriteResponse */
+/* ViewAttributes */
 static UA_INLINE void
-UA_WriteResponse_init(UA_WriteResponse *p) {
-    memset(p, 0, sizeof(UA_WriteResponse));
+UA_ViewAttributes_init(UA_ViewAttributes *p) {
+    memset(p, 0, sizeof(UA_ViewAttributes));
 }
 
-static UA_INLINE UA_WriteResponse *
-UA_WriteResponse_new(void) {
-    return (UA_WriteResponse*)UA_new(&UA_TYPES[UA_TYPES_WRITERESPONSE]);
+static UA_INLINE UA_ViewAttributes *
+UA_ViewAttributes_new(void) {
+    return (UA_ViewAttributes*)UA_new(&UA_TYPES[UA_TYPES_VIEWATTRIBUTES]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_WriteResponse_copy(const UA_WriteResponse *src, UA_WriteResponse *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_WRITERESPONSE]);
+UA_ViewAttributes_copy(const UA_ViewAttributes *src, UA_ViewAttributes *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_VIEWATTRIBUTES]);
 }
 
 static UA_INLINE void
-UA_WriteResponse_deleteMembers(UA_WriteResponse *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_WRITERESPONSE]);
+UA_ViewAttributes_deleteMembers(UA_ViewAttributes *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_VIEWATTRIBUTES]);
 }
 
 static UA_INLINE void
-UA_WriteResponse_clear(UA_WriteResponse *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_WRITERESPONSE]);
+UA_ViewAttributes_clear(UA_ViewAttributes *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_VIEWATTRIBUTES]);
 }
 
 static UA_INLINE void
-UA_WriteResponse_delete(UA_WriteResponse *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_WRITERESPONSE]);
+UA_ViewAttributes_delete(UA_ViewAttributes *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_VIEWATTRIBUTES]);
+}
+
+/* AddNodesItem */
+static UA_INLINE void
+UA_AddNodesItem_init(UA_AddNodesItem *p) {
+    memset(p, 0, sizeof(UA_AddNodesItem));
+}
+
+static UA_INLINE UA_AddNodesItem *
+UA_AddNodesItem_new(void) {
+    return (UA_AddNodesItem*)UA_new(&UA_TYPES[UA_TYPES_ADDNODESITEM]);
+}
+
+static UA_INLINE UA_StatusCode
+UA_AddNodesItem_copy(const UA_AddNodesItem *src, UA_AddNodesItem *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_ADDNODESITEM]);
+}
+
+static UA_INLINE void
+UA_AddNodesItem_deleteMembers(UA_AddNodesItem *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_ADDNODESITEM]);
+}
+
+static UA_INLINE void
+UA_AddNodesItem_clear(UA_AddNodesItem *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_ADDNODESITEM]);
+}
+
+static UA_INLINE void
+UA_AddNodesItem_delete(UA_AddNodesItem *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_ADDNODESITEM]);
 }
 
 /* AddNodesResult */
@@ -18990,6 +19283,68 @@ UA_AddNodesResult_delete(UA_AddNodesResult *p) {
     UA_delete(p, &UA_TYPES[UA_TYPES_ADDNODESRESULT]);
 }
 
+/* AddNodesRequest */
+static UA_INLINE void
+UA_AddNodesRequest_init(UA_AddNodesRequest *p) {
+    memset(p, 0, sizeof(UA_AddNodesRequest));
+}
+
+static UA_INLINE UA_AddNodesRequest *
+UA_AddNodesRequest_new(void) {
+    return (UA_AddNodesRequest*)UA_new(&UA_TYPES[UA_TYPES_ADDNODESREQUEST]);
+}
+
+static UA_INLINE UA_StatusCode
+UA_AddNodesRequest_copy(const UA_AddNodesRequest *src, UA_AddNodesRequest *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_ADDNODESREQUEST]);
+}
+
+static UA_INLINE void
+UA_AddNodesRequest_deleteMembers(UA_AddNodesRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_ADDNODESREQUEST]);
+}
+
+static UA_INLINE void
+UA_AddNodesRequest_clear(UA_AddNodesRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_ADDNODESREQUEST]);
+}
+
+static UA_INLINE void
+UA_AddNodesRequest_delete(UA_AddNodesRequest *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_ADDNODESREQUEST]);
+}
+
+/* AddNodesResponse */
+static UA_INLINE void
+UA_AddNodesResponse_init(UA_AddNodesResponse *p) {
+    memset(p, 0, sizeof(UA_AddNodesResponse));
+}
+
+static UA_INLINE UA_AddNodesResponse *
+UA_AddNodesResponse_new(void) {
+    return (UA_AddNodesResponse*)UA_new(&UA_TYPES[UA_TYPES_ADDNODESRESPONSE]);
+}
+
+static UA_INLINE UA_StatusCode
+UA_AddNodesResponse_copy(const UA_AddNodesResponse *src, UA_AddNodesResponse *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_ADDNODESRESPONSE]);
+}
+
+static UA_INLINE void
+UA_AddNodesResponse_deleteMembers(UA_AddNodesResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_ADDNODESRESPONSE]);
+}
+
+static UA_INLINE void
+UA_AddNodesResponse_clear(UA_AddNodesResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_ADDNODESRESPONSE]);
+}
+
+static UA_INLINE void
+UA_AddNodesResponse_delete(UA_AddNodesResponse *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_ADDNODESRESPONSE]);
+}
+
 /* AddReferencesItem */
 static UA_INLINE void
 UA_AddReferencesItem_init(UA_AddReferencesItem *p) {
@@ -19021,128 +19376,159 @@ UA_AddReferencesItem_delete(UA_AddReferencesItem *p) {
     UA_delete(p, &UA_TYPES[UA_TYPES_ADDREFERENCESITEM]);
 }
 
-/* DeleteReferencesResponse */
+/* AddReferencesRequest */
 static UA_INLINE void
-UA_DeleteReferencesResponse_init(UA_DeleteReferencesResponse *p) {
-    memset(p, 0, sizeof(UA_DeleteReferencesResponse));
+UA_AddReferencesRequest_init(UA_AddReferencesRequest *p) {
+    memset(p, 0, sizeof(UA_AddReferencesRequest));
 }
 
-static UA_INLINE UA_DeleteReferencesResponse *
-UA_DeleteReferencesResponse_new(void) {
-    return (UA_DeleteReferencesResponse*)UA_new(&UA_TYPES[UA_TYPES_DELETEREFERENCESRESPONSE]);
+static UA_INLINE UA_AddReferencesRequest *
+UA_AddReferencesRequest_new(void) {
+    return (UA_AddReferencesRequest*)UA_new(&UA_TYPES[UA_TYPES_ADDREFERENCESREQUEST]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_DeleteReferencesResponse_copy(const UA_DeleteReferencesResponse *src, UA_DeleteReferencesResponse *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_DELETEREFERENCESRESPONSE]);
+UA_AddReferencesRequest_copy(const UA_AddReferencesRequest *src, UA_AddReferencesRequest *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_ADDREFERENCESREQUEST]);
 }
 
 static UA_INLINE void
-UA_DeleteReferencesResponse_deleteMembers(UA_DeleteReferencesResponse *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_DELETEREFERENCESRESPONSE]);
+UA_AddReferencesRequest_deleteMembers(UA_AddReferencesRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_ADDREFERENCESREQUEST]);
 }
 
 static UA_INLINE void
-UA_DeleteReferencesResponse_clear(UA_DeleteReferencesResponse *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_DELETEREFERENCESRESPONSE]);
+UA_AddReferencesRequest_clear(UA_AddReferencesRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_ADDREFERENCESREQUEST]);
 }
 
 static UA_INLINE void
-UA_DeleteReferencesResponse_delete(UA_DeleteReferencesResponse *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_DELETEREFERENCESRESPONSE]);
+UA_AddReferencesRequest_delete(UA_AddReferencesRequest *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_ADDREFERENCESREQUEST]);
 }
 
-/* RelativePathElement */
+/* AddReferencesResponse */
 static UA_INLINE void
-UA_RelativePathElement_init(UA_RelativePathElement *p) {
-    memset(p, 0, sizeof(UA_RelativePathElement));
+UA_AddReferencesResponse_init(UA_AddReferencesResponse *p) {
+    memset(p, 0, sizeof(UA_AddReferencesResponse));
 }
 
-static UA_INLINE UA_RelativePathElement *
-UA_RelativePathElement_new(void) {
-    return (UA_RelativePathElement*)UA_new(&UA_TYPES[UA_TYPES_RELATIVEPATHELEMENT]);
+static UA_INLINE UA_AddReferencesResponse *
+UA_AddReferencesResponse_new(void) {
+    return (UA_AddReferencesResponse*)UA_new(&UA_TYPES[UA_TYPES_ADDREFERENCESRESPONSE]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_RelativePathElement_copy(const UA_RelativePathElement *src, UA_RelativePathElement *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_RELATIVEPATHELEMENT]);
+UA_AddReferencesResponse_copy(const UA_AddReferencesResponse *src, UA_AddReferencesResponse *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_ADDREFERENCESRESPONSE]);
 }
 
 static UA_INLINE void
-UA_RelativePathElement_deleteMembers(UA_RelativePathElement *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_RELATIVEPATHELEMENT]);
+UA_AddReferencesResponse_deleteMembers(UA_AddReferencesResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_ADDREFERENCESRESPONSE]);
 }
 
 static UA_INLINE void
-UA_RelativePathElement_clear(UA_RelativePathElement *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_RELATIVEPATHELEMENT]);
+UA_AddReferencesResponse_clear(UA_AddReferencesResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_ADDREFERENCESRESPONSE]);
 }
 
 static UA_INLINE void
-UA_RelativePathElement_delete(UA_RelativePathElement *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_RELATIVEPATHELEMENT]);
+UA_AddReferencesResponse_delete(UA_AddReferencesResponse *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_ADDREFERENCESRESPONSE]);
 }
 
-/* SubscriptionAcknowledgement */
+/* DeleteNodesItem */
 static UA_INLINE void
-UA_SubscriptionAcknowledgement_init(UA_SubscriptionAcknowledgement *p) {
-    memset(p, 0, sizeof(UA_SubscriptionAcknowledgement));
+UA_DeleteNodesItem_init(UA_DeleteNodesItem *p) {
+    memset(p, 0, sizeof(UA_DeleteNodesItem));
 }
 
-static UA_INLINE UA_SubscriptionAcknowledgement *
-UA_SubscriptionAcknowledgement_new(void) {
-    return (UA_SubscriptionAcknowledgement*)UA_new(&UA_TYPES[UA_TYPES_SUBSCRIPTIONACKNOWLEDGEMENT]);
+static UA_INLINE UA_DeleteNodesItem *
+UA_DeleteNodesItem_new(void) {
+    return (UA_DeleteNodesItem*)UA_new(&UA_TYPES[UA_TYPES_DELETENODESITEM]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_SubscriptionAcknowledgement_copy(const UA_SubscriptionAcknowledgement *src, UA_SubscriptionAcknowledgement *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_SUBSCRIPTIONACKNOWLEDGEMENT]);
+UA_DeleteNodesItem_copy(const UA_DeleteNodesItem *src, UA_DeleteNodesItem *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_DELETENODESITEM]);
 }
 
 static UA_INLINE void
-UA_SubscriptionAcknowledgement_deleteMembers(UA_SubscriptionAcknowledgement *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_SUBSCRIPTIONACKNOWLEDGEMENT]);
+UA_DeleteNodesItem_deleteMembers(UA_DeleteNodesItem *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_DELETENODESITEM]);
 }
 
 static UA_INLINE void
-UA_SubscriptionAcknowledgement_clear(UA_SubscriptionAcknowledgement *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_SUBSCRIPTIONACKNOWLEDGEMENT]);
+UA_DeleteNodesItem_clear(UA_DeleteNodesItem *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_DELETENODESITEM]);
 }
 
 static UA_INLINE void
-UA_SubscriptionAcknowledgement_delete(UA_SubscriptionAcknowledgement *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_SUBSCRIPTIONACKNOWLEDGEMENT]);
+UA_DeleteNodesItem_delete(UA_DeleteNodesItem *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_DELETENODESITEM]);
 }
 
-/* CreateMonitoredItemsResponse */
+/* DeleteNodesRequest */
 static UA_INLINE void
-UA_CreateMonitoredItemsResponse_init(UA_CreateMonitoredItemsResponse *p) {
-    memset(p, 0, sizeof(UA_CreateMonitoredItemsResponse));
+UA_DeleteNodesRequest_init(UA_DeleteNodesRequest *p) {
+    memset(p, 0, sizeof(UA_DeleteNodesRequest));
 }
 
-static UA_INLINE UA_CreateMonitoredItemsResponse *
-UA_CreateMonitoredItemsResponse_new(void) {
-    return (UA_CreateMonitoredItemsResponse*)UA_new(&UA_TYPES[UA_TYPES_CREATEMONITOREDITEMSRESPONSE]);
+static UA_INLINE UA_DeleteNodesRequest *
+UA_DeleteNodesRequest_new(void) {
+    return (UA_DeleteNodesRequest*)UA_new(&UA_TYPES[UA_TYPES_DELETENODESREQUEST]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_CreateMonitoredItemsResponse_copy(const UA_CreateMonitoredItemsResponse *src, UA_CreateMonitoredItemsResponse *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_CREATEMONITOREDITEMSRESPONSE]);
+UA_DeleteNodesRequest_copy(const UA_DeleteNodesRequest *src, UA_DeleteNodesRequest *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_DELETENODESREQUEST]);
 }
 
 static UA_INLINE void
-UA_CreateMonitoredItemsResponse_deleteMembers(UA_CreateMonitoredItemsResponse *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_CREATEMONITOREDITEMSRESPONSE]);
+UA_DeleteNodesRequest_deleteMembers(UA_DeleteNodesRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_DELETENODESREQUEST]);
 }
 
 static UA_INLINE void
-UA_CreateMonitoredItemsResponse_clear(UA_CreateMonitoredItemsResponse *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_CREATEMONITOREDITEMSRESPONSE]);
+UA_DeleteNodesRequest_clear(UA_DeleteNodesRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_DELETENODESREQUEST]);
 }
 
 static UA_INLINE void
-UA_CreateMonitoredItemsResponse_delete(UA_CreateMonitoredItemsResponse *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_CREATEMONITOREDITEMSRESPONSE]);
+UA_DeleteNodesRequest_delete(UA_DeleteNodesRequest *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_DELETENODESREQUEST]);
+}
+
+/* DeleteNodesResponse */
+static UA_INLINE void
+UA_DeleteNodesResponse_init(UA_DeleteNodesResponse *p) {
+    memset(p, 0, sizeof(UA_DeleteNodesResponse));
+}
+
+static UA_INLINE UA_DeleteNodesResponse *
+UA_DeleteNodesResponse_new(void) {
+    return (UA_DeleteNodesResponse*)UA_new(&UA_TYPES[UA_TYPES_DELETENODESRESPONSE]);
+}
+
+static UA_INLINE UA_StatusCode
+UA_DeleteNodesResponse_copy(const UA_DeleteNodesResponse *src, UA_DeleteNodesResponse *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_DELETENODESRESPONSE]);
+}
+
+static UA_INLINE void
+UA_DeleteNodesResponse_deleteMembers(UA_DeleteNodesResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_DELETENODESRESPONSE]);
+}
+
+static UA_INLINE void
+UA_DeleteNodesResponse_clear(UA_DeleteNodesResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_DELETENODESRESPONSE]);
+}
+
+static UA_INLINE void
+UA_DeleteNodesResponse_delete(UA_DeleteNodesResponse *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_DELETENODESRESPONSE]);
 }
 
 /* DeleteReferencesItem */
@@ -19176,376 +19562,407 @@ UA_DeleteReferencesItem_delete(UA_DeleteReferencesItem *p) {
     UA_delete(p, &UA_TYPES[UA_TYPES_DELETEREFERENCESITEM]);
 }
 
-/* WriteValue */
+/* DeleteReferencesRequest */
 static UA_INLINE void
-UA_WriteValue_init(UA_WriteValue *p) {
-    memset(p, 0, sizeof(UA_WriteValue));
+UA_DeleteReferencesRequest_init(UA_DeleteReferencesRequest *p) {
+    memset(p, 0, sizeof(UA_DeleteReferencesRequest));
 }
 
-static UA_INLINE UA_WriteValue *
-UA_WriteValue_new(void) {
-    return (UA_WriteValue*)UA_new(&UA_TYPES[UA_TYPES_WRITEVALUE]);
+static UA_INLINE UA_DeleteReferencesRequest *
+UA_DeleteReferencesRequest_new(void) {
+    return (UA_DeleteReferencesRequest*)UA_new(&UA_TYPES[UA_TYPES_DELETEREFERENCESREQUEST]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_WriteValue_copy(const UA_WriteValue *src, UA_WriteValue *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_WRITEVALUE]);
+UA_DeleteReferencesRequest_copy(const UA_DeleteReferencesRequest *src, UA_DeleteReferencesRequest *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_DELETEREFERENCESREQUEST]);
 }
 
 static UA_INLINE void
-UA_WriteValue_deleteMembers(UA_WriteValue *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_WRITEVALUE]);
+UA_DeleteReferencesRequest_deleteMembers(UA_DeleteReferencesRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_DELETEREFERENCESREQUEST]);
 }
 
 static UA_INLINE void
-UA_WriteValue_clear(UA_WriteValue *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_WRITEVALUE]);
+UA_DeleteReferencesRequest_clear(UA_DeleteReferencesRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_DELETEREFERENCESREQUEST]);
 }
 
 static UA_INLINE void
-UA_WriteValue_delete(UA_WriteValue *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_WRITEVALUE]);
+UA_DeleteReferencesRequest_delete(UA_DeleteReferencesRequest *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_DELETEREFERENCESREQUEST]);
 }
 
-/* DataTypeAttributes */
+/* DeleteReferencesResponse */
 static UA_INLINE void
-UA_DataTypeAttributes_init(UA_DataTypeAttributes *p) {
-    memset(p, 0, sizeof(UA_DataTypeAttributes));
+UA_DeleteReferencesResponse_init(UA_DeleteReferencesResponse *p) {
+    memset(p, 0, sizeof(UA_DeleteReferencesResponse));
 }
 
-static UA_INLINE UA_DataTypeAttributes *
-UA_DataTypeAttributes_new(void) {
-    return (UA_DataTypeAttributes*)UA_new(&UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES]);
+static UA_INLINE UA_DeleteReferencesResponse *
+UA_DeleteReferencesResponse_new(void) {
+    return (UA_DeleteReferencesResponse*)UA_new(&UA_TYPES[UA_TYPES_DELETEREFERENCESRESPONSE]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_DataTypeAttributes_copy(const UA_DataTypeAttributes *src, UA_DataTypeAttributes *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES]);
+UA_DeleteReferencesResponse_copy(const UA_DeleteReferencesResponse *src, UA_DeleteReferencesResponse *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_DELETEREFERENCESRESPONSE]);
 }
 
 static UA_INLINE void
-UA_DataTypeAttributes_deleteMembers(UA_DataTypeAttributes *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES]);
+UA_DeleteReferencesResponse_deleteMembers(UA_DeleteReferencesResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_DELETEREFERENCESRESPONSE]);
 }
 
 static UA_INLINE void
-UA_DataTypeAttributes_clear(UA_DataTypeAttributes *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES]);
+UA_DeleteReferencesResponse_clear(UA_DeleteReferencesResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_DELETEREFERENCESRESPONSE]);
 }
 
 static UA_INLINE void
-UA_DataTypeAttributes_delete(UA_DataTypeAttributes *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_DATATYPEATTRIBUTES]);
+UA_DeleteReferencesResponse_delete(UA_DeleteReferencesResponse *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_DELETEREFERENCESRESPONSE]);
 }
 
-/* AddReferencesResponse */
+/* BrowseDirection */
 static UA_INLINE void
-UA_AddReferencesResponse_init(UA_AddReferencesResponse *p) {
-    memset(p, 0, sizeof(UA_AddReferencesResponse));
+UA_BrowseDirection_init(UA_BrowseDirection *p) {
+    memset(p, 0, sizeof(UA_BrowseDirection));
 }
 
-static UA_INLINE UA_AddReferencesResponse *
-UA_AddReferencesResponse_new(void) {
-    return (UA_AddReferencesResponse*)UA_new(&UA_TYPES[UA_TYPES_ADDREFERENCESRESPONSE]);
+static UA_INLINE UA_BrowseDirection *
+UA_BrowseDirection_new(void) {
+    return (UA_BrowseDirection*)UA_new(&UA_TYPES[UA_TYPES_BROWSEDIRECTION]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_AddReferencesResponse_copy(const UA_AddReferencesResponse *src, UA_AddReferencesResponse *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_ADDREFERENCESRESPONSE]);
+UA_BrowseDirection_copy(const UA_BrowseDirection *src, UA_BrowseDirection *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_BROWSEDIRECTION]);
 }
 
 static UA_INLINE void
-UA_AddReferencesResponse_deleteMembers(UA_AddReferencesResponse *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_ADDREFERENCESRESPONSE]);
+UA_BrowseDirection_deleteMembers(UA_BrowseDirection *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_BROWSEDIRECTION]);
 }
 
 static UA_INLINE void
-UA_AddReferencesResponse_clear(UA_AddReferencesResponse *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_ADDREFERENCESRESPONSE]);
+UA_BrowseDirection_clear(UA_BrowseDirection *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_BROWSEDIRECTION]);
 }
 
 static UA_INLINE void
-UA_AddReferencesResponse_delete(UA_AddReferencesResponse *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_ADDREFERENCESRESPONSE]);
+UA_BrowseDirection_delete(UA_BrowseDirection *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_BROWSEDIRECTION]);
 }
 
-/* DeadbandType */
+/* ViewDescription */
 static UA_INLINE void
-UA_DeadbandType_init(UA_DeadbandType *p) {
-    memset(p, 0, sizeof(UA_DeadbandType));
+UA_ViewDescription_init(UA_ViewDescription *p) {
+    memset(p, 0, sizeof(UA_ViewDescription));
 }
 
-static UA_INLINE UA_DeadbandType *
-UA_DeadbandType_new(void) {
-    return (UA_DeadbandType*)UA_new(&UA_TYPES[UA_TYPES_DEADBANDTYPE]);
+static UA_INLINE UA_ViewDescription *
+UA_ViewDescription_new(void) {
+    return (UA_ViewDescription*)UA_new(&UA_TYPES[UA_TYPES_VIEWDESCRIPTION]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_DeadbandType_copy(const UA_DeadbandType *src, UA_DeadbandType *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_DEADBANDTYPE]);
+UA_ViewDescription_copy(const UA_ViewDescription *src, UA_ViewDescription *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_VIEWDESCRIPTION]);
 }
 
 static UA_INLINE void
-UA_DeadbandType_deleteMembers(UA_DeadbandType *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_DEADBANDTYPE]);
+UA_ViewDescription_deleteMembers(UA_ViewDescription *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_VIEWDESCRIPTION]);
 }
 
 static UA_INLINE void
-UA_DeadbandType_clear(UA_DeadbandType *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_DEADBANDTYPE]);
+UA_ViewDescription_clear(UA_ViewDescription *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_VIEWDESCRIPTION]);
 }
 
 static UA_INLINE void
-UA_DeadbandType_delete(UA_DeadbandType *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_DEADBANDTYPE]);
+UA_ViewDescription_delete(UA_ViewDescription *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_VIEWDESCRIPTION]);
 }
 
-/* DataChangeTrigger */
+/* BrowseDescription */
 static UA_INLINE void
-UA_DataChangeTrigger_init(UA_DataChangeTrigger *p) {
-    memset(p, 0, sizeof(UA_DataChangeTrigger));
+UA_BrowseDescription_init(UA_BrowseDescription *p) {
+    memset(p, 0, sizeof(UA_BrowseDescription));
 }
 
-static UA_INLINE UA_DataChangeTrigger *
-UA_DataChangeTrigger_new(void) {
-    return (UA_DataChangeTrigger*)UA_new(&UA_TYPES[UA_TYPES_DATACHANGETRIGGER]);
+static UA_INLINE UA_BrowseDescription *
+UA_BrowseDescription_new(void) {
+    return (UA_BrowseDescription*)UA_new(&UA_TYPES[UA_TYPES_BROWSEDESCRIPTION]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_DataChangeTrigger_copy(const UA_DataChangeTrigger *src, UA_DataChangeTrigger *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_DATACHANGETRIGGER]);
+UA_BrowseDescription_copy(const UA_BrowseDescription *src, UA_BrowseDescription *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_BROWSEDESCRIPTION]);
 }
 
 static UA_INLINE void
-UA_DataChangeTrigger_deleteMembers(UA_DataChangeTrigger *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_DATACHANGETRIGGER]);
+UA_BrowseDescription_deleteMembers(UA_BrowseDescription *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_BROWSEDESCRIPTION]);
 }
 
 static UA_INLINE void
-UA_DataChangeTrigger_clear(UA_DataChangeTrigger *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_DATACHANGETRIGGER]);
+UA_BrowseDescription_clear(UA_BrowseDescription *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_BROWSEDESCRIPTION]);
 }
 
 static UA_INLINE void
-UA_DataChangeTrigger_delete(UA_DataChangeTrigger *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_DATACHANGETRIGGER]);
+UA_BrowseDescription_delete(UA_BrowseDescription *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_BROWSEDESCRIPTION]);
 }
 
-/* BuildInfo */
+/* BrowseResultMask */
 static UA_INLINE void
-UA_BuildInfo_init(UA_BuildInfo *p) {
-    memset(p, 0, sizeof(UA_BuildInfo));
+UA_BrowseResultMask_init(UA_BrowseResultMask *p) {
+    memset(p, 0, sizeof(UA_BrowseResultMask));
 }
 
-static UA_INLINE UA_BuildInfo *
-UA_BuildInfo_new(void) {
-    return (UA_BuildInfo*)UA_new(&UA_TYPES[UA_TYPES_BUILDINFO]);
+static UA_INLINE UA_BrowseResultMask *
+UA_BrowseResultMask_new(void) {
+    return (UA_BrowseResultMask*)UA_new(&UA_TYPES[UA_TYPES_BROWSERESULTMASK]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_BuildInfo_copy(const UA_BuildInfo *src, UA_BuildInfo *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_BUILDINFO]);
+UA_BrowseResultMask_copy(const UA_BrowseResultMask *src, UA_BrowseResultMask *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_BROWSERESULTMASK]);
 }
 
 static UA_INLINE void
-UA_BuildInfo_deleteMembers(UA_BuildInfo *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_BUILDINFO]);
+UA_BrowseResultMask_deleteMembers(UA_BrowseResultMask *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_BROWSERESULTMASK]);
 }
 
 static UA_INLINE void
-UA_BuildInfo_clear(UA_BuildInfo *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_BUILDINFO]);
+UA_BrowseResultMask_clear(UA_BrowseResultMask *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_BROWSERESULTMASK]);
 }
 
 static UA_INLINE void
-UA_BuildInfo_delete(UA_BuildInfo *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_BUILDINFO]);
+UA_BrowseResultMask_delete(UA_BrowseResultMask *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_BROWSERESULTMASK]);
 }
 
-/* FilterOperand */
+/* ReferenceDescription */
 static UA_INLINE void
-UA_FilterOperand_init(UA_FilterOperand *p) {
-    memset(p, 0, sizeof(UA_FilterOperand));
+UA_ReferenceDescription_init(UA_ReferenceDescription *p) {
+    memset(p, 0, sizeof(UA_ReferenceDescription));
 }
 
-static UA_INLINE UA_FilterOperand *
-UA_FilterOperand_new(void) {
-    return (UA_FilterOperand*)UA_new(&UA_TYPES[UA_TYPES_FILTEROPERAND]);
+static UA_INLINE UA_ReferenceDescription *
+UA_ReferenceDescription_new(void) {
+    return (UA_ReferenceDescription*)UA_new(&UA_TYPES[UA_TYPES_REFERENCEDESCRIPTION]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_FilterOperand_copy(const UA_FilterOperand *src, UA_FilterOperand *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_FILTEROPERAND]);
+UA_ReferenceDescription_copy(const UA_ReferenceDescription *src, UA_ReferenceDescription *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_REFERENCEDESCRIPTION]);
 }
 
 static UA_INLINE void
-UA_FilterOperand_deleteMembers(UA_FilterOperand *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_FILTEROPERAND]);
+UA_ReferenceDescription_deleteMembers(UA_ReferenceDescription *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_REFERENCEDESCRIPTION]);
 }
 
 static UA_INLINE void
-UA_FilterOperand_clear(UA_FilterOperand *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_FILTEROPERAND]);
+UA_ReferenceDescription_clear(UA_ReferenceDescription *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_REFERENCEDESCRIPTION]);
 }
 
 static UA_INLINE void
-UA_FilterOperand_delete(UA_FilterOperand *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_FILTEROPERAND]);
+UA_ReferenceDescription_delete(UA_ReferenceDescription *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_REFERENCEDESCRIPTION]);
 }
 
-/* MonitoringParameters */
+/* BrowseResult */
 static UA_INLINE void
-UA_MonitoringParameters_init(UA_MonitoringParameters *p) {
-    memset(p, 0, sizeof(UA_MonitoringParameters));
+UA_BrowseResult_init(UA_BrowseResult *p) {
+    memset(p, 0, sizeof(UA_BrowseResult));
 }
 
-static UA_INLINE UA_MonitoringParameters *
-UA_MonitoringParameters_new(void) {
-    return (UA_MonitoringParameters*)UA_new(&UA_TYPES[UA_TYPES_MONITORINGPARAMETERS]);
+static UA_INLINE UA_BrowseResult *
+UA_BrowseResult_new(void) {
+    return (UA_BrowseResult*)UA_new(&UA_TYPES[UA_TYPES_BROWSERESULT]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_MonitoringParameters_copy(const UA_MonitoringParameters *src, UA_MonitoringParameters *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_MONITORINGPARAMETERS]);
+UA_BrowseResult_copy(const UA_BrowseResult *src, UA_BrowseResult *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_BROWSERESULT]);
 }
 
 static UA_INLINE void
-UA_MonitoringParameters_deleteMembers(UA_MonitoringParameters *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_MONITORINGPARAMETERS]);
+UA_BrowseResult_deleteMembers(UA_BrowseResult *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_BROWSERESULT]);
 }
 
 static UA_INLINE void
-UA_MonitoringParameters_clear(UA_MonitoringParameters *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_MONITORINGPARAMETERS]);
+UA_BrowseResult_clear(UA_BrowseResult *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_BROWSERESULT]);
 }
 
 static UA_INLINE void
-UA_MonitoringParameters_delete(UA_MonitoringParameters *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_MONITORINGPARAMETERS]);
+UA_BrowseResult_delete(UA_BrowseResult *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_BROWSERESULT]);
 }
 
-/* DoubleComplexNumberType */
+/* BrowseRequest */
 static UA_INLINE void
-UA_DoubleComplexNumberType_init(UA_DoubleComplexNumberType *p) {
-    memset(p, 0, sizeof(UA_DoubleComplexNumberType));
+UA_BrowseRequest_init(UA_BrowseRequest *p) {
+    memset(p, 0, sizeof(UA_BrowseRequest));
 }
 
-static UA_INLINE UA_DoubleComplexNumberType *
-UA_DoubleComplexNumberType_new(void) {
-    return (UA_DoubleComplexNumberType*)UA_new(&UA_TYPES[UA_TYPES_DOUBLECOMPLEXNUMBERTYPE]);
+static UA_INLINE UA_BrowseRequest *
+UA_BrowseRequest_new(void) {
+    return (UA_BrowseRequest*)UA_new(&UA_TYPES[UA_TYPES_BROWSEREQUEST]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_DoubleComplexNumberType_copy(const UA_DoubleComplexNumberType *src, UA_DoubleComplexNumberType *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_DOUBLECOMPLEXNUMBERTYPE]);
+UA_BrowseRequest_copy(const UA_BrowseRequest *src, UA_BrowseRequest *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_BROWSEREQUEST]);
 }
 
 static UA_INLINE void
-UA_DoubleComplexNumberType_deleteMembers(UA_DoubleComplexNumberType *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_DOUBLECOMPLEXNUMBERTYPE]);
+UA_BrowseRequest_deleteMembers(UA_BrowseRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_BROWSEREQUEST]);
 }
 
 static UA_INLINE void
-UA_DoubleComplexNumberType_clear(UA_DoubleComplexNumberType *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_DOUBLECOMPLEXNUMBERTYPE]);
+UA_BrowseRequest_clear(UA_BrowseRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_BROWSEREQUEST]);
 }
 
 static UA_INLINE void
-UA_DoubleComplexNumberType_delete(UA_DoubleComplexNumberType *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_DOUBLECOMPLEXNUMBERTYPE]);
+UA_BrowseRequest_delete(UA_BrowseRequest *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_BROWSEREQUEST]);
 }
 
-/* DeleteNodesItem */
+/* BrowseResponse */
 static UA_INLINE void
-UA_DeleteNodesItem_init(UA_DeleteNodesItem *p) {
-    memset(p, 0, sizeof(UA_DeleteNodesItem));
+UA_BrowseResponse_init(UA_BrowseResponse *p) {
+    memset(p, 0, sizeof(UA_BrowseResponse));
 }
 
-static UA_INLINE UA_DeleteNodesItem *
-UA_DeleteNodesItem_new(void) {
-    return (UA_DeleteNodesItem*)UA_new(&UA_TYPES[UA_TYPES_DELETENODESITEM]);
+static UA_INLINE UA_BrowseResponse *
+UA_BrowseResponse_new(void) {
+    return (UA_BrowseResponse*)UA_new(&UA_TYPES[UA_TYPES_BROWSERESPONSE]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_DeleteNodesItem_copy(const UA_DeleteNodesItem *src, UA_DeleteNodesItem *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_DELETENODESITEM]);
+UA_BrowseResponse_copy(const UA_BrowseResponse *src, UA_BrowseResponse *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_BROWSERESPONSE]);
 }
 
 static UA_INLINE void
-UA_DeleteNodesItem_deleteMembers(UA_DeleteNodesItem *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_DELETENODESITEM]);
+UA_BrowseResponse_deleteMembers(UA_BrowseResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_BROWSERESPONSE]);
 }
 
 static UA_INLINE void
-UA_DeleteNodesItem_clear(UA_DeleteNodesItem *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_DELETENODESITEM]);
+UA_BrowseResponse_clear(UA_BrowseResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_BROWSERESPONSE]);
 }
 
 static UA_INLINE void
-UA_DeleteNodesItem_delete(UA_DeleteNodesItem *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_DELETENODESITEM]);
+UA_BrowseResponse_delete(UA_BrowseResponse *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_BROWSERESPONSE]);
 }
 
-/* ReadValueId */
+/* BrowseNextRequest */
 static UA_INLINE void
-UA_ReadValueId_init(UA_ReadValueId *p) {
-    memset(p, 0, sizeof(UA_ReadValueId));
+UA_BrowseNextRequest_init(UA_BrowseNextRequest *p) {
+    memset(p, 0, sizeof(UA_BrowseNextRequest));
 }
 
-static UA_INLINE UA_ReadValueId *
-UA_ReadValueId_new(void) {
-    return (UA_ReadValueId*)UA_new(&UA_TYPES[UA_TYPES_READVALUEID]);
+static UA_INLINE UA_BrowseNextRequest *
+UA_BrowseNextRequest_new(void) {
+    return (UA_BrowseNextRequest*)UA_new(&UA_TYPES[UA_TYPES_BROWSENEXTREQUEST]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_ReadValueId_copy(const UA_ReadValueId *src, UA_ReadValueId *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_READVALUEID]);
+UA_BrowseNextRequest_copy(const UA_BrowseNextRequest *src, UA_BrowseNextRequest *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_BROWSENEXTREQUEST]);
 }
 
 static UA_INLINE void
-UA_ReadValueId_deleteMembers(UA_ReadValueId *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_READVALUEID]);
+UA_BrowseNextRequest_deleteMembers(UA_BrowseNextRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_BROWSENEXTREQUEST]);
 }
 
 static UA_INLINE void
-UA_ReadValueId_clear(UA_ReadValueId *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_READVALUEID]);
+UA_BrowseNextRequest_clear(UA_BrowseNextRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_BROWSENEXTREQUEST]);
 }
 
 static UA_INLINE void
-UA_ReadValueId_delete(UA_ReadValueId *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_READVALUEID]);
+UA_BrowseNextRequest_delete(UA_BrowseNextRequest *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_BROWSENEXTREQUEST]);
 }
 
-/* CallRequest */
+/* BrowseNextResponse */
 static UA_INLINE void
-UA_CallRequest_init(UA_CallRequest *p) {
-    memset(p, 0, sizeof(UA_CallRequest));
+UA_BrowseNextResponse_init(UA_BrowseNextResponse *p) {
+    memset(p, 0, sizeof(UA_BrowseNextResponse));
 }
 
-static UA_INLINE UA_CallRequest *
-UA_CallRequest_new(void) {
-    return (UA_CallRequest*)UA_new(&UA_TYPES[UA_TYPES_CALLREQUEST]);
+static UA_INLINE UA_BrowseNextResponse *
+UA_BrowseNextResponse_new(void) {
+    return (UA_BrowseNextResponse*)UA_new(&UA_TYPES[UA_TYPES_BROWSENEXTRESPONSE]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_CallRequest_copy(const UA_CallRequest *src, UA_CallRequest *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_CALLREQUEST]);
+UA_BrowseNextResponse_copy(const UA_BrowseNextResponse *src, UA_BrowseNextResponse *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_BROWSENEXTRESPONSE]);
 }
 
 static UA_INLINE void
-UA_CallRequest_deleteMembers(UA_CallRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_CALLREQUEST]);
+UA_BrowseNextResponse_deleteMembers(UA_BrowseNextResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_BROWSENEXTRESPONSE]);
 }
 
 static UA_INLINE void
-UA_CallRequest_clear(UA_CallRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_CALLREQUEST]);
+UA_BrowseNextResponse_clear(UA_BrowseNextResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_BROWSENEXTRESPONSE]);
 }
 
 static UA_INLINE void
-UA_CallRequest_delete(UA_CallRequest *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_CALLREQUEST]);
+UA_BrowseNextResponse_delete(UA_BrowseNextResponse *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_BROWSENEXTRESPONSE]);
+}
+
+/* RelativePathElement */
+static UA_INLINE void
+UA_RelativePathElement_init(UA_RelativePathElement *p) {
+    memset(p, 0, sizeof(UA_RelativePathElement));
+}
+
+static UA_INLINE UA_RelativePathElement *
+UA_RelativePathElement_new(void) {
+    return (UA_RelativePathElement*)UA_new(&UA_TYPES[UA_TYPES_RELATIVEPATHELEMENT]);
+}
+
+static UA_INLINE UA_StatusCode
+UA_RelativePathElement_copy(const UA_RelativePathElement *src, UA_RelativePathElement *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_RELATIVEPATHELEMENT]);
+}
+
+static UA_INLINE void
+UA_RelativePathElement_deleteMembers(UA_RelativePathElement *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_RELATIVEPATHELEMENT]);
+}
+
+static UA_INLINE void
+UA_RelativePathElement_clear(UA_RelativePathElement *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_RELATIVEPATHELEMENT]);
+}
+
+static UA_INLINE void
+UA_RelativePathElement_delete(UA_RelativePathElement *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_RELATIVEPATHELEMENT]);
 }
 
 /* RelativePath */
@@ -19579,159 +19996,252 @@ UA_RelativePath_delete(UA_RelativePath *p) {
     UA_delete(p, &UA_TYPES[UA_TYPES_RELATIVEPATH]);
 }
 
-/* DeleteNodesRequest */
+/* BrowsePath */
 static UA_INLINE void
-UA_DeleteNodesRequest_init(UA_DeleteNodesRequest *p) {
-    memset(p, 0, sizeof(UA_DeleteNodesRequest));
+UA_BrowsePath_init(UA_BrowsePath *p) {
+    memset(p, 0, sizeof(UA_BrowsePath));
 }
 
-static UA_INLINE UA_DeleteNodesRequest *
-UA_DeleteNodesRequest_new(void) {
-    return (UA_DeleteNodesRequest*)UA_new(&UA_TYPES[UA_TYPES_DELETENODESREQUEST]);
+static UA_INLINE UA_BrowsePath *
+UA_BrowsePath_new(void) {
+    return (UA_BrowsePath*)UA_new(&UA_TYPES[UA_TYPES_BROWSEPATH]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_DeleteNodesRequest_copy(const UA_DeleteNodesRequest *src, UA_DeleteNodesRequest *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_DELETENODESREQUEST]);
+UA_BrowsePath_copy(const UA_BrowsePath *src, UA_BrowsePath *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_BROWSEPATH]);
 }
 
 static UA_INLINE void
-UA_DeleteNodesRequest_deleteMembers(UA_DeleteNodesRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_DELETENODESREQUEST]);
+UA_BrowsePath_deleteMembers(UA_BrowsePath *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_BROWSEPATH]);
 }
 
 static UA_INLINE void
-UA_DeleteNodesRequest_clear(UA_DeleteNodesRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_DELETENODESREQUEST]);
+UA_BrowsePath_clear(UA_BrowsePath *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_BROWSEPATH]);
 }
 
 static UA_INLINE void
-UA_DeleteNodesRequest_delete(UA_DeleteNodesRequest *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_DELETENODESREQUEST]);
+UA_BrowsePath_delete(UA_BrowsePath *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_BROWSEPATH]);
 }
 
-/* MonitoredItemModifyRequest */
+/* BrowsePathTarget */
 static UA_INLINE void
-UA_MonitoredItemModifyRequest_init(UA_MonitoredItemModifyRequest *p) {
-    memset(p, 0, sizeof(UA_MonitoredItemModifyRequest));
+UA_BrowsePathTarget_init(UA_BrowsePathTarget *p) {
+    memset(p, 0, sizeof(UA_BrowsePathTarget));
 }
 
-static UA_INLINE UA_MonitoredItemModifyRequest *
-UA_MonitoredItemModifyRequest_new(void) {
-    return (UA_MonitoredItemModifyRequest*)UA_new(&UA_TYPES[UA_TYPES_MONITOREDITEMMODIFYREQUEST]);
+static UA_INLINE UA_BrowsePathTarget *
+UA_BrowsePathTarget_new(void) {
+    return (UA_BrowsePathTarget*)UA_new(&UA_TYPES[UA_TYPES_BROWSEPATHTARGET]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_MonitoredItemModifyRequest_copy(const UA_MonitoredItemModifyRequest *src, UA_MonitoredItemModifyRequest *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_MONITOREDITEMMODIFYREQUEST]);
+UA_BrowsePathTarget_copy(const UA_BrowsePathTarget *src, UA_BrowsePathTarget *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_BROWSEPATHTARGET]);
 }
 
 static UA_INLINE void
-UA_MonitoredItemModifyRequest_deleteMembers(UA_MonitoredItemModifyRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_MONITOREDITEMMODIFYREQUEST]);
+UA_BrowsePathTarget_deleteMembers(UA_BrowsePathTarget *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_BROWSEPATHTARGET]);
 }
 
 static UA_INLINE void
-UA_MonitoredItemModifyRequest_clear(UA_MonitoredItemModifyRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_MONITOREDITEMMODIFYREQUEST]);
+UA_BrowsePathTarget_clear(UA_BrowsePathTarget *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_BROWSEPATHTARGET]);
 }
 
 static UA_INLINE void
-UA_MonitoredItemModifyRequest_delete(UA_MonitoredItemModifyRequest *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_MONITOREDITEMMODIFYREQUEST]);
+UA_BrowsePathTarget_delete(UA_BrowsePathTarget *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_BROWSEPATHTARGET]);
 }
 
-/* UserTokenType */
+/* BrowsePathResult */
 static UA_INLINE void
-UA_UserTokenType_init(UA_UserTokenType *p) {
-    memset(p, 0, sizeof(UA_UserTokenType));
+UA_BrowsePathResult_init(UA_BrowsePathResult *p) {
+    memset(p, 0, sizeof(UA_BrowsePathResult));
 }
 
-static UA_INLINE UA_UserTokenType *
-UA_UserTokenType_new(void) {
-    return (UA_UserTokenType*)UA_new(&UA_TYPES[UA_TYPES_USERTOKENTYPE]);
+static UA_INLINE UA_BrowsePathResult *
+UA_BrowsePathResult_new(void) {
+    return (UA_BrowsePathResult*)UA_new(&UA_TYPES[UA_TYPES_BROWSEPATHRESULT]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_UserTokenType_copy(const UA_UserTokenType *src, UA_UserTokenType *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_USERTOKENTYPE]);
+UA_BrowsePathResult_copy(const UA_BrowsePathResult *src, UA_BrowsePathResult *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_BROWSEPATHRESULT]);
 }
 
 static UA_INLINE void
-UA_UserTokenType_deleteMembers(UA_UserTokenType *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_USERTOKENTYPE]);
+UA_BrowsePathResult_deleteMembers(UA_BrowsePathResult *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_BROWSEPATHRESULT]);
 }
 
 static UA_INLINE void
-UA_UserTokenType_clear(UA_UserTokenType *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_USERTOKENTYPE]);
+UA_BrowsePathResult_clear(UA_BrowsePathResult *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_BROWSEPATHRESULT]);
 }
 
 static UA_INLINE void
-UA_UserTokenType_delete(UA_UserTokenType *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_USERTOKENTYPE]);
+UA_BrowsePathResult_delete(UA_BrowsePathResult *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_BROWSEPATHRESULT]);
 }
 
-/* AggregateConfiguration */
+/* TranslateBrowsePathsToNodeIdsRequest */
 static UA_INLINE void
-UA_AggregateConfiguration_init(UA_AggregateConfiguration *p) {
-    memset(p, 0, sizeof(UA_AggregateConfiguration));
+UA_TranslateBrowsePathsToNodeIdsRequest_init(UA_TranslateBrowsePathsToNodeIdsRequest *p) {
+    memset(p, 0, sizeof(UA_TranslateBrowsePathsToNodeIdsRequest));
 }
 
-static UA_INLINE UA_AggregateConfiguration *
-UA_AggregateConfiguration_new(void) {
-    return (UA_AggregateConfiguration*)UA_new(&UA_TYPES[UA_TYPES_AGGREGATECONFIGURATION]);
+static UA_INLINE UA_TranslateBrowsePathsToNodeIdsRequest *
+UA_TranslateBrowsePathsToNodeIdsRequest_new(void) {
+    return (UA_TranslateBrowsePathsToNodeIdsRequest*)UA_new(&UA_TYPES[UA_TYPES_TRANSLATEBROWSEPATHSTONODEIDSREQUEST]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_AggregateConfiguration_copy(const UA_AggregateConfiguration *src, UA_AggregateConfiguration *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_AGGREGATECONFIGURATION]);
+UA_TranslateBrowsePathsToNodeIdsRequest_copy(const UA_TranslateBrowsePathsToNodeIdsRequest *src, UA_TranslateBrowsePathsToNodeIdsRequest *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_TRANSLATEBROWSEPATHSTONODEIDSREQUEST]);
 }
 
 static UA_INLINE void
-UA_AggregateConfiguration_deleteMembers(UA_AggregateConfiguration *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_AGGREGATECONFIGURATION]);
+UA_TranslateBrowsePathsToNodeIdsRequest_deleteMembers(UA_TranslateBrowsePathsToNodeIdsRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_TRANSLATEBROWSEPATHSTONODEIDSREQUEST]);
 }
 
 static UA_INLINE void
-UA_AggregateConfiguration_clear(UA_AggregateConfiguration *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_AGGREGATECONFIGURATION]);
+UA_TranslateBrowsePathsToNodeIdsRequest_clear(UA_TranslateBrowsePathsToNodeIdsRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_TRANSLATEBROWSEPATHSTONODEIDSREQUEST]);
 }
 
 static UA_INLINE void
-UA_AggregateConfiguration_delete(UA_AggregateConfiguration *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_AGGREGATECONFIGURATION]);
+UA_TranslateBrowsePathsToNodeIdsRequest_delete(UA_TranslateBrowsePathsToNodeIdsRequest *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_TRANSLATEBROWSEPATHSTONODEIDSREQUEST]);
 }
 
-/* LocaleId */
+/* TranslateBrowsePathsToNodeIdsResponse */
 static UA_INLINE void
-UA_LocaleId_init(UA_LocaleId *p) {
-    memset(p, 0, sizeof(UA_LocaleId));
+UA_TranslateBrowsePathsToNodeIdsResponse_init(UA_TranslateBrowsePathsToNodeIdsResponse *p) {
+    memset(p, 0, sizeof(UA_TranslateBrowsePathsToNodeIdsResponse));
 }
 
-static UA_INLINE UA_LocaleId *
-UA_LocaleId_new(void) {
-    return (UA_LocaleId*)UA_new(&UA_TYPES[UA_TYPES_LOCALEID]);
+static UA_INLINE UA_TranslateBrowsePathsToNodeIdsResponse *
+UA_TranslateBrowsePathsToNodeIdsResponse_new(void) {
+    return (UA_TranslateBrowsePathsToNodeIdsResponse*)UA_new(&UA_TYPES[UA_TYPES_TRANSLATEBROWSEPATHSTONODEIDSRESPONSE]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_LocaleId_copy(const UA_LocaleId *src, UA_LocaleId *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_LOCALEID]);
+UA_TranslateBrowsePathsToNodeIdsResponse_copy(const UA_TranslateBrowsePathsToNodeIdsResponse *src, UA_TranslateBrowsePathsToNodeIdsResponse *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_TRANSLATEBROWSEPATHSTONODEIDSRESPONSE]);
 }
 
 static UA_INLINE void
-UA_LocaleId_deleteMembers(UA_LocaleId *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_LOCALEID]);
+UA_TranslateBrowsePathsToNodeIdsResponse_deleteMembers(UA_TranslateBrowsePathsToNodeIdsResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_TRANSLATEBROWSEPATHSTONODEIDSRESPONSE]);
 }
 
 static UA_INLINE void
-UA_LocaleId_clear(UA_LocaleId *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_LOCALEID]);
+UA_TranslateBrowsePathsToNodeIdsResponse_clear(UA_TranslateBrowsePathsToNodeIdsResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_TRANSLATEBROWSEPATHSTONODEIDSRESPONSE]);
 }
 
 static UA_INLINE void
-UA_LocaleId_delete(UA_LocaleId *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_LOCALEID]);
+UA_TranslateBrowsePathsToNodeIdsResponse_delete(UA_TranslateBrowsePathsToNodeIdsResponse *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_TRANSLATEBROWSEPATHSTONODEIDSRESPONSE]);
+}
+
+/* RegisterNodesRequest */
+static UA_INLINE void
+UA_RegisterNodesRequest_init(UA_RegisterNodesRequest *p) {
+    memset(p, 0, sizeof(UA_RegisterNodesRequest));
+}
+
+static UA_INLINE UA_RegisterNodesRequest *
+UA_RegisterNodesRequest_new(void) {
+    return (UA_RegisterNodesRequest*)UA_new(&UA_TYPES[UA_TYPES_REGISTERNODESREQUEST]);
+}
+
+static UA_INLINE UA_StatusCode
+UA_RegisterNodesRequest_copy(const UA_RegisterNodesRequest *src, UA_RegisterNodesRequest *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_REGISTERNODESREQUEST]);
+}
+
+static UA_INLINE void
+UA_RegisterNodesRequest_deleteMembers(UA_RegisterNodesRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_REGISTERNODESREQUEST]);
+}
+
+static UA_INLINE void
+UA_RegisterNodesRequest_clear(UA_RegisterNodesRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_REGISTERNODESREQUEST]);
+}
+
+static UA_INLINE void
+UA_RegisterNodesRequest_delete(UA_RegisterNodesRequest *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_REGISTERNODESREQUEST]);
+}
+
+/* RegisterNodesResponse */
+static UA_INLINE void
+UA_RegisterNodesResponse_init(UA_RegisterNodesResponse *p) {
+    memset(p, 0, sizeof(UA_RegisterNodesResponse));
+}
+
+static UA_INLINE UA_RegisterNodesResponse *
+UA_RegisterNodesResponse_new(void) {
+    return (UA_RegisterNodesResponse*)UA_new(&UA_TYPES[UA_TYPES_REGISTERNODESRESPONSE]);
+}
+
+static UA_INLINE UA_StatusCode
+UA_RegisterNodesResponse_copy(const UA_RegisterNodesResponse *src, UA_RegisterNodesResponse *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_REGISTERNODESRESPONSE]);
+}
+
+static UA_INLINE void
+UA_RegisterNodesResponse_deleteMembers(UA_RegisterNodesResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_REGISTERNODESRESPONSE]);
+}
+
+static UA_INLINE void
+UA_RegisterNodesResponse_clear(UA_RegisterNodesResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_REGISTERNODESRESPONSE]);
+}
+
+static UA_INLINE void
+UA_RegisterNodesResponse_delete(UA_RegisterNodesResponse *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_REGISTERNODESRESPONSE]);
+}
+
+/* UnregisterNodesRequest */
+static UA_INLINE void
+UA_UnregisterNodesRequest_init(UA_UnregisterNodesRequest *p) {
+    memset(p, 0, sizeof(UA_UnregisterNodesRequest));
+}
+
+static UA_INLINE UA_UnregisterNodesRequest *
+UA_UnregisterNodesRequest_new(void) {
+    return (UA_UnregisterNodesRequest*)UA_new(&UA_TYPES[UA_TYPES_UNREGISTERNODESREQUEST]);
+}
+
+static UA_INLINE UA_StatusCode
+UA_UnregisterNodesRequest_copy(const UA_UnregisterNodesRequest *src, UA_UnregisterNodesRequest *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_UNREGISTERNODESREQUEST]);
+}
+
+static UA_INLINE void
+UA_UnregisterNodesRequest_deleteMembers(UA_UnregisterNodesRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_UNREGISTERNODESREQUEST]);
+}
+
+static UA_INLINE void
+UA_UnregisterNodesRequest_clear(UA_UnregisterNodesRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_UNREGISTERNODESREQUEST]);
+}
+
+static UA_INLINE void
+UA_UnregisterNodesRequest_delete(UA_UnregisterNodesRequest *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_UNREGISTERNODESREQUEST]);
 }
 
 /* UnregisterNodesResponse */
@@ -19765,6 +20275,285 @@ UA_UnregisterNodesResponse_delete(UA_UnregisterNodesResponse *p) {
     UA_delete(p, &UA_TYPES[UA_TYPES_UNREGISTERNODESRESPONSE]);
 }
 
+/* FilterOperator */
+static UA_INLINE void
+UA_FilterOperator_init(UA_FilterOperator *p) {
+    memset(p, 0, sizeof(UA_FilterOperator));
+}
+
+static UA_INLINE UA_FilterOperator *
+UA_FilterOperator_new(void) {
+    return (UA_FilterOperator*)UA_new(&UA_TYPES[UA_TYPES_FILTEROPERATOR]);
+}
+
+static UA_INLINE UA_StatusCode
+UA_FilterOperator_copy(const UA_FilterOperator *src, UA_FilterOperator *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_FILTEROPERATOR]);
+}
+
+static UA_INLINE void
+UA_FilterOperator_deleteMembers(UA_FilterOperator *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_FILTEROPERATOR]);
+}
+
+static UA_INLINE void
+UA_FilterOperator_clear(UA_FilterOperator *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_FILTEROPERATOR]);
+}
+
+static UA_INLINE void
+UA_FilterOperator_delete(UA_FilterOperator *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_FILTEROPERATOR]);
+}
+
+/* ContentFilterElement */
+static UA_INLINE void
+UA_ContentFilterElement_init(UA_ContentFilterElement *p) {
+    memset(p, 0, sizeof(UA_ContentFilterElement));
+}
+
+static UA_INLINE UA_ContentFilterElement *
+UA_ContentFilterElement_new(void) {
+    return (UA_ContentFilterElement*)UA_new(&UA_TYPES[UA_TYPES_CONTENTFILTERELEMENT]);
+}
+
+static UA_INLINE UA_StatusCode
+UA_ContentFilterElement_copy(const UA_ContentFilterElement *src, UA_ContentFilterElement *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_CONTENTFILTERELEMENT]);
+}
+
+static UA_INLINE void
+UA_ContentFilterElement_deleteMembers(UA_ContentFilterElement *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_CONTENTFILTERELEMENT]);
+}
+
+static UA_INLINE void
+UA_ContentFilterElement_clear(UA_ContentFilterElement *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_CONTENTFILTERELEMENT]);
+}
+
+static UA_INLINE void
+UA_ContentFilterElement_delete(UA_ContentFilterElement *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_CONTENTFILTERELEMENT]);
+}
+
+/* ContentFilter */
+static UA_INLINE void
+UA_ContentFilter_init(UA_ContentFilter *p) {
+    memset(p, 0, sizeof(UA_ContentFilter));
+}
+
+static UA_INLINE UA_ContentFilter *
+UA_ContentFilter_new(void) {
+    return (UA_ContentFilter*)UA_new(&UA_TYPES[UA_TYPES_CONTENTFILTER]);
+}
+
+static UA_INLINE UA_StatusCode
+UA_ContentFilter_copy(const UA_ContentFilter *src, UA_ContentFilter *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_CONTENTFILTER]);
+}
+
+static UA_INLINE void
+UA_ContentFilter_deleteMembers(UA_ContentFilter *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_CONTENTFILTER]);
+}
+
+static UA_INLINE void
+UA_ContentFilter_clear(UA_ContentFilter *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_CONTENTFILTER]);
+}
+
+static UA_INLINE void
+UA_ContentFilter_delete(UA_ContentFilter *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_CONTENTFILTER]);
+}
+
+/* FilterOperand */
+static UA_INLINE void
+UA_FilterOperand_init(UA_FilterOperand *p) {
+    memset(p, 0, sizeof(UA_FilterOperand));
+}
+
+static UA_INLINE UA_FilterOperand *
+UA_FilterOperand_new(void) {
+    return (UA_FilterOperand*)UA_new(&UA_TYPES[UA_TYPES_FILTEROPERAND]);
+}
+
+static UA_INLINE UA_StatusCode
+UA_FilterOperand_copy(const UA_FilterOperand *src, UA_FilterOperand *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_FILTEROPERAND]);
+}
+
+static UA_INLINE void
+UA_FilterOperand_deleteMembers(UA_FilterOperand *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_FILTEROPERAND]);
+}
+
+static UA_INLINE void
+UA_FilterOperand_clear(UA_FilterOperand *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_FILTEROPERAND]);
+}
+
+static UA_INLINE void
+UA_FilterOperand_delete(UA_FilterOperand *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_FILTEROPERAND]);
+}
+
+/* ElementOperand */
+static UA_INLINE void
+UA_ElementOperand_init(UA_ElementOperand *p) {
+    memset(p, 0, sizeof(UA_ElementOperand));
+}
+
+static UA_INLINE UA_ElementOperand *
+UA_ElementOperand_new(void) {
+    return (UA_ElementOperand*)UA_new(&UA_TYPES[UA_TYPES_ELEMENTOPERAND]);
+}
+
+static UA_INLINE UA_StatusCode
+UA_ElementOperand_copy(const UA_ElementOperand *src, UA_ElementOperand *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_ELEMENTOPERAND]);
+}
+
+static UA_INLINE void
+UA_ElementOperand_deleteMembers(UA_ElementOperand *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_ELEMENTOPERAND]);
+}
+
+static UA_INLINE void
+UA_ElementOperand_clear(UA_ElementOperand *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_ELEMENTOPERAND]);
+}
+
+static UA_INLINE void
+UA_ElementOperand_delete(UA_ElementOperand *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_ELEMENTOPERAND]);
+}
+
+/* LiteralOperand */
+static UA_INLINE void
+UA_LiteralOperand_init(UA_LiteralOperand *p) {
+    memset(p, 0, sizeof(UA_LiteralOperand));
+}
+
+static UA_INLINE UA_LiteralOperand *
+UA_LiteralOperand_new(void) {
+    return (UA_LiteralOperand*)UA_new(&UA_TYPES[UA_TYPES_LITERALOPERAND]);
+}
+
+static UA_INLINE UA_StatusCode
+UA_LiteralOperand_copy(const UA_LiteralOperand *src, UA_LiteralOperand *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_LITERALOPERAND]);
+}
+
+static UA_INLINE void
+UA_LiteralOperand_deleteMembers(UA_LiteralOperand *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_LITERALOPERAND]);
+}
+
+static UA_INLINE void
+UA_LiteralOperand_clear(UA_LiteralOperand *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_LITERALOPERAND]);
+}
+
+static UA_INLINE void
+UA_LiteralOperand_delete(UA_LiteralOperand *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_LITERALOPERAND]);
+}
+
+/* AttributeOperand */
+static UA_INLINE void
+UA_AttributeOperand_init(UA_AttributeOperand *p) {
+    memset(p, 0, sizeof(UA_AttributeOperand));
+}
+
+static UA_INLINE UA_AttributeOperand *
+UA_AttributeOperand_new(void) {
+    return (UA_AttributeOperand*)UA_new(&UA_TYPES[UA_TYPES_ATTRIBUTEOPERAND]);
+}
+
+static UA_INLINE UA_StatusCode
+UA_AttributeOperand_copy(const UA_AttributeOperand *src, UA_AttributeOperand *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_ATTRIBUTEOPERAND]);
+}
+
+static UA_INLINE void
+UA_AttributeOperand_deleteMembers(UA_AttributeOperand *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_ATTRIBUTEOPERAND]);
+}
+
+static UA_INLINE void
+UA_AttributeOperand_clear(UA_AttributeOperand *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_ATTRIBUTEOPERAND]);
+}
+
+static UA_INLINE void
+UA_AttributeOperand_delete(UA_AttributeOperand *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_ATTRIBUTEOPERAND]);
+}
+
+/* SimpleAttributeOperand */
+static UA_INLINE void
+UA_SimpleAttributeOperand_init(UA_SimpleAttributeOperand *p) {
+    memset(p, 0, sizeof(UA_SimpleAttributeOperand));
+}
+
+static UA_INLINE UA_SimpleAttributeOperand *
+UA_SimpleAttributeOperand_new(void) {
+    return (UA_SimpleAttributeOperand*)UA_new(&UA_TYPES[UA_TYPES_SIMPLEATTRIBUTEOPERAND]);
+}
+
+static UA_INLINE UA_StatusCode
+UA_SimpleAttributeOperand_copy(const UA_SimpleAttributeOperand *src, UA_SimpleAttributeOperand *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_SIMPLEATTRIBUTEOPERAND]);
+}
+
+static UA_INLINE void
+UA_SimpleAttributeOperand_deleteMembers(UA_SimpleAttributeOperand *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_SIMPLEATTRIBUTEOPERAND]);
+}
+
+static UA_INLINE void
+UA_SimpleAttributeOperand_clear(UA_SimpleAttributeOperand *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_SIMPLEATTRIBUTEOPERAND]);
+}
+
+static UA_INLINE void
+UA_SimpleAttributeOperand_delete(UA_SimpleAttributeOperand *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_SIMPLEATTRIBUTEOPERAND]);
+}
+
+/* ContentFilterElementResult */
+static UA_INLINE void
+UA_ContentFilterElementResult_init(UA_ContentFilterElementResult *p) {
+    memset(p, 0, sizeof(UA_ContentFilterElementResult));
+}
+
+static UA_INLINE UA_ContentFilterElementResult *
+UA_ContentFilterElementResult_new(void) {
+    return (UA_ContentFilterElementResult*)UA_new(&UA_TYPES[UA_TYPES_CONTENTFILTERELEMENTRESULT]);
+}
+
+static UA_INLINE UA_StatusCode
+UA_ContentFilterElementResult_copy(const UA_ContentFilterElementResult *src, UA_ContentFilterElementResult *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_CONTENTFILTERELEMENTRESULT]);
+}
+
+static UA_INLINE void
+UA_ContentFilterElementResult_deleteMembers(UA_ContentFilterElementResult *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_CONTENTFILTERELEMENTRESULT]);
+}
+
+static UA_INLINE void
+UA_ContentFilterElementResult_clear(UA_ContentFilterElementResult *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_CONTENTFILTERELEMENTRESULT]);
+}
+
+static UA_INLINE void
+UA_ContentFilterElementResult_delete(UA_ContentFilterElementResult *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_CONTENTFILTERELEMENTRESULT]);
+}
+
 /* ContentFilterResult */
 static UA_INLINE void
 UA_ContentFilterResult_init(UA_ContentFilterResult *p) {
@@ -19796,1399 +20585,1492 @@ UA_ContentFilterResult_delete(UA_ContentFilterResult *p) {
     UA_delete(p, &UA_TYPES[UA_TYPES_CONTENTFILTERRESULT]);
 }
 
-/* UserTokenPolicy */
+/* TimestampsToReturn */
 static UA_INLINE void
-UA_UserTokenPolicy_init(UA_UserTokenPolicy *p) {
-    memset(p, 0, sizeof(UA_UserTokenPolicy));
+UA_TimestampsToReturn_init(UA_TimestampsToReturn *p) {
+    memset(p, 0, sizeof(UA_TimestampsToReturn));
 }
 
-static UA_INLINE UA_UserTokenPolicy *
-UA_UserTokenPolicy_new(void) {
-    return (UA_UserTokenPolicy*)UA_new(&UA_TYPES[UA_TYPES_USERTOKENPOLICY]);
+static UA_INLINE UA_TimestampsToReturn *
+UA_TimestampsToReturn_new(void) {
+    return (UA_TimestampsToReturn*)UA_new(&UA_TYPES[UA_TYPES_TIMESTAMPSTORETURN]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_UserTokenPolicy_copy(const UA_UserTokenPolicy *src, UA_UserTokenPolicy *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_USERTOKENPOLICY]);
+UA_TimestampsToReturn_copy(const UA_TimestampsToReturn *src, UA_TimestampsToReturn *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_TIMESTAMPSTORETURN]);
 }
 
 static UA_INLINE void
-UA_UserTokenPolicy_deleteMembers(UA_UserTokenPolicy *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_USERTOKENPOLICY]);
+UA_TimestampsToReturn_deleteMembers(UA_TimestampsToReturn *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_TIMESTAMPSTORETURN]);
 }
 
 static UA_INLINE void
-UA_UserTokenPolicy_clear(UA_UserTokenPolicy *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_USERTOKENPOLICY]);
+UA_TimestampsToReturn_clear(UA_TimestampsToReturn *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_TIMESTAMPSTORETURN]);
 }
 
 static UA_INLINE void
-UA_UserTokenPolicy_delete(UA_UserTokenPolicy *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_USERTOKENPOLICY]);
+UA_TimestampsToReturn_delete(UA_TimestampsToReturn *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_TIMESTAMPSTORETURN]);
 }
 
-/* DeleteMonitoredItemsRequest */
+/* ReadValueId */
 static UA_INLINE void
-UA_DeleteMonitoredItemsRequest_init(UA_DeleteMonitoredItemsRequest *p) {
-    memset(p, 0, sizeof(UA_DeleteMonitoredItemsRequest));
+UA_ReadValueId_init(UA_ReadValueId *p) {
+    memset(p, 0, sizeof(UA_ReadValueId));
 }
 
-static UA_INLINE UA_DeleteMonitoredItemsRequest *
-UA_DeleteMonitoredItemsRequest_new(void) {
-    return (UA_DeleteMonitoredItemsRequest*)UA_new(&UA_TYPES[UA_TYPES_DELETEMONITOREDITEMSREQUEST]);
+static UA_INLINE UA_ReadValueId *
+UA_ReadValueId_new(void) {
+    return (UA_ReadValueId*)UA_new(&UA_TYPES[UA_TYPES_READVALUEID]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_DeleteMonitoredItemsRequest_copy(const UA_DeleteMonitoredItemsRequest *src, UA_DeleteMonitoredItemsRequest *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_DELETEMONITOREDITEMSREQUEST]);
+UA_ReadValueId_copy(const UA_ReadValueId *src, UA_ReadValueId *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_READVALUEID]);
 }
 
 static UA_INLINE void
-UA_DeleteMonitoredItemsRequest_deleteMembers(UA_DeleteMonitoredItemsRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_DELETEMONITOREDITEMSREQUEST]);
+UA_ReadValueId_deleteMembers(UA_ReadValueId *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_READVALUEID]);
 }
 
 static UA_INLINE void
-UA_DeleteMonitoredItemsRequest_clear(UA_DeleteMonitoredItemsRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_DELETEMONITOREDITEMSREQUEST]);
+UA_ReadValueId_clear(UA_ReadValueId *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_READVALUEID]);
 }
 
 static UA_INLINE void
-UA_DeleteMonitoredItemsRequest_delete(UA_DeleteMonitoredItemsRequest *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_DELETEMONITOREDITEMSREQUEST]);
+UA_ReadValueId_delete(UA_ReadValueId *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_READVALUEID]);
 }
 
-/* SetMonitoringModeRequest */
+/* ReadRequest */
 static UA_INLINE void
-UA_SetMonitoringModeRequest_init(UA_SetMonitoringModeRequest *p) {
-    memset(p, 0, sizeof(UA_SetMonitoringModeRequest));
+UA_ReadRequest_init(UA_ReadRequest *p) {
+    memset(p, 0, sizeof(UA_ReadRequest));
 }
 
-static UA_INLINE UA_SetMonitoringModeRequest *
-UA_SetMonitoringModeRequest_new(void) {
-    return (UA_SetMonitoringModeRequest*)UA_new(&UA_TYPES[UA_TYPES_SETMONITORINGMODEREQUEST]);
+static UA_INLINE UA_ReadRequest *
+UA_ReadRequest_new(void) {
+    return (UA_ReadRequest*)UA_new(&UA_TYPES[UA_TYPES_READREQUEST]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_SetMonitoringModeRequest_copy(const UA_SetMonitoringModeRequest *src, UA_SetMonitoringModeRequest *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_SETMONITORINGMODEREQUEST]);
+UA_ReadRequest_copy(const UA_ReadRequest *src, UA_ReadRequest *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_READREQUEST]);
 }
 
 static UA_INLINE void
-UA_SetMonitoringModeRequest_deleteMembers(UA_SetMonitoringModeRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_SETMONITORINGMODEREQUEST]);
+UA_ReadRequest_deleteMembers(UA_ReadRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_READREQUEST]);
 }
 
 static UA_INLINE void
-UA_SetMonitoringModeRequest_clear(UA_SetMonitoringModeRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_SETMONITORINGMODEREQUEST]);
+UA_ReadRequest_clear(UA_ReadRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_READREQUEST]);
 }
 
 static UA_INLINE void
-UA_SetMonitoringModeRequest_delete(UA_SetMonitoringModeRequest *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_SETMONITORINGMODEREQUEST]);
+UA_ReadRequest_delete(UA_ReadRequest *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_READREQUEST]);
 }
 
-/* Duration */
+/* ReadResponse */
 static UA_INLINE void
-UA_Duration_init(UA_Duration *p) {
-    memset(p, 0, sizeof(UA_Duration));
+UA_ReadResponse_init(UA_ReadResponse *p) {
+    memset(p, 0, sizeof(UA_ReadResponse));
 }
 
-static UA_INLINE UA_Duration *
-UA_Duration_new(void) {
-    return (UA_Duration*)UA_new(&UA_TYPES[UA_TYPES_DURATION]);
+static UA_INLINE UA_ReadResponse *
+UA_ReadResponse_new(void) {
+    return (UA_ReadResponse*)UA_new(&UA_TYPES[UA_TYPES_READRESPONSE]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_Duration_copy(const UA_Duration *src, UA_Duration *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_DURATION]);
+UA_ReadResponse_copy(const UA_ReadResponse *src, UA_ReadResponse *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_READRESPONSE]);
 }
 
 static UA_INLINE void
-UA_Duration_deleteMembers(UA_Duration *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_DURATION]);
+UA_ReadResponse_deleteMembers(UA_ReadResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_READRESPONSE]);
 }
 
 static UA_INLINE void
-UA_Duration_clear(UA_Duration *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_DURATION]);
+UA_ReadResponse_clear(UA_ReadResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_READRESPONSE]);
 }
 
 static UA_INLINE void
-UA_Duration_delete(UA_Duration *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_DURATION]);
+UA_ReadResponse_delete(UA_ReadResponse *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_READRESPONSE]);
 }
 
-/* ReferenceTypeAttributes */
+/* HistoryReadValueId */
 static UA_INLINE void
-UA_ReferenceTypeAttributes_init(UA_ReferenceTypeAttributes *p) {
-    memset(p, 0, sizeof(UA_ReferenceTypeAttributes));
+UA_HistoryReadValueId_init(UA_HistoryReadValueId *p) {
+    memset(p, 0, sizeof(UA_HistoryReadValueId));
 }
 
-static UA_INLINE UA_ReferenceTypeAttributes *
-UA_ReferenceTypeAttributes_new(void) {
-    return (UA_ReferenceTypeAttributes*)UA_new(&UA_TYPES[UA_TYPES_REFERENCETYPEATTRIBUTES]);
+static UA_INLINE UA_HistoryReadValueId *
+UA_HistoryReadValueId_new(void) {
+    return (UA_HistoryReadValueId*)UA_new(&UA_TYPES[UA_TYPES_HISTORYREADVALUEID]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_ReferenceTypeAttributes_copy(const UA_ReferenceTypeAttributes *src, UA_ReferenceTypeAttributes *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_REFERENCETYPEATTRIBUTES]);
+UA_HistoryReadValueId_copy(const UA_HistoryReadValueId *src, UA_HistoryReadValueId *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_HISTORYREADVALUEID]);
 }
 
 static UA_INLINE void
-UA_ReferenceTypeAttributes_deleteMembers(UA_ReferenceTypeAttributes *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_REFERENCETYPEATTRIBUTES]);
+UA_HistoryReadValueId_deleteMembers(UA_HistoryReadValueId *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_HISTORYREADVALUEID]);
 }
 
 static UA_INLINE void
-UA_ReferenceTypeAttributes_clear(UA_ReferenceTypeAttributes *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_REFERENCETYPEATTRIBUTES]);
+UA_HistoryReadValueId_clear(UA_HistoryReadValueId *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_HISTORYREADVALUEID]);
 }
 
 static UA_INLINE void
-UA_ReferenceTypeAttributes_delete(UA_ReferenceTypeAttributes *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_REFERENCETYPEATTRIBUTES]);
+UA_HistoryReadValueId_delete(UA_HistoryReadValueId *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_HISTORYREADVALUEID]);
 }
 
-/* GetEndpointsRequest */
+/* HistoryReadResult */
 static UA_INLINE void
-UA_GetEndpointsRequest_init(UA_GetEndpointsRequest *p) {
-    memset(p, 0, sizeof(UA_GetEndpointsRequest));
+UA_HistoryReadResult_init(UA_HistoryReadResult *p) {
+    memset(p, 0, sizeof(UA_HistoryReadResult));
 }
 
-static UA_INLINE UA_GetEndpointsRequest *
-UA_GetEndpointsRequest_new(void) {
-    return (UA_GetEndpointsRequest*)UA_new(&UA_TYPES[UA_TYPES_GETENDPOINTSREQUEST]);
+static UA_INLINE UA_HistoryReadResult *
+UA_HistoryReadResult_new(void) {
+    return (UA_HistoryReadResult*)UA_new(&UA_TYPES[UA_TYPES_HISTORYREADRESULT]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_GetEndpointsRequest_copy(const UA_GetEndpointsRequest *src, UA_GetEndpointsRequest *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_GETENDPOINTSREQUEST]);
+UA_HistoryReadResult_copy(const UA_HistoryReadResult *src, UA_HistoryReadResult *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_HISTORYREADRESULT]);
 }
 
 static UA_INLINE void
-UA_GetEndpointsRequest_deleteMembers(UA_GetEndpointsRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_GETENDPOINTSREQUEST]);
+UA_HistoryReadResult_deleteMembers(UA_HistoryReadResult *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_HISTORYREADRESULT]);
 }
 
 static UA_INLINE void
-UA_GetEndpointsRequest_clear(UA_GetEndpointsRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_GETENDPOINTSREQUEST]);
+UA_HistoryReadResult_clear(UA_HistoryReadResult *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_HISTORYREADRESULT]);
 }
 
 static UA_INLINE void
-UA_GetEndpointsRequest_delete(UA_GetEndpointsRequest *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_GETENDPOINTSREQUEST]);
+UA_HistoryReadResult_delete(UA_HistoryReadResult *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_HISTORYREADRESULT]);
 }
 
-/* CloseSecureChannelResponse */
+/* ReadRawModifiedDetails */
 static UA_INLINE void
-UA_CloseSecureChannelResponse_init(UA_CloseSecureChannelResponse *p) {
-    memset(p, 0, sizeof(UA_CloseSecureChannelResponse));
+UA_ReadRawModifiedDetails_init(UA_ReadRawModifiedDetails *p) {
+    memset(p, 0, sizeof(UA_ReadRawModifiedDetails));
 }
 
-static UA_INLINE UA_CloseSecureChannelResponse *
-UA_CloseSecureChannelResponse_new(void) {
-    return (UA_CloseSecureChannelResponse*)UA_new(&UA_TYPES[UA_TYPES_CLOSESECURECHANNELRESPONSE]);
+static UA_INLINE UA_ReadRawModifiedDetails *
+UA_ReadRawModifiedDetails_new(void) {
+    return (UA_ReadRawModifiedDetails*)UA_new(&UA_TYPES[UA_TYPES_READRAWMODIFIEDDETAILS]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_CloseSecureChannelResponse_copy(const UA_CloseSecureChannelResponse *src, UA_CloseSecureChannelResponse *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_CLOSESECURECHANNELRESPONSE]);
+UA_ReadRawModifiedDetails_copy(const UA_ReadRawModifiedDetails *src, UA_ReadRawModifiedDetails *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_READRAWMODIFIEDDETAILS]);
 }
 
 static UA_INLINE void
-UA_CloseSecureChannelResponse_deleteMembers(UA_CloseSecureChannelResponse *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_CLOSESECURECHANNELRESPONSE]);
+UA_ReadRawModifiedDetails_deleteMembers(UA_ReadRawModifiedDetails *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_READRAWMODIFIEDDETAILS]);
 }
 
 static UA_INLINE void
-UA_CloseSecureChannelResponse_clear(UA_CloseSecureChannelResponse *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_CLOSESECURECHANNELRESPONSE]);
+UA_ReadRawModifiedDetails_clear(UA_ReadRawModifiedDetails *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_READRAWMODIFIEDDETAILS]);
 }
 
 static UA_INLINE void
-UA_CloseSecureChannelResponse_delete(UA_CloseSecureChannelResponse *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_CLOSESECURECHANNELRESPONSE]);
+UA_ReadRawModifiedDetails_delete(UA_ReadRawModifiedDetails *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_READRAWMODIFIEDDETAILS]);
 }
 
-/* ViewDescription */
+/* ReadAtTimeDetails */
 static UA_INLINE void
-UA_ViewDescription_init(UA_ViewDescription *p) {
-    memset(p, 0, sizeof(UA_ViewDescription));
+UA_ReadAtTimeDetails_init(UA_ReadAtTimeDetails *p) {
+    memset(p, 0, sizeof(UA_ReadAtTimeDetails));
 }
 
-static UA_INLINE UA_ViewDescription *
-UA_ViewDescription_new(void) {
-    return (UA_ViewDescription*)UA_new(&UA_TYPES[UA_TYPES_VIEWDESCRIPTION]);
+static UA_INLINE UA_ReadAtTimeDetails *
+UA_ReadAtTimeDetails_new(void) {
+    return (UA_ReadAtTimeDetails*)UA_new(&UA_TYPES[UA_TYPES_READATTIMEDETAILS]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_ViewDescription_copy(const UA_ViewDescription *src, UA_ViewDescription *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_VIEWDESCRIPTION]);
+UA_ReadAtTimeDetails_copy(const UA_ReadAtTimeDetails *src, UA_ReadAtTimeDetails *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_READATTIMEDETAILS]);
 }
 
 static UA_INLINE void
-UA_ViewDescription_deleteMembers(UA_ViewDescription *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_VIEWDESCRIPTION]);
+UA_ReadAtTimeDetails_deleteMembers(UA_ReadAtTimeDetails *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_READATTIMEDETAILS]);
 }
 
 static UA_INLINE void
-UA_ViewDescription_clear(UA_ViewDescription *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_VIEWDESCRIPTION]);
+UA_ReadAtTimeDetails_clear(UA_ReadAtTimeDetails *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_READATTIMEDETAILS]);
 }
 
 static UA_INLINE void
-UA_ViewDescription_delete(UA_ViewDescription *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_VIEWDESCRIPTION]);
+UA_ReadAtTimeDetails_delete(UA_ReadAtTimeDetails *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_READATTIMEDETAILS]);
 }
 
-/* SetPublishingModeResponse */
+/* HistoryData */
 static UA_INLINE void
-UA_SetPublishingModeResponse_init(UA_SetPublishingModeResponse *p) {
-    memset(p, 0, sizeof(UA_SetPublishingModeResponse));
+UA_HistoryData_init(UA_HistoryData *p) {
+    memset(p, 0, sizeof(UA_HistoryData));
 }
 
-static UA_INLINE UA_SetPublishingModeResponse *
-UA_SetPublishingModeResponse_new(void) {
-    return (UA_SetPublishingModeResponse*)UA_new(&UA_TYPES[UA_TYPES_SETPUBLISHINGMODERESPONSE]);
+static UA_INLINE UA_HistoryData *
+UA_HistoryData_new(void) {
+    return (UA_HistoryData*)UA_new(&UA_TYPES[UA_TYPES_HISTORYDATA]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_SetPublishingModeResponse_copy(const UA_SetPublishingModeResponse *src, UA_SetPublishingModeResponse *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_SETPUBLISHINGMODERESPONSE]);
+UA_HistoryData_copy(const UA_HistoryData *src, UA_HistoryData *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_HISTORYDATA]);
 }
 
 static UA_INLINE void
-UA_SetPublishingModeResponse_deleteMembers(UA_SetPublishingModeResponse *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_SETPUBLISHINGMODERESPONSE]);
+UA_HistoryData_deleteMembers(UA_HistoryData *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_HISTORYDATA]);
 }
 
 static UA_INLINE void
-UA_SetPublishingModeResponse_clear(UA_SetPublishingModeResponse *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_SETPUBLISHINGMODERESPONSE]);
+UA_HistoryData_clear(UA_HistoryData *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_HISTORYDATA]);
 }
 
 static UA_INLINE void
-UA_SetPublishingModeResponse_delete(UA_SetPublishingModeResponse *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_SETPUBLISHINGMODERESPONSE]);
+UA_HistoryData_delete(UA_HistoryData *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_HISTORYDATA]);
 }
 
-/* StatusChangeNotification */
+/* HistoryReadRequest */
 static UA_INLINE void
-UA_StatusChangeNotification_init(UA_StatusChangeNotification *p) {
-    memset(p, 0, sizeof(UA_StatusChangeNotification));
+UA_HistoryReadRequest_init(UA_HistoryReadRequest *p) {
+    memset(p, 0, sizeof(UA_HistoryReadRequest));
 }
 
-static UA_INLINE UA_StatusChangeNotification *
-UA_StatusChangeNotification_new(void) {
-    return (UA_StatusChangeNotification*)UA_new(&UA_TYPES[UA_TYPES_STATUSCHANGENOTIFICATION]);
+static UA_INLINE UA_HistoryReadRequest *
+UA_HistoryReadRequest_new(void) {
+    return (UA_HistoryReadRequest*)UA_new(&UA_TYPES[UA_TYPES_HISTORYREADREQUEST]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_StatusChangeNotification_copy(const UA_StatusChangeNotification *src, UA_StatusChangeNotification *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_STATUSCHANGENOTIFICATION]);
+UA_HistoryReadRequest_copy(const UA_HistoryReadRequest *src, UA_HistoryReadRequest *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_HISTORYREADREQUEST]);
 }
 
 static UA_INLINE void
-UA_StatusChangeNotification_deleteMembers(UA_StatusChangeNotification *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_STATUSCHANGENOTIFICATION]);
+UA_HistoryReadRequest_deleteMembers(UA_HistoryReadRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_HISTORYREADREQUEST]);
 }
 
 static UA_INLINE void
-UA_StatusChangeNotification_clear(UA_StatusChangeNotification *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_STATUSCHANGENOTIFICATION]);
+UA_HistoryReadRequest_clear(UA_HistoryReadRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_HISTORYREADREQUEST]);
 }
 
 static UA_INLINE void
-UA_StatusChangeNotification_delete(UA_StatusChangeNotification *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_STATUSCHANGENOTIFICATION]);
+UA_HistoryReadRequest_delete(UA_HistoryReadRequest *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_HISTORYREADREQUEST]);
 }
 
-/* StructureField */
+/* HistoryReadResponse */
 static UA_INLINE void
-UA_StructureField_init(UA_StructureField *p) {
-    memset(p, 0, sizeof(UA_StructureField));
+UA_HistoryReadResponse_init(UA_HistoryReadResponse *p) {
+    memset(p, 0, sizeof(UA_HistoryReadResponse));
 }
 
-static UA_INLINE UA_StructureField *
-UA_StructureField_new(void) {
-    return (UA_StructureField*)UA_new(&UA_TYPES[UA_TYPES_STRUCTUREFIELD]);
+static UA_INLINE UA_HistoryReadResponse *
+UA_HistoryReadResponse_new(void) {
+    return (UA_HistoryReadResponse*)UA_new(&UA_TYPES[UA_TYPES_HISTORYREADRESPONSE]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_StructureField_copy(const UA_StructureField *src, UA_StructureField *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_STRUCTUREFIELD]);
+UA_HistoryReadResponse_copy(const UA_HistoryReadResponse *src, UA_HistoryReadResponse *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_HISTORYREADRESPONSE]);
 }
 
 static UA_INLINE void
-UA_StructureField_deleteMembers(UA_StructureField *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_STRUCTUREFIELD]);
+UA_HistoryReadResponse_deleteMembers(UA_HistoryReadResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_HISTORYREADRESPONSE]);
 }
 
 static UA_INLINE void
-UA_StructureField_clear(UA_StructureField *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_STRUCTUREFIELD]);
+UA_HistoryReadResponse_clear(UA_HistoryReadResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_HISTORYREADRESPONSE]);
 }
 
 static UA_INLINE void
-UA_StructureField_delete(UA_StructureField *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_STRUCTUREFIELD]);
+UA_HistoryReadResponse_delete(UA_HistoryReadResponse *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_HISTORYREADRESPONSE]);
 }
 
-/* NodeAttributesMask */
+/* WriteValue */
 static UA_INLINE void
-UA_NodeAttributesMask_init(UA_NodeAttributesMask *p) {
-    memset(p, 0, sizeof(UA_NodeAttributesMask));
+UA_WriteValue_init(UA_WriteValue *p) {
+    memset(p, 0, sizeof(UA_WriteValue));
 }
 
-static UA_INLINE UA_NodeAttributesMask *
-UA_NodeAttributesMask_new(void) {
-    return (UA_NodeAttributesMask*)UA_new(&UA_TYPES[UA_TYPES_NODEATTRIBUTESMASK]);
+static UA_INLINE UA_WriteValue *
+UA_WriteValue_new(void) {
+    return (UA_WriteValue*)UA_new(&UA_TYPES[UA_TYPES_WRITEVALUE]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_NodeAttributesMask_copy(const UA_NodeAttributesMask *src, UA_NodeAttributesMask *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_NODEATTRIBUTESMASK]);
+UA_WriteValue_copy(const UA_WriteValue *src, UA_WriteValue *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_WRITEVALUE]);
 }
 
 static UA_INLINE void
-UA_NodeAttributesMask_deleteMembers(UA_NodeAttributesMask *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_NODEATTRIBUTESMASK]);
+UA_WriteValue_deleteMembers(UA_WriteValue *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_WRITEVALUE]);
 }
 
 static UA_INLINE void
-UA_NodeAttributesMask_clear(UA_NodeAttributesMask *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_NODEATTRIBUTESMASK]);
+UA_WriteValue_clear(UA_WriteValue *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_WRITEVALUE]);
 }
 
 static UA_INLINE void
-UA_NodeAttributesMask_delete(UA_NodeAttributesMask *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_NODEATTRIBUTESMASK]);
+UA_WriteValue_delete(UA_WriteValue *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_WRITEVALUE]);
 }
 
-/* EventFilterResult */
+/* WriteRequest */
 static UA_INLINE void
-UA_EventFilterResult_init(UA_EventFilterResult *p) {
-    memset(p, 0, sizeof(UA_EventFilterResult));
+UA_WriteRequest_init(UA_WriteRequest *p) {
+    memset(p, 0, sizeof(UA_WriteRequest));
 }
 
-static UA_INLINE UA_EventFilterResult *
-UA_EventFilterResult_new(void) {
-    return (UA_EventFilterResult*)UA_new(&UA_TYPES[UA_TYPES_EVENTFILTERRESULT]);
+static UA_INLINE UA_WriteRequest *
+UA_WriteRequest_new(void) {
+    return (UA_WriteRequest*)UA_new(&UA_TYPES[UA_TYPES_WRITEREQUEST]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_EventFilterResult_copy(const UA_EventFilterResult *src, UA_EventFilterResult *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_EVENTFILTERRESULT]);
+UA_WriteRequest_copy(const UA_WriteRequest *src, UA_WriteRequest *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_WRITEREQUEST]);
 }
 
 static UA_INLINE void
-UA_EventFilterResult_deleteMembers(UA_EventFilterResult *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_EVENTFILTERRESULT]);
+UA_WriteRequest_deleteMembers(UA_WriteRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_WRITEREQUEST]);
 }
 
 static UA_INLINE void
-UA_EventFilterResult_clear(UA_EventFilterResult *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_EVENTFILTERRESULT]);
+UA_WriteRequest_clear(UA_WriteRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_WRITEREQUEST]);
 }
 
 static UA_INLINE void
-UA_EventFilterResult_delete(UA_EventFilterResult *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_EVENTFILTERRESULT]);
+UA_WriteRequest_delete(UA_WriteRequest *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_WRITEREQUEST]);
 }
 
-/* MonitoredItemCreateRequest */
+/* WriteResponse */
 static UA_INLINE void
-UA_MonitoredItemCreateRequest_init(UA_MonitoredItemCreateRequest *p) {
-    memset(p, 0, sizeof(UA_MonitoredItemCreateRequest));
+UA_WriteResponse_init(UA_WriteResponse *p) {
+    memset(p, 0, sizeof(UA_WriteResponse));
 }
 
-static UA_INLINE UA_MonitoredItemCreateRequest *
-UA_MonitoredItemCreateRequest_new(void) {
-    return (UA_MonitoredItemCreateRequest*)UA_new(&UA_TYPES[UA_TYPES_MONITOREDITEMCREATEREQUEST]);
+static UA_INLINE UA_WriteResponse *
+UA_WriteResponse_new(void) {
+    return (UA_WriteResponse*)UA_new(&UA_TYPES[UA_TYPES_WRITERESPONSE]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_MonitoredItemCreateRequest_copy(const UA_MonitoredItemCreateRequest *src, UA_MonitoredItemCreateRequest *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_MONITOREDITEMCREATEREQUEST]);
+UA_WriteResponse_copy(const UA_WriteResponse *src, UA_WriteResponse *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_WRITERESPONSE]);
 }
 
 static UA_INLINE void
-UA_MonitoredItemCreateRequest_deleteMembers(UA_MonitoredItemCreateRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_MONITOREDITEMCREATEREQUEST]);
+UA_WriteResponse_deleteMembers(UA_WriteResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_WRITERESPONSE]);
 }
 
 static UA_INLINE void
-UA_MonitoredItemCreateRequest_clear(UA_MonitoredItemCreateRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_MONITOREDITEMCREATEREQUEST]);
+UA_WriteResponse_clear(UA_WriteResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_WRITERESPONSE]);
 }
 
 static UA_INLINE void
-UA_MonitoredItemCreateRequest_delete(UA_MonitoredItemCreateRequest *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_MONITOREDITEMCREATEREQUEST]);
+UA_WriteResponse_delete(UA_WriteResponse *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_WRITERESPONSE]);
 }
 
-/* ComplexNumberType */
+/* HistoryUpdateType */
 static UA_INLINE void
-UA_ComplexNumberType_init(UA_ComplexNumberType *p) {
-    memset(p, 0, sizeof(UA_ComplexNumberType));
+UA_HistoryUpdateType_init(UA_HistoryUpdateType *p) {
+    memset(p, 0, sizeof(UA_HistoryUpdateType));
 }
 
-static UA_INLINE UA_ComplexNumberType *
-UA_ComplexNumberType_new(void) {
-    return (UA_ComplexNumberType*)UA_new(&UA_TYPES[UA_TYPES_COMPLEXNUMBERTYPE]);
+static UA_INLINE UA_HistoryUpdateType *
+UA_HistoryUpdateType_new(void) {
+    return (UA_HistoryUpdateType*)UA_new(&UA_TYPES[UA_TYPES_HISTORYUPDATETYPE]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_ComplexNumberType_copy(const UA_ComplexNumberType *src, UA_ComplexNumberType *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_COMPLEXNUMBERTYPE]);
+UA_HistoryUpdateType_copy(const UA_HistoryUpdateType *src, UA_HistoryUpdateType *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_HISTORYUPDATETYPE]);
 }
 
 static UA_INLINE void
-UA_ComplexNumberType_deleteMembers(UA_ComplexNumberType *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_COMPLEXNUMBERTYPE]);
+UA_HistoryUpdateType_deleteMembers(UA_HistoryUpdateType *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_HISTORYUPDATETYPE]);
 }
 
 static UA_INLINE void
-UA_ComplexNumberType_clear(UA_ComplexNumberType *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_COMPLEXNUMBERTYPE]);
+UA_HistoryUpdateType_clear(UA_HistoryUpdateType *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_HISTORYUPDATETYPE]);
 }
 
 static UA_INLINE void
-UA_ComplexNumberType_delete(UA_ComplexNumberType *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_COMPLEXNUMBERTYPE]);
+UA_HistoryUpdateType_delete(UA_HistoryUpdateType *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_HISTORYUPDATETYPE]);
 }
 
-/* Range */
+/* PerformUpdateType */
 static UA_INLINE void
-UA_Range_init(UA_Range *p) {
-    memset(p, 0, sizeof(UA_Range));
+UA_PerformUpdateType_init(UA_PerformUpdateType *p) {
+    memset(p, 0, sizeof(UA_PerformUpdateType));
 }
 
-static UA_INLINE UA_Range *
-UA_Range_new(void) {
-    return (UA_Range*)UA_new(&UA_TYPES[UA_TYPES_RANGE]);
+static UA_INLINE UA_PerformUpdateType *
+UA_PerformUpdateType_new(void) {
+    return (UA_PerformUpdateType*)UA_new(&UA_TYPES[UA_TYPES_PERFORMUPDATETYPE]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_Range_copy(const UA_Range *src, UA_Range *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_RANGE]);
+UA_PerformUpdateType_copy(const UA_PerformUpdateType *src, UA_PerformUpdateType *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_PERFORMUPDATETYPE]);
 }
 
 static UA_INLINE void
-UA_Range_deleteMembers(UA_Range *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_RANGE]);
+UA_PerformUpdateType_deleteMembers(UA_PerformUpdateType *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_PERFORMUPDATETYPE]);
 }
 
 static UA_INLINE void
-UA_Range_clear(UA_Range *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_RANGE]);
+UA_PerformUpdateType_clear(UA_PerformUpdateType *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_PERFORMUPDATETYPE]);
 }
 
 static UA_INLINE void
-UA_Range_delete(UA_Range *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_RANGE]);
+UA_PerformUpdateType_delete(UA_PerformUpdateType *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_PERFORMUPDATETYPE]);
 }
 
-/* DataChangeNotification */
+/* UpdateDataDetails */
 static UA_INLINE void
-UA_DataChangeNotification_init(UA_DataChangeNotification *p) {
-    memset(p, 0, sizeof(UA_DataChangeNotification));
+UA_UpdateDataDetails_init(UA_UpdateDataDetails *p) {
+    memset(p, 0, sizeof(UA_UpdateDataDetails));
 }
 
-static UA_INLINE UA_DataChangeNotification *
-UA_DataChangeNotification_new(void) {
-    return (UA_DataChangeNotification*)UA_new(&UA_TYPES[UA_TYPES_DATACHANGENOTIFICATION]);
+static UA_INLINE UA_UpdateDataDetails *
+UA_UpdateDataDetails_new(void) {
+    return (UA_UpdateDataDetails*)UA_new(&UA_TYPES[UA_TYPES_UPDATEDATADETAILS]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_DataChangeNotification_copy(const UA_DataChangeNotification *src, UA_DataChangeNotification *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_DATACHANGENOTIFICATION]);
+UA_UpdateDataDetails_copy(const UA_UpdateDataDetails *src, UA_UpdateDataDetails *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_UPDATEDATADETAILS]);
 }
 
 static UA_INLINE void
-UA_DataChangeNotification_deleteMembers(UA_DataChangeNotification *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_DATACHANGENOTIFICATION]);
+UA_UpdateDataDetails_deleteMembers(UA_UpdateDataDetails *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_UPDATEDATADETAILS]);
 }
 
 static UA_INLINE void
-UA_DataChangeNotification_clear(UA_DataChangeNotification *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_DATACHANGENOTIFICATION]);
+UA_UpdateDataDetails_clear(UA_UpdateDataDetails *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_UPDATEDATADETAILS]);
 }
 
 static UA_INLINE void
-UA_DataChangeNotification_delete(UA_DataChangeNotification *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_DATACHANGENOTIFICATION]);
+UA_UpdateDataDetails_delete(UA_UpdateDataDetails *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_UPDATEDATADETAILS]);
 }
 
-/* Argument */
+/* DeleteRawModifiedDetails */
 static UA_INLINE void
-UA_Argument_init(UA_Argument *p) {
-    memset(p, 0, sizeof(UA_Argument));
+UA_DeleteRawModifiedDetails_init(UA_DeleteRawModifiedDetails *p) {
+    memset(p, 0, sizeof(UA_DeleteRawModifiedDetails));
 }
 
-static UA_INLINE UA_Argument *
-UA_Argument_new(void) {
-    return (UA_Argument*)UA_new(&UA_TYPES[UA_TYPES_ARGUMENT]);
+static UA_INLINE UA_DeleteRawModifiedDetails *
+UA_DeleteRawModifiedDetails_new(void) {
+    return (UA_DeleteRawModifiedDetails*)UA_new(&UA_TYPES[UA_TYPES_DELETERAWMODIFIEDDETAILS]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_Argument_copy(const UA_Argument *src, UA_Argument *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_ARGUMENT]);
+UA_DeleteRawModifiedDetails_copy(const UA_DeleteRawModifiedDetails *src, UA_DeleteRawModifiedDetails *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_DELETERAWMODIFIEDDETAILS]);
 }
 
 static UA_INLINE void
-UA_Argument_deleteMembers(UA_Argument *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_ARGUMENT]);
+UA_DeleteRawModifiedDetails_deleteMembers(UA_DeleteRawModifiedDetails *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_DELETERAWMODIFIEDDETAILS]);
 }
 
 static UA_INLINE void
-UA_Argument_clear(UA_Argument *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_ARGUMENT]);
+UA_DeleteRawModifiedDetails_clear(UA_DeleteRawModifiedDetails *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_DELETERAWMODIFIEDDETAILS]);
 }
 
 static UA_INLINE void
-UA_Argument_delete(UA_Argument *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_ARGUMENT]);
+UA_DeleteRawModifiedDetails_delete(UA_DeleteRawModifiedDetails *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_DELETERAWMODIFIEDDETAILS]);
 }
 
-/* ChannelSecurityToken */
+/* HistoryUpdateResult */
 static UA_INLINE void
-UA_ChannelSecurityToken_init(UA_ChannelSecurityToken *p) {
-    memset(p, 0, sizeof(UA_ChannelSecurityToken));
+UA_HistoryUpdateResult_init(UA_HistoryUpdateResult *p) {
+    memset(p, 0, sizeof(UA_HistoryUpdateResult));
 }
 
-static UA_INLINE UA_ChannelSecurityToken *
-UA_ChannelSecurityToken_new(void) {
-    return (UA_ChannelSecurityToken*)UA_new(&UA_TYPES[UA_TYPES_CHANNELSECURITYTOKEN]);
+static UA_INLINE UA_HistoryUpdateResult *
+UA_HistoryUpdateResult_new(void) {
+    return (UA_HistoryUpdateResult*)UA_new(&UA_TYPES[UA_TYPES_HISTORYUPDATERESULT]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_ChannelSecurityToken_copy(const UA_ChannelSecurityToken *src, UA_ChannelSecurityToken *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_CHANNELSECURITYTOKEN]);
+UA_HistoryUpdateResult_copy(const UA_HistoryUpdateResult *src, UA_HistoryUpdateResult *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_HISTORYUPDATERESULT]);
 }
 
 static UA_INLINE void
-UA_ChannelSecurityToken_deleteMembers(UA_ChannelSecurityToken *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_CHANNELSECURITYTOKEN]);
+UA_HistoryUpdateResult_deleteMembers(UA_HistoryUpdateResult *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_HISTORYUPDATERESULT]);
 }
 
 static UA_INLINE void
-UA_ChannelSecurityToken_clear(UA_ChannelSecurityToken *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_CHANNELSECURITYTOKEN]);
+UA_HistoryUpdateResult_clear(UA_HistoryUpdateResult *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_HISTORYUPDATERESULT]);
 }
 
 static UA_INLINE void
-UA_ChannelSecurityToken_delete(UA_ChannelSecurityToken *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_CHANNELSECURITYTOKEN]);
+UA_HistoryUpdateResult_delete(UA_HistoryUpdateResult *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_HISTORYUPDATERESULT]);
 }
 
-/* ServerState */
+/* HistoryUpdateRequest */
 static UA_INLINE void
-UA_ServerState_init(UA_ServerState *p) {
-    memset(p, 0, sizeof(UA_ServerState));
+UA_HistoryUpdateRequest_init(UA_HistoryUpdateRequest *p) {
+    memset(p, 0, sizeof(UA_HistoryUpdateRequest));
 }
 
-static UA_INLINE UA_ServerState *
-UA_ServerState_new(void) {
-    return (UA_ServerState*)UA_new(&UA_TYPES[UA_TYPES_SERVERSTATE]);
+static UA_INLINE UA_HistoryUpdateRequest *
+UA_HistoryUpdateRequest_new(void) {
+    return (UA_HistoryUpdateRequest*)UA_new(&UA_TYPES[UA_TYPES_HISTORYUPDATEREQUEST]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_ServerState_copy(const UA_ServerState *src, UA_ServerState *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_SERVERSTATE]);
+UA_HistoryUpdateRequest_copy(const UA_HistoryUpdateRequest *src, UA_HistoryUpdateRequest *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_HISTORYUPDATEREQUEST]);
 }
 
 static UA_INLINE void
-UA_ServerState_deleteMembers(UA_ServerState *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_SERVERSTATE]);
+UA_HistoryUpdateRequest_deleteMembers(UA_HistoryUpdateRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_HISTORYUPDATEREQUEST]);
 }
 
 static UA_INLINE void
-UA_ServerState_clear(UA_ServerState *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_SERVERSTATE]);
+UA_HistoryUpdateRequest_clear(UA_HistoryUpdateRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_HISTORYUPDATEREQUEST]);
 }
 
 static UA_INLINE void
-UA_ServerState_delete(UA_ServerState *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_SERVERSTATE]);
+UA_HistoryUpdateRequest_delete(UA_HistoryUpdateRequest *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_HISTORYUPDATEREQUEST]);
 }
 
-/* EventNotificationList */
+/* HistoryUpdateResponse */
 static UA_INLINE void
-UA_EventNotificationList_init(UA_EventNotificationList *p) {
-    memset(p, 0, sizeof(UA_EventNotificationList));
+UA_HistoryUpdateResponse_init(UA_HistoryUpdateResponse *p) {
+    memset(p, 0, sizeof(UA_HistoryUpdateResponse));
 }
 
-static UA_INLINE UA_EventNotificationList *
-UA_EventNotificationList_new(void) {
-    return (UA_EventNotificationList*)UA_new(&UA_TYPES[UA_TYPES_EVENTNOTIFICATIONLIST]);
+static UA_INLINE UA_HistoryUpdateResponse *
+UA_HistoryUpdateResponse_new(void) {
+    return (UA_HistoryUpdateResponse*)UA_new(&UA_TYPES[UA_TYPES_HISTORYUPDATERESPONSE]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_EventNotificationList_copy(const UA_EventNotificationList *src, UA_EventNotificationList *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_EVENTNOTIFICATIONLIST]);
+UA_HistoryUpdateResponse_copy(const UA_HistoryUpdateResponse *src, UA_HistoryUpdateResponse *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_HISTORYUPDATERESPONSE]);
 }
 
 static UA_INLINE void
-UA_EventNotificationList_deleteMembers(UA_EventNotificationList *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_EVENTNOTIFICATIONLIST]);
+UA_HistoryUpdateResponse_deleteMembers(UA_HistoryUpdateResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_HISTORYUPDATERESPONSE]);
 }
 
 static UA_INLINE void
-UA_EventNotificationList_clear(UA_EventNotificationList *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_EVENTNOTIFICATIONLIST]);
+UA_HistoryUpdateResponse_clear(UA_HistoryUpdateResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_HISTORYUPDATERESPONSE]);
 }
 
 static UA_INLINE void
-UA_EventNotificationList_delete(UA_EventNotificationList *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_EVENTNOTIFICATIONLIST]);
+UA_HistoryUpdateResponse_delete(UA_HistoryUpdateResponse *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_HISTORYUPDATERESPONSE]);
 }
 
-/* AnonymousIdentityToken */
+/* CallMethodRequest */
 static UA_INLINE void
-UA_AnonymousIdentityToken_init(UA_AnonymousIdentityToken *p) {
-    memset(p, 0, sizeof(UA_AnonymousIdentityToken));
+UA_CallMethodRequest_init(UA_CallMethodRequest *p) {
+    memset(p, 0, sizeof(UA_CallMethodRequest));
 }
 
-static UA_INLINE UA_AnonymousIdentityToken *
-UA_AnonymousIdentityToken_new(void) {
-    return (UA_AnonymousIdentityToken*)UA_new(&UA_TYPES[UA_TYPES_ANONYMOUSIDENTITYTOKEN]);
+static UA_INLINE UA_CallMethodRequest *
+UA_CallMethodRequest_new(void) {
+    return (UA_CallMethodRequest*)UA_new(&UA_TYPES[UA_TYPES_CALLMETHODREQUEST]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_AnonymousIdentityToken_copy(const UA_AnonymousIdentityToken *src, UA_AnonymousIdentityToken *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_ANONYMOUSIDENTITYTOKEN]);
+UA_CallMethodRequest_copy(const UA_CallMethodRequest *src, UA_CallMethodRequest *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_CALLMETHODREQUEST]);
 }
 
 static UA_INLINE void
-UA_AnonymousIdentityToken_deleteMembers(UA_AnonymousIdentityToken *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_ANONYMOUSIDENTITYTOKEN]);
+UA_CallMethodRequest_deleteMembers(UA_CallMethodRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_CALLMETHODREQUEST]);
 }
 
 static UA_INLINE void
-UA_AnonymousIdentityToken_clear(UA_AnonymousIdentityToken *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_ANONYMOUSIDENTITYTOKEN]);
+UA_CallMethodRequest_clear(UA_CallMethodRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_CALLMETHODREQUEST]);
 }
 
 static UA_INLINE void
-UA_AnonymousIdentityToken_delete(UA_AnonymousIdentityToken *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_ANONYMOUSIDENTITYTOKEN]);
+UA_CallMethodRequest_delete(UA_CallMethodRequest *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_CALLMETHODREQUEST]);
 }
 
-/* FilterOperator */
+/* CallMethodResult */
 static UA_INLINE void
-UA_FilterOperator_init(UA_FilterOperator *p) {
-    memset(p, 0, sizeof(UA_FilterOperator));
+UA_CallMethodResult_init(UA_CallMethodResult *p) {
+    memset(p, 0, sizeof(UA_CallMethodResult));
 }
 
-static UA_INLINE UA_FilterOperator *
-UA_FilterOperator_new(void) {
-    return (UA_FilterOperator*)UA_new(&UA_TYPES[UA_TYPES_FILTEROPERATOR]);
+static UA_INLINE UA_CallMethodResult *
+UA_CallMethodResult_new(void) {
+    return (UA_CallMethodResult*)UA_new(&UA_TYPES[UA_TYPES_CALLMETHODRESULT]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_FilterOperator_copy(const UA_FilterOperator *src, UA_FilterOperator *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_FILTEROPERATOR]);
+UA_CallMethodResult_copy(const UA_CallMethodResult *src, UA_CallMethodResult *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_CALLMETHODRESULT]);
 }
 
 static UA_INLINE void
-UA_FilterOperator_deleteMembers(UA_FilterOperator *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_FILTEROPERATOR]);
+UA_CallMethodResult_deleteMembers(UA_CallMethodResult *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_CALLMETHODRESULT]);
 }
 
 static UA_INLINE void
-UA_FilterOperator_clear(UA_FilterOperator *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_FILTEROPERATOR]);
+UA_CallMethodResult_clear(UA_CallMethodResult *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_CALLMETHODRESULT]);
 }
 
 static UA_INLINE void
-UA_FilterOperator_delete(UA_FilterOperator *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_FILTEROPERATOR]);
+UA_CallMethodResult_delete(UA_CallMethodResult *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_CALLMETHODRESULT]);
 }
 
-/* AggregateFilter */
+/* CallRequest */
 static UA_INLINE void
-UA_AggregateFilter_init(UA_AggregateFilter *p) {
-    memset(p, 0, sizeof(UA_AggregateFilter));
+UA_CallRequest_init(UA_CallRequest *p) {
+    memset(p, 0, sizeof(UA_CallRequest));
 }
 
-static UA_INLINE UA_AggregateFilter *
-UA_AggregateFilter_new(void) {
-    return (UA_AggregateFilter*)UA_new(&UA_TYPES[UA_TYPES_AGGREGATEFILTER]);
+static UA_INLINE UA_CallRequest *
+UA_CallRequest_new(void) {
+    return (UA_CallRequest*)UA_new(&UA_TYPES[UA_TYPES_CALLREQUEST]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_AggregateFilter_copy(const UA_AggregateFilter *src, UA_AggregateFilter *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_AGGREGATEFILTER]);
+UA_CallRequest_copy(const UA_CallRequest *src, UA_CallRequest *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_CALLREQUEST]);
 }
 
 static UA_INLINE void
-UA_AggregateFilter_deleteMembers(UA_AggregateFilter *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_AGGREGATEFILTER]);
+UA_CallRequest_deleteMembers(UA_CallRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_CALLREQUEST]);
 }
 
 static UA_INLINE void
-UA_AggregateFilter_clear(UA_AggregateFilter *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_AGGREGATEFILTER]);
+UA_CallRequest_clear(UA_CallRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_CALLREQUEST]);
 }
 
 static UA_INLINE void
-UA_AggregateFilter_delete(UA_AggregateFilter *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_AGGREGATEFILTER]);
+UA_CallRequest_delete(UA_CallRequest *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_CALLREQUEST]);
 }
 
-/* RepublishResponse */
+/* CallResponse */
 static UA_INLINE void
-UA_RepublishResponse_init(UA_RepublishResponse *p) {
-    memset(p, 0, sizeof(UA_RepublishResponse));
+UA_CallResponse_init(UA_CallResponse *p) {
+    memset(p, 0, sizeof(UA_CallResponse));
 }
 
-static UA_INLINE UA_RepublishResponse *
-UA_RepublishResponse_new(void) {
-    return (UA_RepublishResponse*)UA_new(&UA_TYPES[UA_TYPES_REPUBLISHRESPONSE]);
+static UA_INLINE UA_CallResponse *
+UA_CallResponse_new(void) {
+    return (UA_CallResponse*)UA_new(&UA_TYPES[UA_TYPES_CALLRESPONSE]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_RepublishResponse_copy(const UA_RepublishResponse *src, UA_RepublishResponse *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_REPUBLISHRESPONSE]);
+UA_CallResponse_copy(const UA_CallResponse *src, UA_CallResponse *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_CALLRESPONSE]);
 }
 
 static UA_INLINE void
-UA_RepublishResponse_deleteMembers(UA_RepublishResponse *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_REPUBLISHRESPONSE]);
+UA_CallResponse_deleteMembers(UA_CallResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_CALLRESPONSE]);
 }
 
 static UA_INLINE void
-UA_RepublishResponse_clear(UA_RepublishResponse *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_REPUBLISHRESPONSE]);
+UA_CallResponse_clear(UA_CallResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_CALLRESPONSE]);
 }
 
 static UA_INLINE void
-UA_RepublishResponse_delete(UA_RepublishResponse *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_REPUBLISHRESPONSE]);
+UA_CallResponse_delete(UA_CallResponse *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_CALLRESPONSE]);
 }
 
-/* DeleteSubscriptionsResponse */
+/* MonitoringMode */
 static UA_INLINE void
-UA_DeleteSubscriptionsResponse_init(UA_DeleteSubscriptionsResponse *p) {
-    memset(p, 0, sizeof(UA_DeleteSubscriptionsResponse));
+UA_MonitoringMode_init(UA_MonitoringMode *p) {
+    memset(p, 0, sizeof(UA_MonitoringMode));
 }
 
-static UA_INLINE UA_DeleteSubscriptionsResponse *
-UA_DeleteSubscriptionsResponse_new(void) {
-    return (UA_DeleteSubscriptionsResponse*)UA_new(&UA_TYPES[UA_TYPES_DELETESUBSCRIPTIONSRESPONSE]);
+static UA_INLINE UA_MonitoringMode *
+UA_MonitoringMode_new(void) {
+    return (UA_MonitoringMode*)UA_new(&UA_TYPES[UA_TYPES_MONITORINGMODE]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_DeleteSubscriptionsResponse_copy(const UA_DeleteSubscriptionsResponse *src, UA_DeleteSubscriptionsResponse *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_DELETESUBSCRIPTIONSRESPONSE]);
+UA_MonitoringMode_copy(const UA_MonitoringMode *src, UA_MonitoringMode *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_MONITORINGMODE]);
 }
 
 static UA_INLINE void
-UA_DeleteSubscriptionsResponse_deleteMembers(UA_DeleteSubscriptionsResponse *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_DELETESUBSCRIPTIONSRESPONSE]);
+UA_MonitoringMode_deleteMembers(UA_MonitoringMode *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_MONITORINGMODE]);
 }
 
 static UA_INLINE void
-UA_DeleteSubscriptionsResponse_clear(UA_DeleteSubscriptionsResponse *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_DELETESUBSCRIPTIONSRESPONSE]);
+UA_MonitoringMode_clear(UA_MonitoringMode *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_MONITORINGMODE]);
 }
 
 static UA_INLINE void
-UA_DeleteSubscriptionsResponse_delete(UA_DeleteSubscriptionsResponse *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_DELETESUBSCRIPTIONSRESPONSE]);
+UA_MonitoringMode_delete(UA_MonitoringMode *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_MONITORINGMODE]);
 }
 
-/* RegisterNodesRequest */
+/* DataChangeTrigger */
 static UA_INLINE void
-UA_RegisterNodesRequest_init(UA_RegisterNodesRequest *p) {
-    memset(p, 0, sizeof(UA_RegisterNodesRequest));
+UA_DataChangeTrigger_init(UA_DataChangeTrigger *p) {
+    memset(p, 0, sizeof(UA_DataChangeTrigger));
 }
 
-static UA_INLINE UA_RegisterNodesRequest *
-UA_RegisterNodesRequest_new(void) {
-    return (UA_RegisterNodesRequest*)UA_new(&UA_TYPES[UA_TYPES_REGISTERNODESREQUEST]);
+static UA_INLINE UA_DataChangeTrigger *
+UA_DataChangeTrigger_new(void) {
+    return (UA_DataChangeTrigger*)UA_new(&UA_TYPES[UA_TYPES_DATACHANGETRIGGER]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_RegisterNodesRequest_copy(const UA_RegisterNodesRequest *src, UA_RegisterNodesRequest *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_REGISTERNODESREQUEST]);
+UA_DataChangeTrigger_copy(const UA_DataChangeTrigger *src, UA_DataChangeTrigger *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_DATACHANGETRIGGER]);
 }
 
 static UA_INLINE void
-UA_RegisterNodesRequest_deleteMembers(UA_RegisterNodesRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_REGISTERNODESREQUEST]);
+UA_DataChangeTrigger_deleteMembers(UA_DataChangeTrigger *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_DATACHANGETRIGGER]);
 }
 
 static UA_INLINE void
-UA_RegisterNodesRequest_clear(UA_RegisterNodesRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_REGISTERNODESREQUEST]);
+UA_DataChangeTrigger_clear(UA_DataChangeTrigger *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_DATACHANGETRIGGER]);
 }
 
 static UA_INLINE void
-UA_RegisterNodesRequest_delete(UA_RegisterNodesRequest *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_REGISTERNODESREQUEST]);
+UA_DataChangeTrigger_delete(UA_DataChangeTrigger *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_DATACHANGETRIGGER]);
 }
 
-/* StructureDefinition */
+/* DeadbandType */
 static UA_INLINE void
-UA_StructureDefinition_init(UA_StructureDefinition *p) {
-    memset(p, 0, sizeof(UA_StructureDefinition));
+UA_DeadbandType_init(UA_DeadbandType *p) {
+    memset(p, 0, sizeof(UA_DeadbandType));
 }
 
-static UA_INLINE UA_StructureDefinition *
-UA_StructureDefinition_new(void) {
-    return (UA_StructureDefinition*)UA_new(&UA_TYPES[UA_TYPES_STRUCTUREDEFINITION]);
+static UA_INLINE UA_DeadbandType *
+UA_DeadbandType_new(void) {
+    return (UA_DeadbandType*)UA_new(&UA_TYPES[UA_TYPES_DEADBANDTYPE]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_StructureDefinition_copy(const UA_StructureDefinition *src, UA_StructureDefinition *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_STRUCTUREDEFINITION]);
+UA_DeadbandType_copy(const UA_DeadbandType *src, UA_DeadbandType *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_DEADBANDTYPE]);
 }
 
 static UA_INLINE void
-UA_StructureDefinition_deleteMembers(UA_StructureDefinition *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_STRUCTUREDEFINITION]);
+UA_DeadbandType_deleteMembers(UA_DeadbandType *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_DEADBANDTYPE]);
 }
 
 static UA_INLINE void
-UA_StructureDefinition_clear(UA_StructureDefinition *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_STRUCTUREDEFINITION]);
+UA_DeadbandType_clear(UA_DeadbandType *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_DEADBANDTYPE]);
 }
 
 static UA_INLINE void
-UA_StructureDefinition_delete(UA_StructureDefinition *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_STRUCTUREDEFINITION]);
+UA_DeadbandType_delete(UA_DeadbandType *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_DEADBANDTYPE]);
 }
 
-/* MethodAttributes */
+/* DataChangeFilter */
 static UA_INLINE void
-UA_MethodAttributes_init(UA_MethodAttributes *p) {
-    memset(p, 0, sizeof(UA_MethodAttributes));
+UA_DataChangeFilter_init(UA_DataChangeFilter *p) {
+    memset(p, 0, sizeof(UA_DataChangeFilter));
 }
 
-static UA_INLINE UA_MethodAttributes *
-UA_MethodAttributes_new(void) {
-    return (UA_MethodAttributes*)UA_new(&UA_TYPES[UA_TYPES_METHODATTRIBUTES]);
+static UA_INLINE UA_DataChangeFilter *
+UA_DataChangeFilter_new(void) {
+    return (UA_DataChangeFilter*)UA_new(&UA_TYPES[UA_TYPES_DATACHANGEFILTER]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_MethodAttributes_copy(const UA_MethodAttributes *src, UA_MethodAttributes *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_METHODATTRIBUTES]);
+UA_DataChangeFilter_copy(const UA_DataChangeFilter *src, UA_DataChangeFilter *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_DATACHANGEFILTER]);
 }
 
 static UA_INLINE void
-UA_MethodAttributes_deleteMembers(UA_MethodAttributes *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_METHODATTRIBUTES]);
+UA_DataChangeFilter_deleteMembers(UA_DataChangeFilter *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_DATACHANGEFILTER]);
 }
 
 static UA_INLINE void
-UA_MethodAttributes_clear(UA_MethodAttributes *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_METHODATTRIBUTES]);
+UA_DataChangeFilter_clear(UA_DataChangeFilter *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_DATACHANGEFILTER]);
 }
 
 static UA_INLINE void
-UA_MethodAttributes_delete(UA_MethodAttributes *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_METHODATTRIBUTES]);
+UA_DataChangeFilter_delete(UA_DataChangeFilter *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_DATACHANGEFILTER]);
 }
 
-/* UserNameIdentityToken */
+/* EventFilter */
 static UA_INLINE void
-UA_UserNameIdentityToken_init(UA_UserNameIdentityToken *p) {
-    memset(p, 0, sizeof(UA_UserNameIdentityToken));
+UA_EventFilter_init(UA_EventFilter *p) {
+    memset(p, 0, sizeof(UA_EventFilter));
 }
 
-static UA_INLINE UA_UserNameIdentityToken *
-UA_UserNameIdentityToken_new(void) {
-    return (UA_UserNameIdentityToken*)UA_new(&UA_TYPES[UA_TYPES_USERNAMEIDENTITYTOKEN]);
+static UA_INLINE UA_EventFilter *
+UA_EventFilter_new(void) {
+    return (UA_EventFilter*)UA_new(&UA_TYPES[UA_TYPES_EVENTFILTER]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_UserNameIdentityToken_copy(const UA_UserNameIdentityToken *src, UA_UserNameIdentityToken *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_USERNAMEIDENTITYTOKEN]);
+UA_EventFilter_copy(const UA_EventFilter *src, UA_EventFilter *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_EVENTFILTER]);
 }
 
 static UA_INLINE void
-UA_UserNameIdentityToken_deleteMembers(UA_UserNameIdentityToken *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_USERNAMEIDENTITYTOKEN]);
+UA_EventFilter_deleteMembers(UA_EventFilter *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_EVENTFILTER]);
 }
 
 static UA_INLINE void
-UA_UserNameIdentityToken_clear(UA_UserNameIdentityToken *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_USERNAMEIDENTITYTOKEN]);
+UA_EventFilter_clear(UA_EventFilter *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_EVENTFILTER]);
 }
 
 static UA_INLINE void
-UA_UserNameIdentityToken_delete(UA_UserNameIdentityToken *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_USERNAMEIDENTITYTOKEN]);
+UA_EventFilter_delete(UA_EventFilter *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_EVENTFILTER]);
 }
 
-/* TimeZoneDataType */
+/* AggregateConfiguration */
 static UA_INLINE void
-UA_TimeZoneDataType_init(UA_TimeZoneDataType *p) {
-    memset(p, 0, sizeof(UA_TimeZoneDataType));
+UA_AggregateConfiguration_init(UA_AggregateConfiguration *p) {
+    memset(p, 0, sizeof(UA_AggregateConfiguration));
 }
 
-static UA_INLINE UA_TimeZoneDataType *
-UA_TimeZoneDataType_new(void) {
-    return (UA_TimeZoneDataType*)UA_new(&UA_TYPES[UA_TYPES_TIMEZONEDATATYPE]);
+static UA_INLINE UA_AggregateConfiguration *
+UA_AggregateConfiguration_new(void) {
+    return (UA_AggregateConfiguration*)UA_new(&UA_TYPES[UA_TYPES_AGGREGATECONFIGURATION]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_TimeZoneDataType_copy(const UA_TimeZoneDataType *src, UA_TimeZoneDataType *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_TIMEZONEDATATYPE]);
+UA_AggregateConfiguration_copy(const UA_AggregateConfiguration *src, UA_AggregateConfiguration *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_AGGREGATECONFIGURATION]);
 }
 
 static UA_INLINE void
-UA_TimeZoneDataType_deleteMembers(UA_TimeZoneDataType *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_TIMEZONEDATATYPE]);
+UA_AggregateConfiguration_deleteMembers(UA_AggregateConfiguration *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_AGGREGATECONFIGURATION]);
 }
 
 static UA_INLINE void
-UA_TimeZoneDataType_clear(UA_TimeZoneDataType *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_TIMEZONEDATATYPE]);
+UA_AggregateConfiguration_clear(UA_AggregateConfiguration *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_AGGREGATECONFIGURATION]);
 }
 
 static UA_INLINE void
-UA_TimeZoneDataType_delete(UA_TimeZoneDataType *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_TIMEZONEDATATYPE]);
+UA_AggregateConfiguration_delete(UA_AggregateConfiguration *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_AGGREGATECONFIGURATION]);
 }
 
-/* UnregisterNodesRequest */
+/* AggregateFilter */
 static UA_INLINE void
-UA_UnregisterNodesRequest_init(UA_UnregisterNodesRequest *p) {
-    memset(p, 0, sizeof(UA_UnregisterNodesRequest));
+UA_AggregateFilter_init(UA_AggregateFilter *p) {
+    memset(p, 0, sizeof(UA_AggregateFilter));
 }
 
-static UA_INLINE UA_UnregisterNodesRequest *
-UA_UnregisterNodesRequest_new(void) {
-    return (UA_UnregisterNodesRequest*)UA_new(&UA_TYPES[UA_TYPES_UNREGISTERNODESREQUEST]);
+static UA_INLINE UA_AggregateFilter *
+UA_AggregateFilter_new(void) {
+    return (UA_AggregateFilter*)UA_new(&UA_TYPES[UA_TYPES_AGGREGATEFILTER]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_UnregisterNodesRequest_copy(const UA_UnregisterNodesRequest *src, UA_UnregisterNodesRequest *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_UNREGISTERNODESREQUEST]);
+UA_AggregateFilter_copy(const UA_AggregateFilter *src, UA_AggregateFilter *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_AGGREGATEFILTER]);
 }
 
 static UA_INLINE void
-UA_UnregisterNodesRequest_deleteMembers(UA_UnregisterNodesRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_UNREGISTERNODESREQUEST]);
+UA_AggregateFilter_deleteMembers(UA_AggregateFilter *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_AGGREGATEFILTER]);
 }
 
 static UA_INLINE void
-UA_UnregisterNodesRequest_clear(UA_UnregisterNodesRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_UNREGISTERNODESREQUEST]);
+UA_AggregateFilter_clear(UA_AggregateFilter *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_AGGREGATEFILTER]);
 }
 
 static UA_INLINE void
-UA_UnregisterNodesRequest_delete(UA_UnregisterNodesRequest *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_UNREGISTERNODESREQUEST]);
+UA_AggregateFilter_delete(UA_AggregateFilter *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_AGGREGATEFILTER]);
 }
 
-/* OpenSecureChannelResponse */
+/* EventFilterResult */
 static UA_INLINE void
-UA_OpenSecureChannelResponse_init(UA_OpenSecureChannelResponse *p) {
-    memset(p, 0, sizeof(UA_OpenSecureChannelResponse));
+UA_EventFilterResult_init(UA_EventFilterResult *p) {
+    memset(p, 0, sizeof(UA_EventFilterResult));
 }
 
-static UA_INLINE UA_OpenSecureChannelResponse *
-UA_OpenSecureChannelResponse_new(void) {
-    return (UA_OpenSecureChannelResponse*)UA_new(&UA_TYPES[UA_TYPES_OPENSECURECHANNELRESPONSE]);
+static UA_INLINE UA_EventFilterResult *
+UA_EventFilterResult_new(void) {
+    return (UA_EventFilterResult*)UA_new(&UA_TYPES[UA_TYPES_EVENTFILTERRESULT]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_OpenSecureChannelResponse_copy(const UA_OpenSecureChannelResponse *src, UA_OpenSecureChannelResponse *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_OPENSECURECHANNELRESPONSE]);
+UA_EventFilterResult_copy(const UA_EventFilterResult *src, UA_EventFilterResult *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_EVENTFILTERRESULT]);
 }
 
 static UA_INLINE void
-UA_OpenSecureChannelResponse_deleteMembers(UA_OpenSecureChannelResponse *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_OPENSECURECHANNELRESPONSE]);
+UA_EventFilterResult_deleteMembers(UA_EventFilterResult *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_EVENTFILTERRESULT]);
 }
 
 static UA_INLINE void
-UA_OpenSecureChannelResponse_clear(UA_OpenSecureChannelResponse *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_OPENSECURECHANNELRESPONSE]);
+UA_EventFilterResult_clear(UA_EventFilterResult *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_EVENTFILTERRESULT]);
 }
 
 static UA_INLINE void
-UA_OpenSecureChannelResponse_delete(UA_OpenSecureChannelResponse *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_OPENSECURECHANNELRESPONSE]);
+UA_EventFilterResult_delete(UA_EventFilterResult *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_EVENTFILTERRESULT]);
 }
 
-/* SetTriggeringResponse */
+/* MonitoringParameters */
 static UA_INLINE void
-UA_SetTriggeringResponse_init(UA_SetTriggeringResponse *p) {
-    memset(p, 0, sizeof(UA_SetTriggeringResponse));
+UA_MonitoringParameters_init(UA_MonitoringParameters *p) {
+    memset(p, 0, sizeof(UA_MonitoringParameters));
 }
 
-static UA_INLINE UA_SetTriggeringResponse *
-UA_SetTriggeringResponse_new(void) {
-    return (UA_SetTriggeringResponse*)UA_new(&UA_TYPES[UA_TYPES_SETTRIGGERINGRESPONSE]);
+static UA_INLINE UA_MonitoringParameters *
+UA_MonitoringParameters_new(void) {
+    return (UA_MonitoringParameters*)UA_new(&UA_TYPES[UA_TYPES_MONITORINGPARAMETERS]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_SetTriggeringResponse_copy(const UA_SetTriggeringResponse *src, UA_SetTriggeringResponse *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_SETTRIGGERINGRESPONSE]);
+UA_MonitoringParameters_copy(const UA_MonitoringParameters *src, UA_MonitoringParameters *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_MONITORINGPARAMETERS]);
 }
 
 static UA_INLINE void
-UA_SetTriggeringResponse_deleteMembers(UA_SetTriggeringResponse *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_SETTRIGGERINGRESPONSE]);
+UA_MonitoringParameters_deleteMembers(UA_MonitoringParameters *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_MONITORINGPARAMETERS]);
 }
 
 static UA_INLINE void
-UA_SetTriggeringResponse_clear(UA_SetTriggeringResponse *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_SETTRIGGERINGRESPONSE]);
+UA_MonitoringParameters_clear(UA_MonitoringParameters *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_MONITORINGPARAMETERS]);
 }
 
 static UA_INLINE void
-UA_SetTriggeringResponse_delete(UA_SetTriggeringResponse *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_SETTRIGGERINGRESPONSE]);
+UA_MonitoringParameters_delete(UA_MonitoringParameters *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_MONITORINGPARAMETERS]);
 }
 
-/* SimpleAttributeOperand */
+/* MonitoredItemCreateRequest */
 static UA_INLINE void
-UA_SimpleAttributeOperand_init(UA_SimpleAttributeOperand *p) {
-    memset(p, 0, sizeof(UA_SimpleAttributeOperand));
+UA_MonitoredItemCreateRequest_init(UA_MonitoredItemCreateRequest *p) {
+    memset(p, 0, sizeof(UA_MonitoredItemCreateRequest));
 }
 
-static UA_INLINE UA_SimpleAttributeOperand *
-UA_SimpleAttributeOperand_new(void) {
-    return (UA_SimpleAttributeOperand*)UA_new(&UA_TYPES[UA_TYPES_SIMPLEATTRIBUTEOPERAND]);
+static UA_INLINE UA_MonitoredItemCreateRequest *
+UA_MonitoredItemCreateRequest_new(void) {
+    return (UA_MonitoredItemCreateRequest*)UA_new(&UA_TYPES[UA_TYPES_MONITOREDITEMCREATEREQUEST]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_SimpleAttributeOperand_copy(const UA_SimpleAttributeOperand *src, UA_SimpleAttributeOperand *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_SIMPLEATTRIBUTEOPERAND]);
+UA_MonitoredItemCreateRequest_copy(const UA_MonitoredItemCreateRequest *src, UA_MonitoredItemCreateRequest *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_MONITOREDITEMCREATEREQUEST]);
 }
 
 static UA_INLINE void
-UA_SimpleAttributeOperand_deleteMembers(UA_SimpleAttributeOperand *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_SIMPLEATTRIBUTEOPERAND]);
+UA_MonitoredItemCreateRequest_deleteMembers(UA_MonitoredItemCreateRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_MONITOREDITEMCREATEREQUEST]);
 }
 
 static UA_INLINE void
-UA_SimpleAttributeOperand_clear(UA_SimpleAttributeOperand *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_SIMPLEATTRIBUTEOPERAND]);
+UA_MonitoredItemCreateRequest_clear(UA_MonitoredItemCreateRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_MONITOREDITEMCREATEREQUEST]);
 }
 
 static UA_INLINE void
-UA_SimpleAttributeOperand_delete(UA_SimpleAttributeOperand *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_SIMPLEATTRIBUTEOPERAND]);
+UA_MonitoredItemCreateRequest_delete(UA_MonitoredItemCreateRequest *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_MONITOREDITEMCREATEREQUEST]);
 }
 
-/* RepublishRequest */
+/* MonitoredItemCreateResult */
 static UA_INLINE void
-UA_RepublishRequest_init(UA_RepublishRequest *p) {
-    memset(p, 0, sizeof(UA_RepublishRequest));
+UA_MonitoredItemCreateResult_init(UA_MonitoredItemCreateResult *p) {
+    memset(p, 0, sizeof(UA_MonitoredItemCreateResult));
 }
 
-static UA_INLINE UA_RepublishRequest *
-UA_RepublishRequest_new(void) {
-    return (UA_RepublishRequest*)UA_new(&UA_TYPES[UA_TYPES_REPUBLISHREQUEST]);
+static UA_INLINE UA_MonitoredItemCreateResult *
+UA_MonitoredItemCreateResult_new(void) {
+    return (UA_MonitoredItemCreateResult*)UA_new(&UA_TYPES[UA_TYPES_MONITOREDITEMCREATERESULT]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_RepublishRequest_copy(const UA_RepublishRequest *src, UA_RepublishRequest *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_REPUBLISHREQUEST]);
+UA_MonitoredItemCreateResult_copy(const UA_MonitoredItemCreateResult *src, UA_MonitoredItemCreateResult *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_MONITOREDITEMCREATERESULT]);
 }
 
 static UA_INLINE void
-UA_RepublishRequest_deleteMembers(UA_RepublishRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_REPUBLISHREQUEST]);
+UA_MonitoredItemCreateResult_deleteMembers(UA_MonitoredItemCreateResult *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_MONITOREDITEMCREATERESULT]);
 }
 
 static UA_INLINE void
-UA_RepublishRequest_clear(UA_RepublishRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_REPUBLISHREQUEST]);
+UA_MonitoredItemCreateResult_clear(UA_MonitoredItemCreateResult *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_MONITOREDITEMCREATERESULT]);
 }
 
 static UA_INLINE void
-UA_RepublishRequest_delete(UA_RepublishRequest *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_REPUBLISHREQUEST]);
+UA_MonitoredItemCreateResult_delete(UA_MonitoredItemCreateResult *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_MONITOREDITEMCREATERESULT]);
 }
 
-/* RegisterNodesResponse */
+/* CreateMonitoredItemsRequest */
 static UA_INLINE void
-UA_RegisterNodesResponse_init(UA_RegisterNodesResponse *p) {
-    memset(p, 0, sizeof(UA_RegisterNodesResponse));
+UA_CreateMonitoredItemsRequest_init(UA_CreateMonitoredItemsRequest *p) {
+    memset(p, 0, sizeof(UA_CreateMonitoredItemsRequest));
 }
 
-static UA_INLINE UA_RegisterNodesResponse *
-UA_RegisterNodesResponse_new(void) {
-    return (UA_RegisterNodesResponse*)UA_new(&UA_TYPES[UA_TYPES_REGISTERNODESRESPONSE]);
+static UA_INLINE UA_CreateMonitoredItemsRequest *
+UA_CreateMonitoredItemsRequest_new(void) {
+    return (UA_CreateMonitoredItemsRequest*)UA_new(&UA_TYPES[UA_TYPES_CREATEMONITOREDITEMSREQUEST]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_RegisterNodesResponse_copy(const UA_RegisterNodesResponse *src, UA_RegisterNodesResponse *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_REGISTERNODESRESPONSE]);
+UA_CreateMonitoredItemsRequest_copy(const UA_CreateMonitoredItemsRequest *src, UA_CreateMonitoredItemsRequest *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_CREATEMONITOREDITEMSREQUEST]);
 }
 
 static UA_INLINE void
-UA_RegisterNodesResponse_deleteMembers(UA_RegisterNodesResponse *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_REGISTERNODESRESPONSE]);
+UA_CreateMonitoredItemsRequest_deleteMembers(UA_CreateMonitoredItemsRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_CREATEMONITOREDITEMSREQUEST]);
 }
 
 static UA_INLINE void
-UA_RegisterNodesResponse_clear(UA_RegisterNodesResponse *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_REGISTERNODESRESPONSE]);
+UA_CreateMonitoredItemsRequest_clear(UA_CreateMonitoredItemsRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_CREATEMONITOREDITEMSREQUEST]);
 }
 
 static UA_INLINE void
-UA_RegisterNodesResponse_delete(UA_RegisterNodesResponse *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_REGISTERNODESRESPONSE]);
+UA_CreateMonitoredItemsRequest_delete(UA_CreateMonitoredItemsRequest *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_CREATEMONITOREDITEMSREQUEST]);
 }
 
-/* ModifyMonitoredItemsResponse */
+/* CreateMonitoredItemsResponse */
 static UA_INLINE void
-UA_ModifyMonitoredItemsResponse_init(UA_ModifyMonitoredItemsResponse *p) {
-    memset(p, 0, sizeof(UA_ModifyMonitoredItemsResponse));
+UA_CreateMonitoredItemsResponse_init(UA_CreateMonitoredItemsResponse *p) {
+    memset(p, 0, sizeof(UA_CreateMonitoredItemsResponse));
 }
 
-static UA_INLINE UA_ModifyMonitoredItemsResponse *
-UA_ModifyMonitoredItemsResponse_new(void) {
-    return (UA_ModifyMonitoredItemsResponse*)UA_new(&UA_TYPES[UA_TYPES_MODIFYMONITOREDITEMSRESPONSE]);
+static UA_INLINE UA_CreateMonitoredItemsResponse *
+UA_CreateMonitoredItemsResponse_new(void) {
+    return (UA_CreateMonitoredItemsResponse*)UA_new(&UA_TYPES[UA_TYPES_CREATEMONITOREDITEMSRESPONSE]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_ModifyMonitoredItemsResponse_copy(const UA_ModifyMonitoredItemsResponse *src, UA_ModifyMonitoredItemsResponse *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_MODIFYMONITOREDITEMSRESPONSE]);
+UA_CreateMonitoredItemsResponse_copy(const UA_CreateMonitoredItemsResponse *src, UA_CreateMonitoredItemsResponse *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_CREATEMONITOREDITEMSRESPONSE]);
 }
 
 static UA_INLINE void
-UA_ModifyMonitoredItemsResponse_deleteMembers(UA_ModifyMonitoredItemsResponse *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_MODIFYMONITOREDITEMSRESPONSE]);
+UA_CreateMonitoredItemsResponse_deleteMembers(UA_CreateMonitoredItemsResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_CREATEMONITOREDITEMSRESPONSE]);
 }
 
 static UA_INLINE void
-UA_ModifyMonitoredItemsResponse_clear(UA_ModifyMonitoredItemsResponse *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_MODIFYMONITOREDITEMSRESPONSE]);
+UA_CreateMonitoredItemsResponse_clear(UA_CreateMonitoredItemsResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_CREATEMONITOREDITEMSRESPONSE]);
 }
 
 static UA_INLINE void
-UA_ModifyMonitoredItemsResponse_delete(UA_ModifyMonitoredItemsResponse *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_MODIFYMONITOREDITEMSRESPONSE]);
+UA_CreateMonitoredItemsResponse_delete(UA_CreateMonitoredItemsResponse *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_CREATEMONITOREDITEMSRESPONSE]);
 }
 
-/* DeleteSubscriptionsRequest */
+/* MonitoredItemModifyRequest */
 static UA_INLINE void
-UA_DeleteSubscriptionsRequest_init(UA_DeleteSubscriptionsRequest *p) {
-    memset(p, 0, sizeof(UA_DeleteSubscriptionsRequest));
+UA_MonitoredItemModifyRequest_init(UA_MonitoredItemModifyRequest *p) {
+    memset(p, 0, sizeof(UA_MonitoredItemModifyRequest));
 }
 
-static UA_INLINE UA_DeleteSubscriptionsRequest *
-UA_DeleteSubscriptionsRequest_new(void) {
-    return (UA_DeleteSubscriptionsRequest*)UA_new(&UA_TYPES[UA_TYPES_DELETESUBSCRIPTIONSREQUEST]);
+static UA_INLINE UA_MonitoredItemModifyRequest *
+UA_MonitoredItemModifyRequest_new(void) {
+    return (UA_MonitoredItemModifyRequest*)UA_new(&UA_TYPES[UA_TYPES_MONITOREDITEMMODIFYREQUEST]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_DeleteSubscriptionsRequest_copy(const UA_DeleteSubscriptionsRequest *src, UA_DeleteSubscriptionsRequest *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_DELETESUBSCRIPTIONSREQUEST]);
+UA_MonitoredItemModifyRequest_copy(const UA_MonitoredItemModifyRequest *src, UA_MonitoredItemModifyRequest *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_MONITOREDITEMMODIFYREQUEST]);
 }
 
 static UA_INLINE void
-UA_DeleteSubscriptionsRequest_deleteMembers(UA_DeleteSubscriptionsRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_DELETESUBSCRIPTIONSREQUEST]);
+UA_MonitoredItemModifyRequest_deleteMembers(UA_MonitoredItemModifyRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_MONITOREDITEMMODIFYREQUEST]);
 }
 
 static UA_INLINE void
-UA_DeleteSubscriptionsRequest_clear(UA_DeleteSubscriptionsRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_DELETESUBSCRIPTIONSREQUEST]);
+UA_MonitoredItemModifyRequest_clear(UA_MonitoredItemModifyRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_MONITOREDITEMMODIFYREQUEST]);
 }
 
 static UA_INLINE void
-UA_DeleteSubscriptionsRequest_delete(UA_DeleteSubscriptionsRequest *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_DELETESUBSCRIPTIONSREQUEST]);
+UA_MonitoredItemModifyRequest_delete(UA_MonitoredItemModifyRequest *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_MONITOREDITEMMODIFYREQUEST]);
 }
 
-/* RedundancySupport */
+/* MonitoredItemModifyResult */
 static UA_INLINE void
-UA_RedundancySupport_init(UA_RedundancySupport *p) {
-    memset(p, 0, sizeof(UA_RedundancySupport));
+UA_MonitoredItemModifyResult_init(UA_MonitoredItemModifyResult *p) {
+    memset(p, 0, sizeof(UA_MonitoredItemModifyResult));
 }
 
-static UA_INLINE UA_RedundancySupport *
-UA_RedundancySupport_new(void) {
-    return (UA_RedundancySupport*)UA_new(&UA_TYPES[UA_TYPES_REDUNDANCYSUPPORT]);
+static UA_INLINE UA_MonitoredItemModifyResult *
+UA_MonitoredItemModifyResult_new(void) {
+    return (UA_MonitoredItemModifyResult*)UA_new(&UA_TYPES[UA_TYPES_MONITOREDITEMMODIFYRESULT]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_RedundancySupport_copy(const UA_RedundancySupport *src, UA_RedundancySupport *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_REDUNDANCYSUPPORT]);
+UA_MonitoredItemModifyResult_copy(const UA_MonitoredItemModifyResult *src, UA_MonitoredItemModifyResult *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_MONITOREDITEMMODIFYRESULT]);
 }
 
 static UA_INLINE void
-UA_RedundancySupport_deleteMembers(UA_RedundancySupport *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_REDUNDANCYSUPPORT]);
+UA_MonitoredItemModifyResult_deleteMembers(UA_MonitoredItemModifyResult *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_MONITOREDITEMMODIFYRESULT]);
 }
 
 static UA_INLINE void
-UA_RedundancySupport_clear(UA_RedundancySupport *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_REDUNDANCYSUPPORT]);
+UA_MonitoredItemModifyResult_clear(UA_MonitoredItemModifyResult *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_MONITOREDITEMMODIFYRESULT]);
 }
 
 static UA_INLINE void
-UA_RedundancySupport_delete(UA_RedundancySupport *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_REDUNDANCYSUPPORT]);
+UA_MonitoredItemModifyResult_delete(UA_MonitoredItemModifyResult *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_MONITOREDITEMMODIFYRESULT]);
 }
 
-/* BrowsePath */
+/* ModifyMonitoredItemsRequest */
 static UA_INLINE void
-UA_BrowsePath_init(UA_BrowsePath *p) {
-    memset(p, 0, sizeof(UA_BrowsePath));
+UA_ModifyMonitoredItemsRequest_init(UA_ModifyMonitoredItemsRequest *p) {
+    memset(p, 0, sizeof(UA_ModifyMonitoredItemsRequest));
 }
 
-static UA_INLINE UA_BrowsePath *
-UA_BrowsePath_new(void) {
-    return (UA_BrowsePath*)UA_new(&UA_TYPES[UA_TYPES_BROWSEPATH]);
+static UA_INLINE UA_ModifyMonitoredItemsRequest *
+UA_ModifyMonitoredItemsRequest_new(void) {
+    return (UA_ModifyMonitoredItemsRequest*)UA_new(&UA_TYPES[UA_TYPES_MODIFYMONITOREDITEMSREQUEST]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_BrowsePath_copy(const UA_BrowsePath *src, UA_BrowsePath *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_BROWSEPATH]);
+UA_ModifyMonitoredItemsRequest_copy(const UA_ModifyMonitoredItemsRequest *src, UA_ModifyMonitoredItemsRequest *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_MODIFYMONITOREDITEMSREQUEST]);
 }
 
 static UA_INLINE void
-UA_BrowsePath_deleteMembers(UA_BrowsePath *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_BROWSEPATH]);
+UA_ModifyMonitoredItemsRequest_deleteMembers(UA_ModifyMonitoredItemsRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_MODIFYMONITOREDITEMSREQUEST]);
 }
 
 static UA_INLINE void
-UA_BrowsePath_clear(UA_BrowsePath *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_BROWSEPATH]);
+UA_ModifyMonitoredItemsRequest_clear(UA_ModifyMonitoredItemsRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_MODIFYMONITOREDITEMSREQUEST]);
 }
 
 static UA_INLINE void
-UA_BrowsePath_delete(UA_BrowsePath *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_BROWSEPATH]);
+UA_ModifyMonitoredItemsRequest_delete(UA_ModifyMonitoredItemsRequest *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_MODIFYMONITOREDITEMSREQUEST]);
 }
 
-/* ObjectAttributes */
+/* ModifyMonitoredItemsResponse */
 static UA_INLINE void
-UA_ObjectAttributes_init(UA_ObjectAttributes *p) {
-    memset(p, 0, sizeof(UA_ObjectAttributes));
+UA_ModifyMonitoredItemsResponse_init(UA_ModifyMonitoredItemsResponse *p) {
+    memset(p, 0, sizeof(UA_ModifyMonitoredItemsResponse));
 }
 
-static UA_INLINE UA_ObjectAttributes *
-UA_ObjectAttributes_new(void) {
-    return (UA_ObjectAttributes*)UA_new(&UA_TYPES[UA_TYPES_OBJECTATTRIBUTES]);
+static UA_INLINE UA_ModifyMonitoredItemsResponse *
+UA_ModifyMonitoredItemsResponse_new(void) {
+    return (UA_ModifyMonitoredItemsResponse*)UA_new(&UA_TYPES[UA_TYPES_MODIFYMONITOREDITEMSRESPONSE]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_ObjectAttributes_copy(const UA_ObjectAttributes *src, UA_ObjectAttributes *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES]);
+UA_ModifyMonitoredItemsResponse_copy(const UA_ModifyMonitoredItemsResponse *src, UA_ModifyMonitoredItemsResponse *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_MODIFYMONITOREDITEMSRESPONSE]);
 }
 
 static UA_INLINE void
-UA_ObjectAttributes_deleteMembers(UA_ObjectAttributes *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES]);
+UA_ModifyMonitoredItemsResponse_deleteMembers(UA_ModifyMonitoredItemsResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_MODIFYMONITOREDITEMSRESPONSE]);
 }
 
 static UA_INLINE void
-UA_ObjectAttributes_clear(UA_ObjectAttributes *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES]);
+UA_ModifyMonitoredItemsResponse_clear(UA_ModifyMonitoredItemsResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_MODIFYMONITOREDITEMSRESPONSE]);
 }
 
 static UA_INLINE void
-UA_ObjectAttributes_delete(UA_ObjectAttributes *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_OBJECTATTRIBUTES]);
+UA_ModifyMonitoredItemsResponse_delete(UA_ModifyMonitoredItemsResponse *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_MODIFYMONITOREDITEMSRESPONSE]);
 }
 
-/* PublishRequest */
+/* SetMonitoringModeRequest */
 static UA_INLINE void
-UA_PublishRequest_init(UA_PublishRequest *p) {
-    memset(p, 0, sizeof(UA_PublishRequest));
+UA_SetMonitoringModeRequest_init(UA_SetMonitoringModeRequest *p) {
+    memset(p, 0, sizeof(UA_SetMonitoringModeRequest));
 }
 
-static UA_INLINE UA_PublishRequest *
-UA_PublishRequest_new(void) {
-    return (UA_PublishRequest*)UA_new(&UA_TYPES[UA_TYPES_PUBLISHREQUEST]);
+static UA_INLINE UA_SetMonitoringModeRequest *
+UA_SetMonitoringModeRequest_new(void) {
+    return (UA_SetMonitoringModeRequest*)UA_new(&UA_TYPES[UA_TYPES_SETMONITORINGMODEREQUEST]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_PublishRequest_copy(const UA_PublishRequest *src, UA_PublishRequest *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_PUBLISHREQUEST]);
+UA_SetMonitoringModeRequest_copy(const UA_SetMonitoringModeRequest *src, UA_SetMonitoringModeRequest *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_SETMONITORINGMODEREQUEST]);
 }
 
 static UA_INLINE void
-UA_PublishRequest_deleteMembers(UA_PublishRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_PUBLISHREQUEST]);
+UA_SetMonitoringModeRequest_deleteMembers(UA_SetMonitoringModeRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_SETMONITORINGMODEREQUEST]);
 }
 
 static UA_INLINE void
-UA_PublishRequest_clear(UA_PublishRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_PUBLISHREQUEST]);
+UA_SetMonitoringModeRequest_clear(UA_SetMonitoringModeRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_SETMONITORINGMODEREQUEST]);
 }
 
 static UA_INLINE void
-UA_PublishRequest_delete(UA_PublishRequest *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_PUBLISHREQUEST]);
+UA_SetMonitoringModeRequest_delete(UA_SetMonitoringModeRequest *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_SETMONITORINGMODEREQUEST]);
 }
 
-/* FindServersRequest */
+/* SetMonitoringModeResponse */
 static UA_INLINE void
-UA_FindServersRequest_init(UA_FindServersRequest *p) {
-    memset(p, 0, sizeof(UA_FindServersRequest));
+UA_SetMonitoringModeResponse_init(UA_SetMonitoringModeResponse *p) {
+    memset(p, 0, sizeof(UA_SetMonitoringModeResponse));
 }
 
-static UA_INLINE UA_FindServersRequest *
-UA_FindServersRequest_new(void) {
-    return (UA_FindServersRequest*)UA_new(&UA_TYPES[UA_TYPES_FINDSERVERSREQUEST]);
+static UA_INLINE UA_SetMonitoringModeResponse *
+UA_SetMonitoringModeResponse_new(void) {
+    return (UA_SetMonitoringModeResponse*)UA_new(&UA_TYPES[UA_TYPES_SETMONITORINGMODERESPONSE]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_FindServersRequest_copy(const UA_FindServersRequest *src, UA_FindServersRequest *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_FINDSERVERSREQUEST]);
+UA_SetMonitoringModeResponse_copy(const UA_SetMonitoringModeResponse *src, UA_SetMonitoringModeResponse *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_SETMONITORINGMODERESPONSE]);
 }
 
 static UA_INLINE void
-UA_FindServersRequest_deleteMembers(UA_FindServersRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_FINDSERVERSREQUEST]);
+UA_SetMonitoringModeResponse_deleteMembers(UA_SetMonitoringModeResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_SETMONITORINGMODERESPONSE]);
 }
 
 static UA_INLINE void
-UA_FindServersRequest_clear(UA_FindServersRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_FINDSERVERSREQUEST]);
+UA_SetMonitoringModeResponse_clear(UA_SetMonitoringModeResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_SETMONITORINGMODERESPONSE]);
 }
 
 static UA_INLINE void
-UA_FindServersRequest_delete(UA_FindServersRequest *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_FINDSERVERSREQUEST]);
+UA_SetMonitoringModeResponse_delete(UA_SetMonitoringModeResponse *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_SETMONITORINGMODERESPONSE]);
 }
 
-/* ReferenceDescription */
+/* SetTriggeringRequest */
 static UA_INLINE void
-UA_ReferenceDescription_init(UA_ReferenceDescription *p) {
-    memset(p, 0, sizeof(UA_ReferenceDescription));
+UA_SetTriggeringRequest_init(UA_SetTriggeringRequest *p) {
+    memset(p, 0, sizeof(UA_SetTriggeringRequest));
 }
 
-static UA_INLINE UA_ReferenceDescription *
-UA_ReferenceDescription_new(void) {
-    return (UA_ReferenceDescription*)UA_new(&UA_TYPES[UA_TYPES_REFERENCEDESCRIPTION]);
+static UA_INLINE UA_SetTriggeringRequest *
+UA_SetTriggeringRequest_new(void) {
+    return (UA_SetTriggeringRequest*)UA_new(&UA_TYPES[UA_TYPES_SETTRIGGERINGREQUEST]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_ReferenceDescription_copy(const UA_ReferenceDescription *src, UA_ReferenceDescription *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_REFERENCEDESCRIPTION]);
+UA_SetTriggeringRequest_copy(const UA_SetTriggeringRequest *src, UA_SetTriggeringRequest *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_SETTRIGGERINGREQUEST]);
 }
 
 static UA_INLINE void
-UA_ReferenceDescription_deleteMembers(UA_ReferenceDescription *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_REFERENCEDESCRIPTION]);
+UA_SetTriggeringRequest_deleteMembers(UA_SetTriggeringRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_SETTRIGGERINGREQUEST]);
 }
 
 static UA_INLINE void
-UA_ReferenceDescription_clear(UA_ReferenceDescription *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_REFERENCEDESCRIPTION]);
+UA_SetTriggeringRequest_clear(UA_SetTriggeringRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_SETTRIGGERINGREQUEST]);
 }
 
 static UA_INLINE void
-UA_ReferenceDescription_delete(UA_ReferenceDescription *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_REFERENCEDESCRIPTION]);
+UA_SetTriggeringRequest_delete(UA_SetTriggeringRequest *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_SETTRIGGERINGREQUEST]);
+}
+
+/* SetTriggeringResponse */
+static UA_INLINE void
+UA_SetTriggeringResponse_init(UA_SetTriggeringResponse *p) {
+    memset(p, 0, sizeof(UA_SetTriggeringResponse));
+}
+
+static UA_INLINE UA_SetTriggeringResponse *
+UA_SetTriggeringResponse_new(void) {
+    return (UA_SetTriggeringResponse*)UA_new(&UA_TYPES[UA_TYPES_SETTRIGGERINGRESPONSE]);
+}
+
+static UA_INLINE UA_StatusCode
+UA_SetTriggeringResponse_copy(const UA_SetTriggeringResponse *src, UA_SetTriggeringResponse *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_SETTRIGGERINGRESPONSE]);
+}
+
+static UA_INLINE void
+UA_SetTriggeringResponse_deleteMembers(UA_SetTriggeringResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_SETTRIGGERINGRESPONSE]);
+}
+
+static UA_INLINE void
+UA_SetTriggeringResponse_clear(UA_SetTriggeringResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_SETTRIGGERINGRESPONSE]);
+}
+
+static UA_INLINE void
+UA_SetTriggeringResponse_delete(UA_SetTriggeringResponse *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_SETTRIGGERINGRESPONSE]);
+}
+
+/* DeleteMonitoredItemsRequest */
+static UA_INLINE void
+UA_DeleteMonitoredItemsRequest_init(UA_DeleteMonitoredItemsRequest *p) {
+    memset(p, 0, sizeof(UA_DeleteMonitoredItemsRequest));
+}
+
+static UA_INLINE UA_DeleteMonitoredItemsRequest *
+UA_DeleteMonitoredItemsRequest_new(void) {
+    return (UA_DeleteMonitoredItemsRequest*)UA_new(&UA_TYPES[UA_TYPES_DELETEMONITOREDITEMSREQUEST]);
+}
+
+static UA_INLINE UA_StatusCode
+UA_DeleteMonitoredItemsRequest_copy(const UA_DeleteMonitoredItemsRequest *src, UA_DeleteMonitoredItemsRequest *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_DELETEMONITOREDITEMSREQUEST]);
+}
+
+static UA_INLINE void
+UA_DeleteMonitoredItemsRequest_deleteMembers(UA_DeleteMonitoredItemsRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_DELETEMONITOREDITEMSREQUEST]);
+}
+
+static UA_INLINE void
+UA_DeleteMonitoredItemsRequest_clear(UA_DeleteMonitoredItemsRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_DELETEMONITOREDITEMSREQUEST]);
+}
+
+static UA_INLINE void
+UA_DeleteMonitoredItemsRequest_delete(UA_DeleteMonitoredItemsRequest *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_DELETEMONITOREDITEMSREQUEST]);
+}
+
+/* DeleteMonitoredItemsResponse */
+static UA_INLINE void
+UA_DeleteMonitoredItemsResponse_init(UA_DeleteMonitoredItemsResponse *p) {
+    memset(p, 0, sizeof(UA_DeleteMonitoredItemsResponse));
+}
+
+static UA_INLINE UA_DeleteMonitoredItemsResponse *
+UA_DeleteMonitoredItemsResponse_new(void) {
+    return (UA_DeleteMonitoredItemsResponse*)UA_new(&UA_TYPES[UA_TYPES_DELETEMONITOREDITEMSRESPONSE]);
+}
+
+static UA_INLINE UA_StatusCode
+UA_DeleteMonitoredItemsResponse_copy(const UA_DeleteMonitoredItemsResponse *src, UA_DeleteMonitoredItemsResponse *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_DELETEMONITOREDITEMSRESPONSE]);
+}
+
+static UA_INLINE void
+UA_DeleteMonitoredItemsResponse_deleteMembers(UA_DeleteMonitoredItemsResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_DELETEMONITOREDITEMSRESPONSE]);
+}
+
+static UA_INLINE void
+UA_DeleteMonitoredItemsResponse_clear(UA_DeleteMonitoredItemsResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_DELETEMONITOREDITEMSRESPONSE]);
+}
+
+static UA_INLINE void
+UA_DeleteMonitoredItemsResponse_delete(UA_DeleteMonitoredItemsResponse *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_DELETEMONITOREDITEMSRESPONSE]);
 }
 
 /* CreateSubscriptionRequest */
@@ -21222,1151 +22104,1151 @@ UA_CreateSubscriptionRequest_delete(UA_CreateSubscriptionRequest *p) {
     UA_delete(p, &UA_TYPES[UA_TYPES_CREATESUBSCRIPTIONREQUEST]);
 }
 
-/* CallResponse */
+/* CreateSubscriptionResponse */
 static UA_INLINE void
-UA_CallResponse_init(UA_CallResponse *p) {
-    memset(p, 0, sizeof(UA_CallResponse));
+UA_CreateSubscriptionResponse_init(UA_CreateSubscriptionResponse *p) {
+    memset(p, 0, sizeof(UA_CreateSubscriptionResponse));
 }
 
-static UA_INLINE UA_CallResponse *
-UA_CallResponse_new(void) {
-    return (UA_CallResponse*)UA_new(&UA_TYPES[UA_TYPES_CALLRESPONSE]);
+static UA_INLINE UA_CreateSubscriptionResponse *
+UA_CreateSubscriptionResponse_new(void) {
+    return (UA_CreateSubscriptionResponse*)UA_new(&UA_TYPES[UA_TYPES_CREATESUBSCRIPTIONRESPONSE]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_CallResponse_copy(const UA_CallResponse *src, UA_CallResponse *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_CALLRESPONSE]);
+UA_CreateSubscriptionResponse_copy(const UA_CreateSubscriptionResponse *src, UA_CreateSubscriptionResponse *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_CREATESUBSCRIPTIONRESPONSE]);
 }
 
 static UA_INLINE void
-UA_CallResponse_deleteMembers(UA_CallResponse *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_CALLRESPONSE]);
+UA_CreateSubscriptionResponse_deleteMembers(UA_CreateSubscriptionResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_CREATESUBSCRIPTIONRESPONSE]);
 }
 
 static UA_INLINE void
-UA_CallResponse_clear(UA_CallResponse *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_CALLRESPONSE]);
+UA_CreateSubscriptionResponse_clear(UA_CreateSubscriptionResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_CREATESUBSCRIPTIONRESPONSE]);
 }
 
 static UA_INLINE void
-UA_CallResponse_delete(UA_CallResponse *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_CALLRESPONSE]);
+UA_CreateSubscriptionResponse_delete(UA_CreateSubscriptionResponse *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_CREATESUBSCRIPTIONRESPONSE]);
 }
 
-/* DeleteNodesResponse */
+/* ModifySubscriptionRequest */
 static UA_INLINE void
-UA_DeleteNodesResponse_init(UA_DeleteNodesResponse *p) {
-    memset(p, 0, sizeof(UA_DeleteNodesResponse));
+UA_ModifySubscriptionRequest_init(UA_ModifySubscriptionRequest *p) {
+    memset(p, 0, sizeof(UA_ModifySubscriptionRequest));
 }
 
-static UA_INLINE UA_DeleteNodesResponse *
-UA_DeleteNodesResponse_new(void) {
-    return (UA_DeleteNodesResponse*)UA_new(&UA_TYPES[UA_TYPES_DELETENODESRESPONSE]);
+static UA_INLINE UA_ModifySubscriptionRequest *
+UA_ModifySubscriptionRequest_new(void) {
+    return (UA_ModifySubscriptionRequest*)UA_new(&UA_TYPES[UA_TYPES_MODIFYSUBSCRIPTIONREQUEST]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_DeleteNodesResponse_copy(const UA_DeleteNodesResponse *src, UA_DeleteNodesResponse *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_DELETENODESRESPONSE]);
+UA_ModifySubscriptionRequest_copy(const UA_ModifySubscriptionRequest *src, UA_ModifySubscriptionRequest *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_MODIFYSUBSCRIPTIONREQUEST]);
 }
 
 static UA_INLINE void
-UA_DeleteNodesResponse_deleteMembers(UA_DeleteNodesResponse *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_DELETENODESRESPONSE]);
+UA_ModifySubscriptionRequest_deleteMembers(UA_ModifySubscriptionRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_MODIFYSUBSCRIPTIONREQUEST]);
 }
 
 static UA_INLINE void
-UA_DeleteNodesResponse_clear(UA_DeleteNodesResponse *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_DELETENODESRESPONSE]);
+UA_ModifySubscriptionRequest_clear(UA_ModifySubscriptionRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_MODIFYSUBSCRIPTIONREQUEST]);
 }
 
 static UA_INLINE void
-UA_DeleteNodesResponse_delete(UA_DeleteNodesResponse *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_DELETENODESRESPONSE]);
+UA_ModifySubscriptionRequest_delete(UA_ModifySubscriptionRequest *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_MODIFYSUBSCRIPTIONREQUEST]);
 }
 
-/* ModifyMonitoredItemsRequest */
+/* ModifySubscriptionResponse */
 static UA_INLINE void
-UA_ModifyMonitoredItemsRequest_init(UA_ModifyMonitoredItemsRequest *p) {
-    memset(p, 0, sizeof(UA_ModifyMonitoredItemsRequest));
+UA_ModifySubscriptionResponse_init(UA_ModifySubscriptionResponse *p) {
+    memset(p, 0, sizeof(UA_ModifySubscriptionResponse));
 }
 
-static UA_INLINE UA_ModifyMonitoredItemsRequest *
-UA_ModifyMonitoredItemsRequest_new(void) {
-    return (UA_ModifyMonitoredItemsRequest*)UA_new(&UA_TYPES[UA_TYPES_MODIFYMONITOREDITEMSREQUEST]);
+static UA_INLINE UA_ModifySubscriptionResponse *
+UA_ModifySubscriptionResponse_new(void) {
+    return (UA_ModifySubscriptionResponse*)UA_new(&UA_TYPES[UA_TYPES_MODIFYSUBSCRIPTIONRESPONSE]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_ModifyMonitoredItemsRequest_copy(const UA_ModifyMonitoredItemsRequest *src, UA_ModifyMonitoredItemsRequest *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_MODIFYMONITOREDITEMSREQUEST]);
+UA_ModifySubscriptionResponse_copy(const UA_ModifySubscriptionResponse *src, UA_ModifySubscriptionResponse *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_MODIFYSUBSCRIPTIONRESPONSE]);
 }
 
 static UA_INLINE void
-UA_ModifyMonitoredItemsRequest_deleteMembers(UA_ModifyMonitoredItemsRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_MODIFYMONITOREDITEMSREQUEST]);
+UA_ModifySubscriptionResponse_deleteMembers(UA_ModifySubscriptionResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_MODIFYSUBSCRIPTIONRESPONSE]);
 }
 
 static UA_INLINE void
-UA_ModifyMonitoredItemsRequest_clear(UA_ModifyMonitoredItemsRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_MODIFYMONITOREDITEMSREQUEST]);
+UA_ModifySubscriptionResponse_clear(UA_ModifySubscriptionResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_MODIFYSUBSCRIPTIONRESPONSE]);
 }
 
 static UA_INLINE void
-UA_ModifyMonitoredItemsRequest_delete(UA_ModifyMonitoredItemsRequest *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_MODIFYMONITOREDITEMSREQUEST]);
+UA_ModifySubscriptionResponse_delete(UA_ModifySubscriptionResponse *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_MODIFYSUBSCRIPTIONRESPONSE]);
 }
 
-/* ServiceFault */
+/* SetPublishingModeRequest */
 static UA_INLINE void
-UA_ServiceFault_init(UA_ServiceFault *p) {
-    memset(p, 0, sizeof(UA_ServiceFault));
+UA_SetPublishingModeRequest_init(UA_SetPublishingModeRequest *p) {
+    memset(p, 0, sizeof(UA_SetPublishingModeRequest));
 }
 
-static UA_INLINE UA_ServiceFault *
-UA_ServiceFault_new(void) {
-    return (UA_ServiceFault*)UA_new(&UA_TYPES[UA_TYPES_SERVICEFAULT]);
+static UA_INLINE UA_SetPublishingModeRequest *
+UA_SetPublishingModeRequest_new(void) {
+    return (UA_SetPublishingModeRequest*)UA_new(&UA_TYPES[UA_TYPES_SETPUBLISHINGMODEREQUEST]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_ServiceFault_copy(const UA_ServiceFault *src, UA_ServiceFault *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_SERVICEFAULT]);
+UA_SetPublishingModeRequest_copy(const UA_SetPublishingModeRequest *src, UA_SetPublishingModeRequest *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_SETPUBLISHINGMODEREQUEST]);
 }
 
 static UA_INLINE void
-UA_ServiceFault_deleteMembers(UA_ServiceFault *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_SERVICEFAULT]);
+UA_SetPublishingModeRequest_deleteMembers(UA_SetPublishingModeRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_SETPUBLISHINGMODEREQUEST]);
 }
 
 static UA_INLINE void
-UA_ServiceFault_clear(UA_ServiceFault *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_SERVICEFAULT]);
+UA_SetPublishingModeRequest_clear(UA_SetPublishingModeRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_SETPUBLISHINGMODEREQUEST]);
 }
 
 static UA_INLINE void
-UA_ServiceFault_delete(UA_ServiceFault *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_SERVICEFAULT]);
+UA_SetPublishingModeRequest_delete(UA_SetPublishingModeRequest *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_SETPUBLISHINGMODEREQUEST]);
 }
 
-/* PublishResponse */
+/* SetPublishingModeResponse */
 static UA_INLINE void
-UA_PublishResponse_init(UA_PublishResponse *p) {
-    memset(p, 0, sizeof(UA_PublishResponse));
+UA_SetPublishingModeResponse_init(UA_SetPublishingModeResponse *p) {
+    memset(p, 0, sizeof(UA_SetPublishingModeResponse));
 }
 
-static UA_INLINE UA_PublishResponse *
-UA_PublishResponse_new(void) {
-    return (UA_PublishResponse*)UA_new(&UA_TYPES[UA_TYPES_PUBLISHRESPONSE]);
+static UA_INLINE UA_SetPublishingModeResponse *
+UA_SetPublishingModeResponse_new(void) {
+    return (UA_SetPublishingModeResponse*)UA_new(&UA_TYPES[UA_TYPES_SETPUBLISHINGMODERESPONSE]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_PublishResponse_copy(const UA_PublishResponse *src, UA_PublishResponse *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_PUBLISHRESPONSE]);
+UA_SetPublishingModeResponse_copy(const UA_SetPublishingModeResponse *src, UA_SetPublishingModeResponse *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_SETPUBLISHINGMODERESPONSE]);
 }
 
 static UA_INLINE void
-UA_PublishResponse_deleteMembers(UA_PublishResponse *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_PUBLISHRESPONSE]);
+UA_SetPublishingModeResponse_deleteMembers(UA_SetPublishingModeResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_SETPUBLISHINGMODERESPONSE]);
 }
 
 static UA_INLINE void
-UA_PublishResponse_clear(UA_PublishResponse *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_PUBLISHRESPONSE]);
+UA_SetPublishingModeResponse_clear(UA_SetPublishingModeResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_SETPUBLISHINGMODERESPONSE]);
 }
 
 static UA_INLINE void
-UA_PublishResponse_delete(UA_PublishResponse *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_PUBLISHRESPONSE]);
+UA_SetPublishingModeResponse_delete(UA_SetPublishingModeResponse *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_SETPUBLISHINGMODERESPONSE]);
 }
 
-/* CreateMonitoredItemsRequest */
+/* NotificationMessage */
 static UA_INLINE void
-UA_CreateMonitoredItemsRequest_init(UA_CreateMonitoredItemsRequest *p) {
-    memset(p, 0, sizeof(UA_CreateMonitoredItemsRequest));
+UA_NotificationMessage_init(UA_NotificationMessage *p) {
+    memset(p, 0, sizeof(UA_NotificationMessage));
 }
 
-static UA_INLINE UA_CreateMonitoredItemsRequest *
-UA_CreateMonitoredItemsRequest_new(void) {
-    return (UA_CreateMonitoredItemsRequest*)UA_new(&UA_TYPES[UA_TYPES_CREATEMONITOREDITEMSREQUEST]);
+static UA_INLINE UA_NotificationMessage *
+UA_NotificationMessage_new(void) {
+    return (UA_NotificationMessage*)UA_new(&UA_TYPES[UA_TYPES_NOTIFICATIONMESSAGE]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_CreateMonitoredItemsRequest_copy(const UA_CreateMonitoredItemsRequest *src, UA_CreateMonitoredItemsRequest *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_CREATEMONITOREDITEMSREQUEST]);
+UA_NotificationMessage_copy(const UA_NotificationMessage *src, UA_NotificationMessage *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_NOTIFICATIONMESSAGE]);
 }
 
 static UA_INLINE void
-UA_CreateMonitoredItemsRequest_deleteMembers(UA_CreateMonitoredItemsRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_CREATEMONITOREDITEMSREQUEST]);
+UA_NotificationMessage_deleteMembers(UA_NotificationMessage *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_NOTIFICATIONMESSAGE]);
 }
 
 static UA_INLINE void
-UA_CreateMonitoredItemsRequest_clear(UA_CreateMonitoredItemsRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_CREATEMONITOREDITEMSREQUEST]);
+UA_NotificationMessage_clear(UA_NotificationMessage *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_NOTIFICATIONMESSAGE]);
 }
 
 static UA_INLINE void
-UA_CreateMonitoredItemsRequest_delete(UA_CreateMonitoredItemsRequest *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_CREATEMONITOREDITEMSREQUEST]);
+UA_NotificationMessage_delete(UA_NotificationMessage *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_NOTIFICATIONMESSAGE]);
 }
 
-/* OpenSecureChannelRequest */
+/* MonitoredItemNotification */
 static UA_INLINE void
-UA_OpenSecureChannelRequest_init(UA_OpenSecureChannelRequest *p) {
-    memset(p, 0, sizeof(UA_OpenSecureChannelRequest));
+UA_MonitoredItemNotification_init(UA_MonitoredItemNotification *p) {
+    memset(p, 0, sizeof(UA_MonitoredItemNotification));
 }
 
-static UA_INLINE UA_OpenSecureChannelRequest *
-UA_OpenSecureChannelRequest_new(void) {
-    return (UA_OpenSecureChannelRequest*)UA_new(&UA_TYPES[UA_TYPES_OPENSECURECHANNELREQUEST]);
+static UA_INLINE UA_MonitoredItemNotification *
+UA_MonitoredItemNotification_new(void) {
+    return (UA_MonitoredItemNotification*)UA_new(&UA_TYPES[UA_TYPES_MONITOREDITEMNOTIFICATION]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_OpenSecureChannelRequest_copy(const UA_OpenSecureChannelRequest *src, UA_OpenSecureChannelRequest *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_OPENSECURECHANNELREQUEST]);
+UA_MonitoredItemNotification_copy(const UA_MonitoredItemNotification *src, UA_MonitoredItemNotification *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_MONITOREDITEMNOTIFICATION]);
 }
 
 static UA_INLINE void
-UA_OpenSecureChannelRequest_deleteMembers(UA_OpenSecureChannelRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_OPENSECURECHANNELREQUEST]);
+UA_MonitoredItemNotification_deleteMembers(UA_MonitoredItemNotification *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_MONITOREDITEMNOTIFICATION]);
 }
 
 static UA_INLINE void
-UA_OpenSecureChannelRequest_clear(UA_OpenSecureChannelRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_OPENSECURECHANNELREQUEST]);
+UA_MonitoredItemNotification_clear(UA_MonitoredItemNotification *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_MONITOREDITEMNOTIFICATION]);
 }
 
 static UA_INLINE void
-UA_OpenSecureChannelRequest_delete(UA_OpenSecureChannelRequest *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_OPENSECURECHANNELREQUEST]);
+UA_MonitoredItemNotification_delete(UA_MonitoredItemNotification *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_MONITOREDITEMNOTIFICATION]);
 }
 
-/* CloseSessionRequest */
+/* EventFieldList */
 static UA_INLINE void
-UA_CloseSessionRequest_init(UA_CloseSessionRequest *p) {
-    memset(p, 0, sizeof(UA_CloseSessionRequest));
+UA_EventFieldList_init(UA_EventFieldList *p) {
+    memset(p, 0, sizeof(UA_EventFieldList));
 }
 
-static UA_INLINE UA_CloseSessionRequest *
-UA_CloseSessionRequest_new(void) {
-    return (UA_CloseSessionRequest*)UA_new(&UA_TYPES[UA_TYPES_CLOSESESSIONREQUEST]);
+static UA_INLINE UA_EventFieldList *
+UA_EventFieldList_new(void) {
+    return (UA_EventFieldList*)UA_new(&UA_TYPES[UA_TYPES_EVENTFIELDLIST]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_CloseSessionRequest_copy(const UA_CloseSessionRequest *src, UA_CloseSessionRequest *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_CLOSESESSIONREQUEST]);
+UA_EventFieldList_copy(const UA_EventFieldList *src, UA_EventFieldList *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_EVENTFIELDLIST]);
 }
 
 static UA_INLINE void
-UA_CloseSessionRequest_deleteMembers(UA_CloseSessionRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_CLOSESESSIONREQUEST]);
+UA_EventFieldList_deleteMembers(UA_EventFieldList *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_EVENTFIELDLIST]);
 }
 
 static UA_INLINE void
-UA_CloseSessionRequest_clear(UA_CloseSessionRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_CLOSESESSIONREQUEST]);
+UA_EventFieldList_clear(UA_EventFieldList *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_EVENTFIELDLIST]);
 }
 
 static UA_INLINE void
-UA_CloseSessionRequest_delete(UA_CloseSessionRequest *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_CLOSESESSIONREQUEST]);
+UA_EventFieldList_delete(UA_EventFieldList *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_EVENTFIELDLIST]);
 }
 
-/* SetTriggeringRequest */
+/* HistoryEventFieldList */
 static UA_INLINE void
-UA_SetTriggeringRequest_init(UA_SetTriggeringRequest *p) {
-    memset(p, 0, sizeof(UA_SetTriggeringRequest));
+UA_HistoryEventFieldList_init(UA_HistoryEventFieldList *p) {
+    memset(p, 0, sizeof(UA_HistoryEventFieldList));
 }
 
-static UA_INLINE UA_SetTriggeringRequest *
-UA_SetTriggeringRequest_new(void) {
-    return (UA_SetTriggeringRequest*)UA_new(&UA_TYPES[UA_TYPES_SETTRIGGERINGREQUEST]);
+static UA_INLINE UA_HistoryEventFieldList *
+UA_HistoryEventFieldList_new(void) {
+    return (UA_HistoryEventFieldList*)UA_new(&UA_TYPES[UA_TYPES_HISTORYEVENTFIELDLIST]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_SetTriggeringRequest_copy(const UA_SetTriggeringRequest *src, UA_SetTriggeringRequest *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_SETTRIGGERINGREQUEST]);
+UA_HistoryEventFieldList_copy(const UA_HistoryEventFieldList *src, UA_HistoryEventFieldList *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_HISTORYEVENTFIELDLIST]);
 }
 
 static UA_INLINE void
-UA_SetTriggeringRequest_deleteMembers(UA_SetTriggeringRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_SETTRIGGERINGREQUEST]);
+UA_HistoryEventFieldList_deleteMembers(UA_HistoryEventFieldList *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_HISTORYEVENTFIELDLIST]);
 }
 
 static UA_INLINE void
-UA_SetTriggeringRequest_clear(UA_SetTriggeringRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_SETTRIGGERINGREQUEST]);
+UA_HistoryEventFieldList_clear(UA_HistoryEventFieldList *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_HISTORYEVENTFIELDLIST]);
 }
 
 static UA_INLINE void
-UA_SetTriggeringRequest_delete(UA_SetTriggeringRequest *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_SETTRIGGERINGREQUEST]);
+UA_HistoryEventFieldList_delete(UA_HistoryEventFieldList *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_HISTORYEVENTFIELDLIST]);
 }
 
-/* BrowseResult */
+/* StatusChangeNotification */
 static UA_INLINE void
-UA_BrowseResult_init(UA_BrowseResult *p) {
-    memset(p, 0, sizeof(UA_BrowseResult));
+UA_StatusChangeNotification_init(UA_StatusChangeNotification *p) {
+    memset(p, 0, sizeof(UA_StatusChangeNotification));
 }
 
-static UA_INLINE UA_BrowseResult *
-UA_BrowseResult_new(void) {
-    return (UA_BrowseResult*)UA_new(&UA_TYPES[UA_TYPES_BROWSERESULT]);
+static UA_INLINE UA_StatusChangeNotification *
+UA_StatusChangeNotification_new(void) {
+    return (UA_StatusChangeNotification*)UA_new(&UA_TYPES[UA_TYPES_STATUSCHANGENOTIFICATION]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_BrowseResult_copy(const UA_BrowseResult *src, UA_BrowseResult *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_BROWSERESULT]);
+UA_StatusChangeNotification_copy(const UA_StatusChangeNotification *src, UA_StatusChangeNotification *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_STATUSCHANGENOTIFICATION]);
 }
 
 static UA_INLINE void
-UA_BrowseResult_deleteMembers(UA_BrowseResult *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_BROWSERESULT]);
+UA_StatusChangeNotification_deleteMembers(UA_StatusChangeNotification *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_STATUSCHANGENOTIFICATION]);
 }
 
 static UA_INLINE void
-UA_BrowseResult_clear(UA_BrowseResult *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_BROWSERESULT]);
+UA_StatusChangeNotification_clear(UA_StatusChangeNotification *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_STATUSCHANGENOTIFICATION]);
 }
 
 static UA_INLINE void
-UA_BrowseResult_delete(UA_BrowseResult *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_BROWSERESULT]);
+UA_StatusChangeNotification_delete(UA_StatusChangeNotification *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_STATUSCHANGENOTIFICATION]);
 }
 
-/* AddReferencesRequest */
+/* SubscriptionAcknowledgement */
 static UA_INLINE void
-UA_AddReferencesRequest_init(UA_AddReferencesRequest *p) {
-    memset(p, 0, sizeof(UA_AddReferencesRequest));
+UA_SubscriptionAcknowledgement_init(UA_SubscriptionAcknowledgement *p) {
+    memset(p, 0, sizeof(UA_SubscriptionAcknowledgement));
 }
 
-static UA_INLINE UA_AddReferencesRequest *
-UA_AddReferencesRequest_new(void) {
-    return (UA_AddReferencesRequest*)UA_new(&UA_TYPES[UA_TYPES_ADDREFERENCESREQUEST]);
+static UA_INLINE UA_SubscriptionAcknowledgement *
+UA_SubscriptionAcknowledgement_new(void) {
+    return (UA_SubscriptionAcknowledgement*)UA_new(&UA_TYPES[UA_TYPES_SUBSCRIPTIONACKNOWLEDGEMENT]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_AddReferencesRequest_copy(const UA_AddReferencesRequest *src, UA_AddReferencesRequest *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_ADDREFERENCESREQUEST]);
+UA_SubscriptionAcknowledgement_copy(const UA_SubscriptionAcknowledgement *src, UA_SubscriptionAcknowledgement *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_SUBSCRIPTIONACKNOWLEDGEMENT]);
 }
 
 static UA_INLINE void
-UA_AddReferencesRequest_deleteMembers(UA_AddReferencesRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_ADDREFERENCESREQUEST]);
+UA_SubscriptionAcknowledgement_deleteMembers(UA_SubscriptionAcknowledgement *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_SUBSCRIPTIONACKNOWLEDGEMENT]);
 }
 
 static UA_INLINE void
-UA_AddReferencesRequest_clear(UA_AddReferencesRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_ADDREFERENCESREQUEST]);
+UA_SubscriptionAcknowledgement_clear(UA_SubscriptionAcknowledgement *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_SUBSCRIPTIONACKNOWLEDGEMENT]);
 }
 
 static UA_INLINE void
-UA_AddReferencesRequest_delete(UA_AddReferencesRequest *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_ADDREFERENCESREQUEST]);
+UA_SubscriptionAcknowledgement_delete(UA_SubscriptionAcknowledgement *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_SUBSCRIPTIONACKNOWLEDGEMENT]);
 }
 
-/* AddNodesItem */
+/* PublishRequest */
 static UA_INLINE void
-UA_AddNodesItem_init(UA_AddNodesItem *p) {
-    memset(p, 0, sizeof(UA_AddNodesItem));
+UA_PublishRequest_init(UA_PublishRequest *p) {
+    memset(p, 0, sizeof(UA_PublishRequest));
 }
 
-static UA_INLINE UA_AddNodesItem *
-UA_AddNodesItem_new(void) {
-    return (UA_AddNodesItem*)UA_new(&UA_TYPES[UA_TYPES_ADDNODESITEM]);
+static UA_INLINE UA_PublishRequest *
+UA_PublishRequest_new(void) {
+    return (UA_PublishRequest*)UA_new(&UA_TYPES[UA_TYPES_PUBLISHREQUEST]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_AddNodesItem_copy(const UA_AddNodesItem *src, UA_AddNodesItem *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_ADDNODESITEM]);
+UA_PublishRequest_copy(const UA_PublishRequest *src, UA_PublishRequest *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_PUBLISHREQUEST]);
 }
 
 static UA_INLINE void
-UA_AddNodesItem_deleteMembers(UA_AddNodesItem *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_ADDNODESITEM]);
+UA_PublishRequest_deleteMembers(UA_PublishRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_PUBLISHREQUEST]);
 }
 
 static UA_INLINE void
-UA_AddNodesItem_clear(UA_AddNodesItem *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_ADDNODESITEM]);
+UA_PublishRequest_clear(UA_PublishRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_PUBLISHREQUEST]);
 }
 
 static UA_INLINE void
-UA_AddNodesItem_delete(UA_AddNodesItem *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_ADDNODESITEM]);
+UA_PublishRequest_delete(UA_PublishRequest *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_PUBLISHREQUEST]);
 }
 
-/* ServerStatusDataType */
+/* PublishResponse */
 static UA_INLINE void
-UA_ServerStatusDataType_init(UA_ServerStatusDataType *p) {
-    memset(p, 0, sizeof(UA_ServerStatusDataType));
+UA_PublishResponse_init(UA_PublishResponse *p) {
+    memset(p, 0, sizeof(UA_PublishResponse));
 }
 
-static UA_INLINE UA_ServerStatusDataType *
-UA_ServerStatusDataType_new(void) {
-    return (UA_ServerStatusDataType*)UA_new(&UA_TYPES[UA_TYPES_SERVERSTATUSDATATYPE]);
+static UA_INLINE UA_PublishResponse *
+UA_PublishResponse_new(void) {
+    return (UA_PublishResponse*)UA_new(&UA_TYPES[UA_TYPES_PUBLISHRESPONSE]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_ServerStatusDataType_copy(const UA_ServerStatusDataType *src, UA_ServerStatusDataType *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_SERVERSTATUSDATATYPE]);
+UA_PublishResponse_copy(const UA_PublishResponse *src, UA_PublishResponse *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_PUBLISHRESPONSE]);
 }
 
 static UA_INLINE void
-UA_ServerStatusDataType_deleteMembers(UA_ServerStatusDataType *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_SERVERSTATUSDATATYPE]);
+UA_PublishResponse_deleteMembers(UA_PublishResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_PUBLISHRESPONSE]);
 }
 
 static UA_INLINE void
-UA_ServerStatusDataType_clear(UA_ServerStatusDataType *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_SERVERSTATUSDATATYPE]);
+UA_PublishResponse_clear(UA_PublishResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_PUBLISHRESPONSE]);
 }
 
 static UA_INLINE void
-UA_ServerStatusDataType_delete(UA_ServerStatusDataType *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_SERVERSTATUSDATATYPE]);
+UA_PublishResponse_delete(UA_PublishResponse *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_PUBLISHRESPONSE]);
 }
 
-/* BrowseNextResponse */
+/* RepublishRequest */
 static UA_INLINE void
-UA_BrowseNextResponse_init(UA_BrowseNextResponse *p) {
-    memset(p, 0, sizeof(UA_BrowseNextResponse));
+UA_RepublishRequest_init(UA_RepublishRequest *p) {
+    memset(p, 0, sizeof(UA_RepublishRequest));
 }
 
-static UA_INLINE UA_BrowseNextResponse *
-UA_BrowseNextResponse_new(void) {
-    return (UA_BrowseNextResponse*)UA_new(&UA_TYPES[UA_TYPES_BROWSENEXTRESPONSE]);
+static UA_INLINE UA_RepublishRequest *
+UA_RepublishRequest_new(void) {
+    return (UA_RepublishRequest*)UA_new(&UA_TYPES[UA_TYPES_REPUBLISHREQUEST]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_BrowseNextResponse_copy(const UA_BrowseNextResponse *src, UA_BrowseNextResponse *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_BROWSENEXTRESPONSE]);
+UA_RepublishRequest_copy(const UA_RepublishRequest *src, UA_RepublishRequest *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_REPUBLISHREQUEST]);
 }
 
 static UA_INLINE void
-UA_BrowseNextResponse_deleteMembers(UA_BrowseNextResponse *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_BROWSENEXTRESPONSE]);
+UA_RepublishRequest_deleteMembers(UA_RepublishRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_REPUBLISHREQUEST]);
 }
 
 static UA_INLINE void
-UA_BrowseNextResponse_clear(UA_BrowseNextResponse *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_BROWSENEXTRESPONSE]);
+UA_RepublishRequest_clear(UA_RepublishRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_REPUBLISHREQUEST]);
 }
 
 static UA_INLINE void
-UA_BrowseNextResponse_delete(UA_BrowseNextResponse *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_BROWSENEXTRESPONSE]);
+UA_RepublishRequest_delete(UA_RepublishRequest *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_REPUBLISHREQUEST]);
 }
 
-/* AxisInformation */
+/* RepublishResponse */
 static UA_INLINE void
-UA_AxisInformation_init(UA_AxisInformation *p) {
-    memset(p, 0, sizeof(UA_AxisInformation));
+UA_RepublishResponse_init(UA_RepublishResponse *p) {
+    memset(p, 0, sizeof(UA_RepublishResponse));
 }
 
-static UA_INLINE UA_AxisInformation *
-UA_AxisInformation_new(void) {
-    return (UA_AxisInformation*)UA_new(&UA_TYPES[UA_TYPES_AXISINFORMATION]);
+static UA_INLINE UA_RepublishResponse *
+UA_RepublishResponse_new(void) {
+    return (UA_RepublishResponse*)UA_new(&UA_TYPES[UA_TYPES_REPUBLISHRESPONSE]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_AxisInformation_copy(const UA_AxisInformation *src, UA_AxisInformation *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_AXISINFORMATION]);
+UA_RepublishResponse_copy(const UA_RepublishResponse *src, UA_RepublishResponse *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_REPUBLISHRESPONSE]);
 }
 
 static UA_INLINE void
-UA_AxisInformation_deleteMembers(UA_AxisInformation *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_AXISINFORMATION]);
+UA_RepublishResponse_deleteMembers(UA_RepublishResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_REPUBLISHRESPONSE]);
 }
 
 static UA_INLINE void
-UA_AxisInformation_clear(UA_AxisInformation *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_AXISINFORMATION]);
+UA_RepublishResponse_clear(UA_RepublishResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_REPUBLISHRESPONSE]);
 }
 
 static UA_INLINE void
-UA_AxisInformation_delete(UA_AxisInformation *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_AXISINFORMATION]);
+UA_RepublishResponse_delete(UA_RepublishResponse *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_REPUBLISHRESPONSE]);
 }
 
-/* ApplicationDescription */
+/* DeleteSubscriptionsRequest */
 static UA_INLINE void
-UA_ApplicationDescription_init(UA_ApplicationDescription *p) {
-    memset(p, 0, sizeof(UA_ApplicationDescription));
+UA_DeleteSubscriptionsRequest_init(UA_DeleteSubscriptionsRequest *p) {
+    memset(p, 0, sizeof(UA_DeleteSubscriptionsRequest));
 }
 
-static UA_INLINE UA_ApplicationDescription *
-UA_ApplicationDescription_new(void) {
-    return (UA_ApplicationDescription*)UA_new(&UA_TYPES[UA_TYPES_APPLICATIONDESCRIPTION]);
+static UA_INLINE UA_DeleteSubscriptionsRequest *
+UA_DeleteSubscriptionsRequest_new(void) {
+    return (UA_DeleteSubscriptionsRequest*)UA_new(&UA_TYPES[UA_TYPES_DELETESUBSCRIPTIONSREQUEST]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_ApplicationDescription_copy(const UA_ApplicationDescription *src, UA_ApplicationDescription *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_APPLICATIONDESCRIPTION]);
+UA_DeleteSubscriptionsRequest_copy(const UA_DeleteSubscriptionsRequest *src, UA_DeleteSubscriptionsRequest *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_DELETESUBSCRIPTIONSREQUEST]);
 }
 
 static UA_INLINE void
-UA_ApplicationDescription_deleteMembers(UA_ApplicationDescription *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_APPLICATIONDESCRIPTION]);
+UA_DeleteSubscriptionsRequest_deleteMembers(UA_DeleteSubscriptionsRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_DELETESUBSCRIPTIONSREQUEST]);
 }
 
 static UA_INLINE void
-UA_ApplicationDescription_clear(UA_ApplicationDescription *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_APPLICATIONDESCRIPTION]);
+UA_DeleteSubscriptionsRequest_clear(UA_DeleteSubscriptionsRequest *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_DELETESUBSCRIPTIONSREQUEST]);
 }
 
 static UA_INLINE void
-UA_ApplicationDescription_delete(UA_ApplicationDescription *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_APPLICATIONDESCRIPTION]);
+UA_DeleteSubscriptionsRequest_delete(UA_DeleteSubscriptionsRequest *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_DELETESUBSCRIPTIONSREQUEST]);
 }
 
-/* ReadRequest */
+/* DeleteSubscriptionsResponse */
 static UA_INLINE void
-UA_ReadRequest_init(UA_ReadRequest *p) {
-    memset(p, 0, sizeof(UA_ReadRequest));
+UA_DeleteSubscriptionsResponse_init(UA_DeleteSubscriptionsResponse *p) {
+    memset(p, 0, sizeof(UA_DeleteSubscriptionsResponse));
 }
 
-static UA_INLINE UA_ReadRequest *
-UA_ReadRequest_new(void) {
-    return (UA_ReadRequest*)UA_new(&UA_TYPES[UA_TYPES_READREQUEST]);
+static UA_INLINE UA_DeleteSubscriptionsResponse *
+UA_DeleteSubscriptionsResponse_new(void) {
+    return (UA_DeleteSubscriptionsResponse*)UA_new(&UA_TYPES[UA_TYPES_DELETESUBSCRIPTIONSRESPONSE]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_ReadRequest_copy(const UA_ReadRequest *src, UA_ReadRequest *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_READREQUEST]);
+UA_DeleteSubscriptionsResponse_copy(const UA_DeleteSubscriptionsResponse *src, UA_DeleteSubscriptionsResponse *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_DELETESUBSCRIPTIONSRESPONSE]);
 }
 
 static UA_INLINE void
-UA_ReadRequest_deleteMembers(UA_ReadRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_READREQUEST]);
+UA_DeleteSubscriptionsResponse_deleteMembers(UA_DeleteSubscriptionsResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_DELETESUBSCRIPTIONSRESPONSE]);
 }
 
 static UA_INLINE void
-UA_ReadRequest_clear(UA_ReadRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_READREQUEST]);
+UA_DeleteSubscriptionsResponse_clear(UA_DeleteSubscriptionsResponse *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_DELETESUBSCRIPTIONSRESPONSE]);
 }
 
 static UA_INLINE void
-UA_ReadRequest_delete(UA_ReadRequest *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_READREQUEST]);
+UA_DeleteSubscriptionsResponse_delete(UA_DeleteSubscriptionsResponse *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_DELETESUBSCRIPTIONSRESPONSE]);
 }
 
-/* ActivateSessionRequest */
+/* BuildInfo */
 static UA_INLINE void
-UA_ActivateSessionRequest_init(UA_ActivateSessionRequest *p) {
-    memset(p, 0, sizeof(UA_ActivateSessionRequest));
+UA_BuildInfo_init(UA_BuildInfo *p) {
+    memset(p, 0, sizeof(UA_BuildInfo));
 }
 
-static UA_INLINE UA_ActivateSessionRequest *
-UA_ActivateSessionRequest_new(void) {
-    return (UA_ActivateSessionRequest*)UA_new(&UA_TYPES[UA_TYPES_ACTIVATESESSIONREQUEST]);
+static UA_INLINE UA_BuildInfo *
+UA_BuildInfo_new(void) {
+    return (UA_BuildInfo*)UA_new(&UA_TYPES[UA_TYPES_BUILDINFO]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_ActivateSessionRequest_copy(const UA_ActivateSessionRequest *src, UA_ActivateSessionRequest *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_ACTIVATESESSIONREQUEST]);
+UA_BuildInfo_copy(const UA_BuildInfo *src, UA_BuildInfo *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_BUILDINFO]);
 }
 
 static UA_INLINE void
-UA_ActivateSessionRequest_deleteMembers(UA_ActivateSessionRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_ACTIVATESESSIONREQUEST]);
+UA_BuildInfo_deleteMembers(UA_BuildInfo *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_BUILDINFO]);
 }
 
 static UA_INLINE void
-UA_ActivateSessionRequest_clear(UA_ActivateSessionRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_ACTIVATESESSIONREQUEST]);
+UA_BuildInfo_clear(UA_BuildInfo *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_BUILDINFO]);
 }
 
 static UA_INLINE void
-UA_ActivateSessionRequest_delete(UA_ActivateSessionRequest *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_ACTIVATESESSIONREQUEST]);
+UA_BuildInfo_delete(UA_BuildInfo *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_BUILDINFO]);
 }
 
-/* BrowsePathResult */
+/* RedundancySupport */
 static UA_INLINE void
-UA_BrowsePathResult_init(UA_BrowsePathResult *p) {
-    memset(p, 0, sizeof(UA_BrowsePathResult));
+UA_RedundancySupport_init(UA_RedundancySupport *p) {
+    memset(p, 0, sizeof(UA_RedundancySupport));
 }
 
-static UA_INLINE UA_BrowsePathResult *
-UA_BrowsePathResult_new(void) {
-    return (UA_BrowsePathResult*)UA_new(&UA_TYPES[UA_TYPES_BROWSEPATHRESULT]);
+static UA_INLINE UA_RedundancySupport *
+UA_RedundancySupport_new(void) {
+    return (UA_RedundancySupport*)UA_new(&UA_TYPES[UA_TYPES_REDUNDANCYSUPPORT]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_BrowsePathResult_copy(const UA_BrowsePathResult *src, UA_BrowsePathResult *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_BROWSEPATHRESULT]);
+UA_RedundancySupport_copy(const UA_RedundancySupport *src, UA_RedundancySupport *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_REDUNDANCYSUPPORT]);
 }
 
 static UA_INLINE void
-UA_BrowsePathResult_deleteMembers(UA_BrowsePathResult *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_BROWSEPATHRESULT]);
+UA_RedundancySupport_deleteMembers(UA_RedundancySupport *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_REDUNDANCYSUPPORT]);
 }
 
 static UA_INLINE void
-UA_BrowsePathResult_clear(UA_BrowsePathResult *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_BROWSEPATHRESULT]);
+UA_RedundancySupport_clear(UA_RedundancySupport *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_REDUNDANCYSUPPORT]);
 }
 
 static UA_INLINE void
-UA_BrowsePathResult_delete(UA_BrowsePathResult *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_BROWSEPATHRESULT]);
+UA_RedundancySupport_delete(UA_RedundancySupport *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_REDUNDANCYSUPPORT]);
 }
 
-/* AddNodesRequest */
+/* ServerState */
 static UA_INLINE void
-UA_AddNodesRequest_init(UA_AddNodesRequest *p) {
-    memset(p, 0, sizeof(UA_AddNodesRequest));
+UA_ServerState_init(UA_ServerState *p) {
+    memset(p, 0, sizeof(UA_ServerState));
 }
 
-static UA_INLINE UA_AddNodesRequest *
-UA_AddNodesRequest_new(void) {
-    return (UA_AddNodesRequest*)UA_new(&UA_TYPES[UA_TYPES_ADDNODESREQUEST]);
+static UA_INLINE UA_ServerState *
+UA_ServerState_new(void) {
+    return (UA_ServerState*)UA_new(&UA_TYPES[UA_TYPES_SERVERSTATE]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_AddNodesRequest_copy(const UA_AddNodesRequest *src, UA_AddNodesRequest *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_ADDNODESREQUEST]);
+UA_ServerState_copy(const UA_ServerState *src, UA_ServerState *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_SERVERSTATE]);
 }
 
 static UA_INLINE void
-UA_AddNodesRequest_deleteMembers(UA_AddNodesRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_ADDNODESREQUEST]);
+UA_ServerState_deleteMembers(UA_ServerState *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_SERVERSTATE]);
 }
 
 static UA_INLINE void
-UA_AddNodesRequest_clear(UA_AddNodesRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_ADDNODESREQUEST]);
+UA_ServerState_clear(UA_ServerState *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_SERVERSTATE]);
 }
 
 static UA_INLINE void
-UA_AddNodesRequest_delete(UA_AddNodesRequest *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_ADDNODESREQUEST]);
+UA_ServerState_delete(UA_ServerState *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_SERVERSTATE]);
 }
 
-/* BrowseRequest */
+/* ServerDiagnosticsSummaryDataType */
 static UA_INLINE void
-UA_BrowseRequest_init(UA_BrowseRequest *p) {
-    memset(p, 0, sizeof(UA_BrowseRequest));
+UA_ServerDiagnosticsSummaryDataType_init(UA_ServerDiagnosticsSummaryDataType *p) {
+    memset(p, 0, sizeof(UA_ServerDiagnosticsSummaryDataType));
 }
 
-static UA_INLINE UA_BrowseRequest *
-UA_BrowseRequest_new(void) {
-    return (UA_BrowseRequest*)UA_new(&UA_TYPES[UA_TYPES_BROWSEREQUEST]);
+static UA_INLINE UA_ServerDiagnosticsSummaryDataType *
+UA_ServerDiagnosticsSummaryDataType_new(void) {
+    return (UA_ServerDiagnosticsSummaryDataType*)UA_new(&UA_TYPES[UA_TYPES_SERVERDIAGNOSTICSSUMMARYDATATYPE]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_BrowseRequest_copy(const UA_BrowseRequest *src, UA_BrowseRequest *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_BROWSEREQUEST]);
+UA_ServerDiagnosticsSummaryDataType_copy(const UA_ServerDiagnosticsSummaryDataType *src, UA_ServerDiagnosticsSummaryDataType *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_SERVERDIAGNOSTICSSUMMARYDATATYPE]);
 }
 
 static UA_INLINE void
-UA_BrowseRequest_deleteMembers(UA_BrowseRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_BROWSEREQUEST]);
+UA_ServerDiagnosticsSummaryDataType_deleteMembers(UA_ServerDiagnosticsSummaryDataType *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_SERVERDIAGNOSTICSSUMMARYDATATYPE]);
 }
 
 static UA_INLINE void
-UA_BrowseRequest_clear(UA_BrowseRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_BROWSEREQUEST]);
+UA_ServerDiagnosticsSummaryDataType_clear(UA_ServerDiagnosticsSummaryDataType *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_SERVERDIAGNOSTICSSUMMARYDATATYPE]);
 }
 
 static UA_INLINE void
-UA_BrowseRequest_delete(UA_BrowseRequest *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_BROWSEREQUEST]);
+UA_ServerDiagnosticsSummaryDataType_delete(UA_ServerDiagnosticsSummaryDataType *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_SERVERDIAGNOSTICSSUMMARYDATATYPE]);
 }
 
-/* WriteRequest */
+/* ServerStatusDataType */
 static UA_INLINE void
-UA_WriteRequest_init(UA_WriteRequest *p) {
-    memset(p, 0, sizeof(UA_WriteRequest));
+UA_ServerStatusDataType_init(UA_ServerStatusDataType *p) {
+    memset(p, 0, sizeof(UA_ServerStatusDataType));
 }
 
-static UA_INLINE UA_WriteRequest *
-UA_WriteRequest_new(void) {
-    return (UA_WriteRequest*)UA_new(&UA_TYPES[UA_TYPES_WRITEREQUEST]);
+static UA_INLINE UA_ServerStatusDataType *
+UA_ServerStatusDataType_new(void) {
+    return (UA_ServerStatusDataType*)UA_new(&UA_TYPES[UA_TYPES_SERVERSTATUSDATATYPE]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_WriteRequest_copy(const UA_WriteRequest *src, UA_WriteRequest *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_WRITEREQUEST]);
+UA_ServerStatusDataType_copy(const UA_ServerStatusDataType *src, UA_ServerStatusDataType *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_SERVERSTATUSDATATYPE]);
 }
 
 static UA_INLINE void
-UA_WriteRequest_deleteMembers(UA_WriteRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_WRITEREQUEST]);
+UA_ServerStatusDataType_deleteMembers(UA_ServerStatusDataType *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_SERVERSTATUSDATATYPE]);
 }
 
 static UA_INLINE void
-UA_WriteRequest_clear(UA_WriteRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_WRITEREQUEST]);
+UA_ServerStatusDataType_clear(UA_ServerStatusDataType *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_SERVERSTATUSDATATYPE]);
 }
 
 static UA_INLINE void
-UA_WriteRequest_delete(UA_WriteRequest *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_WRITEREQUEST]);
+UA_ServerStatusDataType_delete(UA_ServerStatusDataType *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_SERVERSTATUSDATATYPE]);
 }
 
-/* AddNodesResponse */
+/* Range */
 static UA_INLINE void
-UA_AddNodesResponse_init(UA_AddNodesResponse *p) {
-    memset(p, 0, sizeof(UA_AddNodesResponse));
+UA_Range_init(UA_Range *p) {
+    memset(p, 0, sizeof(UA_Range));
 }
 
-static UA_INLINE UA_AddNodesResponse *
-UA_AddNodesResponse_new(void) {
-    return (UA_AddNodesResponse*)UA_new(&UA_TYPES[UA_TYPES_ADDNODESRESPONSE]);
+static UA_INLINE UA_Range *
+UA_Range_new(void) {
+    return (UA_Range*)UA_new(&UA_TYPES[UA_TYPES_RANGE]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_AddNodesResponse_copy(const UA_AddNodesResponse *src, UA_AddNodesResponse *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_ADDNODESRESPONSE]);
+UA_Range_copy(const UA_Range *src, UA_Range *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_RANGE]);
 }
 
 static UA_INLINE void
-UA_AddNodesResponse_deleteMembers(UA_AddNodesResponse *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_ADDNODESRESPONSE]);
+UA_Range_deleteMembers(UA_Range *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_RANGE]);
 }
 
 static UA_INLINE void
-UA_AddNodesResponse_clear(UA_AddNodesResponse *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_ADDNODESRESPONSE]);
+UA_Range_clear(UA_Range *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_RANGE]);
 }
 
 static UA_INLINE void
-UA_AddNodesResponse_delete(UA_AddNodesResponse *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_ADDNODESRESPONSE]);
+UA_Range_delete(UA_Range *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_RANGE]);
 }
 
-/* AttributeOperand */
+/* EUInformation */
 static UA_INLINE void
-UA_AttributeOperand_init(UA_AttributeOperand *p) {
-    memset(p, 0, sizeof(UA_AttributeOperand));
+UA_EUInformation_init(UA_EUInformation *p) {
+    memset(p, 0, sizeof(UA_EUInformation));
 }
 
-static UA_INLINE UA_AttributeOperand *
-UA_AttributeOperand_new(void) {
-    return (UA_AttributeOperand*)UA_new(&UA_TYPES[UA_TYPES_ATTRIBUTEOPERAND]);
+static UA_INLINE UA_EUInformation *
+UA_EUInformation_new(void) {
+    return (UA_EUInformation*)UA_new(&UA_TYPES[UA_TYPES_EUINFORMATION]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_AttributeOperand_copy(const UA_AttributeOperand *src, UA_AttributeOperand *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_ATTRIBUTEOPERAND]);
+UA_EUInformation_copy(const UA_EUInformation *src, UA_EUInformation *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_EUINFORMATION]);
 }
 
 static UA_INLINE void
-UA_AttributeOperand_deleteMembers(UA_AttributeOperand *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_ATTRIBUTEOPERAND]);
+UA_EUInformation_deleteMembers(UA_EUInformation *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_EUINFORMATION]);
 }
 
 static UA_INLINE void
-UA_AttributeOperand_clear(UA_AttributeOperand *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_ATTRIBUTEOPERAND]);
+UA_EUInformation_clear(UA_EUInformation *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_EUINFORMATION]);
 }
 
 static UA_INLINE void
-UA_AttributeOperand_delete(UA_AttributeOperand *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_ATTRIBUTEOPERAND]);
+UA_EUInformation_delete(UA_EUInformation *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_EUINFORMATION]);
 }
 
-/* DataChangeFilter */
+/* AxisScaleEnumeration */
 static UA_INLINE void
-UA_DataChangeFilter_init(UA_DataChangeFilter *p) {
-    memset(p, 0, sizeof(UA_DataChangeFilter));
+UA_AxisScaleEnumeration_init(UA_AxisScaleEnumeration *p) {
+    memset(p, 0, sizeof(UA_AxisScaleEnumeration));
 }
 
-static UA_INLINE UA_DataChangeFilter *
-UA_DataChangeFilter_new(void) {
-    return (UA_DataChangeFilter*)UA_new(&UA_TYPES[UA_TYPES_DATACHANGEFILTER]);
+static UA_INLINE UA_AxisScaleEnumeration *
+UA_AxisScaleEnumeration_new(void) {
+    return (UA_AxisScaleEnumeration*)UA_new(&UA_TYPES[UA_TYPES_AXISSCALEENUMERATION]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_DataChangeFilter_copy(const UA_DataChangeFilter *src, UA_DataChangeFilter *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_DATACHANGEFILTER]);
+UA_AxisScaleEnumeration_copy(const UA_AxisScaleEnumeration *src, UA_AxisScaleEnumeration *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_AXISSCALEENUMERATION]);
 }
 
 static UA_INLINE void
-UA_DataChangeFilter_deleteMembers(UA_DataChangeFilter *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_DATACHANGEFILTER]);
+UA_AxisScaleEnumeration_deleteMembers(UA_AxisScaleEnumeration *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_AXISSCALEENUMERATION]);
 }
 
 static UA_INLINE void
-UA_DataChangeFilter_clear(UA_DataChangeFilter *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_DATACHANGEFILTER]);
+UA_AxisScaleEnumeration_clear(UA_AxisScaleEnumeration *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_AXISSCALEENUMERATION]);
 }
 
 static UA_INLINE void
-UA_DataChangeFilter_delete(UA_DataChangeFilter *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_DATACHANGEFILTER]);
+UA_AxisScaleEnumeration_delete(UA_AxisScaleEnumeration *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_AXISSCALEENUMERATION]);
 }
 
-/* EndpointDescription */
+/* ComplexNumberType */
 static UA_INLINE void
-UA_EndpointDescription_init(UA_EndpointDescription *p) {
-    memset(p, 0, sizeof(UA_EndpointDescription));
+UA_ComplexNumberType_init(UA_ComplexNumberType *p) {
+    memset(p, 0, sizeof(UA_ComplexNumberType));
 }
 
-static UA_INLINE UA_EndpointDescription *
-UA_EndpointDescription_new(void) {
-    return (UA_EndpointDescription*)UA_new(&UA_TYPES[UA_TYPES_ENDPOINTDESCRIPTION]);
+static UA_INLINE UA_ComplexNumberType *
+UA_ComplexNumberType_new(void) {
+    return (UA_ComplexNumberType*)UA_new(&UA_TYPES[UA_TYPES_COMPLEXNUMBERTYPE]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_EndpointDescription_copy(const UA_EndpointDescription *src, UA_EndpointDescription *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_ENDPOINTDESCRIPTION]);
+UA_ComplexNumberType_copy(const UA_ComplexNumberType *src, UA_ComplexNumberType *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_COMPLEXNUMBERTYPE]);
 }
 
 static UA_INLINE void
-UA_EndpointDescription_deleteMembers(UA_EndpointDescription *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_ENDPOINTDESCRIPTION]);
+UA_ComplexNumberType_deleteMembers(UA_ComplexNumberType *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_COMPLEXNUMBERTYPE]);
 }
 
 static UA_INLINE void
-UA_EndpointDescription_clear(UA_EndpointDescription *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_ENDPOINTDESCRIPTION]);
+UA_ComplexNumberType_clear(UA_ComplexNumberType *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_COMPLEXNUMBERTYPE]);
 }
 
 static UA_INLINE void
-UA_EndpointDescription_delete(UA_EndpointDescription *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_ENDPOINTDESCRIPTION]);
+UA_ComplexNumberType_delete(UA_ComplexNumberType *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_COMPLEXNUMBERTYPE]);
 }
 
-/* DeleteReferencesRequest */
+/* DoubleComplexNumberType */
 static UA_INLINE void
-UA_DeleteReferencesRequest_init(UA_DeleteReferencesRequest *p) {
-    memset(p, 0, sizeof(UA_DeleteReferencesRequest));
+UA_DoubleComplexNumberType_init(UA_DoubleComplexNumberType *p) {
+    memset(p, 0, sizeof(UA_DoubleComplexNumberType));
 }
 
-static UA_INLINE UA_DeleteReferencesRequest *
-UA_DeleteReferencesRequest_new(void) {
-    return (UA_DeleteReferencesRequest*)UA_new(&UA_TYPES[UA_TYPES_DELETEREFERENCESREQUEST]);
+static UA_INLINE UA_DoubleComplexNumberType *
+UA_DoubleComplexNumberType_new(void) {
+    return (UA_DoubleComplexNumberType*)UA_new(&UA_TYPES[UA_TYPES_DOUBLECOMPLEXNUMBERTYPE]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_DeleteReferencesRequest_copy(const UA_DeleteReferencesRequest *src, UA_DeleteReferencesRequest *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_DELETEREFERENCESREQUEST]);
+UA_DoubleComplexNumberType_copy(const UA_DoubleComplexNumberType *src, UA_DoubleComplexNumberType *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_DOUBLECOMPLEXNUMBERTYPE]);
 }
 
 static UA_INLINE void
-UA_DeleteReferencesRequest_deleteMembers(UA_DeleteReferencesRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_DELETEREFERENCESREQUEST]);
+UA_DoubleComplexNumberType_deleteMembers(UA_DoubleComplexNumberType *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_DOUBLECOMPLEXNUMBERTYPE]);
 }
 
 static UA_INLINE void
-UA_DeleteReferencesRequest_clear(UA_DeleteReferencesRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_DELETEREFERENCESREQUEST]);
+UA_DoubleComplexNumberType_clear(UA_DoubleComplexNumberType *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_DOUBLECOMPLEXNUMBERTYPE]);
 }
 
 static UA_INLINE void
-UA_DeleteReferencesRequest_delete(UA_DeleteReferencesRequest *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_DELETEREFERENCESREQUEST]);
+UA_DoubleComplexNumberType_delete(UA_DoubleComplexNumberType *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_DOUBLECOMPLEXNUMBERTYPE]);
 }
 
-/* TranslateBrowsePathsToNodeIdsRequest */
+/* AxisInformation */
 static UA_INLINE void
-UA_TranslateBrowsePathsToNodeIdsRequest_init(UA_TranslateBrowsePathsToNodeIdsRequest *p) {
-    memset(p, 0, sizeof(UA_TranslateBrowsePathsToNodeIdsRequest));
+UA_AxisInformation_init(UA_AxisInformation *p) {
+    memset(p, 0, sizeof(UA_AxisInformation));
 }
 
-static UA_INLINE UA_TranslateBrowsePathsToNodeIdsRequest *
-UA_TranslateBrowsePathsToNodeIdsRequest_new(void) {
-    return (UA_TranslateBrowsePathsToNodeIdsRequest*)UA_new(&UA_TYPES[UA_TYPES_TRANSLATEBROWSEPATHSTONODEIDSREQUEST]);
+static UA_INLINE UA_AxisInformation *
+UA_AxisInformation_new(void) {
+    return (UA_AxisInformation*)UA_new(&UA_TYPES[UA_TYPES_AXISINFORMATION]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_TranslateBrowsePathsToNodeIdsRequest_copy(const UA_TranslateBrowsePathsToNodeIdsRequest *src, UA_TranslateBrowsePathsToNodeIdsRequest *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_TRANSLATEBROWSEPATHSTONODEIDSREQUEST]);
+UA_AxisInformation_copy(const UA_AxisInformation *src, UA_AxisInformation *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_AXISINFORMATION]);
 }
 
 static UA_INLINE void
-UA_TranslateBrowsePathsToNodeIdsRequest_deleteMembers(UA_TranslateBrowsePathsToNodeIdsRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_TRANSLATEBROWSEPATHSTONODEIDSREQUEST]);
+UA_AxisInformation_deleteMembers(UA_AxisInformation *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_AXISINFORMATION]);
 }
 
 static UA_INLINE void
-UA_TranslateBrowsePathsToNodeIdsRequest_clear(UA_TranslateBrowsePathsToNodeIdsRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_TRANSLATEBROWSEPATHSTONODEIDSREQUEST]);
+UA_AxisInformation_clear(UA_AxisInformation *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_AXISINFORMATION]);
 }
 
 static UA_INLINE void
-UA_TranslateBrowsePathsToNodeIdsRequest_delete(UA_TranslateBrowsePathsToNodeIdsRequest *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_TRANSLATEBROWSEPATHSTONODEIDSREQUEST]);
+UA_AxisInformation_delete(UA_AxisInformation *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_AXISINFORMATION]);
 }
 
-/* FindServersResponse */
+/* XVType */
 static UA_INLINE void
-UA_FindServersResponse_init(UA_FindServersResponse *p) {
-    memset(p, 0, sizeof(UA_FindServersResponse));
+UA_XVType_init(UA_XVType *p) {
+    memset(p, 0, sizeof(UA_XVType));
 }
 
-static UA_INLINE UA_FindServersResponse *
-UA_FindServersResponse_new(void) {
-    return (UA_FindServersResponse*)UA_new(&UA_TYPES[UA_TYPES_FINDSERVERSRESPONSE]);
+static UA_INLINE UA_XVType *
+UA_XVType_new(void) {
+    return (UA_XVType*)UA_new(&UA_TYPES[UA_TYPES_XVTYPE]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_FindServersResponse_copy(const UA_FindServersResponse *src, UA_FindServersResponse *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_FINDSERVERSRESPONSE]);
+UA_XVType_copy(const UA_XVType *src, UA_XVType *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_XVTYPE]);
 }
 
 static UA_INLINE void
-UA_FindServersResponse_deleteMembers(UA_FindServersResponse *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_FINDSERVERSRESPONSE]);
+UA_XVType_deleteMembers(UA_XVType *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_XVTYPE]);
 }
 
 static UA_INLINE void
-UA_FindServersResponse_clear(UA_FindServersResponse *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_FINDSERVERSRESPONSE]);
+UA_XVType_clear(UA_XVType *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_XVTYPE]);
 }
 
 static UA_INLINE void
-UA_FindServersResponse_delete(UA_FindServersResponse *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_FINDSERVERSRESPONSE]);
+UA_XVType_delete(UA_XVType *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_XVTYPE]);
 }
 
-/* CreateSessionRequest */
+/* EnumDefinition */
 static UA_INLINE void
-UA_CreateSessionRequest_init(UA_CreateSessionRequest *p) {
-    memset(p, 0, sizeof(UA_CreateSessionRequest));
+UA_EnumDefinition_init(UA_EnumDefinition *p) {
+    memset(p, 0, sizeof(UA_EnumDefinition));
 }
 
-static UA_INLINE UA_CreateSessionRequest *
-UA_CreateSessionRequest_new(void) {
-    return (UA_CreateSessionRequest*)UA_new(&UA_TYPES[UA_TYPES_CREATESESSIONREQUEST]);
+static UA_INLINE UA_EnumDefinition *
+UA_EnumDefinition_new(void) {
+    return (UA_EnumDefinition*)UA_new(&UA_TYPES[UA_TYPES_ENUMDEFINITION]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_CreateSessionRequest_copy(const UA_CreateSessionRequest *src, UA_CreateSessionRequest *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_CREATESESSIONREQUEST]);
+UA_EnumDefinition_copy(const UA_EnumDefinition *src, UA_EnumDefinition *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_ENUMDEFINITION]);
 }
 
 static UA_INLINE void
-UA_CreateSessionRequest_deleteMembers(UA_CreateSessionRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_CREATESESSIONREQUEST]);
+UA_EnumDefinition_deleteMembers(UA_EnumDefinition *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_ENUMDEFINITION]);
 }
 
 static UA_INLINE void
-UA_CreateSessionRequest_clear(UA_CreateSessionRequest *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_CREATESESSIONREQUEST]);
+UA_EnumDefinition_clear(UA_EnumDefinition *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_ENUMDEFINITION]);
 }
 
 static UA_INLINE void
-UA_CreateSessionRequest_delete(UA_CreateSessionRequest *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_CREATESESSIONREQUEST]);
+UA_EnumDefinition_delete(UA_EnumDefinition *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_ENUMDEFINITION]);
 }
 
-/* ContentFilterElement */
+/* ReadEventDetails */
 static UA_INLINE void
-UA_ContentFilterElement_init(UA_ContentFilterElement *p) {
-    memset(p, 0, sizeof(UA_ContentFilterElement));
+UA_ReadEventDetails_init(UA_ReadEventDetails *p) {
+    memset(p, 0, sizeof(UA_ReadEventDetails));
 }
 
-static UA_INLINE UA_ContentFilterElement *
-UA_ContentFilterElement_new(void) {
-    return (UA_ContentFilterElement*)UA_new(&UA_TYPES[UA_TYPES_CONTENTFILTERELEMENT]);
+static UA_INLINE UA_ReadEventDetails *
+UA_ReadEventDetails_new(void) {
+    return (UA_ReadEventDetails*)UA_new(&UA_TYPES[UA_TYPES_READEVENTDETAILS]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_ContentFilterElement_copy(const UA_ContentFilterElement *src, UA_ContentFilterElement *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_CONTENTFILTERELEMENT]);
+UA_ReadEventDetails_copy(const UA_ReadEventDetails *src, UA_ReadEventDetails *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_READEVENTDETAILS]);
 }
 
 static UA_INLINE void
-UA_ContentFilterElement_deleteMembers(UA_ContentFilterElement *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_CONTENTFILTERELEMENT]);
+UA_ReadEventDetails_deleteMembers(UA_ReadEventDetails *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_READEVENTDETAILS]);
 }
 
 static UA_INLINE void
-UA_ContentFilterElement_clear(UA_ContentFilterElement *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_CONTENTFILTERELEMENT]);
+UA_ReadEventDetails_clear(UA_ReadEventDetails *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_READEVENTDETAILS]);
 }
 
 static UA_INLINE void
-UA_ContentFilterElement_delete(UA_ContentFilterElement *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_CONTENTFILTERELEMENT]);
+UA_ReadEventDetails_delete(UA_ReadEventDetails *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_READEVENTDETAILS]);
 }
 
-/* TranslateBrowsePathsToNodeIdsResponse */
+/* ReadProcessedDetails */
 static UA_INLINE void
-UA_TranslateBrowsePathsToNodeIdsResponse_init(UA_TranslateBrowsePathsToNodeIdsResponse *p) {
-    memset(p, 0, sizeof(UA_TranslateBrowsePathsToNodeIdsResponse));
+UA_ReadProcessedDetails_init(UA_ReadProcessedDetails *p) {
+    memset(p, 0, sizeof(UA_ReadProcessedDetails));
 }
 
-static UA_INLINE UA_TranslateBrowsePathsToNodeIdsResponse *
-UA_TranslateBrowsePathsToNodeIdsResponse_new(void) {
-    return (UA_TranslateBrowsePathsToNodeIdsResponse*)UA_new(&UA_TYPES[UA_TYPES_TRANSLATEBROWSEPATHSTONODEIDSRESPONSE]);
+static UA_INLINE UA_ReadProcessedDetails *
+UA_ReadProcessedDetails_new(void) {
+    return (UA_ReadProcessedDetails*)UA_new(&UA_TYPES[UA_TYPES_READPROCESSEDDETAILS]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_TranslateBrowsePathsToNodeIdsResponse_copy(const UA_TranslateBrowsePathsToNodeIdsResponse *src, UA_TranslateBrowsePathsToNodeIdsResponse *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_TRANSLATEBROWSEPATHSTONODEIDSRESPONSE]);
+UA_ReadProcessedDetails_copy(const UA_ReadProcessedDetails *src, UA_ReadProcessedDetails *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_READPROCESSEDDETAILS]);
 }
 
 static UA_INLINE void
-UA_TranslateBrowsePathsToNodeIdsResponse_deleteMembers(UA_TranslateBrowsePathsToNodeIdsResponse *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_TRANSLATEBROWSEPATHSTONODEIDSRESPONSE]);
+UA_ReadProcessedDetails_deleteMembers(UA_ReadProcessedDetails *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_READPROCESSEDDETAILS]);
 }
 
 static UA_INLINE void
-UA_TranslateBrowsePathsToNodeIdsResponse_clear(UA_TranslateBrowsePathsToNodeIdsResponse *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_TRANSLATEBROWSEPATHSTONODEIDSRESPONSE]);
+UA_ReadProcessedDetails_clear(UA_ReadProcessedDetails *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_READPROCESSEDDETAILS]);
 }
 
 static UA_INLINE void
-UA_TranslateBrowsePathsToNodeIdsResponse_delete(UA_TranslateBrowsePathsToNodeIdsResponse *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_TRANSLATEBROWSEPATHSTONODEIDSRESPONSE]);
+UA_ReadProcessedDetails_delete(UA_ReadProcessedDetails *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_READPROCESSEDDETAILS]);
 }
 
-/* BrowseResponse */
+/* ModificationInfo */
 static UA_INLINE void
-UA_BrowseResponse_init(UA_BrowseResponse *p) {
-    memset(p, 0, sizeof(UA_BrowseResponse));
+UA_ModificationInfo_init(UA_ModificationInfo *p) {
+    memset(p, 0, sizeof(UA_ModificationInfo));
 }
 
-static UA_INLINE UA_BrowseResponse *
-UA_BrowseResponse_new(void) {
-    return (UA_BrowseResponse*)UA_new(&UA_TYPES[UA_TYPES_BROWSERESPONSE]);
+static UA_INLINE UA_ModificationInfo *
+UA_ModificationInfo_new(void) {
+    return (UA_ModificationInfo*)UA_new(&UA_TYPES[UA_TYPES_MODIFICATIONINFO]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_BrowseResponse_copy(const UA_BrowseResponse *src, UA_BrowseResponse *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_BROWSERESPONSE]);
+UA_ModificationInfo_copy(const UA_ModificationInfo *src, UA_ModificationInfo *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_MODIFICATIONINFO]);
 }
 
 static UA_INLINE void
-UA_BrowseResponse_deleteMembers(UA_BrowseResponse *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_BROWSERESPONSE]);
+UA_ModificationInfo_deleteMembers(UA_ModificationInfo *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_MODIFICATIONINFO]);
 }
 
 static UA_INLINE void
-UA_BrowseResponse_clear(UA_BrowseResponse *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_BROWSERESPONSE]);
+UA_ModificationInfo_clear(UA_ModificationInfo *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_MODIFICATIONINFO]);
 }
 
 static UA_INLINE void
-UA_BrowseResponse_delete(UA_BrowseResponse *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_BROWSERESPONSE]);
+UA_ModificationInfo_delete(UA_ModificationInfo *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_MODIFICATIONINFO]);
 }
 
-/* CreateSessionResponse */
+/* HistoryModifiedData */
 static UA_INLINE void
-UA_CreateSessionResponse_init(UA_CreateSessionResponse *p) {
-    memset(p, 0, sizeof(UA_CreateSessionResponse));
+UA_HistoryModifiedData_init(UA_HistoryModifiedData *p) {
+    memset(p, 0, sizeof(UA_HistoryModifiedData));
 }
 
-static UA_INLINE UA_CreateSessionResponse *
-UA_CreateSessionResponse_new(void) {
-    return (UA_CreateSessionResponse*)UA_new(&UA_TYPES[UA_TYPES_CREATESESSIONRESPONSE]);
+static UA_INLINE UA_HistoryModifiedData *
+UA_HistoryModifiedData_new(void) {
+    return (UA_HistoryModifiedData*)UA_new(&UA_TYPES[UA_TYPES_HISTORYMODIFIEDDATA]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_CreateSessionResponse_copy(const UA_CreateSessionResponse *src, UA_CreateSessionResponse *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_CREATESESSIONRESPONSE]);
+UA_HistoryModifiedData_copy(const UA_HistoryModifiedData *src, UA_HistoryModifiedData *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_HISTORYMODIFIEDDATA]);
 }
 
 static UA_INLINE void
-UA_CreateSessionResponse_deleteMembers(UA_CreateSessionResponse *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_CREATESESSIONRESPONSE]);
+UA_HistoryModifiedData_deleteMembers(UA_HistoryModifiedData *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_HISTORYMODIFIEDDATA]);
 }
 
 static UA_INLINE void
-UA_CreateSessionResponse_clear(UA_CreateSessionResponse *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_CREATESESSIONRESPONSE]);
+UA_HistoryModifiedData_clear(UA_HistoryModifiedData *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_HISTORYMODIFIEDDATA]);
 }
 
 static UA_INLINE void
-UA_CreateSessionResponse_delete(UA_CreateSessionResponse *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_CREATESESSIONRESPONSE]);
+UA_HistoryModifiedData_delete(UA_HistoryModifiedData *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_HISTORYMODIFIEDDATA]);
 }
 
-/* ContentFilter */
+/* HistoryEvent */
 static UA_INLINE void
-UA_ContentFilter_init(UA_ContentFilter *p) {
-    memset(p, 0, sizeof(UA_ContentFilter));
+UA_HistoryEvent_init(UA_HistoryEvent *p) {
+    memset(p, 0, sizeof(UA_HistoryEvent));
 }
 
-static UA_INLINE UA_ContentFilter *
-UA_ContentFilter_new(void) {
-    return (UA_ContentFilter*)UA_new(&UA_TYPES[UA_TYPES_CONTENTFILTER]);
+static UA_INLINE UA_HistoryEvent *
+UA_HistoryEvent_new(void) {
+    return (UA_HistoryEvent*)UA_new(&UA_TYPES[UA_TYPES_HISTORYEVENT]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_ContentFilter_copy(const UA_ContentFilter *src, UA_ContentFilter *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_CONTENTFILTER]);
+UA_HistoryEvent_copy(const UA_HistoryEvent *src, UA_HistoryEvent *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_HISTORYEVENT]);
 }
 
 static UA_INLINE void
-UA_ContentFilter_deleteMembers(UA_ContentFilter *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_CONTENTFILTER]);
+UA_HistoryEvent_deleteMembers(UA_HistoryEvent *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_HISTORYEVENT]);
 }
 
 static UA_INLINE void
-UA_ContentFilter_clear(UA_ContentFilter *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_CONTENTFILTER]);
+UA_HistoryEvent_clear(UA_HistoryEvent *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_HISTORYEVENT]);
 }
 
 static UA_INLINE void
-UA_ContentFilter_delete(UA_ContentFilter *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_CONTENTFILTER]);
+UA_HistoryEvent_delete(UA_HistoryEvent *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_HISTORYEVENT]);
 }
 
-/* GetEndpointsResponse */
+/* DataChangeNotification */
 static UA_INLINE void
-UA_GetEndpointsResponse_init(UA_GetEndpointsResponse *p) {
-    memset(p, 0, sizeof(UA_GetEndpointsResponse));
+UA_DataChangeNotification_init(UA_DataChangeNotification *p) {
+    memset(p, 0, sizeof(UA_DataChangeNotification));
 }
 
-static UA_INLINE UA_GetEndpointsResponse *
-UA_GetEndpointsResponse_new(void) {
-    return (UA_GetEndpointsResponse*)UA_new(&UA_TYPES[UA_TYPES_GETENDPOINTSRESPONSE]);
+static UA_INLINE UA_DataChangeNotification *
+UA_DataChangeNotification_new(void) {
+    return (UA_DataChangeNotification*)UA_new(&UA_TYPES[UA_TYPES_DATACHANGENOTIFICATION]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_GetEndpointsResponse_copy(const UA_GetEndpointsResponse *src, UA_GetEndpointsResponse *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_GETENDPOINTSRESPONSE]);
+UA_DataChangeNotification_copy(const UA_DataChangeNotification *src, UA_DataChangeNotification *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_DATACHANGENOTIFICATION]);
 }
 
 static UA_INLINE void
-UA_GetEndpointsResponse_deleteMembers(UA_GetEndpointsResponse *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_GETENDPOINTSRESPONSE]);
+UA_DataChangeNotification_deleteMembers(UA_DataChangeNotification *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_DATACHANGENOTIFICATION]);
 }
 
 static UA_INLINE void
-UA_GetEndpointsResponse_clear(UA_GetEndpointsResponse *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_GETENDPOINTSRESPONSE]);
+UA_DataChangeNotification_clear(UA_DataChangeNotification *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_DATACHANGENOTIFICATION]);
 }
 
 static UA_INLINE void
-UA_GetEndpointsResponse_delete(UA_GetEndpointsResponse *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_GETENDPOINTSRESPONSE]);
+UA_DataChangeNotification_delete(UA_DataChangeNotification *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_DATACHANGENOTIFICATION]);
 }
 
-/* EventFilter */
+/* EventNotificationList */
 static UA_INLINE void
-UA_EventFilter_init(UA_EventFilter *p) {
-    memset(p, 0, sizeof(UA_EventFilter));
+UA_EventNotificationList_init(UA_EventNotificationList *p) {
+    memset(p, 0, sizeof(UA_EventNotificationList));
 }
 
-static UA_INLINE UA_EventFilter *
-UA_EventFilter_new(void) {
-    return (UA_EventFilter*)UA_new(&UA_TYPES[UA_TYPES_EVENTFILTER]);
+static UA_INLINE UA_EventNotificationList *
+UA_EventNotificationList_new(void) {
+    return (UA_EventNotificationList*)UA_new(&UA_TYPES[UA_TYPES_EVENTNOTIFICATIONLIST]);
 }
 
 static UA_INLINE UA_StatusCode
-UA_EventFilter_copy(const UA_EventFilter *src, UA_EventFilter *dst) {
-    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_EVENTFILTER]);
+UA_EventNotificationList_copy(const UA_EventNotificationList *src, UA_EventNotificationList *dst) {
+    return UA_copy(src, dst, &UA_TYPES[UA_TYPES_EVENTNOTIFICATIONLIST]);
 }
 
 static UA_INLINE void
-UA_EventFilter_deleteMembers(UA_EventFilter *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_EVENTFILTER]);
+UA_EventNotificationList_deleteMembers(UA_EventNotificationList *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_EVENTNOTIFICATIONLIST]);
 }
 
 static UA_INLINE void
-UA_EventFilter_clear(UA_EventFilter *p) {
-    UA_clear(p, &UA_TYPES[UA_TYPES_EVENTFILTER]);
+UA_EventNotificationList_clear(UA_EventNotificationList *p) {
+    UA_clear(p, &UA_TYPES[UA_TYPES_EVENTNOTIFICATIONLIST]);
 }
 
 static UA_INLINE void
-UA_EventFilter_delete(UA_EventFilter *p) {
-    UA_delete(p, &UA_TYPES[UA_TYPES_EVENTFILTER]);
+UA_EventNotificationList_delete(UA_EventNotificationList *p) {
+    UA_delete(p, &UA_TYPES[UA_TYPES_EVENTNOTIFICATIONLIST]);
 }
 
 #if defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 6
@@ -22376,7 +23258,7 @@ UA_EventFilter_delete(UA_EventFilter *p) {
 _UA_END_DECLS
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/include/open62541/util.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/include/open62541/util.h" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -22541,7 +23423,7 @@ UA_constantTimeEqual(const void *ptr1, const void *ptr2, size_t length) {
 _UA_END_DECLS
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/include/open62541/server.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/include/open62541/server.h" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -24142,7 +25024,7 @@ UA_Server_getStatistics(UA_Server *server);
 _UA_END_DECLS
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/include/open62541/plugin/log.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/include/open62541/plugin/log.h" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -24296,7 +25178,7 @@ UA_LOG_FATAL(const UA_Logger *logger, UA_LogCategory category, const char *msg,
 _UA_END_DECLS
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/include/open62541/plugin/network.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/include/open62541/plugin/network.h" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -24502,7 +25384,7 @@ typedef UA_Connection
 _UA_END_DECLS
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/include/open62541/plugin/accesscontrol.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/include/open62541/plugin/accesscontrol.h" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -24617,7 +25499,7 @@ struct UA_AccessControl {
 _UA_END_DECLS
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/include/open62541/plugin/pki.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/include/open62541/plugin/pki.h" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -24668,7 +25550,7 @@ struct UA_CertificateVerification {
 _UA_END_DECLS
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/include/open62541/plugin/securitypolicy.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/include/open62541/plugin/securitypolicy.h" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -25054,7 +25936,7 @@ UA_SecurityPolicy_getSecurityPolicyByUri(const UA_Server *server,
 _UA_END_DECLS
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/include/open62541/server_pubsub.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/include/open62541/server_pubsub.h" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -25610,7 +26492,7 @@ _UA_END_DECLS
 
 #endif /* UA_SERVER_PUBSUB_H */
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/include/open62541/plugin/pubsub.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/include/open62541/plugin/pubsub.h" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -25718,7 +26600,7 @@ UA_ServerConfig_addPubSubTransportLayer(UA_ServerConfig *config,
 _UA_END_DECLS
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/deps/ziptree.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/deps/ziptree.h" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -25966,7 +26848,7 @@ name##_ZIP_ITER(struct name *head, name##_cb cb, void *data) {          \
 #endif
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/include/open62541/plugin/nodestore.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/include/open62541/plugin/nodestore.h" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -26503,7 +27385,203 @@ UA_Node_clear(UA_Node *node);
 _UA_END_DECLS
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/include/open62541/server_config.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/include/open62541/plugin/historydatabase.h" ***********************************/
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ *    Copyright 2018 (c) basysKom GmbH <opensource@basyskom.com> (Author: Peter Rustler)
+ */
+
+
+
+_UA_BEGIN_DECLS
+
+typedef struct UA_HistoryDatabase UA_HistoryDatabase;
+
+struct UA_HistoryDatabase {
+    void *context;
+
+    void (*clear)(UA_HistoryDatabase *hdb);
+
+    /* This function will be called when a nodes value is set.
+     * Use this to insert data into your database(s) if polling is not suitable
+     * and you need to get all data changes.
+     * Set it to NULL if you do not need it.
+     *
+     * server is the server this node lives in.
+     * hdbContext is the context of the UA_HistoryDatabase.
+     * sessionId and sessionContext identify the session which set this value.
+     * nodeId is the node id for which data was set.
+     * historizing is the nodes boolean flag for historizing
+     * value is the new value. */
+    void
+    (*setValue)(UA_Server *server,
+                void *hdbContext,
+                const UA_NodeId *sessionId,
+                void *sessionContext,
+                const UA_NodeId *nodeId,
+                UA_Boolean historizing,
+                const UA_DataValue *value);
+
+    /* This function will be called when an event is triggered.
+     * Use it to insert data into your event database.
+     * No default implementation is provided by UA_HistoryDatabase_default.
+     *
+     * server is the server this node lives in.
+     * hdbContext is the context of the UA_HistoryDatabase.
+     * sessionId and sessionContext identify the session which set this value.
+     * originId is the node id of the event's origin.
+     * emitterId is the node id of the event emitter.
+     * eventId is the node id of the event that is being emitted.
+     * willEventNodeBeDeleted specifies whether the event node will be deleted after
+     *                        it has been triggered (this might be relevant for
+     *                        in-memory storage).
+     * historicalEventFilter is the value of the HistoricalEventFilter property of
+     *                       the emitter (OPC UA Part 11, 5.3.2), it is NULL if
+     *                       the property does not exist or is not set.
+     * fieldList is the event field list returned after application of
+     *           historicalEventFilter to the event node
+     *           (NULL if historicalEventFilter is NULL or filtering was
+     *           unsuccessful); the fieldList is not deleted so
+     *           make sure to delete it when it is no longer needed. */
+    void
+    (*setEvent)(UA_Server *server,
+                void *hdbContext,
+                const UA_NodeId *originId,
+                const UA_NodeId *emitterId,
+                const UA_NodeId *eventId,
+                UA_Boolean willEventNodeBeDeleted,
+                const UA_EventFilter *historicalEventFilter,
+                UA_EventFieldList *fieldList);
+
+    /* This function is called if a history read is requested with
+     * isRawReadModified set to false. Setting it to NULL will result in a
+     * response with statuscode UA_STATUSCODE_BADHISTORYOPERATIONUNSUPPORTED.
+     *
+     * server is the server this node lives in.
+     * hdbContext is the context of the UA_HistoryDatabase.
+     * sessionId and sessionContext identify the session which set this value.
+     * requestHeader, historyReadDetails, timestampsToReturn, releaseContinuationPoints
+     * nodesToReadSize and nodesToRead is the requested data from the client. It
+     *                 is from the request object.
+     * response the response to fill for the client. If the request is ok, there
+     *          is no need to use it. Use this to set status codes other than
+     *          "Good" or other data. You find an already allocated
+     *          UA_HistoryReadResult array with an UA_HistoryData object in the
+     *          extension object in the size of nodesToReadSize. If you are not
+     *          willing to return data, you have to delete the results array,
+     *          set it to NULL and set the resultsSize to 0. Do not access
+     *          historyData after that.
+     * historyData is a proper typed pointer array pointing in the
+     *             UA_HistoryReadResult extension object. use this to provide
+     *             result data to the client. Index in the array is the same as
+     *             in nodesToRead and the UA_HistoryReadResult array. */
+    void
+    (*readRaw)(UA_Server *server,
+               void *hdbContext,
+               const UA_NodeId *sessionId,
+               void *sessionContext,
+               const UA_RequestHeader *requestHeader,
+               const UA_ReadRawModifiedDetails *historyReadDetails,
+               UA_TimestampsToReturn timestampsToReturn,
+               UA_Boolean releaseContinuationPoints,
+               size_t nodesToReadSize,
+               const UA_HistoryReadValueId *nodesToRead,
+               UA_HistoryReadResponse *response,
+               UA_HistoryData * const * const historyData);
+
+    /* No default implementation is provided by UA_HistoryDatabase_default
+     * for the following function */
+    void
+    (*readModified)(UA_Server *server,
+               void *hdbContext,
+               const UA_NodeId *sessionId,
+               void *sessionContext,
+               const UA_RequestHeader *requestHeader,
+               const UA_ReadRawModifiedDetails *historyReadDetails,
+               UA_TimestampsToReturn timestampsToReturn,
+               UA_Boolean releaseContinuationPoints,
+               size_t nodesToReadSize,
+               const UA_HistoryReadValueId *nodesToRead,
+               UA_HistoryReadResponse *response,
+               UA_HistoryModifiedData * const * const historyData);
+
+    /* No default implementation is provided by UA_HistoryDatabase_default
+     * for the following function */
+    void
+    (*readEvent)(UA_Server *server,
+               void *hdbContext,
+               const UA_NodeId *sessionId,
+               void *sessionContext,
+               const UA_RequestHeader *requestHeader,
+               const UA_ReadEventDetails *historyReadDetails,
+               UA_TimestampsToReturn timestampsToReturn,
+               UA_Boolean releaseContinuationPoints,
+               size_t nodesToReadSize,
+               const UA_HistoryReadValueId *nodesToRead,
+               UA_HistoryReadResponse *response,
+               UA_HistoryEvent * const * const historyData);
+
+    /* No default implementation is provided by UA_HistoryDatabase_default
+     * for the following function */
+    void
+    (*readProcessed)(UA_Server *server,
+               void *hdbContext,
+               const UA_NodeId *sessionId,
+               void *sessionContext,
+               const UA_RequestHeader *requestHeader,
+               const UA_ReadProcessedDetails *historyReadDetails,
+               UA_TimestampsToReturn timestampsToReturn,
+               UA_Boolean releaseContinuationPoints,
+               size_t nodesToReadSize,
+               const UA_HistoryReadValueId *nodesToRead,
+               UA_HistoryReadResponse *response,
+               UA_HistoryData * const * const historyData);
+
+    /* No default implementation is provided by UA_HistoryDatabase_default
+     * for the following function */
+    void
+    (*readAtTime)(UA_Server *server,
+               void *hdbContext,
+               const UA_NodeId *sessionId,
+               void *sessionContext,
+               const UA_RequestHeader *requestHeader,
+               const UA_ReadAtTimeDetails *historyReadDetails,
+               UA_TimestampsToReturn timestampsToReturn,
+               UA_Boolean releaseContinuationPoints,
+               size_t nodesToReadSize,
+               const UA_HistoryReadValueId *nodesToRead,
+               UA_HistoryReadResponse *response,
+               UA_HistoryData * const * const historyData);
+
+    void
+    (*updateData)(UA_Server *server,
+                  void *hdbContext,
+                  const UA_NodeId *sessionId,
+                  void *sessionContext,
+                  const UA_RequestHeader *requestHeader,
+                  const UA_UpdateDataDetails *details,
+                  UA_HistoryUpdateResult *result);
+
+    void
+    (*deleteRawModified)(UA_Server *server,
+                         void *hdbContext,
+                         const UA_NodeId *sessionId,
+                         void *sessionContext,
+                         const UA_RequestHeader *requestHeader,
+                         const UA_DeleteRawModifiedDetails *details,
+                         UA_HistoryUpdateResult *result);
+
+    /* Add more function pointer here.
+     * For example for read_event, read_annotation, update_details */
+};
+
+_UA_END_DECLS
+
+
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/include/open62541/server_config.h" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -26786,7 +27864,7 @@ UA_ServerConfig_setCustomHostname(UA_ServerConfig *config,
 _UA_END_DECLS
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/include/open62541/client_config.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/include/open62541/client_config.h" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -26924,7 +28002,7 @@ _UA_END_DECLS
 
 #endif /* UA_CLIENT_CONFIG_H */
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/include/open62541/client.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/include/open62541/client.h" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -27513,7 +28591,7 @@ UA_Client_removeRepeatedCallback(UA_Client *client, UA_UInt64 callbackId) {
 _UA_END_DECLS
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/include/open62541/client_highlevel.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/include/open62541/client_highlevel.h" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -28172,7 +29250,7 @@ UA_Client_forEachChildNodeCall(UA_Client *client, UA_NodeId parentNodeId,
 _UA_END_DECLS
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/include/open62541/client_subscriptions.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/include/open62541/client_subscriptions.h" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -28460,7 +29538,7 @@ UA_Client_MonitoredItems_setTriggering_async(UA_Client *client,
 _UA_END_DECLS
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/include/open62541/client_highlevel_async.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/include/open62541/client_highlevel_async.h" ***********************************/
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -29177,7 +30255,7 @@ UA_Cient_translateBrowsePathsToNodeIds_async(UA_Client *client, char **paths,
 _UA_END_DECLS
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/plugins/include/open62541/plugin/accesscontrol_default.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/plugins/include/open62541/plugin/accesscontrol_default.h" ***********************************/
 
 /* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
  * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
@@ -29206,7 +30284,7 @@ UA_AccessControl_default(UA_ServerConfig *config, UA_Boolean allowAnonymous,
 _UA_END_DECLS
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/plugins/include/open62541/plugin/pki_default.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/plugins/include/open62541/plugin/pki_default.h" ***********************************/
 
 /* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
  * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
@@ -29252,7 +30330,7 @@ UA_CertificateVerification_CertFolders(UA_CertificateVerification *cv,
 _UA_END_DECLS
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/plugins/include/open62541/plugin/log_stdout.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/plugins/include/open62541/plugin/log_stdout.h" ***********************************/
 
 /* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
  * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
@@ -29283,7 +30361,7 @@ UA_EXPORT UA_Logger UA_Log_Stdout_withLevel(UA_LogLevel minlevel);
 _UA_END_DECLS
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/plugins/include/open62541/plugin/nodestore_default.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/plugins/include/open62541/plugin/nodestore_default.h" ***********************************/
 
 /* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
  * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
@@ -29314,7 +30392,7 @@ UA_Nodestore_ZipTree(UA_Nodestore *ns);
 _UA_END_DECLS
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/plugins/include/open62541/server_config_default.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/plugins/include/open62541/server_config_default.h" ***********************************/
 
 /* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
  * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
@@ -29539,7 +30617,7 @@ UA_ServerConfig_addAllEndpoints(UA_ServerConfig *config);
 _UA_END_DECLS
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/plugins/include/open62541/client_config_default.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/plugins/include/open62541/client_config_default.h" ***********************************/
 
 /* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
  * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
@@ -29569,7 +30647,7 @@ UA_ClientConfig_setDefaultEncryption(UA_ClientConfig *config,
 _UA_END_DECLS
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/plugins/include/open62541/plugin/securitypolicy_default.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/plugins/include/open62541/plugin/securitypolicy_default.h" ***********************************/
 
 /* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
  * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
@@ -29613,7 +30691,7 @@ UA_SecurityPolicy_Basic256Sha256(UA_SecurityPolicy *policy,
 _UA_END_DECLS
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/plugins/include/open62541/plugin/log_syslog.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/plugins/include/open62541/plugin/log_syslog.h" ***********************************/
 
 /* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
  * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
@@ -29654,7 +30732,479 @@ UA_Log_Syslog(void);
 _UA_END_DECLS
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/include/open62541/network_tcp.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/plugins/include/open62541/plugin/historydata/history_data_backend.h" ***********************************/
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ *    Copyright 2018 (c) basysKom GmbH <opensource@basyskom.com> (Author: Peter Rustler)
+ */
+
+
+
+_UA_BEGIN_DECLS
+
+typedef enum {
+    MATCH_EQUAL, /* Match with the exact timestamp. */
+    MATCH_AFTER, /* Match the value with the timestamp in the
+                    database that is the first later in time from the provided timestamp. */
+    MATCH_EQUAL_OR_AFTER, /* Match exactly if possible, or the first timestamp
+                             later in time from the provided timestamp. */
+    MATCH_BEFORE, /* Match the first timestamp in the database that is earlier
+                     in time from the provided timestamp. */
+    MATCH_EQUAL_OR_BEFORE /* Match exactly if possible, or the first timestamp
+                             that is earlier in time from the provided timestamp. */
+} MatchStrategy;
+
+typedef struct UA_HistoryDataBackend UA_HistoryDataBackend;
+
+struct UA_HistoryDataBackend {
+    void *context;
+
+    void
+    (*deleteMembers)(UA_HistoryDataBackend *backend);
+
+    /* This function sets a DataValue for a node in the historical data storage.
+     *
+     * server is the server the node lives in.
+     * hdbContext is the context of the UA_HistoryDataBackend.
+     * sessionId and sessionContext identify the session that wants to read historical data.
+     * nodeId is the node for which the value shall be stored.
+     * value is the value which shall be stored.
+     * historizing is the historizing flag of the node identified by nodeId.
+     * If sessionId is NULL, the historizing flag is invalid and must not be used. */
+    UA_StatusCode
+    (*serverSetHistoryData)(UA_Server *server,
+                            void *hdbContext,
+                            const UA_NodeId *sessionId,
+                            void *sessionContext,
+                            const UA_NodeId *nodeId,
+                            UA_Boolean historizing,
+                            const UA_DataValue *value);
+
+    /* This function is the high level interface for the ReadRaw operation. Set
+     * it to NULL if you use the low level API for your plugin. It should be
+     * used if the low level interface does not suite your database. It is more
+     * complex to implement the high level interface but it also provide more
+     * freedom. If you implement this, then set all low level api function
+     * pointer to NULL.
+     *
+     * server is the server the node lives in.
+     * hdbContext is the context of the UA_HistoryDataBackend.
+     * sessionId and sessionContext identify the session that wants to read historical data.
+     * backend is the HistoryDataBackend whose storage is to be queried.
+     * start is the start time of the HistoryRead request.
+     * end is the end time of the HistoryRead request.
+     * nodeId is the node id of the node for which historical data is requested.
+     * maxSizePerResponse is the maximum number of items per response the server can provide.
+     * numValuesPerNode is the maximum number of items per response the client wants to receive.
+     * returnBounds determines if the client wants to receive bounding values.
+     * timestampsToReturn contains the time stamps the client is interested in.
+     * range is the numeric range the client wants to read.
+     * releaseContinuationPoints determines if the continuation points shall be released.
+     * continuationPoint is the continuation point the client wants to release or start from.
+     * outContinuationPoint is the continuation point that gets passed to the
+     *                      client by the HistoryRead service.
+     * result contains the result histoy data that gets passed to the client. */
+    UA_StatusCode
+    (*getHistoryData)(UA_Server *server,
+                      const UA_NodeId *sessionId,
+                      void *sessionContext,
+                      const UA_HistoryDataBackend *backend,
+                      const UA_DateTime start,
+                      const UA_DateTime end,
+                      const UA_NodeId *nodeId,
+                      size_t maxSizePerResponse,
+                      UA_UInt32 numValuesPerNode,
+                      UA_Boolean returnBounds,
+                      UA_TimestampsToReturn timestampsToReturn,
+                      UA_NumericRange range,
+                      UA_Boolean releaseContinuationPoints,
+                      const UA_ByteString *continuationPoint,
+                      UA_ByteString *outContinuationPoint,
+                      UA_HistoryData *result);
+
+    /* This function is part of the low level HistoryRead API. It returns the
+     * index of a value in the database which matches certain criteria.
+     *
+     * server is the server the node lives in.
+     * hdbContext is the context of the UA_HistoryDataBackend.
+     * sessionId and sessionContext identify the session that wants to read historical data.
+     * nodeId is the node id of the node for which the matching value shall be found.
+     * timestamp is the timestamp of the requested index.
+     * strategy is the matching strategy which shall be applied in finding the index. */
+    size_t
+    (*getDateTimeMatch)(UA_Server *server,
+                        void *hdbContext,
+                        const UA_NodeId *sessionId,
+                        void *sessionContext,
+                        const UA_NodeId *nodeId,
+                        const UA_DateTime timestamp,
+                        const MatchStrategy strategy);
+
+    /* This function is part of the low level HistoryRead API. It returns the
+     * index of the element after the last valid entry in the database for a
+     * node.
+     *
+     * server is the server the node lives in.
+     * hdbContext is the context of the UA_HistoryDataBackend.
+     * sessionId and sessionContext identify the session that wants to read historical data.
+     * nodeId is the node id of the node for which the end of storage shall be returned. */
+    size_t
+    (*getEnd)(UA_Server *server,
+              void *hdbContext,
+              const UA_NodeId *sessionId,
+              void *sessionContext,
+              const UA_NodeId *nodeId);
+
+    /* This function is part of the low level HistoryRead API. It returns the
+     * index of the last element in the database for a node.
+     *
+     * server is the server the node lives in.
+     * hdbContext is the context of the UA_HistoryDataBackend.
+     * sessionId and sessionContext identify the session that wants to read historical data.
+     * nodeId is the node id of the node for which the index of the last element
+     *        shall be returned. */
+    size_t
+    (*lastIndex)(UA_Server *server,
+                 void *hdbContext,
+                 const UA_NodeId *sessionId,
+                 void *sessionContext,
+                 const UA_NodeId *nodeId);
+
+    /* This function is part of the low level HistoryRead API. It returns the
+     * index of the first element in the database for a node.
+     *
+     * server is the server the node lives in.
+     * hdbContext is the context of the UA_HistoryDataBackend.
+     * sessionId and sessionContext identify the session that wants to read historical data.
+     * nodeId is the node id of the node for which the index of the first
+     *        element shall be returned. */
+    size_t
+    (*firstIndex)(UA_Server *server,
+                  void *hdbContext,
+                  const UA_NodeId *sessionId,
+                  void *sessionContext,
+                  const UA_NodeId *nodeId);
+
+    /* This function is part of the low level HistoryRead API. It returns the
+     * number of elements between startIndex and endIndex including both.
+     *
+     * server is the server the node lives in.
+     * hdbContext is the context of the UA_HistoryDataBackend.
+     * sessionId and sessionContext identify the session that wants to read historical data.
+     * nodeId is the node id of the node for which the number of elements shall be returned.
+     * startIndex is the index of the first element in the range.
+     * endIndex is the index of the last element in the range. */
+    size_t
+    (*resultSize)(UA_Server *server,
+                  void *hdbContext,
+                  const UA_NodeId *sessionId,
+                  void *sessionContext,
+                  const UA_NodeId *nodeId,
+                  size_t startIndex,
+                  size_t endIndex);
+
+    /* This function is part of the low level HistoryRead API. It copies data
+     * values inside a certain range into a buffer.
+     *
+     * server is the server the node lives in.
+     * hdbContext is the context of the UA_HistoryDataBackend.
+     * sessionId and sessionContext identify the session that wants to read historical data.
+     * nodeId is the node id of the node for which the data values shall be copied.
+     * startIndex is the index of the first value in the range.
+     * endIndex is the index of the last value in the range.
+     * reverse determines if the values shall be copied in reverse order.
+     * valueSize is the maximal number of data values to copy.
+     * range is the numeric range which shall be copied for every data value.
+     * releaseContinuationPoints determines if the continuation points shall be released.
+     * continuationPoint is a continuation point the client wants to release or start from.
+     * outContinuationPoint is a continuation point which will be passed to the client.
+     * providedValues contains the number of values that were copied.
+     * values contains the values that have been copied from the database. */
+    UA_StatusCode
+    (*copyDataValues)(UA_Server *server,
+                      void *hdbContext,
+                      const UA_NodeId *sessionId,
+                      void *sessionContext,
+                      const UA_NodeId *nodeId,
+                      size_t startIndex,
+                      size_t endIndex,
+                      UA_Boolean reverse,
+                      size_t valueSize,
+                      UA_NumericRange range,
+                      UA_Boolean releaseContinuationPoints,
+                      const UA_ByteString *continuationPoint,
+                      UA_ByteString *outContinuationPoint,
+                      size_t *providedValues,
+                      UA_DataValue *values);
+
+    /* This function is part of the low level HistoryRead API. It returns the
+     * data value stored at a certain index in the database.
+     *
+     * server is the server the node lives in.
+     * hdbContext is the context of the UA_HistoryDataBackend.
+     * sessionId and sessionContext identify the session that wants to read historical data.
+     * nodeId is the node id of the node for which the data value shall be returned.
+     * index is the index in the database for which the data value is requested. */
+    const UA_DataValue*
+    (*getDataValue)(UA_Server *server,
+                    void *hdbContext,
+                    const UA_NodeId *sessionId,
+                    void *sessionContext,
+                    const UA_NodeId *nodeId,
+                    size_t index);
+
+    /* This function returns UA_TRUE if the backend supports returning bounding
+     * values for a node. This function is mandatory.
+     *
+     * server is the server the node lives in.
+     * hdbContext is the context of the UA_HistoryDataBackend.
+     * sessionId and sessionContext identify the session that wants to read
+     *           historical data.
+     * nodeId is the node id of the node for which the capability to return
+     *        bounds shall be queried. */
+    UA_Boolean
+    (*boundSupported)(UA_Server *server,
+                      void *hdbContext,
+                      const UA_NodeId *sessionId,
+                      void *sessionContext,
+                      const UA_NodeId *nodeId);
+
+    /* This function returns UA_TRUE if the backend supports returning the
+     * requested timestamps for a node. This function is mandatory.
+     *
+     * server is the server the node lives in.
+     * hdbContext is the context of the UA_HistoryDataBackend.
+     * sessionId and sessionContext identify the session that wants to read historical data.
+     * nodeId is the node id of the node for which the capability to return
+     *        certain timestamps shall be queried. */
+    UA_Boolean
+    (*timestampsToReturnSupported)(UA_Server *server,
+                                   void *hdbContext,
+                                   const UA_NodeId *sessionId,
+                                   void *sessionContext,
+                                   const UA_NodeId *nodeId,
+                                   const UA_TimestampsToReturn timestampsToReturn);
+
+    UA_StatusCode
+    (*insertDataValue)(UA_Server *server,
+                       void *hdbContext,
+                       const UA_NodeId *sessionId,
+                       void *sessionContext,
+                       const UA_NodeId *nodeId,
+                       const UA_DataValue *value);
+    UA_StatusCode
+    (*replaceDataValue)(UA_Server *server,
+                        void *hdbContext,
+                        const UA_NodeId *sessionId,
+                        void *sessionContext,
+                        const UA_NodeId *nodeId,
+                        const UA_DataValue *value);
+    UA_StatusCode
+    (*updateDataValue)(UA_Server *server,
+                       void *hdbContext,
+                       const UA_NodeId *sessionId,
+                       void *sessionContext,
+                       const UA_NodeId *nodeId,
+                       const UA_DataValue *value);
+    UA_StatusCode
+    (*removeDataValue)(UA_Server *server,
+                       void *hdbContext,
+                       const UA_NodeId *sessionId,
+                       void *sessionContext,
+                       const UA_NodeId *nodeId,
+                       UA_DateTime startTimestamp,
+                       UA_DateTime endTimestamp);
+};
+
+_UA_END_DECLS
+
+
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/plugins/include/open62541/plugin/historydata/history_data_gathering.h" ***********************************/
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ *    Copyright 2018 (c) basysKom GmbH <opensource@basyskom.com> (Author: Peter Rustler)
+ */
+
+
+
+_UA_BEGIN_DECLS
+
+typedef enum {
+    UA_HISTORIZINGUPDATESTRATEGY_USER     = 0x00, /* The user of the api stores the values to the database himself.
+                                                     The api will not store any value to the database. */
+    UA_HISTORIZINGUPDATESTRATEGY_VALUESET = 0x01, /* Values will be stored when a node's value is set.
+                                                     The values will be stored when a node is updated via write service.*/
+    UA_HISTORIZINGUPDATESTRATEGY_POLL     = 0x02  /* The value of the node will be read periodically.
+                                                     This is mainly relevant for datasource nodes which do
+                                                     not use the write service.
+                                                     Values will not be stored if the value is
+                                                     equal to the old value. */
+} UA_HistorizingUpdateStrategy;
+
+typedef struct {
+    UA_HistoryDataBackend historizingBackend; /* The database backend used for this node. */
+    size_t maxHistoryDataResponseSize; /* The maximum number of values returned by the server in one response.
+                                          If the result has more values, continuation points will be used. */
+    UA_HistorizingUpdateStrategy historizingUpdateStrategy; /* Defines how the values in the database will be updated.
+                                                               See UA_HistorizingUpdateStrategy for details. */
+    size_t pollingInterval; /* The polling interval for UA_HISTORIZINGUPDATESTRATEGY_POLL. */
+    void *userContext; /* A pointer to store your own settings. */
+} UA_HistorizingNodeIdSettings;
+
+typedef struct UA_HistoryDataGathering UA_HistoryDataGathering;
+struct UA_HistoryDataGathering {
+    void *context;
+
+    void
+    (*deleteMembers)(UA_HistoryDataGathering *gathering);
+
+    /* This function registers a node for the gathering of historical data.
+     *
+     * server is the server the node lives in.
+     * hdgContext is the context of the UA_HistoryDataGathering.
+     * nodeId is the node id of the node to register.
+     * setting contains the gatering settings for the node to register. */
+    UA_StatusCode
+    (*registerNodeId)(UA_Server *server,
+                      void *hdgContext,
+                      const UA_NodeId *nodeId,
+                      const UA_HistorizingNodeIdSettings setting);
+
+    /* This function stops polling a node for value changes.
+     *
+     * server is the server the node lives in.
+     * hdgContext is the context of the UA_HistoryDataGathering.
+     * nodeId is id of the node for which polling shall be stopped.
+     * setting contains the gatering settings for the node. */
+    UA_StatusCode
+    (*stopPoll)(UA_Server *server,
+                void *hdgContext,
+                const UA_NodeId *nodeId);
+
+    /* This function starts polling a node for value changes.
+     *
+     * server is the server the node lives in.
+     * hdgContext is the context of the UA_HistoryDataGathering.
+     * nodeId is the id of the node for which polling shall be started. */
+    UA_StatusCode
+    (*startPoll)(UA_Server *server,
+                 void *hdgContext,
+                 const UA_NodeId *nodeId);
+
+    /* This function modifies the gathering settings for a node.
+     *
+     * server is the server the node lives in.
+     * hdgContext is the context of the UA_HistoryDataGathering.
+     * nodeId is the node id of the node for which gathering shall be modified.
+     * setting contains the new gatering settings for the node. */
+    UA_Boolean
+    (*updateNodeIdSetting)(UA_Server *server,
+                           void *hdgContext,
+                           const UA_NodeId *nodeId,
+                           const UA_HistorizingNodeIdSettings setting);
+
+    /* Returns the gathering settings for a node.
+     *
+     * server is the server the node lives in.
+     * hdgContext is the context of the UA_HistoryDataGathering.
+     * nodeId is the node id of the node for which the gathering settings shall
+     *        be retrieved. */
+    const UA_HistorizingNodeIdSettings*
+    (*getHistorizingSetting)(UA_Server *server,
+                             void *hdgContext,
+                             const UA_NodeId *nodeId);
+
+    /* Sets a DataValue for a node in the historical data storage.
+     *
+     * server is the server the node lives in.
+     * hdgContext is the context of the UA_HistoryDataGathering.
+     * sessionId and sessionContext identify the session which wants to set this value.
+     * nodeId is the node id of the node for which a value shall be set.
+     * historizing is the historizing flag of the node identified by nodeId.
+     * value is the value to set in the history data storage. */
+    void
+    (*setValue)(UA_Server *server,
+                void *hdgContext,
+                const UA_NodeId *sessionId,
+                void *sessionContext,
+                const UA_NodeId *nodeId,
+                UA_Boolean historizing,
+                const UA_DataValue *value);
+};
+
+_UA_END_DECLS
+
+
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/plugins/include/open62541/plugin/historydata/history_database_default.h" ***********************************/
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ *    Copyright 2018 (c) basysKom GmbH <opensource@basyskom.com> (Author: Peter Rustler)
+ */
+
+
+
+
+_UA_BEGIN_DECLS
+
+UA_HistoryDatabase UA_EXPORT
+UA_HistoryDatabase_default(UA_HistoryDataGathering gathering);
+
+_UA_END_DECLS
+
+
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/plugins/include/open62541/plugin/historydata/history_data_gathering_default.h" ***********************************/
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ *    Copyright 2018 (c) basysKom GmbH <opensource@basyskom.com> (Author: Peter Rustler)
+ */
+
+
+
+_UA_BEGIN_DECLS
+
+UA_HistoryDataGathering UA_EXPORT
+UA_HistoryDataGathering_Default(size_t initialNodeIdStoreSize);
+
+_UA_END_DECLS
+
+
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/plugins/include/open62541/plugin/historydata/history_data_backend_memory.h" ***********************************/
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ *    Copyright 2018 (c) basysKom GmbH <opensource@basyskom.com> (Author: Peter Rustler)
+ */
+
+
+
+_UA_BEGIN_DECLS
+
+#define INITIAL_MEMORY_STORE_SIZE 1000
+
+UA_HistoryDataBackend UA_EXPORT
+UA_HistoryDataBackend_Memory(size_t initialNodeIdStoreSize, size_t initialDataStoreSize);
+
+void UA_EXPORT
+UA_HistoryDataBackend_Memory_deleteMembers(UA_HistoryDataBackend *backend);
+
+_UA_END_DECLS
+
+
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/include/open62541/network_tcp.h" ***********************************/
 
 /* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
  * See http://creativecommons.org/publicdomain/zero/1.0/ for more information. 
@@ -29694,7 +31244,7 @@ UA_ClientConnectionTCP_init(UA_ConnectionConfig config, const UA_String endpoint
 _UA_END_DECLS
 
 
-/*********************************** amalgamated original file "/home/jvoe/open62541/include/open62541/architecture_functions.h" ***********************************/
+/*********************************** amalgamated original file "/home/pdie/sonstiges/qtopcua/repos/open62541/include/open62541/architecture_functions.h" ***********************************/
 
 /* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
  * See http://creativecommons.org/publicdomain/zero/1.0/ for more information.
diff --git a/src/opcua/CMakeLists.txt b/src/opcua/CMakeLists.txt
index 3f174ca..80f2e7a 100644
--- a/src/opcua/CMakeLists.txt
+++ b/src/opcua/CMakeLists.txt
@@ -26,6 +26,7 @@ qt_internal_add_module(OpcUa
         client/qopcuacomplexnumber.cpp client/qopcuacomplexnumber.h
         client/qopcuacontentfilterelement.cpp client/qopcuacontentfilterelement.h
         client/qopcuacontentfilterelementresult.cpp client/qopcuacontentfilterelementresult.h
+        client/qopcuadatavalue.cpp client/qopcuadatavalue.h
         client/qopcuadeletereferenceitem.cpp client/qopcuadeletereferenceitem.h
         client/qopcuadoublecomplexnumber.cpp client/qopcuadoublecomplexnumber.h
         client/qopcuaelementoperand.cpp client/qopcuaelementoperand.h
@@ -35,6 +36,11 @@ qt_internal_add_module(OpcUa
         client/qopcuaeventfilterresult.cpp client/qopcuaeventfilterresult.h
         client/qopcuaexpandednodeid.cpp client/qopcuaexpandednodeid.h
         client/qopcuaextensionobject.cpp client/qopcuaextensionobject.h
+        client/qopcuahistorydata.cpp client/qopcuahistorydata.h
+        client/qopcuahistoryreadrawrequest.cpp client/qopcuahistoryreadrawrequest.h
+        client/qopcuahistoryreadresponse.cpp client/qopcuahistoryreadresponse.h
+        client/qopcuahistoryreadresponseimpl.cpp client/qopcuahistoryreadresponseimpl_p.h
+        client/qopcuahistoryreadresponse_p.h
         client/qopcualiteraloperand.cpp client/qopcualiteraloperand.h
         client/qopcualocalizedtext.cpp client/qopcualocalizedtext.h
         client/qopcuamonitoringparameters.cpp client/qopcuamonitoringparameters.h client/qopcuamonitoringparameters_p.h
@@ -59,6 +65,7 @@ qt_internal_add_module(OpcUa
         core/qopcuaplugin.cpp core/qopcuaplugin.h
         core/qopcuaprovider.cpp core/qopcuaprovider.h
         qopcuaglobal.h
+
     DEFINES
         QT_NO_FOREACH
     LIBRARIES
diff --git a/src/opcua/client/qopcuabackend_p.h b/src/opcua/client/qopcuabackend_p.h
index e6efe0e..61463af 100644
--- a/src/opcua/client/qopcuabackend_p.h
+++ b/src/opcua/client/qopcuabackend_p.h
@@ -98,6 +98,7 @@ Q_SIGNALS:
     void findServersFinished(QList<QOpcUaApplicationDescription> servers, QOpcUa::UaStatusCode statusCode, QUrl requestUrl);
     void readNodeAttributesFinished(QList<QOpcUaReadResult> results, QOpcUa::UaStatusCode serviceResult);
     void writeNodeAttributesFinished(QList<QOpcUaWriteResult> results, QOpcUa::UaStatusCode serviceResult);
+    void readHistoryDataFinished(quint64 handle, bool isHandleValid, QOpcUaHistoryReadRawRequest request, QList<QOpcUaHistoryData> results, QOpcUa::UaStatusCode serviceResult);
 
     void addNodeFinished(QOpcUaExpandedNodeId requestedNodeId, QString assignedNodeId, QOpcUa::UaStatusCode statusCode);
     void deleteNodeFinished(QString nodeId, QOpcUa::UaStatusCode statusCode);
@@ -108,6 +109,8 @@ Q_SIGNALS:
     void connectError(QOpcUaErrorState *errorState);
     void passwordForPrivateKeyRequired(QString keyFilePath, QString *password, bool previousTryWasInvalid);
 
+    void historyDataAvailable(QList<QOpcUaHistoryData> data, QList<QByteArray> continuationPoints, QOpcUa::UaStatusCode serviceResult, uintptr_t handle);
+
 private:
     Q_DISABLE_COPY(QOpcUaBackend)
 };
diff --git a/src/opcua/client/qopcuaclient.cpp b/src/opcua/client/qopcuaclient.cpp
index ef1df06..de70278 100644
--- a/src/opcua/client/qopcuaclient.cpp
+++ b/src/opcua/client/qopcuaclient.cpp
@@ -935,4 +935,52 @@ QList<QOpcUaUserTokenPolicy::TokenType> QOpcUaClient::supportedUserTokenTypes()
     return d->m_impl->supportedUserTokenTypes();
 }
 
+/*!
+
+    Starts a read raw history request for one or multiple nodes. This is the Qt OPC UA representation for the OPC UA
+    ReadHistory service for reading raw historical data defined in
+    \l {https://reference.opcfoundation.org/v104/Core/docs/Part4/5.10.3/} {OPC-UA part 4, 5.10.3}.
+
+    The start timestamp, end timestamp, number of values per node, returnBounds and nodes to read
+    can be specified in a \l QOpcUaHistoryReadRawRequest.
+
+    Returns a \l QOpcUaHistoryReadResponse which contains the state of the request if the asynchronous
+    request has been successfully dispatched. The results are returned in the
+    \l QOpcUaHistoryReadResponse::readHistoryDataFinished(QList<QOpcUaHistoryData> results, QOpcUa::UaStatusCode serviceResult)
+    signal.
+
+    In the following example, the historic data from the last two days of two nodes are requested and printed.
+    The result is limited to ten values per node.
+
+    \code
+    QOpcUaHistoryReadRawRequest request(
+                { QOpcUaReadItem("ns=1;s=myValue1"), QOpcUaReadItem("ns=1;s=myValue2") },
+                QDateTime::currentDateTime(),
+                QDateTime::currentDateTime().addDays(-2),
+                10,
+                true);
+
+    QOpcUaHistoryReadResponse *response = m_client->readHistoryData(request);
+    if (response) {
+       QObject::connect(response, &QOpcUaHistoryReadResponse::readHistoryDataFinished,
+                        [] (QList<QOpcUaHistoryData> results, QOpcUa::UaStatusCode serviceResult) {
+                            if (serviceResult != QOpcUa::UaStatusCode::Good) {
+                                qWarning() << "Fetching historical data failed with:" << serviceResult;
+                            } else {
+                                for (const auto& result : results) {
+                                    qInfo() << "NodeId:" << result.nodeId();
+                                    for (const auto &dataValue : result.result())
+                                        qInfo() << "Value:" << dataValue.value();
+                                }
+                            }
+                        });
+    }
+    \endcode
+*/
+QOpcUaHistoryReadResponse *QOpcUaClient::readHistoryData(const QOpcUaHistoryReadRawRequest &request)
+{
+    Q_D(const QOpcUaClient);
+    return d->m_impl->readHistoryData(request);
+}
+
 QT_END_NAMESPACE
diff --git a/src/opcua/client/qopcuaclient.h b/src/opcua/client/qopcuaclient.h
index c897ad6..774f8b6 100644
--- a/src/opcua/client/qopcuaclient.h
+++ b/src/opcua/client/qopcuaclient.h
@@ -49,6 +49,7 @@
 #include <QtOpcUa/qopcuaaddreferenceitem.h>
 #include <QtOpcUa/qopcuadeletereferenceitem.h>
 #include <QtOpcUa/qopcuaendpointdescription.h>
+#include <QtOpcUa/qopcuahistoryreadrawrequest.h>
 
 #include <QtCore/qobject.h>
 #include <QtCore/qurl.h>
@@ -141,6 +142,8 @@ public:
     QStringList supportedSecurityPolicies() const;
     QList<QOpcUaUserTokenPolicy::TokenType> supportedUserTokenTypes() const;
 
+    QOpcUaHistoryReadResponse *readHistoryData(const QOpcUaHistoryReadRawRequest &request);
+
 Q_SIGNALS:
     void connected();
     void disconnected();
diff --git a/src/opcua/client/qopcuaclientimpl_p.h b/src/opcua/client/qopcuaclientimpl_p.h
index c04dccb..d29fc6a 100644
--- a/src/opcua/client/qopcuaclientimpl_p.h
+++ b/src/opcua/client/qopcuaclientimpl_p.h
@@ -81,6 +81,8 @@ public:
     virtual bool readNodeAttributes(const QList<QOpcUaReadItem> &nodesToRead) = 0;
     virtual bool writeNodeAttributes(const QList<QOpcUaWriteItem> &nodesToWrite) = 0;
 
+    virtual QOpcUaHistoryReadResponse *readHistoryData(const QOpcUaHistoryReadRawRequest &request) = 0;
+
     bool registerNode(QPointer<QOpcUaNodeImpl> obj);
     void unregisterNode(QPointer<QOpcUaNodeImpl> obj);
 
diff --git a/src/opcua/client/qopcuadatavalue.cpp b/src/opcua/client/qopcuadatavalue.cpp
new file mode 100644
index 0000000..12ca7ca
--- /dev/null
+++ b/src/opcua/client/qopcuadatavalue.cpp
@@ -0,0 +1,149 @@
+/****************************************************************************
+**
+** Copyright (C) 2021 basysKom GmbH, opensource@basyskom.com
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtOpcUa module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qopcuadatavalue.h"
+
+QT_BEGIN_NAMESPACE
+
+/*!
+    \class QOpcUaDataValue
+    \inmodule QtOpcUa
+    \brief This class stores OPC UA value data and associated metadata
+
+    This clas corresponds to the OPC UA DataValue type.
+*/
+class QOpcUaDataValueData : public QSharedData
+{
+public:
+    QDateTime serverTimestamp;
+    QDateTime sourceTimestamp;
+    QOpcUa::UaStatusCode statusCode {QOpcUa::UaStatusCode::Good};
+    QVariant value;
+};
+
+QOpcUaDataValue::QOpcUaDataValue()
+    : data(new QOpcUaDataValueData)
+{
+}
+
+/*!
+    Constructs a data value from \a other.
+*/
+QOpcUaDataValue::QOpcUaDataValue(const QOpcUaDataValue &other)
+    : data(other.data)
+{
+}
+
+/*!
+    Sets the values from \a rhs in this data value.
+*/
+QOpcUaDataValue &QOpcUaDataValue::operator=(const QOpcUaDataValue &rhs)
+{
+    if (this != &rhs)
+        data.operator=(rhs.data);
+    return *this;
+}
+
+QOpcUaDataValue::~QOpcUaDataValue()
+{
+}
+
+/*!
+    Returns the value.
+*/
+QVariant QOpcUaDataValue::value() const
+{
+    return data->value;
+}
+
+/*!
+    Sets the value to \a value.
+*/
+void QOpcUaDataValue::setValue(const QVariant &value)
+{
+    data->value = value;
+}
+
+/*!
+    Returns the status code for this data value. If the status code is not \l {QOpcUa::UaStatusCode} {Good}, the
+    value and the timestamps are invalid.
+*/
+QOpcUa::UaStatusCode QOpcUaDataValue::statusCode() const
+{
+    return data->statusCode;
+}
+
+/*!
+    Sets the status code to \a statusCode.
+*/
+void QOpcUaDataValue::setStatusCode(QOpcUa::UaStatusCode statusCode)
+{
+    data->statusCode = statusCode;
+}
+
+/*!
+    Returns the source timestamp for \l value().
+*/
+QDateTime QOpcUaDataValue::sourceTimestamp() const
+{
+    return data->sourceTimestamp;
+}
+
+/*!
+    Sets the source timestamp to \a sourceTimestamp.
+*/
+void QOpcUaDataValue::setSourceTimestamp(const QDateTime &sourceTimestamp)
+{
+    data->sourceTimestamp = sourceTimestamp;
+}
+
+/*!
+    Returns the server timestamp for \l value().
+*/
+QDateTime QOpcUaDataValue::serverTimestamp() const
+{
+    return data->serverTimestamp;
+}
+
+/*!
+    Sets the server timestamp to \a serverTimestamp.
+*/
+void QOpcUaDataValue::setServerTimestamp(const QDateTime &serverTimestamp)
+{
+    data->serverTimestamp = serverTimestamp;
+}
+
+QT_END_NAMESPACE
diff --git a/src/opcua/client/qopcuadatavalue.h b/src/opcua/client/qopcuadatavalue.h
new file mode 100644
index 0000000..a2e2a56
--- /dev/null
+++ b/src/opcua/client/qopcuadatavalue.h
@@ -0,0 +1,75 @@
+/****************************************************************************
+**
+** Copyright (C) 2021 basysKom GmbH, opensource@basyskom.com
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtOpcUa module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QOPCUADATAVALUE_H
+#define QOPCUADATAVALUE_H
+
+#include <QtOpcUa/qopcuatype.h>
+
+#include <QtCore/qdatetime.h>
+
+QT_BEGIN_NAMESPACE
+
+class QOpcUaDataValueData;
+class Q_OPCUA_EXPORT QOpcUaDataValue
+{
+public:
+    QOpcUaDataValue();
+    QOpcUaDataValue(const QOpcUaDataValue &other);
+    QOpcUaDataValue &operator=(const QOpcUaDataValue &rhs);
+    ~QOpcUaDataValue();
+
+    QDateTime serverTimestamp() const;
+    void setServerTimestamp(const QDateTime &serverTimestamp);
+
+    QDateTime sourceTimestamp() const;
+    void setSourceTimestamp(const QDateTime &sourceTimestamp);
+
+    QOpcUa::UaStatusCode statusCode() const;
+    void setStatusCode(QOpcUa::UaStatusCode statusCode);
+
+    QVariant value() const;
+    void setValue(const QVariant &value);
+
+private:
+    QSharedDataPointer<QOpcUaDataValueData> data;
+};
+
+QT_END_NAMESPACE
+
+Q_DECLARE_METATYPE(QOpcUaDataValue)
+
+#endif // QOPCUADATAVALUE_H
diff --git a/src/opcua/client/qopcuahistorydata.cpp b/src/opcua/client/qopcuahistorydata.cpp
new file mode 100644
index 0000000..4a71a47
--- /dev/null
+++ b/src/opcua/client/qopcuahistorydata.cpp
@@ -0,0 +1,163 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 basysKom GmbH, opensource@basyskom.com
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtOpcUa module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qopcuahistorydata.h"
+
+QT_BEGIN_NAMESPACE
+
+/*!
+    \class QOpcUaHistoryData
+    \inmodule QtOpcUa
+    \brief This class stores historical data values from a node.
+
+    When a request to read history data is being handled, instances of this class
+    are used to store information about which node has been read, its values and
+    the status code.
+    The finished signal of a history read request will return a list of QOpcUaHistoryData
+    objects which can be parsed to review the results of the request.
+*/
+
+class QOpcUaHistoryDataData : public QSharedData
+{
+public:
+    QList<QOpcUaDataValue> result;
+    QOpcUa::UaStatusCode statusCode;
+    QString nodeId;
+};
+
+QOpcUaHistoryData::QOpcUaHistoryData()
+    : data(new QOpcUaHistoryDataData)
+{
+    data->statusCode = QOpcUa::UaStatusCode::Good;
+}
+
+/*!
+    Constructs a history data item and stores which node it corresponds to.
+*/
+QOpcUaHistoryData::QOpcUaHistoryData(const QString &nodeId)
+    : data(new QOpcUaHistoryDataData)
+{
+    data->statusCode = QOpcUa::UaStatusCode::Good;
+    data->nodeId = nodeId;
+}
+
+/*!
+    Constructs a history data item from \a other.
+*/
+QOpcUaHistoryData::QOpcUaHistoryData(const QOpcUaHistoryData &other)
+    : data(other.data)
+{
+}
+
+QOpcUaHistoryData::~QOpcUaHistoryData()
+{
+}
+
+/*!
+    Returns the status code which indicates if an error occurred while fetching the history data.
+*/
+QOpcUa::UaStatusCode QOpcUaHistoryData::statusCode() const
+{
+    return data->statusCode;
+}
+
+/*!
+    Sets the status code to \a statusCode.
+*/
+void QOpcUaHistoryData::setStatusCode(QOpcUa::UaStatusCode statusCode)
+{
+    data->statusCode = statusCode;
+}
+
+/*!
+    Returns the list of data value objects which contain the results of the history read request.
+*/
+QList<QOpcUaDataValue> QOpcUaHistoryData::result() const
+{
+    return data->result;
+}
+
+/*!
+   Returns a reference to the result list.
+*/
+QList<QOpcUaDataValue> &QOpcUaHistoryData::resultRef()
+{
+    return data->result;
+}
+
+/*!
+    Returns the number of available data value objects.
+*/
+int QOpcUaHistoryData::count() const
+{
+    return data->result.count();
+}
+
+/*!
+    Adds a data value object given by \a value.
+*/
+void QOpcUaHistoryData::addValue(const QOpcUaDataValue &value)
+{
+    data->result.append(value);
+}
+
+/*!
+    Returns the nodeId of the node whose data has been stored.
+*/
+QString QOpcUaHistoryData::nodeId() const
+{
+    return data->nodeId;
+}
+
+/*!
+    Sets the nodeId to \a nodeId.
+*/
+void QOpcUaHistoryData::setNodeId(const QString &nodeId)
+{
+    data->nodeId = nodeId;
+}
+
+/*!
+    Sets the values from \a rhs in this history data item.
+*/
+QOpcUaHistoryData &QOpcUaHistoryData::operator=(const QOpcUaHistoryData &rhs)
+{
+    if (this != &rhs)
+        data.operator=(rhs.data);
+    return *this;
+}
+
+QT_END_NAMESPACE
diff --git a/src/opcua/client/qopcuahistorydata.h b/src/opcua/client/qopcuahistorydata.h
new file mode 100644
index 0000000..f726471
--- /dev/null
+++ b/src/opcua/client/qopcuahistorydata.h
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 basysKom GmbH, opensource@basyskom.com
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtOpcUa module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QOPCUAHISTORYDATA_H
+#define QOPCUAHISTORYDATA_H
+
+#include "QtOpcUa/qopcuatype.h"
+#include "QtOpcUa/qopcuadatavalue.h"
+
+#include <QtOpcUa/qopcuaglobal.h>
+
+QT_BEGIN_NAMESPACE
+
+class QOpcUaHistoryDataData;
+class Q_OPCUA_EXPORT QOpcUaHistoryData
+{
+public:
+    explicit QOpcUaHistoryData();
+    explicit QOpcUaHistoryData(const QString &nodeId);
+    QOpcUaHistoryData(const QOpcUaHistoryData &other);
+    ~QOpcUaHistoryData();
+
+    QOpcUa::UaStatusCode statusCode() const;
+    void setStatusCode(QOpcUa::UaStatusCode statusCode);
+    QList<QOpcUaDataValue> result() const;
+    QList<QOpcUaDataValue> &resultRef();
+    int count() const;
+    void addValue(const QOpcUaDataValue &value);
+    QString nodeId() const;
+    void setNodeId(const QString &nodeId);
+
+    QOpcUaHistoryData &operator=(const QOpcUaHistoryData &rhs);
+private:
+    QSharedDataPointer<QOpcUaHistoryDataData> data;
+};
+
+QT_END_NAMESPACE
+
+#endif // QOPCUAHISTORYDATA_H
diff --git a/src/opcua/client/qopcuahistoryreadrawrequest.cpp b/src/opcua/client/qopcuahistoryreadrawrequest.cpp
new file mode 100644
index 0000000..cf3bf8e
--- /dev/null
+++ b/src/opcua/client/qopcuahistoryreadrawrequest.cpp
@@ -0,0 +1,237 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 basysKom GmbH, opensource@basyskom.com
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtOpcUa module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qopcuahistoryreadrawrequest.h"
+
+QT_BEGIN_NAMESPACE
+
+/*!
+    \class QOpcUaHistoryReadRawRequest
+    \inmodule QtOpcUa
+    \brief This class stores the necessary information to request historic data from a server.
+
+    This is the Qt OPC UA representation for the OPC UA ReadRawModifiedDetails for reading historical data
+    defined in \l {https://reference.opcfoundation.org/Core/docs/Part11/6.4.3/} {OPC-UA part 11, 6.4.3}.
+
+    When requesting historic data from a server, several values need to be provided to the server
+    to know which data to collect. The QOpcUaHistoryReadRawRequest class provides the required values.
+    \a startTimestamp and \a endTimestamp define the timerange where historic data should be collected from.
+    \a nodesToRead defines from which nodes historic data should be collected.
+    \a numValuesPerNode defines the maximum number of data values that should be returned per node.
+    \a returnBounds defines if the bounding values should be included in the result.
+*/
+class QOpcUaHistoryReadRawRequestData : public QSharedData
+{
+public:
+    QDateTime startTimestamp;
+    QDateTime endTimestamp;
+    quint32 numValuesPerNode;
+    bool returnBounds;
+    QList<QOpcUaReadItem> nodesToRead;
+};
+
+QOpcUaHistoryReadRawRequest::QOpcUaHistoryReadRawRequest()
+    : data(new QOpcUaHistoryReadRawRequestData)
+{
+}
+
+/*!
+    Constructs a QOpcUaHistoryReadRawRequest item with the given values.
+*/
+QOpcUaHistoryReadRawRequest::QOpcUaHistoryReadRawRequest(QList<QOpcUaReadItem> nodesToRead,
+                                                         QDateTime startTimestamp,
+                                                         QDateTime endTimestamp,
+                                                         quint32 numValuesPerNode,
+                                                         bool returnBounds)
+    : data(new QOpcUaHistoryReadRawRequestData)
+{
+    data->startTimestamp = startTimestamp;
+    data->endTimestamp = endTimestamp;
+    data->numValuesPerNode = numValuesPerNode;
+    data->returnBounds = returnBounds;
+    data->nodesToRead = nodesToRead;
+}
+
+/*!
+    Constructs a QOpcUaHistoryReadRawRequest item from \a other.
+*/
+QOpcUaHistoryReadRawRequest::QOpcUaHistoryReadRawRequest(const QOpcUaHistoryReadRawRequest &other)
+    : data(other.data)
+{
+}
+
+QOpcUaHistoryReadRawRequest::~QOpcUaHistoryReadRawRequest()
+{
+}
+
+/*!
+    Returns the start time stamp.
+*/
+QDateTime QOpcUaHistoryReadRawRequest::startTimestamp() const
+{
+    return data->startTimestamp;
+}
+
+/*!
+    Sets the start time stamp.
+*/
+void QOpcUaHistoryReadRawRequest::setStartTimestamp(QDateTime startTimestamp)
+{
+    if (data->startTimestamp == startTimestamp)
+        return;
+
+    data->startTimestamp = startTimestamp;
+}
+
+/*!
+    Returns the end time stamp.
+*/
+QDateTime QOpcUaHistoryReadRawRequest::endTimestamp() const
+{
+    return data->endTimestamp;
+}
+
+/*!
+    Sets the end time stamp.
+*/
+void QOpcUaHistoryReadRawRequest::setEndTimestamp(QDateTime endTimestamp)
+{
+    if (data->endTimestamp == endTimestamp)
+        return;
+
+    data->endTimestamp = endTimestamp;
+}
+
+/*!
+    Returns the number of values per node.
+*/
+quint32 QOpcUaHistoryReadRawRequest::numValuesPerNode() const
+{
+    return data->numValuesPerNode;
+}
+
+/*!
+    Sets the number of values per node.
+*/
+void QOpcUaHistoryReadRawRequest::setNumValuesPerNode(quint32 numValuesPerNode)
+{
+    if (data->numValuesPerNode == numValuesPerNode)
+        return;
+
+    data->numValuesPerNode = numValuesPerNode;
+}
+
+/*!
+    Returns if the return bounds should be requested.
+*/
+bool QOpcUaHistoryReadRawRequest::returnBounds() const
+{
+    return data->returnBounds;
+}
+
+/*!
+    Sets if the return bounds should be requested.
+*/
+void QOpcUaHistoryReadRawRequest::setReturnBounds(bool returnBounds)
+{
+    data->returnBounds = returnBounds;
+}
+
+/*!
+    Returns the list of nodes to read.
+*/
+QList<QOpcUaReadItem> QOpcUaHistoryReadRawRequest::nodesToRead() const
+{
+    return data->nodesToRead;
+}
+
+/*!
+    Sets the list of nodes to read.
+*/
+void QOpcUaHistoryReadRawRequest::setNodesToRead(QList<QOpcUaReadItem> nodesToRead)
+{
+    data->nodesToRead = nodesToRead;
+}
+
+/*!
+    Adds a node to the list of nodes to read.
+*/
+void QOpcUaHistoryReadRawRequest::addNodeToRead(QOpcUaReadItem nodeToRead)
+{
+    data->nodesToRead.append(nodeToRead);
+}
+
+/*!
+    Sets the values from \a rhs in this QOpcUaHistoryReadRawRequest item.
+*/
+QOpcUaHistoryReadRawRequest &QOpcUaHistoryReadRawRequest::operator=(const QOpcUaHistoryReadRawRequest &rhs)
+{
+    if (this != &rhs)
+        data.operator=(rhs.data);
+    return *this;
+}
+
+/*!
+    Returns true if other is equal to this QOpcUaHistoryReadRawRequest item; otherwise returns false.
+
+    Two QOpcUaHistoryReadRawRequest items are considered equal if their \a startTimestamp, \a endTimestamp,
+    \a numValuesPerNode, \a returnBounds and \a nodesToRead are equal.
+*/
+bool QOpcUaHistoryReadRawRequest::operator==(const QOpcUaHistoryReadRawRequest &other) const
+{
+    return (data->startTimestamp == other.startTimestamp() &&
+            data->endTimestamp == other.endTimestamp() &&
+            data->numValuesPerNode == other.numValuesPerNode() &&
+            data->returnBounds == other.returnBounds() &&
+            data->nodesToRead == other.nodesToRead());
+}
+
+/*!
+    Returns true if other is not equal to this QOpcUaHistoryReadRawRequest item; otherwise returns false.
+
+    Two QOpcUaHistoryReadRawRequest items are considered not equal if their \a startTimestamp, \a endTimestamp,
+    \a numValuesPerNode, \a returnBounds or \a nodesToRead are not equal.
+*/
+bool QOpcUaHistoryReadRawRequest::operator!=(const QOpcUaHistoryReadRawRequest &other) const
+{
+    return (data->startTimestamp != other.startTimestamp() ||
+            data->endTimestamp != other.endTimestamp() ||
+            data->numValuesPerNode != other.numValuesPerNode() ||
+            data->returnBounds != other.returnBounds() ||
+            data->nodesToRead != other.nodesToRead());
+}
+
+QT_END_NAMESPACE
diff --git a/src/opcua/client/qopcuahistoryreadrawrequest.h b/src/opcua/client/qopcuahistoryreadrawrequest.h
new file mode 100644
index 0000000..dd60a30
--- /dev/null
+++ b/src/opcua/client/qopcuahistoryreadrawrequest.h
@@ -0,0 +1,94 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 basysKom GmbH, opensource@basyskom.com
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtOpcUa module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QHISTORYREADRAWREQUEST_H
+#define QHISTORYREADRAWREQUEST_H
+
+#include <QObject>
+#include <QDateTime>
+#include <QtCore/qshareddata.h>
+
+#include "QtOpcUa/qopcuareaditem.h"
+#include "QtOpcUa/qopcuahistorydata.h"
+
+#include <QtOpcUa/qopcuaglobal.h>
+
+QT_BEGIN_NAMESPACE
+
+class QOpcUaHistoryReadRawRequestData;
+class Q_OPCUA_EXPORT QOpcUaHistoryReadRawRequest
+{
+public:
+    explicit QOpcUaHistoryReadRawRequest();
+    explicit QOpcUaHistoryReadRawRequest(QList<QOpcUaReadItem> nodesToRead,
+                                         QDateTime startTimestamp,
+                                         QDateTime endTimestamp,
+                                         quint32 numValuesPerNode = 0,
+                                         bool returnBounds = false);
+
+    QOpcUaHistoryReadRawRequest(const QOpcUaHistoryReadRawRequest &other);
+    ~QOpcUaHistoryReadRawRequest();
+
+    QDateTime startTimestamp() const;
+    void setStartTimestamp(QDateTime startTimestamp);
+
+    QDateTime endTimestamp() const;
+    void setEndTimestamp(QDateTime endTimestamp);
+
+    quint32 numValuesPerNode() const;
+    void setNumValuesPerNode(quint32 numValuesPerNode);
+
+    bool returnBounds() const;
+    void setReturnBounds(bool returnBounds);
+
+    QList<QOpcUaReadItem> nodesToRead() const;
+    void setNodesToRead(QList<QOpcUaReadItem> nodesToRead);
+
+    void addNodeToRead(QOpcUaReadItem nodeToRead);
+
+    QOpcUaHistoryReadRawRequest &operator=(const QOpcUaHistoryReadRawRequest &rhs);
+    bool operator==(const QOpcUaHistoryReadRawRequest& other) const;
+    bool operator!=(const QOpcUaHistoryReadRawRequest& other) const;
+
+private:
+    QSharedDataPointer<QOpcUaHistoryReadRawRequestData> data;
+};
+
+QT_END_NAMESPACE
+
+Q_DECLARE_METATYPE(QOpcUaHistoryReadRawRequest)
+
+#endif // QHISTORYREADRAWREQUEST_H
diff --git a/src/opcua/client/qopcuahistoryreadresponse.cpp b/src/opcua/client/qopcuahistoryreadresponse.cpp
new file mode 100644
index 0000000..1fc3d75
--- /dev/null
+++ b/src/opcua/client/qopcuahistoryreadresponse.cpp
@@ -0,0 +1,127 @@
+/****************************************************************************
+**
+** Copyright (C) 2021 basysKom GmbH, opensource@basyskom.com
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtOpcUa module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qopcuahistoryreadresponse.h"
+
+#include "private/qopcuahistoryreadresponse_p.h"
+#include "private/qopcuahistoryreadresponseimpl_p.h"
+
+QT_BEGIN_NAMESPACE
+/*!
+    \class QOpcUaHistoryReadResponse
+    \inmodule QtOpcUa
+    \brief This class is used for requesting historical data and storing the results.
+
+    A historical data request to an OPC UA server can be specified by a \l QOpcUaHistoryReadRawRequest.
+
+    Objects of this class and the statuscode of the request are returned in the \l QOpcUaHistoryReadResponse::readHistoryDataFinished(QList<QOpcUaHistoryData> results, QOpcUa::UaStatusCode serviceResult)
+    signal and contain the result of a request.
+
+*/
+
+/*!
+    \fn QOpcUaHistoryReadResponse::readHistoryDataFinished(QList<QOpcUaHistoryData> results, QOpcUa::UaStatusCode serviceResult);
+
+    This signal is emitted when a historical data request is finished
+*/
+
+/*!
+    \fn QOpcUaHistoryReadResponse::stateChanged(State state)
+
+    This signal is emitted when the of a historical data request is changed
+*/
+QOpcUaHistoryReadResponse::QOpcUaHistoryReadResponse(QOpcUaHistoryReadResponseImpl *impl)
+    : QObject(*new QOpcUaHistoryReadResponsePrivate(impl), nullptr)
+{}
+
+/*!
+    Returns \c true if there are more values available from the historic data request.
+*/
+bool QOpcUaHistoryReadResponse::hasMoreData() const
+{
+    return d_func()->m_impl->hasMoreData();
+}
+
+/*!
+    Returns \c true if read request for more historic values is succesfull dispatched.
+*/
+bool QOpcUaHistoryReadResponse::readMoreData()
+{
+    return d_func()->m_impl->readMoreData();
+}
+
+/*!
+    Returns the current state of historic data request.
+    The states are
+    \list
+    \li Unknown
+    \li Reading
+    \li Finished
+    \li MoreDataAvailable
+    \li Error
+    \endlist
+*/
+QOpcUaHistoryReadResponse::State QOpcUaHistoryReadResponse::state() const
+{
+    return d_func()->m_impl->state();
+}
+
+/*!
+    Releases the continuation points and sets the request as finished.
+    Returns \c true if the pending request has been successfully finished; otherwise returns false.
+*/
+bool QOpcUaHistoryReadResponse::releaseContinuationPoints()
+{
+    return d_func()->m_impl->releaseContinuationPoints();
+}
+
+/*!
+    Returns a list which contains the requestet historic data.
+*/
+QList<QOpcUaHistoryData> QOpcUaHistoryReadResponse::data() const
+{
+    return d_func()->m_impl->data();
+}
+
+/*!
+    Returns the serviceresult of the historic data request.
+*/
+QOpcUa::UaStatusCode QOpcUaHistoryReadResponse::serviceResult() const
+{
+    return d_func()->m_impl->serviceResult();
+}
+
+QT_END_NAMESPACE
diff --git a/src/opcua/client/qopcuahistoryreadresponse.h b/src/opcua/client/qopcuahistoryreadresponse.h
new file mode 100644
index 0000000..a8440e7
--- /dev/null
+++ b/src/opcua/client/qopcuahistoryreadresponse.h
@@ -0,0 +1,84 @@
+/****************************************************************************
+**
+** Copyright (C) 2021 basysKom GmbH, opensource@basyskom.com
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtOpcUa module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QOPCUAHISTORYREADRESPONSE_H
+#define QOPCUAHISTORYREADRESPONSE_H
+
+#include <QtOpcUa/qopcuahistorydata.h>
+#include <QtOpcUa/qopcuaglobal.h>
+
+#include <QtOpcUa/qopcuahistoryreadrawrequest.h>
+
+#include <QtCore/qpointer.h>
+
+QT_BEGIN_NAMESPACE
+
+class QOpcUaHistoryReadResponseImpl;
+
+class QOpcUaHistoryReadResponsePrivate;
+
+class Q_OPCUA_EXPORT QOpcUaHistoryReadResponse : public QObject {
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(QOpcUaHistoryReadResponse)
+public:
+    QOpcUaHistoryReadResponse(QOpcUaHistoryReadResponseImpl *impl);
+
+    enum class State {
+        Unknown,
+        Reading,
+        Finished,
+        MoreDataAvailable,
+        Error
+    };
+    Q_ENUM(State)
+
+    bool hasMoreData() const;
+    bool readMoreData();
+    State state() const;
+
+    bool releaseContinuationPoints();
+
+    QList<QOpcUaHistoryData> data() const;
+    QOpcUa::UaStatusCode serviceResult() const;
+
+Q_SIGNALS:
+    void readHistoryDataFinished(QList<QOpcUaHistoryData> results, QOpcUa::UaStatusCode serviceResult);
+    void stateChanged(State state);
+};
+
+QT_END_NAMESPACE
+
+#endif // QOPCUAHISTORYREADRESPONSE_H
diff --git a/src/opcua/client/qopcuahistoryreadresponse_p.h b/src/opcua/client/qopcuahistoryreadresponse_p.h
new file mode 100644
index 0000000..cb8cad0
--- /dev/null
+++ b/src/opcua/client/qopcuahistoryreadresponse_p.h
@@ -0,0 +1,90 @@
+/****************************************************************************
+**
+** Copyright (C) 2021 basysKom GmbH, opensource@basyskom.com
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtOpcUa module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#ifndef QOPCUAHISTORYREADRESPONSEPRIVATE_H
+#define QOPCUAHISTORYREADRESPONSEPRIVATE_H
+
+#include <QtOpcUa/qopcuahistoryreadresponse.h>
+#include <QtOpcUa/qopcuahistoryreadrawrequest.h>
+
+#include "private/qopcuahistoryreadresponseimpl_p.h"
+
+#include <private/qobject_p.h>
+#include <QObject>
+
+#include <QUuid>
+
+QT_BEGIN_NAMESPACE
+
+class Q_OPCUA_EXPORT QOpcUaHistoryReadResponsePrivate : public QObjectPrivate {
+    Q_DECLARE_PUBLIC(QOpcUaHistoryReadResponse)
+
+public:
+    QOpcUaHistoryReadResponsePrivate(QOpcUaHistoryReadResponseImpl *impl)
+        : m_impl(impl)
+    {
+        QObject::connect(impl, &QOpcUaHistoryReadResponseImpl::readHistoryDataFinished, impl,
+                         [this](const QList<QOpcUaHistoryData> &data, QOpcUa::UaStatusCode serviceResult) {
+            if (q_func())
+                emit q_func()->readHistoryDataFinished(data, serviceResult);
+        });
+
+        QObject::connect(impl, &QOpcUaHistoryReadResponseImpl::stateChanged, impl,
+                         [this](QOpcUaHistoryReadResponse::State state) {
+            if (q_func())
+                emit q_func()->stateChanged(state);
+        });
+    }
+
+    ~QOpcUaHistoryReadResponsePrivate() = default;
+
+    QScopedPointer<QOpcUaHistoryReadResponseImpl> m_impl;
+};
+
+QT_END_NAMESPACE
+
+#endif // QOPCUAHISTORYREADRESPONSEPRIVATE_H
diff --git a/src/opcua/client/qopcuahistoryreadresponseimpl.cpp b/src/opcua/client/qopcuahistoryreadresponseimpl.cpp
new file mode 100644
index 0000000..18f51d6
--- /dev/null
+++ b/src/opcua/client/qopcuahistoryreadresponseimpl.cpp
@@ -0,0 +1,183 @@
+/****************************************************************************
+**
+** Copyright (C) 2021 basysKom GmbH, opensource@basyskom.com
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtOpcUa module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qopcuahistoryreadresponseimpl_p.h"
+
+QT_BEGIN_NAMESPACE
+
+quint64 QOpcUaHistoryReadResponseImpl::m_currentHandle = 0;
+
+QOpcUaHistoryReadResponseImpl::QOpcUaHistoryReadResponseImpl(const QOpcUaHistoryReadRawRequest &request)
+    : m_requestType(RequestType::ReadRaw)
+    , m_readRawRequest(request)
+    , m_handle(++m_currentHandle)
+{
+}
+
+QOpcUaHistoryReadResponseImpl::~QOpcUaHistoryReadResponseImpl()
+{
+    releaseContinuationPoints();
+}
+
+bool QOpcUaHistoryReadResponseImpl::hasMoreData() const
+{
+    return m_state == QOpcUaHistoryReadResponse::State::MoreDataAvailable;
+}
+
+bool QOpcUaHistoryReadResponseImpl::readMoreData()
+{
+    if (!hasMoreData())
+        return false;
+
+    if (m_requestType == RequestType::ReadRaw) {
+        QOpcUaHistoryReadRawRequest request;
+        request.setStartTimestamp(m_readRawRequest.startTimestamp());
+        request.setEndTimestamp(m_readRawRequest.endTimestamp());
+        request.setNumValuesPerNode(m_readRawRequest.numValuesPerNode());
+        request.setReturnBounds(m_readRawRequest.returnBounds());
+
+        int arrayIndex = 0;
+        QList<int> newDataMapping;
+        QList<QByteArray> newContinuationPoints;
+
+        for (const auto &continuationPoint : m_continuationPoints) {
+            int mappingIndex = 0;
+            if (m_dataMapping.empty())
+                mappingIndex = arrayIndex;
+            else
+                mappingIndex = m_dataMapping.at(arrayIndex);
+
+            if (!continuationPoint.isEmpty()) {
+                newDataMapping.push_back(mappingIndex);
+                newContinuationPoints.push_back(continuationPoint);
+                request.addNodeToRead(m_readRawRequest.nodesToRead().at(mappingIndex));
+            }
+
+            ++arrayIndex;
+        }
+
+        m_dataMapping = newDataMapping;
+
+        m_continuationPoints = newContinuationPoints;
+        emit historyReadRawRequested(request, m_continuationPoints, false, handle());
+        return true;
+    }
+
+    return false;
+}
+
+QOpcUaHistoryReadResponse::State QOpcUaHistoryReadResponseImpl::state() const
+{
+    return m_state;
+}
+
+bool QOpcUaHistoryReadResponseImpl::releaseContinuationPoints()
+{
+    if (m_requestType == RequestType::ReadRaw) {
+        emit historyReadRawRequested(m_readRawRequest, m_continuationPoints, true, handle());
+        setState(QOpcUaHistoryReadResponse::State::Finished);
+    };
+
+    return true;
+}
+
+QList<QOpcUaHistoryData> QOpcUaHistoryReadResponseImpl::data() const
+{
+    return m_data;
+}
+
+QOpcUa::UaStatusCode QOpcUaHistoryReadResponseImpl::serviceResult() const
+{
+    return m_serviceResult;
+}
+
+void QOpcUaHistoryReadResponseImpl::handleDataAvailable(const QList<QOpcUaHistoryData> &data, const QList<QByteArray> &continuationPoints,
+                                                           QOpcUa::UaStatusCode serviceResult, quint64 responseHandle)
+{
+    if (responseHandle != handle())
+        return;
+
+    m_serviceResult = serviceResult;
+    m_continuationPoints = continuationPoints;
+
+    if (m_data.empty()) {
+        m_data = data;
+    } else {
+        int index = 0;
+        for (const auto &result : data) {
+            auto &target = m_data[m_dataMapping.at(index++)];
+            target.setStatusCode(result.statusCode());
+            for (const auto &value : result.result()) {
+                target.resultRef().append(value);
+            }
+        }
+    }
+
+    bool found = false;
+    for (const auto &continuationPoint : m_continuationPoints) {
+        if (!continuationPoint.isEmpty()) {
+            setState(QOpcUaHistoryReadResponse::State::MoreDataAvailable);
+            found = true;
+            break;
+        }
+    }
+
+    if (!found)
+        setState(QOpcUaHistoryReadResponse::State::Finished);
+
+    emit readHistoryDataFinished(m_data, m_serviceResult);
+}
+
+void QOpcUaHistoryReadResponseImpl::handleRequestError(quint64 requestHandle)
+{
+    if (requestHandle == handle())
+        setState(QOpcUaHistoryReadResponse::State::Error);
+}
+
+quint64 QOpcUaHistoryReadResponseImpl::handle() const
+{
+    return m_handle;
+}
+
+void QOpcUaHistoryReadResponseImpl::setState(QOpcUaHistoryReadResponse::State state)
+{
+    if (m_state != state) {
+        m_state = state;
+        emit stateChanged(state);
+    }
+}
+
+QT_END_NAMESPACE
diff --git a/src/opcua/client/qopcuahistoryreadresponseimpl_p.h b/src/opcua/client/qopcuahistoryreadresponseimpl_p.h
new file mode 100644
index 0000000..5a48049
--- /dev/null
+++ b/src/opcua/client/qopcuahistoryreadresponseimpl_p.h
@@ -0,0 +1,111 @@
+/****************************************************************************
+**
+** Copyright (C) 2021 basysKom GmbH, opensource@basyskom.com
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtOpcUa module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#ifndef QOPCUAHISTORYREADRESPONSEIMPL_H
+#define QOPCUAHISTORYREADRESPONSEIMPL_H
+
+#include <QtOpcUa/qopcuahistoryreadresponse.h>
+#include <QtOpcUa/qopcuahistoryreadrawrequest.h>
+
+#include <private/qobject_p.h>
+#include <QObject>
+
+QT_BEGIN_NAMESPACE
+
+class Q_OPCUA_EXPORT QOpcUaHistoryReadResponseImpl : public QObject {
+    Q_OBJECT
+
+public:
+    QOpcUaHistoryReadResponseImpl(const QOpcUaHistoryReadRawRequest &request);
+    ~QOpcUaHistoryReadResponseImpl();
+
+    bool hasMoreData() const;
+    bool readMoreData();
+    QOpcUaHistoryReadResponse::State state() const;
+
+    bool releaseContinuationPoints();
+
+    QList<QOpcUaHistoryData> data() const;
+    QOpcUa::UaStatusCode serviceResult() const;
+
+    Q_INVOKABLE void handleDataAvailable(const QList<QOpcUaHistoryData> &data, const QList<QByteArray> &continuationPoints,
+                                         QOpcUa::UaStatusCode serviceResult, quint64 responseHandle);
+    Q_INVOKABLE void handleRequestError(quint64 requestHandle);
+
+    quint64 handle() const;
+
+Q_SIGNALS:
+    void historyReadRawRequested(QOpcUaHistoryReadRawRequest request, QList<QByteArray> continuationPoints, bool releaseContinuationPoints, quint64 handle);
+    void readHistoryDataFinished(QList<QOpcUaHistoryData> results, QOpcUa::UaStatusCode serviceResult);
+    void stateChanged(QOpcUaHistoryReadResponse::State state);
+
+protected:
+    void setState(QOpcUaHistoryReadResponse::State state);
+
+private:
+    enum class RequestType {
+        Unknown,
+        ReadRaw
+    };
+
+    QOpcUaHistoryReadResponse::State m_state = QOpcUaHistoryReadResponse::State::Reading;
+    QList<QByteArray> m_continuationPoints;
+
+    RequestType m_requestType = RequestType::Unknown;
+    QOpcUaHistoryReadRawRequest m_readRawRequest;
+    QList<QOpcUaHistoryData> m_data;
+    QOpcUa::UaStatusCode m_serviceResult = QOpcUa::UaStatusCode::Good;
+    QList<int> m_dataMapping;
+
+    static quint64 m_currentHandle;
+
+    quint64 m_handle = 0;
+};
+
+QT_END_NAMESPACE
+
+#endif // QOPCUAHISTORYREADRESPONSEIMPL_H
diff --git a/src/opcua/client/qopcuanode.cpp b/src/opcua/client/qopcuanode.cpp
index 27003a3..7647bc5 100644
--- a/src/opcua/client/qopcuanode.cpp
+++ b/src/opcua/client/qopcuanode.cpp
@@ -784,6 +784,51 @@ bool QOpcUaNode::browse(const QOpcUaBrowseRequest &request)
   return d->m_impl->browse(request);
 }
 
+/*!
+    Starts a read history request for this node. This is the Qt OPC UA representation for the OPC UA
+    ReadHistory service for reading raw historical data defined in
+    \l {https://reference.opcfoundation.org/v104/Core/docs/Part4/5.10.3/} {OPC-UA part 4, 5.10.3}.
+    The start timestamp, end timestamp, number of values per node and returnBounds can
+    be specified in the according parameters.
+
+    Returns a \l QOpcUaHistoryReadResponse which contains the state of the request if the asynchronous
+    request has been successfully dispatched. The results are returned in the
+    \l QOpcUaHistoryReadResponse::readHistoryDataFinished(QList<QOpcUaHistoryData> results, QOpcUa::UaStatusCode serviceResult)
+    signal.
+
+    In the following example, the historic data from the last two days of a node are requested and printed.
+    The result is limited to ten values per node.
+
+    \code
+        QOpcUaHistoryReadResponse *response = node->readHistoryRaw(QDateTime::currentDateTime(),
+                                                                   QDateTime::currentDateTime().addDays(-2),
+                                                                   10,
+                                                                   true);
+        if (response) {
+            QObject::connect(response123, &QOpcUaHistoryReadResponse::readHistoryDataFinished,
+                             [] (QList<QOpcUaHistoryData> results, QOpcUa::UaStatusCode serviceResult) {
+                if (serviceResult != QOpcUa::UaStatusCode::Good) {
+                    qWarning() << "Fetching historical data failed with:" << serviceResult;
+                } else {
+                    for (const auto& result : results) {
+                        qInfo() << "NodeId:" << result.nodeId();
+                        for (const auto &dataValue : result.result())
+                            qInfo() << "Value:" << dataValue.value();
+                    }
+                }
+            });
+        }
+    \endcode
+*/
+QOpcUaHistoryReadResponse *QOpcUaNode::readHistoryRaw(const QDateTime &startTime, const QDateTime &endTime, quint32 numValues, bool returnBounds)
+{
+    Q_D(QOpcUaNode);
+    if (d->m_client.isNull() || d->m_client->state() != QOpcUaClient::Connected)
+        return nullptr;
+
+    return d->m_impl->readHistoryRaw(startTime, endTime, numValues, returnBounds);
+}
+
 QDebug operator<<(QDebug dbg, const QOpcUaNode &node)
 {
     dbg << "QOpcUaNode {"
diff --git a/src/opcua/client/qopcuanode.h b/src/opcua/client/qopcuanode.h
index 390b1ad..5238e16 100644
--- a/src/opcua/client/qopcuanode.h
+++ b/src/opcua/client/qopcuanode.h
@@ -44,6 +44,8 @@
 #include <QtOpcUa/qopcuatype.h>
 #include <QtOpcUa/qopcuabrowsepathtarget.h>
 #include <QtOpcUa/qopcuarelativepathelement.h>
+#include <QtOpcUa/qopcuahistoryreadrawrequest.h>
+#include <QtOpcUa/qopcuahistoryreadresponse.h>
 
 #include <QtCore/qdatetime.h>
 #include <QtCore/qdebug.h>
@@ -104,6 +106,8 @@ public:
 
     bool browse(const QOpcUaBrowseRequest &request);
 
+    QOpcUaHistoryReadResponse *readHistoryRaw(const QDateTime &startTime, const QDateTime &endTime, quint32 numValues, bool returnBounds);
+
 Q_SIGNALS:
     void attributeRead(QOpcUa::NodeAttributes attributes);
     void attributeWritten(QOpcUa::NodeAttribute attribute, QOpcUa::UaStatusCode statusCode);
diff --git a/src/opcua/client/qopcuanodeimpl_p.h b/src/opcua/client/qopcuanodeimpl_p.h
index 9c32bd9..aad3120 100644
--- a/src/opcua/client/qopcuanodeimpl_p.h
+++ b/src/opcua/client/qopcuanodeimpl_p.h
@@ -56,6 +56,7 @@
 #include <QtOpcUa/qopcuareadresult.h>
 #include <QtOpcUa/qopcuarelativepathelement.h>
 #include <QtOpcUa/qopcuatype.h>
+#include <QtOpcUa/qopcuahistoryreadrawrequest.h>
 
 #include <QtCore/qvariant.h>
 
@@ -80,6 +81,7 @@ public:
                                           const QVariant &value) = 0;
 
     virtual bool callMethod(const QString &methodNodeId, const QList<QOpcUa::TypedVariant> &args) = 0;
+    virtual QOpcUaHistoryReadResponse *readHistoryRaw(const QDateTime &startTime, const QDateTime &endTime, quint32 numValues, bool returnBounds) = 0;
 
     virtual bool resolveBrowsePath(const QList<QOpcUaRelativePathElement> &path) = 0;
 
@@ -102,6 +104,7 @@ Q_SIGNALS:
     void methodCallFinished(QString methodNodeId, QVariant result, QOpcUa::UaStatusCode statusCode);
     void resolveBrowsePathFinished(QList<QOpcUaBrowsePathTarget> targets,
                                      QList<QOpcUaRelativePathElement> path, QOpcUa::UaStatusCode status);
+    void readHistoryRawFinished(QList<QOpcUaHistoryData> results, QOpcUa::UaStatusCode serviceResult);
 
 private:
     quint64 m_handle;
diff --git a/src/opcua/client/qopcuareaditem.cpp b/src/opcua/client/qopcuareaditem.cpp
index b5ce918..3cf5e87 100644
--- a/src/opcua/client/qopcuareaditem.cpp
+++ b/src/opcua/client/qopcuareaditem.cpp
@@ -95,6 +95,18 @@ QOpcUaReadItem &QOpcUaReadItem::operator=(const QOpcUaReadItem &rhs)
     return *this;
 }
 
+/*!
+    Returns true if other is equal to this read item; otherwise returns false.
+
+    Two read items are considered equal if their \a nodeId, \a attribute and \a indexRange are equal.
+*/
+bool QOpcUaReadItem::operator==(const QOpcUaReadItem &other) const
+{
+    return data->nodeId == other.data->nodeId &&
+            data->attribute == other.data->attribute &&
+            data->indexRange == other.data->indexRange;
+}
+
 QOpcUaReadItem::~QOpcUaReadItem()
 {
 }
diff --git a/src/opcua/client/qopcuareaditem.h b/src/opcua/client/qopcuareaditem.h
index 1a202ad..54f1df3 100644
--- a/src/opcua/client/qopcuareaditem.h
+++ b/src/opcua/client/qopcuareaditem.h
@@ -51,6 +51,7 @@ public:
     QOpcUaReadItem(const QString &nodeId, QOpcUa::NodeAttribute attr = QOpcUa::NodeAttribute::Value,
                    const QString &indexRange = QString());
     QOpcUaReadItem &operator=(const QOpcUaReadItem &rhs);
+    bool operator==(const QOpcUaReadItem &other) const;
     ~QOpcUaReadItem();
 
     QString nodeId() const;
diff --git a/src/opcua/doc/src/qtopcua.qdoc b/src/opcua/doc/src/qtopcua.qdoc
index 85a4c64..6dd3284 100644
--- a/src/opcua/doc/src/qtopcua.qdoc
+++ b/src/opcua/doc/src/qtopcua.qdoc
@@ -459,7 +459,7 @@
     commit e941fc23b0 using the following commands:
 
     \code
-        cmake -DUA_ENABLE_AMALGAMATION=ON -DUA_AMALGAMATION_ARCHITECTURES="win32;posix" -DUA_ENABLE_SUBSCRIPTIONS_EVENTS=ON
+        cmake -DUA_ENABLE_AMALGAMATION=ON -DUA_AMALGAMATION_ARCHITECTURES="win32;posix" -DUA_ENABLE_SUBSCRIPTIONS_EVENTS=ON -DUA_ENABLE_HISTORIZING=ON -DUA_ENABLE_EXPERIMENTAL_HISTORIZING=ON
         make
     \endcode
 
diff --git a/src/plugins/opcua/open62541/qopen62541backend.cpp b/src/plugins/opcua/open62541/qopen62541backend.cpp
index 5816bd7..6bfa58e 100644
--- a/src/plugins/opcua/open62541/qopen62541backend.cpp
+++ b/src/plugins/opcua/open62541/qopen62541backend.cpp
@@ -572,6 +572,54 @@ void Open62541AsyncBackend::writeNodeAttributes(const QList<QOpcUaWriteItem> &no
     m_asyncBatchWriteContext[requestId] = { nodesToWrite };
 }
 
+void Open62541AsyncBackend::readHistoryRaw(QOpcUaHistoryReadRawRequest request, QList<QByteArray> continuationPoints, bool releaseContinuationPoints, quint64 handle)
+{
+    if (!continuationPoints.empty() && continuationPoints.size() != request.nodesToRead().size()) {
+        emit historyDataAvailable({}, {}, QOpcUa::UaStatusCode::BadInternalError, handle);
+        return;
+    }
+
+    UA_HistoryReadRequest uarequest;
+    UA_HistoryReadRequest_init(&uarequest);
+    uarequest.nodesToReadSize = request.nodesToRead().size();
+    uarequest.nodesToRead = static_cast<UA_HistoryReadValueId*>(UA_Array_new(uarequest.nodesToReadSize, &UA_TYPES[UA_TYPES_HISTORYREADVALUEID]));
+    for (size_t i = 0; i < uarequest.nodesToReadSize; ++i) {
+        uarequest.nodesToRead[i].nodeId = Open62541Utils::nodeIdFromQString(request.nodesToRead().at(i).nodeId());
+        QOpen62541ValueConverter::scalarFromQt<UA_String, QString>(request.nodesToRead().at(i).indexRange(), &uarequest.nodesToRead[i].indexRange);
+        uarequest.nodesToRead[i].dataEncoding = UA_QUALIFIEDNAME_ALLOC(0, "Default Binary");
+        if (!continuationPoints.isEmpty())
+            QOpen62541ValueConverter::scalarFromQt<UA_ByteString, QByteArray>(continuationPoints.at(i), &uarequest.nodesToRead[i].continuationPoint);
+    }
+    uarequest.timestampsToReturn = UA_TIMESTAMPSTORETURN_BOTH;
+
+    if (releaseContinuationPoints)
+        uarequest.releaseContinuationPoints = releaseContinuationPoints;
+
+    uarequest.historyReadDetails.encoding = UA_EXTENSIONOBJECT_DECODED;
+    uarequest.historyReadDetails.content.decoded.type = &UA_TYPES[UA_TYPES_READRAWMODIFIEDDETAILS];
+    UA_ReadRawModifiedDetails *details = UA_ReadRawModifiedDetails_new();
+    uarequest.historyReadDetails.content.decoded.data = details;
+    QOpen62541ValueConverter::scalarFromQt<UA_DateTime, QDateTime>(request.startTimestamp(), &details->startTime);
+    QOpen62541ValueConverter::scalarFromQt<UA_DateTime, QDateTime>(request.endTimestamp(), &details->endTime);
+    details->isReadModified = UA_FALSE;
+    details->returnBounds = request.returnBounds();
+    details->numValuesPerNode = request.numValuesPerNode();
+
+    quint32 requestId = 0;
+    UA_StatusCode resultCode = __UA_Client_AsyncServiceEx(m_uaclient, &uarequest, &UA_TYPES[UA_TYPES_HISTORYREADREQUEST], &asyncReadHistoryDataCallBack,
+                                                      &UA_TYPES[UA_TYPES_HISTORYREADRESPONSE], this, &requestId, m_asyncRequestTimeout);
+
+    UA_HistoryReadRequest_clear(&uarequest);
+
+    if (resultCode != UA_STATUSCODE_GOOD) {
+        qCWarning(QT_OPCUA_PLUGINS_OPEN62541) << "Read history data failed:" << resultCode;
+        emit historyDataAvailable({}, {}, QOpcUa::UaStatusCode(resultCode), handle);
+        return;
+    }
+
+    m_asyncReadHistoryDataContext[requestId] = {handle, request};
+}
+
 void Open62541AsyncBackend::addNode(const QOpcUaAddNodeItem &nodeToAdd)
 {
     UA_AddNodesRequest req;
@@ -1429,6 +1477,49 @@ void Open62541AsyncBackend::asyncBatchWriteCallback(UA_Client *client, void *use
     }
 }
 
+void Open62541AsyncBackend::asyncReadHistoryDataCallBack(UA_Client *client, void *userdata, UA_UInt32 requestId, void *response)
+{
+    Q_UNUSED(client);
+
+    Open62541AsyncBackend *backend = static_cast<Open62541AsyncBackend *>(userdata);
+    AsyncReadHistoryDataContext context = backend->m_asyncReadHistoryDataContext.take(requestId);
+
+    UA_HistoryReadResponse* res = static_cast<UA_HistoryReadResponse*>(response);
+
+    QList<QByteArray> continuationPoints;
+
+    QList<QOpcUaHistoryData> historyData;
+
+    for (size_t i = 0; i < res->resultsSize; ++i) {
+        if (res->results[i].historyData.encoding != UA_EXTENSIONOBJECT_DECODED) {
+            emit backend->historyDataAvailable({}, {}, QOpcUa::UaStatusCode(res->responseHeader.serviceResult), context.handle);
+            return;
+        }
+
+        historyData.push_back(QOpcUaHistoryData(context.historyReadRawRequest.nodesToRead().at(i).nodeId()));
+
+        historyData[i].setStatusCode(QOpcUa::UaStatusCode(res->results[i].statusCode));
+
+        if (res->results[i].statusCode != UA_STATUSCODE_GOOD)
+            continue;
+
+        if (res->results[i].historyData.content.decoded.type != &UA_TYPES[UA_TYPES_HISTORYDATA]) {
+            historyData[i].setStatusCode(QOpcUa::UaStatusCode::BadInternalError);
+            continue;
+        }
+
+        UA_HistoryData *data = static_cast<UA_HistoryData *>(res->results[i].historyData.content.decoded.data);
+        for (size_t j = 0; j < data->dataValuesSize; ++j) {
+            const QOpcUaDataValue value = QOpen62541ValueConverter::scalarToQt<QOpcUaDataValue, UA_DataValue>(&data->dataValues[j]);
+            historyData[i].addValue(value);
+        }
+
+        continuationPoints.push_back(QOpen62541ValueConverter::scalarToQt<QByteArray, UA_ByteString>(&res->results[i].continuationPoint));
+    }
+
+    emit backend->historyDataAvailable(historyData, continuationPoints, QOpcUa::UaStatusCode(res->responseHeader.serviceResult), context.handle);
+}
+
 bool Open62541AsyncBackend::loadFileToByteString(const QString &location, UA_ByteString *target) const
 {
     if (location.isEmpty()) {
diff --git a/src/plugins/opcua/open62541/qopen62541backend.h b/src/plugins/opcua/open62541/qopen62541backend.h
index 791fb44..4f94d2a 100644
--- a/src/plugins/opcua/open62541/qopen62541backend.h
+++ b/src/plugins/opcua/open62541/qopen62541backend.h
@@ -72,6 +72,8 @@ public Q_SLOTS:
     void readNodeAttributes(const QList<QOpcUaReadItem> &nodesToRead);
     void writeNodeAttributes(const QList<QOpcUaWriteItem> &nodesToWrite);
 
+    void readHistoryRaw(QOpcUaHistoryReadRawRequest request, QList<QByteArray> continuationPoints, bool releaseContinuationPoints, quint64 handle);
+
     // Node management
     void addNode(const QOpcUaAddNodeItem &nodeToAdd);
     void deleteNode(const QString &nodeId, bool deleteTargetReferences);
@@ -97,6 +99,7 @@ public Q_SLOTS:
     static void asyncBrowseCallback(UA_Client *client, void *userdata, UA_UInt32 requestId, void *response);
     static void asyncBatchReadCallback(UA_Client *client, void *userdata, UA_UInt32 requestId, void *response);
     static void asyncBatchWriteCallback(UA_Client *client, void *userdata, UA_UInt32 requestId, void *response);
+    static void asyncReadHistoryDataCallBack(UA_Client *client, void *userdata, UA_UInt32 requestId, void *response);
 
 public:
     UA_Client *m_uaclient;
@@ -204,6 +207,12 @@ private:
         QList<QOpcUaWriteItem> nodesToWrite;
     };
     QMap<quint32, AsyncBatchWriteContext> m_asyncBatchWriteContext;
+
+    struct AsyncReadHistoryDataContext {
+        quint64 handle;
+        QOpcUaHistoryReadRawRequest historyReadRawRequest;
+    };
+    QMap<quint32, AsyncReadHistoryDataContext> m_asyncReadHistoryDataContext;
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/opcua/open62541/qopen62541client.cpp b/src/plugins/opcua/open62541/qopen62541client.cpp
index 9c620b8..2c33b51 100644
--- a/src/plugins/opcua/open62541/qopen62541client.cpp
+++ b/src/plugins/opcua/open62541/qopen62541client.cpp
@@ -41,6 +41,7 @@
 #include "qopen62541utils.h"
 #include "qopen62541valueconverter.h"
 #include <private/qopcuaclient_p.h>
+#include <private/qopcuahistoryreadresponseimpl_p.h>
 
 #include <QtCore/qloggingcategory.h>
 #include <QtCore/qstringlist.h>
@@ -139,6 +140,29 @@ bool QOpen62541Client::writeNodeAttributes(const QList<QOpcUaWriteItem> &nodesTo
                                      Q_ARG(QList<QOpcUaWriteItem>, nodesToWrite));
 }
 
+QOpcUaHistoryReadResponse *QOpen62541Client::readHistoryData(const QOpcUaHistoryReadRawRequest &request)
+{
+    if (!m_client)
+        return nullptr;
+
+    auto impl = new QOpcUaHistoryReadResponseImpl(request);
+    auto result = new QOpcUaHistoryReadResponse(impl);
+
+    // Connect signals
+    QObject::connect(m_backend, &QOpcUaBackend::historyDataAvailable, impl, &QOpcUaHistoryReadResponseImpl::handleDataAvailable);
+    QObject::connect(impl, &QOpcUaHistoryReadResponseImpl::historyReadRawRequested, this, &QOpen62541Client::handleHistoryReadRawRequested);
+    QObject::connect(this, &QOpen62541Client::historyReadRequestError, impl, &QOpcUaHistoryReadResponseImpl::handleRequestError);
+
+    auto success = handleHistoryReadRawRequested(request, {}, false, impl->handle());
+
+    if (!success) {
+        delete result;
+        return nullptr;
+    }
+
+    return result;
+}
+
 bool QOpen62541Client::addNode(const QOpcUaAddNodeItem &nodeToAdd)
 {
     return QMetaObject::invokeMethod(m_backend, "addNode", Qt::QueuedConnection,
@@ -184,4 +208,20 @@ QList<QOpcUaUserTokenPolicy::TokenType> QOpen62541Client::supportedUserTokenType
     };
 }
 
+bool QOpen62541Client::handleHistoryReadRawRequested(const QOpcUaHistoryReadRawRequest &request, const QList<QByteArray> &continuationPoints,
+                                                     bool releaseContinuationPoints, quint64 handle)
+{
+    const auto success = QMetaObject::invokeMethod(m_backend, "readHistoryRaw",
+                                                   Qt::QueuedConnection,
+                                                   Q_ARG(QOpcUaHistoryReadRawRequest, request),
+                                                   Q_ARG(QList<QByteArray>, continuationPoints),
+                                                   Q_ARG(bool, releaseContinuationPoints),
+                                                   Q_ARG(quint64, handle));
+
+    if (!success)
+        emit historyReadRequestError(handle);
+
+    return success;
+}
+
 QT_END_NAMESPACE
diff --git a/src/plugins/opcua/open62541/qopen62541client.h b/src/plugins/opcua/open62541/qopen62541client.h
index a359b29..454fa62 100644
--- a/src/plugins/opcua/open62541/qopen62541client.h
+++ b/src/plugins/opcua/open62541/qopen62541client.h
@@ -68,6 +68,8 @@ public:
     bool readNodeAttributes(const QList<QOpcUaReadItem> &nodesToRead) override;
     bool writeNodeAttributes(const QList<QOpcUaWriteItem> &nodesToWrite) override;
 
+    QOpcUaHistoryReadResponse *readHistoryData(const QOpcUaHistoryReadRawRequest &request) override;
+
     bool addNode(const QOpcUaAddNodeItem &nodeToAdd) override;
     bool deleteNode(const QString &nodeId, bool deleteTargetReferences) override;
 
@@ -77,6 +79,12 @@ public:
     QStringList supportedSecurityPolicies() const override;
     QList<QOpcUaUserTokenPolicy::TokenType> supportedUserTokenTypes() const override;
 
+    Q_INVOKABLE bool handleHistoryReadRawRequested(const QOpcUaHistoryReadRawRequest &request, const QList<QByteArray> &continuationPoints,
+                                                   bool releaseContinuationPoints, quint64 handle);
+
+signals:
+    void historyReadRequestError(quint64 handle);
+
 private slots:
 
 private:
diff --git a/src/plugins/opcua/open62541/qopen62541node.cpp b/src/plugins/opcua/open62541/qopen62541node.cpp
index 0a784a8..bfc25ec 100644
--- a/src/plugins/opcua/open62541/qopen62541node.cpp
+++ b/src/plugins/opcua/open62541/qopen62541node.cpp
@@ -40,6 +40,8 @@
 #include "qopen62541utils.h"
 #include "qopen62541valueconverter.h"
 
+#include <private/qopcuahistoryreadresponse_p.h>
+
 #include <QtCore/qdatetime.h>
 #include <QtCore/qstring.h>
 #include <QtCore/qlist.h>
@@ -168,7 +170,9 @@ bool QOpen62541Node::writeAttributes(const QOpcUaNode::AttributeMap &toWrite, QO
                                      Q_ARG(QOpcUa::Types, valueAttributeType));
 }
 
+
 bool QOpen62541Node::callMethod(const QString &methodNodeId, const QList<QOpcUa::TypedVariant> &args)
+
 {
     if (!m_client)
         return false;
@@ -183,6 +187,16 @@ bool QOpen62541Node::callMethod(const QString &methodNodeId, const QList<QOpcUa:
                                      Q_ARG(QList<QOpcUa::TypedVariant>, args));
 }
 
+QOpcUaHistoryReadResponse *QOpen62541Node::readHistoryRaw(const QDateTime &startTime, const QDateTime &endTime,
+                                                          quint32 numValues, bool returnBounds)
+{
+    if (!m_client)
+        return nullptr;
+
+    return m_client->readHistoryData(QOpcUaHistoryReadRawRequest{{QOpcUaReadItem(m_nodeIdString)},
+                                                                 startTime, endTime, numValues, returnBounds});
+}
+
 bool QOpen62541Node::resolveBrowsePath(const QList<QOpcUaRelativePathElement> &path)
 {
     if (!m_client)
@@ -194,7 +208,7 @@ bool QOpen62541Node::resolveBrowsePath(const QList<QOpcUaRelativePathElement> &p
     return QMetaObject::invokeMethod(m_client->m_backend, "resolveBrowsePath", Qt::QueuedConnection,
                                              Q_ARG(quint64, handle()),
                                              Q_ARG(UA_NodeId, start),
-                                             Q_ARG(QList<QOpcUaRelativePathElement>, path));
+                                     Q_ARG(QList<QOpcUaRelativePathElement>, path));
 }
 
 QT_END_NAMESPACE
diff --git a/src/plugins/opcua/open62541/qopen62541node.h b/src/plugins/opcua/open62541/qopen62541node.h
index ba96d85..01a56ec 100644
--- a/src/plugins/opcua/open62541/qopen62541node.h
+++ b/src/plugins/opcua/open62541/qopen62541node.h
@@ -61,6 +61,8 @@ public:
     bool writeAttributes(const QOpcUaNode::AttributeMap &toWrite, QOpcUa::Types valueAttributeType) override;
     bool callMethod(const QString &methodNodeId, const QList<QOpcUa::TypedVariant> &args) override;
 
+    QOpcUaHistoryReadResponse *readHistoryRaw(const QDateTime &startTime, const QDateTime &endTime, quint32 numValues, bool returnBounds) override;
+
     bool resolveBrowsePath(const QList<QOpcUaRelativePathElement> &path) override;
 
 private:
diff --git a/src/plugins/opcua/open62541/qopen62541valueconverter.cpp b/src/plugins/opcua/open62541/qopen62541valueconverter.cpp
index 44ebce9..55c1180 100644
--- a/src/plugins/opcua/open62541/qopen62541valueconverter.cpp
+++ b/src/plugins/opcua/open62541/qopen62541valueconverter.cpp
@@ -43,7 +43,6 @@
 #include <QtCore/qdatetime.h>
 #include <QtCore/qloggingcategory.h>
 #include <QtCore/quuid.h>
-
 #include <cstring>
 
 QT_BEGIN_NAMESPACE
@@ -326,11 +325,32 @@ template<>
 QDateTime scalarToQt<QDateTime, UA_DateTime>(const UA_DateTime *data)
 {
     // OPC-UA part 3, Table C.9
+    if (*data == (std::numeric_limits<qint64>::min)() || *data == (std::numeric_limits<qint64>::max)())
+        return QDateTime();
+
     const QDateTime epochStart(QDate(1601, 1, 1), QTime(0, 0), Qt::UTC);
     return epochStart.addMSecs(*data / UA_DATETIME_MSEC).toLocalTime();
 }
 
 template<>
+QOpcUaDataValue scalarToQt<QOpcUaDataValue, UA_DataValue>(const UA_DataValue *data)
+{
+    QOpcUaDataValue result;
+    if (data->hasSourceTimestamp)
+        result.setSourceTimestamp(QOpen62541ValueConverter::scalarToQt<QDateTime, UA_DateTime>(&data->sourceTimestamp));
+    if (data->hasServerTimestamp)
+        result.setServerTimestamp(QOpen62541ValueConverter::scalarToQt<QDateTime, UA_DateTime>(&data->serverTimestamp));
+    if (data->hasValue)
+        result.setValue(QOpen62541ValueConverter::toQVariant(data->value));
+    if (data->hasStatus) {
+        result.setStatusCode(QOpen62541ValueConverter::scalarToQt<QOpcUa::UaStatusCode, UA_StatusCode>(&data->status));
+    } else {
+        result.setStatusCode(QOpcUa::UaStatusCode::Good);
+    }
+    return result;
+}
+
+template<>
 QUuid scalarToQt<QUuid, UA_Guid>(const UA_Guid *data)
 {
     return QUuid(data->data1, data->data2, data->data3, data->data4[0], data->data4[1], data->data4[2],
@@ -565,6 +585,11 @@ void scalarFromQt(const QTTYPE &value, TARGETTYPE *ptr)
 template<>
 void scalarFromQt<UA_DateTime, QDateTime>(const QDateTime &value, UA_DateTime *ptr)
 {
+    if (!value.isValid()) {
+        *ptr = (std::numeric_limits<qint64>::min)();
+        return;
+    }
+
     // OPC-UA part 3, Table C.9
     const QDateTime uaEpochStart(QDate(1601, 1, 1), QTime(0, 0), Qt::UTC);
 
diff --git a/src/plugins/opcua/uacpp/quacppclient.cpp b/src/plugins/opcua/uacpp/quacppclient.cpp
index d0ba644..c2c627d 100644
--- a/src/plugins/opcua/uacpp/quacppclient.cpp
+++ b/src/plugins/opcua/uacpp/quacppclient.cpp
@@ -130,6 +130,13 @@ bool QUACppClient::writeNodeAttributes(const QList<QOpcUaWriteItem> &nodesToWrit
                                      Q_ARG(QList<QOpcUaWriteItem>, nodesToWrite));
 }
 
+QOpcUaHistoryReadResponse *QUACppClient::readHistoryData(const QOpcUaHistoryReadRawRequest &request)
+{
+    Q_UNUSED(request)
+    qCWarning(QT_OPCUA_PLUGINS_UACPP) << "readHistoryData not implemented";
+    return nullptr;
+}
+
 bool QUACppClient::addNode(const QOpcUaAddNodeItem &nodeToAdd)
 {
     return QMetaObject::invokeMethod(m_backend, "addNode", Qt::QueuedConnection,
diff --git a/src/plugins/opcua/uacpp/quacppclient.h b/src/plugins/opcua/uacpp/quacppclient.h
index 4bf75ca..f34fb3b 100644
--- a/src/plugins/opcua/uacpp/quacppclient.h
+++ b/src/plugins/opcua/uacpp/quacppclient.h
@@ -60,6 +60,8 @@ public:
     bool readNodeAttributes(const QList<QOpcUaReadItem> &nodesToRead) override;
     bool writeNodeAttributes(const QList<QOpcUaWriteItem> &nodesToWrite) override;
 
+    QOpcUaHistoryReadResponse *readHistoryData(const QOpcUaHistoryReadRawRequest &request) override;
+
     bool addNode(const QOpcUaAddNodeItem &nodeToAdd) override;
     bool deleteNode(const QString &nodeId, bool deleteTargetReferences) override;
 
diff --git a/src/plugins/opcua/uacpp/quacppnode.cpp b/src/plugins/opcua/uacpp/quacppnode.cpp
index 2d1a1a3..01a9ede 100644
--- a/src/plugins/opcua/uacpp/quacppnode.cpp
+++ b/src/plugins/opcua/uacpp/quacppnode.cpp
@@ -177,4 +177,16 @@ bool QUACppNode::resolveBrowsePath(const QList<QOpcUaRelativePathElement> &path)
                                      Q_ARG(QList<QOpcUaRelativePathElement>, path));
 }
 
+
+
+QOpcUaHistoryReadResponse *QUACppNode::readHistoryRaw(const QDateTime &startTime, const QDateTime &endTime, quint32 numValues, bool returnBounds)
+{
+    Q_UNUSED(startTime)
+    Q_UNUSED(endTime)
+    Q_UNUSED(numValues)
+    Q_UNUSED(returnBounds)
+    qCWarning(QT_OPCUA_PLUGINS_UACPP) << "readHistoryRaw not implemented";
+    return nullptr;
+}
+
 QT_END_NAMESPACE
diff --git a/src/plugins/opcua/uacpp/quacppnode.h b/src/plugins/opcua/uacpp/quacppnode.h
index dd720a2..561f788 100644
--- a/src/plugins/opcua/uacpp/quacppnode.h
+++ b/src/plugins/opcua/uacpp/quacppnode.h
@@ -60,6 +60,8 @@ public:
 
     bool resolveBrowsePath(const QList<QOpcUaRelativePathElement> &path) override;
 
+    QOpcUaHistoryReadResponse *readHistoryRaw(const QDateTime &startTime, const QDateTime &endTime, quint32 numValues, bool returnBounds) override;
+
 private:
     QPointer<QUACppClient> m_client;
     QString m_nodeIdString;
diff --git a/tests/auto/qopcuaclient/tst_client.cpp b/tests/auto/qopcuaclient/tst_client.cpp
index 18c4f65..40d7784 100644
--- a/tests/auto/qopcuaclient/tst_client.cpp
+++ b/tests/auto/qopcuaclient/tst_client.cpp
@@ -483,6 +483,12 @@ private slots:
 
     void statusStrings();
 
+    defineDataMethod(readHistoryDataFromNode_data)
+    void readHistoryDataFromNode();
+
+    defineDataMethod(readHistoryDataFromClient_data)
+    void readHistoryDataFromClient();
+
     // Events
     defineDataMethod(eventSubscription_data)
     void eventSubscription();
@@ -3853,6 +3859,404 @@ void Tst_QOpcUaClient::eventSubscription()
     QCOMPARE(disabledSpy.at(0).at(1).value<QOpcUa::UaStatusCode>(), QOpcUa::UaStatusCode::Good);
 }
 
+void Tst_QOpcUaClient::readHistoryDataFromNode()
+{
+    QFETCH(QOpcUaClient *, opcuaClient);
+    OpcuaConnector connector(opcuaClient, m_endpoint);
+
+    QScopedPointer<QOpcUaNode> node(opcuaClient->node("ns=2;s=Demo.Static.Historizing1"));
+    QVERIFY (node != nullptr);
+    WRITE_VALUE_ATTRIBUTE(node, 0, QOpcUa::Types::Int32);
+    WRITE_VALUE_ATTRIBUTE(node, 1, QOpcUa::Types::Int32);
+    WRITE_VALUE_ATTRIBUTE(node, 2, QOpcUa::Types::Int32);
+    WRITE_VALUE_ATTRIBUTE(node, 3, QOpcUa::Types::Int32);
+    WRITE_VALUE_ATTRIBUTE(node, 4, QOpcUa::Types::Int32);
+    WRITE_VALUE_ATTRIBUTE(node, 5, QOpcUa::Types::Int32);
+    WRITE_VALUE_ATTRIBUTE(node, 6, QOpcUa::Types::Int32);
+    WRITE_VALUE_ATTRIBUTE(node, 7, QOpcUa::Types::Int32);
+    WRITE_VALUE_ATTRIBUTE(node, 8, QOpcUa::Types::Int32);
+    WRITE_VALUE_ATTRIBUTE(node, 9, QOpcUa::Types::Int32);
+
+    QScopedPointer<QOpcUaNode> nodeWithLimit(opcuaClient->node("ns=2;s=Demo.Static.Historizing1.ContinuationPoint"));
+    QVERIFY (nodeWithLimit != nullptr);
+    WRITE_VALUE_ATTRIBUTE(nodeWithLimit, 0, QOpcUa::Types::Int32);
+    WRITE_VALUE_ATTRIBUTE(nodeWithLimit, 1, QOpcUa::Types::Int32);
+    WRITE_VALUE_ATTRIBUTE(nodeWithLimit, 2, QOpcUa::Types::Int32);
+    WRITE_VALUE_ATTRIBUTE(nodeWithLimit, 3, QOpcUa::Types::Int32);
+    WRITE_VALUE_ATTRIBUTE(nodeWithLimit, 4, QOpcUa::Types::Int32);
+    WRITE_VALUE_ATTRIBUTE(nodeWithLimit, 5, QOpcUa::Types::Int32);
+    WRITE_VALUE_ATTRIBUTE(nodeWithLimit, 6, QOpcUa::Types::Int32);
+    WRITE_VALUE_ATTRIBUTE(nodeWithLimit, 7, QOpcUa::Types::Int32);
+    WRITE_VALUE_ATTRIBUTE(nodeWithLimit, 8, QOpcUa::Types::Int32);
+    WRITE_VALUE_ATTRIBUTE(nodeWithLimit, 9, QOpcUa::Types::Int32);
+
+    // All available data in chronological order
+    {
+        QScopedPointer<QOpcUaHistoryReadResponse> response(node->readHistoryRaw(QDateTime::currentDateTime(),
+                                                                                QDateTime::currentDateTime().addDays(-1),
+                                                                                15, false));
+
+        QVERIFY(response != nullptr);
+
+        QSignalSpy readHistoryDataSpy(response.get(), &QOpcUaHistoryReadResponse::readHistoryDataFinished);
+        readHistoryDataSpy.wait(signalSpyTimeout);
+
+        QCOMPARE(readHistoryDataSpy.size(), 1);
+        QCOMPARE(response->hasMoreData(), false);
+        QCOMPARE(readHistoryDataSpy.size(), 1);
+
+        QCOMPARE(readHistoryDataSpy.at(0).at(1).value<QOpcUa::UaStatusCode>(), QOpcUa::UaStatusCode::Good);
+        auto result = readHistoryDataSpy.at(0).at(0).value<QList<QOpcUaHistoryData>>();
+        QCOMPARE(result.size(), 1);
+        QCOMPARE(result[0].statusCode(), QOpcUa::UaStatusCode::Good);
+        QCOMPARE(result[0].count(), 10);
+        QCOMPARE(result[0].result()[0].value(), 9);
+        QCOMPARE(result[0].result()[1].value(), 8);
+        QCOMPARE(result[0].result()[2].value(), 7);
+        QCOMPARE(result[0].result()[3].value(), 6);
+        QCOMPARE(result[0].result()[4].value(), 5);
+        QCOMPARE(result[0].result()[5].value(), 4);
+        QCOMPARE(result[0].result()[6].value(), 3);
+        QCOMPARE(result[0].result()[7].value(), 2);
+        QCOMPARE(result[0].result()[8].value(), 1);
+        QCOMPARE(result[0].result()[9].value(), 0);
+    }
+
+    // All available data in chronological order with continuation point
+    {
+        QScopedPointer<QOpcUaHistoryReadResponse> response(nodeWithLimit->readHistoryRaw(QDateTime::currentDateTime(),
+                                                                                         QDateTime::currentDateTime().addDays(-1),
+                                                                                         15, false));
+
+        QVERIFY(response != nullptr);
+        QCOMPARE(response->state(), QOpcUaHistoryReadResponse::State::Reading);
+
+        QSignalSpy readHistoryDataSpy(response.get(), &QOpcUaHistoryReadResponse::readHistoryDataFinished);
+        QSignalSpy responseStateSpy(response.get(), &QOpcUaHistoryReadResponse::stateChanged);
+        responseStateSpy.wait(signalSpyTimeout);
+        if (readHistoryDataSpy.empty())
+            readHistoryDataSpy.wait(signalSpyTimeout);
+
+        QCOMPARE(responseStateSpy.size(), 1);
+        QCOMPARE(responseStateSpy.at(0).at(0).value<QOpcUaHistoryReadResponse::State>(),
+                 QOpcUaHistoryReadResponse::State::MoreDataAvailable);
+        responseStateSpy.clear();
+
+        QCOMPARE(readHistoryDataSpy.size(), 1);
+
+        QCOMPARE(readHistoryDataSpy.at(0).at(1).value<QOpcUa::UaStatusCode>(), QOpcUa::UaStatusCode::Good);
+        auto result = readHistoryDataSpy.at(0).at(0).value<QList<QOpcUaHistoryData>>();
+        QCOMPARE(result.size(), 1);
+        QCOMPARE(result[0].statusCode(), QOpcUa::UaStatusCode::Good);
+        QCOMPARE(result[0].count(), 5);
+        QCOMPARE(result[0].result()[0].value(), 9);
+        QCOMPARE(result[0].result()[1].value(), 8);
+        QCOMPARE(result[0].result()[2].value(), 7);
+        QCOMPARE(result[0].result()[3].value(), 6);
+        QCOMPARE(result[0].result()[4].value(), 5);
+
+        readHistoryDataSpy.clear();
+        QCOMPARE(response->hasMoreData(), true);
+        response->readMoreData();
+        responseStateSpy.wait(signalSpyTimeout);
+        if (readHistoryDataSpy.empty())
+            readHistoryDataSpy.wait(signalSpyTimeout);
+
+        QCOMPARE(responseStateSpy.size(), 1);
+        QCOMPARE(responseStateSpy.at(0).at(0).value<QOpcUaHistoryReadResponse::State>(),
+                 QOpcUaHistoryReadResponse::State::Finished);
+
+        QCOMPARE(readHistoryDataSpy.size(), 1);
+
+        QCOMPARE(readHistoryDataSpy.at(0).at(1).value<QOpcUa::UaStatusCode>(), QOpcUa::UaStatusCode::Good);
+        result = readHistoryDataSpy.at(0).at(0).value<QList<QOpcUaHistoryData>>();
+        QCOMPARE(result.size(), 1);
+        QCOMPARE(result[0].statusCode(), QOpcUa::UaStatusCode::Good);
+        QCOMPARE(result[0].count(), 10);
+        QCOMPARE(result[0].result()[0].value(), 9);
+        QCOMPARE(result[0].result()[1].value(), 8);
+        QCOMPARE(result[0].result()[2].value(), 7);
+        QCOMPARE(result[0].result()[3].value(), 6);
+        QCOMPARE(result[0].result()[4].value(), 5);
+        QCOMPARE(result[0].result()[5].value(), 4);
+        QCOMPARE(result[0].result()[6].value(), 3);
+        QCOMPARE(result[0].result()[7].value(), 2);
+        QCOMPARE(result[0].result()[8].value(), 1);
+        QCOMPARE(result[0].result()[9].value(), 0);
+
+        readHistoryDataSpy.clear();
+
+        QCOMPARE(response->hasMoreData(), false);
+    }
+
+
+    // All available data in reverse order
+    {
+        QScopedPointer<QOpcUaHistoryReadResponse> response(node->readHistoryRaw(QDateTime::currentDateTime().addDays(-1),
+                                                                                QDateTime::currentDateTime(), 15, false));
+
+        QVERIFY(response != nullptr);
+
+        QSignalSpy readHistoryDataSpy(response.get(), &QOpcUaHistoryReadResponse::readHistoryDataFinished);
+
+        readHistoryDataSpy.wait(signalSpyTimeout);
+
+        QCOMPARE(readHistoryDataSpy.size(), 1);
+
+        QCOMPARE(readHistoryDataSpy.at(0).at(1).value<QOpcUa::UaStatusCode>(), QOpcUa::UaStatusCode::Good);
+        const auto result = readHistoryDataSpy.at(0).at(0).value<QList<QOpcUaHistoryData>>();
+        QCOMPARE(result.size(), 1);
+        QCOMPARE(result[0].statusCode(), QOpcUa::UaStatusCode::Good);
+        QCOMPARE(result[0].count(), 10);
+        QCOMPARE(result[0].result()[0].value(), 0);
+        QCOMPARE(result[0].result()[1].value(), 1);
+        QCOMPARE(result[0].result()[2].value(), 2);
+        QCOMPARE(result[0].result()[3].value(), 3);
+        QCOMPARE(result[0].result()[4].value(), 4);
+        QCOMPARE(result[0].result()[5].value(), 5);
+        QCOMPARE(result[0].result()[6].value(), 6);
+        QCOMPARE(result[0].result()[7].value(), 7);
+        QCOMPARE(result[0].result()[8].value(), 8);
+        QCOMPARE(result[0].result()[9].value(), 9);
+
+        QCOMPARE(response->hasMoreData(), false);
+    }
+
+    // Empty data set for a time range without data
+    {
+        QScopedPointer<QOpcUaHistoryReadResponse> response(node->readHistoryRaw(QDateTime::currentDateTime().addDays(-3),
+                                                                                QDateTime::currentDateTime().addDays(-2),
+                                                                                5, false));
+
+        QVERIFY(response != nullptr);
+        QSignalSpy readHistoryDataSpy(response.get(), &QOpcUaHistoryReadResponse::readHistoryDataFinished);
+
+        readHistoryDataSpy.wait(signalSpyTimeout);
+
+        QCOMPARE(readHistoryDataSpy.size(), 1);
+
+        QCOMPARE(readHistoryDataSpy.at(0).at(1).value<QOpcUa::UaStatusCode>(), QOpcUa::UaStatusCode::Good);
+        const auto resultNoData = readHistoryDataSpy.at(0).at(0).value<QList<QOpcUaHistoryData>>();
+        QCOMPARE(resultNoData.size(), 1);
+        QCOMPARE(resultNoData[0].statusCode(), QOpcUa::UaStatusCode::Good);
+        QCOMPARE(resultNoData[0].count(), 0);
+
+        QCOMPARE(response->hasMoreData(), false);
+    }
+
+    // Only a starting time
+    {
+        QScopedPointer<QOpcUaHistoryReadResponse> response(node->readHistoryRaw(QDateTime::currentDateTime().addDays(-1),
+                                                                                QDateTime(), 15, false));
+
+        QVERIFY(response != nullptr);
+        QSignalSpy readHistoryDataSpy(response.get(), &QOpcUaHistoryReadResponse::readHistoryDataFinished);
+
+        readHistoryDataSpy.wait(signalSpyTimeout);
+
+        QCOMPARE(readHistoryDataSpy.size(), 1);
+
+        QCOMPARE(readHistoryDataSpy.at(0).at(1).value<QOpcUa::UaStatusCode>(), QOpcUa::UaStatusCode::Good);
+        const auto result = readHistoryDataSpy.at(0).at(0).value<QList<QOpcUaHistoryData>>();
+        QCOMPARE(result.size(), 1);
+        QCOMPARE(result[0].statusCode(), QOpcUa::UaStatusCode::Good);
+        QCOMPARE(result[0].count(), 10);
+        QCOMPARE(result[0].result()[0].value(), 0);
+        QCOMPARE(result[0].result()[1].value(), 1);
+        QCOMPARE(result[0].result()[2].value(), 2);
+        QCOMPARE(result[0].result()[3].value(), 3);
+        QCOMPARE(result[0].result()[4].value(), 4);
+        QCOMPARE(result[0].result()[5].value(), 5);
+        QCOMPARE(result[0].result()[6].value(), 6);
+        QCOMPARE(result[0].result()[7].value(), 7);
+        QCOMPARE(result[0].result()[8].value(), 8);
+        QCOMPARE(result[0].result()[9].value(), 9);
+
+        QCOMPARE(response->hasMoreData(), false);
+    }
+
+
+    // Only an end time
+    {
+        QScopedPointer<QOpcUaHistoryReadResponse> response(node->readHistoryRaw(QDateTime(),
+                                                                                QDateTime::currentDateTime().addDays(1), 15, false));
+
+        QVERIFY(response != nullptr);
+        QSignalSpy readHistoryDataSpy(response.get(), &QOpcUaHistoryReadResponse::readHistoryDataFinished);
+
+        readHistoryDataSpy.wait(signalSpyTimeout);
+
+        QCOMPARE(readHistoryDataSpy.size(), 1);
+
+        QCOMPARE(readHistoryDataSpy.at(0).at(1).value<QOpcUa::UaStatusCode>(), QOpcUa::UaStatusCode::Good);
+        const auto result = readHistoryDataSpy.at(0).at(0).value<QList<QOpcUaHistoryData>>();
+        QCOMPARE(result.size(), 1);
+        QCOMPARE(result[0].statusCode(), QOpcUa::UaStatusCode::Good);
+        QCOMPARE(result[0].count(), 10);
+        QCOMPARE(result[0].result()[0].value(), 9);
+        QCOMPARE(result[0].result()[1].value(), 8);
+        QCOMPARE(result[0].result()[2].value(), 7);
+        QCOMPARE(result[0].result()[3].value(), 6);
+        QCOMPARE(result[0].result()[4].value(), 5);
+        QCOMPARE(result[0].result()[5].value(), 4);
+        QCOMPARE(result[0].result()[6].value(), 3);
+        QCOMPARE(result[0].result()[7].value(), 2);
+        QCOMPARE(result[0].result()[8].value(), 1);
+        QCOMPARE(result[0].result()[9].value(), 0);
+
+        QCOMPARE(response->hasMoreData(), false);
+    }
+
+    // Return bounds
+    {
+        QScopedPointer<QOpcUaHistoryReadResponse> response(node->readHistoryRaw(QDateTime::currentDateTime().addDays(-1),
+                                                                                QDateTime(), 15, true));
+
+        QVERIFY(response != nullptr);
+        QSignalSpy readHistoryDataSpy(response.get(), &QOpcUaHistoryReadResponse::readHistoryDataFinished);
+
+        readHistoryDataSpy.wait(signalSpyTimeout);
+
+        QCOMPARE(readHistoryDataSpy.size(), 1);
+
+        QCOMPARE(readHistoryDataSpy.at(0).at(1).value<QOpcUa::UaStatusCode>(), QOpcUa::UaStatusCode::Good);
+        const auto result = readHistoryDataSpy.at(0).at(0).value<QList<QOpcUaHistoryData>>();
+        QCOMPARE(result.size(), 1);
+        QCOMPARE(result[0].statusCode(), QOpcUa::UaStatusCode::Good);
+        QCOMPARE(result[0].count(), 12);
+        QCOMPARE(result[0].result()[0].statusCode(), QOpcUa::UaStatusCode::BadBoundNotFound);
+        QCOMPARE(result[0].result()[0].value(), QVariant());
+        QCOMPARE(result[0].result()[1].value(), 0);
+        QCOMPARE(result[0].result()[2].value(), 1);
+        QCOMPARE(result[0].result()[3].value(), 2);
+        QCOMPARE(result[0].result()[4].value(), 3);
+        QCOMPARE(result[0].result()[5].value(), 4);
+        QCOMPARE(result[0].result()[6].value(), 5);
+        QCOMPARE(result[0].result()[7].value(), 6);
+        QCOMPARE(result[0].result()[8].value(), 7);
+        QCOMPARE(result[0].result()[9].value(), 8);
+        QCOMPARE(result[0].result()[10].value(), 9);
+
+        QCOMPARE(response->hasMoreData(), false);
+    }
+}
+
+void Tst_QOpcUaClient::readHistoryDataFromClient()
+{
+    QFETCH(QOpcUaClient *, opcuaClient);
+    OpcuaConnector connector(opcuaClient, m_endpoint);
+
+    QScopedPointer<QOpcUaNode> node(opcuaClient->node("ns=2;s=Demo.Static.Historizing2"));
+    QVERIFY (node != nullptr);
+    WRITE_VALUE_ATTRIBUTE(node, 0, QOpcUa::Types::Int32);
+    WRITE_VALUE_ATTRIBUTE(node, 1, QOpcUa::Types::Int32);
+    WRITE_VALUE_ATTRIBUTE(node, 2, QOpcUa::Types::Int32);
+    WRITE_VALUE_ATTRIBUTE(node, 3, QOpcUa::Types::Int32);
+    WRITE_VALUE_ATTRIBUTE(node, 4, QOpcUa::Types::Int32);
+    WRITE_VALUE_ATTRIBUTE(node, 5, QOpcUa::Types::Int32);
+    WRITE_VALUE_ATTRIBUTE(node, 6, QOpcUa::Types::Int32);
+    WRITE_VALUE_ATTRIBUTE(node, 7, QOpcUa::Types::Int32);
+    WRITE_VALUE_ATTRIBUTE(node, 8, QOpcUa::Types::Int32);
+    WRITE_VALUE_ATTRIBUTE(node, 9, QOpcUa::Types::Int32);
+
+    QScopedPointer<QOpcUaNode> nodeWithLimit(opcuaClient->node("ns=2;s=Demo.Static.Historizing2.ContinuationPoint"));
+    QVERIFY (nodeWithLimit != nullptr);
+    WRITE_VALUE_ATTRIBUTE(nodeWithLimit, 10, QOpcUa::Types::Int32);
+    WRITE_VALUE_ATTRIBUTE(nodeWithLimit, 11, QOpcUa::Types::Int32);
+    WRITE_VALUE_ATTRIBUTE(nodeWithLimit, 12, QOpcUa::Types::Int32);
+    WRITE_VALUE_ATTRIBUTE(nodeWithLimit, 13, QOpcUa::Types::Int32);
+    WRITE_VALUE_ATTRIBUTE(nodeWithLimit, 14, QOpcUa::Types::Int32);
+    WRITE_VALUE_ATTRIBUTE(nodeWithLimit, 15, QOpcUa::Types::Int32);
+    WRITE_VALUE_ATTRIBUTE(nodeWithLimit, 16, QOpcUa::Types::Int32);
+    WRITE_VALUE_ATTRIBUTE(nodeWithLimit, 17, QOpcUa::Types::Int32);
+    WRITE_VALUE_ATTRIBUTE(nodeWithLimit, 18, QOpcUa::Types::Int32);
+    WRITE_VALUE_ATTRIBUTE(nodeWithLimit, 19, QOpcUa::Types::Int32);
+
+    // Values for two nodes in chronological order
+    // One of the nodes will require two calls to get all values
+    {
+        QOpcUaHistoryReadRawRequest request(
+                    {QOpcUaReadItem(node->nodeId()), QOpcUaReadItem(nodeWithLimit->nodeId())},
+                    QDateTime::currentDateTime(),
+                    QDateTime::currentDateTime().addDays(-1),
+                    15,
+                    false
+                    );
+
+        QScopedPointer<QOpcUaHistoryReadResponse> response(opcuaClient->readHistoryData(request));
+        QVERIFY(response != nullptr);
+
+        QSignalSpy readHistoryDataSpy(response.get(), &QOpcUaHistoryReadResponse::readHistoryDataFinished);
+        readHistoryDataSpy.wait(signalSpyTimeout);
+
+        QCOMPARE(readHistoryDataSpy.size(), 1);
+
+        QCOMPARE(readHistoryDataSpy.at(0).at(1).value<QOpcUa::UaStatusCode>(), QOpcUa::UaStatusCode::Good);
+        auto result = readHistoryDataSpy.at(0).at(0).value<QList<QOpcUaHistoryData>>();
+        QCOMPARE(result.size(), 2);
+        QCOMPARE(result[0].nodeId(), "ns=2;s=Demo.Static.Historizing2");
+        QCOMPARE(result[0].statusCode(), QOpcUa::UaStatusCode::Good);
+        QCOMPARE(result[0].count(), 10);
+        QCOMPARE(result[0].result()[0].value(), 9);
+        QCOMPARE(result[0].result()[1].value(), 8);
+        QCOMPARE(result[0].result()[2].value(), 7);
+        QCOMPARE(result[0].result()[3].value(), 6);
+        QCOMPARE(result[0].result()[4].value(), 5);
+        QCOMPARE(result[0].result()[5].value(), 4);
+        QCOMPARE(result[0].result()[6].value(), 3);
+        QCOMPARE(result[0].result()[7].value(), 2);
+        QCOMPARE(result[0].result()[8].value(), 1);
+        QCOMPARE(result[0].result()[9].value(), 0);
+        QCOMPARE(result[1].count(), 5);
+        QCOMPARE(result[1].nodeId(), "ns=2;s=Demo.Static.Historizing2.ContinuationPoint");
+        QCOMPARE(result[1].result()[0].value(), 19);
+        QCOMPARE(result[1].result()[1].value(), 18);
+        QCOMPARE(result[1].result()[2].value(), 17);
+        QCOMPARE(result[1].result()[3].value(), 16);
+        QCOMPARE(result[1].result()[4].value(), 15);
+
+        QCOMPARE(response->hasMoreData(), true);
+        readHistoryDataSpy.clear();
+
+        response->readMoreData();
+        readHistoryDataSpy.wait(signalSpyTimeout);
+
+        QCOMPARE(readHistoryDataSpy.size(), 1);
+
+        QCOMPARE(readHistoryDataSpy.at(0).at(1).value<QOpcUa::UaStatusCode>(), QOpcUa::UaStatusCode::Good);
+        result = readHistoryDataSpy.at(0).at(0).value<QList<QOpcUaHistoryData>>();
+        QCOMPARE(result.size(), 2);
+        QCOMPARE(result[0].nodeId(), "ns=2;s=Demo.Static.Historizing2");
+        QCOMPARE(result[0].statusCode(), QOpcUa::UaStatusCode::Good);
+        QCOMPARE(result[0].count(), 10);
+        QCOMPARE(result[0].result()[0].value(), 9);
+        QCOMPARE(result[0].result()[1].value(), 8);
+        QCOMPARE(result[0].result()[2].value(), 7);
+        QCOMPARE(result[0].result()[3].value(), 6);
+        QCOMPARE(result[0].result()[4].value(), 5);
+        QCOMPARE(result[0].result()[5].value(), 4);
+        QCOMPARE(result[0].result()[6].value(), 3);
+        QCOMPARE(result[0].result()[7].value(), 2);
+        QCOMPARE(result[0].result()[8].value(), 1);
+        QCOMPARE(result[0].result()[9].value(), 0);
+        QCOMPARE(result[1].count(), 10);
+        QCOMPARE(result[1].nodeId(), "ns=2;s=Demo.Static.Historizing2.ContinuationPoint");
+        QCOMPARE(result[1].result()[0].value(), 19);
+        QCOMPARE(result[1].result()[1].value(), 18);
+        QCOMPARE(result[1].result()[2].value(), 17);
+        QCOMPARE(result[1].result()[3].value(), 16);
+        QCOMPARE(result[1].result()[4].value(), 15);
+        QCOMPARE(result[1].result()[5].value(), 14);
+        QCOMPARE(result[1].result()[6].value(), 13);
+        QCOMPARE(result[1].result()[7].value(), 12);
+        QCOMPARE(result[1].result()[8].value(), 11);
+        QCOMPARE(result[1].result()[9].value(), 10);
+
+        QCOMPARE(response->hasMoreData(), false);
+    }
+}
+
+
 void Tst_QOpcUaClient::connectionLost()
 {
     // Restart the test server if necessary
diff --git a/tests/open62541-testserver/main.cpp b/tests/open62541-testserver/main.cpp
index db51963..6431514 100644
--- a/tests/open62541-testserver/main.cpp
+++ b/tests/open62541-testserver/main.cpp
@@ -212,6 +212,17 @@ int main()
                                                     QOpcUaExtensionObject(), QOpcUa::Types::ExtensionObject);
     server.addNodeWithFixedTimestamp(testFolder, "ns=2;s=Demo.Static.FixedTimestamp", "FixedTimestamp");
 
+    // Add variables for historizing
+    server.addVariable(testFolder, "ns=2;s=Demo.Static.Historizing1", "HistorizingTest1", 0, QOpcUa::Types::Int32,
+                       QList<quint32>(), UA_VALUERANK_ANY, true);
+    server.addVariable(testFolder, "ns=2;s=Demo.Static.Historizing1.ContinuationPoint", "HistorizingContinuationPointTest1", 0, QOpcUa::Types::Int32,
+                       QList<quint32>(), UA_VALUERANK_ANY, true, 5);
+
+    server.addVariable(testFolder, "ns=2;s=Demo.Static.Historizing2", "HistorizingTest2", 0, QOpcUa::Types::Int32,
+                       QList<quint32>(), UA_VALUERANK_ANY, true);
+    server.addVariable(testFolder, "ns=2;s=Demo.Static.Historizing2.ContinuationPoint", "HistorizingContinuationPointTest2", 0, QOpcUa::Types::Int32,
+                       QList<quint32>(), UA_VALUERANK_ANY, true, 5);
+
     // Create folders containing child nodes with string, guid and opaque node ids
     UA_NodeId testStringIdsFolder = server.addFolder("ns=3;s=testStringIdsFolder", "testStringIdsFolder");
     server.addVariable(testStringIdsFolder, "ns=3;s=theStringId", "theStringId", QStringLiteral("Value"), QOpcUa::Types::String);
diff --git a/tests/open62541-testserver/testserver.cpp b/tests/open62541-testserver/testserver.cpp
index 46a8135..b3b2448 100644
--- a/tests/open62541-testserver/testserver.cpp
+++ b/tests/open62541-testserver/testserver.cpp
@@ -237,6 +237,10 @@ bool TestServer::init()
     success = createInsecureServerConfig(m_config);
 #endif
 
+    m_gathering = UA_HistoryDataGathering_Default(1);
+    m_config->historyDatabase = UA_HistoryDatabase_default(m_gathering);
+
+
     if (!success || !m_config)
         return false;
 
@@ -356,7 +360,7 @@ UA_NodeId TestServer::addVariableWithWriteMask(const UA_NodeId &folder, const QS
 }
 
 UA_NodeId TestServer::addVariable(const UA_NodeId &folder, const QString &variableNode, const QString &name, const QVariant &value,
-                                  QOpcUa::Types type, QList<quint32> arrayDimensions, int valueRank)
+                                  QOpcUa::Types type, QList<quint32> arrayDimensions, int valueRank, bool enableHistorizing, quint32 historyNumValuesPerNode)
 {
     UA_NodeId variableNodeId = Open62541Utils::nodeIdFromQString(variableNode);
 
@@ -367,8 +371,13 @@ UA_NodeId TestServer::addVariable(const UA_NodeId &folder, const QString &variab
     attr.valueRank = valueRank;
     attr.displayName = UA_LOCALIZEDTEXT_ALLOC("en-US", name.toUtf8().constData());
     attr.dataType = attr.value.type ? attr.value.type->typeId : UA_TYPES[UA_TYPES_BOOLEAN].typeId;
-    attr.accessLevel = UA_ACCESSLEVELMASK_READ | UA_ACCESSLEVELMASK_WRITE;
+    if (enableHistorizing) {
+        attr.accessLevel = UA_ACCESSLEVELMASK_READ | UA_ACCESSLEVELMASK_WRITE | UA_ACCESSLEVELMASK_HISTORYREAD;
+    } else {
+        attr.accessLevel = UA_ACCESSLEVELMASK_READ | UA_ACCESSLEVELMASK_WRITE;
+    }
     attr.description = UA_LOCALIZEDTEXT_ALLOC("en-US", description.toUtf8().constData());
+    attr.historizing = enableHistorizing;
 
     if (arrayDimensions.size()) {
         attr.arrayDimensionsSize = arrayDimensions.size();
@@ -394,6 +403,18 @@ UA_NodeId TestServer::addVariable(const UA_NodeId &folder, const QString &variab
     attr.arrayDimensions = nullptr;
     attr.arrayDimensionsSize = 0;
 
+    if (enableHistorizing) {
+        UA_HistorizingNodeIdSettings setting;
+        setting.historizingBackend = UA_HistoryDataBackend_Memory(1, 10);
+        setting.maxHistoryDataResponseSize = historyNumValuesPerNode;
+        setting.historizingUpdateStrategy = UA_HISTORIZINGUPDATESTRATEGY_VALUESET;
+        result = m_gathering.registerNodeId(m_server, m_gathering.context, &resultId, setting);
+        if (result != UA_STATUSCODE_GOOD) {
+            qWarning() << "Could not register node for historical data:" << result << "for node" << variableNode;
+            return UA_NODEID_NULL;
+        }
+    }
+
     UA_NodeId_deleteMembers(&variableNodeId);
     UA_VariableAttributes_deleteMembers(&attr);
 
diff --git a/tests/open62541-testserver/testserver.h b/tests/open62541-testserver/testserver.h
index bb54e08..0feca63 100644
--- a/tests/open62541-testserver/testserver.h
+++ b/tests/open62541-testserver/testserver.h
@@ -65,7 +65,8 @@ public:
     UA_NodeId addObject(const UA_NodeId &folderId, int namespaceIndex, const QString &objectName = QString());
 
     UA_NodeId addVariable(const UA_NodeId &folder, const QString &variableNode, const QString &name, const QVariant &value,
-                          QOpcUa::Types type, QList<quint32> arrayDimensions = QList<quint32>(), int valueRank = UA_VALUERANK_ANY);
+                          QOpcUa::Types type, QList<quint32> arrayDimensions = QList<quint32>(), int valueRank = UA_VALUERANK_ANY,
+                          bool enableHistorizing = false, quint32 historyNumValuesPerNode = 100);
     UA_NodeId addVariableWithWriteMask(const UA_NodeId &folder, const QString &variableNode, const QString &name, const QVariant &value,
                           QOpcUa::Types type, quint32 writeMask);
     UA_NodeId addEmptyArrayVariable(const UA_NodeId &folder, const QString &variableNode, const QString &name);
@@ -103,6 +104,7 @@ public:
 
     UA_ServerConfig *m_config{nullptr};
     UA_Server *m_server{nullptr};
+    UA_HistoryDataGathering m_gathering;
 
 public slots:
     UA_StatusCode run(volatile bool *running);