diff --git a/metamodels/securecomponentuml_mof.xmi b/metamodels/securecomponentuml_mof.xmi
index 766ea39..10e9417 100644
--- a/metamodels/securecomponentuml_mof.xmi
+++ b/metamodels/securecomponentuml_mof.xmi
@@ -1,5 +1,5 @@
 <?xml version = '1.0' encoding = 'UTF-8' ?>
-<XMI xmi.version = '1.2' xmlns:Model = 'org.omg.xmi.namespace.Model' timestamp = 'Thu Dec 11 19:03:38 CET 2008'>
+<XMI xmi.version = '1.2' xmlns:Model = 'org.omg.xmi.namespace.Model' timestamp = 'Sat Jan 03 17:58:27 CET 2009'>
   <XMI.header>
     <XMI.documentation>
       <XMI.exporter>Netbeans XMI Writer</XMI.exporter>
@@ -693,7 +693,7 @@
         </Model:Tag>
         <Model:Tag xmi.id = 'a79' name = 'subactionsDefinition' annotation = ''
           tagId = 'subactionsDefinition'>
-          <Model:Tag.values>self.resource.attributes.action-&gt;select(name=&quot;read&quot;)-&gt;union(self.resource.associationEnds.association.ends-&gt;minus(self.resource.associationEnds).action-&gt;select(name=&quot;read&quot;))-&gt;union(self.resource.methods-&gt;select(query).action-&gt;select(name=&quot;execute&quot;))</Model:Tag.values>
+          <Model:Tag.values>self.resource.attributes.action-&gt;select(name=&quot;read&quot;)-&gt;union(self.resource.associationEnds.association.ends.action-&gt;select(name=&quot;read&quot;))-&gt;union(self.resource.methods-&gt;select(query).action-&gt;select(name=&quot;execute&quot;))</Model:Tag.values>
           <Model:Tag.elements>
             <Model:Class xmi.idref = 'a18'/>
           </Model:Tag.elements>
@@ -718,7 +718,7 @@
         </Model:Tag>
         <Model:Tag xmi.id = 'a83' name = 'subactionsDefinition' annotation = ''
           tagId = 'subactionsDefinition'>
-          <Model:Tag.values>self.resource.attributes.action-&gt;select(name=&quot;update&quot;)-&gt;union(resource.associationEnds.association.ends-&gt;minus(self.resource.associationEnds).action-&gt;select(name=&quot;update&quot;))-&gt;union(resource.methods-&gt;select(not query).action-&gt;select(name=&quot;execute&quot;))</Model:Tag.values>
+          <Model:Tag.values>self.resource.attributes.action-&gt;select(name=&quot;update&quot;)-&gt;union(resource.associationEnds.action-&gt;select(name=&quot;update&quot;))-&gt;union(resource.methods-&gt;select(not query).action-&gt;select(name=&quot;execute&quot;))</Model:Tag.values>
           <Model:Tag.elements>
             <Model:Class xmi.idref = 'a31'/>
           </Model:Tag.elements>
@@ -1086,19 +1086,7 @@
             <Model:Class xmi.id = 'a113' name = 'Resource' annotation = '' isRoot = 'false'
               isLeaf = 'false' isAbstract = 'false' visibility = 'public_vis' isSingleton = 'false'>
               <Model:Namespace.contents>
-                <Model:Attribute xmi.id = 'a128' name = 'name' annotation = '' scope = 'instance_level'
-                  visibility = 'public_vis' isChangeable = 'true' isDerived = 'false'>
-                  <Model:StructuralFeature.multiplicity>
-                    <XMI.field>1</XMI.field>
-                    <XMI.field>1</XMI.field>
-                    <XMI.field>false</XMI.field>
-                    <XMI.field>false</XMI.field>
-                  </Model:StructuralFeature.multiplicity>
-                  <Model:TypedElement.type>
-                    <Model:PrimitiveType xmi.idref = 'a7'/>
-                  </Model:TypedElement.type>
-                </Model:Attribute>
-                <Model:Reference xmi.id = 'a129' name = 'action' annotation = '' scope = 'instance_level'
+                <Model:Reference xmi.id = 'a128' name = 'action' annotation = '' scope = 'instance_level'
                   visibility = 'public_vis' isChangeable = 'true'>
                   <Model:StructuralFeature.multiplicity>
                     <XMI.field>0</XMI.field>
@@ -1115,11 +1103,11 @@
                 </Model:Reference>
               </Model:Namespace.contents>
             </Model:Class>
-            <Model:Association xmi.id = 'a130' name = 'ActionAssignment' annotation = ''
+            <Model:Association xmi.id = 'a129' name = 'ActionAssignment' annotation = ''
               isRoot = 'false' isLeaf = 'false' isAbstract = 'false' visibility = 'public_vis'
               isDerived = 'false'>
               <Model:Namespace.contents>
-                <Model:AssociationEnd xmi.id = 'a131' name = 'permission' annotation = ''
+                <Model:AssociationEnd xmi.id = 'a130' name = 'permission' annotation = ''
                   isNavigable = 'true' aggregation = 'none' isChangeable = 'true'>
                   <Model:AssociationEnd.multiplicity>
                     <XMI.field>0</XMI.field>
@@ -1131,7 +1119,7 @@
                     <Model:Class xmi.idref = 'a124'/>
                   </Model:TypedElement.type>
                 </Model:AssociationEnd>
-                <Model:AssociationEnd xmi.id = 'a132' name = 'action' annotation = '' isNavigable = 'true'
+                <Model:AssociationEnd xmi.id = 'a131' name = 'action' annotation = '' isNavigable = 'true'
                   aggregation = 'none' isChangeable = 'true'>
                   <Model:AssociationEnd.multiplicity>
                     <XMI.field>1</XMI.field>
@@ -1145,11 +1133,11 @@
                 </Model:AssociationEnd>
               </Model:Namespace.contents>
             </Model:Association>
-            <Model:Association xmi.id = 'a133' name = 'PermissionAssignment' annotation = ''
+            <Model:Association xmi.id = 'a132' name = 'PermissionAssignment' annotation = ''
               isRoot = 'false' isLeaf = 'false' isAbstract = 'false' visibility = 'public_vis'
               isDerived = 'false'>
               <Model:Namespace.contents>
-                <Model:AssociationEnd xmi.id = 'a134' name = 'role' annotation = '' isNavigable = 'true'
+                <Model:AssociationEnd xmi.id = 'a133' name = 'role' annotation = '' isNavigable = 'true'
                   aggregation = 'none' isChangeable = 'true'>
                   <Model:AssociationEnd.multiplicity>
                     <XMI.field>1</XMI.field>
@@ -1161,7 +1149,7 @@
                     <Model:Class xmi.idref = 'a98'/>
                   </Model:TypedElement.type>
                 </Model:AssociationEnd>
-                <Model:AssociationEnd xmi.id = 'a135' name = 'permission' annotation = ''
+                <Model:AssociationEnd xmi.id = 'a134' name = 'permission' annotation = ''
                   isNavigable = 'true' aggregation = 'none' isChangeable = 'true'>
                   <Model:AssociationEnd.multiplicity>
                     <XMI.field>0</XMI.field>
@@ -1178,7 +1166,7 @@
             <Model:Class xmi.id = 'a124' name = 'Permission' annotation = '' isRoot = 'false'
               isLeaf = 'false' isAbstract = 'false' visibility = 'public_vis' isSingleton = 'false'>
               <Model:Namespace.contents>
-                <Model:Attribute xmi.id = 'a136' name = 'name' annotation = '' scope = 'instance_level'
+                <Model:Attribute xmi.id = 'a135' name = 'name' annotation = '' scope = 'instance_level'
                   visibility = 'public_vis' isChangeable = 'true' isDerived = 'false'>
                   <Model:StructuralFeature.multiplicity>
                     <XMI.field>1</XMI.field>
@@ -1190,7 +1178,7 @@
                     <Model:PrimitiveType xmi.idref = 'a7'/>
                   </Model:TypedElement.type>
                 </Model:Attribute>
-                <Model:Reference xmi.id = 'a137' name = 'authorizationConstraint' annotation = ''
+                <Model:Reference xmi.id = 'a136' name = 'authorizationConstraint' annotation = ''
                   scope = 'instance_level' visibility = 'public_vis' isChangeable = 'true'>
                   <Model:StructuralFeature.multiplicity>
                     <XMI.field>0</XMI.field>
@@ -1205,6 +1193,21 @@
                     <Model:AssociationEnd xmi.idref = 'a121'/>
                   </Model:Reference.referencedEnd>
                 </Model:Reference>
+                <Model:Reference xmi.id = 'a137' name = 'action' annotation = '' scope = 'instance_level'
+                  visibility = 'public_vis' isChangeable = 'true'>
+                  <Model:StructuralFeature.multiplicity>
+                    <XMI.field>1</XMI.field>
+                    <XMI.field>1</XMI.field>
+                    <XMI.field>false</XMI.field>
+                    <XMI.field>true</XMI.field>
+                  </Model:StructuralFeature.multiplicity>
+                  <Model:TypedElement.type>
+                    <Model:Class xmi.idref = 'a115'/>
+                  </Model:TypedElement.type>
+                  <Model:Reference.referencedEnd>
+                    <Model:AssociationEnd xmi.idref = 'a131'/>
+                  </Model:Reference.referencedEnd>
+                </Model:Reference>
                 <Model:Reference xmi.id = 'a138' name = 'role' annotation = '' scope = 'instance_level'
                   visibility = 'public_vis' isChangeable = 'true'>
                   <Model:StructuralFeature.multiplicity>
@@ -1217,22 +1220,7 @@
                     <Model:Class xmi.idref = 'a98'/>
                   </Model:TypedElement.type>
                   <Model:Reference.referencedEnd>
-                    <Model:AssociationEnd xmi.idref = 'a134'/>
-                  </Model:Reference.referencedEnd>
-                </Model:Reference>
-                <Model:Reference xmi.id = 'a139' name = 'action' annotation = '' scope = 'instance_level'
-                  visibility = 'public_vis' isChangeable = 'true'>
-                  <Model:StructuralFeature.multiplicity>
-                    <XMI.field>1</XMI.field>
-                    <XMI.field>1</XMI.field>
-                    <XMI.field>false</XMI.field>
-                    <XMI.field>true</XMI.field>
-                  </Model:StructuralFeature.multiplicity>
-                  <Model:TypedElement.type>
-                    <Model:Class xmi.idref = 'a115'/>
-                  </Model:TypedElement.type>
-                  <Model:Reference.referencedEnd>
-                    <Model:AssociationEnd xmi.idref = 'a132'/>
+                    <Model:AssociationEnd xmi.idref = 'a133'/>
                   </Model:Reference.referencedEnd>
                 </Model:Reference>
               </Model:Namespace.contents>
@@ -1240,7 +1228,7 @@
             <Model:Class xmi.id = 'a115' name = 'Action' annotation = '' isRoot = 'false'
               isLeaf = 'false' isAbstract = 'false' visibility = 'public_vis' isSingleton = 'false'>
               <Model:Namespace.contents>
-                <Model:Attribute xmi.id = 'a140' name = 'name' annotation = '' scope = 'instance_level'
+                <Model:Attribute xmi.id = 'a139' name = 'name' annotation = '' scope = 'instance_level'
                   visibility = 'public_vis' isChangeable = 'true' isDerived = 'false'>
                   <Model:StructuralFeature.multiplicity>
                     <XMI.field>1</XMI.field>
@@ -1252,22 +1240,7 @@
                     <Model:PrimitiveType xmi.idref = 'a7'/>
                   </Model:TypedElement.type>
                 </Model:Attribute>
-                <Model:Reference xmi.id = 'a141' name = 'resource' annotation = '' scope = 'instance_level'
-                  visibility = 'public_vis' isChangeable = 'true'>
-                  <Model:StructuralFeature.multiplicity>
-                    <XMI.field>1</XMI.field>
-                    <XMI.field>1</XMI.field>
-                    <XMI.field>false</XMI.field>
-                    <XMI.field>true</XMI.field>
-                  </Model:StructuralFeature.multiplicity>
-                  <Model:TypedElement.type>
-                    <Model:Class xmi.idref = 'a113'/>
-                  </Model:TypedElement.type>
-                  <Model:Reference.referencedEnd>
-                    <Model:AssociationEnd xmi.idref = 'a112'/>
-                  </Model:Reference.referencedEnd>
-                </Model:Reference>
-                <Model:Reference xmi.id = 'a142' name = 'superactions' annotation = '' scope = 'instance_level'
+                <Model:Reference xmi.id = 'a140' name = 'superactions' annotation = '' scope = 'instance_level'
                   visibility = 'public_vis' isChangeable = 'true'>
                   <Model:StructuralFeature.multiplicity>
                     <XMI.field>0</XMI.field>
@@ -1282,7 +1255,7 @@
                     <Model:AssociationEnd xmi.idref = 'a117'/>
                   </Model:Reference.referencedEnd>
                 </Model:Reference>
-                <Model:Reference xmi.id = 'a143' name = 'permission' annotation = '' scope = 'instance_level'
+                <Model:Reference xmi.id = 'a141' name = 'permission' annotation = '' scope = 'instance_level'
                   visibility = 'public_vis' isChangeable = 'true'>
                   <Model:StructuralFeature.multiplicity>
                     <XMI.field>0</XMI.field>
@@ -1294,7 +1267,22 @@
                     <Model:Class xmi.idref = 'a124'/>
                   </Model:TypedElement.type>
                   <Model:Reference.referencedEnd>
-                    <Model:AssociationEnd xmi.idref = 'a131'/>
+                    <Model:AssociationEnd xmi.idref = 'a130'/>
+                  </Model:Reference.referencedEnd>
+                </Model:Reference>
+                <Model:Reference xmi.id = 'a142' name = 'resource' annotation = '' scope = 'instance_level'
+                  visibility = 'public_vis' isChangeable = 'true'>
+                  <Model:StructuralFeature.multiplicity>
+                    <XMI.field>1</XMI.field>
+                    <XMI.field>1</XMI.field>
+                    <XMI.field>false</XMI.field>
+                    <XMI.field>true</XMI.field>
+                  </Model:StructuralFeature.multiplicity>
+                  <Model:TypedElement.type>
+                    <Model:Class xmi.idref = 'a113'/>
+                  </Model:TypedElement.type>
+                  <Model:Reference.referencedEnd>
+                    <Model:AssociationEnd xmi.idref = 'a112'/>
                   </Model:Reference.referencedEnd>
                 </Model:Reference>
               </Model:Namespace.contents>
@@ -1302,7 +1290,7 @@
             <Model:Class xmi.id = 'a98' name = 'Role' annotation = '' isRoot = 'false'
               isLeaf = 'false' isAbstract = 'false' visibility = 'public_vis' isSingleton = 'false'>
               <Model:Namespace.contents>
-                <Model:Attribute xmi.id = 'a144' name = 'name' annotation = '' scope = 'instance_level'
+                <Model:Attribute xmi.id = 'a143' name = 'name' annotation = '' scope = 'instance_level'
                   visibility = 'public_vis' isChangeable = 'true' isDerived = 'false'>
                   <Model:StructuralFeature.multiplicity>
                     <XMI.field>1</XMI.field>
@@ -1314,7 +1302,7 @@
                     <Model:PrimitiveType xmi.idref = 'a7'/>
                   </Model:TypedElement.type>
                 </Model:Attribute>
-                <Model:Reference xmi.id = 'a145' name = 'permission' annotation = '' scope = 'instance_level'
+                <Model:Reference xmi.id = 'a144' name = 'permission' annotation = '' scope = 'instance_level'
                   visibility = 'public_vis' isChangeable = 'true'>
                   <Model:StructuralFeature.multiplicity>
                     <XMI.field>0</XMI.field>
@@ -1326,7 +1314,22 @@
                     <Model:Class xmi.idref = 'a124'/>
                   </Model:TypedElement.type>
                   <Model:Reference.referencedEnd>
-                    <Model:AssociationEnd xmi.idref = 'a135'/>
+                    <Model:AssociationEnd xmi.idref = 'a134'/>
+                  </Model:Reference.referencedEnd>
+                </Model:Reference>
+                <Model:Reference xmi.id = 'a145' name = 'subroles' annotation = '' scope = 'instance_level'
+                  visibility = 'public_vis' isChangeable = 'true'>
+                  <Model:StructuralFeature.multiplicity>
+                    <XMI.field>0</XMI.field>
+                    <XMI.field>-1</XMI.field>
+                    <XMI.field>false</XMI.field>
+                    <XMI.field>true</XMI.field>
+                  </Model:StructuralFeature.multiplicity>
+                  <Model:TypedElement.type>
+                    <Model:Class xmi.idref = 'a98'/>
+                  </Model:TypedElement.type>
+                  <Model:Reference.referencedEnd>
+                    <Model:AssociationEnd xmi.idref = 'a97'/>
                   </Model:Reference.referencedEnd>
                 </Model:Reference>
                 <Model:Reference xmi.id = 'a146' name = 'superroles' annotation = '' scope = 'instance_level'
@@ -1344,22 +1347,7 @@
                     <Model:AssociationEnd xmi.idref = 'a99'/>
                   </Model:Reference.referencedEnd>
                 </Model:Reference>
-                <Model:Reference xmi.id = 'a147' name = 'subroles' annotation = '' scope = 'instance_level'
-                  visibility = 'public_vis' isChangeable = 'true'>
-                  <Model:StructuralFeature.multiplicity>
-                    <XMI.field>0</XMI.field>
-                    <XMI.field>-1</XMI.field>
-                    <XMI.field>false</XMI.field>
-                    <XMI.field>true</XMI.field>
-                  </Model:StructuralFeature.multiplicity>
-                  <Model:TypedElement.type>
-                    <Model:Class xmi.idref = 'a98'/>
-                  </Model:TypedElement.type>
-                  <Model:Reference.referencedEnd>
-                    <Model:AssociationEnd xmi.idref = 'a97'/>
-                  </Model:Reference.referencedEnd>
-                </Model:Reference>
-                <Model:Reference xmi.id = 'a148' name = 'subject' annotation = '' scope = 'instance_level'
+                <Model:Reference xmi.id = 'a147' name = 'subject' annotation = '' scope = 'instance_level'
                   visibility = 'public_vis' isChangeable = 'true'>
                   <Model:StructuralFeature.multiplicity>
                     <XMI.field>0</XMI.field>
@@ -1378,21 +1366,21 @@
             </Model:Class>
           </Model:Namespace.contents>
         </Model:Package>
-        <Model:Tag xmi.id = 'a149' name = 'javax.jmi.packagePrefix' annotation = ''
+        <Model:Tag xmi.id = 'a148' name = 'javax.jmi.packagePrefix' annotation = ''
           tagId = 'javax.jmi.packagePrefix'>
           <Model:Tag.values>ch.ethz.infsec.secureuml</Model:Tag.values>
           <Model:Tag.elements>
             <Model:Package xmi.idref = 'a95'/>
           </Model:Tag.elements>
         </Model:Tag>
-        <Model:Package xmi.id = 'a150' name = 'ComponentUml' annotation = '' isRoot = 'false'
+        <Model:Package xmi.id = 'a149' name = 'ComponentUml' annotation = '' isRoot = 'false'
           isLeaf = 'false' isAbstract = 'false' visibility = 'public_vis'>
           <Model:Namespace.contents>
-            <Model:Association xmi.id = 'a151' name = 'EntityMethod' annotation = ''
+            <Model:Association xmi.id = 'a150' name = 'EntityMethod' annotation = ''
               isRoot = 'false' isLeaf = 'false' isAbstract = 'false' visibility = 'public_vis'
               isDerived = 'false'>
               <Model:Namespace.contents>
-                <Model:AssociationEnd xmi.id = 'a152' name = 'entity' annotation = '' isNavigable = 'true'
+                <Model:AssociationEnd xmi.id = 'a151' name = 'entity' annotation = '' isNavigable = 'true'
                   aggregation = 'none' isChangeable = 'true'>
                   <Model:AssociationEnd.multiplicity>
                     <XMI.field>1</XMI.field>
@@ -1404,7 +1392,7 @@
                     <Model:Class xmi.idref = 'a15'/>
                   </Model:TypedElement.type>
                 </Model:AssociationEnd>
-                <Model:AssociationEnd xmi.id = 'a153' name = 'methods' annotation = '' isNavigable = 'true'
+                <Model:AssociationEnd xmi.id = 'a152' name = 'methods' annotation = '' isNavigable = 'true'
                   aggregation = 'none' isChangeable = 'true'>
                   <Model:AssociationEnd.multiplicity>
                     <XMI.field>0</XMI.field>
@@ -1418,11 +1406,11 @@
                 </Model:AssociationEnd>
               </Model:Namespace.contents>
             </Model:Association>
-            <Model:Association xmi.id = 'a154' name = 'EntityAttribute' annotation = ''
+            <Model:Association xmi.id = 'a153' name = 'EntityAttribute' annotation = ''
               isRoot = 'false' isLeaf = 'false' isAbstract = 'false' visibility = 'public_vis'
               isDerived = 'false'>
               <Model:Namespace.contents>
-                <Model:AssociationEnd xmi.id = 'a155' name = 'entity' annotation = '' isNavigable = 'true'
+                <Model:AssociationEnd xmi.id = 'a154' name = 'entity' annotation = '' isNavigable = 'true'
                   aggregation = 'none' isChangeable = 'true'>
                   <Model:AssociationEnd.multiplicity>
                     <XMI.field>1</XMI.field>
@@ -1434,7 +1422,7 @@
                     <Model:Class xmi.idref = 'a15'/>
                   </Model:TypedElement.type>
                 </Model:AssociationEnd>
-                <Model:AssociationEnd xmi.id = 'a156' name = 'attributes' annotation = ''
+                <Model:AssociationEnd xmi.id = 'a155' name = 'attributes' annotation = ''
                   isNavigable = 'true' aggregation = 'none' isChangeable = 'true'>
                   <Model:AssociationEnd.multiplicity>
                     <XMI.field>0</XMI.field>
@@ -1448,11 +1436,11 @@
                 </Model:AssociationEnd>
               </Model:Namespace.contents>
             </Model:Association>
-            <Model:Association xmi.id = 'a157' name = 'AssociationEndAssociation' annotation = ''
+            <Model:Association xmi.id = 'a156' name = 'AssociationEndAssociation' annotation = ''
               isRoot = 'false' isLeaf = 'false' isAbstract = 'false' visibility = 'public_vis'
               isDerived = 'false'>
               <Model:Namespace.contents>
-                <Model:AssociationEnd xmi.id = 'a158' name = 'ends' annotation = '' isNavigable = 'true'
+                <Model:AssociationEnd xmi.id = 'a157' name = 'ends' annotation = '' isNavigable = 'true'
                   aggregation = 'none' isChangeable = 'true'>
                   <Model:AssociationEnd.multiplicity>
                     <XMI.field>2</XMI.field>
@@ -1464,7 +1452,7 @@
                     <Model:Class xmi.idref = 'a43'/>
                   </Model:TypedElement.type>
                 </Model:AssociationEnd>
-                <Model:AssociationEnd xmi.id = 'a159' name = 'association' annotation = ''
+                <Model:AssociationEnd xmi.id = 'a158' name = 'association' annotation = ''
                   isNavigable = 'true' aggregation = 'none' isChangeable = 'true'>
                   <Model:AssociationEnd.multiplicity>
                     <XMI.field>1</XMI.field>
@@ -1473,16 +1461,16 @@
                     <XMI.field>true</XMI.field>
                   </Model:AssociationEnd.multiplicity>
                   <Model:TypedElement.type>
-                    <Model:Class xmi.idref = 'a160'/>
+                    <Model:Class xmi.idref = 'a159'/>
                   </Model:TypedElement.type>
                 </Model:AssociationEnd>
               </Model:Namespace.contents>
             </Model:Association>
-            <Model:Association xmi.id = 'a161' name = 'EntityAssociationEnd' annotation = ''
+            <Model:Association xmi.id = 'a160' name = 'EntityAssociationEnd' annotation = ''
               isRoot = 'false' isLeaf = 'false' isAbstract = 'false' visibility = 'public_vis'
               isDerived = 'false'>
               <Model:Namespace.contents>
-                <Model:AssociationEnd xmi.id = 'a162' name = 'type' annotation = '' isNavigable = 'true'
+                <Model:AssociationEnd xmi.id = 'a161' name = 'type' annotation = '' isNavigable = 'true'
                   aggregation = 'none' isChangeable = 'true'>
                   <Model:AssociationEnd.multiplicity>
                     <XMI.field>1</XMI.field>
@@ -1494,7 +1482,7 @@
                     <Model:Class xmi.idref = 'a15'/>
                   </Model:TypedElement.type>
                 </Model:AssociationEnd>
-                <Model:AssociationEnd xmi.id = 'a163' name = 'associationEnds' annotation = ''
+                <Model:AssociationEnd xmi.id = 'a162' name = 'associationEnds' annotation = ''
                   isNavigable = 'true' aggregation = 'none' isChangeable = 'true'>
                   <Model:AssociationEnd.multiplicity>
                     <XMI.field>0</XMI.field>
@@ -1511,6 +1499,18 @@
             <Model:Class xmi.id = 'a75' name = 'Method' annotation = '' isRoot = 'false'
               isLeaf = 'false' isAbstract = 'false' visibility = 'public_vis' isSingleton = 'false'>
               <Model:Namespace.contents>
+                <Model:Attribute xmi.id = 'a163' name = 'name' annotation = '' scope = 'instance_level'
+                  visibility = 'public_vis' isChangeable = 'true' isDerived = 'false'>
+                  <Model:StructuralFeature.multiplicity>
+                    <XMI.field>1</XMI.field>
+                    <XMI.field>1</XMI.field>
+                    <XMI.field>false</XMI.field>
+                    <XMI.field>false</XMI.field>
+                  </Model:StructuralFeature.multiplicity>
+                  <Model:TypedElement.type>
+                    <Model:PrimitiveType xmi.idref = 'a7'/>
+                  </Model:TypedElement.type>
+                </Model:Attribute>
                 <Model:Attribute xmi.id = 'a164' name = 'query' annotation = '' scope = 'instance_level'
                   visibility = 'public_vis' isChangeable = 'true' isDerived = 'false'>
                   <Model:StructuralFeature.multiplicity>
@@ -1535,7 +1535,7 @@
                     <Model:Class xmi.idref = 'a15'/>
                   </Model:TypedElement.type>
                   <Model:Reference.referencedEnd>
-                    <Model:AssociationEnd xmi.idref = 'a152'/>
+                    <Model:AssociationEnd xmi.idref = 'a151'/>
                   </Model:Reference.referencedEnd>
                 </Model:Reference>
                 <Model:Reference xmi.id = 'a166' name = 'execute' annotation = '' scope = 'instance_level'
@@ -1561,21 +1561,18 @@
             <Model:Class xmi.id = 'a59' name = 'Attribute' annotation = '' isRoot = 'false'
               isLeaf = 'false' isAbstract = 'false' visibility = 'public_vis' isSingleton = 'false'>
               <Model:Namespace.contents>
-                <Model:Reference xmi.id = 'a167' name = 'update' annotation = '' scope = 'instance_level'
-                  visibility = 'public_vis' isChangeable = 'true'>
+                <Model:Attribute xmi.id = 'a167' name = 'name' annotation = '' scope = 'instance_level'
+                  visibility = 'public_vis' isChangeable = 'true' isDerived = 'false'>
                   <Model:StructuralFeature.multiplicity>
                     <XMI.field>1</XMI.field>
                     <XMI.field>1</XMI.field>
                     <XMI.field>false</XMI.field>
-                    <XMI.field>true</XMI.field>
+                    <XMI.field>false</XMI.field>
                   </Model:StructuralFeature.multiplicity>
                   <Model:TypedElement.type>
-                    <Model:Class xmi.idref = 'a62'/>
+                    <Model:PrimitiveType xmi.idref = 'a7'/>
                   </Model:TypedElement.type>
-                  <Model:Reference.referencedEnd>
-                    <Model:AssociationEnd xmi.idref = 'a61'/>
-                  </Model:Reference.referencedEnd>
-                </Model:Reference>
+                </Model:Attribute>
                 <Model:Reference xmi.id = 'a168' name = 'read' annotation = '' scope = 'instance_level'
                   visibility = 'public_vis' isChangeable = 'true'>
                   <Model:StructuralFeature.multiplicity>
@@ -1591,7 +1588,22 @@
                     <Model:AssociationEnd xmi.idref = 'a56'/>
                   </Model:Reference.referencedEnd>
                 </Model:Reference>
-                <Model:Reference xmi.id = 'a169' name = 'fullAccess' annotation = '' scope = 'instance_level'
+                <Model:Reference xmi.id = 'a169' name = 'update' annotation = '' scope = 'instance_level'
+                  visibility = 'public_vis' isChangeable = 'true'>
+                  <Model:StructuralFeature.multiplicity>
+                    <XMI.field>1</XMI.field>
+                    <XMI.field>1</XMI.field>
+                    <XMI.field>false</XMI.field>
+                    <XMI.field>true</XMI.field>
+                  </Model:StructuralFeature.multiplicity>
+                  <Model:TypedElement.type>
+                    <Model:Class xmi.idref = 'a62'/>
+                  </Model:TypedElement.type>
+                  <Model:Reference.referencedEnd>
+                    <Model:AssociationEnd xmi.idref = 'a61'/>
+                  </Model:Reference.referencedEnd>
+                </Model:Reference>
+                <Model:Reference xmi.id = 'a170' name = 'fullAccess' annotation = '' scope = 'instance_level'
                   visibility = 'public_vis' isChangeable = 'true'>
                   <Model:StructuralFeature.multiplicity>
                     <XMI.field>1</XMI.field>
@@ -1606,7 +1618,7 @@
                     <Model:AssociationEnd xmi.idref = 'a66'/>
                   </Model:Reference.referencedEnd>
                 </Model:Reference>
-                <Model:Reference xmi.id = 'a170' name = 'entity' annotation = '' scope = 'instance_level'
+                <Model:Reference xmi.id = 'a171' name = 'entity' annotation = '' scope = 'instance_level'
                   visibility = 'public_vis' isChangeable = 'true'>
                   <Model:StructuralFeature.multiplicity>
                     <XMI.field>1</XMI.field>
@@ -1618,7 +1630,7 @@
                     <Model:Class xmi.idref = 'a15'/>
                   </Model:TypedElement.type>
                   <Model:Reference.referencedEnd>
-                    <Model:AssociationEnd xmi.idref = 'a155'/>
+                    <Model:AssociationEnd xmi.idref = 'a154'/>
                   </Model:Reference.referencedEnd>
                 </Model:Reference>
               </Model:Namespace.contents>
@@ -1626,10 +1638,10 @@
                 <Model:Class xmi.idref = 'a113'/>
               </Model:GeneralizableElement.supertypes>
             </Model:Class>
-            <Model:Class xmi.id = 'a160' name = 'Association' annotation = '' isRoot = 'false'
+            <Model:Class xmi.id = 'a159' name = 'Association' annotation = '' isRoot = 'false'
               isLeaf = 'false' isAbstract = 'false' visibility = 'public_vis' isSingleton = 'false'>
               <Model:Namespace.contents>
-                <Model:Attribute xmi.id = 'a171' name = 'name' annotation = '' scope = 'instance_level'
+                <Model:Attribute xmi.id = 'a172' name = 'name' annotation = '' scope = 'instance_level'
                   visibility = 'public_vis' isChangeable = 'true' isDerived = 'false'>
                   <Model:StructuralFeature.multiplicity>
                     <XMI.field>1</XMI.field>
@@ -1641,7 +1653,7 @@
                     <Model:PrimitiveType xmi.idref = 'a7'/>
                   </Model:TypedElement.type>
                 </Model:Attribute>
-                <Model:Reference xmi.id = 'a172' name = 'ends' annotation = '' scope = 'instance_level'
+                <Model:Reference xmi.id = 'a173' name = 'ends' annotation = '' scope = 'instance_level'
                   visibility = 'public_vis' isChangeable = 'true'>
                   <Model:StructuralFeature.multiplicity>
                     <XMI.field>2</XMI.field>
@@ -1653,7 +1665,7 @@
                     <Model:Class xmi.idref = 'a43'/>
                   </Model:TypedElement.type>
                   <Model:Reference.referencedEnd>
-                    <Model:AssociationEnd xmi.idref = 'a158'/>
+                    <Model:AssociationEnd xmi.idref = 'a157'/>
                   </Model:Reference.referencedEnd>
                 </Model:Reference>
               </Model:Namespace.contents>
@@ -1661,22 +1673,19 @@
             <Model:Class xmi.id = 'a43' name = 'AssociationEnd' annotation = '' isRoot = 'false'
               isLeaf = 'false' isAbstract = 'false' visibility = 'public_vis' isSingleton = 'false'>
               <Model:Namespace.contents>
-                <Model:Reference xmi.id = 'a173' name = 'type' annotation = '' scope = 'instance_level'
-                  visibility = 'public_vis' isChangeable = 'true'>
+                <Model:Attribute xmi.id = 'a174' name = 'name' annotation = '' scope = 'instance_level'
+                  visibility = 'public_vis' isChangeable = 'true' isDerived = 'false'>
                   <Model:StructuralFeature.multiplicity>
                     <XMI.field>1</XMI.field>
                     <XMI.field>1</XMI.field>
                     <XMI.field>false</XMI.field>
-                    <XMI.field>true</XMI.field>
+                    <XMI.field>false</XMI.field>
                   </Model:StructuralFeature.multiplicity>
                   <Model:TypedElement.type>
-                    <Model:Class xmi.idref = 'a15'/>
+                    <Model:PrimitiveType xmi.idref = 'a7'/>
                   </Model:TypedElement.type>
-                  <Model:Reference.referencedEnd>
-                    <Model:AssociationEnd xmi.idref = 'a162'/>
-                  </Model:Reference.referencedEnd>
-                </Model:Reference>
-                <Model:Reference xmi.id = 'a174' name = 'update' annotation = '' scope = 'instance_level'
+                </Model:Attribute>
+                <Model:Reference xmi.id = 'a175' name = 'update' annotation = '' scope = 'instance_level'
                   visibility = 'public_vis' isChangeable = 'true'>
                   <Model:StructuralFeature.multiplicity>
                     <XMI.field>1</XMI.field>
@@ -1691,7 +1700,37 @@
                     <Model:AssociationEnd xmi.idref = 'a51'/>
                   </Model:Reference.referencedEnd>
                 </Model:Reference>
-                <Model:Reference xmi.id = 'a175' name = 'read' annotation = '' scope = 'instance_level'
+                <Model:Reference xmi.id = 'a176' name = 'association' annotation = '' scope = 'instance_level'
+                  visibility = 'public_vis' isChangeable = 'true'>
+                  <Model:StructuralFeature.multiplicity>
+                    <XMI.field>1</XMI.field>
+                    <XMI.field>1</XMI.field>
+                    <XMI.field>false</XMI.field>
+                    <XMI.field>true</XMI.field>
+                  </Model:StructuralFeature.multiplicity>
+                  <Model:TypedElement.type>
+                    <Model:Class xmi.idref = 'a159'/>
+                  </Model:TypedElement.type>
+                  <Model:Reference.referencedEnd>
+                    <Model:AssociationEnd xmi.idref = 'a158'/>
+                  </Model:Reference.referencedEnd>
+                </Model:Reference>
+                <Model:Reference xmi.id = 'a177' name = 'type' annotation = '' scope = 'instance_level'
+                  visibility = 'public_vis' isChangeable = 'true'>
+                  <Model:StructuralFeature.multiplicity>
+                    <XMI.field>1</XMI.field>
+                    <XMI.field>1</XMI.field>
+                    <XMI.field>false</XMI.field>
+                    <XMI.field>true</XMI.field>
+                  </Model:StructuralFeature.multiplicity>
+                  <Model:TypedElement.type>
+                    <Model:Class xmi.idref = 'a15'/>
+                  </Model:TypedElement.type>
+                  <Model:Reference.referencedEnd>
+                    <Model:AssociationEnd xmi.idref = 'a161'/>
+                  </Model:Reference.referencedEnd>
+                </Model:Reference>
+                <Model:Reference xmi.id = 'a178' name = 'read' annotation = '' scope = 'instance_level'
                   visibility = 'public_vis' isChangeable = 'true'>
                   <Model:StructuralFeature.multiplicity>
                     <XMI.field>1</XMI.field>
@@ -1706,7 +1745,7 @@
                     <Model:AssociationEnd xmi.idref = 'a45'/>
                   </Model:Reference.referencedEnd>
                 </Model:Reference>
-                <Model:Reference xmi.id = 'a176' name = 'fullAccess' annotation = '' scope = 'instance_level'
+                <Model:Reference xmi.id = 'a179' name = 'fullAccess' annotation = '' scope = 'instance_level'
                   visibility = 'public_vis' isChangeable = 'true'>
                   <Model:StructuralFeature.multiplicity>
                     <XMI.field>1</XMI.field>
@@ -1721,21 +1760,6 @@
                     <Model:AssociationEnd xmi.idref = 'a40'/>
                   </Model:Reference.referencedEnd>
                 </Model:Reference>
-                <Model:Reference xmi.id = 'a177' name = 'association' annotation = '' scope = 'instance_level'
-                  visibility = 'public_vis' isChangeable = 'true'>
-                  <Model:StructuralFeature.multiplicity>
-                    <XMI.field>1</XMI.field>
-                    <XMI.field>1</XMI.field>
-                    <XMI.field>false</XMI.field>
-                    <XMI.field>true</XMI.field>
-                  </Model:StructuralFeature.multiplicity>
-                  <Model:TypedElement.type>
-                    <Model:Class xmi.idref = 'a160'/>
-                  </Model:TypedElement.type>
-                  <Model:Reference.referencedEnd>
-                    <Model:AssociationEnd xmi.idref = 'a159'/>
-                  </Model:Reference.referencedEnd>
-                </Model:Reference>
               </Model:Namespace.contents>
               <Model:GeneralizableElement.supertypes>
                 <Model:Class xmi.idref = 'a113'/>
@@ -1744,37 +1768,19 @@
             <Model:Class xmi.id = 'a15' name = 'Entity' annotation = '' isRoot = 'false'
               isLeaf = 'false' isAbstract = 'false' visibility = 'public_vis' isSingleton = 'false'>
               <Model:Namespace.contents>
-                <Model:Reference xmi.id = 'a178' name = 'associationEnds' annotation = ''
-                  scope = 'instance_level' visibility = 'public_vis' isChangeable = 'true'>
-                  <Model:StructuralFeature.multiplicity>
-                    <XMI.field>0</XMI.field>
-                    <XMI.field>-1</XMI.field>
-                    <XMI.field>false</XMI.field>
-                    <XMI.field>true</XMI.field>
-                  </Model:StructuralFeature.multiplicity>
-                  <Model:TypedElement.type>
-                    <Model:Class xmi.idref = 'a43'/>
-                  </Model:TypedElement.type>
-                  <Model:Reference.referencedEnd>
-                    <Model:AssociationEnd xmi.idref = 'a163'/>
-                  </Model:Reference.referencedEnd>
-                </Model:Reference>
-                <Model:Reference xmi.id = 'a179' name = 'read' annotation = '' scope = 'instance_level'
-                  visibility = 'public_vis' isChangeable = 'true'>
+                <Model:Attribute xmi.id = 'a180' name = 'name' annotation = '' scope = 'instance_level'
+                  visibility = 'public_vis' isChangeable = 'true' isDerived = 'false'>
                   <Model:StructuralFeature.multiplicity>
                     <XMI.field>1</XMI.field>
                     <XMI.field>1</XMI.field>
                     <XMI.field>false</XMI.field>
-                    <XMI.field>true</XMI.field>
+                    <XMI.field>false</XMI.field>
                   </Model:StructuralFeature.multiplicity>
                   <Model:TypedElement.type>
-                    <Model:Class xmi.idref = 'a18'/>
+                    <Model:PrimitiveType xmi.idref = 'a7'/>
                   </Model:TypedElement.type>
-                  <Model:Reference.referencedEnd>
-                    <Model:AssociationEnd xmi.idref = 'a17'/>
-                  </Model:Reference.referencedEnd>
-                </Model:Reference>
-                <Model:Reference xmi.id = 'a180' name = 'create' annotation = '' scope = 'instance_level'
+                </Model:Attribute>
+                <Model:Reference xmi.id = 'a181' name = 'create' annotation = '' scope = 'instance_level'
                   visibility = 'public_vis' isChangeable = 'true'>
                   <Model:StructuralFeature.multiplicity>
                     <XMI.field>1</XMI.field>
@@ -1789,7 +1795,7 @@
                     <Model:AssociationEnd xmi.idref = 'a12'/>
                   </Model:Reference.referencedEnd>
                 </Model:Reference>
-                <Model:Reference xmi.id = 'a181' name = 'update' annotation = '' scope = 'instance_level'
+                <Model:Reference xmi.id = 'a182' name = 'read' annotation = '' scope = 'instance_level'
                   visibility = 'public_vis' isChangeable = 'true'>
                   <Model:StructuralFeature.multiplicity>
                     <XMI.field>1</XMI.field>
@@ -1798,25 +1804,10 @@
                     <XMI.field>true</XMI.field>
                   </Model:StructuralFeature.multiplicity>
                   <Model:TypedElement.type>
-                    <Model:Class xmi.idref = 'a31'/>
+                    <Model:Class xmi.idref = 'a18'/>
                   </Model:TypedElement.type>
                   <Model:Reference.referencedEnd>
-                    <Model:AssociationEnd xmi.idref = 'a30'/>
-                  </Model:Reference.referencedEnd>
-                </Model:Reference>
-                <Model:Reference xmi.id = 'a182' name = 'methods' annotation = '' scope = 'instance_level'
-                  visibility = 'public_vis' isChangeable = 'true'>
-                  <Model:StructuralFeature.multiplicity>
-                    <XMI.field>0</XMI.field>
-                    <XMI.field>-1</XMI.field>
-                    <XMI.field>false</XMI.field>
-                    <XMI.field>true</XMI.field>
-                  </Model:StructuralFeature.multiplicity>
-                  <Model:TypedElement.type>
-                    <Model:Class xmi.idref = 'a75'/>
-                  </Model:TypedElement.type>
-                  <Model:Reference.referencedEnd>
-                    <Model:AssociationEnd xmi.idref = 'a153'/>
+                    <Model:AssociationEnd xmi.idref = 'a17'/>
                   </Model:Reference.referencedEnd>
                 </Model:Reference>
                 <Model:Reference xmi.id = 'a183' name = 'delete' annotation = '' scope = 'instance_level'
@@ -1834,7 +1825,7 @@
                     <Model:AssociationEnd xmi.idref = 'a23'/>
                   </Model:Reference.referencedEnd>
                 </Model:Reference>
-                <Model:Reference xmi.id = 'a184' name = 'attributes' annotation = '' scope = 'instance_level'
+                <Model:Reference xmi.id = 'a184' name = 'methods' annotation = '' scope = 'instance_level'
                   visibility = 'public_vis' isChangeable = 'true'>
                   <Model:StructuralFeature.multiplicity>
                     <XMI.field>0</XMI.field>
@@ -1843,10 +1834,10 @@
                     <XMI.field>true</XMI.field>
                   </Model:StructuralFeature.multiplicity>
                   <Model:TypedElement.type>
-                    <Model:Class xmi.idref = 'a59'/>
+                    <Model:Class xmi.idref = 'a75'/>
                   </Model:TypedElement.type>
                   <Model:Reference.referencedEnd>
-                    <Model:AssociationEnd xmi.idref = 'a156'/>
+                    <Model:AssociationEnd xmi.idref = 'a152'/>
                   </Model:Reference.referencedEnd>
                 </Model:Reference>
                 <Model:Reference xmi.id = 'a185' name = 'fullAccess' annotation = '' scope = 'instance_level'
@@ -1864,6 +1855,51 @@
                     <Model:AssociationEnd xmi.idref = 'a34'/>
                   </Model:Reference.referencedEnd>
                 </Model:Reference>
+                <Model:Reference xmi.id = 'a186' name = 'update' annotation = '' scope = 'instance_level'
+                  visibility = 'public_vis' isChangeable = 'true'>
+                  <Model:StructuralFeature.multiplicity>
+                    <XMI.field>1</XMI.field>
+                    <XMI.field>1</XMI.field>
+                    <XMI.field>false</XMI.field>
+                    <XMI.field>true</XMI.field>
+                  </Model:StructuralFeature.multiplicity>
+                  <Model:TypedElement.type>
+                    <Model:Class xmi.idref = 'a31'/>
+                  </Model:TypedElement.type>
+                  <Model:Reference.referencedEnd>
+                    <Model:AssociationEnd xmi.idref = 'a30'/>
+                  </Model:Reference.referencedEnd>
+                </Model:Reference>
+                <Model:Reference xmi.id = 'a187' name = 'attributes' annotation = '' scope = 'instance_level'
+                  visibility = 'public_vis' isChangeable = 'true'>
+                  <Model:StructuralFeature.multiplicity>
+                    <XMI.field>0</XMI.field>
+                    <XMI.field>-1</XMI.field>
+                    <XMI.field>false</XMI.field>
+                    <XMI.field>true</XMI.field>
+                  </Model:StructuralFeature.multiplicity>
+                  <Model:TypedElement.type>
+                    <Model:Class xmi.idref = 'a59'/>
+                  </Model:TypedElement.type>
+                  <Model:Reference.referencedEnd>
+                    <Model:AssociationEnd xmi.idref = 'a155'/>
+                  </Model:Reference.referencedEnd>
+                </Model:Reference>
+                <Model:Reference xmi.id = 'a188' name = 'associationEnds' annotation = ''
+                  scope = 'instance_level' visibility = 'public_vis' isChangeable = 'true'>
+                  <Model:StructuralFeature.multiplicity>
+                    <XMI.field>0</XMI.field>
+                    <XMI.field>-1</XMI.field>
+                    <XMI.field>false</XMI.field>
+                    <XMI.field>true</XMI.field>
+                  </Model:StructuralFeature.multiplicity>
+                  <Model:TypedElement.type>
+                    <Model:Class xmi.idref = 'a43'/>
+                  </Model:TypedElement.type>
+                  <Model:Reference.referencedEnd>
+                    <Model:AssociationEnd xmi.idref = 'a162'/>
+                  </Model:Reference.referencedEnd>
+                </Model:Reference>
               </Model:Namespace.contents>
               <Model:GeneralizableElement.supertypes>
                 <Model:Class xmi.idref = 'a113'/>
@@ -1871,152 +1907,170 @@
             </Model:Class>
           </Model:Namespace.contents>
         </Model:Package>
-        <Model:Tag xmi.id = 'a186' name = 'umlPropertyGetter' annotation = '' tagId = 'umlPropertyGetter'>
+        <Model:Tag xmi.id = 'a189' name = 'umlPropertyGetter' annotation = '' tagId = 'umlPropertyGetter'>
           <Model:Tag.values>getOwner</Model:Tag.values>
+          <Model:Tag.elements>
+            <Model:AssociationEnd xmi.idref = 'a151'/>
+          </Model:Tag.elements>
+        </Model:Tag>
+        <Model:Tag xmi.id = 'a190' name = 'umlPropertyGetter' annotation = '' tagId = 'umlPropertyGetter'>
+          <Model:Tag.values>getFeature</Model:Tag.values>
           <Model:Tag.elements>
             <Model:AssociationEnd xmi.idref = 'a152'/>
           </Model:Tag.elements>
         </Model:Tag>
-        <Model:Tag xmi.id = 'a187' name = 'umlPropertyGetter' annotation = '' tagId = 'umlPropertyGetter'>
-          <Model:Tag.values>getFeature</Model:Tag.values>
+        <Model:Tag xmi.id = 'a191' name = 'umlPropertyGetter' annotation = '' tagId = 'umlPropertyGetter'>
+          <Model:Tag.values>getOwner</Model:Tag.values>
           <Model:Tag.elements>
-            <Model:AssociationEnd xmi.idref = 'a153'/>
+            <Model:AssociationEnd xmi.idref = 'a154'/>
           </Model:Tag.elements>
         </Model:Tag>
-        <Model:Tag xmi.id = 'a188' name = 'umlPropertyGetter' annotation = '' tagId = 'umlPropertyGetter'>
-          <Model:Tag.values>getOwner</Model:Tag.values>
+        <Model:Tag xmi.id = 'a192' name = 'umlPropertyGetter' annotation = '' tagId = 'umlPropertyGetter'>
+          <Model:Tag.values>getFeature</Model:Tag.values>
           <Model:Tag.elements>
             <Model:AssociationEnd xmi.idref = 'a155'/>
           </Model:Tag.elements>
         </Model:Tag>
-        <Model:Tag xmi.id = 'a189' name = 'umlPropertyGetter' annotation = '' tagId = 'umlPropertyGetter'>
-          <Model:Tag.values>getFeature</Model:Tag.values>
-          <Model:Tag.elements>
-            <Model:AssociationEnd xmi.idref = 'a156'/>
-          </Model:Tag.elements>
-        </Model:Tag>
-        <Model:Tag xmi.id = 'a190' name = 'umlPropertyGetter' annotation = '' tagId = 'umlPropertyGetter'>
+        <Model:Tag xmi.id = 'a193' name = 'umlPropertyGetter' annotation = '' tagId = 'umlPropertyGetter'>
           <Model:Tag.values>getConnection</Model:Tag.values>
           <Model:Tag.elements>
-            <Model:AssociationEnd xmi.idref = 'a158'/>
-          </Model:Tag.elements>
-        </Model:Tag>
-        <Model:Tag xmi.id = 'a191' name = 'umlPropertyGetter' annotation = '' tagId = 'umlPropertyGetter'>
-          <Model:Tag.values>getAssociation</Model:Tag.values>
-          <Model:Tag.elements>
-            <Model:AssociationEnd xmi.idref = 'a159'/>
-          </Model:Tag.elements>
-        </Model:Tag>
-        <Model:Tag xmi.id = 'a192' name = 'umlAssociationName' annotation = '' tagId = 'umlAssociationName'>
-          <Model:Tag.values>AParticipantAssociation</Model:Tag.values>
-          <Model:Tag.elements>
-            <Model:Association xmi.idref = 'a161'/>
-          </Model:Tag.elements>
-        </Model:Tag>
-        <Model:Tag xmi.id = 'a193' name = 'umlPropertyGetter' annotation = '' tagId = 'umlPropertyGetter'>
-          <Model:Tag.values>getParticipant</Model:Tag.values>
-          <Model:Tag.elements>
-            <Model:AssociationEnd xmi.idref = 'a162'/>
+            <Model:AssociationEnd xmi.idref = 'a157'/>
           </Model:Tag.elements>
         </Model:Tag>
         <Model:Tag xmi.id = 'a194' name = 'umlPropertyGetter' annotation = '' tagId = 'umlPropertyGetter'>
           <Model:Tag.values>getAssociation</Model:Tag.values>
           <Model:Tag.elements>
-            <Model:AssociationEnd xmi.idref = 'a163'/>
+            <Model:AssociationEnd xmi.idref = 'a158'/>
           </Model:Tag.elements>
         </Model:Tag>
-        <Model:Tag xmi.id = 'a195' name = 'umlClassName' annotation = '' tagId = 'umlClassName'>
+        <Model:Tag xmi.id = 'a195' name = 'umlPropertyGetter' annotation = '' tagId = 'umlPropertyGetter'>
+          <Model:Tag.values>getParticipant</Model:Tag.values>
+          <Model:Tag.elements>
+            <Model:AssociationEnd xmi.idref = 'a161'/>
+          </Model:Tag.elements>
+        </Model:Tag>
+        <Model:Tag xmi.id = 'a196' name = 'umlClassName' annotation = '' tagId = 'umlClassName'>
           <Model:Tag.values>Operation</Model:Tag.values>
           <Model:Tag.elements>
             <Model:Class xmi.idref = 'a75'/>
           </Model:Tag.elements>
         </Model:Tag>
-        <Model:Tag xmi.id = 'a196' name = 'actionStereotype' annotation = '' tagId = 'actionStereotype'>
+        <Model:Tag xmi.id = 'a197' name = 'actionStereotype' annotation = '' tagId = 'actionStereotype'>
           <Model:Tag.values>compuml.entitymethodaction</Model:Tag.values>
           <Model:Tag.elements>
             <Model:Class xmi.idref = 'a75'/>
           </Model:Tag.elements>
         </Model:Tag>
-        <Model:Tag xmi.id = 'a197' name = 'anchorPath' annotation = '' tagId = 'anchorPath'>
+        <Model:Tag xmi.id = 'a198' name = 'anchorPath' annotation = '' tagId = 'anchorPath'>
           <Model:Tag.values>self.entity</Model:Tag.values>
           <Model:Tag.elements>
             <Model:Class xmi.idref = 'a75'/>
           </Model:Tag.elements>
         </Model:Tag>
-        <Model:Tag xmi.id = 'a198' name = 'umlClassName' annotation = '' tagId = 'umlClassName'>
+        <Model:Tag xmi.id = 'a199' name = 'umlPropertyName' annotation = '' tagId = 'umlPropertyName'>
+          <Model:Tag.values>name</Model:Tag.values>
+          <Model:Tag.elements>
+            <Model:Attribute xmi.idref = 'a163'/>
+          </Model:Tag.elements>
+        </Model:Tag>
+        <Model:Tag xmi.id = 'a200' name = 'umlPropertyName' annotation = '' tagId = 'umlPropertyName'>
+          <Model:Tag.values>query</Model:Tag.values>
+          <Model:Tag.elements>
+            <Model:Attribute xmi.idref = 'a164'/>
+          </Model:Tag.elements>
+        </Model:Tag>
+        <Model:Tag xmi.id = 'a201' name = 'umlClassName' annotation = '' tagId = 'umlClassName'>
           <Model:Tag.values>Attribute</Model:Tag.values>
           <Model:Tag.elements>
             <Model:Class xmi.idref = 'a59'/>
           </Model:Tag.elements>
         </Model:Tag>
-        <Model:Tag xmi.id = 'a199' name = 'actionStereotype' annotation = '' tagId = 'actionStereotype'>
+        <Model:Tag xmi.id = 'a202' name = 'actionStereotype' annotation = '' tagId = 'actionStereotype'>
           <Model:Tag.values>compuml.entityattributeaction</Model:Tag.values>
           <Model:Tag.elements>
             <Model:Class xmi.idref = 'a59'/>
           </Model:Tag.elements>
         </Model:Tag>
-        <Model:Tag xmi.id = 'a200' name = 'anchorPath' annotation = '' tagId = 'anchorPath'>
+        <Model:Tag xmi.id = 'a203' name = 'anchorPath' annotation = '' tagId = 'anchorPath'>
           <Model:Tag.values>self.entity</Model:Tag.values>
           <Model:Tag.elements>
             <Model:Class xmi.idref = 'a59'/>
           </Model:Tag.elements>
         </Model:Tag>
-        <Model:Tag xmi.id = 'a201' name = 'umlClassName' annotation = '' tagId = 'umlClassName'>
-          <Model:Tag.values>UmlAssociation</Model:Tag.values>
+        <Model:Tag xmi.id = 'a204' name = 'umlPropertyName' annotation = '' tagId = 'umlPropertyName'>
+          <Model:Tag.values>name</Model:Tag.values>
           <Model:Tag.elements>
-            <Model:Class xmi.idref = 'a160'/>
+            <Model:Attribute xmi.idref = 'a167'/>
           </Model:Tag.elements>
         </Model:Tag>
-        <Model:Tag xmi.id = 'a202' name = 'resourcePath' annotation = '' tagId = 'resourcePath'>
+        <Model:Tag xmi.id = 'a205' name = 'umlClassName' annotation = '' tagId = 'umlClassName'>
+          <Model:Tag.values>Association</Model:Tag.values>
+          <Model:Tag.elements>
+            <Model:Class xmi.idref = 'a159'/>
+          </Model:Tag.elements>
+        </Model:Tag>
+        <Model:Tag xmi.id = 'a206' name = 'resourcePath' annotation = '' tagId = 'resourcePath'>
           <Model:Tag.values>self.associationEnds</Model:Tag.values>
           <Model:Tag.elements>
             <Model:Class xmi.idref = 'a43'/>
           </Model:Tag.elements>
         </Model:Tag>
-        <Model:Tag xmi.id = 'a203' name = 'umlClassName' annotation = '' tagId = 'umlClassName'>
+        <Model:Tag xmi.id = 'a207' name = 'umlClassName' annotation = '' tagId = 'umlClassName'>
           <Model:Tag.values>AssociationEnd</Model:Tag.values>
           <Model:Tag.elements>
             <Model:Class xmi.idref = 'a43'/>
           </Model:Tag.elements>
         </Model:Tag>
-        <Model:Tag xmi.id = 'a204' name = 'actionStereotype' annotation = '' tagId = 'actionStereotype'>
+        <Model:Tag xmi.id = 'a208' name = 'actionStereotype' annotation = '' tagId = 'actionStereotype'>
           <Model:Tag.values>compuml.associationendaction</Model:Tag.values>
           <Model:Tag.elements>
             <Model:Class xmi.idref = 'a43'/>
           </Model:Tag.elements>
         </Model:Tag>
-        <Model:Tag xmi.id = 'a205' name = 'anchorPath' annotation = '' tagId = 'anchorPath'>
+        <Model:Tag xmi.id = 'a209' name = 'anchorPath' annotation = '' tagId = 'anchorPath'>
           <Model:Tag.values>self.association.ends-&gt;minus(self).type</Model:Tag.values>
           <Model:Tag.elements>
             <Model:Class xmi.idref = 'a43'/>
           </Model:Tag.elements>
         </Model:Tag>
-        <Model:Tag xmi.id = 'a206' name = 'umlClassName' annotation = '' tagId = 'umlClassName'>
+        <Model:Tag xmi.id = 'a210' name = 'umlPropertyName' annotation = '' tagId = 'umlPropertyName'>
+          <Model:Tag.values>name</Model:Tag.values>
+          <Model:Tag.elements>
+            <Model:Attribute xmi.idref = 'a174'/>
+          </Model:Tag.elements>
+        </Model:Tag>
+        <Model:Tag xmi.id = 'a211' name = 'umlClassName' annotation = '' tagId = 'umlClassName'>
           <Model:Tag.values>UmlClass</Model:Tag.values>
           <Model:Tag.elements>
             <Model:Class xmi.idref = 'a15'/>
           </Model:Tag.elements>
         </Model:Tag>
-        <Model:Tag xmi.id = 'a207' name = 'actionStereotype' annotation = '' tagId = 'actionStereotype'>
+        <Model:Tag xmi.id = 'a212' name = 'actionStereotype' annotation = '' tagId = 'actionStereotype'>
           <Model:Tag.values>compumml.entityaction</Model:Tag.values>
           <Model:Tag.elements>
             <Model:Class xmi.idref = 'a15'/>
           </Model:Tag.elements>
         </Model:Tag>
-        <Model:Tag xmi.id = 'a208' name = 'anchorPath' annotation = '' tagId = 'anchorPath'>
+        <Model:Tag xmi.id = 'a213' name = 'anchorPath' annotation = '' tagId = 'anchorPath'>
           <Model:Tag.values>self</Model:Tag.values>
           <Model:Tag.elements>
             <Model:Class xmi.idref = 'a15'/>
           </Model:Tag.elements>
         </Model:Tag>
-        <Model:Tag xmi.id = 'a209' name = 'modelElementStereotype' annotation = ''
+        <Model:Tag xmi.id = 'a214' name = 'modelElementStereotype' annotation = ''
           tagId = 'modelElementStereotype'>
           <Model:Tag.values>compuml.entity</Model:Tag.values>
           <Model:Tag.elements>
             <Model:Class xmi.idref = 'a15'/>
           </Model:Tag.elements>
         </Model:Tag>
-        <Model:Import xmi.id = 'a210' name = 'PrimitiveTypes' annotation = '' visibility = 'public_vis'
+        <Model:Tag xmi.id = 'a215' name = 'umlPropertyName' annotation = '' tagId = 'umlPropertyName'>
+          <Model:Tag.values>Name</Model:Tag.values>
+          <Model:Tag.elements>
+            <Model:Attribute xmi.idref = 'a180'/>
+          </Model:Tag.elements>
+        </Model:Tag>
+        <Model:Import xmi.id = 'a216' name = 'PrimitiveTypes' annotation = '' visibility = 'public_vis'
           isClustered = 'false'>
           <Model:Import.importedNamespace>
             <Model:Package xmi.idref = 'a1'/>
diff --git a/metamodels/securecomponentuml_uml.xmi b/metamodels/securecomponentuml_uml.xmi
index 9c7c293..dfc7651 100644
--- a/metamodels/securecomponentuml_uml.xmi
+++ b/metamodels/securecomponentuml_uml.xmi
@@ -1,8 +1,8 @@
 <?xml version = '1.0' encoding = 'UTF-8' ?>
-<XMI xmi.version = '1.2' xmlns:UML = 'org.omg.xmi.namespace.UML' timestamp = 'Thu Dec 11 19:03:24 CET 2008'>
+<XMI xmi.version = '1.2' xmlns:UML = 'org.omg.xmi.namespace.UML' timestamp = 'Sat Jan 03 17:58:18 CET 2009'>
   <XMI.header>    <XMI.documentation>
       <XMI.exporter>ArgoUML (using Netbeans XMI Writer version 1.0)</XMI.exporter>
-      <XMI.exporterVersion>0.26(6) revised on $Date: 2007-05-12 08:08:08 +0200 (Sat, 12 May 2007) $ </XMI.exporterVersion>
+      <XMI.exporterVersion>0.26.2(6) revised on $Date: 2007-05-12 08:08:08 +0200 (Sat, 12 May 2007) $ </XMI.exporterVersion>
     </XMI.documentation>
     <XMI.metamodel xmi.name="UML" xmi.version="1.4"/></XMI.header>
   <XMI.content>
@@ -74,6 +74,26 @@
               isRoot = 'false' isLeaf = 'false' isAbstract = 'false'/>
           </UML:Namespace.ownedElement>
         </UML:Package>
+        <UML:TagDefinition xmi.id = 'Ie1143m1071507172dmm7ed5' name = 'element.uuid'
+          isSpecification = 'false' tagType = 'String'>
+          <UML:TagDefinition.multiplicity>
+            <UML:Multiplicity xmi.id = 'Ie1143m1071507172dmm7ed7'>
+              <UML:Multiplicity.range>
+                <UML:MultiplicityRange xmi.id = 'Ie1143m1071507172dmm7ed9' lower = '1' upper = '1'/>
+              </UML:Multiplicity.range>
+            </UML:Multiplicity>
+          </UML:TagDefinition.multiplicity>
+        </UML:TagDefinition>
+        <UML:TagDefinition xmi.id = 'Ie1143m1071507172dmm7ecf' name = 'element.uuid'
+          isSpecification = 'false' tagType = 'String'>
+          <UML:TagDefinition.multiplicity>
+            <UML:Multiplicity xmi.id = 'Ie1143m1071507172dmm7ed1'>
+              <UML:Multiplicity.range>
+                <UML:MultiplicityRange xmi.id = 'Ie1143m1071507172dmm7ed3' lower = '1' upper = '1'/>
+              </UML:Multiplicity.range>
+            </UML:Multiplicity>
+          </UML:TagDefinition.multiplicity>
+        </UML:TagDefinition>
         <UML:TagDefinition xmi.id = 'I71238f8am1076bd6c502mm7c4f' name = 'javax.jmi.packagePrefix'
           isSpecification = 'false'>
           <UML:TagDefinition.multiplicity>
@@ -125,7 +145,7 @@
                     <UML:TaggedValue xmi.id = 'Im2f318ff0m10f022339eamm7495' isSpecification = 'false'>
                       <UML:TaggedValue.dataValue>compumml.entityaction</UML:TaggedValue.dataValue>
                       <UML:TaggedValue.type>
-                        <UML:TagDefinition xmi.idref = 'Im2f318ff0m10f022339eamm749d'/>
+                        <UML:TagDefinition xmi.idref = 'Im2f318ff0m10f022339eamm7498'/>
                       </UML:TaggedValue.type>
                     </UML:TaggedValue>
                     <UML:TaggedValue xmi.id = 'I58e7b1cdm10f25aed5abmm50a3' isSpecification = 'false'>
@@ -138,6 +158,22 @@
                   <UML:GeneralizableElement.generalization>
                     <UML:Generalization xmi.idref = 'Im61745bf8m108422f298emm54a7'/>
                   </UML:GeneralizableElement.generalization>
+                  <UML:Classifier.feature>
+                    <UML:Attribute xmi.id = 'Im61745bf8m108422f298emm584b' name = 'name' visibility = 'public'
+                      isSpecification = 'false' ownerScope = 'instance' changeability = 'changeable'>
+                      <UML:ModelElement.taggedValue>
+                        <UML:TaggedValue xmi.id = 'Im29148917m10f4500f61dmm746f' isSpecification = 'false'>
+                          <UML:TaggedValue.dataValue>Name</UML:TaggedValue.dataValue>
+                          <UML:TaggedValue.type>
+                            <UML:TagDefinition xmi.idref = 'Im29148917m10f4500f61dmm7474'/>
+                          </UML:TaggedValue.type>
+                        </UML:TaggedValue>
+                      </UML:ModelElement.taggedValue>
+                      <UML:StructuralFeature.type>
+                        <UML:DataType xmi.idref = 'Ie1143m1071507172dmm7e7f'/>
+                      </UML:StructuralFeature.type>
+                    </UML:Attribute>
+                  </UML:Classifier.feature>
                 </UML:Class>
                 <UML:Class xmi.id = 'Im61745bf8m108422f298emm5845' name = 'AssociationEnd'
                   visibility = 'public' isSpecification = 'false' isRoot = 'false' isLeaf = 'false'
@@ -171,30 +207,37 @@
                   <UML:GeneralizableElement.generalization>
                     <UML:Generalization xmi.idref = 'Im61745bf8m108422f298emm5451'/>
                   </UML:GeneralizableElement.generalization>
+                  <UML:Classifier.feature>
+                    <UML:Attribute xmi.id = 'Im61745bf8m108422f298emm5847' name = 'name' visibility = 'public'
+                      isSpecification = 'false' ownerScope = 'instance' changeability = 'changeable'>
+                      <UML:ModelElement.taggedValue>
+                        <UML:TaggedValue xmi.id = 'Im29148917m10f4500f61dmm746e' isSpecification = 'false'>
+                          <UML:TaggedValue.dataValue>name</UML:TaggedValue.dataValue>
+                          <UML:TaggedValue.type>
+                            <UML:TagDefinition xmi.idref = 'Im29148917m10f4500f61dmm7474'/>
+                          </UML:TaggedValue.type>
+                        </UML:TaggedValue>
+                      </UML:ModelElement.taggedValue>
+                      <UML:StructuralFeature.type>
+                        <UML:DataType xmi.idref = 'Ie1143m1071507172dmm7e7f'/>
+                      </UML:StructuralFeature.type>
+                    </UML:Attribute>
+                  </UML:Classifier.feature>
                 </UML:Class>
                 <UML:Class xmi.id = 'Im61745bf8m108422f298emm5841' name = 'Association'
                   visibility = 'public' isSpecification = 'false' isRoot = 'false' isLeaf = 'false'
                   isAbstract = 'false' isActive = 'false'>
                   <UML:ModelElement.taggedValue>
                     <UML:TaggedValue xmi.id = 'Im29148917m10f4500f61dmm746d' isSpecification = 'false'>
-                      <UML:TaggedValue.dataValue>UmlAssociation</UML:TaggedValue.dataValue>
+                      <UML:TaggedValue.dataValue>Association</UML:TaggedValue.dataValue>
                       <UML:TaggedValue.type>
                         <UML:TagDefinition xmi.idref = 'I58e7b1cdm10f25aed5abmm50a8'/>
                       </UML:TaggedValue.type>
                     </UML:TaggedValue>
                   </UML:ModelElement.taggedValue>
                   <UML:Classifier.feature>
-                    <UML:Attribute xmi.id = '127-0-1-1--3a077754:11e2736c866:-8000:0000000000000EF2'
-                      name = 'name' visibility = 'public' isSpecification = 'false' ownerScope = 'instance'
-                      changeability = 'changeable' targetScope = 'instance'>
-                      <UML:StructuralFeature.multiplicity>
-                        <UML:Multiplicity xmi.id = '127-0-1-1--3a077754:11e2736c866:-8000:0000000000000EF3'>
-                          <UML:Multiplicity.range>
-                            <UML:MultiplicityRange xmi.id = '127-0-1-1--3a077754:11e2736c866:-8000:0000000000000EF4'
-                              lower = '1' upper = '1'/>
-                          </UML:Multiplicity.range>
-                        </UML:Multiplicity>
-                      </UML:StructuralFeature.multiplicity>
+                    <UML:Attribute xmi.id = 'Im61745bf8m108422f298emm5843' name = 'name' visibility = 'public'
+                      isSpecification = 'false' ownerScope = 'instance' changeability = 'changeable'>
                       <UML:StructuralFeature.type>
                         <UML:DataType xmi.idref = 'Ie1143m1071507172dmm7e7f'/>
                       </UML:StructuralFeature.type>
@@ -227,6 +270,30 @@
                   <UML:GeneralizableElement.generalization>
                     <UML:Generalization xmi.idref = 'Im61745bf8m108422f298emm54ae'/>
                   </UML:GeneralizableElement.generalization>
+                  <UML:Classifier.feature>
+                    <UML:Attribute xmi.id = 'Im61745bf8m108422f298emm583f' name = 'name' visibility = 'public'
+                      isSpecification = 'false' ownerScope = 'instance' changeability = 'changeable'>
+                      <UML:StructuralFeature.multiplicity>
+                        <UML:Multiplicity xmi.id = 'Im29148917m10f4500f61dmm6689'>
+                          <UML:Multiplicity.range>
+                            <UML:MultiplicityRange xmi.id = 'Im29148917m10f4500f61dmm6688' lower = '1'
+                              upper = '1'/>
+                          </UML:Multiplicity.range>
+                        </UML:Multiplicity>
+                      </UML:StructuralFeature.multiplicity>
+                      <UML:ModelElement.taggedValue>
+                        <UML:TaggedValue xmi.id = 'Im29148917m10f4500f61dmm7471' isSpecification = 'false'>
+                          <UML:TaggedValue.dataValue>name</UML:TaggedValue.dataValue>
+                          <UML:TaggedValue.type>
+                            <UML:TagDefinition xmi.idref = 'Im29148917m10f4500f61dmm7474'/>
+                          </UML:TaggedValue.type>
+                        </UML:TaggedValue>
+                      </UML:ModelElement.taggedValue>
+                      <UML:StructuralFeature.type>
+                        <UML:DataType xmi.idref = 'Ie1143m1071507172dmm7e7f'/>
+                      </UML:StructuralFeature.type>
+                    </UML:Attribute>
+                  </UML:Classifier.feature>
                 </UML:Class>
                 <UML:Class xmi.id = 'Im61745bf8m108422f298emm5839' name = 'Method' visibility = 'public'
                   isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'
@@ -255,17 +322,46 @@
                     <UML:Generalization xmi.idref = 'Im61745bf8m108422f298emm54a0'/>
                   </UML:GeneralizableElement.generalization>
                   <UML:Classifier.feature>
-                    <UML:Attribute xmi.id = '127-0-1-1--9a861f5:11e07e6192b:-8000:0000000000000F0A'
-                      name = 'query' visibility = 'public' isSpecification = 'false' ownerScope = 'instance'
-                      changeability = 'changeable' targetScope = 'instance'>
+                    <UML:Attribute xmi.id = 'Im61745bf8m108422f298emm583b' name = 'name' visibility = 'public'
+                      isSpecification = 'false' ownerScope = 'instance' changeability = 'changeable'>
                       <UML:StructuralFeature.multiplicity>
-                        <UML:Multiplicity xmi.id = '127-0-1-1--9a861f5:11e07e6192b:-8000:0000000000000F0B'>
+                        <UML:Multiplicity xmi.id = 'Im29148917m10f4500f61dmm668b'>
                           <UML:Multiplicity.range>
-                            <UML:MultiplicityRange xmi.id = '127-0-1-1--9a861f5:11e07e6192b:-8000:0000000000000F0C'
-                              lower = '1' upper = '1'/>
+                            <UML:MultiplicityRange xmi.id = 'Im29148917m10f4500f61dmm668a' lower = '1'
+                              upper = '1'/>
                           </UML:Multiplicity.range>
                         </UML:Multiplicity>
                       </UML:StructuralFeature.multiplicity>
+                      <UML:ModelElement.taggedValue>
+                        <UML:TaggedValue xmi.id = 'Im29148917m10f4500f61dmm7470' isSpecification = 'false'>
+                          <UML:TaggedValue.dataValue>name</UML:TaggedValue.dataValue>
+                          <UML:TaggedValue.type>
+                            <UML:TagDefinition xmi.idref = 'Im29148917m10f4500f61dmm7474'/>
+                          </UML:TaggedValue.type>
+                        </UML:TaggedValue>
+                      </UML:ModelElement.taggedValue>
+                      <UML:StructuralFeature.type>
+                        <UML:DataType xmi.idref = 'Ie1143m1071507172dmm7e7f'/>
+                      </UML:StructuralFeature.type>
+                    </UML:Attribute>
+                    <UML:Attribute xmi.id = 'Im29148917m10f4500f61dmm66bf' name = 'query' visibility = 'public'
+                      isSpecification = 'false' ownerScope = 'instance' changeability = 'changeable'>
+                      <UML:StructuralFeature.multiplicity>
+                        <UML:Multiplicity xmi.id = 'Im29148917m10f4500f61dmm668d'>
+                          <UML:Multiplicity.range>
+                            <UML:MultiplicityRange xmi.id = 'Im29148917m10f4500f61dmm668c' lower = '1'
+                              upper = '1'/>
+                          </UML:Multiplicity.range>
+                        </UML:Multiplicity>
+                      </UML:StructuralFeature.multiplicity>
+                      <UML:ModelElement.taggedValue>
+                        <UML:TaggedValue xmi.id = 'Im29148917m10f4500f61dmm668e' isSpecification = 'false'>
+                          <UML:TaggedValue.dataValue>query</UML:TaggedValue.dataValue>
+                          <UML:TaggedValue.type>
+                            <UML:TagDefinition xmi.idref = 'Im29148917m10f4500f61dmm7474'/>
+                          </UML:TaggedValue.type>
+                        </UML:TaggedValue>
+                      </UML:ModelElement.taggedValue>
                       <UML:StructuralFeature.type>
                         <UML:DataType xmi.idref = 'Ie1143m1071507172dmm7e93'/>
                       </UML:StructuralFeature.type>
@@ -274,15 +370,6 @@
                 </UML:Class>
                 <UML:Association xmi.id = 'Im61745bf8m108422f298emm580f' name = 'EntityAssociationEnd'
                   isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'>
-                  <UML:ModelElement.taggedValue>
-                    <UML:TaggedValue xmi.id = '127-0-1-1-2d5ea25d:11e267b90d9:-8000:0000000000000F0B'
-                      isSpecification = 'false'>
-                      <UML:TaggedValue.dataValue>AParticipantAssociation</UML:TaggedValue.dataValue>
-                      <UML:TaggedValue.type>
-                        <UML:TagDefinition xmi.idref = '127-0-1-1-2d5ea25d:11e267b90d9:-8000:0000000000000F0C'/>
-                      </UML:TaggedValue.type>
-                    </UML:TaggedValue>
-                  </UML:ModelElement.taggedValue>
                   <UML:Association.connection>
                     <UML:AssociationEnd xmi.id = 'Im61745bf8m108422f298emm5817' name = 'type'
                       visibility = 'public' isSpecification = 'false' isNavigable = 'true' ordering = 'unordered'
@@ -318,15 +405,6 @@
                           </UML:Multiplicity.range>
                         </UML:Multiplicity>
                       </UML:AssociationEnd.multiplicity>
-                      <UML:ModelElement.taggedValue>
-                        <UML:TaggedValue xmi.id = '127-0-1-1-2d5ea25d:11e267b90d9:-8000:0000000000000F0F'
-                          isSpecification = 'false'>
-                          <UML:TaggedValue.dataValue>getAssociation</UML:TaggedValue.dataValue>
-                          <UML:TaggedValue.type>
-                            <UML:TagDefinition xmi.idref = 'I58e7b1cdm10f25aed5abmm62ab'/>
-                          </UML:TaggedValue.type>
-                        </UML:TaggedValue>
-                      </UML:ModelElement.taggedValue>
                       <UML:AssociationEnd.participant>
                         <UML:Class xmi.idref = 'Im61745bf8m108422f298emm5845'/>
                       </UML:AssociationEnd.participant>
@@ -374,7 +452,7 @@
                         <UML:TaggedValue xmi.id = 'Im29148917m10f4500f61dmm744c' isSpecification = 'false'>
                           <UML:TaggedValue.dataValue>getAssociation</UML:TaggedValue.dataValue>
                           <UML:TaggedValue.type>
-                            <UML:TagDefinition xmi.idref = 'I58e7b1cdm10f25aed5abmm62ab'/>
+                            <UML:TagDefinition xmi.idref = 'Im29148917m10f4500f61dmm744f'/>
                           </UML:TaggedValue.type>
                         </UML:TaggedValue>
                       </UML:ModelElement.taggedValue>
@@ -610,25 +688,7 @@
                 </UML:Association>
                 <UML:Class xmi.id = 'Im1a6f43c0m10721d791admm7a07' name = 'Resource' visibility = 'public'
                   isSpecification = 'false' isRoot = 'false' isLeaf = 'false' isAbstract = 'false'
-                  isActive = 'false'>
-                  <UML:Classifier.feature>
-                    <UML:Attribute xmi.id = '127-0-0-1-737e0c41:11dd966a3b6:-8000:0000000000000F16'
-                      name = 'name' visibility = 'public' isSpecification = 'false' ownerScope = 'instance'
-                      changeability = 'changeable' targetScope = 'instance'>
-                      <UML:StructuralFeature.multiplicity>
-                        <UML:Multiplicity xmi.id = '127-0-0-1-737e0c41:11dd966a3b6:-8000:0000000000000F17'>
-                          <UML:Multiplicity.range>
-                            <UML:MultiplicityRange xmi.id = '127-0-0-1-737e0c41:11dd966a3b6:-8000:0000000000000F18'
-                              lower = '1' upper = '1'/>
-                          </UML:Multiplicity.range>
-                        </UML:Multiplicity>
-                      </UML:StructuralFeature.multiplicity>
-                      <UML:StructuralFeature.type>
-                        <UML:DataType xmi.idref = 'Ie1143m1071507172dmm7e7f'/>
-                      </UML:StructuralFeature.type>
-                    </UML:Attribute>
-                  </UML:Classifier.feature>
-                </UML:Class>
+                  isActive = 'false'/>
                 <UML:Class xmi.id = 'I135dea05m107759347e5mm716d' name = 'AuthorizationConstraint'
                   visibility = 'public' isSpecification = 'false' isRoot = 'false' isLeaf = 'false'
                   isAbstract = 'false' isActive = 'false'>
@@ -1128,7 +1188,7 @@
                     <UML:TaggedValue xmi.id = 'Im29148917m10f4500f61dmm72dc' isSpecification = 'false'>
                       <UML:TaggedValue.dataValue>self.resource.action-&gt;select(name=&quot;read&quot;)-&gt;union(self.resource.action-&gt;select(name=&quot;update&quot;))</UML:TaggedValue.dataValue>
                       <UML:TaggedValue.type>
-                        <UML:TagDefinition xmi.idref = 'Im29148917m10f4500f61dmm72e7'/>
+                        <UML:TagDefinition xmi.idref = 'Im29148917m10f4500f61dmm72df'/>
                       </UML:TaggedValue.type>
                     </UML:TaggedValue>
                   </UML:ModelElement.taggedValue>
@@ -1337,7 +1397,7 @@
                     <UML:TaggedValue xmi.id = 'Im29148917m10f4500f61dmm72d8' isSpecification = 'false'>
                       <UML:TaggedValue.dataValue>self.resource.action-&gt;select(name=&quot;read&quot;)-&gt;union(self.resource.action-&gt;select(name=&quot;update&quot;))</UML:TaggedValue.dataValue>
                       <UML:TaggedValue.type>
-                        <UML:TagDefinition xmi.idref = 'Im29148917m10f4500f61dmm72e7'/>
+                        <UML:TagDefinition xmi.idref = 'Im29148917m10f4500f61dmm72db'/>
                       </UML:TaggedValue.type>
                     </UML:TaggedValue>
                   </UML:ModelElement.taggedValue>
@@ -1445,7 +1505,7 @@
                     <UML:TaggedValue xmi.id = 'Im29148917m10f4500f61dmm72e0' isSpecification = 'false'>
                       <UML:TaggedValue.dataValue>self.resource.action-&gt;select(name=&quot;create&quot; or name=&quot;read&quot; or  name=&quot;update&quot; or name=&quot;delete&quot;)</UML:TaggedValue.dataValue>
                       <UML:TaggedValue.type>
-                        <UML:TagDefinition xmi.idref = 'Im29148917m10f4500f61dmm72e7'/>
+                        <UML:TagDefinition xmi.idref = 'Im29148917m10f4500f61dmm72e3'/>
                       </UML:TaggedValue.type>
                     </UML:TaggedValue>
                   </UML:ModelElement.taggedValue>
@@ -1458,9 +1518,9 @@
                   isAbstract = 'false' isActive = 'false'>
                   <UML:ModelElement.taggedValue>
                     <UML:TaggedValue xmi.id = 'Im29148917m10f4500f61dmm72d4' isSpecification = 'false'>
-                      <UML:TaggedValue.dataValue>self.resource.attributes.action-&gt;select(name=&quot;update&quot;)-&gt;union(resource.associationEnds.association.ends-&gt;minus(self.resource.associationEnds).action-&gt;select(name=&quot;update&quot;))-&gt;union(resource.methods-&gt;select(not query).action-&gt;select(name=&quot;execute&quot;))</UML:TaggedValue.dataValue>
+                      <UML:TaggedValue.dataValue>self.resource.attributes.action-&gt;select(name=&quot;update&quot;)-&gt;union(resource.associationEnds.action-&gt;select(name=&quot;update&quot;))-&gt;union(resource.methods-&gt;select(not query).action-&gt;select(name=&quot;execute&quot;))</UML:TaggedValue.dataValue>
                       <UML:TaggedValue.type>
-                        <UML:TagDefinition xmi.idref = 'Im29148917m10f4500f61dmm72e7'/>
+                        <UML:TagDefinition xmi.idref = 'Im29148917m10f4500f61dmm72d7'/>
                       </UML:TaggedValue.type>
                     </UML:TaggedValue>
                   </UML:ModelElement.taggedValue>
@@ -1616,7 +1676,7 @@
                   isActive = 'false'>
                   <UML:ModelElement.taggedValue>
                     <UML:TaggedValue xmi.id = 'Im29148917m10f4500f61dmm72e4' isSpecification = 'false'>
-                      <UML:TaggedValue.dataValue>self.resource.attributes.action-&gt;select(name=&quot;read&quot;)-&gt;union(self.resource.associationEnds.association.ends-&gt;minus(self.resource.associationEnds).action-&gt;select(name=&quot;read&quot;))-&gt;union(self.resource.methods-&gt;select(query).action-&gt;select(name=&quot;execute&quot;))</UML:TaggedValue.dataValue>
+                      <UML:TaggedValue.dataValue>self.resource.attributes.action-&gt;select(name=&quot;read&quot;)-&gt;union(self.resource.associationEnds.association.ends.action-&gt;select(name=&quot;read&quot;))-&gt;union(self.resource.methods-&gt;select(query).action-&gt;select(name=&quot;execute&quot;))</UML:TaggedValue.dataValue>
                       <UML:TaggedValue.type>
                         <UML:TagDefinition xmi.idref = 'Im29148917m10f4500f61dmm72e7'/>
                       </UML:TaggedValue.type>
@@ -1764,6 +1824,17 @@
             </UML:Multiplicity>
           </UML:TagDefinition.multiplicity>
         </UML:TagDefinition>
+        <UML:TagDefinition xmi.id = 'Im2f318ff0m10f022339eamm7498' name = 'actionStereotype'
+          isSpecification = 'false'>
+          <UML:TagDefinition.multiplicity>
+            <UML:Multiplicity xmi.id = 'Im2f318ff0m10f022339eamm7497'>
+              <UML:Multiplicity.range>
+                <UML:MultiplicityRange xmi.id = 'Im2f318ff0m10f022339eamm7496' lower = '1'
+                  upper = '1'/>
+              </UML:Multiplicity.range>
+            </UML:Multiplicity>
+          </UML:TagDefinition.multiplicity>
+        </UML:TagDefinition>
         <UML:TagDefinition xmi.id = 'I58e7b1cdm10f25aed5abmm62ab' name = 'umlPropertyGetter'
           isSpecification = 'false'>
           <UML:TagDefinition.multiplicity>
@@ -1786,6 +1857,39 @@
             </UML:Multiplicity>
           </UML:TagDefinition.multiplicity>
         </UML:TagDefinition>
+        <UML:TagDefinition xmi.id = 'Im29148917m10f4500f61dmm7474' name = 'umlPropertyName'
+          isSpecification = 'false'>
+          <UML:TagDefinition.multiplicity>
+            <UML:Multiplicity xmi.id = 'Im29148917m10f4500f61dmm7473'>
+              <UML:Multiplicity.range>
+                <UML:MultiplicityRange xmi.id = 'Im29148917m10f4500f61dmm7472' lower = '1'
+                  upper = '1'/>
+              </UML:Multiplicity.range>
+            </UML:Multiplicity>
+          </UML:TagDefinition.multiplicity>
+        </UML:TagDefinition>
+        <UML:TagDefinition xmi.id = 'Im29148917m10f4500f61dmm744f' name = 'umlPropertyGetter'
+          isSpecification = 'false'>
+          <UML:TagDefinition.multiplicity>
+            <UML:Multiplicity xmi.id = 'Im29148917m10f4500f61dmm744e'>
+              <UML:Multiplicity.range>
+                <UML:MultiplicityRange xmi.id = 'Im29148917m10f4500f61dmm744d' lower = '1'
+                  upper = '1'/>
+              </UML:Multiplicity.range>
+            </UML:Multiplicity>
+          </UML:TagDefinition.multiplicity>
+        </UML:TagDefinition>
+        <UML:TagDefinition xmi.id = 'Im29148917m10f4500f61dmm744b' name = 'foobar'
+          isSpecification = 'false'>
+          <UML:TagDefinition.multiplicity>
+            <UML:Multiplicity xmi.id = 'Im29148917m10f4500f61dmm744a'>
+              <UML:Multiplicity.range>
+                <UML:MultiplicityRange xmi.id = 'Im29148917m10f4500f61dmm7449' lower = '1'
+                  upper = '1'/>
+              </UML:Multiplicity.range>
+            </UML:Multiplicity>
+          </UML:TagDefinition.multiplicity>
+        </UML:TagDefinition>
         <UML:TagDefinition xmi.id = 'Im29148917m10f4500f61dmm72e7' name = 'subactionsDefinition'
           isSpecification = 'false'>
           <UML:TagDefinition.multiplicity>
@@ -1797,6 +1901,50 @@
             </UML:Multiplicity>
           </UML:TagDefinition.multiplicity>
         </UML:TagDefinition>
+        <UML:TagDefinition xmi.id = 'Im29148917m10f4500f61dmm72e3' name = 'subactionsDefinition'
+          isSpecification = 'false'>
+          <UML:TagDefinition.multiplicity>
+            <UML:Multiplicity xmi.id = 'Im29148917m10f4500f61dmm72e2'>
+              <UML:Multiplicity.range>
+                <UML:MultiplicityRange xmi.id = 'Im29148917m10f4500f61dmm72e1' lower = '1'
+                  upper = '1'/>
+              </UML:Multiplicity.range>
+            </UML:Multiplicity>
+          </UML:TagDefinition.multiplicity>
+        </UML:TagDefinition>
+        <UML:TagDefinition xmi.id = 'Im29148917m10f4500f61dmm72df' name = 'subactionsDefinition'
+          isSpecification = 'false'>
+          <UML:TagDefinition.multiplicity>
+            <UML:Multiplicity xmi.id = 'Im29148917m10f4500f61dmm72de'>
+              <UML:Multiplicity.range>
+                <UML:MultiplicityRange xmi.id = 'Im29148917m10f4500f61dmm72dd' lower = '1'
+                  upper = '1'/>
+              </UML:Multiplicity.range>
+            </UML:Multiplicity>
+          </UML:TagDefinition.multiplicity>
+        </UML:TagDefinition>
+        <UML:TagDefinition xmi.id = 'Im29148917m10f4500f61dmm72db' name = 'subactionsDefinition'
+          isSpecification = 'false'>
+          <UML:TagDefinition.multiplicity>
+            <UML:Multiplicity xmi.id = 'Im29148917m10f4500f61dmm72da'>
+              <UML:Multiplicity.range>
+                <UML:MultiplicityRange xmi.id = 'Im29148917m10f4500f61dmm72d9' lower = '1'
+                  upper = '1'/>
+              </UML:Multiplicity.range>
+            </UML:Multiplicity>
+          </UML:TagDefinition.multiplicity>
+        </UML:TagDefinition>
+        <UML:TagDefinition xmi.id = 'Im29148917m10f4500f61dmm72d7' name = 'subactionsDefinition'
+          isSpecification = 'false'>
+          <UML:TagDefinition.multiplicity>
+            <UML:Multiplicity xmi.id = 'Im29148917m10f4500f61dmm72d6'>
+              <UML:Multiplicity.range>
+                <UML:MultiplicityRange xmi.id = 'Im29148917m10f4500f61dmm72d5' lower = '1'
+                  upper = '1'/>
+              </UML:Multiplicity.range>
+            </UML:Multiplicity>
+          </UML:TagDefinition.multiplicity>
+        </UML:TagDefinition>
         <UML:Class xmi.id = 'Im29148917m10f4500f61dmm66c1' name = 'java::lang::int'
           visibility = 'public' isSpecification = 'false' isRoot = 'false' isLeaf = 'false'
           isAbstract = 'false' isActive = 'false'/>
@@ -1814,17 +1962,6 @@
             </UML:Multiplicity>
           </UML:TagDefinition.multiplicity>
         </UML:TagDefinition>
-        <UML:TagDefinition xmi.id = '127-0-1-1-2d5ea25d:11e267b90d9:-8000:0000000000000F0C'
-          name = 'umlAssociationName' isSpecification = 'false'>
-          <UML:TagDefinition.multiplicity>
-            <UML:Multiplicity xmi.id = '127-0-1-1-2d5ea25d:11e267b90d9:-8000:0000000000000F0D'>
-              <UML:Multiplicity.range>
-                <UML:MultiplicityRange xmi.id = '127-0-1-1-2d5ea25d:11e267b90d9:-8000:0000000000000F0E'
-                  lower = '0' upper = '1'/>
-              </UML:Multiplicity.range>
-            </UML:Multiplicity>
-          </UML:TagDefinition.multiplicity>
-        </UML:TagDefinition>
       </UML:Namespace.ownedElement>
     </UML:Model>
   </XMI.content>
diff --git a/metamodels/securecomponentuml_uml.zargo b/metamodels/securecomponentuml_uml.zargo
index 48eecc4..2942906 100644
Binary files a/metamodels/securecomponentuml_uml.zargo and b/metamodels/securecomponentuml_uml.zargo differ