From d93f587282b6f1d758f0e2920e1475fdc1620984 Mon Sep 17 00:00:00 2001
From: thomasfruehwirth <thomasfruehwirth@hotmail.com>
Date: Tue, 7 Dec 2021 13:44:53 +0100
Subject: [PATCH] Add Instance Tests

---
 Uml2OpcuaTransformationTests/Aggregation.xml  |  22 +-
 .../ChainedComposition.xml                    |  44 ++--
 Uml2OpcuaTransformationTests/Class.csv        |   1 +
 Uml2OpcuaTransformationTests/Class.xml        |   4 +-
 .../ClassDiagramAndStateMachine.csv           |   8 +
 .../ClassDiagramAndStateMachine.xml           |  79 +++++---
 .../CompositionWithoutMemberName.xml          |  20 +-
 .../DirectedNamedAssociation.notation         | 190 +++++++++---------
 .../DirectedNamedAssociation.uml              |  17 +-
 .../DirectedNamedAssociation.xml              |  12 +-
 Uml2OpcuaTransformationTests/Instance.xml     |  26 +--
 .../InstanceWithInheritedMethod.csv           |   5 +
 .../InstanceWithInheritedMethod.di            |   2 +
 .../InstanceWithInheritedMethod.notation      |  89 ++++++++
 .../InstanceWithInheritedMethod.uml           |  13 ++
 .../InstanceWithInheritedMethod.xml           |  51 +++++
 .../InstanceWithInheritedProperty.csv         |   6 +
 .../InstanceWithInheritedProperty.di          |   2 +
 .../InstanceWithInheritedProperty.notation    |  90 +++++++++
 .../InstanceWithInheritedProperty.uml         |  15 ++
 .../InstanceWithInheritedProperty.xml         |  64 ++++++
 .../InstanceWithInstanceValueSlot.xml         | 164 +++++++--------
 .../Multiplicity_1_to_1n.xml                  |  52 ++---
 .../NonPrimitiveProperty.di                   |   2 +
 .../NonPrimitiveProperty.notation             |  75 +++++++
 .../NonPrimitiveProperty.uml                  |  14 ++
 .../NonPrimitiveProperty.xml                  |  34 ++++
 Uml2OpcuaTransformationTests/Operation.xml    | 129 ++++++------
 Uml2OpcuaTransformationTests/PropertyClass.di |   2 +
 .../PropertyClass.notation                    |  77 +++++++
 .../PropertyClass.uml                         |  10 +
 .../PropertyClass.xml                         |  35 ++++
 .../PropertyInherited.csv                     |   6 +
 .../PropertyInherited.di                      |   2 +
 .../PropertyInherited.notation                | 117 +++++++++++
 .../PropertyInherited.uml                     |  17 ++
 .../PropertyInherited.xml                     |  61 ++++++
 .../PropertyInteger.xml                       |  17 +-
 .../PropertyString.xml                        |  18 +-
 Uml2OpcuaTransformationTests/Transition.xml   |  42 ++--
 40 files changed, 1228 insertions(+), 406 deletions(-)
 create mode 100644 Uml2OpcuaTransformationTests/Class.csv
 create mode 100644 Uml2OpcuaTransformationTests/ClassDiagramAndStateMachine.csv
 create mode 100644 Uml2OpcuaTransformationTests/InstanceWithInheritedMethod.csv
 create mode 100644 Uml2OpcuaTransformationTests/InstanceWithInheritedMethod.di
 create mode 100644 Uml2OpcuaTransformationTests/InstanceWithInheritedMethod.notation
 create mode 100644 Uml2OpcuaTransformationTests/InstanceWithInheritedMethod.uml
 create mode 100644 Uml2OpcuaTransformationTests/InstanceWithInheritedMethod.xml
 create mode 100644 Uml2OpcuaTransformationTests/InstanceWithInheritedProperty.csv
 create mode 100644 Uml2OpcuaTransformationTests/InstanceWithInheritedProperty.di
 create mode 100644 Uml2OpcuaTransformationTests/InstanceWithInheritedProperty.notation
 create mode 100644 Uml2OpcuaTransformationTests/InstanceWithInheritedProperty.uml
 create mode 100644 Uml2OpcuaTransformationTests/InstanceWithInheritedProperty.xml
 create mode 100644 Uml2OpcuaTransformationTests/NonPrimitiveProperty.di
 create mode 100644 Uml2OpcuaTransformationTests/NonPrimitiveProperty.notation
 create mode 100644 Uml2OpcuaTransformationTests/NonPrimitiveProperty.uml
 create mode 100644 Uml2OpcuaTransformationTests/NonPrimitiveProperty.xml
 create mode 100644 Uml2OpcuaTransformationTests/PropertyClass.di
 create mode 100644 Uml2OpcuaTransformationTests/PropertyClass.notation
 create mode 100644 Uml2OpcuaTransformationTests/PropertyClass.uml
 create mode 100644 Uml2OpcuaTransformationTests/PropertyClass.xml
 create mode 100644 Uml2OpcuaTransformationTests/PropertyInherited.csv
 create mode 100644 Uml2OpcuaTransformationTests/PropertyInherited.di
 create mode 100644 Uml2OpcuaTransformationTests/PropertyInherited.notation
 create mode 100644 Uml2OpcuaTransformationTests/PropertyInherited.uml
 create mode 100644 Uml2OpcuaTransformationTests/PropertyInherited.xml

diff --git a/Uml2OpcuaTransformationTests/Aggregation.xml b/Uml2OpcuaTransformationTests/Aggregation.xml
index 57445ef..f266acd 100644
--- a/Uml2OpcuaTransformationTests/Aggregation.xml
+++ b/Uml2OpcuaTransformationTests/Aggregation.xml
@@ -4,32 +4,32 @@
     <Uri>Aggregation</Uri>
   </NamespaceUris>
   <Aliases>
-    <Alias Alias="HasSubtype">i=45</Alias>
-    <Alias Alias="HasTypeDefinition">i=40</Alias>
     <Alias Alias="HasModellingRule">i=37</Alias>
     <Alias Alias="BaseObjectType">i=58</Alias>
-    <Alias Alias="ModellingRule_Mandatory">i=78</Alias>
     <Alias Alias="HasComponent">i=47</Alias>
+    <Alias Alias="HasTypeDefinition">i=40</Alias>
+    <Alias Alias="HasSubtype">i=45</Alias>
+    <Alias Alias="ModellingRule_Mandatory">i=78</Alias>
   </Aliases>
-  <UAObject BrowseName="Gripper1" NodeId="ns=1;s=Gripper1" ParentNodeId="ns=1;s=RobotType">
+  <UAObject BrowseName="Gripper1" NodeId="ns=1;i=1002" ParentNodeId="ns=1;i=1001">
     <DisplayName>Gripper1</DisplayName>
     <References>
-      <Reference ReferenceType="HasTypeDefinition">ns=1;s=GripperType</Reference>
-      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;s=RobotType</Reference>
+      <Reference ReferenceType="HasTypeDefinition">ns=1;i=1000</Reference>
+      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;i=1001</Reference>
       <Reference ReferenceType="HasModellingRule">ModellingRule_Mandatory</Reference>
     </References>
   </UAObject>
-  <UAObjectType BrowseName="RobotType" NodeId="ns=1;s=RobotType">
-    <DisplayName>RobotType</DisplayName>
+  <UAObjectType BrowseName="GripperType" NodeId="ns=1;i=1000">
+    <DisplayName>GripperType</DisplayName>
     <References>
       <Reference IsForward="false" ReferenceType="HasSubtype">BaseObjectType</Reference>
-      <Reference ReferenceType="HasComponent">ns=1;s=Gripper1</Reference>
     </References>
   </UAObjectType>
-  <UAObjectType BrowseName="GripperType" NodeId="ns=1;s=GripperType">
-    <DisplayName>GripperType</DisplayName>
+  <UAObjectType BrowseName="RobotType" NodeId="ns=1;i=1001">
+    <DisplayName>RobotType</DisplayName>
     <References>
       <Reference IsForward="false" ReferenceType="HasSubtype">BaseObjectType</Reference>
+      <Reference ReferenceType="HasComponent">ns=1;i=1002</Reference>
     </References>
   </UAObjectType>
 </UANodeSet>
\ No newline at end of file
diff --git a/Uml2OpcuaTransformationTests/ChainedComposition.xml b/Uml2OpcuaTransformationTests/ChainedComposition.xml
index ae2829e..a8682da 100644
--- a/Uml2OpcuaTransformationTests/ChainedComposition.xml
+++ b/Uml2OpcuaTransformationTests/ChainedComposition.xml
@@ -5,56 +5,56 @@
   </NamespaceUris>
   <Aliases>
     <Alias Alias="BaseObjectType">i=58</Alias>
-    <Alias Alias="HasComponent">i=47</Alias>
+    <Alias Alias="ModellingRule_Mandatory">i=78</Alias>
     <Alias Alias="HasSubtype">i=45</Alias>
     <Alias Alias="ModellingRule_Optional">i=80</Alias>
-    <Alias Alias="HasModellingRule">i=37</Alias>
     <Alias Alias="HasTypeDefinition">i=40</Alias>
-    <Alias Alias="ModellingRule_Mandatory">i=78</Alias>
+    <Alias Alias="HasModellingRule">i=37</Alias>
+    <Alias Alias="HasComponent">i=47</Alias>
   </Aliases>
-  <UAObject BrowseName="Program" NodeId="ns=1;i=1001" ParentNodeId="ns=1;i=1000">
+  <UAObject BrowseName="Program" NodeId="ns=1;i=1003" ParentNodeId="ns=1;i=1001">
     <DisplayName>Program</DisplayName>
     <References>
-      <Reference ReferenceType="HasTypeDefinition">ns=1;i=1002</Reference>
-      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;i=1000</Reference>
+      <Reference ReferenceType="HasTypeDefinition">ns=1;i=1004</Reference>
+      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;i=1001</Reference>
       <Reference ReferenceType="HasModellingRule">ModellingRule_Optional</Reference>
     </References>
   </UAObject>
-  <UAObject BrowseName="Program" NodeId="ns=1;i=1005" ParentNodeId="ns=1;i=1004">
-    <DisplayName>Program</DisplayName>
+  <UAObject BrowseName="Controller" NodeId="ns=1;i=1001" ParentNodeId="ns=1;i=1000">
+    <DisplayName>Controller</DisplayName>
     <References>
       <Reference ReferenceType="HasTypeDefinition">ns=1;i=1002</Reference>
-      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;i=1004</Reference>
-      <Reference ReferenceType="HasModellingRule">ModellingRule_Optional</Reference>
+      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;i=1000</Reference>
+      <Reference ReferenceType="HasModellingRule">ModellingRule_Mandatory</Reference>
+      <Reference ReferenceType="HasComponent">ns=1;i=1003</Reference>
     </References>
   </UAObject>
-  <UAObject BrowseName="Controller" NodeId="ns=1;i=1004" ParentNodeId="ns=1;i=1003">
-    <DisplayName>Controller</DisplayName>
+  <UAObject BrowseName="Program" NodeId="ns=1;i=1005" ParentNodeId="ns=1;i=1002">
+    <DisplayName>Program</DisplayName>
     <References>
-      <Reference ReferenceType="HasTypeDefinition">ns=1;i=1000</Reference>
-      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;i=1003</Reference>
-      <Reference ReferenceType="HasModellingRule">ModellingRule_Mandatory</Reference>
-      <Reference ReferenceType="HasComponent">ns=1;i=1005</Reference>
+      <Reference ReferenceType="HasTypeDefinition">ns=1;i=1004</Reference>
+      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;i=1002</Reference>
+      <Reference ReferenceType="HasModellingRule">ModellingRule_Optional</Reference>
     </References>
   </UAObject>
-  <UAObjectType BrowseName="ControllerType" NodeId="ns=1;i=1000">
-    <DisplayName>ControllerType</DisplayName>
+  <UAObjectType BrowseName="RobotType" NodeId="ns=1;i=1000">
+    <DisplayName>RobotType</DisplayName>
     <References>
       <Reference IsForward="false" ReferenceType="HasSubtype">BaseObjectType</Reference>
       <Reference ReferenceType="HasComponent">ns=1;i=1001</Reference>
     </References>
   </UAObjectType>
-  <UAObjectType BrowseName="ProgramType" NodeId="ns=1;i=1002">
+  <UAObjectType BrowseName="ProgramType" NodeId="ns=1;i=1004">
     <DisplayName>ProgramType</DisplayName>
     <References>
       <Reference IsForward="false" ReferenceType="HasSubtype">BaseObjectType</Reference>
     </References>
   </UAObjectType>
-  <UAObjectType BrowseName="RobotType" NodeId="ns=1;i=1003">
-    <DisplayName>RobotType</DisplayName>
+  <UAObjectType BrowseName="ControllerType" NodeId="ns=1;i=1002">
+    <DisplayName>ControllerType</DisplayName>
     <References>
       <Reference IsForward="false" ReferenceType="HasSubtype">BaseObjectType</Reference>
-      <Reference ReferenceType="HasComponent">ns=1;i=1004</Reference>
+      <Reference ReferenceType="HasComponent">ns=1;i=1005</Reference>
     </References>
   </UAObjectType>
 </UANodeSet>
\ No newline at end of file
diff --git a/Uml2OpcuaTransformationTests/Class.csv b/Uml2OpcuaTransformationTests/Class.csv
new file mode 100644
index 0000000..e9b96e5
--- /dev/null
+++ b/Uml2OpcuaTransformationTests/Class.csv
@@ -0,0 +1 @@
+Class5Type, 1000, ObjectType
diff --git a/Uml2OpcuaTransformationTests/Class.xml b/Uml2OpcuaTransformationTests/Class.xml
index 4519b8b..f6483c2 100644
--- a/Uml2OpcuaTransformationTests/Class.xml
+++ b/Uml2OpcuaTransformationTests/Class.xml
@@ -4,10 +4,10 @@
     <Uri>Class</Uri>
   </NamespaceUris>
   <Aliases>
-    <Alias Alias="BaseObjectType">i=58</Alias>
     <Alias Alias="HasSubtype">i=45</Alias>
+    <Alias Alias="BaseObjectType">i=58</Alias>
   </Aliases>
-  <UAObjectType BrowseName="Class5Type" NodeId="ns=1;s=Class5Type">
+  <UAObjectType BrowseName="Class5Type" NodeId="ns=1;i=1000">
     <DisplayName>Class5Type</DisplayName>
     <References>
       <Reference IsForward="false" ReferenceType="HasSubtype">BaseObjectType</Reference>
diff --git a/Uml2OpcuaTransformationTests/ClassDiagramAndStateMachine.csv b/Uml2OpcuaTransformationTests/ClassDiagramAndStateMachine.csv
new file mode 100644
index 0000000..f750cc2
--- /dev/null
+++ b/Uml2OpcuaTransformationTests/ClassDiagramAndStateMachine.csv
@@ -0,0 +1,8 @@
+Class1Type_StateMachine1_CurrentState_Id,1004,Variable
+Class1Type_StateMachine1,1001,Object
+Class1Type,1000,ObjectType
+MyStateMachineType,1002,ObjectType
+MyStateMachineType_State2,1006,Object
+MyStateMachineType_State1,1005,Object
+Class1Type_StateMachine1_CurrentState,1003,Variable
+MyStateMachineType_State1_to_State2,1007,Object
diff --git a/Uml2OpcuaTransformationTests/ClassDiagramAndStateMachine.xml b/Uml2OpcuaTransformationTests/ClassDiagramAndStateMachine.xml
index 40bc208..9e29498 100644
--- a/Uml2OpcuaTransformationTests/ClassDiagramAndStateMachine.xml
+++ b/Uml2OpcuaTransformationTests/ClassDiagramAndStateMachine.xml
@@ -4,69 +4,92 @@
     <Uri>ClassDiagramAndStateMachine</Uri>
   </NamespaceUris>
   <Aliases>
-    <Alias Alias="HasModellingRule">i=37</Alias>
-    <Alias Alias="FiniteStateMachineType">i=2771</Alias>
-    <Alias Alias="TransitionEventType">i=2311</Alias>
-    <Alias Alias="HasComponent">i=47</Alias>
-    <Alias Alias="StateType">i=2307</Alias>
-    <Alias Alias="FromState">i=51</Alias>
-    <Alias Alias="ToState">i=52</Alias>
+    <Alias Alias="HasTypeDefinition">i=40</Alias>
+    <Alias Alias="HasEffect">i=54</Alias>
+    <Alias Alias="PropertyType">i=68</Alias>
     <Alias Alias="BaseObjectType">i=58</Alias>
+    <Alias Alias="FromState">i=51</Alias>
     <Alias Alias="ModellingRule_Mandatory">i=78</Alias>
-    <Alias Alias="HasEffect">i=54</Alias>
+    <Alias Alias="LocalizedText">i=21</Alias>
+    <Alias Alias="HasModellingRule">i=37</Alias>
+    <Alias Alias="FiniteStateMachineType">i=2771</Alias>
     <Alias Alias="HasSubtype">i=45</Alias>
     <Alias Alias="TransitionType">i=2310</Alias>
-    <Alias Alias="HasTypeDefinition">i=40</Alias>
+    <Alias Alias="NodeId">i=17</Alias>
+    <Alias Alias="HasProperty">i=46</Alias>
+    <Alias Alias="ToState">i=52</Alias>
+    <Alias Alias="FiniteStateVariableType">i=2760</Alias>
+    <Alias Alias="HasComponent">i=47</Alias>
+    <Alias Alias="TransitionEventType">i=2311</Alias>
+    <Alias Alias="StateType">i=2307</Alias>
   </Aliases>
-  <UAObject BrowseName="StateMachine1" NodeId="ns=1;s=StateMachine1" ParentNodeId="ns=1;s=Class1Type">
+  <UAVariable BrowseName="CurrentState" NodeId="ns=1;i=1003" ParentNodeId="ns=1;i=1001" DataType="LocalizedText">
+    <DisplayName>CurrentState</DisplayName>
+    <References>
+      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;i=1001</Reference>
+      <Reference ReferenceType="HasTypeDefinition">FiniteStateVariableType</Reference>
+      <Reference ReferenceType="HasModellingRule">ModellingRule_Mandatory</Reference>
+      <Reference ReferenceType="HasProperty">ns=1;i=1004</Reference>
+    </References>
+  </UAVariable>
+  <UAVariable BrowseName="Id" NodeId="ns=1;i=1004" ParentNodeId="ns=1;i=1003" DataType="NodeId">
+    <DisplayName>CurrentState</DisplayName>
+    <References>
+      <Reference IsForward="false" ReferenceType="HasProperty">ns=1;i=1003</Reference>
+      <Reference ReferenceType="HasTypeDefinition">PropertyType</Reference>
+      <Reference ReferenceType="HasModellingRule">ModellingRule_Mandatory</Reference>
+    </References>
+  </UAVariable>
+  <UAObject BrowseName="StateMachine1" NodeId="ns=1;i=1001" ParentNodeId="ns=1;i=1000">
     <DisplayName>StateMachine1</DisplayName>
     <References>
-      <Reference ReferenceType="HasTypeDefinition">ns=1;s=MyStateMachineType</Reference>
+      <Reference ReferenceType="HasTypeDefinition">ns=1;i=1002</Reference>
+      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;i=1000</Reference>
       <Reference ReferenceType="HasModellingRule">ModellingRule_Mandatory</Reference>
-      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;s=Class1Type</Reference>
+      <Reference ReferenceType="HasComponent">ns=1;i=1003</Reference>
     </References>
   </UAObject>
-  <UAObjectType BrowseName="Class1Type" NodeId="ns=1;s=Class1Type">
+  <UAObjectType BrowseName="Class1Type" NodeId="ns=1;i=1000">
     <DisplayName>Class1Type</DisplayName>
     <References>
       <Reference IsForward="false" ReferenceType="HasSubtype">BaseObjectType</Reference>
-      <Reference ReferenceType="HasComponent">ns=1;s=StateMachine1</Reference>
+      <Reference ReferenceType="HasComponent">ns=1;i=1001</Reference>
     </References>
   </UAObjectType>
-  <UAObject BrowseName="State1" NodeId="ns=1;s=State1" ParentNodeId="ns=1;s=MyStateMachineType">
-    <DisplayName>State1</DisplayName>
+  <UAObject BrowseName="State2" NodeId="ns=1;i=1006" ParentNodeId="ns=1;i=1002">
+    <DisplayName>State2</DisplayName>
     <References>
       <Reference ReferenceType="HasTypeDefinition">StateType</Reference>
       <Reference ReferenceType="HasModellingRule">ModellingRule_Mandatory</Reference>
-      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;s=MyStateMachineType</Reference>
+      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;i=1002</Reference>
     </References>
   </UAObject>
-  <UAObject BrowseName="State2" NodeId="ns=1;s=State2" ParentNodeId="ns=1;s=MyStateMachineType">
-    <DisplayName>State2</DisplayName>
+  <UAObject BrowseName="State1" NodeId="ns=1;i=1005" ParentNodeId="ns=1;i=1002">
+    <DisplayName>State1</DisplayName>
     <References>
       <Reference ReferenceType="HasTypeDefinition">StateType</Reference>
       <Reference ReferenceType="HasModellingRule">ModellingRule_Mandatory</Reference>
-      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;s=MyStateMachineType</Reference>
+      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;i=1002</Reference>
     </References>
   </UAObject>
-  <UAObject BrowseName="State1_to_State2" NodeId="ns=1;s=State1_to_State2" ParentNodeId="ns=1;s=MyStateMachineType">
+  <UAObject BrowseName="State1_to_State2" NodeId="ns=1;i=1007" ParentNodeId="ns=1;i=1002">
     <DisplayName>State1_to_State2</DisplayName>
     <References>
       <Reference ReferenceType="HasTypeDefinition">TransitionType</Reference>
       <Reference ReferenceType="HasModellingRule">ModellingRule_Mandatory</Reference>
-      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;s=MyStateMachineType</Reference>
-      <Reference ReferenceType="FromState">ns=1;s=State1</Reference>
-      <Reference ReferenceType="ToState">ns=1;s=State2</Reference>
+      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;i=1002</Reference>
+      <Reference ReferenceType="FromState">ns=1;i=1005</Reference>
+      <Reference ReferenceType="ToState">ns=1;i=1006</Reference>
       <Reference ReferenceType="HasEffect">TransitionEventType</Reference>
     </References>
   </UAObject>
-  <UAObjectType BrowseName="MyStateMachineType" NodeId="ns=1;s=MyStateMachineType">
+  <UAObjectType BrowseName="MyStateMachineType" NodeId="ns=1;i=1002">
     <DisplayName>MyStateMachineType</DisplayName>
     <References>
       <Reference IsForward="false" ReferenceType="HasSubtype">FiniteStateMachineType</Reference>
-      <Reference ReferenceType="HasComponent">ns=1;s=State2</Reference>
-      <Reference ReferenceType="HasComponent">ns=1;s=State1</Reference>
-      <Reference ReferenceType="HasComponent">ns=1;s=State1_to_State2</Reference>
+      <Reference ReferenceType="HasComponent">ns=1;i=1005</Reference>
+      <Reference ReferenceType="HasComponent">ns=1;i=1006</Reference>
+      <Reference ReferenceType="HasComponent">ns=1;i=1007</Reference>
     </References>
   </UAObjectType>
 </UANodeSet>
\ No newline at end of file
diff --git a/Uml2OpcuaTransformationTests/CompositionWithoutMemberName.xml b/Uml2OpcuaTransformationTests/CompositionWithoutMemberName.xml
index 51cd2e0..3275998 100644
--- a/Uml2OpcuaTransformationTests/CompositionWithoutMemberName.xml
+++ b/Uml2OpcuaTransformationTests/CompositionWithoutMemberName.xml
@@ -4,32 +4,32 @@
     <Uri>CompositionWithoutMemberName</Uri>
   </NamespaceUris>
   <Aliases>
-    <Alias Alias="BaseObjectType">i=58</Alias>
     <Alias Alias="ModellingRule_Mandatory">i=78</Alias>
-    <Alias Alias="HasModellingRule">i=37</Alias>
-    <Alias Alias="HasSubtype">i=45</Alias>
+    <Alias Alias="BaseObjectType">i=58</Alias>
     <Alias Alias="HasTypeDefinition">i=40</Alias>
     <Alias Alias="HasComponent">i=47</Alias>
+    <Alias Alias="HasModellingRule">i=37</Alias>
+    <Alias Alias="HasSubtype">i=45</Alias>
   </Aliases>
-  <UAObject BrowseName="Controller" NodeId="ns=1;s=Controller" ParentNodeId="ns=1;s=RobotType">
-    <DisplayName>Controller</DisplayName>
+  <UAObject NodeId="ns=1;i=1002" ParentNodeId="ns=1;i=1001">
+    <DisplayName/>
     <References>
-      <Reference ReferenceType="HasTypeDefinition">ns=1;s=ControllerType</Reference>
-      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;s=RobotType</Reference>
+      <Reference ReferenceType="HasTypeDefinition">ns=1;i=1000</Reference>
       <Reference ReferenceType="HasModellingRule">ModellingRule_Mandatory</Reference>
+      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;i=1001</Reference>
     </References>
   </UAObject>
-  <UAObjectType BrowseName="ControllerType" NodeId="ns=1;s=ControllerType">
+  <UAObjectType BrowseName="ControllerType" NodeId="ns=1;i=1000">
     <DisplayName>ControllerType</DisplayName>
     <References>
       <Reference IsForward="false" ReferenceType="HasSubtype">BaseObjectType</Reference>
     </References>
   </UAObjectType>
-  <UAObjectType BrowseName="RobotType" NodeId="ns=1;s=RobotType">
+  <UAObjectType BrowseName="RobotType" NodeId="ns=1;i=1001">
     <DisplayName>RobotType</DisplayName>
     <References>
       <Reference IsForward="false" ReferenceType="HasSubtype">BaseObjectType</Reference>
-      <Reference ReferenceType="HasComponent">ns=1;s=Controller</Reference>
+      <Reference ReferenceType="HasComponent">ns=1;i=1002</Reference>
     </References>
   </UAObjectType>
 </UANodeSet>
\ No newline at end of file
diff --git a/Uml2OpcuaTransformationTests/DirectedNamedAssociation.notation b/Uml2OpcuaTransformationTests/DirectedNamedAssociation.notation
index f2ae5f0..a53712c 100644
--- a/Uml2OpcuaTransformationTests/DirectedNamedAssociation.notation
+++ b/Uml2OpcuaTransformationTests/DirectedNamedAssociation.notation
@@ -1,68 +1,68 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.3/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_Z-5LEP5FEeqcH6exUiFZNQ" type="PapyrusUMLClassDiagram" name="Class Diagram" measurementUnit="Pixel">
-  <children xmi:type="notation:Shape" xmi:id="_bjz6cP5FEeqcH6exUiFZNQ" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_bj29wP5FEeqcH6exUiFZNQ" type="Class_NameLabel">
-      <element xmi:type="uml:Class" href="DirectedNamedAssociation.uml#_bjo7UP5FEeqcH6exUiFZNQ"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_bj29wf5FEeqcH6exUiFZNQ" type="Class_FloatingNameLabel">
-      <element xmi:type="uml:Class" href="DirectedNamedAssociation.uml#_bjo7UP5FEeqcH6exUiFZNQ"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_bj29wv5FEeqcH6exUiFZNQ" y="15"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_bj3k0P5FEeqcH6exUiFZNQ" type="Class_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_bj3k0f5FEeqcH6exUiFZNQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_bj3k0v5FEeqcH6exUiFZNQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_bj3k0_5FEeqcH6exUiFZNQ"/>
-      <element xmi:type="uml:Class" href="DirectedNamedAssociation.uml#_bjo7UP5FEeqcH6exUiFZNQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bj3k1P5FEeqcH6exUiFZNQ"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_bj3k1f5FEeqcH6exUiFZNQ" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_bj3k1v5FEeqcH6exUiFZNQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_bj3k1_5FEeqcH6exUiFZNQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_bj3k2P5FEeqcH6exUiFZNQ"/>
-      <element xmi:type="uml:Class" href="DirectedNamedAssociation.uml#_bjo7UP5FEeqcH6exUiFZNQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bj3k2f5FEeqcH6exUiFZNQ"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_bj4L4P5FEeqcH6exUiFZNQ" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_bj4L4f5FEeqcH6exUiFZNQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_bj4L4v5FEeqcH6exUiFZNQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_bj4L4_5FEeqcH6exUiFZNQ"/>
-      <element xmi:type="uml:Class" href="DirectedNamedAssociation.uml#_bjo7UP5FEeqcH6exUiFZNQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bj4L5P5FEeqcH6exUiFZNQ"/>
-    </children>
-    <element xmi:type="uml:Class" href="DirectedNamedAssociation.uml#_bjo7UP5FEeqcH6exUiFZNQ"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bjz6cf5FEeqcH6exUiFZNQ" x="160" y="140"/>
+  <children xmi:type="notation:Shape" xmi:id="_SyYb4P5XEeqcH6exUiFZNQ" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_SyYb4v5XEeqcH6exUiFZNQ" type="Class_NameLabel">
+      <element xmi:type="uml:Class" href="DirectedNamedAssociation.uml#_SyVYkP5XEeqcH6exUiFZNQ"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_SyZC8P5XEeqcH6exUiFZNQ" type="Class_FloatingNameLabel">
+      <element xmi:type="uml:Class" href="DirectedNamedAssociation.uml#_SyVYkP5XEeqcH6exUiFZNQ"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_SyZC8f5XEeqcH6exUiFZNQ" y="15"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_SyZC8v5XEeqcH6exUiFZNQ" type="Class_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_SyZC8_5XEeqcH6exUiFZNQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_SyZC9P5XEeqcH6exUiFZNQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_SyZC9f5XEeqcH6exUiFZNQ"/>
+      <element xmi:type="uml:Class" href="DirectedNamedAssociation.uml#_SyVYkP5XEeqcH6exUiFZNQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SyZC9v5XEeqcH6exUiFZNQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_SyZC9_5XEeqcH6exUiFZNQ" type="Class_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_SyZC-P5XEeqcH6exUiFZNQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_SyZC-f5XEeqcH6exUiFZNQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_SyZC-v5XEeqcH6exUiFZNQ"/>
+      <element xmi:type="uml:Class" href="DirectedNamedAssociation.uml#_SyVYkP5XEeqcH6exUiFZNQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SyZC-_5XEeqcH6exUiFZNQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_SyZC_P5XEeqcH6exUiFZNQ" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_SyZC_f5XEeqcH6exUiFZNQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_SyZC_v5XEeqcH6exUiFZNQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_SyZC__5XEeqcH6exUiFZNQ"/>
+      <element xmi:type="uml:Class" href="DirectedNamedAssociation.uml#_SyVYkP5XEeqcH6exUiFZNQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SyZDAP5XEeqcH6exUiFZNQ"/>
+    </children>
+    <element xmi:type="uml:Class" href="DirectedNamedAssociation.uml#_SyVYkP5XEeqcH6exUiFZNQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SyYb4f5XEeqcH6exUiFZNQ" x="160" y="300"/>
   </children>
-  <children xmi:type="notation:Shape" xmi:id="_cGJygP5FEeqcH6exUiFZNQ" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_cGLAoP5FEeqcH6exUiFZNQ" type="Class_NameLabel">
-      <element xmi:type="uml:Class" href="DirectedNamedAssociation.uml#_cGH9UP5FEeqcH6exUiFZNQ"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_cGLAof5FEeqcH6exUiFZNQ" type="Class_FloatingNameLabel">
-      <element xmi:type="uml:Class" href="DirectedNamedAssociation.uml#_cGH9UP5FEeqcH6exUiFZNQ"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_cGLAov5FEeqcH6exUiFZNQ" y="15"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_cGLAo_5FEeqcH6exUiFZNQ" type="Class_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_cGLApP5FEeqcH6exUiFZNQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_cGLApf5FEeqcH6exUiFZNQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_cGLApv5FEeqcH6exUiFZNQ"/>
-      <element xmi:type="uml:Class" href="DirectedNamedAssociation.uml#_cGH9UP5FEeqcH6exUiFZNQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cGLAp_5FEeqcH6exUiFZNQ"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_cGLAqP5FEeqcH6exUiFZNQ" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_cGLnsP5FEeqcH6exUiFZNQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_cGLnsf5FEeqcH6exUiFZNQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_cGLnsv5FEeqcH6exUiFZNQ"/>
-      <element xmi:type="uml:Class" href="DirectedNamedAssociation.uml#_cGH9UP5FEeqcH6exUiFZNQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cGLns_5FEeqcH6exUiFZNQ"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_cGLntP5FEeqcH6exUiFZNQ" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_cGLntf5FEeqcH6exUiFZNQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_cGLntv5FEeqcH6exUiFZNQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_cGLnt_5FEeqcH6exUiFZNQ"/>
-      <element xmi:type="uml:Class" href="DirectedNamedAssociation.uml#_cGH9UP5FEeqcH6exUiFZNQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cGLnuP5FEeqcH6exUiFZNQ"/>
-    </children>
-    <element xmi:type="uml:Class" href="DirectedNamedAssociation.uml#_cGH9UP5FEeqcH6exUiFZNQ"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cGJygf5FEeqcH6exUiFZNQ" x="520" y="140"/>
+  <children xmi:type="notation:Shape" xmi:id="_U6YDIP5XEeqcH6exUiFZNQ" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_U6YDIv5XEeqcH6exUiFZNQ" type="Class_NameLabel">
+      <element xmi:type="uml:Class" href="DirectedNamedAssociation.uml#_U6TKoP5XEeqcH6exUiFZNQ"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_U6YDI_5XEeqcH6exUiFZNQ" type="Class_FloatingNameLabel">
+      <element xmi:type="uml:Class" href="DirectedNamedAssociation.uml#_U6TKoP5XEeqcH6exUiFZNQ"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_U6YDJP5XEeqcH6exUiFZNQ" y="15"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_U6YDJf5XEeqcH6exUiFZNQ" type="Class_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_U6YDJv5XEeqcH6exUiFZNQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_U6YDJ_5XEeqcH6exUiFZNQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_U6YDKP5XEeqcH6exUiFZNQ"/>
+      <element xmi:type="uml:Class" href="DirectedNamedAssociation.uml#_U6TKoP5XEeqcH6exUiFZNQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_U6YDKf5XEeqcH6exUiFZNQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_U6afYP5XEeqcH6exUiFZNQ" type="Class_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_U6afYf5XEeqcH6exUiFZNQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_U6afYv5XEeqcH6exUiFZNQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_U6afY_5XEeqcH6exUiFZNQ"/>
+      <element xmi:type="uml:Class" href="DirectedNamedAssociation.uml#_U6TKoP5XEeqcH6exUiFZNQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_U6afZP5XEeqcH6exUiFZNQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_U6afZf5XEeqcH6exUiFZNQ" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_U6afZv5XEeqcH6exUiFZNQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_U6afZ_5XEeqcH6exUiFZNQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_U6afaP5XEeqcH6exUiFZNQ"/>
+      <element xmi:type="uml:Class" href="DirectedNamedAssociation.uml#_U6TKoP5XEeqcH6exUiFZNQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_U6afaf5XEeqcH6exUiFZNQ"/>
+    </children>
+    <element xmi:type="uml:Class" href="DirectedNamedAssociation.uml#_U6TKoP5XEeqcH6exUiFZNQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_U6YDIf5XEeqcH6exUiFZNQ" x="500" y="300"/>
   </children>
   <styles xmi:type="notation:StringValueStyle" xmi:id="_Z-5LEf5FEeqcH6exUiFZNQ" name="diagram_compatibility_version" stringValue="1.4.0"/>
   <styles xmi:type="notation:DiagramStyle" xmi:id="_Z-5LEv5FEeqcH6exUiFZNQ"/>
@@ -70,35 +70,41 @@
     <owner xmi:type="uml:Model" href="DirectedNamedAssociation.uml#_Z9FNMP5FEeqcH6exUiFZNQ"/>
   </styles>
   <element xmi:type="uml:Model" href="DirectedNamedAssociation.uml#_Z9FNMP5FEeqcH6exUiFZNQ"/>
-  <edges xmi:type="notation:Connector" xmi:id="_6vDjkP5HEeqcH6exUiFZNQ" type="Association_Edge" source="_bjz6cP5FEeqcH6exUiFZNQ" target="_cGJygP5FEeqcH6exUiFZNQ">
-    <children xmi:type="notation:DecorationNode" xmi:id="_6vExsP5HEeqcH6exUiFZNQ" type="Association_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_IDsroP5XEeqcH6exUiFZNQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_6vExsf5HEeqcH6exUiFZNQ" x="1" y="-18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_6vExsv5HEeqcH6exUiFZNQ" type="Association_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ID6uEP5XEeqcH6exUiFZNQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_6vExs_5HEeqcH6exUiFZNQ" y="19"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_6vExtP5HEeqcH6exUiFZNQ" type="Association_TargetRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_IEGUQP5XEeqcH6exUiFZNQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_6vGm4P5HEeqcH6exUiFZNQ" x="40" y="-18"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_6vGm4f5HEeqcH6exUiFZNQ" type="Association_SourceRoleLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_IEbrcP5XEeqcH6exUiFZNQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_6vGm4v5HEeqcH6exUiFZNQ" x="-40" y="19"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_6vGm4_5HEeqcH6exUiFZNQ" type="Association_SourceMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_IEofwP5XEeqcH6exUiFZNQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_6vGm5P5HEeqcH6exUiFZNQ" x="40" y="19"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_6vGm5f5HEeqcH6exUiFZNQ" type="Association_TargetMultiplicityLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_IE0F8P5XEeqcH6exUiFZNQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_6vGm5v5HEeqcH6exUiFZNQ" x="-40" y="-18"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_6vDjkf5HEeqcH6exUiFZNQ"/>
-    <element xmi:type="uml:Association" href="DirectedNamedAssociation.uml#_6uzE4P5HEeqcH6exUiFZNQ"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6vDjkv5HEeqcH6exUiFZNQ" points="[260, 345, -643984, -643984]$[567, 320, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6wAl0P5HEeqcH6exUiFZNQ" id="(1.0,0.6)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6wAl0f5HEeqcH6exUiFZNQ" id="(0.0,0.6)"/>
+  <edges xmi:type="notation:Connector" xmi:id="_aBl0kP5XEeqcH6exUiFZNQ" type="Association_Edge" source="_SyYb4P5XEeqcH6exUiFZNQ" target="_U6YDIP5XEeqcH6exUiFZNQ">
+    <children xmi:type="notation:DecorationNode" xmi:id="_aBl0k_5XEeqcH6exUiFZNQ" type="Association_StereotypeLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jDzb8P5XEeqcH6exUiFZNQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <element xmi:type="uml:Association" href="DirectedNamedAssociation.uml#_aBOBIP5XEeqcH6exUiFZNQ"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_aBmboP5XEeqcH6exUiFZNQ" x="1" y="-18"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_aBmbof5XEeqcH6exUiFZNQ" type="Association_NameLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jED6oP5XEeqcH6exUiFZNQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <element xmi:type="uml:Association" href="DirectedNamedAssociation.uml#_aBOBIP5XEeqcH6exUiFZNQ"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_aBmbov5XEeqcH6exUiFZNQ" y="19"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_aBmbo_5XEeqcH6exUiFZNQ" type="Association_TargetRoleLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jER9EP5XEeqcH6exUiFZNQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <element xmi:type="uml:Association" href="DirectedNamedAssociation.uml#_aBOBIP5XEeqcH6exUiFZNQ"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_aBmbpP5XEeqcH6exUiFZNQ" x="27" y="-18"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_aBmbpf5XEeqcH6exUiFZNQ" type="Association_SourceRoleLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jEjC0P5XEeqcH6exUiFZNQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <element xmi:type="uml:Association" href="DirectedNamedAssociation.uml#_aBOBIP5XEeqcH6exUiFZNQ"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_aBmbpv5XEeqcH6exUiFZNQ" x="-27" y="19"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_aBmbp_5XEeqcH6exUiFZNQ" type="Association_SourceMultiplicityLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jEy6cP5XEeqcH6exUiFZNQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <element xmi:type="uml:Association" href="DirectedNamedAssociation.uml#_aBOBIP5XEeqcH6exUiFZNQ"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_aBmbqP5XEeqcH6exUiFZNQ" x="27" y="19"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_aBmbqf5XEeqcH6exUiFZNQ" type="Association_TargetMultiplicityLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_jFCyEP5XEeqcH6exUiFZNQ" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <element xmi:type="uml:Association" href="DirectedNamedAssociation.uml#_aBOBIP5XEeqcH6exUiFZNQ"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_aBmbqv5XEeqcH6exUiFZNQ" x="-27" y="-18"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_aBl0kf5XEeqcH6exUiFZNQ"/>
+    <element xmi:type="uml:Association" href="DirectedNamedAssociation.uml#_aBOBIP5XEeqcH6exUiFZNQ"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_aBl0kv5XEeqcH6exUiFZNQ" points="[280, 360, -643984, -643984]$[460, 380, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aCvrIP5XEeqcH6exUiFZNQ" id="(1.0,0.6)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aCvrIf5XEeqcH6exUiFZNQ" id="(0.0,0.6)"/>
   </edges>
 </notation:Diagram>
diff --git a/Uml2OpcuaTransformationTests/DirectedNamedAssociation.uml b/Uml2OpcuaTransformationTests/DirectedNamedAssociation.uml
index 46c5097..2296c39 100644
--- a/Uml2OpcuaTransformationTests/DirectedNamedAssociation.uml
+++ b/Uml2OpcuaTransformationTests/DirectedNamedAssociation.uml
@@ -3,14 +3,17 @@
   <packageImport xmi:type="uml:PackageImport" xmi:id="_aBXQQP5FEeqcH6exUiFZNQ">
     <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
   </packageImport>
-  <packagedElement xmi:type="uml:Class" xmi:id="_bjo7UP5FEeqcH6exUiFZNQ" name="Class2">
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_6u2vQP5HEeqcH6exUiFZNQ" type="_cGH9UP5FEeqcH6exUiFZNQ" association="_6uzE4P5HEeqcH6exUiFZNQ"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_SyVYkP5XEeqcH6exUiFZNQ" name="Class4">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_aBOoMv5XEeqcH6exUiFZNQ" name="class5" type="_U6TKoP5XEeqcH6exUiFZNQ" association="_aBOBIP5XEeqcH6exUiFZNQ">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_aBTgsP5XEeqcH6exUiFZNQ"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_aBTgsf5XEeqcH6exUiFZNQ" value="1"/>
+    </ownedAttribute>
   </packagedElement>
-  <packagedElement xmi:type="uml:Class" xmi:id="_cGH9UP5FEeqcH6exUiFZNQ" name="Class3"/>
-  <packagedElement xmi:type="uml:Association" xmi:id="_6uzE4P5HEeqcH6exUiFZNQ" name="MyAssociation" memberEnd="_6u2vQP5HEeqcH6exUiFZNQ _6u3WUP5HEeqcH6exUiFZNQ">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6u2IMP5HEeqcH6exUiFZNQ" source="org.eclipse.papyrus">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6u2IMf5HEeqcH6exUiFZNQ" key="nature" value="UML_Nature"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_U6TKoP5XEeqcH6exUiFZNQ" name="Class5"/>
+  <packagedElement xmi:type="uml:Association" xmi:id="_aBOBIP5XEeqcH6exUiFZNQ" name="MyAssociation" memberEnd="_aBOoMv5XEeqcH6exUiFZNQ _aBTgsv5XEeqcH6exUiFZNQ">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aBOoMP5XEeqcH6exUiFZNQ" source="org.eclipse.papyrus">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_aBOoMf5XEeqcH6exUiFZNQ" key="nature" value="UML_Nature"/>
     </eAnnotations>
-    <ownedEnd xmi:type="uml:Property" xmi:id="_6u3WUP5HEeqcH6exUiFZNQ" type="_bjo7UP5FEeqcH6exUiFZNQ" association="_6uzE4P5HEeqcH6exUiFZNQ"/>
+    <ownedEnd xmi:type="uml:Property" xmi:id="_aBTgsv5XEeqcH6exUiFZNQ" name="class4" type="_SyVYkP5XEeqcH6exUiFZNQ" association="_aBOBIP5XEeqcH6exUiFZNQ"/>
   </packagedElement>
 </uml:Model>
diff --git a/Uml2OpcuaTransformationTests/DirectedNamedAssociation.xml b/Uml2OpcuaTransformationTests/DirectedNamedAssociation.xml
index a6efe4d..b693965 100644
--- a/Uml2OpcuaTransformationTests/DirectedNamedAssociation.xml
+++ b/Uml2OpcuaTransformationTests/DirectedNamedAssociation.xml
@@ -8,23 +8,23 @@
     <Alias Alias="HasSubtype">i=45</Alias>
     <Alias Alias="NonHierarchicalReferences">i=32</Alias>
   </Aliases>
-  <UAReferenceType BrowseName="MyAssociation" NodeId="ns=1;s=MyAssociation">
+  <UAReferenceType BrowseName="MyAssociation" NodeId="ns=1;i=1002">
     <DisplayName>MyAssociation</DisplayName>
     <References>
       <Reference IsForward="false" ReferenceType="HasSubtype">NonHierarchicalReferences</Reference>
     </References>
   </UAReferenceType>
-  <UAObjectType BrowseName="Class3Type" NodeId="ns=1;s=Class3Type">
-    <DisplayName>Class3Type</DisplayName>
+  <UAObjectType BrowseName="Class4Type" NodeId="ns=1;i=1001">
+    <DisplayName>Class4Type</DisplayName>
     <References>
       <Reference IsForward="false" ReferenceType="HasSubtype">BaseObjectType</Reference>
+      <Reference ReferenceType="ns=1;i=1002">ns=1;i=1000</Reference>
     </References>
   </UAObjectType>
-  <UAObjectType BrowseName="Class2Type" NodeId="ns=1;s=Class2Type">
-    <DisplayName>Class2Type</DisplayName>
+  <UAObjectType BrowseName="Class5Type" NodeId="ns=1;i=1000">
+    <DisplayName>Class5Type</DisplayName>
     <References>
       <Reference IsForward="false" ReferenceType="HasSubtype">BaseObjectType</Reference>
-      <Reference ReferenceType="ns=1;s=MyAssociation">ns=1;s=Class3Type</Reference>
     </References>
   </UAObjectType>
 </UANodeSet>
\ No newline at end of file
diff --git a/Uml2OpcuaTransformationTests/Instance.xml b/Uml2OpcuaTransformationTests/Instance.xml
index 2bf69c7..da3ffc3 100644
--- a/Uml2OpcuaTransformationTests/Instance.xml
+++ b/Uml2OpcuaTransformationTests/Instance.xml
@@ -5,30 +5,22 @@
   </NamespaceUris>
   <Aliases>
     <Alias Alias="HasSubtype">i=45</Alias>
-    <Alias Alias="HasTypeDefinition">i=40</Alias>
+    <Alias Alias="ObjectsFolder">i=85</Alias>
     <Alias Alias="BaseObjectType">i=58</Alias>
-    <Alias Alias="String">i=12</Alias>
-    <Alias Alias="HasComponent">i=47</Alias>
-    <Alias Alias="ModellingRule_Mandatory">i=78</Alias>
-    <Alias Alias="BaseDataVariableType">i=63</Alias>
-    <Alias Alias="HasModellingRule">i=37</Alias>
+    <Alias Alias="HasTypeDefinition">i=40</Alias>
+    <Alias Alias="Organizes">i=35</Alias>
   </Aliases>
-  <UAVariable BrowseName="Manufacturer" NodeId="ns=1;s=Manufacturer" ParentNodeId="ns=1;s=Class5Type" DataType="String">
-    <DisplayName>Manufacturer</DisplayName>
-    <References>
-      <Reference ReferenceType="HasTypeDefinition">BaseDataVariableType</Reference>
-      <Reference ReferenceType="HasModellingRule">ModellingRule_Mandatory</Reference>
-      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;s=Class5Type</Reference>
-    </References>
-  </UAVariable>
-  <UAObjectType BrowseName="Class5Type" NodeId="ns=1;s=Class5Type">
+  <UAObjectType BrowseName="Class5Type" NodeId="ns=1;i=1000">
     <DisplayName>Class5Type</DisplayName>
     <References>
       <Reference IsForward="false" ReferenceType="HasSubtype">BaseObjectType</Reference>
-      <Reference ReferenceType="HasComponent">ns=1;s=Manufacturer</Reference>
     </References>
   </UAObjectType>
-  <UAObject BrowseName="Class5Instance" NodeId="ns=1;s=Class5Instance">
+  <UAObject BrowseName="Class5Instance" NodeId="ns=1;i=1001">
     <DisplayName>Class5Instance</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">ns=1;i=1000</Reference>
+      <Reference IsForward="false" ReferenceType="Organizes">ObjectsFolder</Reference>
+    </References>
   </UAObject>
 </UANodeSet>
\ No newline at end of file
diff --git a/Uml2OpcuaTransformationTests/InstanceWithInheritedMethod.csv b/Uml2OpcuaTransformationTests/InstanceWithInheritedMethod.csv
new file mode 100644
index 0000000..ad8333d
--- /dev/null
+++ b/Uml2OpcuaTransformationTests/InstanceWithInheritedMethod.csv
@@ -0,0 +1,5 @@
+ToolType,1000,ObjectType
+Gripper1_Close,1004,Method
+GripperType,1002,ObjectType
+ToolType_Close,1001,Method
+Gripper1,1003,Object
diff --git a/Uml2OpcuaTransformationTests/InstanceWithInheritedMethod.di b/Uml2OpcuaTransformationTests/InstanceWithInheritedMethod.di
new file mode 100644
index 0000000..8c549ee
--- /dev/null
+++ b/Uml2OpcuaTransformationTests/InstanceWithInheritedMethod.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<architecture:ArchitectureDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" contextId="org.eclipse.papyrus.infra.services.edit.TypeContext"/>
diff --git a/Uml2OpcuaTransformationTests/InstanceWithInheritedMethod.notation b/Uml2OpcuaTransformationTests/InstanceWithInheritedMethod.notation
new file mode 100644
index 0000000..f28c157
--- /dev/null
+++ b/Uml2OpcuaTransformationTests/InstanceWithInheritedMethod.notation
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.3/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_hq1BwJhxEeuDpJWgeHWJGw" type="PapyrusUMLClassDiagram" name="Class Diagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_oJMMUJhxEeuDpJWgeHWJGw" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_oJMMUphxEeuDpJWgeHWJGw" type="Class_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_oJMMU5hxEeuDpJWgeHWJGw" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_oJMMVJhxEeuDpJWgeHWJGw" y="15"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_oJMMVZhxEeuDpJWgeHWJGw" type="Class_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_oJMMVphxEeuDpJWgeHWJGw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_oJMMV5hxEeuDpJWgeHWJGw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_oJMMWJhxEeuDpJWgeHWJGw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oJMMWZhxEeuDpJWgeHWJGw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_oJMzYJhxEeuDpJWgeHWJGw" type="Class_OperationCompartment">
+      <children xmi:type="notation:Shape" xmi:id="_r6G5MJhxEeuDpJWgeHWJGw" type="Operation_ClassOperationLabel">
+        <element xmi:type="uml:Operation" href="InstanceWithInheritedMethod.uml#_r6AykJhxEeuDpJWgeHWJGw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_r6G5MZhxEeuDpJWgeHWJGw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_oJMzYZhxEeuDpJWgeHWJGw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_oJMzYphxEeuDpJWgeHWJGw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_oJMzY5hxEeuDpJWgeHWJGw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oJMzZJhxEeuDpJWgeHWJGw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_oJMzZZhxEeuDpJWgeHWJGw" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_oJMzZphxEeuDpJWgeHWJGw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_oJMzZ5hxEeuDpJWgeHWJGw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_oJMzaJhxEeuDpJWgeHWJGw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oJMzaZhxEeuDpJWgeHWJGw"/>
+    </children>
+    <element xmi:type="uml:Class" href="InstanceWithInheritedMethod.uml#_oJKXIJhxEeuDpJWgeHWJGw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oJMMUZhxEeuDpJWgeHWJGw" x="240" y="160"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_o3gq4JhxEeuDpJWgeHWJGw" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_o3gq4phxEeuDpJWgeHWJGw" type="Class_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_o3gq45hxEeuDpJWgeHWJGw" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_o3hR8JhxEeuDpJWgeHWJGw" y="15"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_o3hR8ZhxEeuDpJWgeHWJGw" type="Class_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_o3hR8phxEeuDpJWgeHWJGw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_o3hR85hxEeuDpJWgeHWJGw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_o3hR9JhxEeuDpJWgeHWJGw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o3hR9ZhxEeuDpJWgeHWJGw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_o3hR9phxEeuDpJWgeHWJGw" type="Class_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_o3hR95hxEeuDpJWgeHWJGw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_o3hR-JhxEeuDpJWgeHWJGw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_o3hR-ZhxEeuDpJWgeHWJGw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o3hR-phxEeuDpJWgeHWJGw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_o3hR-5hxEeuDpJWgeHWJGw" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_o3hR_JhxEeuDpJWgeHWJGw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_o3hR_ZhxEeuDpJWgeHWJGw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_o3hR_phxEeuDpJWgeHWJGw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o3hR_5hxEeuDpJWgeHWJGw"/>
+    </children>
+    <element xmi:type="uml:Class" href="InstanceWithInheritedMethod.uml#_o3fcwJhxEeuDpJWgeHWJGw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o3gq4ZhxEeuDpJWgeHWJGw" x="240" y="320"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_pibQIJhxEeuDpJWgeHWJGw" type="InstanceSpecification_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_pibQIphxEeuDpJWgeHWJGw" type="InstanceSpecification_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_pibQI5hxEeuDpJWgeHWJGw" type="InstanceSpecification_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_pibQJJhxEeuDpJWgeHWJGw" y="15"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_pibQJZhxEeuDpJWgeHWJGw" type="InstanceSpecification_SlotCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_pib3MJhxEeuDpJWgeHWJGw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_pib3MZhxEeuDpJWgeHWJGw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_pib3MphxEeuDpJWgeHWJGw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pib3M5hxEeuDpJWgeHWJGw"/>
+    </children>
+    <element xmi:type="uml:InstanceSpecification" href="InstanceWithInheritedMethod.uml#_piaCAJhxEeuDpJWgeHWJGw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pibQIZhxEeuDpJWgeHWJGw" x="480" y="320"/>
+  </children>
+  <styles xmi:type="notation:StringValueStyle" xmi:id="_hq1BwZhxEeuDpJWgeHWJGw" name="diagram_compatibility_version" stringValue="1.4.0"/>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_hq1BwphxEeuDpJWgeHWJGw"/>
+  <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_hq1Bw5hxEeuDpJWgeHWJGw" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
+    <owner xmi:type="uml:Model" href="InstanceWithInheritedMethod.uml#_hqj8AJhxEeuDpJWgeHWJGw"/>
+  </styles>
+  <element xmi:type="uml:Model" href="InstanceWithInheritedMethod.uml#_hqj8AJhxEeuDpJWgeHWJGw"/>
+  <edges xmi:type="notation:Connector" xmi:id="_wTD2cJhxEeuDpJWgeHWJGw" type="Generalization_Edge" source="_o3gq4JhxEeuDpJWgeHWJGw" target="_oJMMUJhxEeuDpJWgeHWJGw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_wTD2c5hxEeuDpJWgeHWJGw" type="Generalization_StereotypeLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_wTD2dJhxEeuDpJWgeHWJGw" y="40"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_wTD2cZhxEeuDpJWgeHWJGw"/>
+    <element xmi:type="uml:Generalization" href="InstanceWithInheritedMethod.uml#_wS76oJhxEeuDpJWgeHWJGw"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wTD2cphxEeuDpJWgeHWJGw" points="[300, 320, -643984, -643984]$[280, 264, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wTRR0JhxEeuDpJWgeHWJGw" id="(0.6,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wTRR0ZhxEeuDpJWgeHWJGw" id="(0.4,1.0)"/>
+  </edges>
+</notation:Diagram>
diff --git a/Uml2OpcuaTransformationTests/InstanceWithInheritedMethod.uml b/Uml2OpcuaTransformationTests/InstanceWithInheritedMethod.uml
new file mode 100644
index 0000000..8dac19f
--- /dev/null
+++ b/Uml2OpcuaTransformationTests/InstanceWithInheritedMethod.uml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_hqj8AJhxEeuDpJWgeHWJGw" name="InstanceWithInheritedMethod">
+  <packageImport xmi:type="uml:PackageImport" xmi:id="_hrizcJhxEeuDpJWgeHWJGw">
+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+  </packageImport>
+  <packagedElement xmi:type="uml:Class" xmi:id="_oJKXIJhxEeuDpJWgeHWJGw" name="Tool">
+    <ownedOperation xmi:type="uml:Operation" xmi:id="_r6AykJhxEeuDpJWgeHWJGw" name="Close"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_o3fcwJhxEeuDpJWgeHWJGw" name="Gripper">
+    <generalization xmi:type="uml:Generalization" xmi:id="_wS76oJhxEeuDpJWgeHWJGw" general="_oJKXIJhxEeuDpJWgeHWJGw"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_piaCAJhxEeuDpJWgeHWJGw" name="Gripper1" classifier="_o3fcwJhxEeuDpJWgeHWJGw"/>
+</uml:Model>
diff --git a/Uml2OpcuaTransformationTests/InstanceWithInheritedMethod.xml b/Uml2OpcuaTransformationTests/InstanceWithInheritedMethod.xml
new file mode 100644
index 0000000..3fe6fd2
--- /dev/null
+++ b/Uml2OpcuaTransformationTests/InstanceWithInheritedMethod.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<UANodeSet xmlns="http://opcfoundation.org/UA/2011/03/UANodeSet.xsd">
+  <NamespaceUris>
+    <Uri>InstanceWithInheritedMethod</Uri>
+  </NamespaceUris>
+  <Aliases>
+    <Alias Alias="HasModellingRule">i=37</Alias>
+    <Alias Alias="HasTypeDefinition">i=40</Alias>
+    <Alias Alias="BaseObjectType">i=58</Alias>
+    <Alias Alias="ObjectsFolder">i=85</Alias>
+    <Alias Alias="HasSubtype">i=45</Alias>
+    <Alias Alias="Organizes">i=35</Alias>
+    <Alias Alias="ModellingRule_Mandatory">i=78</Alias>
+    <Alias Alias="HasComponent">i=47</Alias>
+  </Aliases>
+  <UAMethod BrowseName="Close" NodeId="ns=1;i=1001" ParentNodeId="ns=1;i=1000">
+    <DisplayName>Close</DisplayName>
+    <References>
+      <Reference ReferenceType="HasModellingRule">ModellingRule_Mandatory</Reference>
+      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;i=1000</Reference>
+    </References>
+  </UAMethod>
+  <UAObjectType BrowseName="ToolType" NodeId="ns=1;i=1000">
+    <DisplayName>ToolType</DisplayName>
+    <References>
+      <Reference IsForward="false" ReferenceType="HasSubtype">BaseObjectType</Reference>
+      <Reference ReferenceType="HasComponent">ns=1;i=1001</Reference>
+    </References>
+  </UAObjectType>
+  <UAObjectType BrowseName="GripperType" NodeId="ns=1;i=1002">
+    <DisplayName>GripperType</DisplayName>
+    <References>
+      <Reference IsForward="false" ReferenceType="HasSubtype">ns=1;i=1000</Reference>
+    </References>
+  </UAObjectType>
+  <UAMethod BrowseName="Close" NodeId="ns=1;i=1004" ParentNodeId="ns=1;i=1003">
+    <DisplayName>Close</DisplayName>
+    <References>
+      <Reference ReferenceType="HasModellingRule">ModellingRule_Mandatory</Reference>
+      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;i=1003</Reference>
+    </References>
+  </UAMethod>
+  <UAObject BrowseName="Gripper1" NodeId="ns=1;i=1003">
+    <DisplayName>Gripper1</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">ns=1;i=1002</Reference>
+      <Reference IsForward="false" ReferenceType="Organizes">ObjectsFolder</Reference>
+      <Reference ReferenceType="HasComponent">ns=1;i=1004</Reference>
+    </References>
+  </UAObject>
+</UANodeSet>
\ No newline at end of file
diff --git a/Uml2OpcuaTransformationTests/InstanceWithInheritedProperty.csv b/Uml2OpcuaTransformationTests/InstanceWithInheritedProperty.csv
new file mode 100644
index 0000000..f5cd2f1
--- /dev/null
+++ b/Uml2OpcuaTransformationTests/InstanceWithInheritedProperty.csv
@@ -0,0 +1,6 @@
+Gripper1_ToolId,1005,Variable
+GripperType,1000,ObjectType
+ToolType,1001,ObjectType
+ToolType_ToolId,1003,Variable
+GripperType_ToolId,1002,Variable
+Gripper1,1004,Object
diff --git a/Uml2OpcuaTransformationTests/InstanceWithInheritedProperty.di b/Uml2OpcuaTransformationTests/InstanceWithInheritedProperty.di
new file mode 100644
index 0000000..8c549ee
--- /dev/null
+++ b/Uml2OpcuaTransformationTests/InstanceWithInheritedProperty.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<architecture:ArchitectureDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" contextId="org.eclipse.papyrus.infra.services.edit.TypeContext"/>
diff --git a/Uml2OpcuaTransformationTests/InstanceWithInheritedProperty.notation b/Uml2OpcuaTransformationTests/InstanceWithInheritedProperty.notation
new file mode 100644
index 0000000..d134610
--- /dev/null
+++ b/Uml2OpcuaTransformationTests/InstanceWithInheritedProperty.notation
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.3/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_NdNucJesEeuDpJWgeHWJGw" type="PapyrusUMLClassDiagram" name="Class Diagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_RymaUJesEeuDpJWgeHWJGw" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_RyoPgJesEeuDpJWgeHWJGw" type="Class_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_RyoPgZesEeuDpJWgeHWJGw" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_RyoPgpesEeuDpJWgeHWJGw" y="15"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_RyoPg5esEeuDpJWgeHWJGw" type="Class_AttributeCompartment">
+      <children xmi:type="notation:Shape" xmi:id="_U43nsJesEeuDpJWgeHWJGw" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="InstanceWithInheritedProperty.uml#_U4sokJesEeuDpJWgeHWJGw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_U43nsZesEeuDpJWgeHWJGw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_RyoPhJesEeuDpJWgeHWJGw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_RyoPhZesEeuDpJWgeHWJGw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_RyoPhpesEeuDpJWgeHWJGw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RyoPh5esEeuDpJWgeHWJGw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_RyoPiJesEeuDpJWgeHWJGw" type="Class_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_RyoPiZesEeuDpJWgeHWJGw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_RyoPipesEeuDpJWgeHWJGw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_RyoPi5esEeuDpJWgeHWJGw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RyoPjJesEeuDpJWgeHWJGw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_RyoPjZesEeuDpJWgeHWJGw" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_RyoPjpesEeuDpJWgeHWJGw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_RyoPj5esEeuDpJWgeHWJGw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_RyoPkJesEeuDpJWgeHWJGw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RyoPkZesEeuDpJWgeHWJGw"/>
+    </children>
+    <element xmi:type="uml:Class" href="InstanceWithInheritedProperty.uml#_RydQYJesEeuDpJWgeHWJGw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RymaUZesEeuDpJWgeHWJGw" x="300" y="140"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_SiV1MJesEeuDpJWgeHWJGw" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_SiWcQJesEeuDpJWgeHWJGw" type="Class_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_SiWcQZesEeuDpJWgeHWJGw" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_SiWcQpesEeuDpJWgeHWJGw" y="15"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_SiWcQ5esEeuDpJWgeHWJGw" type="Class_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_SiWcRJesEeuDpJWgeHWJGw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_SiWcRZesEeuDpJWgeHWJGw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_SiWcRpesEeuDpJWgeHWJGw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SiWcR5esEeuDpJWgeHWJGw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_SiWcSJesEeuDpJWgeHWJGw" type="Class_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_SiWcSZesEeuDpJWgeHWJGw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_SiWcSpesEeuDpJWgeHWJGw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_SiWcS5esEeuDpJWgeHWJGw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SiWcTJesEeuDpJWgeHWJGw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_SiXDUJesEeuDpJWgeHWJGw" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_SiXDUZesEeuDpJWgeHWJGw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_SiXDUpesEeuDpJWgeHWJGw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_SiXDU5esEeuDpJWgeHWJGw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SiXDVJesEeuDpJWgeHWJGw"/>
+    </children>
+    <element xmi:type="uml:Class" href="InstanceWithInheritedProperty.uml#_SiTY8JesEeuDpJWgeHWJGw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SiV1MZesEeuDpJWgeHWJGw" x="340" y="300"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_aFrq0JesEeuDpJWgeHWJGw" type="InstanceSpecification_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_aFsR4JesEeuDpJWgeHWJGw" type="InstanceSpecification_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_aFsR4ZesEeuDpJWgeHWJGw" type="InstanceSpecification_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_aFsR4pesEeuDpJWgeHWJGw" y="15"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_aFsR45esEeuDpJWgeHWJGw" type="InstanceSpecification_SlotCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_aFsR5JesEeuDpJWgeHWJGw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_aFsR5ZesEeuDpJWgeHWJGw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_aFsR5pesEeuDpJWgeHWJGw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aFsR55esEeuDpJWgeHWJGw"/>
+    </children>
+    <element xmi:type="uml:InstanceSpecification" href="InstanceWithInheritedProperty.uml#_aFongJesEeuDpJWgeHWJGw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aFrq0ZesEeuDpJWgeHWJGw" x="520" y="300"/>
+  </children>
+  <styles xmi:type="notation:StringValueStyle" xmi:id="_NdNucZesEeuDpJWgeHWJGw" name="diagram_compatibility_version" stringValue="1.4.0"/>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_NdNucpesEeuDpJWgeHWJGw"/>
+  <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_NdOVgJesEeuDpJWgeHWJGw" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
+    <owner xmi:type="uml:Model" href="InstanceWithInheritedProperty.uml#_NZVUAJesEeuDpJWgeHWJGw"/>
+  </styles>
+  <element xmi:type="uml:Model" href="InstanceWithInheritedProperty.uml#_NZVUAJesEeuDpJWgeHWJGw"/>
+  <edges xmi:type="notation:Connector" xmi:id="_UFOkQJesEeuDpJWgeHWJGw" type="Generalization_Edge" source="_SiV1MJesEeuDpJWgeHWJGw" target="_RymaUJesEeuDpJWgeHWJGw">
+    <children xmi:type="notation:DecorationNode" xmi:id="_UFPLUJesEeuDpJWgeHWJGw" type="Generalization_StereotypeLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_lwf2oJhxEeuDpJWgeHWJGw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_UFPLUZesEeuDpJWgeHWJGw" y="39"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_UFOkQZesEeuDpJWgeHWJGw"/>
+    <element xmi:type="uml:Generalization" href="InstanceWithInheritedProperty.uml#_UFGocJesEeuDpJWgeHWJGw"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UFOkQpesEeuDpJWgeHWJGw" points="[340, 400, -643984, -643984]$[360, 240, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UFkigJesEeuDpJWgeHWJGw" id="(0.6,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UFlJkJesEeuDpJWgeHWJGw" id="(0.6060606060606061,1.0)"/>
+  </edges>
+</notation:Diagram>
diff --git a/Uml2OpcuaTransformationTests/InstanceWithInheritedProperty.uml b/Uml2OpcuaTransformationTests/InstanceWithInheritedProperty.uml
new file mode 100644
index 0000000..9d647af
--- /dev/null
+++ b/Uml2OpcuaTransformationTests/InstanceWithInheritedProperty.uml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_NZVUAJesEeuDpJWgeHWJGw" name="InstanceWithInheritedProperty">
+  <packageImport xmi:type="uml:PackageImport" xmi:id="_NfxTMJesEeuDpJWgeHWJGw">
+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+  </packageImport>
+  <packagedElement xmi:type="uml:Class" xmi:id="_RydQYJesEeuDpJWgeHWJGw" name="Tool">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_U4sokJesEeuDpJWgeHWJGw" name="ToolId">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_SiTY8JesEeuDpJWgeHWJGw" name="Gripper">
+    <generalization xmi:type="uml:Generalization" xmi:id="_UFGocJesEeuDpJWgeHWJGw" general="_RydQYJesEeuDpJWgeHWJGw"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_aFongJesEeuDpJWgeHWJGw" name="Gripper1" classifier="_SiTY8JesEeuDpJWgeHWJGw"/>
+</uml:Model>
diff --git a/Uml2OpcuaTransformationTests/InstanceWithInheritedProperty.xml b/Uml2OpcuaTransformationTests/InstanceWithInheritedProperty.xml
new file mode 100644
index 0000000..c109566
--- /dev/null
+++ b/Uml2OpcuaTransformationTests/InstanceWithInheritedProperty.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<set:UANodeSet xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:set="http://opcfoundation.org/UA/2011/03/UANodeSet.xsd" xsi:schemaLocation="http://opcfoundation.org/UA/2011/03/UANodeSet.xsd ../QvtoTransformationRules/metamodels/set.ecore">
+  <set:NamespaceUris>
+    <set:Uri>InstanceWithInheritedProperty</set:Uri>
+  </set:NamespaceUris>
+  <set:Aliases>
+    <set:Alias Alias="HasSubtype">i=45</set:Alias>
+    <set:Alias Alias="ModellingRule_Mandatory">i=78</set:Alias>
+    <set:Alias Alias="ObjectsFolder">i=85</set:Alias>
+    <set:Alias Alias="BaseDataVariableType">i=63</set:Alias>
+    <set:Alias Alias="BaseObjectType">i=58</set:Alias>
+    <set:Alias Alias="HasTypeDefinition">i=40</set:Alias>
+    <set:Alias Alias="HasModellingRule">i=37</set:Alias>
+    <set:Alias Alias="Organizes">i=35</set:Alias>
+    <set:Alias Alias="HasComponent">i=47</set:Alias>
+    <set:Alias Alias="String">i=12</set:Alias>
+  </set:Aliases>
+  <set:UAVariable BrowseName="ToolId" NodeId="ns=1;i=1002" ParentNodeId="ns=1;i=1000" DataType="String">
+    <set:DisplayName>ToolId</set:DisplayName>
+    <set:References>
+      <set:Reference ReferenceType="HasTypeDefinition">BaseDataVariableType</set:Reference>
+      <set:Reference ReferenceType="HasModellingRule">ModellingRule_Mandatory</set:Reference>
+      <set:Reference IsForward="false" ReferenceType="HasComponent">ns=1;i=1000</set:Reference>
+    </set:References>
+  </set:UAVariable>
+  <set:UAVariable BrowseName="ToolId" NodeId="ns=1;i=1003" ParentNodeId="ns=1;i=1001" DataType="String">
+    <set:DisplayName>ToolId</set:DisplayName>
+    <set:References>
+      <set:Reference ReferenceType="HasTypeDefinition">BaseDataVariableType</set:Reference>
+      <set:Reference ReferenceType="HasModellingRule">ModellingRule_Mandatory</set:Reference>
+      <set:Reference IsForward="false" ReferenceType="HasComponent">ns=1;i=1001</set:Reference>
+    </set:References>
+  </set:UAVariable>
+  <set:UAObjectType BrowseName="GripperType" NodeId="ns=1;i=1000">
+    <set:DisplayName>GripperType</set:DisplayName>
+    <set:References>
+      <set:Reference IsForward="false" ReferenceType="HasSubtype">ns=1;i=1001</set:Reference>
+      <set:Reference ReferenceType="HasComponent">ns=1;i=1002</set:Reference>
+    </set:References>
+  </set:UAObjectType>
+  <set:UAObjectType BrowseName="ToolType" NodeId="ns=1;i=1001">
+    <set:DisplayName>ToolType</set:DisplayName>
+    <set:References>
+      <set:Reference IsForward="false" ReferenceType="HasSubtype">BaseObjectType</set:Reference>
+      <set:Reference ReferenceType="HasComponent">ns=1;i=1003</set:Reference>
+    </set:References>
+  </set:UAObjectType>
+  <set:UAVariable BrowseName="ToolId" NodeId="ns=1;i=1005" ParentNodeId="ns=1;i=1004" DataType="String">
+    <set:DisplayName>ToolId</set:DisplayName>
+    <set:References>
+      <set:Reference ReferenceType="HasTypeDefinition">BaseDataVariableType</set:Reference>
+      <set:Reference ReferenceType="HasModellingRule">ModellingRule_Mandatory</set:Reference>
+      <set:Reference IsForward="false" ReferenceType="HasComponent">ns=1;i=1004</set:Reference>
+    </set:References>
+  </set:UAVariable>
+  <set:UAObject BrowseName="Gripper1" NodeId="ns=1;i=1004">
+    <set:DisplayName>Gripper1</set:DisplayName>
+    <set:References>
+      <set:Reference ReferenceType="HasTypeDefinition">ns=1;i=1000</set:Reference>
+      <set:Reference IsForward="false" ReferenceType="Organizes">ObjectsFolder</set:Reference>
+      <set:Reference ReferenceType="HasComponent">ns=1;i=1005</set:Reference>
+    </set:References>
+  </set:UAObject>
+</set:UANodeSet>
\ No newline at end of file
diff --git a/Uml2OpcuaTransformationTests/InstanceWithInstanceValueSlot.xml b/Uml2OpcuaTransformationTests/InstanceWithInstanceValueSlot.xml
index 5132938..09c8a3b 100644
--- a/Uml2OpcuaTransformationTests/InstanceWithInstanceValueSlot.xml
+++ b/Uml2OpcuaTransformationTests/InstanceWithInstanceValueSlot.xml
@@ -1,83 +1,83 @@
-<?xml version="1.0" encoding="utf-8"?>
-<UANodeSet xmlns="http://opcfoundation.org/UA/2011/03/UANodeSet.xsd" xmlns:types="http://opcfoundation.org/UA/2008/02/Types.xsd">
-  <NamespaceUris>
-    <Uri>InstanceWithInstanceValueSlot</Uri>
-  </NamespaceUris>
-  <Aliases>
-    <Alias Alias="BaseObjectType">i=58</Alias>
-    <Alias Alias="HasTypeDefinition">i=40</Alias>
-    <Alias Alias="ObjectsFolder">i=85</Alias>
-    <Alias Alias="HasComponent">i=47</Alias>
-    <Alias Alias="String">i=12</Alias>
-    <Alias Alias="Organizes">i=35</Alias>
-    <Alias Alias="HasModellingRule">i=37</Alias>
-    <Alias Alias="HasSubtype">i=45</Alias>
-    <Alias Alias="ModellingRule_Mandatory">i=78</Alias>
-    <Alias Alias="BaseDataVariableType">i=63</Alias>
-  </Aliases>
-  <UAVariable BrowseName="Version" NodeId="ns=1;i=1003" ParentNodeId="ns=1;i=1001" DataType="String">
-    <DisplayName>Version</DisplayName>
-    <References>
-      <Reference ReferenceType="HasTypeDefinition">BaseDataVariableType</Reference>
-      <Reference ReferenceType="HasModellingRule">ModellingRule_Mandatory</Reference>
-      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;i=1001</Reference>
-    </References>
-  </UAVariable>
-  <UAObject BrowseName="RobotController" NodeId="ns=1;i=1001" ParentNodeId="ns=1;i=1000">
-    <DisplayName>RobotController</DisplayName>
-    <References>
-      <Reference ReferenceType="HasTypeDefinition">ns=1;i=1002</Reference>
-      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;i=1000</Reference>
-      <Reference ReferenceType="HasModellingRule">ModellingRule_Mandatory</Reference>
-      <Reference ReferenceType="HasComponent">ns=1;i=1003</Reference>
-    </References>
-  </UAObject>
-  <UAVariable BrowseName="Version" NodeId="ns=1;i=1004" ParentNodeId="ns=1;i=1002" DataType="String">
-    <DisplayName>Version</DisplayName>
-    <References>
-      <Reference ReferenceType="HasTypeDefinition">BaseDataVariableType</Reference>
-      <Reference ReferenceType="HasModellingRule">ModellingRule_Mandatory</Reference>
-      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;i=1002</Reference>
-    </References>
-  </UAVariable>
-  <UAObjectType BrowseName="ControllerType" NodeId="ns=1;i=1002">
-    <DisplayName>ControllerType</DisplayName>
-    <References>
-      <Reference IsForward="false" ReferenceType="HasSubtype">BaseObjectType</Reference>
-      <Reference ReferenceType="HasComponent">ns=1;i=1004</Reference>
-    </References>
-  </UAObjectType>
-  <UAObjectType BrowseName="RobotType" NodeId="ns=1;i=1000">
-    <DisplayName>RobotType</DisplayName>
-    <References>
-      <Reference IsForward="false" ReferenceType="HasSubtype">BaseObjectType</Reference>
-      <Reference ReferenceType="HasComponent">ns=1;i=1001</Reference>
-    </References>
-  </UAObjectType>
-  <UAVariable BrowseName="Version" NodeId="ns=1;i=1006" ParentNodeId="ns=1;i=1005" DataType="String">
-    <DisplayName>Version</DisplayName>
-    <References>
-      <Reference ReferenceType="HasTypeDefinition">BaseDataVariableType</Reference>
-      <Reference ReferenceType="HasModellingRule">ModellingRule_Mandatory</Reference>
-      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;i=1005</Reference>
-    </References>
-    <Value>
+<?xml version="1.0" encoding="UTF-8"?>
+<set:UANodeSet xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:set="http://opcfoundation.org/UA/2011/03/UANodeSet.xsd" xmlns:types="http://opcfoundation.org/UA/2008/02/Types.xsd" xsi:schemaLocation="http://opcfoundation.org/UA/2011/03/UANodeSet.xsd ../QvtoTransformationRules/metamodels/set.ecore http://opcfoundation.org/UA/2008/02/Types.xsd ../QvtoTransformationRules/metamodels/types.ecore">
+  <set:NamespaceUris>
+    <set:Uri>InstanceWithInstanceValueSlot</set:Uri>
+  </set:NamespaceUris>
+  <set:Aliases>
+    <set:Alias Alias="HasSubtype">i=45</set:Alias>
+    <set:Alias Alias="BaseObjectType">i=58</set:Alias>
+    <set:Alias Alias="HasModellingRule">i=37</set:Alias>
+    <set:Alias Alias="BaseDataVariableType">i=63</set:Alias>
+    <set:Alias Alias="Organizes">i=35</set:Alias>
+    <set:Alias Alias="String">i=12</set:Alias>
+    <set:Alias Alias="HasTypeDefinition">i=40</set:Alias>
+    <set:Alias Alias="ModellingRule_Mandatory">i=78</set:Alias>
+    <set:Alias Alias="HasComponent">i=47</set:Alias>
+    <set:Alias Alias="ObjectsFolder">i=85</set:Alias>
+  </set:Aliases>
+  <set:UAVariable BrowseName="Version" NodeId="ns=1;i=1001" ParentNodeId="ns=1;i=1000" DataType="String">
+    <set:DisplayName>Version</set:DisplayName>
+    <set:References>
+      <set:Reference ReferenceType="HasTypeDefinition">BaseDataVariableType</set:Reference>
+      <set:Reference ReferenceType="HasModellingRule">ModellingRule_Mandatory</set:Reference>
+      <set:Reference IsForward="false" ReferenceType="HasComponent">ns=1;i=1000</set:Reference>
+    </set:References>
+  </set:UAVariable>
+  <set:UAVariable BrowseName="Version" NodeId="ns=1;i=1004" ParentNodeId="ns=1;i=1003" DataType="String">
+    <set:DisplayName>Version</set:DisplayName>
+    <set:References>
+      <set:Reference ReferenceType="HasTypeDefinition">BaseDataVariableType</set:Reference>
+      <set:Reference ReferenceType="HasModellingRule">ModellingRule_Mandatory</set:Reference>
+      <set:Reference IsForward="false" ReferenceType="HasComponent">ns=1;i=1003</set:Reference>
+    </set:References>
+  </set:UAVariable>
+  <set:UAObject BrowseName="RobotController" NodeId="ns=1;i=1003" ParentNodeId="ns=1;i=1002">
+    <set:DisplayName>RobotController</set:DisplayName>
+    <set:References>
+      <set:Reference ReferenceType="HasTypeDefinition">ns=1;i=1000</set:Reference>
+      <set:Reference IsForward="false" ReferenceType="HasComponent">ns=1;i=1002</set:Reference>
+      <set:Reference ReferenceType="HasModellingRule">ModellingRule_Mandatory</set:Reference>
+      <set:Reference ReferenceType="HasComponent">ns=1;i=1004</set:Reference>
+    </set:References>
+  </set:UAObject>
+  <set:UAObjectType BrowseName="RobotType" NodeId="ns=1;i=1002">
+    <set:DisplayName>RobotType</set:DisplayName>
+    <set:References>
+      <set:Reference IsForward="false" ReferenceType="HasSubtype">BaseObjectType</set:Reference>
+      <set:Reference ReferenceType="HasComponent">ns=1;i=1003</set:Reference>
+    </set:References>
+  </set:UAObjectType>
+  <set:UAObjectType BrowseName="ControllerType" NodeId="ns=1;i=1000">
+    <set:DisplayName>ControllerType</set:DisplayName>
+    <set:References>
+      <set:Reference IsForward="false" ReferenceType="HasSubtype">BaseObjectType</set:Reference>
+      <set:Reference ReferenceType="HasComponent">ns=1;i=1001</set:Reference>
+    </set:References>
+  </set:UAObjectType>
+  <set:UAVariable BrowseName="Version" NodeId="ns=1;i=1007" ParentNodeId="ns=1;i=1006" DataType="String">
+    <set:DisplayName>Version</set:DisplayName>
+    <set:References>
+      <set:Reference ReferenceType="HasTypeDefinition">BaseDataVariableType</set:Reference>
+      <set:Reference ReferenceType="HasModellingRule">ModellingRule_Mandatory</set:Reference>
+      <set:Reference IsForward="false" ReferenceType="HasComponent">ns=1;i=1006</set:Reference>
+    </set:References>
+    <set:Value>
       <types:String>#006002</types:String>
-    </Value>
-  </UAVariable>
-  <UAObject BrowseName="MyControllerInstance" NodeId="ns=1;i=1005">
-    <DisplayName>MyControllerInstance</DisplayName>
-    <References>
-      <Reference ReferenceType="HasTypeDefinition">ns=1;i=1002</Reference>
-      <Reference ReferenceType="HasComponent">ns=1;i=1006</Reference>
-    </References>
-  </UAObject>
-  <UAObject BrowseName="MyRobotInstance" NodeId="ns=1;i=1007">
-    <DisplayName>MyRobotInstance</DisplayName>
-    <References>
-      <Reference ReferenceType="HasTypeDefinition">ns=1;i=1000</Reference>
-      <Reference IsForward="false" ReferenceType="Organizes">ObjectsFolder</Reference>
-      <Reference ReferenceType="HasComponent">ns=1;i=1005</Reference>
-    </References>
-  </UAObject>
-</UANodeSet>
\ No newline at end of file
+    </set:Value>
+  </set:UAVariable>
+  <set:UAObject BrowseName="MyRobotInstance" NodeId="ns=1;i=1005">
+    <set:DisplayName>MyRobotInstance</set:DisplayName>
+    <set:References>
+      <set:Reference ReferenceType="HasTypeDefinition">ns=1;i=1002</set:Reference>
+      <set:Reference IsForward="false" ReferenceType="Organizes">ObjectsFolder</set:Reference>
+      <set:Reference ReferenceType="HasComponent">ns=1;i=1006</set:Reference>
+    </set:References>
+  </set:UAObject>
+  <set:UAObject BrowseName="MyControllerInstance" NodeId="ns=1;i=1006" ParentNodeId="ns=1;i=1005">
+    <set:DisplayName>MyControllerInstance</set:DisplayName>
+    <set:References>
+      <set:Reference ReferenceType="HasTypeDefinition">ns=1;i=1000</set:Reference>
+      <set:Reference ReferenceType="HasComponent">ns=1;i=1007</set:Reference>
+    </set:References>
+  </set:UAObject>
+</set:UANodeSet>
\ No newline at end of file
diff --git a/Uml2OpcuaTransformationTests/Multiplicity_1_to_1n.xml b/Uml2OpcuaTransformationTests/Multiplicity_1_to_1n.xml
index 6b121e1..bfb4115 100644
--- a/Uml2OpcuaTransformationTests/Multiplicity_1_to_1n.xml
+++ b/Uml2OpcuaTransformationTests/Multiplicity_1_to_1n.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<UANodeSet xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://opcfoundation.org/UA/2011/03/UANodeSet.xsd" xsi:type="UANodeSet">
-  <NamespaceUris xsi:type="UriTable">
-    <Uri>Multiplicity_1_to_1..n</Uri>
+<?xml version="1.0" encoding="utf-8"?>
+<UANodeSet xmlns="http://opcfoundation.org/UA/2011/03/UANodeSet.xsd">
+  <NamespaceUris>
+    <Uri>Multiplicity_1_to_1n</Uri>
   </NamespaceUris>
-  <Aliases xsi:type="AliasTable">
-    <Alias xsi:type="NodeIdAlias" Alias="HasTypeDefinition">i=40</Alias>
-    <Alias xsi:type="NodeIdAlias" Alias="BaseObjectType">i=58</Alias>
-    <Alias xsi:type="NodeIdAlias" Alias="ModellingRule_MandatoryPlaceholder">i=11510</Alias>
-    <Alias xsi:type="NodeIdAlias" Alias="HasComponent">i=47</Alias>
-    <Alias xsi:type="NodeIdAlias" Alias="HasModellingRule">i=37</Alias>
-    <Alias xsi:type="NodeIdAlias" Alias="HasSubtype">i=45</Alias>
+  <Aliases>
+    <Alias Alias="HasTypeDefinition">i=40</Alias>
+    <Alias Alias="HasComponent">i=47</Alias>
+    <Alias Alias="HasSubtype">i=45</Alias>
+    <Alias Alias="ModellingRule_MandatoryPlaceholder">i=11510</Alias>
+    <Alias Alias="HasModellingRule">i=37</Alias>
+    <Alias Alias="BaseObjectType">i=58</Alias>
   </Aliases>
-  <UAObject xsi:type="UAObject" BrowseName="Axis" NodeId="ns=1;s=Axis" ParentNodeId="ns=1;s=RobotType">
-    <DisplayName xsi:type="LocalizedText">Axis</DisplayName>
-    <References xsi:type="ListOfReferences">
-      <Reference xsi:type="Reference" ReferenceType="HasTypeDefinition">ns=1;s=AxisType</Reference>
-      <Reference xsi:type="Reference" IsForward="false" ReferenceType="HasComponent">ns=1;s=RobotType</Reference>
-      <Reference xsi:type="Reference" ReferenceType="HasModellingRule">ModellingRule_MandatoryPlaceholder</Reference>
+  <UAObject BrowseName="Axis" NodeId="ns=1;i=1001" ParentNodeId="ns=1;i=1000">
+    <DisplayName>Axis</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">ns=1;i=1002</Reference>
+      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;i=1000</Reference>
+      <Reference ReferenceType="HasModellingRule">ModellingRule_MandatoryPlaceholder</Reference>
     </References>
   </UAObject>
-  <UAObjectType xsi:type="UAObjectType" BrowseName="AxisType" NodeId="ns=1;s=AxisType">
-    <DisplayName xsi:type="LocalizedText">AxisType</DisplayName>
-    <References xsi:type="ListOfReferences">
-      <Reference xsi:type="Reference" IsForward="false" ReferenceType="HasSubtype">BaseObjectType</Reference>
+  <UAObjectType BrowseName="RobotType" NodeId="ns=1;i=1000">
+    <DisplayName>RobotType</DisplayName>
+    <References>
+      <Reference IsForward="false" ReferenceType="HasSubtype">BaseObjectType</Reference>
+      <Reference ReferenceType="HasComponent">ns=1;i=1001</Reference>
     </References>
   </UAObjectType>
-  <UAObjectType xsi:type="UAObjectType" BrowseName="RobotType" NodeId="ns=1;s=RobotType">
-    <DisplayName xsi:type="LocalizedText">RobotType</DisplayName>
-    <References xsi:type="ListOfReferences">
-      <Reference xsi:type="Reference" IsForward="false" ReferenceType="HasSubtype">BaseObjectType</Reference>
-      <Reference xsi:type="Reference" ReferenceType="HasComponent">ns=1;s=Axis</Reference>
+  <UAObjectType BrowseName="AxisType" NodeId="ns=1;i=1002">
+    <DisplayName>AxisType</DisplayName>
+    <References>
+      <Reference IsForward="false" ReferenceType="HasSubtype">BaseObjectType</Reference>
     </References>
   </UAObjectType>
 </UANodeSet>
\ No newline at end of file
diff --git a/Uml2OpcuaTransformationTests/NonPrimitiveProperty.di b/Uml2OpcuaTransformationTests/NonPrimitiveProperty.di
new file mode 100644
index 0000000..8c549ee
--- /dev/null
+++ b/Uml2OpcuaTransformationTests/NonPrimitiveProperty.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<architecture:ArchitectureDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" contextId="org.eclipse.papyrus.infra.services.edit.TypeContext"/>
diff --git a/Uml2OpcuaTransformationTests/NonPrimitiveProperty.notation b/Uml2OpcuaTransformationTests/NonPrimitiveProperty.notation
new file mode 100644
index 0000000..4c5dafa
--- /dev/null
+++ b/Uml2OpcuaTransformationTests/NonPrimitiveProperty.notation
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.3/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_n9rskMdPEeqBwPQ5-6UCwg" type="PapyrusUMLClassDiagram" name="Class Diagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_pu7AsMdPEeqBwPQ5-6UCwg" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_pvEKoMdPEeqBwPQ5-6UCwg" type="Class_NameLabel">
+      <element xmi:type="uml:Class" href="NonPrimitiveProperty.uml#_punesMdPEeqBwPQ5-6UCwg"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_pvEKocdPEeqBwPQ5-6UCwg" type="Class_FloatingNameLabel">
+      <element xmi:type="uml:Class" href="NonPrimitiveProperty.uml#_punesMdPEeqBwPQ5-6UCwg"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_pvEKosdPEeqBwPQ5-6UCwg" y="15"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_pvN7oMdPEeqBwPQ5-6UCwg" type="Class_AttributeCompartment">
+      <children xmi:type="notation:Shape" xmi:id="_bFa4gTVfEeuvtL-cjTXdxg" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="NonPrimitiveProperty.uml#_bFa4gDVfEeuvtL-cjTXdxg"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_bFa4gjVfEeuvtL-cjTXdxg"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_pvN7ocdPEeqBwPQ5-6UCwg"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_pvN7osdPEeqBwPQ5-6UCwg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_pvN7o8dPEeqBwPQ5-6UCwg"/>
+      <element xmi:type="uml:Class" href="NonPrimitiveProperty.uml#_punesMdPEeqBwPQ5-6UCwg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pvN7pMdPEeqBwPQ5-6UCwg"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_pvN7pcdPEeqBwPQ5-6UCwg" type="Class_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_pvN7psdPEeqBwPQ5-6UCwg"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_pvN7p8dPEeqBwPQ5-6UCwg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_pvN7qMdPEeqBwPQ5-6UCwg"/>
+      <element xmi:type="uml:Class" href="NonPrimitiveProperty.uml#_punesMdPEeqBwPQ5-6UCwg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pvN7qcdPEeqBwPQ5-6UCwg"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_pvN7qsdPEeqBwPQ5-6UCwg" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_pvN7q8dPEeqBwPQ5-6UCwg"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_pvN7rMdPEeqBwPQ5-6UCwg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_pvN7rcdPEeqBwPQ5-6UCwg"/>
+      <element xmi:type="uml:Class" href="NonPrimitiveProperty.uml#_punesMdPEeqBwPQ5-6UCwg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pvN7rsdPEeqBwPQ5-6UCwg"/>
+    </children>
+    <element xmi:type="uml:Class" href="NonPrimitiveProperty.uml#_punesMdPEeqBwPQ5-6UCwg"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pu7AscdPEeqBwPQ5-6UCwg" x="60" y="60"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_UaPZ8TVfEeuvtL-cjTXdxg" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_UaPZ8zVfEeuvtL-cjTXdxg" type="Class_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_UaPZ9DVfEeuvtL-cjTXdxg" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_UaPZ9TVfEeuvtL-cjTXdxg" y="15"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_UaPZ9jVfEeuvtL-cjTXdxg" type="Class_AttributeCompartment">
+      <children xmi:type="notation:Shape" xmi:id="_VzcokTVfEeuvtL-cjTXdxg" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="NonPrimitiveProperty.uml#_VzcokDVfEeuvtL-cjTXdxg"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_VzcokjVfEeuvtL-cjTXdxg"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_UaPZ9zVfEeuvtL-cjTXdxg"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_UaPZ-DVfEeuvtL-cjTXdxg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_UaPZ-TVfEeuvtL-cjTXdxg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UaPZ-jVfEeuvtL-cjTXdxg"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_UaPZ-zVfEeuvtL-cjTXdxg" type="Class_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_UaPZ_DVfEeuvtL-cjTXdxg"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_UaPZ_TVfEeuvtL-cjTXdxg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_UaPZ_jVfEeuvtL-cjTXdxg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UaPZ_zVfEeuvtL-cjTXdxg"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_UaPaADVfEeuvtL-cjTXdxg" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_UaPaATVfEeuvtL-cjTXdxg"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_UaPaAjVfEeuvtL-cjTXdxg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_UaPaAzVfEeuvtL-cjTXdxg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UaPaBDVfEeuvtL-cjTXdxg"/>
+    </children>
+    <element xmi:type="uml:Class" href="NonPrimitiveProperty.uml#_UaPZ8DVfEeuvtL-cjTXdxg"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UaPZ8jVfEeuvtL-cjTXdxg" x="280" y="60"/>
+  </children>
+  <styles xmi:type="notation:StringValueStyle" xmi:id="_n9rskcdPEeqBwPQ5-6UCwg" name="diagram_compatibility_version" stringValue="1.4.0"/>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_n9rsksdPEeqBwPQ5-6UCwg"/>
+  <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_n9rsk8dPEeqBwPQ5-6UCwg" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
+    <owner xmi:type="uml:Model" href="NonPrimitiveProperty.uml#_n7J9AMdPEeqBwPQ5-6UCwg"/>
+  </styles>
+  <element xmi:type="uml:Model" href="NonPrimitiveProperty.uml#_n7J9AMdPEeqBwPQ5-6UCwg"/>
+</notation:Diagram>
diff --git a/Uml2OpcuaTransformationTests/NonPrimitiveProperty.uml b/Uml2OpcuaTransformationTests/NonPrimitiveProperty.uml
new file mode 100644
index 0000000..d3c3a98
--- /dev/null
+++ b/Uml2OpcuaTransformationTests/NonPrimitiveProperty.uml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_n7J9AMdPEeqBwPQ5-6UCwg" name="NonPrimitiveProperty">
+  <packageImport xmi:type="uml:PackageImport" xmi:id="_oCcQwMdPEeqBwPQ5-6UCwg">
+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+  </packageImport>
+  <packagedElement xmi:type="uml:Class" xmi:id="_punesMdPEeqBwPQ5-6UCwg" name="Robot">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_bFa4gDVfEeuvtL-cjTXdxg" name="c1" type="_UaPZ8DVfEeuvtL-cjTXdxg"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_UaPZ8DVfEeuvtL-cjTXdxg" name="Controller">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_VzcokDVfEeuvtL-cjTXdxg" name="Version">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+    </ownedAttribute>
+  </packagedElement>
+</uml:Model>
diff --git a/Uml2OpcuaTransformationTests/NonPrimitiveProperty.xml b/Uml2OpcuaTransformationTests/NonPrimitiveProperty.xml
new file mode 100644
index 0000000..951a144
--- /dev/null
+++ b/Uml2OpcuaTransformationTests/NonPrimitiveProperty.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<UANodeSet xmlns="http://opcfoundation.org/UA/2011/03/UANodeSet.xsd" xmlns:types="http://opcfoundation.org/UA/2008/02/Types.xsd">
+  <NamespaceUris>
+    <Uri>PropertyString</Uri>
+  </NamespaceUris>
+  <Aliases>
+    <Alias Alias="String">i=12</Alias>
+    <Alias Alias="HasModellingRule">i=37</Alias>
+    <Alias Alias="BaseDataVariableType">i=63</Alias>
+    <Alias Alias="HasTypeDefinition">i=40</Alias>
+    <Alias Alias="HasComponent">i=47</Alias>
+    <Alias Alias="HasSubtype">i=45</Alias>
+    <Alias Alias="BaseObjectType">i=58</Alias>
+    <Alias Alias="ModellingRule_Mandatory">i=78</Alias>
+  </Aliases>
+  <UAVariable BrowseName="myProperty" NodeId="ns=1;s=myProperty" ParentNodeId="ns=1;s=RobotType" DataType="String">
+    <DisplayName>myProperty</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">BaseDataVariableType</Reference>
+      <Reference ReferenceType="HasModellingRule">ModellingRule_Mandatory</Reference>
+      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;s=RobotType</Reference>
+    </References>
+    <Value>
+      <types:String>SomeDefaultValueString</types:String>
+    </Value>
+  </UAVariable>
+  <UAObjectType BrowseName="RobotType" NodeId="ns=1;s=RobotType">
+    <DisplayName>RobotType</DisplayName>
+    <References>
+      <Reference IsForward="false" ReferenceType="HasSubtype">BaseObjectType</Reference>
+      <Reference ReferenceType="HasComponent">ns=1;s=myProperty</Reference>
+    </References>
+  </UAObjectType>
+</UANodeSet>
\ No newline at end of file
diff --git a/Uml2OpcuaTransformationTests/Operation.xml b/Uml2OpcuaTransformationTests/Operation.xml
index 52d2ef6..40b418e 100644
--- a/Uml2OpcuaTransformationTests/Operation.xml
+++ b/Uml2OpcuaTransformationTests/Operation.xml
@@ -1,103 +1,102 @@
 <?xml version="1.0" encoding="utf-8"?>
-<UANodeSet xmlns="http://opcfoundation.org/UA/2011/03/UANodeSet.xsd" xmlns:types="http://opcfoundation.org/UA/2008/02/Types.xsd">
+<UANodeSet xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://opcfoundation.org/UA/2011/03/UANodeSet.xsd" xmlns:uax="http://opcfoundation.org/UA/2008/02/Types.xsd">
   <NamespaceUris>
     <Uri>Operation</Uri>
   </NamespaceUris>
   <Aliases>
-    <Alias Alias="HasTypeDefinition">i=40</Alias>
-    <Alias Alias="HasSubtype">i=45</Alias>
-    <Alias Alias="Int32">i=6</Alias>
     <Alias Alias="HasProperty">i=46</Alias>
+    <Alias Alias="ModellingRule_Mandatory">i=78</Alias>
+    <Alias Alias="HasSubtype">i=45</Alias>
+    <Alias Alias="HasTypeDefinition">i=40</Alias>
     <Alias Alias="PropertyType">i=68</Alias>
-    <Alias Alias="HasModellingRule">i=37</Alias>
     <Alias Alias="BaseObjectType">i=58</Alias>
-    <Alias Alias="Double">i=11</Alias>
-    <Alias Alias="Argument_Encoding_DefaultXml">i=297</Alias>
-    <Alias Alias="String">i=12</Alias>
     <Alias Alias="Argument">i=296</Alias>
+    <Alias Alias="HasModellingRule">i=37</Alias>
     <Alias Alias="HasComponent">i=47</Alias>
-    <Alias Alias="ModellingRule_Mandatory">i=78</Alias>
   </Aliases>
-  <UAVariable BrowseName="InputArguments" NodeId="ns=1;s=AddNumbersInputArguments" ParentNodeId="ns=1;s=AddNumbers" ArrayDimensions="3" DataType="Argument" ValueRank="1">
+  <UAVariable BrowseName="InputArguments" NodeId="ns=1;i=1002" ParentNodeId="ns=1;i=1001" ArrayDimensions="3" DataType="Argument" ValueRank="1">
     <DisplayName>InputArguments</DisplayName>
     <References>
       <Reference ReferenceType="HasModellingRule">ModellingRule_Mandatory</Reference>
-      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;s=AddNumbers</Reference>
+      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;i=1001</Reference>
       <Reference ReferenceType="HasTypeDefinition">PropertyType</Reference>
     </References>
     <Value>
-      <types:ListOfExtensionObject>
-        <types:ExtensionObject>
-          <types:TypeId>
-            <types:Identifier>Argument_Encoding_DefaultXml</types:Identifier>
-          </types:TypeId>
-          <types:Body>
-            <types:Argument>
-              <types:Name>in2</types:Name>
-              <types:DataType>
-                <types:Identifier>Double</types:Identifier>
-              </types:DataType>
-              <types:ValueRank>-1</types:ValueRank>
-            </types:Argument>
-          </types:Body>
-        </types:ExtensionObject>
-        <types:ExtensionObject>
-          <types:TypeId>
-            <types:Identifier>Argument_Encoding_DefaultXml</types:Identifier>
-          </types:TypeId>
-          <types:Body>
-            <types:Argument>
-              <types:Name>in1</types:Name>
-              <types:DataType>
-                <types:Identifier>Int32</types:Identifier>
-              </types:DataType>
-              <types:ValueRank>-1</types:ValueRank>
-            </types:Argument>
-          </types:Body>
-        </types:ExtensionObject>
-      </types:ListOfExtensionObject>
+      <uax:ListOfExtensionObject>
+        <uax:ExtensionObject>
+          <uax:TypeId>
+            <uax:Identifier>i=297</uax:Identifier>
+          </uax:TypeId>
+          <uax:Body>
+            <uax:Argument>
+              <uax:Name>in1</uax:Name>
+              <uax:DataType>
+                <uax:Identifier>i=6</uax:Identifier>
+              </uax:DataType>
+              <uax:ValueRank>-1</uax:ValueRank>
+              <uax:ArrayDimensions xsi:nil="true"/>
+            </uax:Argument>
+          </uax:Body>
+        </uax:ExtensionObject>
+        <uax:ExtensionObject>
+          <uax:TypeId>
+            <uax:Identifier>i=297</uax:Identifier>
+          </uax:TypeId>
+          <uax:Body>
+            <uax:Argument>
+              <uax:Name>in2</uax:Name>
+              <uax:DataType>
+                <uax:Identifier>i=11</uax:Identifier>
+              </uax:DataType>
+              <uax:ValueRank>-1</uax:ValueRank>
+              <uax:ArrayDimensions xsi:nil="true"/>
+            </uax:Argument>
+          </uax:Body>
+        </uax:ExtensionObject>
+      </uax:ListOfExtensionObject>
     </Value>
   </UAVariable>
-  <UAVariable BrowseName="OutputArguments" NodeId="ns=1;s=AddNumbersOutputArguments" ParentNodeId="ns=1;s=AddNumbers" ArrayDimensions="3" DataType="Argument" ValueRank="1">
+  <UAVariable BrowseName="OutputArguments" NodeId="ns=1;i=1003" ParentNodeId="ns=1;i=1001" ArrayDimensions="3" DataType="Argument" ValueRank="1">
     <DisplayName>OutputArguments</DisplayName>
     <References>
       <Reference ReferenceType="HasModellingRule">ModellingRule_Mandatory</Reference>
-      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;s=AddNumbers</Reference>
+      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;i=1001</Reference>
       <Reference ReferenceType="HasTypeDefinition">PropertyType</Reference>
     </References>
     <Value>
-      <types:ListOfExtensionObject>
-        <types:ExtensionObject>
-          <types:TypeId>
-            <types:Identifier>Argument_Encoding_DefaultXml</types:Identifier>
-          </types:TypeId>
-          <types:Body>
-            <types:Argument>
-              <types:Name>out1</types:Name>
-              <types:DataType>
-                <types:Identifier>String</types:Identifier>
-              </types:DataType>
-              <types:ValueRank>-1</types:ValueRank>
-            </types:Argument>
-          </types:Body>
-        </types:ExtensionObject>
-      </types:ListOfExtensionObject>
+      <uax:ListOfExtensionObject>
+        <uax:ExtensionObject>
+          <uax:TypeId>
+            <uax:Identifier>i=297</uax:Identifier>
+          </uax:TypeId>
+          <uax:Body>
+            <uax:Argument>
+              <uax:Name>out1</uax:Name>
+              <uax:DataType>
+                <uax:Identifier>i=12</uax:Identifier>
+              </uax:DataType>
+              <uax:ValueRank>-1</uax:ValueRank>
+              <uax:ArrayDimensions xsi:nil="true"/>
+            </uax:Argument>
+          </uax:Body>
+        </uax:ExtensionObject>
+      </uax:ListOfExtensionObject>
     </Value>
   </UAVariable>
-  <UAMethod BrowseName="AddNumbers" NodeId="ns=1;s=AddNumbers" ParentNodeId="ns=1;s=CalculatorType">
+  <UAMethod BrowseName="AddNumbers" NodeId="ns=1;i=1001" ParentNodeId="ns=1;i=1000">
     <DisplayName>AddNumbers</DisplayName>
     <References>
       <Reference ReferenceType="HasModellingRule">ModellingRule_Mandatory</Reference>
-      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;s=CalculatorType</Reference>
-      <Reference ReferenceType="HasProperty">ns=1;s=AddNumbersInputArguments</Reference>
-      <Reference ReferenceType="HasProperty">ns=1;s=AddNumbersOutputArguments</Reference>
+      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;i=1000</Reference>
+      <Reference ReferenceType="HasProperty">ns=1;i=1002</Reference>
+      <Reference ReferenceType="HasProperty">ns=1;i=1003</Reference>
     </References>
   </UAMethod>
-  <UAObjectType BrowseName="CalculatorType" NodeId="ns=1;s=CalculatorType">
+  <UAObjectType BrowseName="CalculatorType" NodeId="ns=1;i=1000">
     <DisplayName>CalculatorType</DisplayName>
     <References>
       <Reference IsForward="false" ReferenceType="HasSubtype">BaseObjectType</Reference>
-      <Reference ReferenceType="HasComponent">ns=1;s=AddNumbers</Reference>
+      <Reference ReferenceType="HasComponent">ns=1;i=1001</Reference>
     </References>
   </UAObjectType>
 </UANodeSet>
\ No newline at end of file
diff --git a/Uml2OpcuaTransformationTests/PropertyClass.di b/Uml2OpcuaTransformationTests/PropertyClass.di
new file mode 100644
index 0000000..8c549ee
--- /dev/null
+++ b/Uml2OpcuaTransformationTests/PropertyClass.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<architecture:ArchitectureDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" contextId="org.eclipse.papyrus.infra.services.edit.TypeContext"/>
diff --git a/Uml2OpcuaTransformationTests/PropertyClass.notation b/Uml2OpcuaTransformationTests/PropertyClass.notation
new file mode 100644
index 0000000..303e483
--- /dev/null
+++ b/Uml2OpcuaTransformationTests/PropertyClass.notation
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.3/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_Z-5LEP5FEeqcH6exUiFZNQ" type="PapyrusUMLClassDiagram" name="Class Diagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_bjz6cP5FEeqcH6exUiFZNQ" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_bj29wP5FEeqcH6exUiFZNQ" type="Class_NameLabel">
+      <element xmi:type="uml:Class" href="PropertyClass.uml#_bjo7UP5FEeqcH6exUiFZNQ"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_bj29wf5FEeqcH6exUiFZNQ" type="Class_FloatingNameLabel">
+      <element xmi:type="uml:Class" href="PropertyClass.uml#_bjo7UP5FEeqcH6exUiFZNQ"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_bj29wv5FEeqcH6exUiFZNQ" y="15"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_bj3k0P5FEeqcH6exUiFZNQ" type="Class_AttributeCompartment">
+      <children xmi:type="notation:Shape" xmi:id="_AR8N0DljEeuSk7aEnW8xTw" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="PropertyClass.uml#_ARzq8DljEeuSk7aEnW8xTw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_AR8N0TljEeuSk7aEnW8xTw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_bj3k0f5FEeqcH6exUiFZNQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_bj3k0v5FEeqcH6exUiFZNQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_bj3k0_5FEeqcH6exUiFZNQ"/>
+      <element xmi:type="uml:Class" href="PropertyClass.uml#_bjo7UP5FEeqcH6exUiFZNQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bj3k1P5FEeqcH6exUiFZNQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_bj3k1f5FEeqcH6exUiFZNQ" type="Class_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_bj3k1v5FEeqcH6exUiFZNQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_bj3k1_5FEeqcH6exUiFZNQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_bj3k2P5FEeqcH6exUiFZNQ"/>
+      <element xmi:type="uml:Class" href="PropertyClass.uml#_bjo7UP5FEeqcH6exUiFZNQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bj3k2f5FEeqcH6exUiFZNQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_bj4L4P5FEeqcH6exUiFZNQ" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_bj4L4f5FEeqcH6exUiFZNQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_bj4L4v5FEeqcH6exUiFZNQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_bj4L4_5FEeqcH6exUiFZNQ"/>
+      <element xmi:type="uml:Class" href="PropertyClass.uml#_bjo7UP5FEeqcH6exUiFZNQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bj4L5P5FEeqcH6exUiFZNQ"/>
+    </children>
+    <element xmi:type="uml:Class" href="PropertyClass.uml#_bjo7UP5FEeqcH6exUiFZNQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bjz6cf5FEeqcH6exUiFZNQ" x="201" y="245"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_cGJygP5FEeqcH6exUiFZNQ" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_cGLAoP5FEeqcH6exUiFZNQ" type="Class_NameLabel">
+      <element xmi:type="uml:Class" href="PropertyClass.uml#_cGH9UP5FEeqcH6exUiFZNQ"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_cGLAof5FEeqcH6exUiFZNQ" type="Class_FloatingNameLabel">
+      <element xmi:type="uml:Class" href="PropertyClass.uml#_cGH9UP5FEeqcH6exUiFZNQ"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_cGLAov5FEeqcH6exUiFZNQ" y="15"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_cGLAo_5FEeqcH6exUiFZNQ" type="Class_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_cGLApP5FEeqcH6exUiFZNQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_cGLApf5FEeqcH6exUiFZNQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_cGLApv5FEeqcH6exUiFZNQ"/>
+      <element xmi:type="uml:Class" href="PropertyClass.uml#_cGH9UP5FEeqcH6exUiFZNQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cGLAp_5FEeqcH6exUiFZNQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_cGLAqP5FEeqcH6exUiFZNQ" type="Class_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_cGLnsP5FEeqcH6exUiFZNQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_cGLnsf5FEeqcH6exUiFZNQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_cGLnsv5FEeqcH6exUiFZNQ"/>
+      <element xmi:type="uml:Class" href="PropertyClass.uml#_cGH9UP5FEeqcH6exUiFZNQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cGLns_5FEeqcH6exUiFZNQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_cGLntP5FEeqcH6exUiFZNQ" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_cGLntf5FEeqcH6exUiFZNQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_cGLntv5FEeqcH6exUiFZNQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_cGLnt_5FEeqcH6exUiFZNQ"/>
+      <element xmi:type="uml:Class" href="PropertyClass.uml#_cGH9UP5FEeqcH6exUiFZNQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cGLnuP5FEeqcH6exUiFZNQ"/>
+    </children>
+    <element xmi:type="uml:Class" href="PropertyClass.uml#_cGH9UP5FEeqcH6exUiFZNQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cGJygf5FEeqcH6exUiFZNQ" x="540" y="240"/>
+  </children>
+  <styles xmi:type="notation:StringValueStyle" xmi:id="_Z-5LEf5FEeqcH6exUiFZNQ" name="diagram_compatibility_version" stringValue="1.4.0"/>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_Z-5LEv5FEeqcH6exUiFZNQ"/>
+  <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_Z-5LE_5FEeqcH6exUiFZNQ" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
+    <owner xmi:type="uml:Model" href="PropertyClass.uml#_Z9FNMP5FEeqcH6exUiFZNQ"/>
+  </styles>
+  <element xmi:type="uml:Model" href="PropertyClass.uml#_Z9FNMP5FEeqcH6exUiFZNQ"/>
+</notation:Diagram>
diff --git a/Uml2OpcuaTransformationTests/PropertyClass.uml b/Uml2OpcuaTransformationTests/PropertyClass.uml
new file mode 100644
index 0000000..e70e981
--- /dev/null
+++ b/Uml2OpcuaTransformationTests/PropertyClass.uml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_Z9FNMP5FEeqcH6exUiFZNQ" name="PropertyClass">
+  <packageImport xmi:type="uml:PackageImport" xmi:id="_aBXQQP5FEeqcH6exUiFZNQ">
+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+  </packageImport>
+  <packagedElement xmi:type="uml:Class" xmi:id="_bjo7UP5FEeqcH6exUiFZNQ" name="Robot">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_ARzq8DljEeuSk7aEnW8xTw" name="gripper1" type="_cGH9UP5FEeqcH6exUiFZNQ"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_cGH9UP5FEeqcH6exUiFZNQ" name="Gripper"/>
+</uml:Model>
diff --git a/Uml2OpcuaTransformationTests/PropertyClass.xml b/Uml2OpcuaTransformationTests/PropertyClass.xml
new file mode 100644
index 0000000..8e1d959
--- /dev/null
+++ b/Uml2OpcuaTransformationTests/PropertyClass.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<UANodeSet xmlns="http://opcfoundation.org/UA/2011/03/UANodeSet.xsd">
+  <NamespaceUris>
+    <Uri>PropertyClass</Uri>
+  </NamespaceUris>
+  <Aliases>
+    <Alias Alias="HasSubtype">i=45</Alias>
+    <Alias Alias="BaseObjectType">i=58</Alias>
+    <Alias Alias="HasTypeDefinition">i=40</Alias>
+    <Alias Alias="HasModellingRule">i=37</Alias>
+    <Alias Alias="ModellingRule_Mandatory">i=78</Alias>
+    <Alias Alias="HasComponent">i=47</Alias>
+  </Aliases>
+  <UAObject BrowseName="gripper1" NodeId="ns=1;i=1001" ParentNodeId="ns=1;i=1000">
+    <DisplayName>gripper1</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">ns=1;i=1002</Reference>
+      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;i=1000</Reference>
+      <Reference ReferenceType="HasModellingRule">ModellingRule_Mandatory</Reference>
+    </References>
+  </UAObject>
+  <UAObjectType BrowseName="GripperType" NodeId="ns=1;i=1002">
+    <DisplayName>GripperType</DisplayName>
+    <References>
+      <Reference IsForward="false" ReferenceType="HasSubtype">BaseObjectType</Reference>
+    </References>
+  </UAObjectType>
+  <UAObjectType BrowseName="RobotType" NodeId="ns=1;i=1000">
+    <DisplayName>RobotType</DisplayName>
+    <References>
+      <Reference IsForward="false" ReferenceType="HasSubtype">BaseObjectType</Reference>
+      <Reference ReferenceType="HasComponent">ns=1;i=1001</Reference>
+    </References>
+  </UAObjectType>
+</UANodeSet>
\ No newline at end of file
diff --git a/Uml2OpcuaTransformationTests/PropertyInherited.csv b/Uml2OpcuaTransformationTests/PropertyInherited.csv
new file mode 100644
index 0000000..bc53a3e
--- /dev/null
+++ b/Uml2OpcuaTransformationTests/PropertyInherited.csv
@@ -0,0 +1,6 @@
+RobotType,1004,ObjectType
+ToolType_ToolId,1001,Variable
+GripperType,1002,ObjectType
+ToolType,1000,ObjectType
+GripperType_ToolId,1003,Variable
+RobotType_gripper1,1005,Object
diff --git a/Uml2OpcuaTransformationTests/PropertyInherited.di b/Uml2OpcuaTransformationTests/PropertyInherited.di
new file mode 100644
index 0000000..8c549ee
--- /dev/null
+++ b/Uml2OpcuaTransformationTests/PropertyInherited.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<architecture:ArchitectureDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" contextId="org.eclipse.papyrus.infra.services.edit.TypeContext"/>
diff --git a/Uml2OpcuaTransformationTests/PropertyInherited.notation b/Uml2OpcuaTransformationTests/PropertyInherited.notation
new file mode 100644
index 0000000..98ea0b6
--- /dev/null
+++ b/Uml2OpcuaTransformationTests/PropertyInherited.notation
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.3/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_Z-5LEP5FEeqcH6exUiFZNQ" type="PapyrusUMLClassDiagram" name="Class Diagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_bjz6cP5FEeqcH6exUiFZNQ" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_bj29wP5FEeqcH6exUiFZNQ" type="Class_NameLabel">
+      <element xmi:type="uml:Class" href="PropertyInherited.uml#_bjo7UP5FEeqcH6exUiFZNQ"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_bj29wf5FEeqcH6exUiFZNQ" type="Class_FloatingNameLabel">
+      <element xmi:type="uml:Class" href="PropertyInherited.uml#_bjo7UP5FEeqcH6exUiFZNQ"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_bj29wv5FEeqcH6exUiFZNQ" y="15"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_bj3k0P5FEeqcH6exUiFZNQ" type="Class_AttributeCompartment">
+      <children xmi:type="notation:Shape" xmi:id="_AR8N0DljEeuSk7aEnW8xTw" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="PropertyInherited.uml#_ARzq8DljEeuSk7aEnW8xTw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_AR8N0TljEeuSk7aEnW8xTw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_bj3k0f5FEeqcH6exUiFZNQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_bj3k0v5FEeqcH6exUiFZNQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_bj3k0_5FEeqcH6exUiFZNQ"/>
+      <element xmi:type="uml:Class" href="PropertyInherited.uml#_bjo7UP5FEeqcH6exUiFZNQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bj3k1P5FEeqcH6exUiFZNQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_bj3k1f5FEeqcH6exUiFZNQ" type="Class_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_bj3k1v5FEeqcH6exUiFZNQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_bj3k1_5FEeqcH6exUiFZNQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_bj3k2P5FEeqcH6exUiFZNQ"/>
+      <element xmi:type="uml:Class" href="PropertyInherited.uml#_bjo7UP5FEeqcH6exUiFZNQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bj3k2f5FEeqcH6exUiFZNQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_bj4L4P5FEeqcH6exUiFZNQ" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_bj4L4f5FEeqcH6exUiFZNQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_bj4L4v5FEeqcH6exUiFZNQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_bj4L4_5FEeqcH6exUiFZNQ"/>
+      <element xmi:type="uml:Class" href="PropertyInherited.uml#_bjo7UP5FEeqcH6exUiFZNQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bj4L5P5FEeqcH6exUiFZNQ"/>
+    </children>
+    <element xmi:type="uml:Class" href="PropertyInherited.uml#_bjo7UP5FEeqcH6exUiFZNQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bjz6cf5FEeqcH6exUiFZNQ" x="201" y="245"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_cGJygP5FEeqcH6exUiFZNQ" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_cGLAoP5FEeqcH6exUiFZNQ" type="Class_NameLabel">
+      <element xmi:type="uml:Class" href="PropertyInherited.uml#_cGH9UP5FEeqcH6exUiFZNQ"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_cGLAof5FEeqcH6exUiFZNQ" type="Class_FloatingNameLabel">
+      <element xmi:type="uml:Class" href="PropertyInherited.uml#_cGH9UP5FEeqcH6exUiFZNQ"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_cGLAov5FEeqcH6exUiFZNQ" y="15"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_cGLAo_5FEeqcH6exUiFZNQ" type="Class_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_cGLApP5FEeqcH6exUiFZNQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_cGLApf5FEeqcH6exUiFZNQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_cGLApv5FEeqcH6exUiFZNQ"/>
+      <element xmi:type="uml:Class" href="PropertyInherited.uml#_cGH9UP5FEeqcH6exUiFZNQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cGLAp_5FEeqcH6exUiFZNQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_cGLAqP5FEeqcH6exUiFZNQ" type="Class_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_cGLnsP5FEeqcH6exUiFZNQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_cGLnsf5FEeqcH6exUiFZNQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_cGLnsv5FEeqcH6exUiFZNQ"/>
+      <element xmi:type="uml:Class" href="PropertyInherited.uml#_cGH9UP5FEeqcH6exUiFZNQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cGLns_5FEeqcH6exUiFZNQ"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_cGLntP5FEeqcH6exUiFZNQ" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_cGLntf5FEeqcH6exUiFZNQ"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_cGLntv5FEeqcH6exUiFZNQ"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_cGLnt_5FEeqcH6exUiFZNQ"/>
+      <element xmi:type="uml:Class" href="PropertyInherited.uml#_cGH9UP5FEeqcH6exUiFZNQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cGLnuP5FEeqcH6exUiFZNQ"/>
+    </children>
+    <element xmi:type="uml:Class" href="PropertyInherited.uml#_cGH9UP5FEeqcH6exUiFZNQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cGJygf5FEeqcH6exUiFZNQ" x="500" y="280" width="201"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_9qOeMJeoEeuABfhdgMwvaw" type="Class_Shape">
+    <children xmi:type="notation:DecorationNode" xmi:id="_9qQTYJeoEeuABfhdgMwvaw" type="Class_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_9qQTYZeoEeuABfhdgMwvaw" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_9qQTYpeoEeuABfhdgMwvaw" y="15"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_9qQ6cJeoEeuABfhdgMwvaw" type="Class_AttributeCompartment">
+      <children xmi:type="notation:Shape" xmi:id="_DC-EgJepEeuABfhdgMwvaw" type="Property_ClassAttributeLabel">
+        <element xmi:type="uml:Property" href="PropertyInherited.uml#_DCuM4JepEeuABfhdgMwvaw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_DC-EgZepEeuABfhdgMwvaw"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_9qQ6cZeoEeuABfhdgMwvaw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_9qQ6cpeoEeuABfhdgMwvaw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_9qQ6c5eoEeuABfhdgMwvaw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9qQ6dJeoEeuABfhdgMwvaw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_9qQ6dZeoEeuABfhdgMwvaw" type="Class_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_9qQ6dpeoEeuABfhdgMwvaw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_9qQ6d5eoEeuABfhdgMwvaw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_9qQ6eJeoEeuABfhdgMwvaw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9qQ6eZeoEeuABfhdgMwvaw"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_9qQ6epeoEeuABfhdgMwvaw" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_9qQ6e5eoEeuABfhdgMwvaw"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_9qQ6fJeoEeuABfhdgMwvaw"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_9qQ6fZeoEeuABfhdgMwvaw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9qQ6fpeoEeuABfhdgMwvaw"/>
+    </children>
+    <element xmi:type="uml:Class" href="PropertyInherited.uml#_9qHwgJeoEeuABfhdgMwvaw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9qOeMZeoEeuABfhdgMwvaw" x="500" y="120" width="201"/>
+  </children>
+  <styles xmi:type="notation:StringValueStyle" xmi:id="_Z-5LEf5FEeqcH6exUiFZNQ" name="diagram_compatibility_version" stringValue="1.4.0"/>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_Z-5LEv5FEeqcH6exUiFZNQ"/>
+  <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_Z-5LE_5FEeqcH6exUiFZNQ" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
+    <owner xmi:type="uml:Model" href="PropertyInherited.uml#_Z9FNMP5FEeqcH6exUiFZNQ"/>
+  </styles>
+  <element xmi:type="uml:Model" href="PropertyInherited.uml#_Z9FNMP5FEeqcH6exUiFZNQ"/>
+  <edges xmi:type="notation:Connector" xmi:id="__z6HgJeoEeuABfhdgMwvaw" type="Generalization_Edge" source="_cGJygP5FEeqcH6exUiFZNQ" target="_9qOeMJeoEeuABfhdgMwvaw">
+    <children xmi:type="notation:DecorationNode" xmi:id="__z6ukJeoEeuABfhdgMwvaw" type="Generalization_StereotypeLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="__z6ukZeoEeuABfhdgMwvaw" y="40"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="__z6HgZeoEeuABfhdgMwvaw"/>
+    <element xmi:type="uml:Generalization" href="PropertyInherited.uml#__zwWgJeoEeuABfhdgMwvaw"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__z6HgpeoEeuABfhdgMwvaw" points="[540, 340, -643984, -643984]$[540, 180, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__0RT4JeoEeuABfhdgMwvaw" id="(0.4975124378109453,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__0R68JeoEeuABfhdgMwvaw" id="(0.4975124378109453,1.0)"/>
+  </edges>
+</notation:Diagram>
diff --git a/Uml2OpcuaTransformationTests/PropertyInherited.uml b/Uml2OpcuaTransformationTests/PropertyInherited.uml
new file mode 100644
index 0000000..03b099e
--- /dev/null
+++ b/Uml2OpcuaTransformationTests/PropertyInherited.uml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_Z9FNMP5FEeqcH6exUiFZNQ" name="PropertyInherited">
+  <packageImport xmi:type="uml:PackageImport" xmi:id="_aBXQQP5FEeqcH6exUiFZNQ">
+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+  </packageImport>
+  <packagedElement xmi:type="uml:Class" xmi:id="_bjo7UP5FEeqcH6exUiFZNQ" name="Robot">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_ARzq8DljEeuSk7aEnW8xTw" name="gripper1" type="_cGH9UP5FEeqcH6exUiFZNQ"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_cGH9UP5FEeqcH6exUiFZNQ" name="Gripper">
+    <generalization xmi:type="uml:Generalization" xmi:id="__zwWgJeoEeuABfhdgMwvaw" general="_9qHwgJeoEeuABfhdgMwvaw"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_9qHwgJeoEeuABfhdgMwvaw" name="Tool">
+    <ownedAttribute xmi:type="uml:Property" xmi:id="_DCuM4JepEeuABfhdgMwvaw" name="ToolId">
+      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
+    </ownedAttribute>
+  </packagedElement>
+</uml:Model>
diff --git a/Uml2OpcuaTransformationTests/PropertyInherited.xml b/Uml2OpcuaTransformationTests/PropertyInherited.xml
new file mode 100644
index 0000000..8070248
--- /dev/null
+++ b/Uml2OpcuaTransformationTests/PropertyInherited.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<UANodeSet xmlns="http://opcfoundation.org/UA/2011/03/UANodeSet.xsd">
+  <NamespaceUris>
+    <Uri>PropertyInherited</Uri>
+  </NamespaceUris>
+  <Aliases>
+    <Alias Alias="ModellingRule_Mandatory">i=78</Alias>
+    <Alias Alias="String">i=12</Alias>
+    <Alias Alias="HasTypeDefinition">i=40</Alias>
+    <Alias Alias="HasSubtype">i=45</Alias>
+    <Alias Alias="HasModellingRule">i=37</Alias>
+    <Alias Alias="HasComponent">i=47</Alias>
+    <Alias Alias="BaseDataVariableType">i=63</Alias>
+    <Alias Alias="BaseObjectType">i=58</Alias>
+  </Aliases>
+  <UAVariable BrowseName="ToolId" NodeId="ns=1;i=1001" ParentNodeId="ns=1;i=1000" DataType="String">
+    <DisplayName>ToolId</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">BaseDataVariableType</Reference>
+      <Reference ReferenceType="HasModellingRule">ModellingRule_Mandatory</Reference>
+      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;i=1000</Reference>
+    </References>
+  </UAVariable>
+  <UAVariable BrowseName="ToolId" NodeId="ns=1;i=1003" ParentNodeId="ns=1;i=1002" DataType="String">
+    <DisplayName>ToolId</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">BaseDataVariableType</Reference>
+      <Reference ReferenceType="HasModellingRule">ModellingRule_Mandatory</Reference>
+      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;i=1002</Reference>
+    </References>
+  </UAVariable>
+  <UAObject BrowseName="gripper1" NodeId="ns=1;i=1005" ParentNodeId="ns=1;i=1004">
+    <DisplayName>gripper1</DisplayName>
+    <References>
+      <Reference ReferenceType="HasTypeDefinition">ns=1;i=1002</Reference>
+      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;i=1004</Reference>
+      <Reference ReferenceType="HasModellingRule">ModellingRule_Mandatory</Reference>
+    </References>
+  </UAObject>
+  <UAObjectType BrowseName="RobotType" NodeId="ns=1;i=1004">
+    <DisplayName>RobotType</DisplayName>
+    <References>
+      <Reference IsForward="false" ReferenceType="HasSubtype">BaseObjectType</Reference>
+      <Reference ReferenceType="HasComponent">ns=1;i=1005</Reference>
+    </References>
+  </UAObjectType>
+  <UAObjectType BrowseName="GripperType" NodeId="ns=1;i=1002">
+    <DisplayName>GripperType</DisplayName>
+    <References>
+      <Reference IsForward="false" ReferenceType="HasSubtype">ns=1;i=1000</Reference>
+      <Reference ReferenceType="HasComponent">ns=1;i=1003</Reference>
+    </References>
+  </UAObjectType>
+  <UAObjectType BrowseName="ToolType" NodeId="ns=1;i=1000">
+    <DisplayName>ToolType</DisplayName>
+    <References>
+      <Reference IsForward="false" ReferenceType="HasSubtype">BaseObjectType</Reference>
+      <Reference ReferenceType="HasComponent">ns=1;i=1001</Reference>
+    </References>
+  </UAObjectType>
+</UANodeSet>
\ No newline at end of file
diff --git a/Uml2OpcuaTransformationTests/PropertyInteger.xml b/Uml2OpcuaTransformationTests/PropertyInteger.xml
index d7a9153..289f3ed 100644
--- a/Uml2OpcuaTransformationTests/PropertyInteger.xml
+++ b/Uml2OpcuaTransformationTests/PropertyInteger.xml
@@ -4,27 +4,28 @@
     <Uri>Class</Uri>
   </NamespaceUris>
   <Aliases>
-    <Alias Alias="HasTypeDefinition">i=40</Alias>
     <Alias Alias="HasModellingRule">i=37</Alias>
-    <Alias Alias="ModellingRule_Mandatory">i=78</Alias>
-    <Alias Alias="BaseObjectType">i=58</Alias>
+    <Alias Alias="Int32">i=6</Alias>
     <Alias Alias="HasSubtype">i=45</Alias>
+    <Alias Alias="HasTypeDefinition">i=40</Alias>
+    <Alias Alias="BaseObjectType">i=58</Alias>
     <Alias Alias="HasComponent">i=47</Alias>
-    <Alias Alias="BaseDataVariableType"/>
+    <Alias Alias="ModellingRule_Mandatory">i=78</Alias>
+    <Alias Alias="BaseDataVariableType">i=63</Alias>
   </Aliases>
-  <UAVariable BrowseName="Property1" NodeId="ns=1;s=Property1" ParentNodeId="ns=1;s=Class2Type" DataType="Int32">
+  <UAVariable BrowseName="Property1" NodeId="ns=1;i=1" ParentNodeId="ns=1;i=0" DataType="Int32">
     <DisplayName>Property1</DisplayName>
     <References>
       <Reference ReferenceType="HasTypeDefinition">BaseDataVariableType</Reference>
       <Reference ReferenceType="HasModellingRule">ModellingRule_Mandatory</Reference>
-      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;s=Class2Type</Reference>
+      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;i=0</Reference>
     </References>
   </UAVariable>
-  <UAObjectType BrowseName="Class2Type" NodeId="ns=1;s=Class2Type">
+  <UAObjectType BrowseName="Class2Type" NodeId="ns=1;i=0">
     <DisplayName>Class2Type</DisplayName>
     <References>
       <Reference IsForward="false" ReferenceType="HasSubtype">BaseObjectType</Reference>
-      <Reference ReferenceType="HasComponent">ns=1;s=Property1</Reference>
+      <Reference ReferenceType="HasComponent">ns=1;i=1</Reference>
     </References>
   </UAObjectType>
 </UANodeSet>
\ No newline at end of file
diff --git a/Uml2OpcuaTransformationTests/PropertyString.xml b/Uml2OpcuaTransformationTests/PropertyString.xml
index 40b6fca..0392779 100644
--- a/Uml2OpcuaTransformationTests/PropertyString.xml
+++ b/Uml2OpcuaTransformationTests/PropertyString.xml
@@ -4,28 +4,28 @@
     <Uri>PropertyString</Uri>
   </NamespaceUris>
   <Aliases>
+    <Alias Alias="BaseDataVariableType">i=63</Alias>
+    <Alias Alias="BaseObjectType">i=58</Alias>
+    <Alias Alias="HasTypeDefinition">i=40</Alias>
+    <Alias Alias="HasComponent">i=47</Alias>
+    <Alias Alias="HasSubtype">i=45</Alias>
     <Alias Alias="ModellingRule_Mandatory">i=78</Alias>
     <Alias Alias="HasModellingRule">i=37</Alias>
-    <Alias Alias="HasSubtype">i=45</Alias>
     <Alias Alias="String">i=12</Alias>
-    <Alias Alias="HasComponent">i=47</Alias>
-    <Alias Alias="BaseDataVariableType">i=63</Alias>
-    <Alias Alias="HasTypeDefinition">i=40</Alias>
-    <Alias Alias="BaseObjectType">i=58</Alias>
   </Aliases>
-  <UAVariable BrowseName="Manufacturer" NodeId="ns=1;s=Manufacturer" ParentNodeId="ns=1;s=RobotType" DataType="String">
+  <UAVariable BrowseName="Manufacturer" NodeId="ns=1;i=1001" ParentNodeId="ns=1;i=1000" DataType="String">
     <DisplayName>Manufacturer</DisplayName>
     <References>
       <Reference ReferenceType="HasTypeDefinition">BaseDataVariableType</Reference>
       <Reference ReferenceType="HasModellingRule">ModellingRule_Mandatory</Reference>
-      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;s=RobotType</Reference>
+      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;i=1000</Reference>
     </References>
   </UAVariable>
-  <UAObjectType BrowseName="RobotType" NodeId="ns=1;s=RobotType">
+  <UAObjectType BrowseName="RobotType" NodeId="ns=1;i=1000">
     <DisplayName>RobotType</DisplayName>
     <References>
       <Reference IsForward="false" ReferenceType="HasSubtype">BaseObjectType</Reference>
-      <Reference ReferenceType="HasComponent">ns=1;s=Manufacturer</Reference>
+      <Reference ReferenceType="HasComponent">ns=1;i=1001</Reference>
     </References>
   </UAObjectType>
 </UANodeSet>
\ No newline at end of file
diff --git a/Uml2OpcuaTransformationTests/Transition.xml b/Uml2OpcuaTransformationTests/Transition.xml
index 8aff877..c11c358 100644
--- a/Uml2OpcuaTransformationTests/Transition.xml
+++ b/Uml2OpcuaTransformationTests/Transition.xml
@@ -4,53 +4,53 @@
     <Uri>StateMachine</Uri>
   </NamespaceUris>
   <Aliases>
-    <Alias Alias="ModellingRule_Mandatory">i=78</Alias>
-    <Alias Alias="HasModellingRule">i=37</Alias>
-    <Alias Alias="FiniteStateMachineType">i=2771</Alias>
     <Alias Alias="TransitionType">i=2310</Alias>
-    <Alias Alias="TransitionEventType">i=2311</Alias>
     <Alias Alias="StateType">i=2307</Alias>
-    <Alias Alias="HasTypeDefinition">i=40</Alias>
     <Alias Alias="HasComponent">i=47</Alias>
-    <Alias Alias="ToState">i=52</Alias>
-    <Alias Alias="HasEffect">i=54</Alias>
     <Alias Alias="FromState">i=51</Alias>
+    <Alias Alias="HasEffect">i=54</Alias>
     <Alias Alias="HasSubtype">i=45</Alias>
+    <Alias Alias="ModellingRule_Mandatory">i=78</Alias>
+    <Alias Alias="HasModellingRule">i=37</Alias>
+    <Alias Alias="HasTypeDefinition">i=40</Alias>
+    <Alias Alias="TransitionEventType">i=2311</Alias>
+    <Alias Alias="ToState">i=52</Alias>
+    <Alias Alias="FiniteStateMachineType">i=2771</Alias>
   </Aliases>
-  <UAObject BrowseName="State3" NodeId="ns=1;s=State3" ParentNodeId="ns=1;s=StateMachine4Type">
-    <DisplayName>State3</DisplayName>
+  <UAObject BrowseName="State2" NodeId="ns=1;i=1002" ParentNodeId="ns=1;i=1000">
+    <DisplayName>State2</DisplayName>
     <References>
       <Reference ReferenceType="HasTypeDefinition">StateType</Reference>
       <Reference ReferenceType="HasModellingRule">ModellingRule_Mandatory</Reference>
-      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;s=StateMachine4Type</Reference>
+      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;i=1000</Reference>
     </References>
   </UAObject>
-  <UAObject BrowseName="State2" NodeId="ns=1;s=State2" ParentNodeId="ns=1;s=StateMachine4Type">
-    <DisplayName>State2</DisplayName>
+  <UAObject BrowseName="State3" NodeId="ns=1;i=1001" ParentNodeId="ns=1;i=1000">
+    <DisplayName>State3</DisplayName>
     <References>
       <Reference ReferenceType="HasTypeDefinition">StateType</Reference>
       <Reference ReferenceType="HasModellingRule">ModellingRule_Mandatory</Reference>
-      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;s=StateMachine4Type</Reference>
+      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;i=1000</Reference>
     </References>
   </UAObject>
-  <UAObject BrowseName="myTransition" NodeId="ns=1;s=myTransition" ParentNodeId="ns=1;s=StateMachine4Type">
+  <UAObject BrowseName="myTransition" NodeId="ns=1;i=1003" ParentNodeId="ns=1;i=1000">
     <DisplayName>myTransition</DisplayName>
     <References>
       <Reference ReferenceType="HasTypeDefinition">TransitionType</Reference>
       <Reference ReferenceType="HasModellingRule">ModellingRule_Mandatory</Reference>
-      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;s=StateMachine4Type</Reference>
-      <Reference ReferenceType="FromState">ns=1;s=State2</Reference>
-      <Reference ReferenceType="ToState">ns=1;s=State3</Reference>
+      <Reference IsForward="false" ReferenceType="HasComponent">ns=1;i=1000</Reference>
+      <Reference ReferenceType="FromState">ns=1;i=1002</Reference>
+      <Reference ReferenceType="ToState">ns=1;i=1001</Reference>
       <Reference ReferenceType="HasEffect">TransitionEventType</Reference>
     </References>
   </UAObject>
-  <UAObjectType BrowseName="StateMachine4Type" NodeId="ns=1;s=StateMachine4Type">
+  <UAObjectType BrowseName="StateMachine4Type" NodeId="ns=1;i=1000">
     <DisplayName>StateMachine4Type</DisplayName>
     <References>
       <Reference IsForward="false" ReferenceType="HasSubtype">FiniteStateMachineType</Reference>
-      <Reference ReferenceType="HasComponent">ns=1;s=State3</Reference>
-      <Reference ReferenceType="HasComponent">ns=1;s=State2</Reference>
-      <Reference ReferenceType="HasComponent">ns=1;s=myTransition</Reference>
+      <Reference ReferenceType="HasComponent">ns=1;i=1001</Reference>
+      <Reference ReferenceType="HasComponent">ns=1;i=1002</Reference>
+      <Reference ReferenceType="HasComponent">ns=1;i=1003</Reference>
     </References>
   </UAObjectType>
 </UANodeSet>
\ No newline at end of file