diff --git a/NodeSetToAML.cs b/NodeSetToAML.cs
index 0939b44..7a106b3 100644
--- a/NodeSetToAML.cs
+++ b/NodeSetToAML.cs
@@ -694,14 +694,6 @@ private string GetLocaleId( NodeSet.LocalizedText localizedText, ref string last
         private AttributeType AddModifyAttribute(AttributeSequence seq, string name, string refDataType, Variant val, bool bListOf = false, string sURI = uaNamespaceURI)
         {
             string sUADataType = refDataType;
-
-            var DataTypeNode = m_modelManager.FindNode<UANode>(refDataType);
-            if (DataTypeNode != null)
-            {
-                sUADataType = DataTypeNode.DecodedBrowseName.Name;
-                sURI = m_modelManager.FindModelUri(DataTypeNode.DecodedNodeId);
-            }
-
             string ListOfPrefix = "";
             if (bListOf == true)
                 ListOfPrefix = ListOf;
diff --git a/Opc2Aml.csproj b/Opc2Aml.csproj
index 465d94e..565cdb4 100644
--- a/Opc2Aml.csproj
+++ b/Opc2Aml.csproj
@@ -25,7 +25,10 @@
   <ItemGroup>
     <PackageReference Include="Aml.Engine" Version="3.1.1" />
     <PackageReference Include="Aml.Engine.Resources" Version="3.0.0" />
-    <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua" Version="1.4.371.60" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
+    <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua" Version="1.5.374.158" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/OrderModelInfo.cs b/OrderModelInfo.cs
index 4a24ed3..90a6ccf 100644
--- a/OrderModelInfo.cs
+++ b/OrderModelInfo.cs
@@ -1,12 +1,7 @@
 using MarkdownProcessor;
 using MarkdownProcessor.NodeSet;
-using Microsoft.AspNetCore.Mvc.ViewFeatures;
-using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Opc2Aml
 {
diff --git a/SystemTest/SystemTest.csproj b/SystemTest/SystemTest.csproj
index b962295..c0d52a9 100644
--- a/SystemTest/SystemTest.csproj
+++ b/SystemTest/SystemTest.csproj
@@ -18,7 +18,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua" Version="1.4.371.60" />
+    <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua" Version="1.5.374.158" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/SystemTest/TestComplexRootNamespace.cs b/SystemTest/TestComplexRootNamespace.cs
index c7714d0..77f636f 100644
--- a/SystemTest/TestComplexRootNamespace.cs
+++ b/SystemTest/TestComplexRootNamespace.cs
@@ -59,8 +59,8 @@ public void TestDataSetMetaData()
             ValidateQualifiedName( structureDataType, "Name", RootLevel, "Structure Description One" );
 
             AttributeType structureDefinition = GetAttribute( structureDataType, "StructureDefinition", validateSubAttributes: true );
-            ValidateNodeId( structureDefinition, "DefaultEncodingId", LevelOne, new NodeId( "EncodingOne" ) );
-            ValidateNodeId( structureDefinition, "BaseDataType", LevelOne, new NodeId( "BaseDataTypeOne" ) );
+            ValidateNodeId( structureDefinition, "DefaultEncodingId", LevelOne, new NodeId( "EncodingOne", 1 ) );
+            ValidateNodeId( structureDefinition, "BaseDataType", LevelOne, new NodeId( "BaseDataTypeOne", 1 ) );
 
             AttributeType structureType = GetAttribute( structureDefinition, "StructureType", validateSubAttributes: false );
             Assert.AreEqual( "Structure", structureType.Value );