diff --git a/src/main/conf/module.xml b/src/main/conf/module.xml
index a5a82f9c..ef66d998 100644
--- a/src/main/conf/module.xml
+++ b/src/main/conf/module.xml
@@ -1,2335 +1,1306 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Module author="Softeam" binaryversion="4.1.0"
-    class="fr.softeam.cameldesigner.impl.CamelDesignerModule"
-    id="${project.name}" image="" schema-level="2"
-    uid="dc1688c2-8bd2-4585-a786-b1b5877996d7" url="" version="${project.version}">
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<Module id="${project.name}" class="fr.softeam.cameldesigner.impl.CamelDesignerModule" binaryversion="4.1.0" version="${project.version}" schema-level="2" uid="dc1688c2-8bd2-4585-a786-b1b5877996d7" author="Softeam" image="" url="">
     <ClassPath>
         <PathEntry path="lib/${project.artifactId}-${project.version}.jar"/>
+        <PathEntry path="lib/com.google.guava-21.0.0-SNAPSHOT.jar"/>
+        <PathEntry path="lib/org.eclipse.emf.mwe.core-1.3.21-SNAPSHOT.jar"/>
+        <PathEntry path="lib/org.eclipse.emf.mwe2.runtime-2.9.1-SNAPSHOT.jar"/>
+        <PathEntry path="lib/org.eclipse.emf.mwe.utils-1.3.21-SNAPSHOT.jar"/>
+        <PathEntry path="lib/CamelDSLExporter-3.0.0-SNAPSHOT.jar"/>
+        <PathEntry path="lib/com.google.guava-21.0.0-SNAPSHOT.jar"/>
+        <PathEntry path="lib/org.eclipse.emf.mwe.core-1.3.21-SNAPSHOT.jar"/>
+        <PathEntry path="lib/org.eclipse.emf.mwe2.runtime-2.9.1-SNAPSHOT.jar"/>
+        <PathEntry path="lib/org.eclipse.emf.mwe.utils-1.3.21-SNAPSHOT.jar"/>
+        <PathEntry path="lib/CamelDSLExporter-3.0.0-SNAPSHOT.jar"/>
+        <PathEntry path="lib/com.google.guava-21.0.0-SNAPSHOT.jar"/>
+        <PathEntry path="lib/org.eclipse.emf.mwe.core-1.3.21-SNAPSHOT.jar"/>
+        <PathEntry path="lib/org.eclipse.emf.mwe2.runtime-2.9.1-SNAPSHOT.jar"/>
+        <PathEntry path="lib/org.eclipse.emf.mwe.utils-1.3.21-SNAPSHOT.jar"/>
+        <PathEntry path="lib/CamelDSLExporter-3.0.0-SNAPSHOT.jar"/>
+        <PathEntry path="lib/com.google.guava-21.0.0-SNAPSHOT.jar"/>
+        <PathEntry path="lib/org.eclipse.emf.mwe.core-1.3.21-SNAPSHOT.jar"/>
+        <PathEntry path="lib/org.eclipse.emf.mwe2.runtime-2.9.1-SNAPSHOT.jar"/>
+        <PathEntry path="lib/org.eclipse.emf.mwe.utils-1.3.21-SNAPSHOT.jar"/>
+        <PathEntry path="lib/CamelDSLExporter-3.0.0-SNAPSHOT.jar"/>
+        <PathEntry path="lib/com.google.guava-21.0.0-SNAPSHOT.jar"/>
+        <PathEntry path="lib/org.eclipse.emf.mwe.core-1.3.21-SNAPSHOT.jar"/>
+        <PathEntry path="lib/org.eclipse.emf.mwe2.runtime-2.9.1-SNAPSHOT.jar"/>
+        <PathEntry path="lib/org.eclipse.emf.mwe.utils-1.3.21-SNAPSHOT.jar"/>
+        <PathEntry path="lib/CamelDSLExporter-3.0.0-SNAPSHOT.jar"/>
+        <PathEntry path="lib/inject-3.0.0.jar"/>
+        <PathEntry path="lib/registry-3.7.0.jar"/>
+        <PathEntry path="lib/xtext-2.12.0.jar"/>
+        <PathEntry path="lib/inject-1.0.0.jar"/>
+        <PathEntry path="lib/com.google.guava-21.0.0-SNAPSHOT.jar"/>
+        <PathEntry path="lib/oclstdlib-1.3.0.jar"/>
+        <PathEntry path="lib/state-1.1.0.jar"/>
+        <PathEntry path="lib/java-2.0.17.jar"/>
+        <PathEntry path="lib/net4j-4.6.0.jar"/>
+        <PathEntry path="lib/osgi-3.12.100.jar"/>
+        <PathEntry path="lib/common-3.9.0.jar"/>
+        <PathEntry path="lib/ecore-2.13.0.jar"/>
+        <PathEntry path="lib/uml-5.2.200.jar"/>
+        <PathEntry path="lib/log4j-1.2.15.jar"/>
+        <PathEntry path="lib/runtime-3.13.0.jar"/>
+        <PathEntry path="lib/edit-2.12.0.jar"/>
+        <PathEntry path="lib/net4j-4.1.500.jar"/>
+        <PathEntry path="lib/multibindings-3.0.0.jar"/>
+        <PathEntry path="lib/app-1.3.400.jar"/>
+        <PathEntry path="lib/pivot-1.3.0.jar"/>
+        <PathEntry path="lib/jobs-3.9.3.jar"/>
+        <PathEntry path="lib/completeocl-1.3.0.jar"/>
+        <PathEntry path="lib/common-2.13.0.jar"/>
+        <PathEntry path="lib/oclinecore-1.3.0.jar"/>
+        <PathEntry path="lib/org.eclipse.emf.mwe.core-1.3.21-SNAPSHOT.jar"/>
+        <PathEntry path="lib/base-1.3.0.jar"/>
+        <PathEntry path="lib/security-4.3.200.jar"/>
+        <PathEntry path="lib/cli-1.2.0.jar"/>
+        <PathEntry path="lib/expressions-4.3.200.jar"/>
+        <PathEntry path="lib/common-1.4.200.jar"/>
+        <PathEntry path="lib/xmi-2.13.0.jar"/>
+        <PathEntry path="lib/preferences-3.7.0.jar"/>
+        <PathEntry path="lib/common-4.6.0.jar"/>
+        <PathEntry path="lib/api-1.7.2.jar"/>
+        <PathEntry path="lib/org.eclipse.emf.mwe2.runtime-2.9.1-SNAPSHOT.jar"/>
+        <PathEntry path="lib/tcp-4.1.500.jar"/>
+        <PathEntry path="lib/runtime-3.2.0.jar"/>
+        <PathEntry path="lib/essentialocl-1.3.0.jar"/>
+        <PathEntry path="lib/org.eclipse.emf.mwe.utils-1.3.21-SNAPSHOT.jar"/>
+        <PathEntry path="lib/util-3.7.0.jar"/>
+        <PathEntry path="lib/CamelDSLExporter-3.0.0-SNAPSHOT.jar"/>
+        <PathEntry path="lib/contenttype-3.6.0.jar"/>
+        <PathEntry path="lib/ocl-3.6.200.jar"/>
+        <PathEntry path="lib/ecore-3.6.200.jar"/>
+        <PathEntry path="lib/annotation-2.1.150.jar"/>
+        <PathEntry path="lib/change-2.11.0.jar"/>
+        <PathEntry path="lib/cdo-4.6.0.jar"/>
+        <PathEntry path="lib/util-2.12.0.jar"/>
     </ClassPath>
     <Profiles>
-        <Profile id="CamelCore" uid="28a1b85d-93b2-47f7-845a-f4883b71ded5">
-            <Stereotype is-abstract="true" is-hidden="true"
-                label="%stereotype.Action.label"
-                metaclass="Standard.NameSpace" name="Action"
-                owner-stereotype="mref#'' {1ff10997-aa56-4f9b-b413-f32fadcc29bb} Infrastructure.Stereotype" uid="b23cd4a9-cc6d-43b4-b5fc-fbab5abf866b">
+        <Profile uid="28a1b85d-93b2-47f7-845a-f4883b71ded5" id="CamelCore">
+            <Stereotype name="Action" metaclass="Standard.NameSpace" owner-stereotype="mref#'' {1ff10997-aa56-4f9b-b413-f32fadcc29bb} Infrastructure.Stereotype" is-hidden="true" label="%stereotype.Action.label" uid="b23cd4a9-cc6d-43b4-b5fc-fbab5abf866b" is-abstract="true">
                 <Icon path=""/>
                 <Image path=""/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.Annotation.label"
-                metaclass="Infrastructure.Dependency" name="Annotation"
-                owner-stereotype="mref#'' {9aef4bd8-fa92-4231-9295-3eb5a619ceab} Infrastructure.Stereotype" uid="6ac7f831-f2b4-447b-ba9e-e58f7834bcf7">
+            <Stereotype name="Annotation" metaclass="Infrastructure.Dependency" owner-stereotype="mref#'' {9aef4bd8-fa92-4231-9295-3eb5a619ceab} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.Annotation.label" uid="6ac7f831-f2b4-447b-ba9e-e58f7834bcf7" is-abstract="false">
                 <Icon path=""/>
                 <Image path=""/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.Application.label"
-                metaclass="Standard.Class" name="Application"
-                owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" uid="46979e9e-2d44-4099-afdf-62d13a0b1d25">
+            <Stereotype name="Application" metaclass="Standard.Class" owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.Application.label" uid="46979e9e-2d44-4099-afdf-62d13a0b1d25" is-abstract="false">
                 <Icon path="res/icon/gui/CoreModelEmpty_24.png"/>
                 <Image path="res/icon/gui/CoreModelEmpty_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.version.label" name="version"
-                        parameter-card="1" uid="a33973d1-0249-418d-b3fd-1ccbbe910d72"/>
+                    <TagType name="version" uid="a33973d1-0249-418d-b3fd-1ccbbe910d72" label="%tagtype.version.label" parameter-card="1" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.Attribute_Attribute.label"
-                metaclass="Standard.Attribute"
-                name="Attribute_Attribute"
-                owner-stereotype="mref#'' {342512a5-ad9b-48b8-a454-5fd44237b8f2} Infrastructure.Stereotype" uid="02d333e9-0603-47b3-87bb-b2a311cc65dd">
+            <Stereotype name="Attribute_Attribute" metaclass="Standard.Attribute" owner-stereotype="mref#'' {342512a5-ad9b-48b8-a454-5fd44237b8f2} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.Attribute_Attribute.label" uid="02d333e9-0603-47b3-87bb-b2a311cc65dd" is-abstract="false">
                 <Icon path="res/icon/gui/Attribute_24.png"/>
                 <Image path=""/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.Attribute_Class.label"
-                metaclass="Standard.Class" name="Attribute_Class"
-                owner-stereotype="mref#'' {342512a5-ad9b-48b8-a454-5fd44237b8f2} Infrastructure.Stereotype" uid="b062f4ef-e492-4b34-9caa-bdd63d717cb9">
+            <Stereotype name="Attribute_Class" metaclass="Standard.Class" owner-stereotype="mref#'' {342512a5-ad9b-48b8-a454-5fd44237b8f2} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.Attribute_Class.label" uid="b062f4ef-e492-4b34-9caa-bdd63d717cb9" is-abstract="false">
                 <Icon path="res/icon/gui/Attribute_24.png"/>
                 <Image path="res/icon/gui/CoreModelEmpty_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.Value.label" name="Value"
-                        parameter-card="1" uid="d3cee445-f1e5-4752-ad1b-6ffb45d35a89"/>
+                    <TagType name="Value" uid="d3cee445-f1e5-4752-ad1b-6ffb45d35a89" label="%tagtype.Value.label" parameter-card="1" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="true" is-hidden="true"
-                label="%stereotype.CamelAttribute.label"
-                metaclass="Infrastructure.ModelElement"
-                name="CamelAttribute"
-                owner-stereotype="mref#'' {f81fdaa1-17e1-49a4-bf1f-60c18563c100} Infrastructure.Stereotype" uid="342512a5-ad9b-48b8-a454-5fd44237b8f2">
+            <Stereotype name="CamelAttribute" metaclass="Infrastructure.ModelElement" owner-stereotype="mref#'' {f81fdaa1-17e1-49a4-bf1f-60c18563c100} Infrastructure.Stereotype" is-hidden="true" label="%stereotype.CamelAttribute.label" uid="342512a5-ad9b-48b8-a454-5fd44237b8f2" is-abstract="true">
                 <Icon path=""/>
                 <Image path=""/>
             </Stereotype>
-            <Stereotype is-abstract="true" is-hidden="true"
-                label="%stereotype.CamelElement.label"
-                metaclass="Infrastructure.ModelElement"
-                name="CamelElement" owner-stereotype="" uid="9aef4bd8-fa92-4231-9295-3eb5a619ceab">
+            <Stereotype name="CamelElement" metaclass="Infrastructure.ModelElement" owner-stereotype="" is-hidden="true" label="%stereotype.CamelElement.label" uid="9aef4bd8-fa92-4231-9295-3eb5a619ceab" is-abstract="true">
                 <Icon path=""/>
                 <Image path=""/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.CamelModel.label"
-                metaclass="Standard.Package" name="CamelModel"
-                owner-stereotype="mref#'' {f81fdaa1-17e1-49a4-bf1f-60c18563c100} Infrastructure.Stereotype" uid="e33cb0ef-7003-4579-8739-638c171ab891">
+            <Stereotype name="CamelModel" metaclass="Standard.Package" owner-stereotype="mref#'' {f81fdaa1-17e1-49a4-bf1f-60c18563c100} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.CamelModel.label" uid="e33cb0ef-7003-4579-8739-638c171ab891" is-abstract="false">
                 <Icon path="res/icon/gui/CamelModel_24.png"/>
                 <Image path=""/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.applicationName.label"
-                        name="applicationName" parameter-card="1" uid="1e31728e-d8b4-4498-9d67-219b020ee5ff"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.applicationVersion.label"
-                        name="applicationVersion" parameter-card="1" uid="bd5b684e-453d-4203-a1ac-e24d368f74ad"/>
+                    <TagType name="applicationName" uid="1e31728e-d8b4-4498-9d67-219b020ee5ff" label="%tagtype.applicationName.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="applicationVersion" uid="bd5b684e-453d-4203-a1ac-e24d368f74ad" label="%tagtype.applicationVersion.label" parameter-card="1" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="true" is-hidden="true"
-                label="%stereotype.ExpendableElement.label"
-                metaclass="Infrastructure.ModelElement"
-                name="ExpendableElement"
-                owner-stereotype="mref#'' {0fcc7434-c82f-4c57-a814-8a9233fdc9b0} Infrastructure.Stereotype" uid="f81fdaa1-17e1-49a4-bf1f-60c18563c100">
+            <Stereotype name="ExpendableElement" metaclass="Infrastructure.ModelElement" owner-stereotype="mref#'' {0fcc7434-c82f-4c57-a814-8a9233fdc9b0} Infrastructure.Stereotype" is-hidden="true" label="%stereotype.ExpendableElement.label" uid="f81fdaa1-17e1-49a4-bf1f-60c18563c100" is-abstract="true">
                 <Icon path=""/>
                 <Image path=""/>
             </Stereotype>
-            <Stereotype is-abstract="true" is-hidden="true"
-                label="%stereotype.Feature.label"
-                metaclass="Infrastructure.ModelElement" name="Feature"
-                owner-stereotype="mref#'' {f81fdaa1-17e1-49a4-bf1f-60c18563c100} Infrastructure.Stereotype" uid="1ff10997-aa56-4f9b-b413-f32fadcc29bb">
+            <Stereotype name="Feature" metaclass="Infrastructure.ModelElement" owner-stereotype="mref#'' {f81fdaa1-17e1-49a4-bf1f-60c18563c100} Infrastructure.Stereotype" is-hidden="true" label="%stereotype.Feature.label" uid="1ff10997-aa56-4f9b-b413-f32fadcc29bb" is-abstract="true">
                 <Icon path=""/>
                 <Image path=""/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.Feature_Artifact.label"
-                metaclass="Standard.Artifact" name="Feature_Artifact"
-                owner-stereotype="mref#'' {7c5a3627-4282-427f-93a3-957cdca1adb7} Infrastructure.Stereotype" uid="4fc85f6a-6ece-4e79-b662-e20cb7f28cea">
+            <Stereotype name="Feature_Artifact" metaclass="Standard.Artifact" owner-stereotype="mref#'' {7c5a3627-4282-427f-93a3-957cdca1adb7} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.Feature_Artifact.label" uid="4fc85f6a-6ece-4e79-b662-e20cb7f28cea" is-abstract="false">
                 <Icon path="res/icon/gui/Feature_24.png"/>
                 <Image path=""/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.Feature_Class.label"
-                metaclass="Standard.Class" name="Feature_Class"
-                owner-stereotype="mref#'' {7c5a3627-4282-427f-93a3-957cdca1adb7} Infrastructure.Stereotype" uid="babf8276-c4d4-4d86-b02b-d20c6636d937">
+            <Stereotype name="Feature_Class" metaclass="Standard.Class" owner-stereotype="mref#'' {7c5a3627-4282-427f-93a3-957cdca1adb7} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.Feature_Class.label" uid="babf8276-c4d4-4d86-b02b-d20c6636d937" is-abstract="false">
                 <Icon path="res/icon/gui/Feature_24.png"/>
                 <Image path=""/>
             </Stereotype>
-            <Stereotype is-abstract="true" is-hidden="true"
-                label="%stereotype.Feature_Classifier.label"
-                metaclass="Standard.Classifier"
-                name="Feature_Classifier"
-                owner-stereotype="mref#'' {1ff10997-aa56-4f9b-b413-f32fadcc29bb} Infrastructure.Stereotype" uid="7c5a3627-4282-427f-93a3-957cdca1adb7">
+            <Stereotype name="Feature_Classifier" metaclass="Standard.Classifier" owner-stereotype="mref#'' {1ff10997-aa56-4f9b-b413-f32fadcc29bb} Infrastructure.Stereotype" is-hidden="true" label="%stereotype.Feature_Classifier.label" uid="7c5a3627-4282-427f-93a3-957cdca1adb7" is-abstract="true">
                 <Icon path=""/>
                 <Image path=""/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.Feature_Connector.label"
-                metaclass="Standard.Connector" name="Feature_Connector"
-                owner-stereotype="mref#'' {1ff10997-aa56-4f9b-b413-f32fadcc29bb} Infrastructure.Stereotype" uid="e94d1d27-429c-47ce-a373-e940bf1bf49b">
+            <Stereotype name="Feature_Connector" metaclass="Standard.Connector" owner-stereotype="mref#'' {1ff10997-aa56-4f9b-b413-f32fadcc29bb} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.Feature_Connector.label" uid="e94d1d27-429c-47ce-a373-e940bf1bf49b" is-abstract="false">
                 <Icon path="res/icon/gui/Feature_24.png"/>
                 <Image path=""/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.Feature_DataType.label"
-                metaclass="Standard.DataType" name="Feature_DataType"
-                owner-stereotype="mref#'' {7c5a3627-4282-427f-93a3-957cdca1adb7} Infrastructure.Stereotype" uid="eaf56346-fbac-4409-ad4f-4e1a6c4183d1">
+            <Stereotype name="Feature_DataType" metaclass="Standard.DataType" owner-stereotype="mref#'' {7c5a3627-4282-427f-93a3-957cdca1adb7} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.Feature_DataType.label" uid="eaf56346-fbac-4409-ad4f-4e1a6c4183d1" is-abstract="false">
                 <Icon path="res/icon/gui/Feature_24.png"/>
                 <Image path=""/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.Feature_Enumeration.label"
-                metaclass="Standard.Enumeration"
-                name="Feature_Enumeration"
-                owner-stereotype="mref#'' {7c5a3627-4282-427f-93a3-957cdca1adb7} Infrastructure.Stereotype" uid="56eb7780-c162-400f-8e4b-0a5178cef153">
+            <Stereotype name="Feature_Enumeration" metaclass="Standard.Enumeration" owner-stereotype="mref#'' {7c5a3627-4282-427f-93a3-957cdca1adb7} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.Feature_Enumeration.label" uid="56eb7780-c162-400f-8e4b-0a5178cef153" is-abstract="false">
                 <Icon path="res/icon/gui/Feature_24.png"/>
                 <Image path=""/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.Feature_Instance.label"
-                metaclass="Standard.Instance" name="Feature_Instance"
-                owner-stereotype="mref#'' {1ff10997-aa56-4f9b-b413-f32fadcc29bb} Infrastructure.Stereotype" uid="df209aca-1325-4c99-b383-ca2650224ff6">
+            <Stereotype name="Feature_Instance" metaclass="Standard.Instance" owner-stereotype="mref#'' {1ff10997-aa56-4f9b-b413-f32fadcc29bb} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.Feature_Instance.label" uid="df209aca-1325-4c99-b383-ca2650224ff6" is-abstract="false">
                 <Icon path="res/icon/gui/Feature_24.png"/>
                 <Image path=""/>
             </Stereotype>
-            <Stereotype is-abstract="true" is-hidden="true"
-                label="%stereotype.Feature_Package.label"
-                metaclass="Standard.Package" name="Feature_Package"
-                owner-stereotype="mref#'' {1ff10997-aa56-4f9b-b413-f32fadcc29bb} Infrastructure.Stereotype" uid="9a524454-5126-4778-9cec-5eae95e4f160">
+            <Stereotype name="Feature_Package" metaclass="Standard.Package" owner-stereotype="mref#'' {1ff10997-aa56-4f9b-b413-f32fadcc29bb} Infrastructure.Stereotype" is-hidden="true" label="%stereotype.Feature_Package.label" uid="9a524454-5126-4778-9cec-5eae95e4f160" is-abstract="true">
                 <Icon path="res/icon/gui/Feature_24.png"/>
                 <Image path=""/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.Feature_Port.label"
-                metaclass="Standard.Port" name="Feature_Port"
-                owner-stereotype="mref#'' {df209aca-1325-4c99-b383-ca2650224ff6} Infrastructure.Stereotype" uid="18d0504c-73e0-4c7c-8341-53038298af2c">
+            <Stereotype name="Feature_Port" metaclass="Standard.Port" owner-stereotype="mref#'' {df209aca-1325-4c99-b383-ca2650224ff6} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.Feature_Port.label" uid="18d0504c-73e0-4c7c-8341-53038298af2c" is-abstract="false">
                 <Icon path="res/icon/gui/Feature_24.png"/>
                 <Image path=""/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.MeasurableAttribute_Attribute.label"
-                metaclass="Standard.Attribute"
-                name="MeasurableAttribute_Attribute"
-                owner-stereotype="mref#'' {affcb570-9c14-4702-aacd-86bdbea720ff} Infrastructure.Stereotype" uid="0904c020-0de8-4170-8d49-131f2ce38022">
+            <Stereotype name="MeasurableAttribute_Attribute" metaclass="Standard.Attribute" owner-stereotype="mref#'' {affcb570-9c14-4702-aacd-86bdbea720ff} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.MeasurableAttribute_Attribute.label" uid="0904c020-0de8-4170-8d49-131f2ce38022" is-abstract="false">
                 <Icon path="res/icon/gui/MeasurableAttribute_24.png"/>
                 <Image path="res/icon/gui/MeasurableAttribute_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.MeasurableAttribute_Class.label"
-                metaclass="Standard.Class"
-                name="MeasurableAttribute_Class"
-                owner-stereotype="mref#'' {ef0c1237-df8a-4bfc-8f0b-d3ad72e39bf4} Infrastructure.Stereotype" uid="41f442d8-cf5f-4e6c-a842-47675cf36361">
+            <Stereotype name="MeasurableAttribute_Class" metaclass="Standard.Class" owner-stereotype="mref#'' {ef0c1237-df8a-4bfc-8f0b-d3ad72e39bf4} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.MeasurableAttribute_Class.label" uid="41f442d8-cf5f-4e6c-a842-47675cf36361" is-abstract="false">
                 <Icon path="res/icon/gui/MeasurableAttribute_24.png"/>
                 <Image path="res/icon/gui/MeasurableAttribute_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="true" is-hidden="true"
-                label="%stereotype.NamedElement.label"
-                metaclass="Infrastructure.ModelElement"
-                name="NamedElement"
-                owner-stereotype="mref#'' {9aef4bd8-fa92-4231-9295-3eb5a619ceab} Infrastructure.Stereotype" uid="0fcc7434-c82f-4c57-a814-8a9233fdc9b0">
+            <Stereotype name="NamedElement" metaclass="Infrastructure.ModelElement" owner-stereotype="mref#'' {9aef4bd8-fa92-4231-9295-3eb5a619ceab} Infrastructure.Stereotype" is-hidden="true" label="%stereotype.NamedElement.label" uid="0fcc7434-c82f-4c57-a814-8a9233fdc9b0" is-abstract="true">
                 <Icon path=""/>
                 <Image path=""/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.PropertyDependency.label"
-                metaclass="Infrastructure.Dependency"
-                name="PropertyDependency"
-                owner-stereotype="mref#'' {9aef4bd8-fa92-4231-9295-3eb5a619ceab} Infrastructure.Stereotype" uid="738c4b6c-0cf3-4276-b6d9-7fe4ec31ff01">
+            <Stereotype name="PropertyDependency" metaclass="Infrastructure.Dependency" owner-stereotype="mref#'' {9aef4bd8-fa92-4231-9295-3eb5a619ceab} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.PropertyDependency.label" uid="738c4b6c-0cf3-4276-b6d9-7fe4ec31ff01" is-abstract="false">
                 <Icon path="res/icon/gui/CoreModelEmpty_24.png"/>
                 <Image path="res/icon/gui/CoreModelEmpty_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="true"
-                label="%stereotype.QualityAttribute_Attribute.label"
-                metaclass="Standard.Attribute"
-                name="QualityAttribute_Attribute"
-                owner-stereotype="mref#'' {02d333e9-0603-47b3-87bb-b2a311cc65dd} Infrastructure.Stereotype" uid="affcb570-9c14-4702-aacd-86bdbea720ff">
+            <Stereotype name="QualityAttribute_Attribute" metaclass="Standard.Attribute" owner-stereotype="mref#'' {02d333e9-0603-47b3-87bb-b2a311cc65dd} Infrastructure.Stereotype" is-hidden="true" label="%stereotype.QualityAttribute_Attribute.label" uid="affcb570-9c14-4702-aacd-86bdbea720ff" is-abstract="false">
                 <Icon path="res/icon/gui/CoreModelEmpty_24.png"/>
                 <Image path="res/icon/gui/CoreModelEmpty_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.QualityAttribute_Class.label"
-                metaclass="Standard.Class" name="QualityAttribute_Class"
-                owner-stereotype="mref#'' {b062f4ef-e492-4b34-9caa-bdd63d717cb9} Infrastructure.Stereotype" uid="ef0c1237-df8a-4bfc-8f0b-d3ad72e39bf4">
+            <Stereotype name="QualityAttribute_Class" metaclass="Standard.Class" owner-stereotype="mref#'' {b062f4ef-e492-4b34-9caa-bdd63d717cb9} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.QualityAttribute_Class.label" uid="ef0c1237-df8a-4bfc-8f0b-d3ad72e39bf4" is-abstract="false">
                 <Icon path="res/icon/gui/CoreModelEmpty_24.png"/>
                 <Image path="res/icon/gui/CoreModelEmpty_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="true" is-hidden="true"
-                label="%stereotype.SubModel.label"
-                metaclass="Standard.Package" name="SubModel"
-                owner-stereotype="mref#'' {9a524454-5126-4778-9cec-5eae95e4f160} Infrastructure.Stereotype" uid="577c153e-42b8-4f36-9686-1a6109ffdc16">
+            <Stereotype name="SubModel" metaclass="Standard.Package" owner-stereotype="mref#'' {9a524454-5126-4778-9cec-5eae95e4f160} Infrastructure.Stereotype" is-hidden="true" label="%stereotype.SubModel.label" uid="577c153e-42b8-4f36-9686-1a6109ffdc16" is-abstract="true">
                 <Icon path=""/>
                 <Image path=""/>
             </Stereotype>
         </Profile>
-        <Profile id="CamelDiagrams" uid="87d25481-b81a-4679-9e56-88df8ddc5bc9">
-            <Stereotype is-abstract="true" is-hidden="true"
-                label="%stereotype.AbstractCamelDiagram.label"
-                metaclass="Infrastructure.AbstractDiagram"
-                name="AbstractCamelDiagram"
-                owner-stereotype="mref#'' {f81fdaa1-17e1-49a4-bf1f-60c18563c100} Infrastructure.Stereotype" uid="c147d6d3-8bd0-4b94-a9d6-164a947fa0b4">
+        <Profile uid="87d25481-b81a-4679-9e56-88df8ddc5bc9" id="CamelDiagrams">
+            <Stereotype name="AbstractCamelDiagram" metaclass="Infrastructure.AbstractDiagram" owner-stereotype="mref#'' {f81fdaa1-17e1-49a4-bf1f-60c18563c100} Infrastructure.Stereotype" is-hidden="true" label="%stereotype.AbstractCamelDiagram.label" uid="c147d6d3-8bd0-4b94-a9d6-164a947fa0b4" is-abstract="true">
                 <Icon path=""/>
                 <Image path=""/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.CamelModelDiagram.label"
-                metaclass="Standard.ClassDiagram"
-                name="CamelModelDiagram"
-                owner-stereotype="mref#'' {c147d6d3-8bd0-4b94-a9d6-164a947fa0b4} Infrastructure.Stereotype" uid="eec7381e-4c61-4f7c-9a1c-210f2fe38377">
+            <Stereotype name="CamelModelDiagram" metaclass="Standard.ClassDiagram" owner-stereotype="mref#'' {c147d6d3-8bd0-4b94-a9d6-164a947fa0b4} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.CamelModelDiagram.label" uid="eec7381e-4c61-4f7c-9a1c-210f2fe38377" is-abstract="false">
                 <Icon path="res/icon/gui/CamelModelDiagram_24.png"/>
                 <Image path="res/icon/gui/CamelModelDiagram_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.CamelViewPoint.label"
-                metaclass="Standard.ClassDiagram" name="CamelViewPoint"
-                owner-stereotype="" uid="e46b07f3-2bf2-48c1-8218-3a31ce9fa75d">
+            <Stereotype name="CamelViewPoint" metaclass="Standard.ClassDiagram" owner-stereotype="" is-hidden="false" label="%stereotype.CamelViewPoint.label" uid="e46b07f3-2bf2-48c1-8218-3a31ce9fa75d" is-abstract="false">
                 <Icon path="res/icon/gui/CamelViewPoint_24.png"/>
                 <Image path="res/icon/gui/CamelViewPoint_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.ConstraintModelDiagram.label"
-                metaclass="Standard.ClassDiagram"
-                name="ConstraintModelDiagram"
-                owner-stereotype="mref#'' {c147d6d3-8bd0-4b94-a9d6-164a947fa0b4} Infrastructure.Stereotype" uid="62499a4d-4037-4aef-bb40-8b5495465a22">
+            <Stereotype name="ConstraintModelDiagram" metaclass="Standard.ClassDiagram" owner-stereotype="mref#'' {c147d6d3-8bd0-4b94-a9d6-164a947fa0b4} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.ConstraintModelDiagram.label" uid="62499a4d-4037-4aef-bb40-8b5495465a22" is-abstract="false">
                 <Icon path="res/icon/gui/LogicalConstraint_24.png"/>
                 <Image path="res/icon/gui/constraintModelDiagram_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.DataInstanceModelDiagram.label"
-                metaclass="Standard.ClassDiagram"
-                name="DataInstanceModelDiagram"
-                owner-stereotype="mref#'' {c147d6d3-8bd0-4b94-a9d6-164a947fa0b4} Infrastructure.Stereotype" uid="8ab145ba-4bc6-410d-be7a-b17e36147115">
+            <Stereotype name="DataInstanceModelDiagram" metaclass="Standard.ClassDiagram" owner-stereotype="mref#'' {c147d6d3-8bd0-4b94-a9d6-164a947fa0b4} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.DataInstanceModelDiagram.label" uid="8ab145ba-4bc6-410d-be7a-b17e36147115" is-abstract="false">
                 <Icon path="res/icon/gui/dataInstanceModelDiagram_24.png"/>
                 <Image path=""/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.DataTypeModelDiagram.label"
-                metaclass="Standard.ClassDiagram"
-                name="DataTypeModelDiagram"
-                owner-stereotype="mref#'' {c147d6d3-8bd0-4b94-a9d6-164a947fa0b4} Infrastructure.Stereotype" uid="fc779080-0243-43b7-a1e1-9ddf71de93d7">
+            <Stereotype name="DataTypeModelDiagram" metaclass="Standard.ClassDiagram" owner-stereotype="mref#'' {c147d6d3-8bd0-4b94-a9d6-164a947fa0b4} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.DataTypeModelDiagram.label" uid="fc779080-0243-43b7-a1e1-9ddf71de93d7" is-abstract="false">
                 <Icon path="res/icon/gui/dataModelDiagram_24.png"/>
                 <Image path="res/icon/gui/dataModelDiagram_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.DeploymentInstanceModelDiagram.label"
-                metaclass="Standard.ClassDiagram"
-                name="DeploymentInstanceModelDiagram"
-                owner-stereotype="mref#'' {c147d6d3-8bd0-4b94-a9d6-164a947fa0b4} Infrastructure.Stereotype" uid="b5ff2f96-fb60-424e-ae18-02b24209d1af">
+            <Stereotype name="DeploymentInstanceModelDiagram" metaclass="Standard.ClassDiagram" owner-stereotype="mref#'' {c147d6d3-8bd0-4b94-a9d6-164a947fa0b4} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.DeploymentInstanceModelDiagram.label" uid="b5ff2f96-fb60-424e-ae18-02b24209d1af" is-abstract="false">
                 <Icon path="res/icon/gui/DeploymentInstanceModelDiagram_24.png"/>
                 <Image path="res/icon/gui/DeploymentInstanceModelDiagram_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.DeploymentTypeModelDiagram.label"
-                metaclass="Standard.ClassDiagram"
-                name="DeploymentTypeModelDiagram"
-                owner-stereotype="mref#'' {c147d6d3-8bd0-4b94-a9d6-164a947fa0b4} Infrastructure.Stereotype" uid="b78ff0fe-e31c-4034-ba6a-7a3d0626819e">
+            <Stereotype name="DeploymentTypeModelDiagram" metaclass="Standard.ClassDiagram" owner-stereotype="mref#'' {c147d6d3-8bd0-4b94-a9d6-164a947fa0b4} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.DeploymentTypeModelDiagram.label" uid="b78ff0fe-e31c-4034-ba6a-7a3d0626819e" is-abstract="false">
                 <Icon path="res/icon/gui/DeploymentTypeModelDiagram_24.png"/>
                 <Image path="res/icon/gui/DeploymentTypeModelDiagram_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.ExecutionModelDiagram.label"
-                metaclass="Standard.ClassDiagram"
-                name="ExecutionModelDiagram"
-                owner-stereotype="mref#'' {c147d6d3-8bd0-4b94-a9d6-164a947fa0b4} Infrastructure.Stereotype" uid="40a6ab6a-6df9-40b0-a877-d1de85918a7d">
+            <Stereotype name="ExecutionModelDiagram" metaclass="Standard.ClassDiagram" owner-stereotype="mref#'' {c147d6d3-8bd0-4b94-a9d6-164a947fa0b4} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.ExecutionModelDiagram.label" uid="40a6ab6a-6df9-40b0-a877-d1de85918a7d" is-abstract="false">
                 <Icon path="res/icon/gui/executionModelDiagram_24.png"/>
                 <Image path="res/icon/gui/executionModelDiagram_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.LocationModelDiagram.label"
-                metaclass="Standard.ClassDiagram"
-                name="LocationModelDiagram"
-                owner-stereotype="mref#'' {c147d6d3-8bd0-4b94-a9d6-164a947fa0b4} Infrastructure.Stereotype" uid="8417972e-6235-45f0-b45e-8f6202da12d9">
+            <Stereotype name="LocationModelDiagram" metaclass="Standard.ClassDiagram" owner-stereotype="mref#'' {c147d6d3-8bd0-4b94-a9d6-164a947fa0b4} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.LocationModelDiagram.label" uid="8417972e-6235-45f0-b45e-8f6202da12d9" is-abstract="false">
                 <Icon path="res/icon/gui/locationModelDiagram_24.png"/>
                 <Image path="res/icon/gui/locationModelDiagram_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.MetadataModelDiagram.label"
-                metaclass="Standard.ClassDiagram"
-                name="MetadataModelDiagram"
-                owner-stereotype="mref#'' {c147d6d3-8bd0-4b94-a9d6-164a947fa0b4} Infrastructure.Stereotype" uid="409ebd0d-ecd3-4a8a-95f0-0080c7137e1c">
+            <Stereotype name="MetadataModelDiagram" metaclass="Standard.ClassDiagram" owner-stereotype="mref#'' {c147d6d3-8bd0-4b94-a9d6-164a947fa0b4} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.MetadataModelDiagram.label" uid="409ebd0d-ecd3-4a8a-95f0-0080c7137e1c" is-abstract="false">
                 <Icon path="res/icon/gui/metadataModelDiagram_24.png"/>
                 <Image path="res/icon/gui/metadataModelDiagram_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="true"
-                label="%stereotype.MetricInstanceModelDiagram.label"
-                metaclass="Standard.ClassDiagram"
-                name="MetricInstanceModelDiagram"
-                owner-stereotype="mref#'' {c147d6d3-8bd0-4b94-a9d6-164a947fa0b4} Infrastructure.Stereotype" uid="9acac5e4-9e57-4c77-9274-f1d0aa426dad">
+            <Stereotype name="MetricInstanceModelDiagram" metaclass="Standard.ClassDiagram" owner-stereotype="mref#'' {c147d6d3-8bd0-4b94-a9d6-164a947fa0b4} Infrastructure.Stereotype" is-hidden="true" label="%stereotype.MetricInstanceModelDiagram.label" uid="9acac5e4-9e57-4c77-9274-f1d0aa426dad" is-abstract="false">
                 <Icon path="res/icon/gui/MetricInstanceModelDiagram_24.png"/>
                 <Image path="res/icon/gui/MetricInstanceModelDiagram_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="true"
-                label="%stereotype.MetricTypeModelDiagram.label"
-                metaclass="Standard.ClassDiagram"
-                name="MetricTypeModelDiagram"
-                owner-stereotype="mref#'' {c147d6d3-8bd0-4b94-a9d6-164a947fa0b4} Infrastructure.Stereotype" uid="41062298-9e86-4073-b4a8-713719cfcf90">
+            <Stereotype name="MetricTypeModelDiagram" metaclass="Standard.ClassDiagram" owner-stereotype="mref#'' {c147d6d3-8bd0-4b94-a9d6-164a947fa0b4} Infrastructure.Stereotype" is-hidden="true" label="%stereotype.MetricTypeModelDiagram.label" uid="41062298-9e86-4073-b4a8-713719cfcf90" is-abstract="false">
                 <Icon path="res/icon/gui/MetricTypeModelDiagram_24.png"/>
                 <Image path="res/icon/gui/MetricTypeModelDiagram_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.OrganisationModelDiagram.label"
-                metaclass="Standard.ClassDiagram"
-                name="OrganisationModelDiagram"
-                owner-stereotype="mref#'' {c147d6d3-8bd0-4b94-a9d6-164a947fa0b4} Infrastructure.Stereotype" uid="866330db-6440-4bbe-bd93-4bb567e8f1e7">
+            <Stereotype name="OrganisationModelDiagram" metaclass="Standard.ClassDiagram" owner-stereotype="mref#'' {c147d6d3-8bd0-4b94-a9d6-164a947fa0b4} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.OrganisationModelDiagram.label" uid="866330db-6440-4bbe-bd93-4bb567e8f1e7" is-abstract="false">
                 <Icon path="res/icon/gui/organisationModelDiagram_24.png"/>
                 <Image path="res/icon/gui/organisationModelDiagram_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.RequirementModelDiagram.label"
-                metaclass="Standard.ClassDiagram"
-                name="RequirementModelDiagram"
-                owner-stereotype="mref#'' {c147d6d3-8bd0-4b94-a9d6-164a947fa0b4} Infrastructure.Stereotype" uid="f8879e00-7139-4923-a7ff-67ebdb678e5b">
+            <Stereotype name="RequirementModelDiagram" metaclass="Standard.ClassDiagram" owner-stereotype="mref#'' {c147d6d3-8bd0-4b94-a9d6-164a947fa0b4} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.RequirementModelDiagram.label" uid="f8879e00-7139-4923-a7ff-67ebdb678e5b" is-abstract="false">
                 <Icon path="res/icon/gui/requirementModelDiagram_24.png"/>
                 <Image path="res/icon/gui/requirementModelDiagram_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.ScalabilityModelDiagram.label"
-                metaclass="Standard.ClassDiagram"
-                name="ScalabilityModelDiagram"
-                owner-stereotype="mref#'' {c147d6d3-8bd0-4b94-a9d6-164a947fa0b4} Infrastructure.Stereotype" uid="7f111587-b577-4533-9e55-41832442bd71">
+            <Stereotype name="ScalabilityModelDiagram" metaclass="Standard.ClassDiagram" owner-stereotype="mref#'' {c147d6d3-8bd0-4b94-a9d6-164a947fa0b4} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.ScalabilityModelDiagram.label" uid="7f111587-b577-4533-9e55-41832442bd71" is-abstract="false">
                 <Icon path="res/icon/gui/scalabilityModelDiagram_24.png"/>
                 <Image path="res/icon/gui/scalabilityModelDiagram_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.SecurityModelDiagram.label"
-                metaclass="Standard.ClassDiagram"
-                name="SecurityModelDiagram"
-                owner-stereotype="mref#'' {c147d6d3-8bd0-4b94-a9d6-164a947fa0b4} Infrastructure.Stereotype" uid="f7228862-f56b-49a6-a404-f06dcb6a08fa">
+            <Stereotype name="SecurityModelDiagram" metaclass="Standard.ClassDiagram" owner-stereotype="mref#'' {c147d6d3-8bd0-4b94-a9d6-164a947fa0b4} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.SecurityModelDiagram.label" uid="f7228862-f56b-49a6-a404-f06dcb6a08fa" is-abstract="false">
                 <Icon path="res/icon/gui/securityModelDiagram_24.png"/>
                 <Image path="res/icon/gui/securityModelDiagram_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.TypeModelDiagram.label"
-                metaclass="Standard.ClassDiagram"
-                name="TypeModelDiagram"
-                owner-stereotype="mref#'' {c147d6d3-8bd0-4b94-a9d6-164a947fa0b4} Infrastructure.Stereotype" uid="e909af8e-708a-490e-886c-55037a9674e1">
+            <Stereotype name="TypeModelDiagram" metaclass="Standard.ClassDiagram" owner-stereotype="mref#'' {c147d6d3-8bd0-4b94-a9d6-164a947fa0b4} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.TypeModelDiagram.label" uid="e909af8e-708a-490e-886c-55037a9674e1" is-abstract="false">
                 <Icon path="res/icon/gui/typeModelDiagram_24.png"/>
                 <Image path="res/icon/gui/typeModelDiagram_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.UnitModelDiagram.label"
-                metaclass="Standard.ClassDiagram"
-                name="UnitModelDiagram"
-                owner-stereotype="mref#'' {c147d6d3-8bd0-4b94-a9d6-164a947fa0b4} Infrastructure.Stereotype" uid="447f259a-1b5e-46e1-8721-8c09653baaff">
+            <Stereotype name="UnitModelDiagram" metaclass="Standard.ClassDiagram" owner-stereotype="mref#'' {c147d6d3-8bd0-4b94-a9d6-164a947fa0b4} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.UnitModelDiagram.label" uid="447f259a-1b5e-46e1-8721-8c09653baaff" is-abstract="false">
                 <Icon path="res/icon/gui/unitModel_24.png"/>
                 <Image path="res/icon/gui/unitModelDiagram_48.png"/>
             </Stereotype>
         </Profile>
-        <Profile id="ConstraintModel" uid="48587c66-74f8-44e2-b83a-e97a53204f84">
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.ConstraintModel.label"
-                metaclass="Standard.Package" name="ConstraintModel"
-                owner-stereotype="mref#'' {577c153e-42b8-4f36-9686-1a6109ffdc16} Infrastructure.Stereotype" uid="0a13db20-02d0-45a2-954a-db10f14d206b">
+        <Profile uid="48587c66-74f8-44e2-b83a-e97a53204f84" id="ConstraintModel">
+            <Stereotype name="ConstraintModel" metaclass="Standard.Package" owner-stereotype="mref#'' {577c153e-42b8-4f36-9686-1a6109ffdc16} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.ConstraintModel.label" uid="0a13db20-02d0-45a2-954a-db10f14d206b" is-abstract="false">
                 <Icon path="res/icon/gui/constraintModel_24.png"/>
                 <Image path=""/>
             </Stereotype>
-            <Stereotype is-abstract="true" is-hidden="false"
-                label="%stereotype.UnaryConstraint.label"
-                metaclass="Standard.Constraint" name="UnaryConstraint"
-                owner-stereotype="mref#'' {4afa0df7-c748-4db8-b9a7-a082a8419c00} Infrastructure.Stereotype" uid="e8928d56-f64c-4a1f-90b0-929dc78cd231">
+            <Stereotype name="UnaryConstraint" metaclass="Standard.Constraint" owner-stereotype="mref#'' {4afa0df7-c748-4db8-b9a7-a082a8419c00} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.UnaryConstraint.label" uid="e8928d56-f64c-4a1f-90b0-929dc78cd231" is-abstract="true">
                 <Icon path=""/>
                 <Image path=""/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.validity.label" name="validity"
-                        parameter-card="1" uid="ce4ae655-ac63-4f75-acac-fc8ab479de0f"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.comparisonOperator.label"
-                        name="comparisonOperator" parameter-card="1" uid="c145ec8b-ed85-4f7b-b6f7-9caf11d3a14d"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.threshold.label"
-                        name="threshold" parameter-card="1" uid="5a404e89-57d0-48c8-af7d-412703aed4c0"/>
+                    <TagType name="validity" uid="ce4ae655-ac63-4f75-acac-fc8ab479de0f" label="%tagtype.validity.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="comparisonOperator" uid="c145ec8b-ed85-4f7b-b6f7-9caf11d3a14d" label="%tagtype.comparisonOperator.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="threshold" uid="5a404e89-57d0-48c8-af7d-412703aed4c0" label="%tagtype.threshold.label" parameter-card="1" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.MetricConstraint.label"
-                metaclass="Standard.Constraint" name="MetricConstraint"
-                owner-stereotype="mref#'' {e8928d56-f64c-4a1f-90b0-929dc78cd231} Infrastructure.Stereotype" uid="713a32d2-c7ee-4caa-9f5d-94fcb7820b94">
+            <Stereotype name="MetricConstraint" metaclass="Standard.Constraint" owner-stereotype="mref#'' {e8928d56-f64c-4a1f-90b0-929dc78cd231} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.MetricConstraint.label" uid="713a32d2-c7ee-4caa-9f5d-94fcb7820b94" is-abstract="false">
                 <Icon path=""/>
                 <Image path=""/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.AttributeConstraint.label"
-                metaclass="Standard.Constraint"
-                name="AttributeConstraint"
-                owner-stereotype="mref#'' {e8928d56-f64c-4a1f-90b0-929dc78cd231} Infrastructure.Stereotype" uid="310d656e-d693-4ec1-b186-66894464b4b3">
+            <Stereotype name="AttributeConstraint" metaclass="Standard.Constraint" owner-stereotype="mref#'' {e8928d56-f64c-4a1f-90b0-929dc78cd231} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.AttributeConstraint.label" uid="310d656e-d693-4ec1-b186-66894464b4b3" is-abstract="false">
                 <Icon path=""/>
                 <Image path=""/>
             </Stereotype>
-            <Stereotype is-abstract="true" is-hidden="false"
-                label="%stereotype.CompositeConstraint.label"
-                metaclass="Standard.Constraint"
-                name="CompositeConstraint"
-                owner-stereotype="mref#'' {4afa0df7-c748-4db8-b9a7-a082a8419c00} Infrastructure.Stereotype" uid="95f69da8-e7d7-494b-90a7-db1618fa56fc">
+            <Stereotype name="CompositeConstraint" metaclass="Standard.Constraint" owner-stereotype="mref#'' {4afa0df7-c748-4db8-b9a7-a082a8419c00} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.CompositeConstraint.label" uid="95f69da8-e7d7-494b-90a7-db1618fa56fc" is-abstract="true">
                 <Icon path=""/>
                 <Image path=""/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.IfThenConstraint.label"
-                metaclass="Standard.Constraint" name="IfThenConstraint"
-                owner-stereotype="mref#'' {95f69da8-e7d7-494b-90a7-db1618fa56fc} Infrastructure.Stereotype" uid="da516708-1c56-443a-addc-f474b2e61c28">
+            <Stereotype name="IfThenConstraint" metaclass="Standard.Constraint" owner-stereotype="mref#'' {95f69da8-e7d7-494b-90a7-db1618fa56fc} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.IfThenConstraint.label" uid="da516708-1c56-443a-addc-f474b2e61c28" is-abstract="false">
                 <Icon path=""/>
                 <Image path=""/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.MetricVariableConstraint.label"
-                metaclass="Standard.Constraint"
-                name="MetricVariableConstraint"
-                owner-stereotype="mref#'' {e8928d56-f64c-4a1f-90b0-929dc78cd231} Infrastructure.Stereotype" uid="80ac8ced-a3d3-4519-b015-f0726e46e256">
+            <Stereotype name="MetricVariableConstraint" metaclass="Standard.Constraint" owner-stereotype="mref#'' {e8928d56-f64c-4a1f-90b0-929dc78cd231} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.MetricVariableConstraint.label" uid="80ac8ced-a3d3-4519-b015-f0726e46e256" is-abstract="false">
                 <Icon path=""/>
                 <Image path=""/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.LogicalConstraint.label"
-                metaclass="Standard.Constraint" name="LogicalConstraint"
-                owner-stereotype="mref#'' {95f69da8-e7d7-494b-90a7-db1618fa56fc} Infrastructure.Stereotype" uid="a266bdba-acc2-4ce2-81a0-4b2f404f7db7">
+            <Stereotype name="LogicalConstraint" metaclass="Standard.Constraint" owner-stereotype="mref#'' {95f69da8-e7d7-494b-90a7-db1618fa56fc} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.LogicalConstraint.label" uid="a266bdba-acc2-4ce2-81a0-4b2f404f7db7" is-abstract="false">
                 <Icon path=""/>
                 <Image path=""/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.logicalOperator.label"
-                        name="logicalOperator" parameter-card="1" uid="eb2e6178-406b-46d5-80d2-5453be9fce45"/>
+                    <TagType name="logicalOperator" uid="eb2e6178-406b-46d5-80d2-5453be9fce45" label="%tagtype.logicalOperator.label" parameter-card="1" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="true" is-hidden="false"
-                label="%stereotype.CamelConstraint.label"
-                metaclass="Standard.Constraint" name="CamelConstraint"
-                owner-stereotype="mref#'' {f81fdaa1-17e1-49a4-bf1f-60c18563c100} Infrastructure.Stereotype" uid="4afa0df7-c748-4db8-b9a7-a082a8419c00">
+            <Stereotype name="CamelConstraint" metaclass="Standard.Constraint" owner-stereotype="mref#'' {f81fdaa1-17e1-49a4-bf1f-60c18563c100} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.CamelConstraint.label" uid="4afa0df7-c748-4db8-b9a7-a082a8419c00" is-abstract="true">
                 <Icon path=""/>
                 <Image path=""/>
             </Stereotype>
         </Profile>
-        <Profile id="DataModel" uid="76e6ed95-9835-4267-b8bd-28a94ddf8b62">
-            <Stereotype is-abstract="true" is-hidden="true"
-                label="%stereotype.DataModel.label"
-                metaclass="Standard.Package" name="DataModel"
-                owner-stereotype="mref#'' {577c153e-42b8-4f36-9686-1a6109ffdc16} Infrastructure.Stereotype" uid="69b59850-29a3-4354-afc2-617679c2ef73">
+        <Profile uid="76e6ed95-9835-4267-b8bd-28a94ddf8b62" id="DataModel">
+            <Stereotype name="DataModel" metaclass="Standard.Package" owner-stereotype="mref#'' {577c153e-42b8-4f36-9686-1a6109ffdc16} Infrastructure.Stereotype" is-hidden="true" label="%stereotype.DataModel.label" uid="69b59850-29a3-4354-afc2-617679c2ef73" is-abstract="true">
                 <Icon path=""/>
                 <Image path=""/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.DataTypeModel.label"
-                metaclass="Standard.Package" name="DataTypeModel"
-                owner-stereotype="mref#'' {69b59850-29a3-4354-afc2-617679c2ef73} Infrastructure.Stereotype" uid="0014ffb4-9b70-4831-bf43-352df23bedfa">
+            <Stereotype name="DataTypeModel" metaclass="Standard.Package" owner-stereotype="mref#'' {69b59850-29a3-4354-afc2-617679c2ef73} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.DataTypeModel.label" uid="0014ffb4-9b70-4831-bf43-352df23bedfa" is-abstract="false">
                 <Icon path="res/icon/gui/dataModel_24.png"/>
                 <Image path=""/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.DataInstanceModel.label"
-                metaclass="Standard.Package" name="DataInstanceModel"
-                owner-stereotype="mref#'' {69b59850-29a3-4354-afc2-617679c2ef73} Infrastructure.Stereotype" uid="5f0d05aa-3af3-4ce2-b44f-e7f797acc992">
+            <Stereotype name="DataInstanceModel" metaclass="Standard.Package" owner-stereotype="mref#'' {69b59850-29a3-4354-afc2-617679c2ef73} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.DataInstanceModel.label" uid="5f0d05aa-3af3-4ce2-b44f-e7f797acc992" is-abstract="false">
                 <Icon path="res/icon/gui/DataInstanceModel_24.png"/>
                 <Image path=""/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.Data.label"
-                metaclass="Standard.Class" name="Data"
-                owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" uid="fe12d8bd-3047-4893-8e67-549a85ecb744">
+            <Stereotype name="Data" metaclass="Standard.Class" owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.Data.label" uid="fe12d8bd-3047-4893-8e67-549a85ecb744" is-abstract="false">
                 <Icon path="res/icon/gui/dataModelEmpty_24.png"/>
                 <Image path="res/icon/gui/dataModelEmpty_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.DataSource.label"
-                metaclass="Standard.Class" name="DataSource"
-                owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" uid="074f2086-e176-45fc-80c7-81fd2336ac7f">
+            <Stereotype name="DataSource" metaclass="Standard.Class" owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.DataSource.label" uid="074f2086-e176-45fc-80c7-81fd2336ac7f" is-abstract="false">
                 <Icon path="res/icon/gui/dataModelEmpty_24.png"/>
                 <Image path="res/icon/gui/dataModelEmpty_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.external.label" name="external"
-                        parameter-card="0" uid="05736a3c-caa6-4f52-b966-63ac2100cca2"/>
+                    <TagType name="external" uid="05736a3c-caa6-4f52-b966-63ac2100cca2" label="%tagtype.external.label" parameter-card="0" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.DataInstance.label"
-                metaclass="Standard.Instance" name="DataInstance"
-                owner-stereotype="mref#'' {df209aca-1325-4c99-b383-ca2650224ff6} Infrastructure.Stereotype" uid="fd50c81e-cd4d-4ae8-8e12-a2818c71f1de">
+            <Stereotype name="DataInstance" metaclass="Standard.Instance" owner-stereotype="mref#'' {df209aca-1325-4c99-b383-ca2650224ff6} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.DataInstance.label" uid="fd50c81e-cd4d-4ae8-8e12-a2818c71f1de" is-abstract="false">
                 <Icon path="res/icon/gui/DataInstanceEmpty_24.png"/>
                 <Image path="res/icon/gui/DataInstanceEmpty_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.DataSourceInstance.label"
-                metaclass="Standard.Instance" name="DataSourceInstance"
-                owner-stereotype="mref#'' {df209aca-1325-4c99-b383-ca2650224ff6} Infrastructure.Stereotype" uid="b72705cc-1db6-46cb-8f6e-de0c711a1997">
+            <Stereotype name="DataSourceInstance" metaclass="Standard.Instance" owner-stereotype="mref#'' {df209aca-1325-4c99-b383-ca2650224ff6} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.DataSourceInstance.label" uid="b72705cc-1db6-46cb-8f6e-de0c711a1997" is-abstract="false">
                 <Icon path="res/icon/gui/DataInstanceEmpty_24.png"/>
                 <Image path="res/icon/gui/DataInstanceEmpty_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.DataInstance_BindableInstance.label"
-                metaclass="Standard.BindableInstance"
-                name="DataInstance_BindableInstance"
-                owner-stereotype="mref#'' {fd50c81e-cd4d-4ae8-8e12-a2818c71f1de} Infrastructure.Stereotype" uid="ca031a70-7376-4397-ae2a-7ff762e285e1">
+            <Stereotype name="DataInstance_BindableInstance" metaclass="Standard.BindableInstance" owner-stereotype="mref#'' {fd50c81e-cd4d-4ae8-8e12-a2818c71f1de} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.DataInstance_BindableInstance.label" uid="ca031a70-7376-4397-ae2a-7ff762e285e1" is-abstract="false">
                 <Icon path="res/icon/gui/DataInstanceEmpty_24.png"/>
                 <Image path="res/icon/gui/DataInstanceEmpty_48.png"/>
             </Stereotype>
         </Profile>
-        <Profile id="DeploymentInstanceModel" uid="2b2a35bd-7537-4b54-a7b2-52e5c856e855">
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.CommunicationInstance.label"
-                metaclass="Standard.Connector"
-                name="CommunicationInstance"
-                owner-stereotype="mref#'' {b055b982-4854-4f90-adad-1833553f489e} Infrastructure.Stereotype" uid="479fff80-8075-4f90-b7f8-e148699ee433">
+        <Profile uid="2b2a35bd-7537-4b54-a7b2-52e5c856e855" id="DeploymentInstanceModel">
+            <Stereotype name="CommunicationInstance" metaclass="Standard.Connector" owner-stereotype="mref#'' {b055b982-4854-4f90-adad-1833553f489e} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.CommunicationInstance.label" uid="479fff80-8075-4f90-b7f8-e148699ee433" is-abstract="false">
                 <Icon path="res/icon/gui/DeploymentInstanceEmpty_24.png"/>
                 <Image path="res/icon/gui/DeploymentInstanceEmpty_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.CommunicationPortInstance.label"
-                metaclass="Standard.Port"
-                name="CommunicationPortInstance"
-                owner-stereotype="mref#'' {18d0504c-73e0-4c7c-8341-53038298af2c} Infrastructure.Stereotype" uid="42bf761a-193d-48f8-b686-2c4b96a56384">
+            <Stereotype name="CommunicationPortInstance" metaclass="Standard.Port" owner-stereotype="mref#'' {18d0504c-73e0-4c7c-8341-53038298af2c} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.CommunicationPortInstance.label" uid="42bf761a-193d-48f8-b686-2c4b96a56384" is-abstract="false">
                 <Icon path=""/>
                 <Image path=""/>
             </Stereotype>
-            <Stereotype is-abstract="true" is-hidden="true"
-                label="%stereotype.ComponentInstance.label"
-                metaclass="Standard.Instance" name="ComponentInstance"
-                owner-stereotype="mref#'' {df209aca-1325-4c99-b383-ca2650224ff6} Infrastructure.Stereotype" uid="aba476b3-2629-42d6-9138-1bf866332333">
+            <Stereotype name="ComponentInstance" metaclass="Standard.Instance" owner-stereotype="mref#'' {df209aca-1325-4c99-b383-ca2650224ff6} Infrastructure.Stereotype" is-hidden="true" label="%stereotype.ComponentInstance.label" uid="aba476b3-2629-42d6-9138-1bf866332333" is-abstract="true">
                 <Icon path=""/>
                 <Image path=""/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.instantiatedOn.label"
-                        name="instantiatedOn" parameter-card="1" uid="e6ac56dd-6986-41e3-944d-c5fad2bd2b84"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.destroyedOn.label"
-                        name="destroyedOn" parameter-card="1" uid="fb31df1a-95e1-40e6-aea3-f1c4fc314882"/>
+                    <TagType name="instantiatedOn" uid="e6ac56dd-6986-41e3-944d-c5fad2bd2b84" label="%tagtype.instantiatedOn.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="destroyedOn" uid="fb31df1a-95e1-40e6-aea3-f1c4fc314882" label="%tagtype.destroyedOn.label" parameter-card="1" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="true" is-hidden="true"
-                label="%stereotype.ComponentRelationInstance.label"
-                metaclass="Standard.Connector"
-                name="ComponentRelationInstance"
-                owner-stereotype="mref#'' {e94d1d27-429c-47ce-a373-e940bf1bf49b} Infrastructure.Stereotype" uid="b055b982-4854-4f90-adad-1833553f489e">
+            <Stereotype name="ComponentRelationInstance" metaclass="Standard.Connector" owner-stereotype="mref#'' {e94d1d27-429c-47ce-a373-e940bf1bf49b} Infrastructure.Stereotype" is-hidden="true" label="%stereotype.ComponentRelationInstance.label" uid="b055b982-4854-4f90-adad-1833553f489e" is-abstract="true">
                 <Icon path=""/>
                 <Image path=""/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.ContainerInstance.label"
-                metaclass="Standard.Instance" name="ContainerInstance"
-                owner-stereotype="mref#'' {aba476b3-2629-42d6-9138-1bf866332333} Infrastructure.Stereotype" uid="13481bb8-bdfe-4a15-8050-482bd996ac9e">
+            <Stereotype name="ContainerInstance" metaclass="Standard.Instance" owner-stereotype="mref#'' {aba476b3-2629-42d6-9138-1bf866332333} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.ContainerInstance.label" uid="13481bb8-bdfe-4a15-8050-482bd996ac9e" is-abstract="false">
                 <Icon path="res/icon/gui/ContainerInstance_24.png"/>
                 <Image path="res/icon/gui/ContainerInstance_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.DeploymentInstanceModel.label"
-                metaclass="Standard.Package"
-                name="DeploymentInstanceModel"
-                owner-stereotype="mref#'' {7d620068-3fc6-4fec-8829-0444c0c3186f} Infrastructure.Stereotype" uid="b43cbec3-a3d4-4d2b-90c9-eb4a56ed3ca9">
+            <Stereotype name="DeploymentInstanceModel" metaclass="Standard.Package" owner-stereotype="mref#'' {7d620068-3fc6-4fec-8829-0444c0c3186f} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.DeploymentInstanceModel.label" uid="b43cbec3-a3d4-4d2b-90c9-eb4a56ed3ca9" is-abstract="false">
                 <Icon path="res/icon/gui/DeploymentInstanceModel_24.png"/>
                 <Image path="res/icon/gui/DeploymentInstanceModel_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.HostingInstance.label"
-                metaclass="Standard.Connector" name="HostingInstance"
-                owner-stereotype="mref#'' {b055b982-4854-4f90-adad-1833553f489e} Infrastructure.Stereotype" uid="db62c499-d8f1-45e2-a427-4649858fbf35">
+            <Stereotype name="HostingInstance" metaclass="Standard.Connector" owner-stereotype="mref#'' {b055b982-4854-4f90-adad-1833553f489e} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.HostingInstance.label" uid="db62c499-d8f1-45e2-a427-4649858fbf35" is-abstract="false">
                 <Icon path="res/icon/gui/HostingInstance_24.png"/>
                 <Image path="res/icon/gui/HostingInstance_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.HostingPortInstance.label"
-                metaclass="Standard.Port" name="HostingPortInstance"
-                owner-stereotype="mref#'' {18d0504c-73e0-4c7c-8341-53038298af2c} Infrastructure.Stereotype" uid="b2bcf5bc-48d4-42cc-bc87-0ca2f2ca2812">
+            <Stereotype name="HostingPortInstance" metaclass="Standard.Port" owner-stereotype="mref#'' {18d0504c-73e0-4c7c-8341-53038298af2c} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.HostingPortInstance.label" uid="b2bcf5bc-48d4-42cc-bc87-0ca2f2ca2812" is-abstract="false">
                 <Icon path=""/>
                 <Image path=""/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.PaaSInstance.label"
-                metaclass="Standard.Instance" name="PaaSInstance"
-                owner-stereotype="mref#'' {aba476b3-2629-42d6-9138-1bf866332333} Infrastructure.Stereotype" uid="8d6e2b24-ed30-4aad-9c44-39b18b4c76d8">
+            <Stereotype name="PaaSInstance" metaclass="Standard.Instance" owner-stereotype="mref#'' {aba476b3-2629-42d6-9138-1bf866332333} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.PaaSInstance.label" uid="8d6e2b24-ed30-4aad-9c44-39b18b4c76d8" is-abstract="false">
                 <Icon path="res/icon/gui/DeploymentInstanceEmpty_24.png"/>
                 <Image path="res/icon/gui/DeploymentInstanceEmpty_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.SoftwareComponentInstance.label"
-                metaclass="Standard.Instance"
-                name="SoftwareComponentInstance"
-                owner-stereotype="mref#'' {aba476b3-2629-42d6-9138-1bf866332333} Infrastructure.Stereotype" uid="dfb1cf41-de3c-4af9-a3ff-66986b4f35fb">
+            <Stereotype name="SoftwareComponentInstance" metaclass="Standard.Instance" owner-stereotype="mref#'' {aba476b3-2629-42d6-9138-1bf866332333} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.SoftwareComponentInstance.label" uid="dfb1cf41-de3c-4af9-a3ff-66986b4f35fb" is-abstract="false">
                 <Icon path="res/icon/gui/SoftwareComponentInstance_24.png"/>
                 <Image path="res/icon/gui/SoftwareComponentInstance_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.VMInstance.label"
-                metaclass="Standard.Instance" name="VMInstance"
-                owner-stereotype="mref#'' {aba476b3-2629-42d6-9138-1bf866332333} Infrastructure.Stereotype" uid="a9a4550c-517a-4781-a3c9-5eb56d430f48">
+            <Stereotype name="VMInstance" metaclass="Standard.Instance" owner-stereotype="mref#'' {aba476b3-2629-42d6-9138-1bf866332333} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.VMInstance.label" uid="a9a4550c-517a-4781-a3c9-5eb56d430f48" is-abstract="false">
                 <Icon path="res/icon/gui/VMInstance_24.png"/>
                 <Image path="res/icon/gui/VMInstance_48.png"/>
             </Stereotype>
         </Profile>
-        <Profile id="DeploymentModel" uid="6d816e3a-22b6-4451-801d-38a800e92932">
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.BuildConfiguration.label"
-                metaclass="Standard.Artifact" name="BuildConfiguration"
-                owner-stereotype="mref#'' {4fc85f6a-6ece-4e79-b662-e20cb7f28cea} Infrastructure.Stereotype" uid="72bbf7a5-04d3-40d1-8b20-3489ec93b45a">
+        <Profile uid="6d816e3a-22b6-4451-801d-38a800e92932" id="DeploymentModel">
+            <Stereotype name="BuildConfiguration" metaclass="Standard.Artifact" owner-stereotype="mref#'' {4fc85f6a-6ece-4e79-b662-e20cb7f28cea} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.BuildConfiguration.label" uid="72bbf7a5-04d3-40d1-8b20-3489ec93b45a" is-abstract="false">
                 <Icon path="res/icon/gui/BuildConfiguration_24.png"/>
                 <Image path="res/icon/gui/BuildConfiguration_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.artifactId.label"
-                        name="artifactId" parameter-card="1" uid="95dcdeef-f3a8-4b72-8658-7469cc386bd1"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.buildFramework.label"
-                        name="buildFramework" parameter-card="1" uid="a7f87bab-5a8f-4554-a8c7-ce21e172ce96"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.sourceCodeURL.label"
-                        name="sourceCodeURL" parameter-card="1" uid="8bf57c83-b62d-4d66-b368-95557d32e7d8"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.include.label" name="include"
-                        parameter-card="1" uid="97e74456-ac43-4bcf-9226-fbd06b5aaf8b"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.exclude.label" name="exclude"
-                        parameter-card="1" uid="d3625030-f18b-4e0d-a94f-238b134a7f67"/>
+                    <TagType name="artifactId" uid="95dcdeef-f3a8-4b72-8658-7469cc386bd1" label="%tagtype.artifactId.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="buildFramework" uid="a7f87bab-5a8f-4554-a8c7-ce21e172ce96" label="%tagtype.buildFramework.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="sourceCodeURL" uid="8bf57c83-b62d-4d66-b368-95557d32e7d8" label="%tagtype.sourceCodeURL.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="include" uid="97e74456-ac43-4bcf-9226-fbd06b5aaf8b" label="%tagtype.include.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="exclude" uid="d3625030-f18b-4e0d-a94f-238b134a7f67" label="%tagtype.exclude.label" parameter-card="1" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="true" is-hidden="true"
-                label="%stereotype.CamelComponent.label"
-                metaclass="Standard.Component" name="CamelComponent"
-                owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" uid="abb7159a-fde4-40d9-8e5e-8f9ad94f2b31">
+            <Stereotype name="CamelComponent" metaclass="Standard.Component" owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" is-hidden="true" label="%stereotype.CamelComponent.label" uid="abb7159a-fde4-40d9-8e5e-8f9ad94f2b31" is-abstract="true">
                 <Icon path=""/>
                 <Image path=""/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.ClusterConfiguration.label"
-                metaclass="Standard.Artifact"
-                name="ClusterConfiguration"
-                owner-stereotype="mref#'' {24d6edfb-e2bf-4e67-8c56-b051b479f16d} Infrastructure.Stereotype" uid="b8d5ac50-75fd-4e01-9d50-04e6139e072c">
+            <Stereotype name="ClusterConfiguration" metaclass="Standard.Artifact" owner-stereotype="mref#'' {24d6edfb-e2bf-4e67-8c56-b051b479f16d} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.ClusterConfiguration.label" uid="b8d5ac50-75fd-4e01-9d50-04e6139e072c" is-abstract="false">
                 <Icon path="res/icon/gui/ClusterConfiguration_24.png"/>
                 <Image path="res/icon/gui/ClusterConfiguration_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.downloadURL.label"
-                        name="downloadURL" parameter-card="1" uid="33966f3f-93c8-4e48-88fc-3e4ca226da16"/>
+                    <TagType name="downloadURL" uid="33966f3f-93c8-4e48-88fc-3e4ca226da16" label="%tagtype.downloadURL.label" parameter-card="1" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.Communication.label"
-                metaclass="Standard.Connector" name="Communication"
-                owner-stereotype="mref#'' {1c00d806-f009-48a9-a7de-3f1e462818d1} Infrastructure.Stereotype" uid="141875d2-e648-4750-9fff-84c1b21e9b54">
+            <Stereotype name="Communication" metaclass="Standard.Connector" owner-stereotype="mref#'' {1c00d806-f009-48a9-a7de-3f1e462818d1} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.Communication.label" uid="141875d2-e648-4750-9fff-84c1b21e9b54" is-abstract="false">
                 <Icon path="res/icon/gui/deploymentModelEmpty_24.png"/>
                 <Image path="res/icon/gui/deploymentModelEmpty_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.CommunicationPort.label"
-                metaclass="Standard.Port" name="CommunicationPort"
-                owner-stereotype="mref#'' {18d0504c-73e0-4c7c-8341-53038298af2c} Infrastructure.Stereotype" uid="c3c6e0a4-b112-4a00-9c2f-964e3093c423">
+            <Stereotype name="CommunicationPort" metaclass="Standard.Port" owner-stereotype="mref#'' {18d0504c-73e0-4c7c-8341-53038298af2c} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.CommunicationPort.label" uid="c3c6e0a4-b112-4a00-9c2f-964e3093c423" is-abstract="false">
                 <Icon path=""/>
                 <Image path=""/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.lowPortNumber.label"
-                        name="lowPortNumber" parameter-card="1" uid="6a5677a8-e95a-48ca-9d2c-17c3eb64fb84"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.highPortNumber.label"
-                        name="highPortNumber" parameter-card="1" uid="4ea4c624-90ec-4d17-bed6-7bbba5114296"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.isMandatory.label"
-                        name="isMandatory" parameter-card="0" uid="db6301a8-58c7-4502-a816-681c606c13cf"/>
+                    <TagType name="lowPortNumber" uid="6a5677a8-e95a-48ca-9d2c-17c3eb64fb84" label="%tagtype.lowPortNumber.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="highPortNumber" uid="4ea4c624-90ec-4d17-bed6-7bbba5114296" label="%tagtype.highPortNumber.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="isMandatory" uid="db6301a8-58c7-4502-a816-681c606c13cf" label="%tagtype.isMandatory.label" parameter-card="0" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="true" is-hidden="true"
-                label="%stereotype.ComponentRelation.label"
-                metaclass="Standard.Connector" name="ComponentRelation"
-                owner-stereotype="mref#'' {e94d1d27-429c-47ce-a373-e940bf1bf49b} Infrastructure.Stereotype" uid="1c00d806-f009-48a9-a7de-3f1e462818d1">
+            <Stereotype name="ComponentRelation" metaclass="Standard.Connector" owner-stereotype="mref#'' {e94d1d27-429c-47ce-a373-e940bf1bf49b} Infrastructure.Stereotype" is-hidden="true" label="%stereotype.ComponentRelation.label" uid="1c00d806-f009-48a9-a7de-3f1e462818d1" is-abstract="true">
                 <Icon path=""/>
                 <Image path=""/>
             </Stereotype>
-            <Stereotype is-abstract="true" is-hidden="true"
-                label="%stereotype.Configuration.label"
-                metaclass="Standard.Artifact" name="Configuration"
-                owner-stereotype="mref#'' {4fc85f6a-6ece-4e79-b662-e20cb7f28cea} Infrastructure.Stereotype" uid="24d6edfb-e2bf-4e67-8c56-b051b479f16d">
+            <Stereotype name="Configuration" metaclass="Standard.Artifact" owner-stereotype="mref#'' {4fc85f6a-6ece-4e79-b662-e20cb7f28cea} Infrastructure.Stereotype" is-hidden="true" label="%stereotype.Configuration.label" uid="24d6edfb-e2bf-4e67-8c56-b051b479f16d" is-abstract="true">
                 <Icon path=""/>
                 <Image path=""/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.Container.label"
-                metaclass="Standard.Component" name="Container"
-                owner-stereotype="mref#'' {abb7159a-fde4-40d9-8e5e-8f9ad94f2b31} Infrastructure.Stereotype" uid="ad6f0ae5-0d16-43f4-b514-9a46eea51950">
+            <Stereotype name="Container" metaclass="Standard.Component" owner-stereotype="mref#'' {abb7159a-fde4-40d9-8e5e-8f9ad94f2b31} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.Container.label" uid="ad6f0ae5-0d16-43f4-b514-9a46eea51950" is-abstract="false">
                 <Icon path="res/icon/gui/Container_24.png"/>
                 <Image path="res/icon/gui/Container_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="true" is-hidden="true"
-                label="%stereotype.DeploymentModel.label"
-                metaclass="Standard.Package" name="DeploymentModel"
-                owner-stereotype="mref#'' {577c153e-42b8-4f36-9686-1a6109ffdc16} Infrastructure.Stereotype" uid="7d620068-3fc6-4fec-8829-0444c0c3186f">
+            <Stereotype name="DeploymentModel" metaclass="Standard.Package" owner-stereotype="mref#'' {577c153e-42b8-4f36-9686-1a6109ffdc16} Infrastructure.Stereotype" is-hidden="true" label="%stereotype.DeploymentModel.label" uid="7d620068-3fc6-4fec-8829-0444c0c3186f" is-abstract="true">
                 <Icon path=""/>
                 <Image path=""/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.DeploymentTypeModel.label"
-                metaclass="Standard.Package" name="DeploymentTypeModel"
-                owner-stereotype="mref#'' {7d620068-3fc6-4fec-8829-0444c0c3186f} Infrastructure.Stereotype" uid="24bc0f0f-63bd-4249-8f58-47597e6cae12">
+            <Stereotype name="DeploymentTypeModel" metaclass="Standard.Package" owner-stereotype="mref#'' {7d620068-3fc6-4fec-8829-0444c0c3186f} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.DeploymentTypeModel.label" uid="24bc0f0f-63bd-4249-8f58-47597e6cae12" is-abstract="false">
                 <Icon path="res/icon/gui/DeploymentTypeModel_24.png"/>
                 <Image path=""/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.EventConfiguration.label"
-                metaclass="Standard.Artifact" name="EventConfiguration"
-                owner-stereotype="mref#'' {4fc85f6a-6ece-4e79-b662-e20cb7f28cea} Infrastructure.Stereotype" uid="5138fe5c-0bae-4c49-9442-c6ac48dd09d8">
+            <Stereotype name="EventConfiguration" metaclass="Standard.Artifact" owner-stereotype="mref#'' {4fc85f6a-6ece-4e79-b662-e20cb7f28cea} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.EventConfiguration.label" uid="5138fe5c-0bae-4c49-9442-c6ac48dd09d8" is-abstract="false">
                 <Icon path="res/icon/gui/EventConfiguration_24.png"/>
                 <Image path="res/icon/gui/EventConfiguration_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.httpMethodName.label"
-                        name="httpMethodName" parameter-card="1" uid="06feb07e-1378-4f53-8ae2-7ba21ca97283"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.httpMethodType.label"
-                        name="httpMethodType" parameter-card="1" uid="b6e019c4-7a53-4b8f-8ce5-bc2c0bf22328"/>
+                    <TagType name="httpMethodName" uid="06feb07e-1378-4f53-8ae2-7ba21ca97283" label="%tagtype.httpMethodName.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="httpMethodType" uid="b6e019c4-7a53-4b8f-8ce5-bc2c0bf22328" label="%tagtype.httpMethodType.label" parameter-card="1" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.Hosting.label"
-                metaclass="Standard.Connector" name="Hosting"
-                owner-stereotype="mref#'' {1c00d806-f009-48a9-a7de-3f1e462818d1} Infrastructure.Stereotype" uid="d727bc20-8640-446b-8252-f7e3783e8efe">
+            <Stereotype name="Hosting" metaclass="Standard.Connector" owner-stereotype="mref#'' {1c00d806-f009-48a9-a7de-3f1e462818d1} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.Hosting.label" uid="d727bc20-8640-446b-8252-f7e3783e8efe" is-abstract="false">
                 <Icon path="res/icon/gui/deploymentModelEmpty_24.png"/>
                 <Image path="res/icon/gui/deploymentModelEmpty_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.HostingPort.label"
-                metaclass="Standard.Port" name="HostingPort"
-                owner-stereotype="mref#'' {18d0504c-73e0-4c7c-8341-53038298af2c} Infrastructure.Stereotype" uid="0672a25d-20e7-4566-b187-f3f3572d73c3">
+            <Stereotype name="HostingPort" metaclass="Standard.Port" owner-stereotype="mref#'' {18d0504c-73e0-4c7c-8341-53038298af2c} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.HostingPort.label" uid="0672a25d-20e7-4566-b187-f3f3572d73c3" is-abstract="false">
                 <Icon path=""/>
                 <Image path=""/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.LocationCoupling.label"
-                metaclass="Standard.Connector" name="LocationCoupling"
-                owner-stereotype="mref#'' {1c00d806-f009-48a9-a7de-3f1e462818d1} Infrastructure.Stereotype" uid="09dbc4af-5728-4b42-9d70-83e64d7205dd">
+            <Stereotype name="LocationCoupling" metaclass="Standard.Connector" owner-stereotype="mref#'' {1c00d806-f009-48a9-a7de-3f1e462818d1} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.LocationCoupling.label" uid="09dbc4af-5728-4b42-9d70-83e64d7205dd" is-abstract="false">
                 <Icon path="res/icon/gui/LocationCoupling_24.png"/>
                 <Image path="res/icon/gui/LocationCoupling_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.couplingType.label"
-                        name="couplingType" parameter-card="1" uid="e8ff5d38-9710-482d-84f1-69e389fdd673"/>
-                    <TagType is-hidden="true" is-signed="false"
-                        label="%tagtype.relaxed.label" name="relaxed"
-                        parameter-card="0" uid="c2d7df3f-0813-48ef-bbc6-545b50985067"/>
+                    <TagType name="couplingType" uid="e8ff5d38-9710-482d-84f1-69e389fdd673" label="%tagtype.couplingType.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="relaxed" uid="c2d7df3f-0813-48ef-bbc6-545b50985067" label="%tagtype.relaxed.label" parameter-card="0" is-hidden="true" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.PaaS.label"
-                metaclass="Standard.Component" name="PaaS"
-                owner-stereotype="mref#'' {abb7159a-fde4-40d9-8e5e-8f9ad94f2b31} Infrastructure.Stereotype" uid="d0c33c39-75b6-489b-be58-97166b99012b">
+            <Stereotype name="PaaS" metaclass="Standard.Component" owner-stereotype="mref#'' {abb7159a-fde4-40d9-8e5e-8f9ad94f2b31} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.PaaS.label" uid="d0c33c39-75b6-489b-be58-97166b99012b" is-abstract="false">
                 <Icon path="res/icon/gui/paas_24.png"/>
                 <Image path="res/icon/gui/paas_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.PaaSConfiguration.label"
-                metaclass="Standard.Artifact" name="PaaSConfiguration"
-                owner-stereotype="mref#'' {24d6edfb-e2bf-4e67-8c56-b051b479f16d} Infrastructure.Stereotype" uid="708a5ac1-972a-428b-8eb9-2caa4bc35dbd">
+            <Stereotype name="PaaSConfiguration" metaclass="Standard.Artifact" owner-stereotype="mref#'' {24d6edfb-e2bf-4e67-8c56-b051b479f16d} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.PaaSConfiguration.label" uid="708a5ac1-972a-428b-8eb9-2caa4bc35dbd" is-abstract="false">
                 <Icon path="res/icon/gui/paasConfiguration_24.png"/>
                 <Image path="res/icon/gui/paasConfiguration_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.api.label" name="api"
-                        parameter-card="1" uid="f030f8ad-63ae-42c6-8eaf-af3bd34ffc29"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.version.label" name="version"
-                        parameter-card="1" uid="714f9b40-e02b-4d11-9d33-c41aebe5fc2a"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.endpoint.label" name="endpoint"
-                        parameter-card="1" uid="b29d207b-7ea1-4215-98ec-ca376e600523"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.downloadURL.label"
-                        name="downloadURL" parameter-card="1" uid="a187ac30-8cda-4e5a-bf97-c52a98987e17"/>
+                    <TagType name="api" uid="f030f8ad-63ae-42c6-8eaf-af3bd34ffc29" label="%tagtype.api.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="version" uid="714f9b40-e02b-4d11-9d33-c41aebe5fc2a" label="%tagtype.version.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="endpoint" uid="b29d207b-7ea1-4215-98ec-ca376e600523" label="%tagtype.endpoint.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="downloadURL" uid="a187ac30-8cda-4e5a-bf97-c52a98987e17" label="%tagtype.downloadURL.label" parameter-card="1" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.RequirementSet.label"
-                metaclass="Standard.Class" name="RequirementSet"
-                owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" uid="513b1519-9560-4cd7-9dd4-f071d5fe54e8">
+            <Stereotype name="RequirementSet" metaclass="Standard.Class" owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.RequirementSet.label" uid="513b1519-9560-4cd7-9dd4-f071d5fe54e8" is-abstract="false">
                 <Icon path="res/icon/gui/RequirementSet_24.png"/>
                 <Image path="res/icon/gui/RequirementSet_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.ScriptConfiguration.label"
-                metaclass="Standard.Artifact" name="ScriptConfiguration"
-                owner-stereotype="mref#'' {24d6edfb-e2bf-4e67-8c56-b051b479f16d} Infrastructure.Stereotype" uid="451f4ee3-f056-4311-b405-23e7eae6d020">
+            <Stereotype name="ScriptConfiguration" metaclass="Standard.Artifact" owner-stereotype="mref#'' {24d6edfb-e2bf-4e67-8c56-b051b479f16d} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.ScriptConfiguration.label" uid="451f4ee3-f056-4311-b405-23e7eae6d020" is-abstract="false">
                 <Icon path=""/>
                 <Image path=""/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.devopsTool.label"
-                        name="devopsTool" parameter-card="1" uid="a60944a6-52f0-4a9f-9a40-7d31930f312b"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.os.label" name="os"
-                        parameter-card="1" uid="14b18b2b-5fc1-4734-964d-befd9717830a"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.imageId.label" name="imageId"
-                        parameter-card="1" uid="8b33bb29-84d4-439a-9b16-00e186c50ae5"/>
+                    <TagType name="devopsTool" uid="a60944a6-52f0-4a9f-9a40-7d31930f312b" label="%tagtype.devopsTool.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="os" uid="14b18b2b-5fc1-4734-964d-befd9717830a" label="%tagtype.os.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="imageId" uid="8b33bb29-84d4-439a-9b16-00e186c50ae5" label="%tagtype.imageId.label" parameter-card="1" is-hidden="false" is-signed="false"/>
                 </TagTypes>
                 <NoteTypes>
-                    <NoteType is-hidden="false"
-                        label="%notetype.uploadCommand.label"
-                        mime-type="text/plain" name="uploadCommand" uid="1b2eab67-c6b7-4a6b-adef-3911d66d879b"/>
-                    <NoteType is-hidden="false"
-                        label="%notetype.installCommand.label"
-                        mime-type="text/plain" name="installCommand" uid="1910005c-4153-4df7-917e-e963fdc1f729"/>
-                    <NoteType is-hidden="false"
-                        label="%notetype.startCommand.label"
-                        mime-type="text/plain" name="startCommand" uid="945d0ab8-e3f5-4aab-854d-213c66993c00"/>
-                    <NoteType is-hidden="false"
-                        label="%notetype.stopCommand.label"
-                        mime-type="text/plain" name="stopCommand" uid="7ab65049-6e99-414f-8340-ab492bdfbc83"/>
-                    <NoteType is-hidden="false"
-                        label="%notetype.downloadCommand.label"
-                        mime-type="text/plain" name="downloadCommand" uid="3392b397-0425-4bab-be0f-57fd42e01799"/>
-                    <NoteType is-hidden="false"
-                        label="%notetype.configureCommand.label"
-                        mime-type="text/plain" name="configureCommand" uid="25f32468-57fd-4df0-93d7-14cb8a055517"/>
-                    <NoteType is-hidden="false"
-                        label="%notetype.updateCommand.label"
-                        mime-type="text/plain" name="updateCommand" uid="3a9b0e27-e638-4558-ab02-a618fc09199f"/>
+                    <NoteType name="uploadCommand" label="%notetype.uploadCommand.label" is-hidden="false" uid="1b2eab67-c6b7-4a6b-adef-3911d66d879b" mime-type="text/plain"/>
+                    <NoteType name="installCommand" label="%notetype.installCommand.label" is-hidden="false" uid="1910005c-4153-4df7-917e-e963fdc1f729" mime-type="text/plain"/>
+                    <NoteType name="startCommand" label="%notetype.startCommand.label" is-hidden="false" uid="945d0ab8-e3f5-4aab-854d-213c66993c00" mime-type="text/plain"/>
+                    <NoteType name="stopCommand" label="%notetype.stopCommand.label" is-hidden="false" uid="7ab65049-6e99-414f-8340-ab492bdfbc83" mime-type="text/plain"/>
+                    <NoteType name="downloadCommand" label="%notetype.downloadCommand.label" is-hidden="false" uid="3392b397-0425-4bab-be0f-57fd42e01799" mime-type="text/plain"/>
+                    <NoteType name="configureCommand" label="%notetype.configureCommand.label" is-hidden="false" uid="25f32468-57fd-4df0-93d7-14cb8a055517" mime-type="text/plain"/>
+                    <NoteType name="updateCommand" label="%notetype.updateCommand.label" is-hidden="false" uid="3a9b0e27-e638-4558-ab02-a618fc09199f" mime-type="text/plain"/>
                 </NoteTypes>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.ServerlessConfiguration.label"
-                metaclass="Standard.Artifact"
-                name="ServerlessConfiguration"
-                owner-stereotype="mref#'' {24d6edfb-e2bf-4e67-8c56-b051b479f16d} Infrastructure.Stereotype" uid="9f4ca31f-e397-4c28-b2d2-031f838cfe99">
+            <Stereotype name="ServerlessConfiguration" metaclass="Standard.Artifact" owner-stereotype="mref#'' {24d6edfb-e2bf-4e67-8c56-b051b479f16d} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.ServerlessConfiguration.label" uid="9f4ca31f-e397-4c28-b2d2-031f838cfe99" is-abstract="false">
                 <Icon path="res/icon/gui/ServerlessConfiguration_24.png"/>
                 <Image path="res/icon/gui/ServerlessConfiguration_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.binaryCodeURL.label"
-                        name="binaryCodeURL" parameter-card="1" uid="a9a8e449-cba1-4eb1-86c5-d6776d809a5f"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.continuousDeployment.label"
-                        name="continuousDeployment" parameter-card="0" uid="b19002d3-1aa5-4739-b9db-e55a4a2126db"/>
+                    <TagType name="binaryCodeURL" uid="a9a8e449-cba1-4eb1-86c5-d6776d809a5f" label="%tagtype.binaryCodeURL.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="continuousDeployment" uid="b19002d3-1aa5-4739-b9db-e55a4a2126db" label="%tagtype.continuousDeployment.label" parameter-card="0" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.SoftwareComponent.label"
-                metaclass="Standard.Component" name="SoftwareComponent"
-                owner-stereotype="mref#'' {abb7159a-fde4-40d9-8e5e-8f9ad94f2b31} Infrastructure.Stereotype" uid="e66ca9e8-6d1c-46bd-9d9d-e1e16675fada">
+            <Stereotype name="SoftwareComponent" metaclass="Standard.Component" owner-stereotype="mref#'' {abb7159a-fde4-40d9-8e5e-8f9ad94f2b31} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.SoftwareComponent.label" uid="e66ca9e8-6d1c-46bd-9d9d-e1e16675fada" is-abstract="false">
                 <Icon path="res/icon/gui/SoftwareComponent_24.png"/>
                 <Image path=""/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.longLived.label"
-                        name="longLived" parameter-card="0" uid="dad4c8d0-a0a7-4cbd-86b5-f8f40b461f7e"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.coInstanceHosting.label"
-                        name="coInstanceHosting" parameter-card="0" uid="494a7252-cb31-4efb-ba4c-43fde6acbc7f"/>
+                    <TagType name="longLived" uid="dad4c8d0-a0a7-4cbd-86b5-f8f40b461f7e" label="%tagtype.longLived.label" parameter-card="0" is-hidden="false" is-signed="false"/>
+                    <TagType name="coInstanceHosting" uid="494a7252-cb31-4efb-ba4c-43fde6acbc7f" label="%tagtype.coInstanceHosting.label" parameter-card="0" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.VM.label"
-                metaclass="Standard.Component" name="VM"
-                owner-stereotype="mref#'' {abb7159a-fde4-40d9-8e5e-8f9ad94f2b31} Infrastructure.Stereotype" uid="8bd1ea8d-6714-4a3b-9da9-c914064d8440">
+            <Stereotype name="VM" metaclass="Standard.Component" owner-stereotype="mref#'' {abb7159a-fde4-40d9-8e5e-8f9ad94f2b31} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.VM.label" uid="8bd1ea8d-6714-4a3b-9da9-c914064d8440" is-abstract="false">
                 <Icon path="res/icon/gui/VM_24.png"/>
                 <Image path="res/icon/gui/VM_48.png"/>
             </Stereotype>
         </Profile>
-        <Profile id="ExecutionModel" uid="529aca05-46d5-4f0c-84e5-010f52582ab9">
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.ActionInstance.label"
-                metaclass="Standard.Instance" name="ActionInstance"
-                owner-stereotype="mref#'' {df209aca-1325-4c99-b383-ca2650224ff6} Infrastructure.Stereotype" uid="fe6343f1-1474-4d9e-a80f-e88b019c9e46">
+        <Profile uid="529aca05-46d5-4f0c-84e5-010f52582ab9" id="ExecutionModel">
+            <Stereotype name="ActionInstance" metaclass="Standard.Instance" owner-stereotype="mref#'' {df209aca-1325-4c99-b383-ca2650224ff6} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.ActionInstance.label" uid="fe6343f1-1474-4d9e-a80f-e88b019c9e46" is-abstract="false">
                 <Icon path="res/icon/gui/executionModelEmpty_24.png"/>
                 <Image path="res/icon/gui/executionModelEmpty_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.startTime.label"
-                        name="startTime" parameter-card="1" uid="b0fbf0b8-55e7-49bd-8638-48285c121023"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.endTime.label" name="endTime"
-                        parameter-card="1" uid="b0d29654-1e13-4705-af26-e7bcf590850e"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.successful.label"
-                        name="successful" parameter-card="0" uid="652d15c6-5261-493e-a968-b981d7bee54a"/>
+                    <TagType name="startTime" uid="b0fbf0b8-55e7-49bd-8638-48285c121023" label="%tagtype.startTime.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="endTime" uid="b0d29654-1e13-4705-af26-e7bcf590850e" label="%tagtype.endTime.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="successful" uid="652d15c6-5261-493e-a968-b981d7bee54a" label="%tagtype.successful.label" parameter-card="0" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.ApplicationMeasurement.label"
-                metaclass="Standard.Class" name="ApplicationMeasurement"
-                owner-stereotype="mref#'' {481e52bb-d5b3-4dcb-a365-8ca5d75d8ac2} Infrastructure.Stereotype" uid="8962d6e6-e540-41c6-bf79-3df6530aae2e">
+            <Stereotype name="ApplicationMeasurement" metaclass="Standard.Class" owner-stereotype="mref#'' {481e52bb-d5b3-4dcb-a365-8ca5d75d8ac2} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.ApplicationMeasurement.label" uid="8962d6e6-e540-41c6-bf79-3df6530aae2e" is-abstract="false">
                 <Icon path="res/icon/gui/ApplicationMeasurement_24.png"/>
                 <Image path="res/icon/gui/ApplicationMeasurement_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.Cause.label"
-                metaclass="Standard.Class" name="Cause"
-                owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" uid="fc44bcb6-59df-49ef-9ed6-13f1d2b85393">
+            <Stereotype name="Cause" metaclass="Standard.Class" owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.Cause.label" uid="fc44bcb6-59df-49ef-9ed6-13f1d2b85393" is-abstract="false">
                 <Icon path="res/icon/gui/executionModelEmpty_24.png"/>
                 <Image path="res/icon/gui/executionModelEmpty_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.CommunicationMeasurement.label"
-                metaclass="Standard.Class"
-                name="CommunicationMeasurement"
-                owner-stereotype="mref#'' {481e52bb-d5b3-4dcb-a365-8ca5d75d8ac2} Infrastructure.Stereotype" uid="438c005e-3455-4a76-ba8b-3791473a3e5a">
+            <Stereotype name="CommunicationMeasurement" metaclass="Standard.Class" owner-stereotype="mref#'' {481e52bb-d5b3-4dcb-a365-8ca5d75d8ac2} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.CommunicationMeasurement.label" uid="438c005e-3455-4a76-ba8b-3791473a3e5a" is-abstract="false">
                 <Icon path="res/icon/gui/CommunicationMeasurement_24.png"/>
                 <Image path="res/icon/gui/CommunicationMeasurement_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.ContainerMeasurement.label"
-                metaclass="Standard.Class" name="ContainerMeasurement"
-                owner-stereotype="mref#'' {481e52bb-d5b3-4dcb-a365-8ca5d75d8ac2} Infrastructure.Stereotype" uid="85629f9a-c7b9-455f-a948-e90a070e6b60">
+            <Stereotype name="ContainerMeasurement" metaclass="Standard.Class" owner-stereotype="mref#'' {481e52bb-d5b3-4dcb-a365-8ca5d75d8ac2} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.ContainerMeasurement.label" uid="85629f9a-c7b9-455f-a948-e90a070e6b60" is-abstract="false">
                 <Icon path="res/icon/gui/ContainerMeasurement_24.png"/>
                 <Image path="res/icon/gui/ContainerMeasurement_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.DataMeasurement.label"
-                metaclass="Standard.Class" name="DataMeasurement"
-                owner-stereotype="mref#'' {481e52bb-d5b3-4dcb-a365-8ca5d75d8ac2} Infrastructure.Stereotype" uid="fe1fd247-1047-4137-8ff6-90ed2e79ac91">
+            <Stereotype name="DataMeasurement" metaclass="Standard.Class" owner-stereotype="mref#'' {481e52bb-d5b3-4dcb-a365-8ca5d75d8ac2} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.DataMeasurement.label" uid="fe1fd247-1047-4137-8ff6-90ed2e79ac91" is-abstract="false">
                 <Icon path="res/icon/gui/DataMeasurement_24.png"/>
                 <Image path="res/icon/gui/DataMeasurement_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.ExecutionModel.label"
-                metaclass="Standard.Package" name="ExecutionModel"
-                owner-stereotype="mref#'' {577c153e-42b8-4f36-9686-1a6109ffdc16} Infrastructure.Stereotype" uid="e68f7e04-ff66-47dd-af65-5c017645cb8d">
+            <Stereotype name="ExecutionModel" metaclass="Standard.Package" owner-stereotype="mref#'' {577c153e-42b8-4f36-9686-1a6109ffdc16} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.ExecutionModel.label" uid="e68f7e04-ff66-47dd-af65-5c017645cb8d" is-abstract="false">
                 <Icon path="res/icon/gui/executionModel_24.png"/>
                 <Image path="res/icon/gui/executionModel_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.startTime.label"
-                        name="startTime" parameter-card="1" uid="8a1a55fb-6fdd-41a1-8b7f-0402a36c1c5a"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.endTime.label" name="endTime"
-                        parameter-card="1" uid="9eaffab4-ecb8-4197-8a10-fa6efdbce7f0"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.totalCost.label"
-                        name="totalCost" parameter-card="1" uid="897470a5-3fb6-46aa-b4cc-d3aefb9903a1"/>
+                    <TagType name="startTime" uid="8a1a55fb-6fdd-41a1-8b7f-0402a36c1c5a" label="%tagtype.startTime.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="endTime" uid="9eaffab4-ecb8-4197-8a10-fa6efdbce7f0" label="%tagtype.endTime.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="totalCost" uid="897470a5-3fb6-46aa-b4cc-d3aefb9903a1" label="%tagtype.totalCost.label" parameter-card="1" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.HistoryInfo.label"
-                metaclass="Standard.Class" name="HistoryInfo"
-                owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" uid="acef265d-7979-416d-8e8d-bc2a20331822">
+            <Stereotype name="HistoryInfo" metaclass="Standard.Class" owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.HistoryInfo.label" uid="acef265d-7979-416d-8e8d-bc2a20331822" is-abstract="false">
                 <Icon path="res/icon/gui/HistoryInfo_24.png"/>
                 <Image path="res/icon/gui/HistoryInfo_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.object.label" name="object"
-                        parameter-card="1" uid="b459f0a0-04c3-4f41-ba76-aca6f5dc6dda"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.startTime.label"
-                        name="startTime" parameter-card="1" uid="3888f8fe-984d-4fcb-a8f4-ed0071eb91c0"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.endTime.label" name="endTime"
-                        parameter-card="1" uid="e34ce3bc-ef22-4d6d-9c02-81f6bbd2268b"/>
+                    <TagType name="object" uid="b459f0a0-04c3-4f41-ba76-aca6f5dc6dda" label="%tagtype.object.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="startTime" uid="3888f8fe-984d-4fcb-a8f4-ed0071eb91c0" label="%tagtype.startTime.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="endTime" uid="e34ce3bc-ef22-4d6d-9c02-81f6bbd2268b" label="%tagtype.endTime.label" parameter-card="1" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.HistoryRecord.label"
-                metaclass="Standard.Class" name="HistoryRecord"
-                owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" uid="fe3e6072-933d-456c-bd5a-77cd25aeb183">
+            <Stereotype name="HistoryRecord" metaclass="Standard.Class" owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.HistoryRecord.label" uid="fe3e6072-933d-456c-bd5a-77cd25aeb183" is-abstract="false">
                 <Icon path="res/icon/gui/HistoryRecord_24.png"/>
                 <Image path="res/icon/gui/HistoryRecord_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.startTime.label"
-                        name="startTime" parameter-card="1" uid="d4316e17-4ce7-49fa-8ef0-c2743e111a0b"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.endTime.label" name="endTime"
-                        parameter-card="1" uid="bb514f2c-6871-49ad-a376-0f3411c9acca"/>
+                    <TagType name="startTime" uid="d4316e17-4ce7-49fa-8ef0-c2743e111a0b" label="%tagtype.startTime.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="endTime" uid="bb514f2c-6871-49ad-a376-0f3411c9acca" label="%tagtype.endTime.label" parameter-card="1" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="true" is-hidden="true"
-                label="%stereotype.Measurement.label"
-                metaclass="Standard.Class" name="Measurement"
-                owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" uid="481e52bb-d5b3-4dcb-a365-8ca5d75d8ac2">
+            <Stereotype name="Measurement" metaclass="Standard.Class" owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" is-hidden="true" label="%stereotype.Measurement.label" uid="481e52bb-d5b3-4dcb-a365-8ca5d75d8ac2" is-abstract="true">
                 <Icon path="res/icon/gui/Measurement_24.png"/>
                 <Image path="res/icon/gui/Measurement_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.value.label" name="value"
-                        parameter-card="1" uid="03f06745-0e69-475c-a468-9f73b761a5d0"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.measurementTime.label"
-                        name="measurementTime" parameter-card="1" uid="501b05dc-7f34-42e0-9da5-3a581c881e5c"/>
+                    <TagType name="value" uid="03f06745-0e69-475c-a468-9f73b761a5d0" label="%tagtype.value.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="measurementTime" uid="501b05dc-7f34-42e0-9da5-3a581c881e5c" label="%tagtype.measurementTime.label" parameter-card="1" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.PaaSMeasurement.label"
-                metaclass="Standard.Class" name="PaaSMeasurement"
-                owner-stereotype="mref#'' {481e52bb-d5b3-4dcb-a365-8ca5d75d8ac2} Infrastructure.Stereotype" uid="726f03cf-0c34-448c-a300-42d54277a37d">
+            <Stereotype name="PaaSMeasurement" metaclass="Standard.Class" owner-stereotype="mref#'' {481e52bb-d5b3-4dcb-a365-8ca5d75d8ac2} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.PaaSMeasurement.label" uid="726f03cf-0c34-448c-a300-42d54277a37d" is-abstract="false">
                 <Icon path="res/icon/gui/PaasMeasurement_24.png"/>
                 <Image path="res/icon/gui/PaasMeasurement_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.RuleTrigger.label"
-                metaclass="Standard.Class" name="RuleTrigger"
-                owner-stereotype="mref#'' {fc44bcb6-59df-49ef-9ed6-13f1d2b85393} Infrastructure.Stereotype" uid="6feb668e-fc53-4354-93a8-d98b00fdb186">
+            <Stereotype name="RuleTrigger" metaclass="Standard.Class" owner-stereotype="mref#'' {fc44bcb6-59df-49ef-9ed6-13f1d2b85393} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.RuleTrigger.label" uid="6feb668e-fc53-4354-93a8-d98b00fdb186" is-abstract="false">
                 <Icon path="res/icon/gui/RuleTrigger_24.png"/>
                 <Image path="res/icon/gui/RuleTrigger_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.TriggeringTime.label"
-                        name="TriggeringTime" parameter-card="1" uid="222df9b1-1654-420c-9e13-31a2c7f0da8d"/>
+                    <TagType name="TriggeringTime" uid="222df9b1-1654-420c-9e13-31a2c7f0da8d" label="%tagtype.TriggeringTime.label" parameter-card="1" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.SLOViolation.label"
-                metaclass="Standard.Class" name="SLOViolation"
-                owner-stereotype="mref#'' {fc44bcb6-59df-49ef-9ed6-13f1d2b85393} Infrastructure.Stereotype" uid="fe591c4e-317f-4202-9f7a-43dff0e6d7fe">
+            <Stereotype name="SLOViolation" metaclass="Standard.Class" owner-stereotype="mref#'' {fc44bcb6-59df-49ef-9ed6-13f1d2b85393} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.SLOViolation.label" uid="fe591c4e-317f-4202-9f7a-43dff0e6d7fe" is-abstract="false">
                 <Icon path="res/icon/gui/SLOViolation_24.png"/>
                 <Image path="res/icon/gui/SLOViolation_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.assessmentTime.label"
-                        name="assessmentTime" parameter-card="1" uid="fc352744-f101-466f-a61c-0b32b9269a34"/>
+                    <TagType name="assessmentTime" uid="fc352744-f101-466f-a61c-0b32b9269a34" label="%tagtype.assessmentTime.label" parameter-card="1" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.SoftwareComponentMeasurement.label"
-                metaclass="Standard.Class"
-                name="SoftwareComponentMeasurement"
-                owner-stereotype="mref#'' {481e52bb-d5b3-4dcb-a365-8ca5d75d8ac2} Infrastructure.Stereotype" uid="cef53d47-e830-42d6-9834-bfc960dc6abe">
+            <Stereotype name="SoftwareComponentMeasurement" metaclass="Standard.Class" owner-stereotype="mref#'' {481e52bb-d5b3-4dcb-a365-8ca5d75d8ac2} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.SoftwareComponentMeasurement.label" uid="cef53d47-e830-42d6-9834-bfc960dc6abe" is-abstract="false">
                 <Icon path="res/icon/gui/executionModelEmpty_24.png"/>
                 <Image path="res/icon/gui/executionModelEmpty_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.VMMeasurement.label"
-                metaclass="Standard.Class" name="VMMeasurement"
-                owner-stereotype="mref#'' {481e52bb-d5b3-4dcb-a365-8ca5d75d8ac2} Infrastructure.Stereotype" uid="a33f8ce2-8fb0-4642-be2c-588ae287f860">
+            <Stereotype name="VMMeasurement" metaclass="Standard.Class" owner-stereotype="mref#'' {481e52bb-d5b3-4dcb-a365-8ca5d75d8ac2} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.VMMeasurement.label" uid="a33f8ce2-8fb0-4642-be2c-588ae287f860" is-abstract="false">
                 <Icon path="res/icon/gui/VMMeasurement_24.png"/>
                 <Image path="res/icon/gui/VMMeasurement_48.png"/>
             </Stereotype>
         </Profile>
-        <Profile id="LocationModel" uid="27e07c22-7b2a-4cfa-a3d8-859eb4eb2db1">
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.LocationModel.label"
-                metaclass="Standard.Package" name="LocationModel"
-                owner-stereotype="mref#'' {577c153e-42b8-4f36-9686-1a6109ffdc16} Infrastructure.Stereotype" uid="ae1d1599-c214-4ba0-9176-8cd1277e2ae1">
+        <Profile uid="27e07c22-7b2a-4cfa-a3d8-859eb4eb2db1" id="LocationModel">
+            <Stereotype name="LocationModel" metaclass="Standard.Package" owner-stereotype="mref#'' {577c153e-42b8-4f36-9686-1a6109ffdc16} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.LocationModel.label" uid="ae1d1599-c214-4ba0-9176-8cd1277e2ae1" is-abstract="false">
                 <Icon path="res/icon/gui/locationModel_24.png"/>
                 <Image path="res/icon/gui/locationModel_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="true" is-hidden="true"
-                label="%stereotype.Location.label"
-                metaclass="Standard.Enumeration" name="Location"
-                owner-stereotype="mref#'' {56eb7780-c162-400f-8e4b-0a5178cef153} Infrastructure.Stereotype" uid="451ac0cf-b5d0-488a-8f05-43139794aa83">
+            <Stereotype name="Location" metaclass="Standard.Enumeration" owner-stereotype="mref#'' {56eb7780-c162-400f-8e4b-0a5178cef153} Infrastructure.Stereotype" is-hidden="true" label="%stereotype.Location.label" uid="451ac0cf-b5d0-488a-8f05-43139794aa83" is-abstract="true">
                 <Icon path=""/>
                 <Image path=""/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.id.label" name="id"
-                        parameter-card="1" uid="4726ff4f-02ae-437f-aebc-16cda8f5d0df"/>
+                    <TagType name="id" uid="4726ff4f-02ae-437f-aebc-16cda8f5d0df" label="%tagtype.id.label" parameter-card="1" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.CloudLocation.label"
-                metaclass="Standard.Enumeration" name="CloudLocation"
-                owner-stereotype="mref#'' {451ac0cf-b5d0-488a-8f05-43139794aa83} Infrastructure.Stereotype" uid="230c406e-effa-4238-9937-957af3c1a96d">
+            <Stereotype name="CloudLocation" metaclass="Standard.Enumeration" owner-stereotype="mref#'' {451ac0cf-b5d0-488a-8f05-43139794aa83} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.CloudLocation.label" uid="230c406e-effa-4238-9937-957af3c1a96d" is-abstract="false">
                 <Icon path="res/icon/gui/locationCloud_24.png"/>
                 <Image path="res/icon/gui/locationCloud_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.isAssignable.label"
-                        name="isAssignable" parameter-card="0" uid="9636ddd4-581e-40c7-98e9-2ce66cca47e8"/>
+                    <TagType name="isAssignable" uid="9636ddd4-581e-40c7-98e9-2ce66cca47e8" label="%tagtype.isAssignable.label" parameter-card="0" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.GeographicalRegion.label"
-                metaclass="Standard.Enumeration"
-                name="GeographicalRegion"
-                owner-stereotype="mref#'' {451ac0cf-b5d0-488a-8f05-43139794aa83} Infrastructure.Stereotype" uid="b9be9f56-5f88-4cfb-8745-3fe2ceda1c86">
+            <Stereotype name="GeographicalRegion" metaclass="Standard.Enumeration" owner-stereotype="mref#'' {451ac0cf-b5d0-488a-8f05-43139794aa83} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.GeographicalRegion.label" uid="b9be9f56-5f88-4cfb-8745-3fe2ceda1c86" is-abstract="false">
                 <Icon path="res/icon/gui/locationRegion_24.png"/>
                 <Image path="res/icon/gui/locationRegion_48.png"/>
             </Stereotype>
         </Profile>
-        <Profile id="MetaDataModel" uid="e8763fa1-0306-417f-a678-38b6a89f90de">
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.MetaDataModel.label"
-                metaclass="Standard.Package" name="MetaDataModel"
-                owner-stereotype="mref#'' {577c153e-42b8-4f36-9686-1a6109ffdc16} Infrastructure.Stereotype" uid="73200409-c934-45d3-b418-8d71c00e7382">
+        <Profile uid="e8763fa1-0306-417f-a678-38b6a89f90de" id="MetaDataModel">
+            <Stereotype name="MetaDataModel" metaclass="Standard.Package" owner-stereotype="mref#'' {577c153e-42b8-4f36-9686-1a6109ffdc16} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.MetaDataModel.label" uid="73200409-c934-45d3-b418-8d71c00e7382" is-abstract="false">
                 <Icon path="res/icon/gui/metadataModel_24.png"/>
                 <Image path="res/icon/gui/metadataModel_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.MmsConcept.label"
-                metaclass="Standard.Class" name="MmsConcept"
-                owner-stereotype="mref#'' {907f72a5-eb52-4908-953e-7f9a66b9939d} Infrastructure.Stereotype" uid="6f3091ee-3a3b-4157-8b89-872f99b970f9">
+            <Stereotype name="MmsConcept" metaclass="Standard.Class" owner-stereotype="mref#'' {907f72a5-eb52-4908-953e-7f9a66b9939d} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.MmsConcept.label" uid="6f3091ee-3a3b-4157-8b89-872f99b970f9" is-abstract="false">
                 <Icon path="res/icon/gui/metadataConcept_24.png"/>
                 <Image path="res/icon/gui/metadataConcept_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.MmsConceptInstance.label"
-                metaclass="Standard.Instance" name="MmsConceptInstance"
-                owner-stereotype="mref#'' {907f72a5-eb52-4908-953e-7f9a66b9939d} Infrastructure.Stereotype" uid="81bc1a2f-1255-41fb-b517-5ca503ccc73e">
+            <Stereotype name="MmsConceptInstance" metaclass="Standard.Instance" owner-stereotype="mref#'' {907f72a5-eb52-4908-953e-7f9a66b9939d} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.MmsConceptInstance.label" uid="81bc1a2f-1255-41fb-b517-5ca503ccc73e" is-abstract="false">
                 <Icon path="res/icon/gui/metadataConceptInstance_24.png"/>
                 <Image path="res/icon/gui/metadataConceptInstance_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="true" is-hidden="true"
-                label="%stereotype.MmsObject.label"
-                metaclass="Infrastructure.ModelElement" name="MmsObject"
-                owner-stereotype="mref#'' {0fcc7434-c82f-4c57-a814-8a9233fdc9b0} Infrastructure.Stereotype" uid="907f72a5-eb52-4908-953e-7f9a66b9939d">
+            <Stereotype name="MmsObject" metaclass="Infrastructure.ModelElement" owner-stereotype="mref#'' {0fcc7434-c82f-4c57-a814-8a9233fdc9b0} Infrastructure.Stereotype" is-hidden="true" label="%stereotype.MmsObject.label" uid="907f72a5-eb52-4908-953e-7f9a66b9939d" is-abstract="true">
                 <Icon path=""/>
                 <Image path=""/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.label.label" name="id"
-                        parameter-card="1" uid="a139c9cf-4b74-454a-b4cd-b0363a008c40"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.uri.label" name="uri"
-                        parameter-card="1" uid="5cff0fda-7e85-46ea-af8b-de500c800a21"/>
+                    <TagType name="id" uid="a139c9cf-4b74-454a-b4cd-b0363a008c40" label="%tagtype.label.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="uri" uid="5cff0fda-7e85-46ea-af8b-de500c800a21" label="%tagtype.uri.label" parameter-card="1" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.MmsProperty.label"
-                metaclass="Standard.Attribute" name="MmsProperty"
-                owner-stereotype="mref#'' {907f72a5-eb52-4908-953e-7f9a66b9939d} Infrastructure.Stereotype" uid="2fd479fe-3531-4636-aba9-b8fb0976fe66">
+            <Stereotype name="MmsProperty" metaclass="Standard.Attribute" owner-stereotype="mref#'' {907f72a5-eb52-4908-953e-7f9a66b9939d} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.MmsProperty.label" uid="2fd479fe-3531-4636-aba9-b8fb0976fe66" is-abstract="false">
                 <Icon path="res/icon/gui/metadataProperty_24.png"/>
                 <Image path="res/icon/gui/metadataProperty_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.rangeUri.label" name="rangeUri"
-                        parameter-card="1" uid="d51c3381-6675-4439-9ba0-f0c7da269bcf"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.propertyType.label"
-                        name="propertyType" parameter-card="1" uid="fb35b00c-ff5a-4b21-b9bf-fdb16ef500e5"/>
+                    <TagType name="rangeUri" uid="d51c3381-6675-4439-9ba0-f0c7da269bcf" label="%tagtype.rangeUri.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="propertyType" uid="fb35b00c-ff5a-4b21-b9bf-fdb16ef500e5" label="%tagtype.propertyType.label" parameter-card="1" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.MmsPropertyInstance.label"
-                metaclass="Standard.AttributeLink"
-                name="MmsPropertyInstance"
-                owner-stereotype="mref#'' {907f72a5-eb52-4908-953e-7f9a66b9939d} Infrastructure.Stereotype" uid="f4953787-31fa-4eed-88df-83d5ad51d82e">
+            <Stereotype name="MmsPropertyInstance" metaclass="Standard.AttributeLink" owner-stereotype="mref#'' {907f72a5-eb52-4908-953e-7f9a66b9939d} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.MmsPropertyInstance.label" uid="f4953787-31fa-4eed-88df-83d5ad51d82e" is-abstract="false">
                 <Icon path="res/icon/gui/metadataPropertyInstance_24.png"/>
                 <Image path="res/icon/gui/metadataPropertyInstance_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.propertyValue.label"
-                        name="propertyValue" parameter-card="1" uid="1df65abe-3c98-4cde-9656-91b11230e762"/>
+                    <TagType name="propertyValue" uid="1df65abe-3c98-4cde-9656-91b11230e762" label="%tagtype.propertyValue.label" parameter-card="1" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
         </Profile>
-        <Profile id="MetricModel" uid="7b7cc375-db0a-4b93-8d14-6adbc5f5618b">
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.AttributeContext.label"
-                metaclass="Standard.Class" name="AttributeContext"
-                owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" uid="817ee7bc-b7e6-432e-af4a-bbc95f4162be">
+        <Profile uid="7b7cc375-db0a-4b93-8d14-6adbc5f5618b" id="MetricModel">
+            <Stereotype name="AttributeContext" metaclass="Standard.Class" owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.AttributeContext.label" uid="817ee7bc-b7e6-432e-af4a-bbc95f4162be" is-abstract="false">
                 <Icon path="res/icon/gui/AttributeContext_24.png"/>
                 <Image path="res/icon/gui/AttributeContext_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.CompositeMetric.label"
-                metaclass="Standard.Class" name="CompositeMetric"
-                owner-stereotype="mref#'' {1603af9c-7b21-4da2-96b7-6607aa8066cc} Infrastructure.Stereotype" uid="680d667b-9545-40d8-9c12-84675bc68fc4">
+            <Stereotype name="CompositeMetric" metaclass="Standard.Class" owner-stereotype="mref#'' {1603af9c-7b21-4da2-96b7-6607aa8066cc} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.CompositeMetric.label" uid="680d667b-9545-40d8-9c12-84675bc68fc4" is-abstract="false">
                 <Icon path="res/icon/gui/CompositeMetric_24.png"/>
                 <Image path="res/icon/gui/CompositeMetric_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.formula.label" name="formula"
-                        parameter-card="1" uid="851d14e4-ea15-4582-a92c-96160e350212"/>
+                    <TagType name="formula" uid="851d14e4-ea15-4582-a92c-96160e350212" label="%tagtype.formula.label" parameter-card="1" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.CompositeMetricContext.label"
-                metaclass="Standard.Class" name="CompositeMetricContext"
-                owner-stereotype="mref#'' {488a751d-5081-4d44-bdb2-716e2a588fb4} Infrastructure.Stereotype" uid="5967b9ec-f47f-4506-8f58-e308c56214d4">
+            <Stereotype name="CompositeMetricContext" metaclass="Standard.Class" owner-stereotype="mref#'' {488a751d-5081-4d44-bdb2-716e2a588fb4} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.CompositeMetricContext.label" uid="5967b9ec-f47f-4506-8f58-e308c56214d4" is-abstract="false">
                 <Icon path="res/icon/gui/CompositeMetricContext_24.png"/>
                 <Image path="res/icon/gui/CompositeMetricContext_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.groupingType.label"
-                        name="groupingType" parameter-card="1" uid="7147fecd-832f-4c13-ad68-032239f5c0f3"/>
+                    <TagType name="groupingType" uid="7147fecd-832f-4c13-ad68-032239f5c0f3" label="%tagtype.groupingType.label" parameter-card="1" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.Function.label"
-                metaclass="Standard.Class" name="Function"
-                owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" uid="2ce13037-e3af-417d-9c03-54d155a1d933">
+            <Stereotype name="Function" metaclass="Standard.Class" owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.Function.label" uid="2ce13037-e3af-417d-9c03-54d155a1d933" is-abstract="false">
                 <Icon path="res/icon/gui/Function_24.png"/>
                 <Image path="res/icon/gui/Function_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.expression.label"
-                        name="expression" parameter-card="1" uid="8e19ff42-15d1-4aa8-b24d-934d6c6f8774"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.arguments.label"
-                        name="arguments" parameter-card="*" uid="e6a87341-c973-4532-970a-be2e90fe9dda"/>
+                    <TagType name="expression" uid="8e19ff42-15d1-4aa8-b24d-934d6c6f8774" label="%tagtype.expression.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="arguments" uid="e6a87341-c973-4532-970a-be2e90fe9dda" label="%tagtype.arguments.label" parameter-card="*" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="true" is-hidden="true"
-                label="%stereotype.Metric.label"
-                metaclass="Standard.Class" name="Metric"
-                owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" uid="1603af9c-7b21-4da2-96b7-6607aa8066cc">
+            <Stereotype name="Metric" metaclass="Standard.Class" owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" is-hidden="true" label="%stereotype.Metric.label" uid="1603af9c-7b21-4da2-96b7-6607aa8066cc" is-abstract="true">
                 <Icon path=""/>
                 <Image path=""/>
             </Stereotype>
-            <Stereotype is-abstract="true" is-hidden="true"
-                label="%stereotype.MetricContext.label"
-                metaclass="Standard.Class" name="MetricContext"
-                owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" uid="488a751d-5081-4d44-bdb2-716e2a588fb4">
+            <Stereotype name="MetricContext" metaclass="Standard.Class" owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" is-hidden="true" label="%stereotype.MetricContext.label" uid="488a751d-5081-4d44-bdb2-716e2a588fb4" is-abstract="true">
                 <Icon path=""/>
                 <Image path=""/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.MetricInstance.label"
-                metaclass="Standard.Instance" name="MetricInstance"
-                owner-stereotype="mref#'' {df209aca-1325-4c99-b383-ca2650224ff6} Infrastructure.Stereotype" uid="52b2d53f-cfda-455d-ae3d-dd97fed6fa84">
+            <Stereotype name="MetricInstance" metaclass="Standard.Instance" owner-stereotype="mref#'' {df209aca-1325-4c99-b383-ca2650224ff6} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.MetricInstance.label" uid="52b2d53f-cfda-455d-ae3d-dd97fed6fa84" is-abstract="false">
                 <Icon path="res/icon/gui/MetricInstance_24.png"/>
                 <Image path="res/icon/gui/MetricInstanceModel_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.MetricInstanceModel.label"
-                metaclass="Standard.Package" name="MetricInstanceModel"
-                owner-stereotype="mref#'' {e9c199d4-1f22-4720-a79c-39ebaf36e7bb} Infrastructure.Stereotype" uid="42ce7273-a709-4cf7-bc51-ac7ee48b9f13">
+            <Stereotype name="MetricInstanceModel" metaclass="Standard.Package" owner-stereotype="mref#'' {e9c199d4-1f22-4720-a79c-39ebaf36e7bb} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.MetricInstanceModel.label" uid="42ce7273-a709-4cf7-bc51-ac7ee48b9f13" is-abstract="false">
                 <Icon path="res/icon/gui/MetricInstanceModel_24.png"/>
                 <Image path="res/icon/gui/MetricInstanceModel_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="true" is-hidden="true"
-                label="%stereotype.MetricModel.label"
-                metaclass="Standard.Package" name="MetricModel"
-                owner-stereotype="mref#'' {577c153e-42b8-4f36-9686-1a6109ffdc16} Infrastructure.Stereotype" uid="e9c199d4-1f22-4720-a79c-39ebaf36e7bb">
+            <Stereotype name="MetricModel" metaclass="Standard.Package" owner-stereotype="mref#'' {577c153e-42b8-4f36-9686-1a6109ffdc16} Infrastructure.Stereotype" is-hidden="true" label="%stereotype.MetricModel.label" uid="e9c199d4-1f22-4720-a79c-39ebaf36e7bb" is-abstract="true">
                 <Icon path=""/>
                 <Image path=""/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.MetricObjectBinding.label"
-                metaclass="Standard.Class" name="MetricObjectBinding"
-                owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" uid="53d4e08f-3c02-461e-91e7-e2adf292b0c2">
+            <Stereotype name="MetricObjectBinding" metaclass="Standard.Class" owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.MetricObjectBinding.label" uid="53d4e08f-3c02-461e-91e7-e2adf292b0c2" is-abstract="false">
                 <Icon path="res/icon/gui/MetricObjectBinding_24.png"/>
                 <Image path="res/icon/gui/MetricObjectBinding_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.MetricTemplate.label"
-                metaclass="Standard.Class" name="MetricTemplate"
-                owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" uid="9f394e40-1b72-4bd0-a2e6-b02a67cf87fd">
+            <Stereotype name="MetricTemplate" metaclass="Standard.Class" owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.MetricTemplate.label" uid="9f394e40-1b72-4bd0-a2e6-b02a67cf87fd" is-abstract="false">
                 <Icon path="res/icon/gui/MetricTemplate_24.png"/>
                 <Image path="res/icon/gui/MetricTemplate_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.valueDirection.label"
-                        name="valueDirection" parameter-card="1" uid="537c84fa-0460-4eae-bc55-104097f503c9"/>
+                    <TagType name="valueDirection" uid="537c84fa-0460-4eae-bc55-104097f503c9" label="%tagtype.valueDirection.label" parameter-card="1" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.MetricTypeModel.label"
-                metaclass="Standard.Package" name="MetricTypeModel"
-                owner-stereotype="mref#'' {e9c199d4-1f22-4720-a79c-39ebaf36e7bb} Infrastructure.Stereotype" uid="76545176-b1ff-442f-8629-bc2c4845dbdb">
+            <Stereotype name="MetricTypeModel" metaclass="Standard.Package" owner-stereotype="mref#'' {e9c199d4-1f22-4720-a79c-39ebaf36e7bb} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.MetricTypeModel.label" uid="76545176-b1ff-442f-8629-bc2c4845dbdb" is-abstract="false">
                 <Icon path="res/icon/gui/metricModel_24.png"/>
                 <Image path="res/icon/gui/metricModel_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.MetricVariable.label"
-                metaclass="Standard.Class" name="MetricVariable"
-                owner-stereotype="mref#'' {1603af9c-7b21-4da2-96b7-6607aa8066cc} Infrastructure.Stereotype" uid="74fbbe90-c06f-4bc3-81a7-d13724b575a8">
+            <Stereotype name="MetricVariable" metaclass="Standard.Class" owner-stereotype="mref#'' {1603af9c-7b21-4da2-96b7-6607aa8066cc} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.MetricVariable.label" uid="74fbbe90-c06f-4bc3-81a7-d13724b575a8" is-abstract="false">
                 <Icon path="res/icon/gui/MetricVariable_24.png"/>
                 <Image path="res/icon/gui/MetricVariable_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.currentConfiguration.label"
-                        name="currentConfiguration" parameter-card="0" uid="c0614ae1-0ba0-4112-bdfd-d97d8b6faafa"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.onNodeCandidates.label"
-                        name="onNodeCandidates" parameter-card="0" uid="0f9463fd-7b8b-4783-891a-4e8783894e9d"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.formula.label" name="formula"
-                        parameter-card="1" uid="9bfc3948-91d5-4ff4-b294-c2ef71d31b6a"/>
+                    <TagType name="currentConfiguration" uid="c0614ae1-0ba0-4112-bdfd-d97d8b6faafa" label="%tagtype.currentConfiguration.label" parameter-card="0" is-hidden="false" is-signed="false"/>
+                    <TagType name="onNodeCandidates" uid="0f9463fd-7b8b-4783-891a-4e8783894e9d" label="%tagtype.onNodeCandidates.label" parameter-card="0" is-hidden="false" is-signed="false"/>
+                    <TagType name="formula" uid="9bfc3948-91d5-4ff4-b294-c2ef71d31b6a" label="%tagtype.formula.label" parameter-card="1" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.ObjectContext.label"
-                metaclass="Standard.Class" name="ObjectContext"
-                owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" uid="b5ec870a-0a52-4a49-a5f3-ee6a50acb0c7">
+            <Stereotype name="ObjectContext" metaclass="Standard.Class" owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.ObjectContext.label" uid="b5ec870a-0a52-4a49-a5f3-ee6a50acb0c7" is-abstract="false">
                 <Icon path="res/icon/gui/ObjectContext_24.png"/>
                 <Image path="res/icon/gui/ObjectContext_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.RawMetric.label"
-                metaclass="Standard.Class" name="RawMetric"
-                owner-stereotype="mref#'' {1603af9c-7b21-4da2-96b7-6607aa8066cc} Infrastructure.Stereotype" uid="01e0501b-37c4-4e17-af3c-6a30e6ad9290">
+            <Stereotype name="RawMetric" metaclass="Standard.Class" owner-stereotype="mref#'' {1603af9c-7b21-4da2-96b7-6607aa8066cc} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.RawMetric.label" uid="01e0501b-37c4-4e17-af3c-6a30e6ad9290" is-abstract="false">
                 <Icon path="res/icon/gui/RawMetric_24.png"/>
                 <Image path="res/icon/gui/RawMetric_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.RawMetricContext.label"
-                metaclass="Standard.Class" name="RawMetricContext"
-                owner-stereotype="mref#'' {488a751d-5081-4d44-bdb2-716e2a588fb4} Infrastructure.Stereotype" uid="e344a491-8e64-437e-81c2-ca5e85a6daf9">
+            <Stereotype name="RawMetricContext" metaclass="Standard.Class" owner-stereotype="mref#'' {488a751d-5081-4d44-bdb2-716e2a588fb4} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.RawMetricContext.label" uid="e344a491-8e64-437e-81c2-ca5e85a6daf9" is-abstract="false">
                 <Icon path="res/icon/gui/RawMetricContext_24.png"/>
                 <Image path="res/icon/gui/RawMetricContext_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.Schedule.label"
-                metaclass="Standard.Class" name="Schedule"
-                owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" uid="cad43b0e-412b-4e89-9a37-e7e1cda6ca29">
+            <Stereotype name="Schedule" metaclass="Standard.Class" owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.Schedule.label" uid="cad43b0e-412b-4e89-9a37-e7e1cda6ca29" is-abstract="false">
                 <Icon path="res/icon/gui/Schedule_24.png"/>
                 <Image path="res/icon/gui/Schedule_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.start.label" name="start"
-                        parameter-card="1" uid="798817d7-1858-433c-924c-d2de04defbb5"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.end.label" name="end"
-                        parameter-card="1" uid="508e2653-ea62-4c42-b280-044f60f4aa40"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.repetitions.label"
-                        name="repetitions" parameter-card="1" uid="ce32b74c-7bc9-4e7a-8a99-2834143aec80"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.interval.label" name="interval"
-                        parameter-card="1" uid="db3b563e-906f-40b7-a3f1-970e008bdf2a"/>
+                    <TagType name="start" uid="798817d7-1858-433c-924c-d2de04defbb5" label="%tagtype.start.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="end" uid="508e2653-ea62-4c42-b280-044f60f4aa40" label="%tagtype.end.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="repetitions" uid="ce32b74c-7bc9-4e7a-8a99-2834143aec80" label="%tagtype.repetitions.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="interval" uid="db3b563e-906f-40b7-a3f1-970e008bdf2a" label="%tagtype.interval.label" parameter-card="1" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.Sensor.label"
-                metaclass="Standard.Component" name="Sensor"
-                owner-stereotype="mref#'' {e66ca9e8-6d1c-46bd-9d9d-e1e16675fada} Infrastructure.Stereotype" uid="d130006b-ebe5-4a5f-818a-abc63742cf56">
+            <Stereotype name="Sensor" metaclass="Standard.Component" owner-stereotype="mref#'' {e66ca9e8-6d1c-46bd-9d9d-e1e16675fada} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.Sensor.label" uid="d130006b-ebe5-4a5f-818a-abc63742cf56" is-abstract="false">
                 <Icon path="res/icon/gui/Sensor_24.png"/>
                 <Image path="res/icon/gui/Sensor_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.configuration.label"
-                        name="configuration" parameter-card="1" uid="326b1fa3-0a38-48be-aace-c126d5979004"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.isPush.label" name="isPush"
-                        parameter-card="0" uid="13acdee9-96c7-4ae3-82b9-99cd12effc27"/>
+                    <TagType name="configuration" uid="326b1fa3-0a38-48be-aace-c126d5979004" label="%tagtype.configuration.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="isPush" uid="13acdee9-96c7-4ae3-82b9-99cd12effc27" label="%tagtype.isPush.label" parameter-card="0" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.Window.label"
-                metaclass="Standard.Class" name="Window"
-                owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" uid="33bb8dc7-688c-4f64-97da-a3fcddbddc20">
+            <Stereotype name="Window" metaclass="Standard.Class" owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.Window.label" uid="33bb8dc7-688c-4f64-97da-a3fcddbddc20" is-abstract="false">
                 <Icon path="res/icon/gui/Window_24.png"/>
                 <Image path="res/icon/gui/Window_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.windowType.label"
-                        name="windowType" parameter-card="1" uid="cd7ae4c0-9f79-4384-b562-1bfdfa78754a"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.sizeType.label" name="sizeType"
-                        parameter-card="1" uid="9c7e3aaf-1ae0-4766-b44d-2717c3abea43"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.measurementSize.label"
-                        name="measurementSize" parameter-card="1" uid="651305db-6f84-43d4-ba59-fbc3a00368d0"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.timeSize.label" name="timeSize"
-                        parameter-card="1" uid="7ab2f3bb-742a-4b32-b5f9-08576f164c8b"/>
+                    <TagType name="windowType" uid="cd7ae4c0-9f79-4384-b562-1bfdfa78754a" label="%tagtype.windowType.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="sizeType" uid="9c7e3aaf-1ae0-4766-b44d-2717c3abea43" label="%tagtype.sizeType.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="measurementSize" uid="651305db-6f84-43d4-ba59-fbc3a00368d0" label="%tagtype.measurementSize.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="timeSize" uid="7ab2f3bb-742a-4b32-b5f9-08576f164c8b" label="%tagtype.timeSize.label" parameter-card="1" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
         </Profile>
-        <Profile id="OrganisationModel" uid="5db99bc2-85e7-4b01-bda0-109f45e1fd70">
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.CloudCredentials.label"
-                metaclass="Standard.Class" name="CloudCredentials"
-                owner-stereotype="mref#'' {ff07e549-20c1-4871-863d-c00d48790863} Infrastructure.Stereotype" uid="1ac06bbb-e680-411d-9dd2-26838d4ec854">
+        <Profile uid="5db99bc2-85e7-4b01-bda0-109f45e1fd70" id="OrganisationModel">
+            <Stereotype name="CloudCredentials" metaclass="Standard.Class" owner-stereotype="mref#'' {ff07e549-20c1-4871-863d-c00d48790863} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.CloudCredentials.label" uid="1ac06bbb-e680-411d-9dd2-26838d4ec854" is-abstract="false">
                 <Icon path="res/icon/gui/organisationModelEmpty_24.png"/>
                 <Image path="res/icon/gui/organisationModelEmpty_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.cloudProviderName.label"
-                        name="cloudProviderName" parameter-card="1" uid="d30c4942-657d-4e40-b794-bcad379adfe3"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.securityGroup.label"
-                        name="securityGroup" parameter-card="1" uid="f0d9b3a8-180f-4577-b22e-2aff1b401636"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.publicSSHKey.label"
-                        name="publicSSHKey" parameter-card="1" uid="467685e9-1975-4ab8-80f3-6f8a9e088e88"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.privateSSHKey.label"
-                        name="privateSSHKey" parameter-card="1" uid="bc33f941-e476-464e-8924-377efbc04526"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.username.label" name="username"
-                        parameter-card="1" uid="ee879df8-6973-4292-a98c-ce1d07b26d43"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.password.label" name="password"
-                        parameter-card="1" uid="65bb8183-11c0-49de-84f2-e0c3eccbff14"/>
+                    <TagType name="cloudProviderName" uid="d30c4942-657d-4e40-b794-bcad379adfe3" label="%tagtype.cloudProviderName.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="securityGroup" uid="f0d9b3a8-180f-4577-b22e-2aff1b401636" label="%tagtype.securityGroup.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="publicSSHKey" uid="467685e9-1975-4ab8-80f3-6f8a9e088e88" label="%tagtype.publicSSHKey.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="privateSSHKey" uid="bc33f941-e476-464e-8924-377efbc04526" label="%tagtype.privateSSHKey.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="username" uid="ee879df8-6973-4292-a98c-ce1d07b26d43" label="%tagtype.username.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="password" uid="65bb8183-11c0-49de-84f2-e0c3eccbff14" label="%tagtype.password.label" parameter-card="1" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.CloudProvider.label"
-                metaclass="Standard.Class" name="CloudProvider"
-                owner-stereotype="mref#'' {fa6ac57f-ab05-4b55-81ec-f129e360b94d} Infrastructure.Stereotype" uid="eb3e5683-72bd-4e46-8bda-1ea07af0c09e">
+            <Stereotype name="CloudProvider" metaclass="Standard.Class" owner-stereotype="mref#'' {fa6ac57f-ab05-4b55-81ec-f129e360b94d} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.CloudProvider.label" uid="eb3e5683-72bd-4e46-8bda-1ea07af0c09e" is-abstract="false">
                 <Icon path="res/icon/gui/organisationModelEmpty_24.png"/>
                 <Image path="res/icon/gui/organisationModelEmpty_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.public.label" name="public"
-                        parameter-card="0" uid="a7b7a414-a54a-45b1-a53e-3126883211b8"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.SaaS.label" name="SaaS"
-                        parameter-card="0" uid="f42c6540-bd96-497b-9689-075610b04eda"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.PaaS.label" name="PaaS"
-                        parameter-card="0" uid="d89c42d7-ad3d-49e1-a24d-46b82e7965ac"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.IaaS.label" name="IaaS"
-                        parameter-card="0" uid="e33192b2-ce6c-499c-98c5-167d63c32690"/>
+                    <TagType name="public" uid="a7b7a414-a54a-45b1-a53e-3126883211b8" label="%tagtype.public.label" parameter-card="0" is-hidden="false" is-signed="false"/>
+                    <TagType name="SaaS" uid="f42c6540-bd96-497b-9689-075610b04eda" label="%tagtype.SaaS.label" parameter-card="0" is-hidden="false" is-signed="false"/>
+                    <TagType name="PaaS" uid="d89c42d7-ad3d-49e1-a24d-46b82e7965ac" label="%tagtype.PaaS.label" parameter-card="0" is-hidden="false" is-signed="false"/>
+                    <TagType name="IaaS" uid="e33192b2-ce6c-499c-98c5-167d63c32690" label="%tagtype.IaaS.label" parameter-card="0" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="true" is-hidden="true"
-                label="%stereotype.Credentials.label"
-                metaclass="Standard.Class" name="Credentials"
-                owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" uid="ff07e549-20c1-4871-863d-c00d48790863">
+            <Stereotype name="Credentials" metaclass="Standard.Class" owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" is-hidden="true" label="%stereotype.Credentials.label" uid="ff07e549-20c1-4871-863d-c00d48790863" is-abstract="true">
                 <Icon path=""/>
                 <Image path=""/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.DataResourceFilter.label"
-                metaclass="Standard.Class" name="DataResourceFilter"
-                owner-stereotype="mref#'' {ce775666-60ae-48ab-94dd-b9a12b9edf2f} Infrastructure.Stereotype" uid="db53c8ff-ef9a-4bc2-bbfa-af051fcaa66d">
+            <Stereotype name="DataResourceFilter" metaclass="Standard.Class" owner-stereotype="mref#'' {ce775666-60ae-48ab-94dd-b9a12b9edf2f} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.DataResourceFilter.label" uid="db53c8ff-ef9a-4bc2-bbfa-af051fcaa66d" is-abstract="false">
                 <Icon path="res/icon/gui/organisationModelEmpty_24.png"/>
                 <Image path="res/icon/gui/organisationModelEmpty_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.everyData.label"
-                        name="everyData" parameter-card="0" uid="224a9d86-f0da-48c2-aee2-621dc2822fd3"/>
+                    <TagType name="everyData" uid="224a9d86-f0da-48c2-aee2-621dc2822fd3" label="%tagtype.everyData.label" parameter-card="0" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.Entity.label"
-                metaclass="Standard.Class" name="Entity"
-                owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" uid="8edda027-b2f3-43bb-b101-0058aaa1550f">
+            <Stereotype name="Entity" metaclass="Standard.Class" owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.Entity.label" uid="8edda027-b2f3-43bb-b101-0058aaa1550f" is-abstract="false">
                 <Icon path="res/icon/gui/organisationModelEmpty_24.png"/>
                 <Image path="res/icon/gui/organisationModelEmpty_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.ExternalIdentifier.label"
-                metaclass="Standard.Class" name="ExternalIdentifier"
-                owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" uid="9e9641f0-08c0-4453-a828-314b9d3e7682">
+            <Stereotype name="ExternalIdentifier" metaclass="Standard.Class" owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.ExternalIdentifier.label" uid="9e9641f0-08c0-4453-a828-314b9d3e7682" is-abstract="false">
                 <Icon path="res/icon/gui/organisationModelEmpty_24.png"/>
                 <Image path="res/icon/gui/organisationModelEmpty_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.identifier.label"
-                        name="identifier" parameter-card="1" uid="79f66d2e-b870-4d06-81b9-8851077fb522"/>
+                    <TagType name="identifier" uid="79f66d2e-b870-4d06-81b9-8851077fb522" label="%tagtype.identifier.label" parameter-card="1" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.ModelResourceFilter.label"
-                metaclass="Standard.Class" name="ModelResourceFilter"
-                owner-stereotype="mref#'' {ce775666-60ae-48ab-94dd-b9a12b9edf2f} Infrastructure.Stereotype" uid="b2deaba4-8571-4400-b47d-f0a5b91b3149">
+            <Stereotype name="ModelResourceFilter" metaclass="Standard.Class" owner-stereotype="mref#'' {ce775666-60ae-48ab-94dd-b9a12b9edf2f} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.ModelResourceFilter.label" uid="b2deaba4-8571-4400-b47d-f0a5b91b3149" is-abstract="false">
                 <Icon path="res/icon/gui/organisationModelEmpty_24.png"/>
                 <Image path="res/icon/gui/organisationModelEmpty_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.informationResourcePath.label"
-                        name="informationResourcePath"
-                        parameter-card="1" uid="cbea7d8d-42de-41a1-808c-4a3c6505d00f"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.everyInformationResource.label"
-                        name="everyInformationResource"
-                        parameter-card="0" uid="bffb0548-bcf3-4966-9260-825f28edb4db"/>
+                    <TagType name="informationResourcePath" uid="cbea7d8d-42de-41a1-808c-4a3c6505d00f" label="%tagtype.informationResourcePath.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="everyInformationResource" uid="bffb0548-bcf3-4966-9260-825f28edb4db" label="%tagtype.everyInformationResource.label" parameter-card="0" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.Organisation.label"
-                metaclass="Standard.Class" name="Organisation"
-                owner-stereotype="mref#'' {8edda027-b2f3-43bb-b101-0058aaa1550f} Infrastructure.Stereotype" uid="fa6ac57f-ab05-4b55-81ec-f129e360b94d">
+            <Stereotype name="Organisation" metaclass="Standard.Class" owner-stereotype="mref#'' {8edda027-b2f3-43bb-b101-0058aaa1550f} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.Organisation.label" uid="fa6ac57f-ab05-4b55-81ec-f129e360b94d" is-abstract="false">
                 <Icon path="res/icon/gui/organisationModelEmpty_24.png"/>
                 <Image path="res/icon/gui/organisationModelEmpty_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.www.label" name="www"
-                        parameter-card="1" uid="79c63438-ac0f-42ea-aead-1ff7c9210f58"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.postalAddress.label"
-                        name="postalAddress" parameter-card="1" uid="cfbc93ca-abc2-46b7-954e-feedaadfd214"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.email.label" name="email"
-                        parameter-card="1" uid="6cb9f211-07e7-4de9-b4b1-4da86857332f"/>
+                    <TagType name="www" uid="79c63438-ac0f-42ea-aead-1ff7c9210f58" label="%tagtype.www.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="postalAddress" uid="cfbc93ca-abc2-46b7-954e-feedaadfd214" label="%tagtype.postalAddress.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="email" uid="6cb9f211-07e7-4de9-b4b1-4da86857332f" label="%tagtype.email.label" parameter-card="1" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.OrganisationModel.label"
-                metaclass="Standard.Package" name="OrganisationModel"
-                owner-stereotype="mref#'' {577c153e-42b8-4f36-9686-1a6109ffdc16} Infrastructure.Stereotype" uid="e44c4759-0924-40bc-95d9-3cf51944eccf">
+            <Stereotype name="OrganisationModel" metaclass="Standard.Package" owner-stereotype="mref#'' {577c153e-42b8-4f36-9686-1a6109ffdc16} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.OrganisationModel.label" uid="e44c4759-0924-40bc-95d9-3cf51944eccf" is-abstract="false">
                 <Icon path="res/icon/gui/organisationModel_24.png"/>
                 <Image path=""/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.organisationName.label"
-                        name="organisationName" parameter-card="1" uid="f8f457b3-49af-40e8-8af6-d2a7c8a961ae"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.organisationEmail.label"
-                        name="organisationEmail" parameter-card="1" uid="9449c6de-b56a-409f-ad60-bb01d80d128e"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.organisationWebsite.label"
-                        name="organisationWebsite" parameter-card="1" uid="cd62f8b6-56da-4e63-b459-3bace5101527"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.securityLevel.label"
-                        name="securityLevel" parameter-card="1" uid="faa375ab-b4ac-4c59-95c5-592a98011b70"/>
+                    <TagType name="organisationName" uid="f8f457b3-49af-40e8-8af6-d2a7c8a961ae" label="%tagtype.organisationName.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="organisationEmail" uid="9449c6de-b56a-409f-ad60-bb01d80d128e" label="%tagtype.organisationEmail.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="organisationWebsite" uid="cd62f8b6-56da-4e63-b459-3bace5101527" label="%tagtype.organisationWebsite.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="securityLevel" uid="faa375ab-b4ac-4c59-95c5-592a98011b70" label="%tagtype.securityLevel.label" parameter-card="1" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.Permission.label"
-                metaclass="Standard.Class" name="Permission"
-                owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" uid="6ae08256-a803-41d5-b777-25c632563818">
+            <Stereotype name="Permission" metaclass="Standard.Class" owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.Permission.label" uid="6ae08256-a803-41d5-b777-25c632563818" is-abstract="false">
                 <Icon path="res/icon/gui/organisationModelEmpty_24.png"/>
                 <Image path="res/icon/gui/organisationModelEmpty_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.startTime.label"
-                        name="startTime" parameter-card="1" uid="1cd5d4cb-89a8-4de9-bb2b-b8c6c32eb886"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.endTime.label" name="endTime"
-                        parameter-card="1" uid="915d1bbf-4329-4bc3-808f-6a5c16adb930"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.action.label" name="action"
-                        parameter-card="1" uid="d9e1084c-4454-4058-8d17-2a224a9d9315"/>
+                    <TagType name="startTime" uid="1cd5d4cb-89a8-4de9-bb2b-b8c6c32eb886" label="%tagtype.startTime.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="endTime" uid="915d1bbf-4329-4bc3-808f-6a5c16adb930" label="%tagtype.endTime.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="action" uid="d9e1084c-4454-4058-8d17-2a224a9d9315" label="%tagtype.action.label" parameter-card="1" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.PlatformCredentials.label"
-                metaclass="Standard.Class" name="PlatformCredentials"
-                owner-stereotype="mref#'' {ff07e549-20c1-4871-863d-c00d48790863} Infrastructure.Stereotype" uid="18028ade-34c8-4575-802c-163035bf0bb0">
+            <Stereotype name="PlatformCredentials" metaclass="Standard.Class" owner-stereotype="mref#'' {ff07e549-20c1-4871-863d-c00d48790863} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.PlatformCredentials.label" uid="18028ade-34c8-4575-802c-163035bf0bb0" is-abstract="false">
                 <Icon path="res/icon/gui/organisationModelEmpty_24.png"/>
                 <Image path="res/icon/gui/organisationModelEmpty_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.password.label" name="password"
-                        parameter-card="1" uid="82175de9-34de-4e30-ba3e-d13cdf0653d1"/>
+                    <TagType name="password" uid="82175de9-34de-4e30-ba3e-d13cdf0653d1" label="%tagtype.password.label" parameter-card="1" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="true" is-hidden="true"
-                label="%stereotype.ResourceFilter.label"
-                metaclass="Standard.Class" name="ResourceFilter"
-                owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" uid="ce775666-60ae-48ab-94dd-b9a12b9edf2f">
+            <Stereotype name="ResourceFilter" metaclass="Standard.Class" owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" is-hidden="true" label="%stereotype.ResourceFilter.label" uid="ce775666-60ae-48ab-94dd-b9a12b9edf2f" is-abstract="true">
                 <Icon path=""/>
                 <Image path=""/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.resourcePattern.label"
-                        name="resourcePattern" parameter-card="1" uid="4a71ce8e-6fc5-476d-8f32-ccf11be3149c"/>
+                    <TagType name="resourcePattern" uid="4a71ce8e-6fc5-476d-8f32-ccf11be3149c" label="%tagtype.resourcePattern.label" parameter-card="1" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.Role.label"
-                metaclass="Standard.Class" name="Role"
-                owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" uid="858f6212-589e-4b36-9150-2e764f0e91b5">
+            <Stereotype name="Role" metaclass="Standard.Class" owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.Role.label" uid="858f6212-589e-4b36-9150-2e764f0e91b5" is-abstract="false">
                 <Icon path="res/icon/gui/organisationModelEmpty_24.png"/>
                 <Image path="res/icon/gui/organisationModelEmpty_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.RoleAssignment.label"
-                metaclass="Standard.Class" name="RoleAssignment"
-                owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" uid="25d04405-c94a-44a0-848d-8563ca51ba23">
+            <Stereotype name="RoleAssignment" metaclass="Standard.Class" owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.RoleAssignment.label" uid="25d04405-c94a-44a0-848d-8563ca51ba23" is-abstract="false">
                 <Icon path=""/>
                 <Image path=""/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.startTime.label"
-                        name="startTime" parameter-card="1" uid="18d4111c-a2ed-4810-84d3-509d97db6890"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.endTime.label" name="endTime"
-                        parameter-card="1" uid="a5dd39e5-3525-409a-86ca-821144af3aab"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.assignmentTime.label"
-                        name="assignmentTime" parameter-card="1" uid="a10d5c66-ff1b-405a-a713-cd6e0515e09d"/>
+                    <TagType name="startTime" uid="18d4111c-a2ed-4810-84d3-509d97db6890" label="%tagtype.startTime.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="endTime" uid="a5dd39e5-3525-409a-86ca-821144af3aab" label="%tagtype.endTime.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="assignmentTime" uid="a10d5c66-ff1b-405a-a713-cd6e0515e09d" label="%tagtype.assignmentTime.label" parameter-card="1" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.ServiceResourceFilter.label"
-                metaclass="Standard.Class" name="ServiceResourceFilter"
-                owner-stereotype="mref#'' {ce775666-60ae-48ab-94dd-b9a12b9edf2f} Infrastructure.Stereotype" uid="0012ff53-c300-4f0c-bdce-8583f97e3236">
+            <Stereotype name="ServiceResourceFilter" metaclass="Standard.Class" owner-stereotype="mref#'' {ce775666-60ae-48ab-94dd-b9a12b9edf2f} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.ServiceResourceFilter.label" uid="0012ff53-c300-4f0c-bdce-8583f97e3236" is-abstract="false">
                 <Icon path="res/icon/gui/organisationModelEmpty_24.png"/>
                 <Image path="res/icon/gui/organisationModelEmpty_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.serviceURL.label"
-                        name="serviceURL" parameter-card="1" uid="1b4c10c8-5621-4bb6-aa2e-3f00deea0d5e"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.everyService.label"
-                        name="everyService" parameter-card="0" uid="a2aaca30-b509-469a-b65c-99a30cd09e16"/>
+                    <TagType name="serviceURL" uid="1b4c10c8-5621-4bb6-aa2e-3f00deea0d5e" label="%tagtype.serviceURL.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="everyService" uid="a2aaca30-b509-469a-b65c-99a30cd09e16" label="%tagtype.everyService.label" parameter-card="0" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.SoftwareComponentResourceFilter.label"
-                metaclass="Standard.Class"
-                name="SoftwareComponentResourceFilter"
-                owner-stereotype="mref#'' {ce775666-60ae-48ab-94dd-b9a12b9edf2f} Infrastructure.Stereotype" uid="d2a3f527-691b-4b04-a5c2-63f39b55c173">
+            <Stereotype name="SoftwareComponentResourceFilter" metaclass="Standard.Class" owner-stereotype="mref#'' {ce775666-60ae-48ab-94dd-b9a12b9edf2f} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.SoftwareComponentResourceFilter.label" uid="d2a3f527-691b-4b04-a5c2-63f39b55c173" is-abstract="false">
                 <Icon path="res/icon/gui/organisationModelEmpty_24.png"/>
                 <Image path="res/icon/gui/organisationModelEmpty_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.everyComponent.label"
-                        name="everyComponent" parameter-card="0" uid="726ba30c-05cc-4f4b-b31a-4c9238661a62"/>
+                    <TagType name="everyComponent" uid="726ba30c-05cc-4f4b-b31a-4c9238661a62" label="%tagtype.everyComponent.label" parameter-card="0" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.User.label"
-                metaclass="Standard.Class" name="User"
-                owner-stereotype="mref#'' {8edda027-b2f3-43bb-b101-0058aaa1550f} Infrastructure.Stereotype" uid="a36b6005-fc91-4d36-bf4a-4b39194d892b">
+            <Stereotype name="User" metaclass="Standard.Class" owner-stereotype="mref#'' {8edda027-b2f3-43bb-b101-0058aaa1550f} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.User.label" uid="a36b6005-fc91-4d36-bf4a-4b39194d892b" is-abstract="false">
                 <Icon path="res/icon/gui/organisationModelEmpty_24.png"/>
                 <Image path="res/icon/gui/organisationModelEmpty_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.email.label" name="email"
-                        parameter-card="1" uid="23c8cc8c-ec83-45ef-aa8c-3089186d0437"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.firstName.label"
-                        name="firstName" parameter-card="1" uid="a293b940-1081-4a06-8e26-c2a71f692b11"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.lastName.label" name="lastName"
-                        parameter-card="1" uid="b5e360b5-9a54-4f3a-982f-305bc0bb0ffa"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.www.label" name="www"
-                        parameter-card="1" uid="ab04f702-4373-4755-964c-4af996f0b47a"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.platformCredentialName.label"
-                        name="platformCredentialName" parameter-card="1" uid="02fe1cbf-75ac-419d-b683-7e0076fde173"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.platformCredentialPassword.label"
-                        name="platformCredentialPassword"
-                        parameter-card="1" uid="fde2e502-b458-4bd0-a9f4-2617c9bada0a"/>
+                    <TagType name="email" uid="23c8cc8c-ec83-45ef-aa8c-3089186d0437" label="%tagtype.email.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="firstName" uid="a293b940-1081-4a06-8e26-c2a71f692b11" label="%tagtype.firstName.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="lastName" uid="b5e360b5-9a54-4f3a-982f-305bc0bb0ffa" label="%tagtype.lastName.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="www" uid="ab04f702-4373-4755-964c-4af996f0b47a" label="%tagtype.www.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="platformCredentialName" uid="02fe1cbf-75ac-419d-b683-7e0076fde173" label="%tagtype.platformCredentialName.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="platformCredentialPassword" uid="fde2e502-b458-4bd0-a9f4-2617c9bada0a" label="%tagtype.platformCredentialPassword.label" parameter-card="1" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.UserGroup.label"
-                metaclass="Standard.Class" name="UserGroup"
-                owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" uid="a69e85bc-a398-4ffb-a9d6-267bdf5cf5b2">
+            <Stereotype name="UserGroup" metaclass="Standard.Class" owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.UserGroup.label" uid="a69e85bc-a398-4ffb-a9d6-267bdf5cf5b2" is-abstract="false">
                 <Icon path="res/icon/gui/organisationModelEmpty_24.png"/>
                 <Image path="res/icon/gui/organisationModelEmpty_48.png"/>
             </Stereotype>
         </Profile>
-        <Profile id="RequirementModel" uid="002a1553-9258-4f57-a0b9-fdcebc63a8ae">
-            <Stereotype is-abstract="true" is-hidden="true"
-                label="%stereotype.HardRequirement.label"
-                metaclass="Standard.GeneralClass" name="HardRequirement"
-                owner-stereotype="mref#'' {f14398cc-a1c7-4953-9874-f7819f1ec4f7} Infrastructure.Stereotype" uid="2955347c-7823-427d-af9e-c725897bba1c">
+        <Profile uid="002a1553-9258-4f57-a0b9-fdcebc63a8ae" id="RequirementModel">
+            <Stereotype name="HardRequirement" metaclass="Standard.GeneralClass" owner-stereotype="mref#'' {f14398cc-a1c7-4953-9874-f7819f1ec4f7} Infrastructure.Stereotype" is-hidden="true" label="%stereotype.HardRequirement.label" uid="2955347c-7823-427d-af9e-c725897bba1c" is-abstract="true">
                 <Icon path=""/>
                 <Image path=""/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.HorizontalScaleRequirement.label"
-                metaclass="Standard.Class"
-                name="HorizontalScaleRequirement"
-                owner-stereotype="mref#'' {92dc2d3d-2985-4da0-bc0e-3a4f5e00e269} Infrastructure.Stereotype" uid="3f58cfed-b308-4059-99be-85d0b3e87e12">
+            <Stereotype name="HorizontalScaleRequirement" metaclass="Standard.Class" owner-stereotype="mref#'' {92dc2d3d-2985-4da0-bc0e-3a4f5e00e269} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.HorizontalScaleRequirement.label" uid="3f58cfed-b308-4059-99be-85d0b3e87e12" is-abstract="false">
                 <Icon path="res/icon/gui/horizontalScaleRequirement_24.png"/>
                 <Image path="res/icon/gui/horizontalScaleRequirement_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.minInstances.label"
-                        name="minInstances" parameter-card="1" uid="c43f3c46-ad2f-4776-809a-94ad9affc593"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.maxInstances.label"
-                        name="maxInstances" parameter-card="1" uid="980baa1c-368d-4fd9-a7a4-8b4741c06485"/>
+                    <TagType name="minInstances" uid="c43f3c46-ad2f-4776-809a-94ad9affc593" label="%tagtype.minInstances.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="maxInstances" uid="980baa1c-368d-4fd9-a7a4-8b4741c06485" label="%tagtype.maxInstances.label" parameter-card="1" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.ImageRequirement.label"
-                metaclass="Standard.Enumeration" name="ImageRequirement"
-                owner-stereotype="mref#'' {2955347c-7823-427d-af9e-c725897bba1c} Infrastructure.Stereotype" uid="aed9a95b-2f53-42b5-ad97-3a39f0ee4d60">
+            <Stereotype name="ImageRequirement" metaclass="Standard.Enumeration" owner-stereotype="mref#'' {2955347c-7823-427d-af9e-c725897bba1c} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.ImageRequirement.label" uid="aed9a95b-2f53-42b5-ad97-3a39f0ee4d60" is-abstract="false">
                 <Icon path="res/icon/gui/imageRequirement_24.png"/>
                 <Image path="res/icon/gui/imageRequirement_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.images.label" name="images"
-                        parameter-card="*" uid="15d9a370-393a-428c-8331-c15664b99f13"/>
+                    <TagType name="images" uid="15d9a370-393a-428c-8331-c15664b99f13" label="%tagtype.images.label" parameter-card="*" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.LocationRequirement.label"
-                metaclass="Standard.Class" name="LocationRequirement"
-                owner-stereotype="mref#'' {2955347c-7823-427d-af9e-c725897bba1c} Infrastructure.Stereotype" uid="72da0f17-5434-4558-b50f-7be0430c3f2b">
+            <Stereotype name="LocationRequirement" metaclass="Standard.Class" owner-stereotype="mref#'' {2955347c-7823-427d-af9e-c725897bba1c} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.LocationRequirement.label" uid="72da0f17-5434-4558-b50f-7be0430c3f2b" is-abstract="false">
                 <Icon path="res/icon/gui/locationRequirement_24.png"/>
                 <Image path="res/icon/gui/locationRequirement_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.allRequired.label"
-                        name="allRequired" parameter-card="0" uid="3af4908e-00c9-4466-8e0c-d74baa35afe1"/>
+                    <TagType name="allRequired" uid="3af4908e-00c9-4466-8e0c-d74baa35afe1" label="%tagtype.allRequired.label" parameter-card="0" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.OSRequirement.label"
-                metaclass="Standard.Class" name="OSRequirement"
-                owner-stereotype="mref#'' {2955347c-7823-427d-af9e-c725897bba1c} Infrastructure.Stereotype" uid="64f95ec3-043c-4955-bfcb-9aabe91d54fe">
+            <Stereotype name="OSRequirement" metaclass="Standard.Class" owner-stereotype="mref#'' {2955347c-7823-427d-af9e-c725897bba1c} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.OSRequirement.label" uid="64f95ec3-043c-4955-bfcb-9aabe91d54fe" is-abstract="false">
                 <Icon path="res/icon/gui/osRequirement_24.png"/>
                 <Image path="res/icon/gui/osRequirement_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.os.label" name="os"
-                        parameter-card="1" uid="49d0562e-ffa2-4b4a-868d-9912389113a8"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.is64os.label" name="is64os"
-                        parameter-card="0" uid="1fd5f98d-5994-42d1-8b1f-e0de7d51fb9b"/>
+                    <TagType name="os" uid="49d0562e-ffa2-4b4a-868d-9912389113a8" label="%tagtype.os.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="is64os" uid="1fd5f98d-5994-42d1-8b1f-e0de7d51fb9b" label="%tagtype.is64os.label" parameter-card="0" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.OptimisationRequirement.label"
-                metaclass="Standard.Class"
-                name="OptimisationRequirement"
-                owner-stereotype="mref#'' {fc1abdeb-e2fa-4a04-9253-4e15a223bce2} Infrastructure.Stereotype" uid="5032b63e-764b-4afb-8636-29fe5cee73f0">
+            <Stereotype name="OptimisationRequirement" metaclass="Standard.Class" owner-stereotype="mref#'' {fc1abdeb-e2fa-4a04-9253-4e15a223bce2} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.OptimisationRequirement.label" uid="5032b63e-764b-4afb-8636-29fe5cee73f0" is-abstract="false">
                 <Icon path="res/icon/gui/optimisationRequirement_24.png"/>
                 <Image path="res/icon/gui/optimisationRequirement_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.minimise.label" name="minimise"
-                        parameter-card="0" uid="bc674ab8-644b-456a-875e-c51eb68d068f"/>
+                    <TagType name="minimise" uid="bc674ab8-644b-456a-875e-c51eb68d068f" label="%tagtype.minimise.label" parameter-card="0" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.PaaSRequirement.label"
-                metaclass="Standard.Class" name="PaaSRequirement"
-                owner-stereotype="mref#'' {2955347c-7823-427d-af9e-c725897bba1c} Infrastructure.Stereotype" uid="1b4b9489-ad62-4a1b-be52-900e21e7f441">
+            <Stereotype name="PaaSRequirement" metaclass="Standard.Class" owner-stereotype="mref#'' {2955347c-7823-427d-af9e-c725897bba1c} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.PaaSRequirement.label" uid="1b4b9489-ad62-4a1b-be52-900e21e7f441" is-abstract="false">
                 <Icon path="res/icon/gui/PaasRequirement_24.png"/>
                 <Image path="res/icon/gui/PaasRequirement_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.ProviderRequirement.label"
-                metaclass="Standard.Class" name="ProviderRequirement"
-                owner-stereotype="mref#'' {2955347c-7823-427d-af9e-c725897bba1c} Infrastructure.Stereotype" uid="3889bd5f-decc-4b65-b4f4-e9f2db4b8446">
+            <Stereotype name="ProviderRequirement" metaclass="Standard.Class" owner-stereotype="mref#'' {2955347c-7823-427d-af9e-c725897bba1c} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.ProviderRequirement.label" uid="3889bd5f-decc-4b65-b4f4-e9f2db4b8446" is-abstract="false">
                 <Icon path="res/icon/gui/providerRequirement_24.png"/>
                 <Image path="res/icon/gui/providerRequirement_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.providerNames.label"
-                        name="providerNames" parameter-card="*" uid="3ba7ca0d-40ed-45d4-b49f-4c7abf286fd0"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.cloudType.label"
-                        name="cloudType" parameter-card="1" uid="4bc02bc5-50c2-4fee-9fcd-538e95fd8460"/>
+                    <TagType name="providerNames" uid="3ba7ca0d-40ed-45d4-b49f-4c7abf286fd0" label="%tagtype.providerNames.label" parameter-card="*" is-hidden="false" is-signed="false"/>
+                    <TagType name="cloudType" uid="4bc02bc5-50c2-4fee-9fcd-538e95fd8460" label="%tagtype.cloudType.label" parameter-card="1" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="true" is-hidden="true"
-                label="%stereotype.Requirement.label"
-                metaclass="Standard.GeneralClass" name="Requirement"
-                owner-stereotype="mref#'' {7c5a3627-4282-427f-93a3-957cdca1adb7} Infrastructure.Stereotype" uid="f14398cc-a1c7-4953-9874-f7819f1ec4f7">
+            <Stereotype name="Requirement" metaclass="Standard.GeneralClass" owner-stereotype="mref#'' {7c5a3627-4282-427f-93a3-957cdca1adb7} Infrastructure.Stereotype" is-hidden="true" label="%stereotype.Requirement.label" uid="f14398cc-a1c7-4953-9874-f7819f1ec4f7" is-abstract="true">
                 <Icon path=""/>
                 <Image path=""/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.RequirementModel.label"
-                metaclass="Standard.Package" name="RequirementModel"
-                owner-stereotype="mref#'' {577c153e-42b8-4f36-9686-1a6109ffdc16} Infrastructure.Stereotype" uid="a6bb7236-ef3d-41b8-a879-26c642be9cb8">
+            <Stereotype name="RequirementModel" metaclass="Standard.Package" owner-stereotype="mref#'' {577c153e-42b8-4f36-9686-1a6109ffdc16} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.RequirementModel.label" uid="a6bb7236-ef3d-41b8-a879-26c642be9cb8" is-abstract="false">
                 <Icon path="res/icon/gui/requirementModel_24.png"/>
                 <Image path=""/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.ResourceRequirement.label"
-                metaclass="Standard.Class" name="ResourceRequirement"
-                owner-stereotype="mref#'' {2955347c-7823-427d-af9e-c725897bba1c} Infrastructure.Stereotype" uid="4e76597a-e007-4596-abfe-591ce920815d">
+            <Stereotype name="ResourceRequirement" metaclass="Standard.Class" owner-stereotype="mref#'' {2955347c-7823-427d-af9e-c725897bba1c} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.ResourceRequirement.label" uid="4e76597a-e007-4596-abfe-591ce920815d" is-abstract="false">
                 <Icon path="res/icon/gui/resourceRequirement_24.png"/>
                 <Image path=""/>
             </Stereotype>
-            <Stereotype is-abstract="true" is-hidden="true"
-                label="%stereotype.ScaleRequirement.label"
-                metaclass="Standard.GeneralClass"
-                name="ScaleRequirement"
-                owner-stereotype="mref#'' {2955347c-7823-427d-af9e-c725897bba1c} Infrastructure.Stereotype" uid="92dc2d3d-2985-4da0-bc0e-3a4f5e00e269">
+            <Stereotype name="ScaleRequirement" metaclass="Standard.GeneralClass" owner-stereotype="mref#'' {2955347c-7823-427d-af9e-c725897bba1c} Infrastructure.Stereotype" is-hidden="true" label="%stereotype.ScaleRequirement.label" uid="92dc2d3d-2985-4da0-bc0e-3a4f5e00e269" is-abstract="true">
                 <Icon path=""/>
                 <Image path=""/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.SecurityRequirement.label"
-                metaclass="Standard.Class" name="SecurityRequirement"
-                owner-stereotype="mref#'' {2955347c-7823-427d-af9e-c725897bba1c} Infrastructure.Stereotype" uid="c104b35e-2578-4138-94df-ff26daad8dc7">
+            <Stereotype name="SecurityRequirement" metaclass="Standard.Class" owner-stereotype="mref#'' {2955347c-7823-427d-af9e-c725897bba1c} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.SecurityRequirement.label" uid="c104b35e-2578-4138-94df-ff26daad8dc7" is-abstract="false">
                 <Icon path="res/icon/gui/securityRequirement_24.png"/>
                 <Image path="res/icon/gui/securityRequirement_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.ServiceLevelObjective.label"
-                metaclass="Standard.Class" name="ServiceLevelObjective"
-                owner-stereotype="mref#'' {2955347c-7823-427d-af9e-c725897bba1c} Infrastructure.Stereotype" uid="72de5d29-7d68-48f4-a3ac-eace289da2c6">
+            <Stereotype name="ServiceLevelObjective" metaclass="Standard.Class" owner-stereotype="mref#'' {2955347c-7823-427d-af9e-c725897bba1c} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.ServiceLevelObjective.label" uid="72de5d29-7d68-48f4-a3ac-eace289da2c6" is-abstract="false">
                 <Icon path="res/icon/gui/sloRequirement_24.png"/>
                 <Image path="res/icon/gui/SloRequirement_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="true" is-hidden="true"
-                label="%stereotype.SoftRequirement.label"
-                metaclass="Standard.GeneralClass" name="SoftRequirement"
-                owner-stereotype="mref#'' {f14398cc-a1c7-4953-9874-f7819f1ec4f7} Infrastructure.Stereotype" uid="fc1abdeb-e2fa-4a04-9253-4e15a223bce2">
+            <Stereotype name="SoftRequirement" metaclass="Standard.GeneralClass" owner-stereotype="mref#'' {f14398cc-a1c7-4953-9874-f7819f1ec4f7} Infrastructure.Stereotype" is-hidden="true" label="%stereotype.SoftRequirement.label" uid="fc1abdeb-e2fa-4a04-9253-4e15a223bce2" is-abstract="true">
                 <Icon path=""/>
                 <Image path=""/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.priority.label" name="priority"
-                        parameter-card="1" uid="1f38e006-1584-4036-8ddc-f39a5b607306"/>
+                    <TagType name="priority" uid="1f38e006-1584-4036-8ddc-f39a5b607306" label="%tagtype.priority.label" parameter-card="1" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.VerticalScaleRequirement.label"
-                metaclass="Standard.Class"
-                name="VerticalScaleRequirement"
-                owner-stereotype="mref#'' {92dc2d3d-2985-4da0-bc0e-3a4f5e00e269} Infrastructure.Stereotype" uid="1090f8fc-a713-4641-89db-bd23c8a82ab1">
+            <Stereotype name="VerticalScaleRequirement" metaclass="Standard.Class" owner-stereotype="mref#'' {92dc2d3d-2985-4da0-bc0e-3a4f5e00e269} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.VerticalScaleRequirement.label" uid="1090f8fc-a713-4641-89db-bd23c8a82ab1" is-abstract="false">
                 <Icon path="res/icon/gui/VerticalScaleRequirement_24.png"/>
                 <Image path="res/icon/gui/VerticalScaleRequirement_48.png"/>
             </Stereotype>
         </Profile>
-        <Profile id="ScalabilityModel" uid="52523797-c57c-422d-a15b-f19ec79f5d24">
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.BinaryEventPattern.label"
-                metaclass="Standard.Class" name="BinaryEventPattern"
-                owner-stereotype="mref#'' {46e221ca-8a8f-458b-8018-009a273cc009} Infrastructure.Stereotype" uid="af833114-4bf1-4889-8ad0-621bb63e44c6">
+        <Profile uid="52523797-c57c-422d-a15b-f19ec79f5d24" id="ScalabilityModel">
+            <Stereotype name="BinaryEventPattern" metaclass="Standard.Class" owner-stereotype="mref#'' {46e221ca-8a8f-458b-8018-009a273cc009} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.BinaryEventPattern.label" uid="af833114-4bf1-4889-8ad0-621bb63e44c6" is-abstract="false">
                 <Icon path="res/icon/gui/BinaryEventPattern_24.png"/>
                 <Image path="res/icon/gui/BinaryEventPattern_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.lowerOccurrenceBound.label"
-                        name="lowerOccurrenceBound" parameter-card="1" uid="93e3f728-14c6-4561-9b94-3abf79c5863c"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.upperOccurrenceBound.label"
-                        name="upperOccurrenceBound" parameter-card="1" uid="617103f2-a083-48d1-9655-6e2384b75bd6"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.operator.label" name="operator"
-                        parameter-card="1" uid="759de975-2a14-4a02-af62-115d703de355"/>
+                    <TagType name="lowerOccurrenceBound" uid="93e3f728-14c6-4561-9b94-3abf79c5863c" label="%tagtype.lowerOccurrenceBound.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="upperOccurrenceBound" uid="617103f2-a083-48d1-9655-6e2384b75bd6" label="%tagtype.upperOccurrenceBound.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="operator" uid="759de975-2a14-4a02-af62-115d703de355" label="%tagtype.operator.label" parameter-card="1" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="true" is-hidden="true"
-                label="%stereotype.Event.label"
-                metaclass="Standard.Class" name="Event"
-                owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" uid="79c08ab1-4e04-44ee-b88e-ddc638947bfd">
+            <Stereotype name="Event" metaclass="Standard.Class" owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" is-hidden="true" label="%stereotype.Event.label" uid="79c08ab1-4e04-44ee-b88e-ddc638947bfd" is-abstract="true">
                 <Icon path="res/icon/gui/Event_24.png"/>
                 <Image path="res/icon/gui/Event_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="true" is-hidden="true"
-                label="%stereotype.EventInstance.label"
-                metaclass="Standard.Instance" name="EventInstance"
-                owner-stereotype="mref#'' {df209aca-1325-4c99-b383-ca2650224ff6} Infrastructure.Stereotype" uid="7cddc4dd-ed72-4a04-85c5-54fe85e4ef38">
+            <Stereotype name="EventInstance" metaclass="Standard.Instance" owner-stereotype="mref#'' {df209aca-1325-4c99-b383-ca2650224ff6} Infrastructure.Stereotype" is-hidden="true" label="%stereotype.EventInstance.label" uid="7cddc4dd-ed72-4a04-85c5-54fe85e4ef38" is-abstract="true">
                 <Icon path="res/icon/gui/EventInstance_24.png"/>
                 <Image path="res/icon/gui/EventInstance_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.status.label" name="status"
-                        parameter-card="1" uid="4747fc7f-ba00-4b26-b582-d03b1ba48082"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.layer.label" name="layer"
-                        parameter-card="1" uid="cb82d86d-41ee-47ee-b272-0c8093a8fadf"/>
+                    <TagType name="status" uid="4747fc7f-ba00-4b26-b582-d03b1ba48082" label="%tagtype.status.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="layer" uid="cb82d86d-41ee-47ee-b272-0c8093a8fadf" label="%tagtype.layer.label" parameter-card="1" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="true" is-hidden="true"
-                label="%stereotype.EventPattern.label"
-                metaclass="Standard.Class" name="EventPattern"
-                owner-stereotype="mref#'' {79c08ab1-4e04-44ee-b88e-ddc638947bfd} Infrastructure.Stereotype" uid="46e221ca-8a8f-458b-8018-009a273cc009">
+            <Stereotype name="EventPattern" metaclass="Standard.Class" owner-stereotype="mref#'' {79c08ab1-4e04-44ee-b88e-ddc638947bfd} Infrastructure.Stereotype" is-hidden="true" label="%stereotype.EventPattern.label" uid="46e221ca-8a8f-458b-8018-009a273cc009" is-abstract="true">
                 <Icon path="res/icon/gui/EventPattern_24.png"/>
                 <Image path="res/icon/gui/EventPattern_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.FunctionalEvent.label"
-                metaclass="Standard.Class" name="FunctionalEvent"
-                owner-stereotype="mref#'' {40acd9bb-daad-41f6-96cd-d9267430eabf} Infrastructure.Stereotype" uid="8d4865c6-d973-416b-ba6e-62311853e410">
+            <Stereotype name="FunctionalEvent" metaclass="Standard.Class" owner-stereotype="mref#'' {40acd9bb-daad-41f6-96cd-d9267430eabf} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.FunctionalEvent.label" uid="8d4865c6-d973-416b-ba6e-62311853e410" is-abstract="false">
                 <Icon path="res/icon/gui/FunctionnalEvent_24.png"/>
                 <Image path="res/icon/gui/FunctionnalEvent_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.FunctionalEventInstance.label"
-                metaclass="Standard.Instance"
-                name="FunctionalEventInstance"
-                owner-stereotype="mref#'' {7cddc4dd-ed72-4a04-85c5-54fe85e4ef38} Infrastructure.Stereotype" uid="b88afca5-ed15-48f1-a81b-29da4a453701">
+            <Stereotype name="FunctionalEventInstance" metaclass="Standard.Instance" owner-stereotype="mref#'' {7cddc4dd-ed72-4a04-85c5-54fe85e4ef38} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.FunctionalEventInstance.label" uid="b88afca5-ed15-48f1-a81b-29da4a453701" is-abstract="false">
                 <Icon path="res/icon/gui/FunctionnalEventInstance_24.png"/>
                 <Image path="res/icon/gui/FunctionnalEventInstance_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.HorizontalScalingAction.label"
-                metaclass="Standard.Class"
-                name="HorizontalScalingAction"
-                owner-stereotype="mref#'' {25bf81ac-b13e-4716-b766-42a9b7e05150} Infrastructure.Stereotype" uid="99008d6c-2622-4467-8283-6059df42c240">
+            <Stereotype name="HorizontalScalingAction" metaclass="Standard.Class" owner-stereotype="mref#'' {25bf81ac-b13e-4716-b766-42a9b7e05150} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.HorizontalScalingAction.label" uid="99008d6c-2622-4467-8283-6059df42c240" is-abstract="false">
                 <Icon path="res/icon/gui/HorizontalScalingAction_24.png"/>
                 <Image path="res/icon/gui/HorizontalScalingAction_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.count.label" name="count"
-                        parameter-card="1" uid="d52b6541-1841-4607-96a8-591ad329e65f"/>
+                    <TagType name="count" uid="d52b6541-1841-4607-96a8-591ad329e65f" label="%tagtype.count.label" parameter-card="1" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.NonFunctionalEvent.label"
-                metaclass="Standard.Class" name="NonFunctionalEvent"
-                owner-stereotype="mref#'' {40acd9bb-daad-41f6-96cd-d9267430eabf} Infrastructure.Stereotype" uid="af2fc032-7f83-4251-9a0c-8ef45959bb71">
+            <Stereotype name="NonFunctionalEvent" metaclass="Standard.Class" owner-stereotype="mref#'' {40acd9bb-daad-41f6-96cd-d9267430eabf} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.NonFunctionalEvent.label" uid="af2fc032-7f83-4251-9a0c-8ef45959bb71" is-abstract="false">
                 <Icon path="res/icon/gui/NonFunctionnalEvent_24.png"/>
                 <Image path="res/icon/gui/NonFunctionnalEvent_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.isViolation.label"
-                        name="isViolation" parameter-card="0" uid="7adb963c-c7f7-4e56-9770-80f01813f2b5"/>
+                    <TagType name="isViolation" uid="7adb963c-c7f7-4e56-9770-80f01813f2b5" label="%tagtype.isViolation.label" parameter-card="0" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.NonFunctionalEventInstance.label"
-                metaclass="Standard.Instance"
-                name="NonFunctionalEventInstance"
-                owner-stereotype="mref#'' {7cddc4dd-ed72-4a04-85c5-54fe85e4ef38} Infrastructure.Stereotype" uid="d6b986dc-6dc7-40b3-b2a3-c0fe9f6add0e">
+            <Stereotype name="NonFunctionalEventInstance" metaclass="Standard.Instance" owner-stereotype="mref#'' {7cddc4dd-ed72-4a04-85c5-54fe85e4ef38} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.NonFunctionalEventInstance.label" uid="d6b986dc-6dc7-40b3-b2a3-c0fe9f6add0e" is-abstract="false">
                 <Icon path="res/icon/gui/NonFunctionnalEventInstance_24.png"/>
                 <Image path="res/icon/gui/NonFunctionnalEventInstance_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.ScalabilityModel.label"
-                metaclass="Standard.Package" name="ScalabilityModel"
-                owner-stereotype="mref#'' {577c153e-42b8-4f36-9686-1a6109ffdc16} Infrastructure.Stereotype" uid="0e1f4eeb-63ca-467d-b99c-92a54f34fcb5">
+            <Stereotype name="ScalabilityModel" metaclass="Standard.Package" owner-stereotype="mref#'' {577c153e-42b8-4f36-9686-1a6109ffdc16} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.ScalabilityModel.label" uid="0e1f4eeb-63ca-467d-b99c-92a54f34fcb5" is-abstract="false">
                 <Icon path="res/icon/gui/scalabilityModel_24.png"/>
                 <Image path="res/icon/gui/scalabilityModel_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.ScalabilityRule.label"
-                metaclass="Standard.Class" name="ScalabilityRule"
-                owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" uid="cf2a4cc5-0c2d-4f57-9f3e-35cf455ef4cb">
+            <Stereotype name="ScalabilityRule" metaclass="Standard.Class" owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.ScalabilityRule.label" uid="cf2a4cc5-0c2d-4f57-9f3e-35cf455ef4cb" is-abstract="false">
                 <Icon path="res/icon/gui/ScalabilityRule_24.png"/>
                 <Image path="res/icon/gui/ScalabilityRule_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="true" is-hidden="true"
-                label="%stereotype.ScalingAction.label"
-                metaclass="Standard.NameSpace" name="ScalingAction"
-                owner-stereotype="mref#'' {b23cd4a9-cc6d-43b4-b5fc-fbab5abf866b} Infrastructure.Stereotype" uid="25bf81ac-b13e-4716-b766-42a9b7e05150">
+            <Stereotype name="ScalingAction" metaclass="Standard.NameSpace" owner-stereotype="mref#'' {b23cd4a9-cc6d-43b4-b5fc-fbab5abf866b} Infrastructure.Stereotype" is-hidden="true" label="%stereotype.ScalingAction.label" uid="25bf81ac-b13e-4716-b766-42a9b7e05150" is-abstract="true">
                 <Icon path="res/icon/gui/ScalingAction_24.png"/>
                 <Image path="res/icon/gui/ScalingAction_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="true" is-hidden="true"
-                label="%stereotype.SingleEvent.label"
-                metaclass="Standard.Class" name="SingleEvent"
-                owner-stereotype="mref#'' {79c08ab1-4e04-44ee-b88e-ddc638947bfd} Infrastructure.Stereotype" uid="40acd9bb-daad-41f6-96cd-d9267430eabf">
+            <Stereotype name="SingleEvent" metaclass="Standard.Class" owner-stereotype="mref#'' {79c08ab1-4e04-44ee-b88e-ddc638947bfd} Infrastructure.Stereotype" is-hidden="true" label="%stereotype.SingleEvent.label" uid="40acd9bb-daad-41f6-96cd-d9267430eabf" is-abstract="true">
                 <Icon path="res/icon/gui/SingleEvent_24.png"/>
                 <Image path="res/icon/gui/SingleEvent_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.Timer.label"
-                metaclass="Standard.Class" name="Timer"
-                owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" uid="ee279c12-3256-430d-b3f9-146318d3e947">
+            <Stereotype name="Timer" metaclass="Standard.Class" owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.Timer.label" uid="ee279c12-3256-430d-b3f9-146318d3e947" is-abstract="false">
                 <Icon path="res/icon/gui/Timer_24.png"/>
                 <Image path="res/icon/gui/Timer_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.type.label" name="type"
-                        parameter-card="1" uid="1442a037-e5a4-4248-bc4d-20d6cc5568e0"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.timeValue.label"
-                        name="timeValue" parameter-card="1" uid="4898fefb-c185-478e-b8cf-96025bfe5971"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.maxOccurrenceNum.label"
-                        name="maxOccurrenceNum" parameter-card="1" uid="94fa8f95-4a9e-4209-b10c-b8c31176f9af"/>
+                    <TagType name="type" uid="1442a037-e5a4-4248-bc4d-20d6cc5568e0" label="%tagtype.type.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="timeValue" uid="4898fefb-c185-478e-b8cf-96025bfe5971" label="%tagtype.timeValue.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="maxOccurrenceNum" uid="94fa8f95-4a9e-4209-b10c-b8c31176f9af" label="%tagtype.maxOccurrenceNum.label" parameter-card="1" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.UnaryEventPattern.label"
-                metaclass="Standard.Class" name="UnaryEventPattern"
-                owner-stereotype="mref#'' {46e221ca-8a8f-458b-8018-009a273cc009} Infrastructure.Stereotype" uid="3956e53e-cf9e-4b4c-9b9c-16e18a3c53d6">
+            <Stereotype name="UnaryEventPattern" metaclass="Standard.Class" owner-stereotype="mref#'' {46e221ca-8a8f-458b-8018-009a273cc009} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.UnaryEventPattern.label" uid="3956e53e-cf9e-4b4c-9b9c-16e18a3c53d6" is-abstract="false">
                 <Icon path="res/icon/gui/UnaryEventPattern_24.png"/>
                 <Image path="res/icon/gui/UnaryEventPattern_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.occurrenceNum.label"
-                        name="occurrenceNum" parameter-card="1" uid="bd5fbe3f-41f7-445c-99e7-d6dc54c00545"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.operator.label" name="operator"
-                        parameter-card="1" uid="d81a946e-890b-49ba-87e2-6b173e3400d3"/>
+                    <TagType name="occurrenceNum" uid="bd5fbe3f-41f7-445c-99e7-d6dc54c00545" label="%tagtype.occurrenceNum.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="operator" uid="d81a946e-890b-49ba-87e2-6b173e3400d3" label="%tagtype.operator.label" parameter-card="1" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.VerticalScalingAction.label"
-                metaclass="Standard.Class" name="VerticalScalingAction"
-                owner-stereotype="mref#'' {25bf81ac-b13e-4716-b766-42a9b7e05150} Infrastructure.Stereotype" uid="725de5f4-a090-41c9-b326-f573c1d3b15d">
+            <Stereotype name="VerticalScalingAction" metaclass="Standard.Class" owner-stereotype="mref#'' {25bf81ac-b13e-4716-b766-42a9b7e05150} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.VerticalScalingAction.label" uid="725de5f4-a090-41c9-b326-f573c1d3b15d" is-abstract="false">
                 <Icon path="res/icon/gui/VerticalScalingAction_24.png"/>
                 <Image path="res/icon/gui/VerticalScalingAction_48.png"/>
             </Stereotype>
         </Profile>
-        <Profile id="SecurityModel" uid="3da8a4bd-0057-41b3-89b8-5c8e337fe153">
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.Certifiable.label"
-                metaclass="Standard.Class" name="Certifiable"
-                owner-stereotype="mref#'' {59943cbd-62e2-4183-8973-e15130bcb7d3} Infrastructure.Stereotype" uid="2ded821f-dd6d-4a25-82d8-46091a835fa0">
+        <Profile uid="3da8a4bd-0057-41b3-89b8-5c8e337fe153" id="SecurityModel">
+            <Stereotype name="Certifiable" metaclass="Standard.Class" owner-stereotype="mref#'' {59943cbd-62e2-4183-8973-e15130bcb7d3} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.Certifiable.label" uid="2ded821f-dd6d-4a25-82d8-46091a835fa0" is-abstract="false">
                 <Icon path="res/icon/gui/Certifiable_24.png"/>
                 <Image path="res/icon/gui/Certifiable_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.CompositeSecurityMetric.label"
-                metaclass="Standard.Class"
-                name="CompositeSecurityMetric"
-                owner-stereotype="mref#'' {680d667b-9545-40d8-9c12-84675bc68fc4} Infrastructure.Stereotype" uid="49dfe43f-0fa8-476b-a6ba-03b62463e361">
+            <Stereotype name="CompositeSecurityMetric" metaclass="Standard.Class" owner-stereotype="mref#'' {680d667b-9545-40d8-9c12-84675bc68fc4} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.CompositeSecurityMetric.label" uid="49dfe43f-0fa8-476b-a6ba-03b62463e361" is-abstract="false">
                 <Icon path="res/icon/gui/CompositeSecurityMetric_24.png"/>
                 <Image path="res/icon/gui/CompositeSecurityMetric_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.RawSecurityMetric.label"
-                metaclass="Standard.Class" name="RawSecurityMetric"
-                owner-stereotype="mref#'' {01e0501b-37c4-4e17-af3c-6a30e6ad9290} Infrastructure.Stereotype" uid="01bb4068-95c3-463c-bfc3-5e98fbd8bf98">
+            <Stereotype name="RawSecurityMetric" metaclass="Standard.Class" owner-stereotype="mref#'' {01e0501b-37c4-4e17-af3c-6a30e6ad9290} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.RawSecurityMetric.label" uid="01bb4068-95c3-463c-bfc3-5e98fbd8bf98" is-abstract="false">
                 <Icon path="res/icon/gui/RawSecurityMetric_24.png"/>
                 <Image path="res/icon/gui/RawSecurityMetric_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.SecurityAttribute.label"
-                metaclass="Standard.Class" name="SecurityAttribute"
-                owner-stereotype="mref#'' {ef0c1237-df8a-4bfc-8f0b-d3ad72e39bf4} Infrastructure.Stereotype" uid="59943cbd-62e2-4183-8973-e15130bcb7d3">
+            <Stereotype name="SecurityAttribute" metaclass="Standard.Class" owner-stereotype="mref#'' {ef0c1237-df8a-4bfc-8f0b-d3ad72e39bf4} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.SecurityAttribute.label" uid="59943cbd-62e2-4183-8973-e15130bcb7d3" is-abstract="false">
                 <Icon path="res/icon/gui/SecurityAttribute_24.png"/>
                 <Image path="res/icon/gui/SecurityAttribute_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.SecurityControl.label"
-                metaclass="Standard.Class" name="SecurityControl"
-                owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" uid="0cf7fb23-2fb5-4c33-8d52-c3db4e05bb34">
+            <Stereotype name="SecurityControl" metaclass="Standard.Class" owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.SecurityControl.label" uid="0cf7fb23-2fb5-4c33-8d52-c3db4e05bb34" is-abstract="false">
                 <Icon path="res/icon/gui/SecurityControl_24.png"/>
                 <Image path="res/icon/gui/SecurityControl_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.id.label" name="id"
-                        parameter-card="1" uid="d0865d90-2ead-4a1b-825d-1611f8206fcb"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.specification.label"
-                        name="specification" parameter-card="1" uid="2caf403e-3e13-413c-9bb9-2e53d9d92f78"/>
+                    <TagType name="id" uid="d0865d90-2ead-4a1b-825d-1611f8206fcb" label="%tagtype.id.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="specification" uid="2caf403e-3e13-413c-9bb9-2e53d9d92f78" label="%tagtype.specification.label" parameter-card="1" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.SecurityDomain.label"
-                metaclass="Standard.Class" name="SecurityDomain"
-                owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" uid="1487e8d9-e360-40e9-85a2-46b131aa86ef">
+            <Stereotype name="SecurityDomain" metaclass="Standard.Class" owner-stereotype="mref#'' {babf8276-c4d4-4d86-b02b-d20c6636d937} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.SecurityDomain.label" uid="1487e8d9-e360-40e9-85a2-46b131aa86ef" is-abstract="false">
                 <Icon path="res/icon/gui/SecurityDomain_24.png"/>
                 <Image path="res/icon/gui/SecurityDomain_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.id.label" name="id"
-                        parameter-card="1" uid="c7e2415a-e07a-4b88-8369-3496216f8174"/>
+                    <TagType name="id" uid="c7e2415a-e07a-4b88-8369-3496216f8174" label="%tagtype.id.label" parameter-card="1" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.SecurityMetricInstance.label"
-                metaclass="Standard.Instance"
-                name="SecurityMetricInstance"
-                owner-stereotype="mref#'' {52b2d53f-cfda-455d-ae3d-dd97fed6fa84} Infrastructure.Stereotype" uid="4cb7cfa4-64dc-42a4-9178-af3560cfcf40">
+            <Stereotype name="SecurityMetricInstance" metaclass="Standard.Instance" owner-stereotype="mref#'' {52b2d53f-cfda-455d-ae3d-dd97fed6fa84} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.SecurityMetricInstance.label" uid="4cb7cfa4-64dc-42a4-9178-af3560cfcf40" is-abstract="false">
                 <Icon path=""/>
                 <Image path=""/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.SecurityModel.label"
-                metaclass="Standard.Package" name="SecurityModel"
-                owner-stereotype="mref#'' {577c153e-42b8-4f36-9686-1a6109ffdc16} Infrastructure.Stereotype" uid="61f4f16b-0ac0-4a06-a279-b5b28dc86d01">
+            <Stereotype name="SecurityModel" metaclass="Standard.Package" owner-stereotype="mref#'' {577c153e-42b8-4f36-9686-1a6109ffdc16} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.SecurityModel.label" uid="61f4f16b-0ac0-4a06-a279-b5b28dc86d01" is-abstract="false">
                 <Icon path="res/icon/gui/securityModel_24.png"/>
                 <Image path="res/icon/gui/securityModel_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.SecuritySLO.label"
-                metaclass="Standard.Class" name="SecuritySLO"
-                owner-stereotype="mref#'' {72de5d29-7d68-48f4-a3ac-eace289da2c6} Infrastructure.Stereotype" uid="8fcb0a39-47f5-4d53-9540-bede515f2431">
+            <Stereotype name="SecuritySLO" metaclass="Standard.Class" owner-stereotype="mref#'' {72de5d29-7d68-48f4-a3ac-eace289da2c6} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.SecuritySLO.label" uid="8fcb0a39-47f5-4d53-9540-bede515f2431" is-abstract="false">
                 <Icon path="res/icon/gui/SecuritySLO_24.png"/>
                 <Image path="res/icon/gui/SecuritySLO_48.png"/>
             </Stereotype>
         </Profile>
-        <Profile id="TypeModel" uid="8f4434b2-3c4c-47a4-b563-0899d678993d">
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.TypeModel.label"
-                metaclass="Standard.Package" name="TypeModel"
-                owner-stereotype="mref#'' {577c153e-42b8-4f36-9686-1a6109ffdc16} Infrastructure.Stereotype" uid="429103ee-a14c-4a9a-b791-6d9441fe5cf6">
+        <Profile uid="8f4434b2-3c4c-47a4-b563-0899d678993d" id="TypeModel">
+            <Stereotype name="TypeModel" metaclass="Standard.Package" owner-stereotype="mref#'' {577c153e-42b8-4f36-9686-1a6109ffdc16} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.TypeModel.label" uid="429103ee-a14c-4a9a-b791-6d9441fe5cf6" is-abstract="false">
                 <Icon path="res/icon/gui/typeModel_24.png"/>
                 <Image path="res/icon/gui/typeModel_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.Limit.label"
-                metaclass="Standard.Class" name="Limit"
-                owner-stereotype="" uid="bf1d744a-e1f0-4ace-be02-64e9edfbbba2">
+            <Stereotype name="Limit" metaclass="Standard.Class" owner-stereotype="" is-hidden="false" label="%stereotype.Limit.label" uid="bf1d744a-e1f0-4ace-be02-64e9edfbbba2" is-abstract="false">
                 <Icon path="res/icon/gui/typeModelEmpty_24.png"/>
                 <Image path="res/icon/gui/typeModelEmpty_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.included.label" name="included"
-                        parameter-card="0" uid="74608d88-801b-4173-8a41-35e922bd8144"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.value.label" name="value"
-                        parameter-card="1" uid="bf31a33d-0e91-4d1a-a2ea-eb225bdcd049"/>
+                    <TagType name="included" uid="74608d88-801b-4173-8a41-35e922bd8144" label="%tagtype.included.label" parameter-card="0" is-hidden="false" is-signed="false"/>
+                    <TagType name="value" uid="bf31a33d-0e91-4d1a-a2ea-eb225bdcd049" label="%tagtype.value.label" parameter-card="1" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="true" is-hidden="true"
-                label="%stereotype.Value.label"
-                metaclass="Standard.Class" name="Value"
-                owner-stereotype="" uid="b7cec495-c026-4fde-b42d-496bbcda924b">
+            <Stereotype name="Value" metaclass="Standard.Class" owner-stereotype="" is-hidden="true" label="%stereotype.Value.label" uid="b7cec495-c026-4fde-b42d-496bbcda924b" is-abstract="true">
                 <Icon path=""/>
                 <Image path=""/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.StringValue.label"
-                metaclass="Standard.Class" name="StringValue"
-                owner-stereotype="mref#'' {b7cec495-c026-4fde-b42d-496bbcda924b} Infrastructure.Stereotype" uid="6150e77e-8a8a-40f6-9270-79aa182fc926">
+            <Stereotype name="StringValue" metaclass="Standard.Class" owner-stereotype="mref#'' {b7cec495-c026-4fde-b42d-496bbcda924b} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.StringValue.label" uid="6150e77e-8a8a-40f6-9270-79aa182fc926" is-abstract="false">
                 <Icon path="res/icon/gui/typeModelEmpty_24.png"/>
                 <Image path="res/icon/gui/typeModelEmpty_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.value.label" name="value"
-                        parameter-card="1" uid="dc99a44c-debc-43d9-a8f2-cf3b62a7138f"/>
+                    <TagType name="value" uid="dc99a44c-debc-43d9-a8f2-cf3b62a7138f" label="%tagtype.value.label" parameter-card="1" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.BooleanValue.label"
-                metaclass="Standard.Class" name="BooleanValue"
-                owner-stereotype="mref#'' {b7cec495-c026-4fde-b42d-496bbcda924b} Infrastructure.Stereotype" uid="b4355a7e-9eca-4a9e-8c4c-d49344a0c9a5">
+            <Stereotype name="BooleanValue" metaclass="Standard.Class" owner-stereotype="mref#'' {b7cec495-c026-4fde-b42d-496bbcda924b} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.BooleanValue.label" uid="b4355a7e-9eca-4a9e-8c4c-d49344a0c9a5" is-abstract="false">
                 <Icon path="res/icon/gui/typeModelEmpty_24.png"/>
                 <Image path="res/icon/gui/typeModelEmpty_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.value.label" name="value"
-                        parameter-card="0" uid="2fabd851-ad25-472c-927a-770ef9217dd9"/>
+                    <TagType name="value" uid="2fabd851-ad25-472c-927a-770ef9217dd9" label="%tagtype.value.label" parameter-card="0" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="true" is-hidden="true"
-                label="%stereotype.NumericValue.label"
-                metaclass="Standard.Class" name="NumericValue"
-                owner-stereotype="mref#'' {b7cec495-c026-4fde-b42d-496bbcda924b} Infrastructure.Stereotype" uid="a8d40881-b0b9-4426-a68a-cba902a74a5e">
+            <Stereotype name="NumericValue" metaclass="Standard.Class" owner-stereotype="mref#'' {b7cec495-c026-4fde-b42d-496bbcda924b} Infrastructure.Stereotype" is-hidden="true" label="%stereotype.NumericValue.label" uid="a8d40881-b0b9-4426-a68a-cba902a74a5e" is-abstract="true">
                 <Icon path=""/>
                 <Image path=""/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.IntValue.label"
-                metaclass="Standard.Class" name="IntValue"
-                owner-stereotype="mref#'' {a8d40881-b0b9-4426-a68a-cba902a74a5e} Infrastructure.Stereotype" uid="84b646d6-4b3e-4375-b9e3-8e6d650114b3">
+            <Stereotype name="IntValue" metaclass="Standard.Class" owner-stereotype="mref#'' {a8d40881-b0b9-4426-a68a-cba902a74a5e} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.IntValue.label" uid="84b646d6-4b3e-4375-b9e3-8e6d650114b3" is-abstract="false">
                 <Icon path="res/icon/gui/typeModelEmpty_24.png"/>
                 <Image path="res/icon/gui/typeModelEmpty_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.value.label" name="value"
-                        parameter-card="1" uid="8c63edd5-c470-41cc-a9bf-8eb948e832ba"/>
+                    <TagType name="value" uid="8c63edd5-c470-41cc-a9bf-8eb948e832ba" label="%tagtype.value.label" parameter-card="1" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.FloatValue.label"
-                metaclass="Standard.Class" name="FloatValue"
-                owner-stereotype="mref#'' {a8d40881-b0b9-4426-a68a-cba902a74a5e} Infrastructure.Stereotype" uid="b1f1ce0e-5329-4ea6-ad29-efcecf0e3fd3">
+            <Stereotype name="FloatValue" metaclass="Standard.Class" owner-stereotype="mref#'' {a8d40881-b0b9-4426-a68a-cba902a74a5e} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.FloatValue.label" uid="b1f1ce0e-5329-4ea6-ad29-efcecf0e3fd3" is-abstract="false">
                 <Icon path="res/icon/gui/typeModelEmpty_24.png"/>
                 <Image path="res/icon/gui/typeModelEmpty_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.value.label" name="value"
-                        parameter-card="1" uid="39512df5-0c85-431c-a6e2-bda678216414"/>
+                    <TagType name="value" uid="39512df5-0c85-431c-a6e2-bda678216414" label="%tagtype.value.label" parameter-card="1" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="true" is-hidden="true"
-                label="%stereotype.ValueType.label"
-                metaclass="Standard.DataType" name="ValueType"
-                owner-stereotype="mref#'' {f81fdaa1-17e1-49a4-bf1f-60c18563c100} Infrastructure.Stereotype" uid="4fa7ea19-f563-4658-8d2a-755724d85061">
+            <Stereotype name="ValueType" metaclass="Standard.DataType" owner-stereotype="mref#'' {f81fdaa1-17e1-49a4-bf1f-60c18563c100} Infrastructure.Stereotype" is-hidden="true" label="%stereotype.ValueType.label" uid="4fa7ea19-f563-4658-8d2a-755724d85061" is-abstract="true">
                 <Icon path=""/>
                 <Image path=""/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.primitiveType.label"
-                        name="primitiveType" parameter-card="1" uid="23bfa9f4-034d-4dcf-9837-9cdd4bd55ba2"/>
+                    <TagType name="primitiveType" uid="23bfa9f4-034d-4dcf-9837-9cdd4bd55ba2" label="%tagtype.primitiveType.label" parameter-card="1" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.CamelList.label"
-                metaclass="Standard.DataType" name="CamelList"
-                owner-stereotype="mref#'' {4fa7ea19-f563-4658-8d2a-755724d85061} Infrastructure.Stereotype" uid="789c3b87-cb58-4659-a04c-7f948aae0e2e">
+            <Stereotype name="CamelList" metaclass="Standard.DataType" owner-stereotype="mref#'' {4fa7ea19-f563-4658-8d2a-755724d85061} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.CamelList.label" uid="789c3b87-cb58-4659-a04c-7f948aae0e2e" is-abstract="false">
                 <Icon path="res/icon/gui/typeModelEmpty_24.png"/>
                 <Image path="res/icon/gui/typeModelEmpty_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.DoubleValue.label"
-                metaclass="Standard.Class" name="DoubleValue"
-                owner-stereotype="mref#'' {a8d40881-b0b9-4426-a68a-cba902a74a5e} Infrastructure.Stereotype" uid="6f7f3c3b-3812-4284-9665-7696d52500f2">
+            <Stereotype name="DoubleValue" metaclass="Standard.Class" owner-stereotype="mref#'' {a8d40881-b0b9-4426-a68a-cba902a74a5e} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.DoubleValue.label" uid="6f7f3c3b-3812-4284-9665-7696d52500f2" is-abstract="false">
                 <Icon path="res/icon/gui/typeModelEmpty_24.png"/>
                 <Image path="res/icon/gui/typeModelEmpty_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.value.label" name="value"
-                        parameter-card="1" uid="8e0fd000-262b-4aa6-9b35-fea753d10683"/>
+                    <TagType name="value" uid="8e0fd000-262b-4aa6-9b35-fea753d10683" label="%tagtype.value.label" parameter-card="1" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.BooleanValueType.label"
-                metaclass="Standard.DataType" name="BooleanValueType"
-                owner-stereotype="mref#'' {4fa7ea19-f563-4658-8d2a-755724d85061} Infrastructure.Stereotype" uid="34356c14-6f57-4377-8b6d-5f7e5d8b4929">
+            <Stereotype name="BooleanValueType" metaclass="Standard.DataType" owner-stereotype="mref#'' {4fa7ea19-f563-4658-8d2a-755724d85061} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.BooleanValueType.label" uid="34356c14-6f57-4377-8b6d-5f7e5d8b4929" is-abstract="false">
                 <Icon path="res/icon/gui/typeModelEmpty_24.png"/>
                 <Image path="res/icon/gui/typeModelEmpty_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.StringValueType.label"
-                metaclass="Standard.DataType" name="StringValueType"
-                owner-stereotype="mref#'' {4fa7ea19-f563-4658-8d2a-755724d85061} Infrastructure.Stereotype" uid="c8a2299c-93cc-47ca-82f3-53c1866d2c5b">
+            <Stereotype name="StringValueType" metaclass="Standard.DataType" owner-stereotype="mref#'' {4fa7ea19-f563-4658-8d2a-755724d85061} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.StringValueType.label" uid="c8a2299c-93cc-47ca-82f3-53c1866d2c5b" is-abstract="false">
                 <Icon path="res/icon/gui/typeModelEmpty_24.png"/>
                 <Image path="res/icon/gui/typeModelEmpty_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.RangeUnion.label"
-                metaclass="Standard.DataType" name="RangeUnion"
-                owner-stereotype="mref#'' {4fa7ea19-f563-4658-8d2a-755724d85061} Infrastructure.Stereotype" uid="aeb307d4-49c6-4201-b285-a8ba93b291fb">
+            <Stereotype name="RangeUnion" metaclass="Standard.DataType" owner-stereotype="mref#'' {4fa7ea19-f563-4658-8d2a-755724d85061} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.RangeUnion.label" uid="aeb307d4-49c6-4201-b285-a8ba93b291fb" is-abstract="false">
                 <Icon path="res/icon/gui/typeModelEmpty_24.png"/>
                 <Image path="res/icon/gui/typeModelEmpty_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.Range.label"
-                metaclass="Standard.DataType" name="Range"
-                owner-stereotype="mref#'' {4fa7ea19-f563-4658-8d2a-755724d85061} Infrastructure.Stereotype" uid="ea69f465-8f51-41c3-9c81-cc30270ea9cb">
+            <Stereotype name="Range" metaclass="Standard.DataType" owner-stereotype="mref#'' {4fa7ea19-f563-4658-8d2a-755724d85061} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.Range.label" uid="ea69f465-8f51-41c3-9c81-cc30270ea9cb" is-abstract="false">
                 <Icon path="res/icon/gui/typeModelEmpty_24.png"/>
                 <Image path="res/icon/gui/typeModelEmpty_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.lowerLimit.label"
-                        name="lowerLimit" parameter-card="1" uid="f6f57467-6d1e-4bb7-9266-0e11d1e1c7dd"/>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.upperLimit.label"
-                        name="upperLimit" parameter-card="1" uid="8205fd1c-29b3-4558-954d-bd9f8cd79610"/>
+                    <TagType name="lowerLimit" uid="f6f57467-6d1e-4bb7-9266-0e11d1e1c7dd" label="%tagtype.lowerLimit.label" parameter-card="1" is-hidden="false" is-signed="false"/>
+                    <TagType name="upperLimit" uid="8205fd1c-29b3-4558-954d-bd9f8cd79610" label="%tagtype.upperLimit.label" parameter-card="1" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
         </Profile>
-        <Profile id="UnitModel" uid="424f40e4-27b6-461a-8e0a-e70d966ee4ca">
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.UnitModel.label"
-                metaclass="Standard.Package" name="UnitModel"
-                owner-stereotype="mref#'' {577c153e-42b8-4f36-9686-1a6109ffdc16} Infrastructure.Stereotype" uid="59acf7f4-2a84-41d4-8fcb-ec300340062c">
+        <Profile uid="424f40e4-27b6-461a-8e0a-e70d966ee4ca" id="UnitModel">
+            <Stereotype name="UnitModel" metaclass="Standard.Package" owner-stereotype="mref#'' {577c153e-42b8-4f36-9686-1a6109ffdc16} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.UnitModel.label" uid="59acf7f4-2a84-41d4-8fcb-ec300340062c" is-abstract="false">
                 <Icon path="res/icon/gui/unitModel_24.png"/>
                 <Image path=""/>
             </Stereotype>
-            <Stereotype is-abstract="true" is-hidden="true"
-                label="%stereotype.Unit.label"
-                metaclass="Standard.DataType" name="Unit"
-                owner-stereotype="mref#'' {eaf56346-fbac-4409-ad4f-4e1a6c4183d1} Infrastructure.Stereotype" uid="56c9f56b-274d-4816-80c8-72536d1d7295">
+            <Stereotype name="Unit" metaclass="Standard.DataType" owner-stereotype="mref#'' {eaf56346-fbac-4409-ad4f-4e1a6c4183d1} Infrastructure.Stereotype" is-hidden="true" label="%stereotype.Unit.label" uid="56c9f56b-274d-4816-80c8-72536d1d7295" is-abstract="true">
                 <Icon path=""/>
                 <Image path=""/>
             </Stereotype>
-            <Stereotype is-abstract="true" is-hidden="true"
-                label="%stereotype.DimensionedUnit.label"
-                metaclass="Standard.DataType" name="DimensionedUnit"
-                owner-stereotype="mref#'' {56c9f56b-274d-4816-80c8-72536d1d7295} Infrastructure.Stereotype" uid="7e307b11-f18c-4c69-8c76-7b57b8d1bb8e">
+            <Stereotype name="DimensionedUnit" metaclass="Standard.DataType" owner-stereotype="mref#'' {56c9f56b-274d-4816-80c8-72536d1d7295} Infrastructure.Stereotype" is-hidden="true" label="%stereotype.DimensionedUnit.label" uid="7e307b11-f18c-4c69-8c76-7b57b8d1bb8e" is-abstract="true">
                 <Icon path=""/>
                 <Image path=""/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.UnitDimension.label"
-                metaclass="Standard.DataType" name="UnitDimension"
-                owner-stereotype="mref#'' {eaf56346-fbac-4409-ad4f-4e1a6c4183d1} Infrastructure.Stereotype" uid="ce437f2d-07f2-4127-9702-da4eb627b157">
+            <Stereotype name="UnitDimension" metaclass="Standard.DataType" owner-stereotype="mref#'' {eaf56346-fbac-4409-ad4f-4e1a6c4183d1} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.UnitDimension.label" uid="ce437f2d-07f2-4127-9702-da4eb627b157" is-abstract="false">
                 <Icon path=""/>
                 <Image path=""/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.Dimensionless.label"
-                metaclass="Standard.DataType" name="Dimensionless"
-                owner-stereotype="mref#'' {56c9f56b-274d-4816-80c8-72536d1d7295} Infrastructure.Stereotype" uid="4d98d5de-9085-4175-b509-30f88171f3ea">
+            <Stereotype name="Dimensionless" metaclass="Standard.DataType" owner-stereotype="mref#'' {56c9f56b-274d-4816-80c8-72536d1d7295} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.Dimensionless.label" uid="4d98d5de-9085-4175-b509-30f88171f3ea" is-abstract="false">
                 <Icon path="res/icon/gui/unitModelEmpty_24.png"/>
                 <Image path="res/icon/gui/unitModelEmpty_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.SingleUnit.label"
-                metaclass="Standard.DataType" name="SingleUnit"
-                owner-stereotype="mref#'' {7e307b11-f18c-4c69-8c76-7b57b8d1bb8e} Infrastructure.Stereotype" uid="5f6c0584-c6dd-44e5-a1ad-cd4785dccb03">
+            <Stereotype name="SingleUnit" metaclass="Standard.DataType" owner-stereotype="mref#'' {7e307b11-f18c-4c69-8c76-7b57b8d1bb8e} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.SingleUnit.label" uid="5f6c0584-c6dd-44e5-a1ad-cd4785dccb03" is-abstract="false">
                 <Icon path="res/icon/gui/typeModelEmpty_24.png"/>
                 <Image path="res/icon/gui/typeModelEmpty_48.png"/>
             </Stereotype>
-            <Stereotype is-abstract="false" is-hidden="false"
-                label="%stereotype.CompositeUnit.label"
-                metaclass="Standard.DataType" name="CompositeUnit"
-                owner-stereotype="mref#'' {7e307b11-f18c-4c69-8c76-7b57b8d1bb8e} Infrastructure.Stereotype" uid="54731af6-c46a-4304-996c-2e03b9035567">
+            <Stereotype name="CompositeUnit" metaclass="Standard.DataType" owner-stereotype="mref#'' {7e307b11-f18c-4c69-8c76-7b57b8d1bb8e} Infrastructure.Stereotype" is-hidden="false" label="%stereotype.CompositeUnit.label" uid="54731af6-c46a-4304-996c-2e03b9035567" is-abstract="false">
                 <Icon path="res/icon/gui/unitModelEmpty_24.png"/>
                 <Image path="res/icon/gui/unitModelEmpty_48.png"/>
                 <TagTypes>
-                    <TagType is-hidden="false" is-signed="false"
-                        label="%tagtype.formula.label" name="formula"
-                        parameter-card="1" uid="a2bb36cd-c4c0-4f75-b9ed-ec821fa8774e"/>
+                    <TagType name="formula" uid="a2bb36cd-c4c0-4f75-b9ed-ec821fa8774e" label="%tagtype.formula.label" parameter-card="1" is-hidden="false" is-signed="false"/>
                 </TagTypes>
             </Stereotype>
         </Profile>
     </Profiles>
     <Gui>
-        <ContextualMenu>
-            <CommandRef group="%group.Create diagram.label"
-                group-image="res/icon/gui/CamelDiagram.png" refid="Camel_Model_diagram"/>
-            <CommandRef group="%group.Create diagram.label"
-                group-image="res/icon/gui/CamelDiagram.png" refid="Data_Type_Model_diagram"/>
-            <CommandRef group="%group.Create diagram.label"
-                group-image="res/icon/gui/CamelDiagram.png" refid="Data_Instance_Model_diagram"/>
-            <CommandRef group="%group.Create diagram.label"
-                group-image="res/icon/gui/CamelDiagram.png" refid="Deployment_Type_Model_diagram"/>
-            <CommandRef group="%group.Create diagram.label"
-                group-image="res/icon/gui/CamelDiagram.png" refid="Deployment_Instance_Model_diagram"/>
-            <CommandRef group="%group.Create diagram.label"
-                group-image="res/icon/gui/CamelDiagram.png" refid="Execution_Model_diagram"/>
-            <CommandRef group="%group.Create diagram.label"
-                group-image="res/icon/gui/CamelDiagram.png" refid="Location_Model_diagram"/>
-            <CommandRef group="%group.Create diagram.label"
-                group-image="res/icon/gui/CamelDiagram.png" refid="Metadata_Model_diagram"/>
-            <CommandRef group="%group.Create diagram.label"
-                group-image="res/icon/gui/CamelDiagram.png" refid="Metric_Type_Model_diagram"/>
-            <CommandRef group="%group.Create diagram.label"
-                group-image="res/icon/gui/CamelDiagram.png" refid="Metric_Instance_Model_diagram"/>
-            <CommandRef group="%group.Create diagram.label"
-                group-image="res/icon/gui/CamelDiagram.png" refid="Organisation_Model_diagram"/>
-            <CommandRef group="%group.Create diagram.label"
-                group-image="res/icon/gui/CamelDiagram.png" refid="Requirement_Model_diagram"/>
-            <CommandRef group="%group.Create diagram.label"
-                group-image="res/icon/gui/CamelDiagram.png" refid="Scalability_Model_diagram"/>
-            <CommandRef group="%group.Create diagram.label"
-                group-image="res/icon/gui/CamelDiagram.png" refid="Security_Model_diagram"/>
-            <CommandRef group="%group.Create diagram.label"
-                group-image="res/icon/gui/CamelDiagram.png" refid="Type_Model_diagram"/>
-            <CommandRef group="%group.Create diagram.label"
-                group-image="res/icon/gui/CamelDiagram.png" refid="Unit_Model_diagram"/>
-            <CommandRef group="%group.Create_element.label"
-                group-image="res/icon/gui/CamelModel_24.png" refid="Camel_Model"/>
-            <CommandRef group="%group.Create_element.label"
-                group-image="res/icon/gui/CamelModel_24.png" refid="Data_Type_Model"/>
-            <CommandRef group="%group.Create_element.label"
-                group-image="res/icon/gui/CamelModel_24.png" refid="Data_Instance_Model"/>
-            <CommandRef group="%group.Create_element.label"
-                group-image="res/icon/gui/CamelModel_24.png" refid="Deployment_Type_Model"/>
-            <CommandRef group="%group.Create_element.label"
-                group-image="res/icon/gui/CamelModel_24.png" refid="Deployment_Instance_Model"/>
-            <CommandRef group="%group.Create_element.label"
-                group-image="res/icon/gui/CamelModel_24.png" refid="Execution_Model"/>
-            <CommandRef group="%group.Create_element.label"
-                group-image="res/icon/gui/CamelModel_24.png" refid="Location_Model"/>
-            <CommandRef group="%group.Create_element.label"
-                group-image="res/icon/gui/CamelModel_24.png" refid="Metadata_Model"/>
-            <CommandRef group="%group.Create_element.label"
-                group-image="res/icon/gui/CamelModel_24.png" refid="Metric_Type_Model"/>
-            <CommandRef group="%group.Create_element.label"
-                group-image="res/icon/gui/CamelModel_24.png" refid="Metric_Instance_Model"/>
-            <CommandRef group="%group.Create_element.label"
-                group-image="res/icon/gui/CamelModel_24.png" refid="Organisation_Model"/>
-            <CommandRef group="%group.Create_element.label"
-                group-image="res/icon/gui/CamelModel_24.png" refid="Requirement_Model"/>
-            <CommandRef group="%group.Create_element.label"
-                group-image="res/icon/gui/CamelModel_24.png" refid="Scalability_Model"/>
-            <CommandRef group="%group.Create_element.label"
-                group-image="res/icon/gui/CamelModel_24.png" refid="Security_Model"/>
-            <CommandRef group="%group.Create_element.label"
-                group-image="res/icon/gui/CamelModel_24.png" refid="Type_Model"/>
-            <CommandRef group="%group.Create_element.label"
-                group-image="res/icon/gui/CamelModel_24.png" refid="Unit_Model"/>
-            <CommandRef group="" group-image="" refid="Export"/>
-            <CommandRef group="" group-image="" refid="Import"/>
-            <CommandRef group="" group-image="" refid="Checker"/>
-        </ContextualMenu>
         <Commands>
-            <Command id="Camel_Model"
-                image="res/icon/gui/CamelCoreModel_24.png"
-                label="%command.Camel_Model.label" modify-model="true" tooltip="%command.Camel_Model.tooltip">
+            <Command id="Camel_Model" label="%command.Camel_Model.label" tooltip="%command.Camel_Model.tooltip" image="res/icon/gui/CamelCoreModel_24.png" modify-model="true">
                 <Scope metaclass="Standard.Package" stereotype=""/>
                 <Handler class="fr.softeam.cameldesigner.handlers.commands.CreateCamelModelCommand">
                     <HParameter name="name" value=""/>
                 </Handler>
             </Command>
-            <Command id="Camel_Model_diagram"
-                image="res/icon/gui/CamelModelDiagram_24.png"
-                label="%command.Camel_Model_diagram.label"
-                modify-model="false" tooltip="%command.Camel_Model_diagram.tooltip">
+            <Command id="Camel_Model_diagram" label="%command.Camel_Model_diagram.label" tooltip="%command.Camel_Model_diagram.tooltip" image="res/icon/gui/CamelModelDiagram_24.png" modify-model="false">
                 <Scope metaclass="Standard.Package" stereotype="CamelDesigner#CamelModel"/>
                 <Handler class="fr.softeam.cameldesigner.handlers.commands.CreateCamelModelDiagram">
                     <HParameter name="stereotype" value="CamelDesigner#CamelModelDiagram"/>
@@ -2337,24 +1308,17 @@
                     <HParameter name="name" value="Camel Model diagram"/>
                 </Handler>
             </Command>
-            <Command id="Checker" image=""
-                label="%command.Checker.label" modify-model="false" tooltip="%command.Checker.tooltip">
+            <Command id="Checker" label="%command.Checker.label" tooltip="%command.Checker.tooltip" image="" modify-model="false">
                 <Scope metaclass="Standard.Package" stereotype="CamelDesigner#CamelModel"/>
                 <Handler class="fr.softeam.cameldesigner.handlers.commands.CheckerCommand"/>
             </Command>
-            <Command id="Data_Instance_Model"
-                image="res/icon/gui/DataInstanceModel_24.png"
-                label="%command.Data_Instance_Model.label"
-                modify-model="true" tooltip="%command.Data_Instance_Model.tooltip">
+            <Command id="Data_Instance_Model" label="%command.Data_Instance_Model.label" tooltip="%command.Data_Instance_Model.tooltip" image="res/icon/gui/DataInstanceModel_24.png" modify-model="true">
                 <Scope metaclass="Standard.Package" stereotype="CamelDesigner#CamelModel"/>
                 <Handler class="fr.softeam.cameldesigner.handlers.commands.createsubmodel.CreateDataInstanceModelCommand">
                     <HParameter name="name" value=""/>
                 </Handler>
             </Command>
-            <Command id="Data_Instance_Model_diagram"
-                image="res/icon/gui/dataInstanceModelDiagram_24.png"
-                label="%command.Data_Instance_Model_diagram.label"
-                modify-model="false" tooltip="%command.Data_Instance_Model_diagram.tooltip">
+            <Command id="Data_Instance_Model_diagram" label="%command.Data_Instance_Model_diagram.label" tooltip="%command.Data_Instance_Model_diagram.tooltip" image="res/icon/gui/dataInstanceModelDiagram_24.png" modify-model="false">
                 <Scope metaclass="Standard.Package" stereotype="CamelDesigner#DataInstanceModel"/>
                 <Handler class="DiagramCreate">
                     <HParameter name="name" value="Data Instance Model diagram"/>
@@ -2363,19 +1327,13 @@
                     <HParameter name="style" value="CamelStyle"/>
                 </Handler>
             </Command>
-            <Command id="Data_Type_Model"
-                image="res/icon/gui/dataModel_24.png"
-                label="%command.Data_Type_Model.label"
-                modify-model="true" tooltip="%command.Data_Type_Model.tooltip">
+            <Command id="Data_Type_Model" label="%command.Data_Type_Model.label" tooltip="%command.Data_Type_Model.tooltip" image="res/icon/gui/dataModel_24.png" modify-model="true">
                 <Scope metaclass="Standard.Package" stereotype="CamelDesigner#CamelModel"/>
                 <Handler class="fr.softeam.cameldesigner.handlers.commands.createsubmodel.CreateDataTypeModelCommand">
                     <HParameter name="name" value=""/>
                 </Handler>
             </Command>
-            <Command id="Data_Type_Model_diagram"
-                image="res/icon/gui/dataModelDiagram_24.png"
-                label="%command.Data_Type_Model_diagram.label"
-                modify-model="false" tooltip="%command.Data_Type_Model_diagram.tooltip">
+            <Command id="Data_Type_Model_diagram" label="%command.Data_Type_Model_diagram.label" tooltip="%command.Data_Type_Model_diagram.tooltip" image="res/icon/gui/dataModelDiagram_24.png" modify-model="false">
                 <Scope metaclass="Standard.Package" stereotype="CamelDesigner#DataTypeModel"/>
                 <Handler class="DiagramCreate">
                     <HParameter name="name" value="Data Type Model diagram"/>
@@ -2384,19 +1342,13 @@
                     <HParameter name="style" value="CamelStyle"/>
                 </Handler>
             </Command>
-            <Command id="Deployment_Instance_Model"
-                image="res/icon/gui/DeploymentInstanceModel_24.png"
-                label="%command.Deployment_Instance_Model.label"
-                modify-model="true" tooltip="%command.Deployment_Instance_Model.tooltip">
+            <Command id="Deployment_Instance_Model" label="%command.Deployment_Instance_Model.label" tooltip="%command.Deployment_Instance_Model.tooltip" image="res/icon/gui/DeploymentInstanceModel_24.png" modify-model="true">
                 <Scope metaclass="Standard.Package" stereotype="CamelDesigner#CamelModel"/>
                 <Handler class="fr.softeam.cameldesigner.handlers.commands.createsubmodel.CreateDeploymentInstanceModelCommand">
                     <HParameter name="name" value=""/>
                 </Handler>
             </Command>
-            <Command id="Deployment_Instance_Model_diagram"
-                image="res/icon/gui/DeploymentTypeModelDiagram_24.png"
-                label="%command.Deployment_Instance_Model_diagram.label"
-                modify-model="false" tooltip="%command.Deployment_Instance_Model_diagram.tooltip">
+            <Command id="Deployment_Instance_Model_diagram" label="%command.Deployment_Instance_Model_diagram.label" tooltip="%command.Deployment_Instance_Model_diagram.tooltip" image="res/icon/gui/DeploymentTypeModelDiagram_24.png" modify-model="false">
                 <Scope metaclass="Standard.Package" stereotype="CamelDesigner#DeploymentInstanceModel"/>
                 <Handler class="DiagramCreate">
                     <HParameter name="name" value="Deployment Instance Model diagram"/>
@@ -2405,19 +1357,13 @@
                     <HParameter name="style" value="CamelStyle"/>
                 </Handler>
             </Command>
-            <Command id="Deployment_Type_Model"
-                image="res/icon/gui/DeploymentTypeModel_24.png"
-                label="%command.Deployment_Type_Model.label"
-                modify-model="true" tooltip="%command.Deployment_Type_Model.tooltip">
+            <Command id="Deployment_Type_Model" label="%command.Deployment_Type_Model.label" tooltip="%command.Deployment_Type_Model.tooltip" image="res/icon/gui/DeploymentTypeModel_24.png" modify-model="true">
                 <Scope metaclass="Standard.Package" stereotype="CamelDesigner#CamelModel"/>
                 <Handler class="fr.softeam.cameldesigner.handlers.commands.createsubmodel.CreateDeploymentTypeModelCommand">
                     <HParameter name="name" value=""/>
                 </Handler>
             </Command>
-            <Command id="Deployment_Type_Model_diagram"
-                image="res/icon/gui/DeploymentTypeModelDiagram_24.png"
-                label="%command.Deployment_Type_Model_diagram.label"
-                modify-model="false" tooltip="%command.Deployment_Type_Model_diagram.tooltip">
+            <Command id="Deployment_Type_Model_diagram" label="%command.Deployment_Type_Model_diagram.label" tooltip="%command.Deployment_Type_Model_diagram.tooltip" image="res/icon/gui/DeploymentTypeModelDiagram_24.png" modify-model="false">
                 <Scope metaclass="Standard.Package" stereotype="CamelDesigner#DeploymentTypeModel"/>
                 <Handler class="DiagramCreate">
                     <HParameter name="name" value="Deployment Type Model diagram"/>
@@ -2426,19 +1372,13 @@
                     <HParameter name="style" value="CamelStyle"/>
                 </Handler>
             </Command>
-            <Command id="Execution_Model"
-                image="res/icon/gui/executionModel_24.png"
-                label="%command.Execution_Model.label"
-                modify-model="true" tooltip="%command.Execution_Model.tooltip">
+            <Command id="Execution_Model" label="%command.Execution_Model.label" tooltip="%command.Execution_Model.tooltip" image="res/icon/gui/executionModel_24.png" modify-model="true">
                 <Scope metaclass="Standard.Package" stereotype="CamelDesigner#CamelModel"/>
                 <Handler class="fr.softeam.cameldesigner.handlers.commands.createsubmodel.CreateExecutionModelCommand">
                     <HParameter name="name" value=""/>
                 </Handler>
             </Command>
-            <Command id="Execution_Model_diagram"
-                image="res/icon/gui/executionModelDiagram_24.png"
-                label="%command.Execution_Model_diagram.label"
-                modify-model="false" tooltip="%command.Execution_Model_diagram.tooltip">
+            <Command id="Execution_Model_diagram" label="%command.Execution_Model_diagram.label" tooltip="%command.Execution_Model_diagram.tooltip" image="res/icon/gui/executionModelDiagram_24.png" modify-model="false">
                 <Scope metaclass="Standard.Package" stereotype="CamelDesigner#ExecutionModel"/>
                 <Handler class="DiagramCreate">
                     <HParameter name="name" value="Execution Model diagram"/>
@@ -2448,29 +1388,21 @@
                     <HParameter name="style" value="CamelStyle"/>
                 </Handler>
             </Command>
-            <Command id="Export" image="res/icon/gui/exportCamel_24.png"
-                label="%command.Export.label" modify-model="false" tooltip="%command.Export.tooltip">
+            <Command id="Export" label="%command.Export.label" tooltip="%command.Export.tooltip" image="res/icon/gui/exportCamel_24.png" modify-model="false">
                 <Scope metaclass="Standard.Package" stereotype="CamelDesigner#CamelModel"/>
                 <Handler class="fr.softeam.cameldesigner.handlers.commands.ExportModelCommand"/>
             </Command>
-            <Command id="Import" image="res/icon/gui/importCamel_24.png"
-                label="%command.Import.label" modify-model="true" tooltip="%command.Import.tooltip">
+            <Command id="Import" label="%command.Import.label" tooltip="%command.Import.tooltip" image="res/icon/gui/importCamel_24.png" modify-model="true">
                 <Scope metaclass="Standard.Package" stereotype=""/>
                 <Handler class="fr.softeam.cameldesigner.handlers.commands.ImportModelCommand"/>
             </Command>
-            <Command id="Location_Model"
-                image="res/icon/gui/locationModel_24.png"
-                label="%command.Location_Model.label"
-                modify-model="true" tooltip="%command.Location_Model.tooltip">
+            <Command id="Location_Model" label="%command.Location_Model.label" tooltip="%command.Location_Model.tooltip" image="res/icon/gui/locationModel_24.png" modify-model="true">
                 <Scope metaclass="Standard.Package" stereotype="CamelDesigner#CamelModel"/>
                 <Handler class="fr.softeam.cameldesigner.handlers.commands.createsubmodel.CreateLocationModelCommand">
                     <HParameter name="name" value=""/>
                 </Handler>
             </Command>
-            <Command id="Location_Model_diagram"
-                image="res/icon/gui/locationModelDiagram_24.png"
-                label="%command.Location_Model_diagram.label"
-                modify-model="false" tooltip="%command.Location_Model_diagram.tooltip">
+            <Command id="Location_Model_diagram" label="%command.Location_Model_diagram.label" tooltip="%command.Location_Model_diagram.tooltip" image="res/icon/gui/locationModelDiagram_24.png" modify-model="false">
                 <Scope metaclass="Standard.Package" stereotype="CamelDesigner#LocationModel"/>
                 <Handler class="DiagramCreate">
                     <HParameter name="name" value="Location Model diagram"/>
@@ -2479,19 +1411,13 @@
                     <HParameter name="style" value="CamelStyle"/>
                 </Handler>
             </Command>
-            <Command id="Metadata_Model"
-                image="res/icon/gui/metadataModel_24.png"
-                label="%command.Metadata_Model.label"
-                modify-model="true" tooltip="%command.Metadata_Model.tooltip">
+            <Command id="Metadata_Model" label="%command.Metadata_Model.label" tooltip="%command.Metadata_Model.tooltip" image="res/icon/gui/metadataModel_24.png" modify-model="true">
                 <Scope metaclass="Standard.Package" stereotype="CamelDesigner#CamelModel"/>
                 <Handler class="fr.softeam.cameldesigner.handlers.commands.createsubmodel.CreateMetadataModelCommand">
                     <HParameter name="name" value=""/>
                 </Handler>
             </Command>
-            <Command id="Metadata_Model_diagram"
-                image="res/icon/gui/metadataModelDiagram_24.png"
-                label="%command.Metadata_Model_diagram.label"
-                modify-model="false" tooltip="%command.Metadata_Model_diagram.tooltip">
+            <Command id="Metadata_Model_diagram" label="%command.Metadata_Model_diagram.label" tooltip="%command.Metadata_Model_diagram.tooltip" image="res/icon/gui/metadataModelDiagram_24.png" modify-model="false">
                 <Scope metaclass="Standard.Package" stereotype="CamelDesigner#MetaDataModel"/>
                 <Handler class="DiagramCreate">
                     <HParameter name="name" value="Metadata Model diagram"/>
@@ -2500,19 +1426,13 @@
                     <HParameter name="style" value="CamelStyle"/>
                 </Handler>
             </Command>
-            <Command id="Metric_Instance_Model"
-                image="res/icon/gui/MetricInstanceModel_24.png"
-                label="%command.Metric_Instance_Model.label"
-                modify-model="true" tooltip="%command.Metric_Instance_Model.tooltip">
+            <Command id="Metric_Instance_Model" label="%command.Metric_Instance_Model.label" tooltip="%command.Metric_Instance_Model.tooltip" image="res/icon/gui/MetricInstanceModel_24.png" modify-model="true">
                 <Scope metaclass="Standard.Package" stereotype="CamelDesigner#CamelModel"/>
                 <Handler class="fr.softeam.cameldesigner.handlers.commands.createsubmodel.CreateMetricInstanceModelCommand">
                     <HParameter name="name" value=""/>
                 </Handler>
             </Command>
-            <Command id="Metric_Instance_Model_diagram"
-                image="res/icon/gui/MetricInstanceModelDiagram_24.png"
-                label="%command.Metric_Instance_Model_diagram.label"
-                modify-model="false" tooltip="%command.Metric_Instance_Model_diagram.tooltip">
+            <Command id="Metric_Instance_Model_diagram" label="%command.Metric_Instance_Model_diagram.label" tooltip="%command.Metric_Instance_Model_diagram.tooltip" image="res/icon/gui/MetricInstanceModelDiagram_24.png" modify-model="false">
                 <Scope metaclass="Standard.Package" stereotype="CamelDesigner#MetricInstanceModel"/>
                 <Handler class="DiagramCreate">
                     <HParameter name="name" value="Metric Instance Model diagram"/>
@@ -2521,19 +1441,13 @@
                     <HParameter name="style" value="CamelStyle"/>
                 </Handler>
             </Command>
-            <Command id="Metric_Type_Model"
-                image="res/icon/gui/metricModel_24.png"
-                label="%command.Metric_Type_Model.label"
-                modify-model="true" tooltip="%command.Metric_Type_Model.tooltip">
+            <Command id="Metric_Type_Model" label="%command.Metric_Type_Model.label" tooltip="%command.Metric_Type_Model.tooltip" image="res/icon/gui/metricModel_24.png" modify-model="true">
                 <Scope metaclass="Standard.Package" stereotype="CamelDesigner#CamelModel"/>
                 <Handler class="fr.softeam.cameldesigner.handlers.commands.createsubmodel.CreateMetricTypeModelCommand">
                     <HParameter name="name" value=""/>
                 </Handler>
             </Command>
-            <Command id="Metric_Type_Model_diagram"
-                image="res/icon/gui/MetricTypeModelDiagram_24.png"
-                label="%command.Metric_Type_Model_diagram.label"
-                modify-model="false" tooltip="%command.Metric_Type_Model_diagram.tooltip">
+            <Command id="Metric_Type_Model_diagram" label="%command.Metric_Type_Model_diagram.label" tooltip="%command.Metric_Type_Model_diagram.tooltip" image="res/icon/gui/MetricTypeModelDiagram_24.png" modify-model="false">
                 <Scope metaclass="Standard.Package" stereotype="CamelDesigner#MetricTypeModel"/>
                 <Handler class="DiagramCreate">
                     <HParameter name="name" value="Metric Type Model diagram"/>
@@ -2542,19 +1456,13 @@
                     <HParameter name="style" value="CamelStyle"/>
                 </Handler>
             </Command>
-            <Command id="Organisation_Model"
-                image="res/icon/gui/organisationModel_24.png"
-                label="%command.Organisation_Model.label"
-                modify-model="true" tooltip="%command.Organisation_Model.tooltip">
+            <Command id="Organisation_Model" label="%command.Organisation_Model.label" tooltip="%command.Organisation_Model.tooltip" image="res/icon/gui/organisationModel_24.png" modify-model="true">
                 <Scope metaclass="Standard.Package" stereotype="CamelDesigner#CamelModel"/>
                 <Handler class="fr.softeam.cameldesigner.handlers.commands.createsubmodel.CreateOrganisationModelCommand">
                     <HParameter name="name" value=""/>
                 </Handler>
             </Command>
-            <Command id="Organisation_Model_diagram"
-                image="res/icon/gui/organisationModelDiagram_24.png"
-                label="%command.Organisation_Model_diagram.label"
-                modify-model="false" tooltip="%command.Organisation_Model_diagram.tooltip">
+            <Command id="Organisation_Model_diagram" label="%command.Organisation_Model_diagram.label" tooltip="%command.Organisation_Model_diagram.tooltip" image="res/icon/gui/organisationModelDiagram_24.png" modify-model="false">
                 <Scope metaclass="Standard.Package" stereotype="CamelDesigner#OrganisationModel"/>
                 <Handler class="DiagramCreate">
                     <HParameter name="name" value="Organisation Model diagram"/>
@@ -2563,19 +1471,13 @@
                     <HParameter name="style" value="CamelStyle"/>
                 </Handler>
             </Command>
-            <Command id="Requirement_Model"
-                image="res/icon/gui/requirementModel_24.png"
-                label="%command.Requirement_Model.label"
-                modify-model="true" tooltip="%command.Requirement_Model.tooltip">
+            <Command id="Requirement_Model" label="%command.Requirement_Model.label" tooltip="%command.Requirement_Model.tooltip" image="res/icon/gui/requirementModel_24.png" modify-model="true">
                 <Scope metaclass="Standard.Package" stereotype="CamelDesigner#CamelModel"/>
                 <Handler class="fr.softeam.cameldesigner.handlers.commands.createsubmodel.CreateRequirementModelCommand">
                     <HParameter name="name" value=""/>
                 </Handler>
             </Command>
-            <Command id="Requirement_Model_diagram"
-                image="res/icon/gui/requirementModelDiagram_48.ICON.png"
-                label="%command.Requirement_Model_diagram.label"
-                modify-model="false" tooltip="%command.Requirement_Model_diagram.tooltip">
+            <Command id="Requirement_Model_diagram" label="%command.Requirement_Model_diagram.label" tooltip="%command.Requirement_Model_diagram.tooltip" image="res/icon/gui/requirementModelDiagram_48.ICON.png" modify-model="false">
                 <Scope metaclass="Standard.Package" stereotype="CamelDesigner#RequirementModel"/>
                 <Handler class="DiagramCreate">
                     <HParameter name="name" value="Requirement Model diagram"/>
@@ -2584,19 +1486,13 @@
                     <HParameter name="style" value="CamelStyle"/>
                 </Handler>
             </Command>
-            <Command id="Scalability_Model"
-                image="res/icon/gui/scalabilityModel_24.png"
-                label="%command.Scalability_Model.label"
-                modify-model="true" tooltip="%command.Scalability_Model.tooltip">
+            <Command id="Scalability_Model" label="%command.Scalability_Model.label" tooltip="%command.Scalability_Model.tooltip" image="res/icon/gui/scalabilityModel_24.png" modify-model="true">
                 <Scope metaclass="Standard.Package" stereotype="CamelDesigner#CamelModel"/>
                 <Handler class="fr.softeam.cameldesigner.handlers.commands.createsubmodel.CreateScalabilityModelCommand">
                     <HParameter name="name" value=""/>
                 </Handler>
             </Command>
-            <Command id="Scalability_Model_diagram"
-                image="res/icon/gui/scalabilityModelDiagram_24.png"
-                label="%command.Scalability_Model_diagram.label"
-                modify-model="false" tooltip="%command.Scalability_Model_diagram.tooltip">
+            <Command id="Scalability_Model_diagram" label="%command.Scalability_Model_diagram.label" tooltip="%command.Scalability_Model_diagram.tooltip" image="res/icon/gui/scalabilityModelDiagram_24.png" modify-model="false">
                 <Scope metaclass="Standard.Package" stereotype="CamelDesigner#ScalabilityModel"/>
                 <Handler class="DiagramCreate">
                     <HParameter name="name" value="Scalability Model diagram"/>
@@ -2605,19 +1501,13 @@
                     <HParameter name="style" value="CamelStyle"/>
                 </Handler>
             </Command>
-            <Command id="Security_Model"
-                image="res/icon/gui/securityModel_24.png"
-                label="%command.Security_Model.label"
-                modify-model="true" tooltip="%command.Security_Model.tooltip">
+            <Command id="Security_Model" label="%command.Security_Model.label" tooltip="%command.Security_Model.tooltip" image="res/icon/gui/securityModel_24.png" modify-model="true">
                 <Scope metaclass="Standard.Package" stereotype="CamelDesigner#CamelModel"/>
                 <Handler class="fr.softeam.cameldesigner.handlers.commands.createsubmodel.CreateSecurityModelCommand">
                     <HParameter name="name" value=""/>
                 </Handler>
             </Command>
-            <Command id="Security_Model_diagram"
-                image="res/icon/gui/securityModelDiagram_24.png"
-                label="%command.Security_Model_diagram.label"
-                modify-model="false" tooltip="%command.Security_Model_diagram.tooltip">
+            <Command id="Security_Model_diagram" label="%command.Security_Model_diagram.label" tooltip="%command.Security_Model_diagram.tooltip" image="res/icon/gui/securityModelDiagram_24.png" modify-model="false">
                 <Scope metaclass="Standard.Package" stereotype="CamelDesigner#SecurityModel"/>
                 <Handler class="DiagramCreate">
                     <HParameter name="name" value="Secutity Model diagram"/>
@@ -2626,18 +1516,13 @@
                     <HParameter name="style" value="CamelStyle"/>
                 </Handler>
             </Command>
-            <Command id="Type_Model"
-                image="res/icon/gui/typeModel_24.png"
-                label="%command.Type_Model.label" modify-model="true" tooltip="%command.Type_Model.tooltip">
+            <Command id="Type_Model" label="%command.Type_Model.label" tooltip="%command.Type_Model.tooltip" image="res/icon/gui/typeModel_24.png" modify-model="true">
                 <Scope metaclass="Standard.Package" stereotype="CamelDesigner#CamelModel"/>
                 <Handler class="fr.softeam.cameldesigner.handlers.commands.createsubmodel.CreateTypeModelCommand">
                     <HParameter name="name" value=""/>
                 </Handler>
             </Command>
-            <Command id="Type_Model_diagram"
-                image="res/icon/gui/typeModelDiagram_24.png"
-                label="%command.Type_Model_diagram.label"
-                modify-model="false" tooltip="%command.Type_Model_diagram.tooltip">
+            <Command id="Type_Model_diagram" label="%command.Type_Model_diagram.label" tooltip="%command.Type_Model_diagram.tooltip" image="res/icon/gui/typeModelDiagram_24.png" modify-model="false">
                 <Scope metaclass="Standard.Package" stereotype="CamelDesigner#TypeModel"/>
                 <Handler class="DiagramCreate">
                     <HParameter name="name" value="Type Model diagram"/>
@@ -2646,18 +1531,13 @@
                     <HParameter name="style" value="CamelStyle"/>
                 </Handler>
             </Command>
-            <Command id="Unit_Model"
-                image="res/icon/gui/unitModel_24.png"
-                label="%command.Unit_Model.label" modify-model="true" tooltip="%command.Unit_Model.tooltip">
+            <Command id="Unit_Model" label="%command.Unit_Model.label" tooltip="%command.Unit_Model.tooltip" image="res/icon/gui/unitModel_24.png" modify-model="true">
                 <Scope metaclass="Standard.Package" stereotype="CamelDesigner#CamelModel"/>
                 <Handler class="fr.softeam.cameldesigner.handlers.commands.createsubmodel.CreateUnitModelCommand">
                     <HParameter name="name" value=""/>
                 </Handler>
             </Command>
-            <Command id="Unit_Model_diagram"
-                image="res/icon/gui/unitModelDiagram_24.png"
-                label="%command.Unit_Model_diagram.label"
-                modify-model="false" tooltip="%command.Unit_Model_diagram.tooltip">
+            <Command id="Unit_Model_diagram" label="%command.Unit_Model_diagram.label" tooltip="%command.Unit_Model_diagram.tooltip" image="res/icon/gui/unitModelDiagram_24.png" modify-model="false">
                 <Scope metaclass="Standard.Package" stereotype="CamelDesigner#UnitModel"/>
                 <Handler class="DiagramCreate">
                     <HParameter name="name" value="Unit Model diagram"/>
@@ -2667,430 +1547,8 @@
                 </Handler>
             </Command>
         </Commands>
-        <Diagrams>
-            <DiagramType base-diagram="Standard.ClassDiagram" stereotype="CamelDesigner#CamelModelDiagram">
-                <Palette keepBasePalette="false">
-                    <ToolRef group="%group.Camel_Sub_Models.label" refid="DataInstanceModel"/>
-                    <ToolRef group="%group.Camel_Sub_Models.label" refid="DataTypeModel"/>
-                    <ToolRef group="%group.Camel_Sub_Models.label" refid="Deployment_Instance_Model"/>
-                    <ToolRef group="%group.Camel_Sub_Models.label" refid="Deployment_Type_Model"/>
-                    <ToolRef group="%group.Camel_Sub_Models.label" refid="ExecutionModel"/>
-                    <ToolRef group="%group.Camel_Sub_Models.label" refid="LocationModel"/>
-                    <ToolRef group="%group.Camel_Sub_Models.label" refid="MetaDataModel"/>
-                    <ToolRef group="%group.Camel_Sub_Models.label" refid="MetricInstanceModel"/>
-                    <ToolRef group="%group.Camel_Sub_Models.label" refid="Metric_Type_Model"/>
-                    <ToolRef group="%group.Camel_Sub_Models.label" refid="OrganisationModel"/>
-                    <ToolRef group="%group.Camel_Sub_Models.label" refid="Requirement_Model"/>
-                    <ToolRef group="%group.Camel_Sub_Models.label" refid="ScalabilityModel"/>
-                    <ToolRef group="%group.Camel_Sub_Models.label" refid="SecurityModel"/>
-                    <ToolRef group="%group.Camel_Sub_Models.label" refid="TypeModel"/>
-                    <ToolRef group="%group.Camel_Sub_Models.label" refid="UnitModel"/>
-                    <ToolRef group="%group.Common.label" refid="CREATE_EXTERNDOCUMENT"/>
-                    <ToolRef group="%group.Common.label" refid="CREATE_RELATED_DIAGRAM_LINK"/>
-                    <ToolRef group="%group.Common.label" refid="CREATE_NOTE"/>
-                    <ToolRef group="%group.Common.label" refid="CREATE_TRACEABILITY"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_LINE"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_RECTANGLE"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_TEXT"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_ELLIPSE"/>
-                </Palette>
-                <Handler class="StandardCustomizer">
-                    <HParameter name="stereotype" value="CamelDesigner#CamelModelDiagram"/>
-                    <HParameter name="metaclass" value="Standard.ClassDiagram"/>
-                </Handler>
-            </DiagramType>
-            <DiagramType base-diagram="Standard.ClassDiagram" stereotype="CamelDesigner#CamelViewPoint">
-                <Palette keepBasePalette="false">
-                    <ToolRef group="%group.Common.label" refid="Feature"/>
-                    <ToolRef group="%group.Common.label" refid="CamelAttribute"/>
-                    <ToolRef group="%group.Common.label" refid="Measurable_Attribute"/>
-                    <ToolRef group="%group.Common.label" refid="CREATE_NOTE"/>
-                    <ToolRef group="%group.Common.label" refid="CREATE_RELATED_DIAGRAM_LINK"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_ELLIPSE"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_RECTANGLE"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_LINE"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_TEXT"/>
-                </Palette>
-                <Handler class="StandardCustomizer">
-                    <HParameter name="stereotype" value="CamelDesigner#CamelViewPoint"/>
-                    <HParameter name="metaclass" value="Standard.ClassDiagram"/>
-                </Handler>
-            </DiagramType>
-            <DiagramType base-diagram="Standard.ClassDiagram" stereotype="CamelDesigner#ConstraintModelDiagram">
-                <Palette keepBasePalette="false">
-                    <ToolRef group="%group.Constraint.label" refid="ConstraintModel"/>
-                    <ToolRef group="%group.Constraint.label" refid="Metric_Constraint"/>
-                    <ToolRef group="%group.Constraint.label" refid="Attribute_Constraint"/>
-                    <ToolRef group="%group.Constraint.label" refid="IfThen_Constraint"/>
-                    <ToolRef group="%group.Constraint.label" refid="Metric_Variable_Constraint"/>
-                    <ToolRef group="%group.Constraint.label" refid="Logical_Constraint"/>
-                    <ToolRef group="%group.Constraint.label" refid="Unary_Constraint"/>
-                    <ToolRef group="%group.Common.label" refid="CREATE_EXTERNDOCUMENT"/>
-                    <ToolRef group="%group.Common.label" refid="CREATE_NOTE"/>
-                    <ToolRef group="%group.Common.label" refid="CREATE_TRACEABILITY"/>
-                    <ToolRef group="%group.Common.label" refid="CREATE_RELATED_DIAGRAM_LINK"/>
-                    <ToolRef group="%group.Common.label" refid="PropertyDependency"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_ELLIPSE"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_TEXT"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_RECTANGLE"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_LINE"/>
-                </Palette>
-                <Handler class="StandardCustomizer">
-                    <HParameter name="stereotype" value="CamelDesigner#ConstraintModelDiagram"/>
-                    <HParameter name="metaclass" value="Standard.ClassDiagram"/>
-                </Handler>
-            </DiagramType>
-            <DiagramType base-diagram="Standard.ClassDiagram" stereotype="CamelDesigner#DataInstanceModelDiagram">
-                <Palette keepBasePalette="false">
-                    <ToolRef group="%group.Data_Instance.label" refid="DataInstance"/>
-                    <ToolRef group="%group.Data_Instance.label" refid="Data_Source_Instance"/>
-                    <ToolRef group="%group.Common.label" refid="Feature"/>
-                    <ToolRef group="%group.Common.label" refid="CamelAttribute"/>
-                    <ToolRef group="%group.Common.label" refid="Measurable_Attribute"/>
-                    <ToolRef group="%group.Common.label" refid="CREATE_NOTE"/>
-                    <ToolRef group="%group.Common.label" refid="CREATE_RELATED_DIAGRAM_LINK"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_ELLIPSE"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_RECTANGLE"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_LINE"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_TEXT"/>
-                </Palette>
-                <Handler class="StandardCustomizer">
-                    <HParameter name="stereotype" value="CamelDesigner#DataInstanceModelDiagram"/>
-                    <HParameter name="metaclass" value="Standard.ClassDiagram"/>
-                </Handler>
-            </DiagramType>
-            <DiagramType base-diagram="Standard.ClassDiagram" stereotype="CamelDesigner#DataTypeModelDiagram">
-                <Palette keepBasePalette="false">
-                    <ToolRef group="%group.Data.label" refid="Data"/>
-                    <ToolRef group="%group.Data.label" refid="Data_Source"/>
-                    <ToolRef group="%group.Common.label" refid="Feature"/>
-                    <ToolRef group="%group.Common.label" refid="CamelAttribute"/>
-                    <ToolRef group="%group.Common.label" refid="Measurable_Attribute"/>
-                    <ToolRef group="%group.Common.label" refid="CREATE_NOTE"/>
-                    <ToolRef group="%group.Common.label" refid="CREATE_RELATED_DIAGRAM_LINK"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_RECTANGLE"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_TEXT"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_ELLIPSE"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_LINE"/>
-                </Palette>
-                <Handler class="StandardCustomizer">
-                    <HParameter name="stereotype" value="CamelDesigner#DataTypeModelDiagram"/>
-                    <HParameter name="metaclass" value="Standard.ClassDiagram"/>
-                </Handler>
-            </DiagramType>
-            <DiagramType base-diagram="Standard.ClassDiagram" stereotype="CamelDesigner#DeploymentInstanceModelDiagram">
-                <Palette keepBasePalette="false">
-                    <ToolRef group="%group.Deployment_Instance.label" refid="Container_Instance"/>
-                    <ToolRef group="%group.Deployment_Instance.label" refid="VM_Instance"/>
-                    <ToolRef group="%group.Common.label" refid="Feature"/>
-                    <ToolRef group="%group.Common.label" refid="CamelAttribute"/>
-                    <ToolRef group="%group.Common.label" refid="Measurable_Attribute"/>
-                    <ToolRef group="%group.Common.label" refid="CREATE_NOTE"/>
-                    <ToolRef group="%group.Common.label" refid="CREATE_RELATED_DIAGRAM_LINK"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_RECTANGLE"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_TEXT"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_ELLIPSE"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_LINE"/>
-                </Palette>
-                <Handler class="StandardCustomizer">
-                    <HParameter name="stereotype" value="CamelDesigner#DeploymentInstanceModelDiagram"/>
-                    <HParameter name="metaclass" value="Standard.ClassDiagram"/>
-                </Handler>
-            </DiagramType>
-            <DiagramType base-diagram="Standard.ClassDiagram" stereotype="CamelDesigner#DeploymentTypeModelDiagram">
-                <Palette keepBasePalette="false">
-                    <ToolRef group="%group.Deployment_Type.label" refid="Software_Component"/>
-                    <ToolRef group="%group.Deployment_Type.label" refid="RequirementSet"/>
-                    <ToolRef group="%group.Deployment_Type.label" refid="Container"/>
-                    <ToolRef group="%group.Deployment_Type.label" refid="PaaS"/>
-                    <ToolRef group="%group.Deployment_Type.label" refid="VM"/>
-                    <ToolRef group="%group.Configuration.label" refid="Serverless_Configuration"/>
-                    <ToolRef group="%group.Configuration.label" refid="Build_Configuration"/>
-                    <ToolRef group="%group.Configuration.label" refid="Cluster_Configuration"/>
-                    <ToolRef group="%group.Configuration.label" refid="Event_Configuration"/>
-                    <ToolRef group="%group.Configuration.label" refid="PaaS_Configuration"/>
-                    <ToolRef group="%group.Configuration.label" refid="ScriptConfiguration"/>
-                    <ToolRef group="%group.Communication.label" refid="RequiredHost"/>
-                    <ToolRef group="%group.Communication.label" refid="ProvidedHost"/>
-                    <ToolRef group="%group.Communication.label" refid="RequiredCommunication"/>
-                    <ToolRef group="%group.Communication.label" refid="ProvidedCommunication"/>
-                    <ToolRef group="%group.Communication.label" refid="CREATE_CONNECTOR"/>
-                    <ToolRef group="%group.Common.label" refid="Feature"/>
-                    <ToolRef group="%group.Common.label" refid="CamelAttribute"/>
-                    <ToolRef group="%group.Common.label" refid="Measurable_Attribute"/>
-                    <ToolRef group="%group.Common.label" refid="CREATE_NOTE"/>
-                    <ToolRef group="%group.Common.label" refid="CREATE_RELATED_DIAGRAM_LINK"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_TEXT"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_LINE"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_RECTANGLE"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_ELLIPSE"/>
-                </Palette>
-                <Handler class="StandardCustomizer">
-                    <HParameter name="stereotype" value="CamelDesigner#DeploymentTypeModelDiagram"/>
-                    <HParameter name="metaclass" value="Standard.ClassDiagram"/>
-                </Handler>
-            </DiagramType>
-            <DiagramType base-diagram="Standard.ClassDiagram" stereotype="CamelDesigner#ExecutionModelDiagram">
-                <Palette keepBasePalette="false">
-                    <ToolRef group="%group.Execution.label" refid="Action_Instance"/>
-                    <ToolRef group="%group.Execution.label" refid="ApplicationMeasurement"/>
-                    <ToolRef group="%group.Execution.label" refid="Cause"/>
-                    <ToolRef group="%group.Execution.label" refid="CommunicationMeasurement"/>
-                    <ToolRef group="%group.Execution.label" refid="ContainerMeasurement"/>
-                    <ToolRef group="%group.Execution.label" refid="DataMeasurement"/>
-                    <ToolRef group="%group.Execution.label" refid="HistoryInfo"/>
-                    <ToolRef group="%group.Execution.label" refid="HistoryRecord"/>
-                    <ToolRef group="%group.Execution.label" refid="PaasMeasurement"/>
-                    <ToolRef group="%group.Execution.label" refid="RuleTrigger"/>
-                    <ToolRef group="%group.Execution.label" refid="SLOViolation"/>
-                    <ToolRef group="%group.Execution.label" refid="SoftwareComponentMeasurement"/>
-                    <ToolRef group="%group.Execution.label" refid="VMMeasurement"/>
-                    <ToolRef group="%group.Common.label" refid="Feature"/>
-                    <ToolRef group="%group.Common.label" refid="CamelAttribute"/>
-                    <ToolRef group="%group.Common.label" refid="Measurable_Attribute"/>
-                    <ToolRef group="%group.Common.label" refid="CREATE_NOTE"/>
-                    <ToolRef group="%group.Common.label" refid="CREATE_RELATED_DIAGRAM_LINK"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_RECTANGLE"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_LINE"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_ELLIPSE"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_TEXT"/>
-                </Palette>
-                <Handler class="StandardCustomizer">
-                    <HParameter name="stereotype" value="CamelDesigner#ExecutionModelDiagram"/>
-                    <HParameter name="metaclass" value="Standard.ClassDiagram"/>
-                </Handler>
-            </DiagramType>
-            <DiagramType base-diagram="Standard.ClassDiagram" stereotype="CamelDesigner#LocationModelDiagram">
-                <Palette keepBasePalette="false">
-                    <ToolRef group="%group.Location.label" refid="Cloud_Location"/>
-                    <ToolRef group="%group.Location.label" refid="Geographical_Region"/>
-                    <ToolRef group="%group.Common.label" refid="Feature"/>
-                    <ToolRef group="%group.Common.label" refid="CamelAttribute"/>
-                    <ToolRef group="%group.Common.label" refid="Measurable_Attribute"/>
-                    <ToolRef group="%group.Common.label" refid="CREATE_NOTE"/>
-                    <ToolRef group="%group.Common.label" refid="CREATE_RELATED_DIAGRAM_LINK"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_LINE"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_TEXT"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_ELLIPSE"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_RECTANGLE"/>
-                </Palette>
-                <Handler class="StandardCustomizer">
-                    <HParameter name="stereotype" value="CamelDesigner#LocationModelDiagram"/>
-                    <HParameter name="metaclass" value="Standard.ClassDiagram"/>
-                </Handler>
-            </DiagramType>
-            <DiagramType base-diagram="Standard.ClassDiagram" stereotype="CamelDesigner#MetadataModelDiagram">
-                <Palette keepBasePalette="false">
-                    <ToolRef group="%group.MetaData.label" refid="MMSConcept"/>
-                    <ToolRef group="%group.MetaData.label" refid="MMSConceptInstance"/>
-                    <ToolRef group="%group.MetaData.label" refid="MMSProperty"/>
-                    <ToolRef group="%group.MetaData.label" refid="MMS_Property_Instance"/>
-                    <ToolRef group="%group.Common.label" refid="CREATE_NOTE"/>
-                    <ToolRef group="%group.Common.label" refid="CREATE_RELATED_DIAGRAM_LINK"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_RECTANGLE"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_ELLIPSE"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_LINE"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_TEXT"/>
-                </Palette>
-                <Handler class="StandardCustomizer">
-                    <HParameter name="stereotype" value="CamelDesigner#MetadataModelDiagram"/>
-                    <HParameter name="metaclass" value="Standard.ClassDiagram"/>
-                </Handler>
-            </DiagramType>
-            <DiagramType base-diagram="Standard.ClassDiagram" stereotype="CamelDesigner#MetricInstanceModelDiagram">
-                <Palette keepBasePalette="false">
-                    <ToolRef group="%group.Metric_Instance.label" refid="Metric_Instance"/>
-                    <ToolRef group="%group.Metric_Instance.label" refid="Metric_Object_Binding"/>
-                    <ToolRef group="%group.Common.label" refid="Feature"/>
-                    <ToolRef group="%group.Common.label" refid="CamelAttribute"/>
-                    <ToolRef group="%group.Common.label" refid="Measurable_Attribute"/>
-                    <ToolRef group="%group.Common.label" refid="CREATE_NOTE"/>
-                    <ToolRef group="%group.Common.label" refid="CREATE_RELATED_DIAGRAM_LINK"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_RECTANGLE"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_ELLIPSE"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_LINE"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_TEXT"/>
-                </Palette>
-                <Handler class="StandardCustomizer">
-                    <HParameter name="stereotype" value="CamelDesigner#MetricInstanceModelDiagram"/>
-                    <HParameter name="metaclass" value="Standard.ClassDiagram"/>
-                </Handler>
-            </DiagramType>
-            <DiagramType base-diagram="Standard.ClassDiagram" stereotype="CamelDesigner#MetricTypeModelDiagram">
-                <Palette keepBasePalette="false">
-                    <ToolRef group="%group.Metric.label" refid="Attribute_Context"/>
-                    <ToolRef group="%group.Metric.label" refid="Composite_Metric"/>
-                    <ToolRef group="%group.Metric.label" refid="Composite_Metric_Context"/>
-                    <ToolRef group="%group.Metric.label" refid="Function"/>
-                    <ToolRef group="%group.Metric.label" refid="Metric_Template"/>
-                    <ToolRef group="%group.Metric.label" refid="Metric_Variable"/>
-                    <ToolRef group="%group.Metric.label" refid="Object_Context"/>
-                    <ToolRef group="%group.Metric.label" refid="Raw_Metric"/>
-                    <ToolRef group="%group.Metric.label" refid="Raw_Metric_Context"/>
-                    <ToolRef group="%group.Metric.label" refid="Sensor"/>
-                    <ToolRef group="%group.Metric.label" refid="Window"/>
-                    <ToolRef group="%group.Common.label" refid="Feature"/>
-                    <ToolRef group="%group.Common.label" refid="CamelAttribute"/>
-                    <ToolRef group="%group.Common.label" refid="Measurable_Attribute"/>
-                    <ToolRef group="%group.Common.label" refid="CREATE_NOTE"/>
-                    <ToolRef group="%group.Common.label" refid="CREATE_RELATED_DIAGRAM_LINK"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_LINE"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_TEXT"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_ELLIPSE"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_RECTANGLE"/>
-                </Palette>
-                <Handler class="StandardCustomizer">
-                    <HParameter name="stereotype" value="CamelDesigner#MetricTypeModelDiagram"/>
-                    <HParameter name="metaclass" value="Standard.ClassDiagram"/>
-                </Handler>
-            </DiagramType>
-            <DiagramType base-diagram="Standard.ClassDiagram" stereotype="CamelDesigner#OrganisationModelDiagram">
-                <Palette keepBasePalette="false">
-                    <ToolRef group="%group.Organisation.label" refid="Cloud_Credentials"/>
-                    <ToolRef group="%group.Organisation.label" refid="Cloud_Provider"/>
-                    <ToolRef group="%group.Organisation.label" refid="Data_Resource_Filter"/>
-                    <ToolRef group="%group.Organisation.label" refid="Model_Resource_Filter"/>
-                    <ToolRef group="%group.Organisation.label" refid="Organisation"/>
-                    <ToolRef group="%group.Common.label" refid="Feature"/>
-                    <ToolRef group="%group.Common.label" refid="CamelAttribute"/>
-                    <ToolRef group="%group.Common.label" refid="Measurable_Attribute"/>
-                    <ToolRef group="%group.Common.label" refid="CREATE_NOTE"/>
-                    <ToolRef group="%group.Common.label" refid="CREATE_RELATED_DIAGRAM_LINK"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_RECTANGLE"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_ELLIPSE"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_TEXT"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_LINE"/>
-                </Palette>
-                <Handler class="StandardCustomizer">
-                    <HParameter name="stereotype" value="CamelDesigner#OrganisationModelDiagram"/>
-                    <HParameter name="metaclass" value="Standard.ClassDiagram"/>
-                </Handler>
-            </DiagramType>
-            <DiagramType base-diagram="Standard.ClassDiagram" stereotype="CamelDesigner#RequirementModelDiagram">
-                <Palette keepBasePalette="false">
-                    <ToolRef group="%group.Requirement.label" refid="ResourceRequirement"/>
-                    <ToolRef group="%group.Requirement.label" refid="HorizontalScaleRequirement"/>
-                    <ToolRef group="%group.Requirement.label" refid="ImageRequirement"/>
-                    <ToolRef group="%group.Requirement.label" refid="ServiceLevelObjective"/>
-                    <ToolRef group="%group.Requirement.label" refid="OptimisationRequirement"/>
-                    <ToolRef group="%group.Requirement.label" refid="OSRequirement"/>
-                    <ToolRef group="%group.Requirement.label" refid="ProviderRequirement"/>
-                    <ToolRef group="%group.Requirement.label" refid="LocationRequirement"/>
-                    <ToolRef group="%group.Requirement.label" refid="PaaS_Requirement"/>
-                    <ToolRef group="%group.Requirement.label" refid="Verticale_Scale_Requirement"/>
-                    <ToolRef group="%group.Common.label" refid="Feature"/>
-                    <ToolRef group="%group.Common.label" refid="CamelAttribute"/>
-                    <ToolRef group="%group.Common.label" refid="Measurable_Attribute"/>
-                    <ToolRef group="%group.Common.label" refid="CREATE_NOTE"/>
-                    <ToolRef group="%group.Common.label" refid="CREATE_RELATED_DIAGRAM_LINK"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_TEXT"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_RECTANGLE"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_ELLIPSE"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_LINE"/>
-                </Palette>
-                <Handler class="StandardCustomizer">
-                    <HParameter name="stereotype" value="CamelDesigner#RequirementModelDiagram"/>
-                    <HParameter name="metaclass" value="Standard.ClassDiagram"/>
-                </Handler>
-            </DiagramType>
-            <DiagramType base-diagram="Standard.ClassDiagram" stereotype="CamelDesigner#ScalabilityModelDiagram">
-                <Palette keepBasePalette="false">
-                    <ToolRef group="%group.Scalability.label" refid="ScalabilityModel"/>
-                    <ToolRef group="%group.Scalability.label" refid="Scalability_Rule"/>
-                    <ToolRef group="%group.Scalability.label" refid="Single_Event"/>
-                    <ToolRef group="%group.Scalability.label" refid="Timer"/>
-                    <ToolRef group="%group.Scalability.label" refid="Unary_Event_Pattern"/>
-                    <ToolRef group="%group.Scalability.label" refid="Vertical_Scaling_Action"/>
-                    <ToolRef group="%group.Scalability.label" refid="Binary_Event_Pattern"/>
-                    <ToolRef group="%group.Scalability.label" refid="Event"/>
-                    <ToolRef group="%group.Scalability.label" refid="Event_Instance"/>
-                    <ToolRef group="%group.Scalability.label" refid="Event_Pattern"/>
-                    <ToolRef group="%group.Scalability.label" refid="Functional_Event"/>
-                    <ToolRef group="%group.Scalability.label" refid="Functional_Event_Instance"/>
-                    <ToolRef group="%group.Scalability.label" refid="Horizontal_Scaling_Action"/>
-                    <ToolRef group="%group.Scalability.label" refid="Non_Functional_Event"/>
-                    <ToolRef group="%group.Scalability.label" refid="Non_Functional_Event_Instance"/>
-                    <ToolRef group="%group.Common.label" refid="Feature"/>
-                    <ToolRef group="%group.Common.label" refid="CamelAttribute"/>
-                    <ToolRef group="%group.Common.label" refid="Measurable_Attribute"/>
-                    <ToolRef group="%group.Common.label" refid="CREATE_NOTE"/>
-                    <ToolRef group="%group.Common.label" refid="CREATE_RELATED_DIAGRAM_LINK"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_TEXT"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_ELLIPSE"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_LINE"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_RECTANGLE"/>
-                </Palette>
-                <Handler class="StandardCustomizer">
-                    <HParameter name="stereotype" value="CamelDesigner#ScalabilityModelDiagram"/>
-                    <HParameter name="metaclass" value="Standard.ClassDiagram"/>
-                </Handler>
-            </DiagramType>
-            <DiagramType base-diagram="Standard.ClassDiagram" stereotype="CamelDesigner#SecurityModelDiagram">
-                <Palette keepBasePalette="false">
-                    <ToolRef group="%group.Security.label" refid="Security_Attribute"/>
-                    <ToolRef group="%group.Security.label" refid="Security_Control"/>
-                    <ToolRef group="%group.Security.label" refid="Security_Domain"/>
-                    <ToolRef group="%group.Security.label" refid="Security_Metric_Instance"/>
-                    <ToolRef group="%group.Security.label" refid="Certifiable"/>
-                    <ToolRef group="%group.Security.label" refid="Composite_Security_Metric"/>
-                    <ToolRef group="%group.Security.label" refid="Raw_Secutiry_Metric"/>
-                    <ToolRef group="%group.Security.label" refid="SecuritySLO"/>
-                    <ToolRef group="%group.Common.label" refid="Feature"/>
-                    <ToolRef group="%group.Common.label" refid="CamelAttribute"/>
-                    <ToolRef group="%group.Common.label" refid="Measurable_Attribute"/>
-                    <ToolRef group="%group.Common.label" refid="CREATE_NOTE"/>
-                    <ToolRef group="%group.Common.label" refid="CREATE_RELATED_DIAGRAM_LINK"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_LINE"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_ELLIPSE"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_TEXT"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_RECTANGLE"/>
-                </Palette>
-                <Handler class="StandardCustomizer">
-                    <HParameter name="stereotype" value="CamelDesigner#SecurityModelDiagram"/>
-                    <HParameter name="metaclass" value="Standard.ClassDiagram"/>
-                </Handler>
-            </DiagramType>
-            <DiagramType base-diagram="Standard.ClassDiagram" stereotype="CamelDesigner#TypeModelDiagram">
-                <Palette keepBasePalette="false">
-                    <ToolRef group="%group.Type.label" refid="TypeModel"/>
-                    <ToolRef group="%group.Common.label" refid="Feature"/>
-                    <ToolRef group="%group.Common.label" refid="CamelAttribute"/>
-                    <ToolRef group="%group.Common.label" refid="Measurable_Attribute"/>
-                    <ToolRef group="%group.Common.label" refid="CREATE_NOTE"/>
-                    <ToolRef group="%group.Common.label" refid="CREATE_RELATED_DIAGRAM_LINK"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_ELLIPSE"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_RECTANGLE"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_LINE"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_TEXT"/>
-                </Palette>
-                <Handler class="StandardCustomizer">
-                    <HParameter name="stereotype" value="CamelDesigner#TypeModelDiagram"/>
-                    <HParameter name="metaclass" value="Standard.ClassDiagram"/>
-                </Handler>
-            </DiagramType>
-            <DiagramType base-diagram="Standard.ClassDiagram" stereotype="CamelDesigner#UnitModelDiagram">
-                <Palette keepBasePalette="false">
-                    <ToolRef group="%group.Unit.label" refid="Unit_Dimension"/>
-                    <ToolRef group="%group.Common.label" refid="Feature"/>
-                    <ToolRef group="%group.Common.label" refid="CamelAttribute"/>
-                    <ToolRef group="%group.Common.label" refid="Measurable_Attribute"/>
-                    <ToolRef group="%group.Common.label" refid="CREATE_NOTE"/>
-                    <ToolRef group="%group.Common.label" refid="CREATE_RELATED_DIAGRAM_LINK"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_ELLIPSE"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_TEXT"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_RECTANGLE"/>
-                    <ToolRef group="%group.Free_Drawing.label" refid="CREATE_DRAWING_LINE"/>
-                </Palette>
-                <Handler class="StandardCustomizer">
-                    <HParameter name="stereotype" value="CamelDesigner#UnitModelDiagram"/>
-                    <HParameter name="metaclass" value="Standard.ClassDiagram"/>
-                </Handler>
-            </DiagramType>
-        </Diagrams>
         <Tools>
-            <Tool id="Action_Instance"
-                image="res/icon/gui/ActionInstance_24.png"
-                label="%tool.Action_Instance.label" tooltip="%tool.Action_Instance.tooltip">
+            <Tool id="Action_Instance" label="%tool.Action_Instance.label" tooltip="%tool.Action_Instance.tooltip" image="res/icon/gui/ActionInstance_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#ExecutionModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#ActionInstance"/>
@@ -3098,9 +1556,7 @@
                     <HParameter name="name" value="Action Instance"/>
                 </Handler>
             </Tool>
-            <Tool id="ApplicationMeasurement"
-                image="res/icon/gui/ApplicationMeasurement_24.png"
-                label="%tool.ApplicationMeasurement.label" tooltip="%tool.ApplicationMeasurement.tooltip">
+            <Tool id="ApplicationMeasurement" label="%tool.ApplicationMeasurement.label" tooltip="%tool.ApplicationMeasurement.tooltip" image="res/icon/gui/ApplicationMeasurement_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#ExecutionModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#ApplicationMeasurement"/>
@@ -3108,18 +1564,14 @@
                     <HParameter name="name" value="Application MeasurementElement"/>
                 </Handler>
             </Tool>
-            <Tool id="CamelAttribute"
-                image="res/icon/gui/Attribute_24.png"
-                label="%tool.CamelAttribute.label" tooltip="%tool.CamelAttribute.tooltip">
+            <Tool id="CamelAttribute" label="%tool.CamelAttribute.label" tooltip="%tool.CamelAttribute.tooltip" image="res/icon/gui/Attribute_24.png">
                 <Scope-source metaclass="Standard.ModelTree" stereotype=""/>
                 <Handler class="fr.softeam.cameldesigner.handlers.tools.core.CreateAttributeTool">
                     <HParameter name="metaclass" value="Standard.Class"/>
                     <HParameter name="name" value="Attribute"/>
                 </Handler>
             </Tool>
-            <Tool id="Attribute_Constraint"
-                image="res/icon/gui/AttributeConstraint_24.png"
-                label="%tool.Attribute_Constraint.label" tooltip="%tool.Attribute_Constraint.tooltip">
+            <Tool id="Attribute_Constraint" label="%tool.Attribute_Constraint.label" tooltip="%tool.Attribute_Constraint.tooltip" image="res/icon/gui/AttributeConstraint_24.png">
                 <Scope-source metaclass="Standard.Class" stereotype="CamelDesigner#AttributeContext"/>
                 <Handler class="AttachedBox">
                     <HParameter name="stereotype" value="CamelDesigner#AttributeConstraint"/>
@@ -3127,9 +1579,7 @@
                     <HParameter name="name" value=""/>
                 </Handler>
             </Tool>
-            <Tool id="Attribute_Context"
-                image="res/icon/gui/AttributeContext_24.png"
-                label="%tool.Attribute_Context.label" tooltip="%tool.Attribute_Context.tooltip">
+            <Tool id="Attribute_Context" label="%tool.Attribute_Context.label" tooltip="%tool.Attribute_Context.tooltip" image="res/icon/gui/AttributeContext_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#MetricTypeModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#AttributeContext"/>
@@ -3137,9 +1587,7 @@
                     <HParameter name="name" value="Attribute Context"/>
                 </Handler>
             </Tool>
-            <Tool id="Binary_Event_Pattern"
-                image="res/icon/gui/BinaryEventPattern_24.png"
-                label="%tool.Binary_Event_Pattern.label" tooltip="%tool.Binary_Event_Pattern.tooltip">
+            <Tool id="Binary_Event_Pattern" label="%tool.Binary_Event_Pattern.label" tooltip="%tool.Binary_Event_Pattern.tooltip" image="res/icon/gui/BinaryEventPattern_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#ScalabilityModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#BinaryEventPattern"/>
@@ -3147,9 +1595,7 @@
                     <HParameter name="name" value="Binary Event Pattern"/>
                 </Handler>
             </Tool>
-            <Tool id="Build_Configuration"
-                image="res/icon/gui/BuildConfiguration_24.png"
-                label="%tool.Build_Configuration.label" tooltip="%tool.Build_Configuration.tooltip">
+            <Tool id="Build_Configuration" label="%tool.Build_Configuration.label" tooltip="%tool.Build_Configuration.tooltip" image="res/icon/gui/BuildConfiguration_24.png">
                 <Scope-source metaclass="Standard.Component" stereotype="CamelDesigner#CamelComponent"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#BuildConfiguration"/>
@@ -3157,9 +1603,7 @@
                     <HParameter name="name" value="Build Configuration"/>
                 </Handler>
             </Tool>
-            <Tool id="Cause"
-                image="res/icon/gui/executionModelEmpty_24.png"
-                label="%tool.Cause.label" tooltip="%tool.Cause.tooltip">
+            <Tool id="Cause" label="%tool.Cause.label" tooltip="%tool.Cause.tooltip" image="res/icon/gui/executionModelEmpty_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#ExecutionModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#Cause"/>
@@ -3167,9 +1611,7 @@
                     <HParameter name="name" value="Cause"/>
                 </Handler>
             </Tool>
-            <Tool id="Certifiable"
-                image="res/icon/gui/Certifiable_24.png"
-                label="%tool.Certifiable.label" tooltip="%tool.Certifiable.tooltip">
+            <Tool id="Certifiable" label="%tool.Certifiable.label" tooltip="%tool.Certifiable.tooltip" image="res/icon/gui/Certifiable_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#SecurityModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#Certifiable"/>
@@ -3177,9 +1619,7 @@
                     <HParameter name="name" value="Certifiable"/>
                 </Handler>
             </Tool>
-            <Tool id="Cloud_Credentials"
-                image="res/icon/gui/organisationModelEmpty_24.png"
-                label="%tool.Cloud_Credentials.label" tooltip="%tool.Cloud_Credentials.tooltip">
+            <Tool id="Cloud_Credentials" label="%tool.Cloud_Credentials.label" tooltip="%tool.Cloud_Credentials.tooltip" image="res/icon/gui/organisationModelEmpty_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#OrganisationModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#CloudCredentials"/>
@@ -3187,9 +1627,7 @@
                     <HParameter name="name" value="Cloud Credentials"/>
                 </Handler>
             </Tool>
-            <Tool id="Cloud_Location"
-                image="res/icon/gui/locationCloud_24.png"
-                label="%tool.Cloud_Location.label" tooltip="%tool.Cloud_Location.tooltip">
+            <Tool id="Cloud_Location" label="%tool.Cloud_Location.label" tooltip="%tool.Cloud_Location.tooltip" image="res/icon/gui/locationCloud_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#LocationModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#CloudLocation"/>
@@ -3197,9 +1635,7 @@
                     <HParameter name="name" value="Cloud Location"/>
                 </Handler>
             </Tool>
-            <Tool id="Cloud_Provider"
-                image="res/icon/gui/organisationModelEmpty_24.png"
-                label="%tool.Cloud_Provider.label" tooltip="%tool.Cloud_Provider.tooltip">
+            <Tool id="Cloud_Provider" label="%tool.Cloud_Provider.label" tooltip="%tool.Cloud_Provider.tooltip" image="res/icon/gui/organisationModelEmpty_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#OrganisationModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#CloudProvider"/>
@@ -3207,9 +1643,7 @@
                     <HParameter name="name" value="Cloud Provider"/>
                 </Handler>
             </Tool>
-            <Tool id="Cluster_Configuration"
-                image="res/icon/gui/ClusterConfiguration_24.png"
-                label="%tool.Cluster_Configuration.label" tooltip="%tool.Cluster_Configuration.tooltip">
+            <Tool id="Cluster_Configuration" label="%tool.Cluster_Configuration.label" tooltip="%tool.Cluster_Configuration.tooltip" image="res/icon/gui/ClusterConfiguration_24.png">
                 <Scope-source metaclass="Standard.Component" stereotype="CamelDesigner#CamelComponent"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#ClusterConfiguration"/>
@@ -3217,9 +1651,7 @@
                     <HParameter name="name" value="Cluster Configuration"/>
                 </Handler>
             </Tool>
-            <Tool id="CommunicationMeasurement"
-                image="res/icon/gui/CommunicationMeasurement_24.png"
-                label="%tool.CommunicationMeasurement.label" tooltip="%tool.CommunicationMeasurement.tooltip">
+            <Tool id="CommunicationMeasurement" label="%tool.CommunicationMeasurement.label" tooltip="%tool.CommunicationMeasurement.tooltip" image="res/icon/gui/CommunicationMeasurement_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#ExecutionModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#CommunicationMeasurement"/>
@@ -3227,18 +1659,14 @@
                     <HParameter name="name" value="Communication Measurement"/>
                 </Handler>
             </Tool>
-            <Tool id="Composite_Constraint"
-                image="res/icon/gui/CompositeConstraint_24.png"
-                label="%tool.Composite_Constraint.label" tooltip="%tool.Composite_Constraint.tooltip">
+            <Tool id="Composite_Constraint" label="%tool.Composite_Constraint.label" tooltip="%tool.Composite_Constraint.tooltip" image="res/icon/gui/CompositeConstraint_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#ConstraintModel"/>
                 <Handler class="Box">
                     <HParameter name="metaclass" value="Standard.Class"/>
                     <HParameter name="name" value="Composite Constraint"/>
                 </Handler>
             </Tool>
-            <Tool id="Composite_Metric"
-                image="res/icon/gui/CompositeMetric_24.png"
-                label="%tool.Composite_Metric.label" tooltip="%tool.Composite_Metric.tooltip">
+            <Tool id="Composite_Metric" label="%tool.Composite_Metric.label" tooltip="%tool.Composite_Metric.tooltip" image="res/icon/gui/CompositeMetric_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#MetricTypeModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#CompositeMetric"/>
@@ -3246,9 +1674,7 @@
                     <HParameter name="name" value="Composite Metric"/>
                 </Handler>
             </Tool>
-            <Tool id="Composite_Metric_Context"
-                image="res/icon/gui/CompositeMetricContext_24.png"
-                label="%tool.Composite_Metric_Context.label" tooltip="%tool.Composite_Metric_Context.tooltip">
+            <Tool id="Composite_Metric_Context" label="%tool.Composite_Metric_Context.label" tooltip="%tool.Composite_Metric_Context.tooltip" image="res/icon/gui/CompositeMetricContext_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#MetricTypeModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#CompositeMetricContext"/>
@@ -3256,9 +1682,7 @@
                     <HParameter name="name" value="Composite Metric Context"/>
                 </Handler>
             </Tool>
-            <Tool id="Composite_Security_Metric"
-                image="res/icon/gui/CompositeSecurityMetric_24.png"
-                label="%tool.Composite_Security_Metric.label" tooltip="%tool.Composite_Security_Metric.tooltip">
+            <Tool id="Composite_Security_Metric" label="%tool.Composite_Security_Metric.label" tooltip="%tool.Composite_Security_Metric.tooltip" image="res/icon/gui/CompositeSecurityMetric_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#SecurityModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#CompositeSecurityMetric"/>
@@ -3266,9 +1690,7 @@
                     <HParameter name="name" value="Composite Security Metric"/>
                 </Handler>
             </Tool>
-            <Tool id="Composite_Unit"
-                image="res/icon/gui/unitModelEmpty_24.png"
-                label="%tool.Composite_Unit.label" tooltip="%tool.Composite_Unit.tooltip">
+            <Tool id="Composite_Unit" label="%tool.Composite_Unit.label" tooltip="%tool.Composite_Unit.tooltip" image="res/icon/gui/unitModelEmpty_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#UnitModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#CompositeUnit"/>
@@ -3276,9 +1698,7 @@
                     <HParameter name="name" value="Composite Unit"/>
                 </Handler>
             </Tool>
-            <Tool id="ConstraintModel"
-                image="res/icon/gui/constraintModel_24.png"
-                label="%tool.ConstraintModel.label" tooltip="%tool.ConstraintModel.tooltip">
+            <Tool id="ConstraintModel" label="%tool.ConstraintModel.label" tooltip="%tool.ConstraintModel.tooltip" image="res/icon/gui/constraintModel_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#CamelModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#ConstraintModel"/>
@@ -3286,8 +1706,7 @@
                     <HParameter name="name" value="Constraint Model"/>
                 </Handler>
             </Tool>
-            <Tool id="Container" image="res/icon/gui/Container_24.png"
-                label="%tool.Container.label" tooltip="%tool.Container.tooltip">
+            <Tool id="Container" label="%tool.Container.label" tooltip="%tool.Container.tooltip" image="res/icon/gui/Container_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#DeploymentTypeModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#Container"/>
@@ -3295,9 +1714,7 @@
                     <HParameter name="name" value="Container"/>
                 </Handler>
             </Tool>
-            <Tool id="ContainerMeasurement"
-                image="res/icon/gui/ContainerMeasurement_24.png"
-                label="%tool.ContainerMeasurement.label" tooltip="%tool.ContainerMeasurement.tooltip">
+            <Tool id="ContainerMeasurement" label="%tool.ContainerMeasurement.label" tooltip="%tool.ContainerMeasurement.tooltip" image="res/icon/gui/ContainerMeasurement_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#ExecutionModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#ContainerMeasurement"/>
@@ -3305,9 +1722,7 @@
                     <HParameter name="name" value="Container Measurement"/>
                 </Handler>
             </Tool>
-            <Tool id="Container_Instance"
-                image="res/icon/gui/ContainerInstance_24.png"
-                label="%tool.Container_Instance.label" tooltip="%tool.Container_Instance.tooltip">
+            <Tool id="Container_Instance" label="%tool.Container_Instance.label" tooltip="%tool.Container_Instance.tooltip" image="res/icon/gui/ContainerInstance_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#DeploymentInstanceModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#ContainerInstance"/>
@@ -3315,8 +1730,7 @@
                     <HParameter name="name" value="Container Instance"/>
                 </Handler>
             </Tool>
-            <Tool id="Data" image="res/icon/gui/dataModelEmpty_24.png"
-                label="%tool.Data.label" tooltip="%tool.Data.tooltip">
+            <Tool id="Data" label="%tool.Data.label" tooltip="%tool.Data.tooltip" image="res/icon/gui/dataModelEmpty_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#DataTypeModel"/>
                 <Scope-source metaclass="Standard.Class" stereotype="CamelDesigner#Data"/>
                 <Handler class="Box">
@@ -3325,9 +1739,7 @@
                     <HParameter name="name" value="Data"/>
                 </Handler>
             </Tool>
-            <Tool id="DataInstance"
-                image="res/icon/gui/DataInstanceEmpty_24.png"
-                label="%tool.DataInstance.label" tooltip="%tool.DataInstance.tooltip">
+            <Tool id="DataInstance" label="%tool.DataInstance.label" tooltip="%tool.DataInstance.tooltip" image="res/icon/gui/DataInstanceEmpty_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#DataInstanceModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#DataInstance"/>
@@ -3335,9 +1747,7 @@
                     <HParameter name="name" value="Data Instance"/>
                 </Handler>
             </Tool>
-            <Tool id="DataInstanceModel"
-                image="res/icon/gui/DataInstanceModel_24.png"
-                label="%tool.DataInstanceModel.label" tooltip="%tool.DataInstanceModel.tooltip">
+            <Tool id="DataInstanceModel" label="%tool.DataInstanceModel.label" tooltip="%tool.DataInstanceModel.tooltip" image="res/icon/gui/DataInstanceModel_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#CamelModel"/>
                 <Handler class="fr.softeam.cameldesigner.handlers.tools.core.CreateDataInstanceModelTool">
                     <HParameter name="stereotype" value="CamelDesigner#DataInstanceModel"/>
@@ -3345,9 +1755,7 @@
                     <HParameter name="name" value="Data Instance Model"/>
                 </Handler>
             </Tool>
-            <Tool id="DataMeasurement"
-                image="res/icon/gui/DataMeasurement_24.png"
-                label="%tool.DataMeasurement.label" tooltip="%tool.DataMeasurement.tooltip">
+            <Tool id="DataMeasurement" label="%tool.DataMeasurement.label" tooltip="%tool.DataMeasurement.tooltip" image="res/icon/gui/DataMeasurement_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#ExecutionModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#DataMeasurement"/>
@@ -3355,9 +1763,7 @@
                     <HParameter name="name" value="Data Measurement"/>
                 </Handler>
             </Tool>
-            <Tool id="DataTypeModel"
-                image="res/icon/gui/dataModel_24.png"
-                label="%tool.DataTypeModel.label" tooltip="%tool.DataTypeModel.tooltip">
+            <Tool id="DataTypeModel" label="%tool.DataTypeModel.label" tooltip="%tool.DataTypeModel.tooltip" image="res/icon/gui/dataModel_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#CamelModel"/>
                 <Handler class="fr.softeam.cameldesigner.handlers.tools.core.CreateDataTypeModelTool">
                     <HParameter name="stereotype" value="CamelDesigner#DataTypeModel"/>
@@ -3365,9 +1771,7 @@
                     <HParameter name="name" value="DataTypeModel"/>
                 </Handler>
             </Tool>
-            <Tool id="Data_Resource_Filter"
-                image="res/icon/gui/organisationModelEmpty_24.png"
-                label="%tool.Data_Resource_Filter.label" tooltip="%tool.Data_Resource_Filter.tooltip">
+            <Tool id="Data_Resource_Filter" label="%tool.Data_Resource_Filter.label" tooltip="%tool.Data_Resource_Filter.tooltip" image="res/icon/gui/organisationModelEmpty_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#OrganisationModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#DataResourceFilter"/>
@@ -3375,9 +1779,7 @@
                     <HParameter name="name" value="Data Resource Filter"/>
                 </Handler>
             </Tool>
-            <Tool id="Data_Source"
-                image="res/icon/gui/dataModelEmpty_24.png"
-                label="%tool.Data_Source.label" tooltip="%tool.Data_Source.tooltip">
+            <Tool id="Data_Source" label="%tool.Data_Source.label" tooltip="%tool.Data_Source.tooltip" image="res/icon/gui/dataModelEmpty_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#DataTypeModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#DataSource"/>
@@ -3385,9 +1787,7 @@
                     <HParameter name="name" value="Data Source"/>
                 </Handler>
             </Tool>
-            <Tool id="Data_Source_Instance"
-                image="res/icon/gui/DataInstanceModel_24.png"
-                label="%tool.Data_Source_Instance.label" tooltip="%tool.Data_Source_Instance.tooltip">
+            <Tool id="Data_Source_Instance" label="%tool.Data_Source_Instance.label" tooltip="%tool.Data_Source_Instance.tooltip" image="res/icon/gui/DataInstanceModel_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#DataInstanceModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#DataSourceInstance"/>
@@ -3395,9 +1795,7 @@
                     <HParameter name="name" value="Data Source Instance"/>
                 </Handler>
             </Tool>
-            <Tool id="Deployment_Instance_Model"
-                image="res/icon/gui/DeploymentInstanceModel_24.png"
-                label="%tool.Deployment_Instance_Model.label" tooltip="%tool.Deployment_Instance_Model.tooltip">
+            <Tool id="Deployment_Instance_Model" label="%tool.Deployment_Instance_Model.label" tooltip="%tool.Deployment_Instance_Model.tooltip" image="res/icon/gui/DeploymentInstanceModel_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#CamelModel"/>
                 <Handler class="fr.softeam.cameldesigner.handlers.tools.core.CreateDeploymentInstanceModelTool">
                     <HParameter name="stereotype" value="CamelDesigner#DeploymentInstanceModel"/>
@@ -3405,9 +1803,7 @@
                     <HParameter name="name" value="Deployment Instance Model"/>
                 </Handler>
             </Tool>
-            <Tool id="Deployment_Type_Model"
-                image="res/icon/gui/DeploymentTypeModel_24.png"
-                label="%tool.Deployment_Type_Model.label" tooltip="%tool.Deployment_Type_Model.tooltip">
+            <Tool id="Deployment_Type_Model" label="%tool.Deployment_Type_Model.label" tooltip="%tool.Deployment_Type_Model.tooltip" image="res/icon/gui/DeploymentTypeModel_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#CamelModel"/>
                 <Handler class="fr.softeam.cameldesigner.handlers.tools.core.CreateDeploymentTypeModelTool">
                     <HParameter name="stereotype" value="CamelDesigner#DeploymentTypeModel"/>
@@ -3415,9 +1811,7 @@
                     <HParameter name="name" value="Deployment Type Model"/>
                 </Handler>
             </Tool>
-            <Tool id="Dimensioned_Unit"
-                image="res/icon/gui/unitModelEmpty_24.png"
-                label="%tool.Dimensioned_Unit.label" tooltip="%tool.Dimensioned_Unit.tooltip">
+            <Tool id="Dimensioned_Unit" label="%tool.Dimensioned_Unit.label" tooltip="%tool.Dimensioned_Unit.tooltip" image="res/icon/gui/unitModelEmpty_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#UnitModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#DimensionedUnit"/>
@@ -3425,9 +1819,7 @@
                     <HParameter name="name" value="Dimensioned Unit"/>
                 </Handler>
             </Tool>
-            <Tool id="Dimensionless"
-                image="res/icon/gui/unitModelEmpty_24.png"
-                label="%tool.Dimensionless.label" tooltip="%tool.Dimensionless.tooltip">
+            <Tool id="Dimensionless" label="%tool.Dimensionless.label" tooltip="%tool.Dimensionless.tooltip" image="res/icon/gui/unitModelEmpty_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#UnitModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#Dimensionless"/>
@@ -3435,9 +1827,7 @@
                     <HParameter name="name" value="Dimension less"/>
                 </Handler>
             </Tool>
-            <Tool id="Entity"
-                image="res/icon/gui/organisationModelEmpty_24.png"
-                label="%tool.Entity.label" tooltip="%tool.Entity.tooltip">
+            <Tool id="Entity" label="%tool.Entity.label" tooltip="%tool.Entity.tooltip" image="res/icon/gui/organisationModelEmpty_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#OrganisationModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#Entity"/>
@@ -3445,8 +1835,7 @@
                     <HParameter name="name" value="Entity"/>
                 </Handler>
             </Tool>
-            <Tool id="Event" image="res/icon/gui/Event_24.png"
-                label="%tool.Event.label" tooltip="%tool.Event.tooltip">
+            <Tool id="Event" label="%tool.Event.label" tooltip="%tool.Event.tooltip" image="res/icon/gui/Event_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#ScalabilityModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#Event"/>
@@ -3454,9 +1843,7 @@
                     <HParameter name="name" value="Event"/>
                 </Handler>
             </Tool>
-            <Tool id="Event_Configuration"
-                image="res/icon/gui/executionModel_24.png"
-                label="%tool.Event_Configuration.label" tooltip="%tool.Event_Configuration.tooltip">
+            <Tool id="Event_Configuration" label="%tool.Event_Configuration.label" tooltip="%tool.Event_Configuration.tooltip" image="res/icon/gui/executionModel_24.png">
                 <Scope-source metaclass="Standard.Component" stereotype="CamelDesigner#CamelComponent"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#EventConfiguration"/>
@@ -3464,9 +1851,7 @@
                     <HParameter name="name" value="Event Configuration"/>
                 </Handler>
             </Tool>
-            <Tool id="Event_Instance"
-                image="res/icon/gui/EventInstance_24.png"
-                label="%tool.Event_Instance.label" tooltip="%tool.Event_Instance.tooltip">
+            <Tool id="Event_Instance" label="%tool.Event_Instance.label" tooltip="%tool.Event_Instance.tooltip" image="res/icon/gui/EventInstance_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#ScalabilityModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#EventInstance"/>
@@ -3474,9 +1859,7 @@
                     <HParameter name="name" value="Event Instance"/>
                 </Handler>
             </Tool>
-            <Tool id="Event_Pattern"
-                image="res/icon/gui/EventPattern_24.png"
-                label="%tool.Event_Pattern.label" tooltip="%tool.Event_Pattern.tooltip">
+            <Tool id="Event_Pattern" label="%tool.Event_Pattern.label" tooltip="%tool.Event_Pattern.tooltip" image="res/icon/gui/EventPattern_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#ScalabilityModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#EventPattern"/>
@@ -3484,9 +1867,7 @@
                     <HParameter name="name" value="Event Pattern"/>
                 </Handler>
             </Tool>
-            <Tool id="ExecutionModel"
-                image="res/icon/gui/executionModel_24.png"
-                label="%tool.ExecutionModel.label" tooltip="%tool.ExecutionModel.tooltip">
+            <Tool id="ExecutionModel" label="%tool.ExecutionModel.label" tooltip="%tool.ExecutionModel.tooltip" image="res/icon/gui/executionModel_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#CamelModel"/>
                 <Handler class="fr.softeam.cameldesigner.handlers.tools.core.CreateExecutionModelTool">
                     <HParameter name="stereotype" value="CamelDesigner#ExecutionModel"/>
@@ -3494,9 +1875,7 @@
                     <HParameter name="name" value="ExecutionModel"/>
                 </Handler>
             </Tool>
-            <Tool id="External_Identifier"
-                image="res/icon/gui/organisationModelEmpty_24.png"
-                label="%tool.External_Identifier.label" tooltip="%tool.External_Identifier.tooltip">
+            <Tool id="External_Identifier" label="%tool.External_Identifier.label" tooltip="%tool.External_Identifier.tooltip" image="res/icon/gui/organisationModelEmpty_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#OrganisationModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#ExternalIdentifier"/>
@@ -3504,16 +1883,14 @@
                     <HParameter name="name" value="External Identifier"/>
                 </Handler>
             </Tool>
-            <Tool id="Feature" image="res/icon/gui/Feature_24.png"
-                label="%tool.Feature.label" tooltip="%tool.Feature.tooltip">
+            <Tool id="Feature" label="%tool.Feature.label" tooltip="%tool.Feature.tooltip" image="res/icon/gui/Feature_24.png">
                 <Scope-source metaclass="Standard.ModelTree" stereotype=""/>
                 <Handler class="fr.softeam.cameldesigner.handlers.tools.core.CreateFeatureTool">
                     <HParameter name="metaclass" value="Standard.Class"/>
                     <HParameter name="name" value="Feature"/>
                 </Handler>
             </Tool>
-            <Tool id="Function" image="res/icon/gui/Function_24.png"
-                label="%tool.Function.label" tooltip="%tool.Function.tooltip">
+            <Tool id="Function" label="%tool.Function.label" tooltip="%tool.Function.tooltip" image="res/icon/gui/Function_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#MetricTypeModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#Function"/>
@@ -3521,9 +1898,7 @@
                     <HParameter name="name" value="Function"/>
                 </Handler>
             </Tool>
-            <Tool id="Functional_Event"
-                image="res/icon/gui/FunctionnalEvent_24.png"
-                label="%tool.Functional_Event.label" tooltip="%tool.Functional_Event.tooltip">
+            <Tool id="Functional_Event" label="%tool.Functional_Event.label" tooltip="%tool.Functional_Event.tooltip" image="res/icon/gui/FunctionnalEvent_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#ScalabilityModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#FunctionalEvent"/>
@@ -3531,9 +1906,7 @@
                     <HParameter name="name" value="Functional Event"/>
                 </Handler>
             </Tool>
-            <Tool id="Functional_Event_Instance"
-                image="res/icon/gui/FunctionnalEventInstance_24.png"
-                label="%tool.Functional_Event_Instance.label" tooltip="%tool.Functional_Event_Instance.tooltip">
+            <Tool id="Functional_Event_Instance" label="%tool.Functional_Event_Instance.label" tooltip="%tool.Functional_Event_Instance.tooltip" image="res/icon/gui/FunctionnalEventInstance_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#ScalabilityModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#FunctionalEventInstance"/>
@@ -3541,9 +1914,7 @@
                     <HParameter name="name" value="Functional Event Instance"/>
                 </Handler>
             </Tool>
-            <Tool id="Geographical_Region"
-                image="res/icon/gui/locationRegion_24.png"
-                label="%tool.Geographical_Region.label" tooltip="%tool.Geographical_Region.tooltip">
+            <Tool id="Geographical_Region" label="%tool.Geographical_Region.label" tooltip="%tool.Geographical_Region.tooltip" image="res/icon/gui/locationRegion_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#LocationModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#GeographicalRegion"/>
@@ -3551,9 +1922,7 @@
                     <HParameter name="name" value="Region"/>
                 </Handler>
             </Tool>
-            <Tool id="HistoryInfo"
-                image="res/icon/gui/HistoryInfo_24.png"
-                label="%tool.HistoryInfo.label" tooltip="%tool.HistoryInfo.tooltip">
+            <Tool id="HistoryInfo" label="%tool.HistoryInfo.label" tooltip="%tool.HistoryInfo.tooltip" image="res/icon/gui/HistoryInfo_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#ExecutionModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#HistoryInfo"/>
@@ -3561,9 +1930,7 @@
                     <HParameter name="name" value="History Info"/>
                 </Handler>
             </Tool>
-            <Tool id="HistoryRecord"
-                image="res/icon/gui/HistoryRecord_24.png"
-                label="%tool.HistoryRecord.label" tooltip="%tool.HistoryRecord.tooltip">
+            <Tool id="HistoryRecord" label="%tool.HistoryRecord.label" tooltip="%tool.HistoryRecord.tooltip" image="res/icon/gui/HistoryRecord_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#ExecutionModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#HistoryRecord"/>
@@ -3571,9 +1938,7 @@
                     <HParameter name="name" value="History Record"/>
                 </Handler>
             </Tool>
-            <Tool id="HorizontalScaleRequirement"
-                image="res/icon/gui/horizontalScaleRequirement_24.png"
-                label="%tool.HorizontalScaleRequirement.label" tooltip="%tool.HorizontalScaleRequirement.tooltip">
+            <Tool id="HorizontalScaleRequirement" label="%tool.HorizontalScaleRequirement.label" tooltip="%tool.HorizontalScaleRequirement.tooltip" image="res/icon/gui/horizontalScaleRequirement_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#RequirementModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#HorizontalScaleRequirement"/>
@@ -3581,9 +1946,7 @@
                     <HParameter name="name" value="Horizontal Scale Requirement"/>
                 </Handler>
             </Tool>
-            <Tool id="Horizontal_Scaling_Action"
-                image="res/icon/gui/HorizontalScalingAction_24.png"
-                label="%tool.Horizontal_Scaling_Action.label" tooltip="%tool.Horizontal_Scaling_Action.tooltip">
+            <Tool id="Horizontal_Scaling_Action" label="%tool.Horizontal_Scaling_Action.label" tooltip="%tool.Horizontal_Scaling_Action.tooltip" image="res/icon/gui/HorizontalScalingAction_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#ScalabilityModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#HorizontalScalingAction"/>
@@ -3591,9 +1954,7 @@
                     <HParameter name="name" value="Horizonta Scaling Action"/>
                 </Handler>
             </Tool>
-            <Tool id="IfThen_Constraint"
-                image="res/icon/gui/IfThenConstraint_24.png"
-                label="%tool.IfThen_Constraint.label" tooltip="%tool.IfThen_Constraint.tooltip">
+            <Tool id="IfThen_Constraint" label="%tool.IfThen_Constraint.label" tooltip="%tool.IfThen_Constraint.tooltip" image="res/icon/gui/IfThenConstraint_24.png">
                 <Scope-source metaclass="Infrastructure.ModelElement" stereotype="CamelDesigner#CamelElement"/>
                 <Handler class="AttachedBox">
                     <HParameter name="stereotype" value="CamelDesigner#IfThenConstraint"/>
@@ -3601,9 +1962,7 @@
                     <HParameter name="name" value=""/>
                 </Handler>
             </Tool>
-            <Tool id="ImageRequirement"
-                image="res/icon/gui/imageRequirement_24.png"
-                label="%tool.ImageRequirement.label" tooltip="%tool.ImageRequirement.tooltip">
+            <Tool id="ImageRequirement" label="%tool.ImageRequirement.label" tooltip="%tool.ImageRequirement.tooltip" image="res/icon/gui/imageRequirement_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#RequirementModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#ImageRequirement"/>
@@ -3611,9 +1970,7 @@
                     <HParameter name="name" value="Image Requirement"/>
                 </Handler>
             </Tool>
-            <Tool id="LocationModel"
-                image="res/icon/gui/locationModel_24.png"
-                label="%tool.LocationModel.label" tooltip="%tool.LocationModel.tooltip">
+            <Tool id="LocationModel" label="%tool.LocationModel.label" tooltip="%tool.LocationModel.tooltip" image="res/icon/gui/locationModel_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#CamelModel"/>
                 <Handler class="fr.softeam.cameldesigner.handlers.tools.core.CreateLocationModelTool">
                     <HParameter name="stereotype" value="CamelDesigner#LocationModel"/>
@@ -3621,9 +1978,7 @@
                     <HParameter name="name" value="LocationModel"/>
                 </Handler>
             </Tool>
-            <Tool id="LocationRequirement"
-                image="res/icon/gui/locationRequirement_24.png"
-                label="%tool.LocationRequirement.label" tooltip="%tool.LocationRequirement.tooltip">
+            <Tool id="LocationRequirement" label="%tool.LocationRequirement.label" tooltip="%tool.LocationRequirement.tooltip" image="res/icon/gui/locationRequirement_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#RequirementModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#LocationRequirement"/>
@@ -3631,9 +1986,7 @@
                     <HParameter name="name" value="Location Requirement"/>
                 </Handler>
             </Tool>
-            <Tool id="Location_Coupling"
-                image="res/icon/gui/LocationCoupling_24.png"
-                label="%tool.Location_Coupling.label" tooltip="%tool.Location_Coupling.tooltip">
+            <Tool id="Location_Coupling" label="%tool.Location_Coupling.label" tooltip="%tool.Location_Coupling.tooltip" image="res/icon/gui/LocationCoupling_24.png">
                 <Scope-source metaclass="Standard.Component" stereotype="CamelDesigner#SoftwareComponent"/>
                 <Scope-target metaclass="Standard.Component" stereotype="CamelDesigner#SoftwareComponent"/>
                 <Handler class="Link">
@@ -3642,9 +1995,7 @@
                     <HParameter name="name" value="location coupling"/>
                 </Handler>
             </Tool>
-            <Tool id="Logical_Constraint"
-                image="res/icon/gui/LogicalConstraint_24.png"
-                label="%tool.Logical_Constraint.label" tooltip="%tool.Logical_Constraint.tooltip">
+            <Tool id="Logical_Constraint" label="%tool.Logical_Constraint.label" tooltip="%tool.Logical_Constraint.tooltip" image="res/icon/gui/LogicalConstraint_24.png">
                 <Scope-source metaclass="Infrastructure.ModelElement" stereotype="CamelDesigner#CamelElement"/>
                 <Handler class="AttachedBox">
                     <HParameter name="stereotype" value="CamelDesigner#LogicalConstraint"/>
@@ -3652,9 +2003,7 @@
                     <HParameter name="name" value=""/>
                 </Handler>
             </Tool>
-            <Tool id="MMSConcept"
-                image="res/icon/gui/metadataConcept_24.png"
-                label="%tool.MMSConcept.label" tooltip="%tool.MMSConcept.tooltip">
+            <Tool id="MMSConcept" label="%tool.MMSConcept.label" tooltip="%tool.MMSConcept.tooltip" image="res/icon/gui/metadataConcept_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#MetaDataModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#MmsConcept"/>
@@ -3662,9 +2011,7 @@
                     <HParameter name="name" value="Concept"/>
                 </Handler>
             </Tool>
-            <Tool id="MMSConceptInstance"
-                image="res/icon/gui/metadataConceptInstance_24.png"
-                label="%tool.MMSConceptInstance.label" tooltip="%tool.MMSConceptInstance.tooltip">
+            <Tool id="MMSConceptInstance" label="%tool.MMSConceptInstance.label" tooltip="%tool.MMSConceptInstance.tooltip" image="res/icon/gui/metadataConceptInstance_24.png">
                 <Scope-source metaclass="Standard.Class" stereotype="CamelDesigner#MmsConcept"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#MmsConceptInstance"/>
@@ -3672,9 +2019,7 @@
                     <HParameter name="name" value="ConceptInstance"/>
                 </Handler>
             </Tool>
-            <Tool id="MMSProperty"
-                image="res/icon/gui/metadataProperty_24.png"
-                label="%tool.MMSProperty.label" tooltip="%tool.MMSProperty.tooltip">
+            <Tool id="MMSProperty" label="%tool.MMSProperty.label" tooltip="%tool.MMSProperty.tooltip" image="res/icon/gui/metadataProperty_24.png">
                 <Scope-source metaclass="Standard.Class" stereotype="CamelDesigner#MmsConcept"/>
                 <Handler class="fr.softeam.cameldesigner.handlers.tools.metadata.MMSProperty">
                     <HParameter name="stereotype" value="CamelDesigner#MmsProperty"/>
@@ -3682,9 +2027,7 @@
                     <HParameter name="name" value="Property"/>
                 </Handler>
             </Tool>
-            <Tool id="MMS_Property_Instance"
-                image="res/icon/gui/metadataPropertyInstance_48.ICON.png"
-                label="%tool.MMS_Property_Instance.label" tooltip="%tool.MMS_Property_Instance.tooltip">
+            <Tool id="MMS_Property_Instance" label="%tool.MMS_Property_Instance.label" tooltip="%tool.MMS_Property_Instance.tooltip" image="res/icon/gui/metadataPropertyInstance_48.ICON.png">
                 <Scope-source metaclass="Standard.Instance" stereotype="CamelDesigner#MmsConceptInstance"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#MmsPropertyInstance"/>
@@ -3692,18 +2035,14 @@
                     <HParameter name="name" value="property instance"/>
                 </Handler>
             </Tool>
-            <Tool id="Measurable_Attribute"
-                image="res/icon/gui/MeasurableAttribute_24.png"
-                label="%tool.Measurable_Attribute.label" tooltip="%tool.Measurable_Attribute.tooltip">
+            <Tool id="Measurable_Attribute" label="%tool.Measurable_Attribute.label" tooltip="%tool.Measurable_Attribute.tooltip" image="res/icon/gui/MeasurableAttribute_24.png">
                 <Scope-source metaclass="Standard.ModelTree" stereotype=""/>
                 <Handler class="fr.softeam.cameldesigner.handlers.tools.core.CreateMeasurableAttributeTool">
                     <HParameter name="metaclass" value="Standard.Class"/>
                     <HParameter name="name" value="Element"/>
                 </Handler>
             </Tool>
-            <Tool id="Measurement"
-                image="res/icon/gui/Measurement_24.png"
-                label="%tool.Measurement.label" tooltip="%tool.Measurement.tooltip">
+            <Tool id="Measurement" label="%tool.Measurement.label" tooltip="%tool.Measurement.tooltip" image="res/icon/gui/Measurement_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#ExecutionModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#Measurement"/>
@@ -3711,9 +2050,7 @@
                     <HParameter name="name" value="Measurement"/>
                 </Handler>
             </Tool>
-            <Tool id="MetaDataModel"
-                image="res/icon/gui/metadataModel_24.png"
-                label="%tool.MetaDataModel.label" tooltip="%tool.MetaDataModel.tooltip">
+            <Tool id="MetaDataModel" label="%tool.MetaDataModel.label" tooltip="%tool.MetaDataModel.tooltip" image="res/icon/gui/metadataModel_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#CamelModel"/>
                 <Handler class="fr.softeam.cameldesigner.handlers.tools.core.CreateMetaDataModelTool">
                     <HParameter name="stereotype" value="CamelDesigner#MetaDataModel"/>
@@ -3721,9 +2058,7 @@
                     <HParameter name="name" value="MetaDataModel"/>
                 </Handler>
             </Tool>
-            <Tool id="MetricInstanceModel"
-                image="res/icon/gui/MetricInstanceModel_24.png"
-                label="%tool.MetricInstanceModel.label" tooltip="%tool.MetricInstanceModel.tooltip">
+            <Tool id="MetricInstanceModel" label="%tool.MetricInstanceModel.label" tooltip="%tool.MetricInstanceModel.tooltip" image="res/icon/gui/MetricInstanceModel_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#CamelModel"/>
                 <Handler class="fr.softeam.cameldesigner.handlers.tools.core.CreateMetricInstanceModelTool">
                     <HParameter name="stereotype" value="CamelDesigner#MetricInstanceModel"/>
@@ -3731,9 +2066,7 @@
                     <HParameter name="name" value="MetricInstanceModel"/>
                 </Handler>
             </Tool>
-            <Tool id="Metric_Constraint"
-                image="res/icon/gui/MetricConstraint_24.png"
-                label="%tool.Metric_Constraint.label" tooltip="%tool.Metric_Constraint.tooltip">
+            <Tool id="Metric_Constraint" label="%tool.Metric_Constraint.label" tooltip="%tool.Metric_Constraint.tooltip" image="res/icon/gui/MetricConstraint_24.png">
                 <Scope-source metaclass="Standard.Class" stereotype="CamelDesigner#MetricContext"/>
                 <Handler class="AttachedBox">
                     <HParameter name="stereotype" value="CamelDesigner#MetricConstraint"/>
@@ -3741,9 +2074,7 @@
                     <HParameter name="name" value=""/>
                 </Handler>
             </Tool>
-            <Tool id="Metric_Instance"
-                image="res/icon/gui/MetricInstance_24.png"
-                label="%tool.Metric_Instance.label" tooltip="%tool.Metric_Instance.tooltip">
+            <Tool id="Metric_Instance" label="%tool.Metric_Instance.label" tooltip="%tool.Metric_Instance.tooltip" image="res/icon/gui/MetricInstance_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#MetricInstanceModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#MetricInstance"/>
@@ -3751,9 +2082,7 @@
                     <HParameter name="name" value="Metric Instance"/>
                 </Handler>
             </Tool>
-            <Tool id="Metric_Object_Binding"
-                image="res/icon/gui/MetricObjectBinding_24.png"
-                label="%tool.Metric_Object_Binding.label" tooltip="%tool.Metric_Object_Binding.tooltip">
+            <Tool id="Metric_Object_Binding" label="%tool.Metric_Object_Binding.label" tooltip="%tool.Metric_Object_Binding.tooltip" image="res/icon/gui/MetricObjectBinding_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#MetricTypeModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#MetricObjectBinding"/>
@@ -3761,9 +2090,7 @@
                     <HParameter name="name" value="Metric Object Binding"/>
                 </Handler>
             </Tool>
-            <Tool id="Metric_Template"
-                image="res/icon/gui/MetricTemplate_24.png"
-                label="%tool.Metric_Template.label" tooltip="%tool.Metric_Template.tooltip">
+            <Tool id="Metric_Template" label="%tool.Metric_Template.label" tooltip="%tool.Metric_Template.tooltip" image="res/icon/gui/MetricTemplate_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#MetricTypeModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#MetricTemplate"/>
@@ -3771,9 +2098,7 @@
                     <HParameter name="name" value="Metric Template"/>
                 </Handler>
             </Tool>
-            <Tool id="Metric_Type_Model"
-                image="res/icon/gui/metricModel_24.png"
-                label="%tool.Metric_Type_Model.label" tooltip="%tool.Metric_Type_Model.tooltip">
+            <Tool id="Metric_Type_Model" label="%tool.Metric_Type_Model.label" tooltip="%tool.Metric_Type_Model.tooltip" image="res/icon/gui/metricModel_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#CamelModel"/>
                 <Handler class="fr.softeam.cameldesigner.handlers.tools.core.CreateMetricTypeModelTool">
                     <HParameter name="stereotype" value="CamelDesigner#MetricTypeModel"/>
@@ -3781,9 +2106,7 @@
                     <HParameter name="name" value="Metric Type Model"/>
                 </Handler>
             </Tool>
-            <Tool id="Metric_Variable"
-                image="res/icon/gui/MetricVariable_24.png"
-                label="%tool.Metric_Variable.label" tooltip="%tool.Metric_Variable.tooltip">
+            <Tool id="Metric_Variable" label="%tool.Metric_Variable.label" tooltip="%tool.Metric_Variable.tooltip" image="res/icon/gui/MetricVariable_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#MetricTypeModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#MetricVariable"/>
@@ -3791,9 +2114,7 @@
                     <HParameter name="name" value="Metric Variable"/>
                 </Handler>
             </Tool>
-            <Tool id="Metric_Variable_Constraint"
-                image="res/icon/gui/MetricVariableConstraint_24.png"
-                label="%tool.Metric_Variable_Constraint.label" tooltip="%tool.Metric_Variable_Constraint.tooltip">
+            <Tool id="Metric_Variable_Constraint" label="%tool.Metric_Variable_Constraint.label" tooltip="%tool.Metric_Variable_Constraint.tooltip" image="res/icon/gui/MetricVariableConstraint_24.png">
                 <Scope-source metaclass="Standard.Class" stereotype="CamelDesigner#MetricVariable"/>
                 <Handler class="AttachedBox">
                     <HParameter name="stereotype" value="CamelDesigner#MetricVariableConstraint"/>
@@ -3801,9 +2122,7 @@
                     <HParameter name="name" value=""/>
                 </Handler>
             </Tool>
-            <Tool id="Model_Resource_Filter"
-                image="res/icon/gui/organisationModelEmpty_24.png"
-                label="%tool.Model_Resource_Filter.label" tooltip="%tool.Model_Resource_Filter.tooltip">
+            <Tool id="Model_Resource_Filter" label="%tool.Model_Resource_Filter.label" tooltip="%tool.Model_Resource_Filter.tooltip" image="res/icon/gui/organisationModelEmpty_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#OrganisationModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#ModelResourceFilter"/>
@@ -3811,9 +2130,7 @@
                     <HParameter name="name" value="Model Resource Filter"/>
                 </Handler>
             </Tool>
-            <Tool id="Non_Functional_Event"
-                image="res/icon/gui/NonFunctionnalEvent_24.png"
-                label="%tool.Non_Functional_Event.label" tooltip="%tool.Non_Functional_Event.tooltip">
+            <Tool id="Non_Functional_Event" label="%tool.Non_Functional_Event.label" tooltip="%tool.Non_Functional_Event.tooltip" image="res/icon/gui/NonFunctionnalEvent_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#ScalabilityModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#NonFunctionalEvent"/>
@@ -3821,9 +2138,7 @@
                     <HParameter name="name" value="Non Functional Avent"/>
                 </Handler>
             </Tool>
-            <Tool id="Non_Functional_Event_Instance"
-                image="res/icon/gui/NonFunctionnalEventInstance_24.png"
-                label="%tool.Non_Functional_Event_Instance.label" tooltip="%tool.Non_Functional_Event_Instance.tooltip">
+            <Tool id="Non_Functional_Event_Instance" label="%tool.Non_Functional_Event_Instance.label" tooltip="%tool.Non_Functional_Event_Instance.tooltip" image="res/icon/gui/NonFunctionnalEventInstance_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#ScalabilityModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#NonFunctionalEventInstance"/>
@@ -3831,9 +2146,7 @@
                     <HParameter name="name" value="Non Functional Event Instance"/>
                 </Handler>
             </Tool>
-            <Tool id="OSRequirement"
-                image="res/icon/gui/osRequirement_24.png"
-                label="%tool.OSRequirement.label" tooltip="%tool.OSRequirement.tooltip">
+            <Tool id="OSRequirement" label="%tool.OSRequirement.label" tooltip="%tool.OSRequirement.tooltip" image="res/icon/gui/osRequirement_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#RequirementModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#OSRequirement"/>
@@ -3841,9 +2154,7 @@
                     <HParameter name="name" value="OS Requirement"/>
                 </Handler>
             </Tool>
-            <Tool id="Object_Context"
-                image="res/icon/gui/ObjectContext_24.png"
-                label="%tool.Object_Context.label" tooltip="%tool.Object_Context.tooltip">
+            <Tool id="Object_Context" label="%tool.Object_Context.label" tooltip="%tool.Object_Context.tooltip" image="res/icon/gui/ObjectContext_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#MetricTypeModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#ObjectContext"/>
@@ -3851,9 +2162,7 @@
                     <HParameter name="name" value="Object Context"/>
                 </Handler>
             </Tool>
-            <Tool id="OptimisationRequirement"
-                image="res/icon/gui/optimisationRequirement_24.png"
-                label="%tool.OptimisationRequirement.label" tooltip="%tool.OptimisationRequirement.tooltip">
+            <Tool id="OptimisationRequirement" label="%tool.OptimisationRequirement.label" tooltip="%tool.OptimisationRequirement.tooltip" image="res/icon/gui/optimisationRequirement_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#RequirementModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#OptimisationRequirement"/>
@@ -3861,9 +2170,7 @@
                     <HParameter name="name" value="OptimisationRequirement"/>
                 </Handler>
             </Tool>
-            <Tool id="Organisation"
-                image="res/icon/gui/organisationModelEmpty_24.png"
-                label="%tool.Organisation.label" tooltip="%tool.Organisation.tooltip">
+            <Tool id="Organisation" label="%tool.Organisation.label" tooltip="%tool.Organisation.tooltip" image="res/icon/gui/organisationModelEmpty_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#OrganisationModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#Organisation"/>
@@ -3871,9 +2178,7 @@
                     <HParameter name="name" value="Organisation"/>
                 </Handler>
             </Tool>
-            <Tool id="OrganisationModel"
-                image="res/icon/gui/organisationModel_24.png"
-                label="%tool.OrganisationModel.label" tooltip="%tool.OrganisationModel.tooltip">
+            <Tool id="OrganisationModel" label="%tool.OrganisationModel.label" tooltip="%tool.OrganisationModel.tooltip" image="res/icon/gui/organisationModel_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#CamelModel"/>
                 <Handler class="fr.softeam.cameldesigner.handlers.tools.core.CreateOrganisationModelTool">
                     <HParameter name="stereotype" value="CamelDesigner#OrganisationModel"/>
@@ -3881,8 +2186,7 @@
                     <HParameter name="name" value="OrganisationModel"/>
                 </Handler>
             </Tool>
-            <Tool id="PaaS" image="res/icon/gui/paas_24.png"
-                label="%tool.PaaS.label" tooltip="%tool.PaaS.tooltip">
+            <Tool id="PaaS" label="%tool.PaaS.label" tooltip="%tool.PaaS.tooltip" image="res/icon/gui/paas_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#DeploymentTypeModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#PaaS"/>
@@ -3890,9 +2194,7 @@
                     <HParameter name="name" value="PaaS"/>
                 </Handler>
             </Tool>
-            <Tool id="PaaS_Configuration"
-                image="res/icon/gui/paasConfiguration_24.png"
-                label="%tool.PaaS_Configuration.label" tooltip="%tool.PaaS_Configuration.tooltip">
+            <Tool id="PaaS_Configuration" label="%tool.PaaS_Configuration.label" tooltip="%tool.PaaS_Configuration.tooltip" image="res/icon/gui/paasConfiguration_24.png">
                 <Scope-source metaclass="Standard.Component" stereotype="CamelDesigner#PaaS"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#PaaSConfiguration"/>
@@ -3900,9 +2202,7 @@
                     <HParameter name="name" value="PaaS Configuration"/>
                 </Handler>
             </Tool>
-            <Tool id="PaaS_Requirement"
-                image="res/icon/gui/PaasRequirement_24.png"
-                label="%tool.PaaS_Requirement.label" tooltip="%tool.PaaS_Requirement.tooltip">
+            <Tool id="PaaS_Requirement" label="%tool.PaaS_Requirement.label" tooltip="%tool.PaaS_Requirement.tooltip" image="res/icon/gui/PaasRequirement_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#RequirementModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#PaaSRequirement"/>
@@ -3910,9 +2210,7 @@
                     <HParameter name="name" value="PaaS Requirement"/>
                 </Handler>
             </Tool>
-            <Tool id="PaasMeasurement"
-                image="res/icon/gui/PaasMeasurement_24.png"
-                label="%tool.PaasMeasurement.label" tooltip="%tool.PaasMeasurement.tooltip">
+            <Tool id="PaasMeasurement" label="%tool.PaasMeasurement.label" tooltip="%tool.PaasMeasurement.tooltip" image="res/icon/gui/PaasMeasurement_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#ExecutionModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#PaaSMeasurement"/>
@@ -3920,9 +2218,7 @@
                     <HParameter name="name" value="PaaSMeasurement"/>
                 </Handler>
             </Tool>
-            <Tool id="PropertyDependency"
-                image="res/icon/gui/propertyDependency2_48.ICON.png"
-                label="%tool.PropertyDependency.label" tooltip="%tool.PropertyDependency.tooltip">
+            <Tool id="PropertyDependency" label="%tool.PropertyDependency.label" tooltip="%tool.PropertyDependency.tooltip" image="res/icon/gui/propertyDependency2_48.ICON.png">
                 <Scope-source metaclass="Standard.Class" stereotype=""/>
                 <Scope-target metaclass="Standard.Class" stereotype=""/>
                 <Handler class="Link">
@@ -3931,9 +2227,7 @@
                     <HParameter name="name" value="PropertyDependency"/>
                 </Handler>
             </Tool>
-            <Tool id="ProvidedCommunication"
-                image="res/icon/gui/ProvidedCommunication_24.png"
-                label="%tool.ProvidedCommunication.label" tooltip="%tool.ProvidedCommunication.tooltip">
+            <Tool id="ProvidedCommunication" label="%tool.ProvidedCommunication.label" tooltip="%tool.ProvidedCommunication.tooltip" image="res/icon/gui/ProvidedCommunication_24.png">
                 <Scope-source metaclass="Standard.Component" stereotype="CamelDesigner#SoftwareComponent"/>
                 <Handler class="fr.softeam.cameldesigner.handlers.tools.deployment.CreateProvidedCommunication">
                     <HParameter name="stereotype" value="CamelDesigner#CommunicationPort"/>
@@ -3941,9 +2235,7 @@
                     <HParameter name="name" value="ProvidedCommunication"/>
                 </Handler>
             </Tool>
-            <Tool id="ProvidedHost"
-                image="res/icon/gui/ProvidedHost_24.png"
-                label="%tool.ProvidedHost.label" tooltip="%tool.ProvidedHost.tooltip">
+            <Tool id="ProvidedHost" label="%tool.ProvidedHost.label" tooltip="%tool.ProvidedHost.tooltip" image="res/icon/gui/ProvidedHost_24.png">
                 <Scope-source metaclass="Standard.Component" stereotype="CamelDesigner#SoftwareComponent"/>
                 <Handler class="fr.softeam.cameldesigner.handlers.tools.deployment.CreateProvidedHost">
                     <HParameter name="stereotype" value="CamelDesigner#HostingPort"/>
@@ -3951,9 +2243,7 @@
                     <HParameter name="name" value="Provided Host"/>
                 </Handler>
             </Tool>
-            <Tool id="ProviderRequirement"
-                image="res/icon/gui/providerRequirement_24.png"
-                label="%tool.ProviderRequirement.label" tooltip="%tool.ProviderRequirement.tooltip">
+            <Tool id="ProviderRequirement" label="%tool.ProviderRequirement.label" tooltip="%tool.ProviderRequirement.tooltip" image="res/icon/gui/providerRequirement_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#RequirementModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#ProviderRequirement"/>
@@ -3961,16 +2251,14 @@
                     <HParameter name="name" value="ProviderRequirement"/>
                 </Handler>
             </Tool>
-            <Tool id="Quality_Attribute" image=""
-                label="%tool.Quality_Attribute.label" tooltip="%tool.Quality_Attribute.tooltip">
+            <Tool id="Quality_Attribute" label="%tool.Quality_Attribute.label" tooltip="%tool.Quality_Attribute.tooltip" image="">
                 <Scope-source metaclass="Standard.ModelTree" stereotype=""/>
                 <Handler class="fr.softeam.cameldesigner.handlers.tools.core.CreateQualityAttributeTool">
                     <HParameter name="metaclass" value="Standard.Class"/>
                     <HParameter name="name" value="QualityAttribute"/>
                 </Handler>
             </Tool>
-            <Tool id="Range" image="res/icon/gui/typeModelEmpty_24.png"
-                label="%tool.Range.label" tooltip="%tool.Range.tooltip">
+            <Tool id="Range" label="%tool.Range.label" tooltip="%tool.Range.tooltip" image="res/icon/gui/typeModelEmpty_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#TypeModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#Range"/>
@@ -3978,8 +2266,7 @@
                     <HParameter name="name" value="Range"/>
                 </Handler>
             </Tool>
-            <Tool id="Raw_Metric" image="res/icon/gui/RawMetric_24.png"
-                label="%tool.Raw_Metric.label" tooltip="%tool.Raw_Metric.tooltip">
+            <Tool id="Raw_Metric" label="%tool.Raw_Metric.label" tooltip="%tool.Raw_Metric.tooltip" image="res/icon/gui/RawMetric_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#MetricTypeModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#RawMetric"/>
@@ -3987,9 +2274,7 @@
                     <HParameter name="name" value="Raw Metric"/>
                 </Handler>
             </Tool>
-            <Tool id="Raw_Metric_Context"
-                image="res/icon/gui/RawMetricContext_24.png"
-                label="%tool.Raw_Metric_Context.label" tooltip="%tool.Raw_Metric_Context.tooltip">
+            <Tool id="Raw_Metric_Context" label="%tool.Raw_Metric_Context.label" tooltip="%tool.Raw_Metric_Context.tooltip" image="res/icon/gui/RawMetricContext_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#MetricTypeModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#RawMetricContext"/>
@@ -3997,9 +2282,7 @@
                     <HParameter name="name" value="Raw Metric Context"/>
                 </Handler>
             </Tool>
-            <Tool id="Raw_Secutiry_Metric"
-                image="res/icon/gui/RawSecurityMetric_24.png"
-                label="%tool.Raw_Secutiry_Metric.label" tooltip="%tool.Raw_Secutiry_Metric.tooltip">
+            <Tool id="Raw_Secutiry_Metric" label="%tool.Raw_Secutiry_Metric.label" tooltip="%tool.Raw_Secutiry_Metric.tooltip" image="res/icon/gui/RawSecurityMetric_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#SecurityModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#RawSecurityMetric"/>
@@ -4007,9 +2290,7 @@
                     <HParameter name="name" value="Raw Security Metric"/>
                 </Handler>
             </Tool>
-            <Tool id="RequiredCommunication"
-                image="res/icon/gui/RequiredCommunication_24.png"
-                label="%tool.RequiredCommunication.label" tooltip="%tool.RequiredCommunication.tooltip">
+            <Tool id="RequiredCommunication" label="%tool.RequiredCommunication.label" tooltip="%tool.RequiredCommunication.tooltip" image="res/icon/gui/RequiredCommunication_24.png">
                 <Scope-source metaclass="Standard.Component" stereotype="CamelDesigner#SoftwareComponent"/>
                 <Handler class="fr.softeam.cameldesigner.handlers.tools.deployment.CreateRequiredCommunication">
                     <HParameter name="stereotype" value="CamelDesigner#CommunicationPort"/>
@@ -4017,9 +2298,7 @@
                     <HParameter name="name" value="Required Communication"/>
                 </Handler>
             </Tool>
-            <Tool id="RequiredHost"
-                image="res/icon/gui/RequiredHost_24.png"
-                label="%tool.RequiredHost.label" tooltip="%tool.RequiredHost.tooltip">
+            <Tool id="RequiredHost" label="%tool.RequiredHost.label" tooltip="%tool.RequiredHost.tooltip" image="res/icon/gui/RequiredHost_24.png">
                 <Scope-source metaclass="Standard.Component" stereotype="CamelDesigner#SoftwareComponent"/>
                 <Handler class="fr.softeam.cameldesigner.handlers.tools.deployment.CreateRequiredHost">
                     <HParameter name="stereotype" value="CamelDesigner#HostingPort"/>
@@ -4027,9 +2306,7 @@
                     <HParameter name="name" value="Required Host"/>
                 </Handler>
             </Tool>
-            <Tool id="RequirementSet"
-                image="res/icon/gui/RequirementSet_24.png"
-                label="%tool.RequirementSet.label" tooltip="%tool.RequirementSet.tooltip">
+            <Tool id="RequirementSet" label="%tool.RequirementSet.label" tooltip="%tool.RequirementSet.tooltip" image="res/icon/gui/RequirementSet_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#DeploymentTypeModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#RequirementSet"/>
@@ -4037,9 +2314,7 @@
                     <HParameter name="name" value="Requirement Set"/>
                 </Handler>
             </Tool>
-            <Tool id="Requirement_Model"
-                image="res/icon/gui/requirementModel_24.png"
-                label="%tool.Requirement_Model.label" tooltip="%tool.Requirement_Model.tooltip">
+            <Tool id="Requirement_Model" label="%tool.Requirement_Model.label" tooltip="%tool.Requirement_Model.tooltip" image="res/icon/gui/requirementModel_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#CamelModel"/>
                 <Handler class="fr.softeam.cameldesigner.handlers.tools.core.CreateRequirementModelTool">
                     <HParameter name="stereotype" value="CamelDesigner#RequirementModel"/>
@@ -4047,9 +2322,7 @@
                     <HParameter name="name" value="Requirement Model"/>
                 </Handler>
             </Tool>
-            <Tool id="ResourceRequirement"
-                image="res/icon/gui/resourceRequirement_24.png"
-                label="%tool.ResourceRequirement.label" tooltip="%tool.ResourceRequirement.tooltip">
+            <Tool id="ResourceRequirement" label="%tool.ResourceRequirement.label" tooltip="%tool.ResourceRequirement.tooltip" image="res/icon/gui/resourceRequirement_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#RequirementModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#ResourceRequirement"/>
@@ -4057,9 +2330,7 @@
                     <HParameter name="name" value="Resource Requirement"/>
                 </Handler>
             </Tool>
-            <Tool id="RuleTrigger"
-                image="res/icon/gui/RuleTrigger_24.png"
-                label="%tool.RuleTrigger.label" tooltip="%tool.RuleTrigger.tooltip">
+            <Tool id="RuleTrigger" label="%tool.RuleTrigger.label" tooltip="%tool.RuleTrigger.tooltip" image="res/icon/gui/RuleTrigger_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#ExecutionModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#RuleTrigger"/>
@@ -4067,9 +2338,7 @@
                     <HParameter name="name" value="Rule Trigger"/>
                 </Handler>
             </Tool>
-            <Tool id="SLOViolation"
-                image="res/icon/gui/SLOViolation_24.png"
-                label="%tool.SLOViolation.label" tooltip="%tool.SLOViolation.tooltip">
+            <Tool id="SLOViolation" label="%tool.SLOViolation.label" tooltip="%tool.SLOViolation.tooltip" image="res/icon/gui/SLOViolation_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#ExecutionModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#SLOViolation"/>
@@ -4077,9 +2346,7 @@
                     <HParameter name="name" value="SLO Violation"/>
                 </Handler>
             </Tool>
-            <Tool id="ScalabilityModel"
-                image="res/icon/gui/scalabilityModel_24.png"
-                label="%tool.ScalabilityModel.label" tooltip="%tool.ScalabilityModel.tooltip">
+            <Tool id="ScalabilityModel" label="%tool.ScalabilityModel.label" tooltip="%tool.ScalabilityModel.tooltip" image="res/icon/gui/scalabilityModel_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#CamelModel"/>
                 <Handler class="fr.softeam.cameldesigner.handlers.tools.core.CreateScalabilityModelTool">
                     <HParameter name="stereotype" value="CamelDesigner#ScalabilityModel"/>
@@ -4087,9 +2354,7 @@
                     <HParameter name="name" value="ScalabilityModel"/>
                 </Handler>
             </Tool>
-            <Tool id="Scalability_Rule"
-                image="res/icon/gui/ScalabilityRule_24.png"
-                label="%tool.Scalability_Rule.label" tooltip="%tool.Scalability_Rule.tooltip">
+            <Tool id="Scalability_Rule" label="%tool.Scalability_Rule.label" tooltip="%tool.Scalability_Rule.tooltip" image="res/icon/gui/ScalabilityRule_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#ScalabilityModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#ScalabilityRule"/>
@@ -4097,9 +2362,7 @@
                     <HParameter name="name" value="Scalability Rue"/>
                 </Handler>
             </Tool>
-            <Tool id="Scaling_Action"
-                image="res/icon/gui/ScalingAction_24.png"
-                label="%tool.Scaling_Action.label" tooltip="%tool.Scaling_Action.tooltip">
+            <Tool id="Scaling_Action" label="%tool.Scaling_Action.label" tooltip="%tool.Scaling_Action.tooltip" image="res/icon/gui/ScalingAction_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#ScalabilityModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#ScalingAction"/>
@@ -4107,8 +2370,7 @@
                     <HParameter name="name" value="Scaling Action"/>
                 </Handler>
             </Tool>
-            <Tool id="Schedule" image="res/icon/gui/Schedule_24.png"
-                label="%tool.Schedule.label" tooltip="%tool.Schedule.tooltip">
+            <Tool id="Schedule" label="%tool.Schedule.label" tooltip="%tool.Schedule.tooltip" image="res/icon/gui/Schedule_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#MetricTypeModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#Schedule"/>
@@ -4116,9 +2378,7 @@
                     <HParameter name="name" value="Schedule"/>
                 </Handler>
             </Tool>
-            <Tool id="ScriptConfiguration"
-                image="res/icon/gui/ScriptConfiguration_24.png"
-                label="%tool.ScriptConfiguration.label" tooltip="%tool.ScriptConfiguration.tooltip">
+            <Tool id="ScriptConfiguration" label="%tool.ScriptConfiguration.label" tooltip="%tool.ScriptConfiguration.tooltip" image="res/icon/gui/ScriptConfiguration_24.png">
                 <Scope-source metaclass="Standard.Component" stereotype="CamelDesigner#CamelComponent"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#ScriptConfiguration"/>
@@ -4126,9 +2386,7 @@
                     <HParameter name="name" value="Script Configuration"/>
                 </Handler>
             </Tool>
-            <Tool id="SecurityModel"
-                image="res/icon/gui/securityModel_24.png"
-                label="%tool.SecurityModel.label" tooltip="%tool.SecurityModel.tooltip">
+            <Tool id="SecurityModel" label="%tool.SecurityModel.label" tooltip="%tool.SecurityModel.tooltip" image="res/icon/gui/securityModel_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#CamelModel"/>
                 <Handler class="fr.softeam.cameldesigner.handlers.tools.core.CreateSecurityModelTool">
                     <HParameter name="stereotype" value="CamelDesigner#SecurityModel"/>
@@ -4136,9 +2394,7 @@
                     <HParameter name="name" value="SecurityModel"/>
                 </Handler>
             </Tool>
-            <Tool id="SecuritySLO"
-                image="res/icon/gui/SecuritySLO_24.png"
-                label="%tool.SecuritySLO.label" tooltip="%tool.SecuritySLO.tooltip">
+            <Tool id="SecuritySLO" label="%tool.SecuritySLO.label" tooltip="%tool.SecuritySLO.tooltip" image="res/icon/gui/SecuritySLO_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#SecurityModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#SecuritySLO"/>
@@ -4146,9 +2402,7 @@
                     <HParameter name="name" value="SecuritySLO"/>
                 </Handler>
             </Tool>
-            <Tool id="Security_Attribute"
-                image="res/icon/gui/SecurityAttribute_24.png"
-                label="%tool.Security_Attribute.label" tooltip="%tool.Security_Attribute.tooltip">
+            <Tool id="Security_Attribute" label="%tool.Security_Attribute.label" tooltip="%tool.Security_Attribute.tooltip" image="res/icon/gui/SecurityAttribute_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#SecurityModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#SecurityAttribute"/>
@@ -4156,9 +2410,7 @@
                     <HParameter name="name" value="Secutiry Attribute"/>
                 </Handler>
             </Tool>
-            <Tool id="Security_Control"
-                image="res/icon/gui/SecurityControl_24.png"
-                label="%tool.Security_Control.label" tooltip="%tool.Security_Control.tooltip">
+            <Tool id="Security_Control" label="%tool.Security_Control.label" tooltip="%tool.Security_Control.tooltip" image="res/icon/gui/SecurityControl_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#SecurityModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#SecurityControl"/>
@@ -4166,9 +2418,7 @@
                     <HParameter name="name" value="Secutity Control"/>
                 </Handler>
             </Tool>
-            <Tool id="Security_Domain"
-                image="res/icon/gui/SecurityDomain_24.png"
-                label="%tool.Security_Domain.label" tooltip="%tool.Security_Domain.tooltip">
+            <Tool id="Security_Domain" label="%tool.Security_Domain.label" tooltip="%tool.Security_Domain.tooltip" image="res/icon/gui/SecurityDomain_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#SecurityModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#SecurityDomain"/>
@@ -4176,9 +2426,7 @@
                     <HParameter name="name" value="Security Domain"/>
                 </Handler>
             </Tool>
-            <Tool id="Security_Metric_Instance"
-                image="res/icon/gui/SecurityMetricInstance_24.png"
-                label="%tool.Security_Metric_Instance.label" tooltip="%tool.Security_Metric_Instance.tooltip">
+            <Tool id="Security_Metric_Instance" label="%tool.Security_Metric_Instance.label" tooltip="%tool.Security_Metric_Instance.tooltip" image="res/icon/gui/SecurityMetricInstance_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#SecurityModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#SecurityMetricInstance"/>
@@ -4186,9 +2434,7 @@
                     <HParameter name="name" value="Security Metric Instance"/>
                 </Handler>
             </Tool>
-            <Tool id="Security_Requirement"
-                image="res/icon/gui/securityRequirement_24.png"
-                label="%tool.Security_Requirement.label" tooltip="%tool.Security_Requirement.tooltip">
+            <Tool id="Security_Requirement" label="%tool.Security_Requirement.label" tooltip="%tool.Security_Requirement.tooltip" image="res/icon/gui/securityRequirement_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#SecurityModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#SecurityRequirement"/>
@@ -4196,8 +2442,7 @@
                     <HParameter name="name" value="Security Requirement"/>
                 </Handler>
             </Tool>
-            <Tool id="Sensor" image="res/icon/gui/Sensor_24.png"
-                label="%tool.Sensor.label" tooltip="%tool.Sensor.tooltip">
+            <Tool id="Sensor" label="%tool.Sensor.label" tooltip="%tool.Sensor.tooltip" image="res/icon/gui/Sensor_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#MetricTypeModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#Sensor"/>
@@ -4205,9 +2450,7 @@
                     <HParameter name="name" value="Sensor"/>
                 </Handler>
             </Tool>
-            <Tool id="Serverless_Configuration"
-                image="res/icon/gui/ServerlessConfiguration_24.png"
-                label="%tool.Serverless_Configuration.label" tooltip="%tool.Serverless_Configuration.tooltip">
+            <Tool id="Serverless_Configuration" label="%tool.Serverless_Configuration.label" tooltip="%tool.Serverless_Configuration.tooltip" image="res/icon/gui/ServerlessConfiguration_24.png">
                 <Scope-source metaclass="Standard.Component" stereotype="CamelDesigner#CamelComponent"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#ServerlessConfiguration"/>
@@ -4215,9 +2458,7 @@
                     <HParameter name="name" value="Serverless Configuration"/>
                 </Handler>
             </Tool>
-            <Tool id="ServiceLevelObjective"
-                image="res/icon/gui/sloRequirement_24.png"
-                label="%tool.ServiceLevelObjective.label" tooltip="%tool.ServiceLevelObjective.tooltip">
+            <Tool id="ServiceLevelObjective" label="%tool.ServiceLevelObjective.label" tooltip="%tool.ServiceLevelObjective.tooltip" image="res/icon/gui/sloRequirement_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#RequirementModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#ServiceLevelObjective"/>
@@ -4225,9 +2466,7 @@
                     <HParameter name="name" value="ServiceLevelObjective"/>
                 </Handler>
             </Tool>
-            <Tool id="Single_Event"
-                image="res/icon/gui/SingleEvent_24.png"
-                label="%tool.Single_Event.label" tooltip="%tool.Single_Event.tooltip">
+            <Tool id="Single_Event" label="%tool.Single_Event.label" tooltip="%tool.Single_Event.tooltip" image="res/icon/gui/SingleEvent_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#ScalabilityModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#SingleEvent"/>
@@ -4235,9 +2474,7 @@
                     <HParameter name="name" value="Single Event"/>
                 </Handler>
             </Tool>
-            <Tool id="Single_Unit"
-                image="res/icon/gui/unitModelEmpty_24.png"
-                label="%tool.Single_Unit.label" tooltip="%tool.Single_Unit.tooltip">
+            <Tool id="Single_Unit" label="%tool.Single_Unit.label" tooltip="%tool.Single_Unit.tooltip" image="res/icon/gui/unitModelEmpty_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#UnitModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#SingleUnit"/>
@@ -4245,9 +2482,7 @@
                     <HParameter name="name" value="Element"/>
                 </Handler>
             </Tool>
-            <Tool id="SoftwareComponentMeasurement"
-                image="res/icon/gui/SoftwareComponentMeasurement_24.png"
-                label="%tool.SoftwareComponentMeasurement.label" tooltip="%tool.SoftwareComponentMeasurement.tooltip">
+            <Tool id="SoftwareComponentMeasurement" label="%tool.SoftwareComponentMeasurement.label" tooltip="%tool.SoftwareComponentMeasurement.tooltip" image="res/icon/gui/SoftwareComponentMeasurement_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#ExecutionModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#SoftwareComponentMeasurement"/>
@@ -4255,9 +2490,7 @@
                     <HParameter name="name" value="Software Component Measurement"/>
                 </Handler>
             </Tool>
-            <Tool id="Software_Component"
-                image="res/icon/gui/SoftwareComponent_24.png"
-                label="%tool.Software_Component.label" tooltip="%tool.Software_Component.tooltip">
+            <Tool id="Software_Component" label="%tool.Software_Component.label" tooltip="%tool.Software_Component.tooltip" image="res/icon/gui/SoftwareComponent_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#DeploymentTypeModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#SoftwareComponent"/>
@@ -4265,8 +2498,7 @@
                     <HParameter name="name" value="Software Component"/>
                 </Handler>
             </Tool>
-            <Tool id="Timer" image="res/icon/gui/Timer_24.png"
-                label="%tool.Timer.label" tooltip="%tool.Timer.tooltip">
+            <Tool id="Timer" label="%tool.Timer.label" tooltip="%tool.Timer.tooltip" image="res/icon/gui/Timer_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#ScalabilityModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#Timer"/>
@@ -4274,8 +2506,7 @@
                     <HParameter name="name" value="Timer"/>
                 </Handler>
             </Tool>
-            <Tool id="TypeModel" image="res/icon/gui/typeModel_24.png"
-                label="%tool.TypeModel.label" tooltip="%tool.TypeModel.tooltip">
+            <Tool id="TypeModel" label="%tool.TypeModel.label" tooltip="%tool.TypeModel.tooltip" image="res/icon/gui/typeModel_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#CamelModel"/>
                 <Handler class="fr.softeam.cameldesigner.handlers.tools.core.CreateTypeModelTool">
                     <HParameter name="stereotype" value="CamelDesigner#TypeModel"/>
@@ -4283,18 +2514,14 @@
                     <HParameter name="name" value="Type Model"/>
                 </Handler>
             </Tool>
-            <Tool id="Unary_Constraint"
-                image="res/icon/gui/UnaryConstraint_24.png"
-                label="%tool.Unary_Constraint.label" tooltip="%tool.Unary_Constraint.tooltip">
+            <Tool id="Unary_Constraint" label="%tool.Unary_Constraint.label" tooltip="%tool.Unary_Constraint.tooltip" image="res/icon/gui/UnaryConstraint_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#ConstraintModel"/>
                 <Handler class="Box">
                     <HParameter name="metaclass" value="Standard.Class"/>
                     <HParameter name="name" value="Unary Constraint"/>
                 </Handler>
             </Tool>
-            <Tool id="Unary_Event_Pattern"
-                image="res/icon/gui/UnaryEventPattern_24.png"
-                label="%tool.Unary_Event_Pattern.label" tooltip="%tool.Unary_Event_Pattern.tooltip">
+            <Tool id="Unary_Event_Pattern" label="%tool.Unary_Event_Pattern.label" tooltip="%tool.Unary_Event_Pattern.tooltip" image="res/icon/gui/UnaryEventPattern_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#ScalabilityModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#UnaryEventPattern"/>
@@ -4302,8 +2529,7 @@
                     <HParameter name="name" value="Unary Event Pattern"/>
                 </Handler>
             </Tool>
-            <Tool id="Unit" image="res/icon/gui/unitModelEmpty_24.png"
-                label="%tool.Unit.label" tooltip="%tool.Unit.tooltip">
+            <Tool id="Unit" label="%tool.Unit.label" tooltip="%tool.Unit.tooltip" image="res/icon/gui/unitModelEmpty_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#UnitModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#Unit"/>
@@ -4311,8 +2537,7 @@
                     <HParameter name="name" value="Unit"/>
                 </Handler>
             </Tool>
-            <Tool id="UnitModel" image="res/icon/gui/unitModel_24.png"
-                label="%tool.UnitModel.label" tooltip="%tool.UnitModel.tooltip">
+            <Tool id="UnitModel" label="%tool.UnitModel.label" tooltip="%tool.UnitModel.tooltip" image="res/icon/gui/unitModel_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#CamelModel"/>
                 <Handler class="fr.softeam.cameldesigner.handlers.tools.core.CreateUnitModelTool">
                     <HParameter name="stereotype" value="CamelDesigner#UnitModel"/>
@@ -4320,9 +2545,7 @@
                     <HParameter name="name" value="Unit Model"/>
                 </Handler>
             </Tool>
-            <Tool id="Unit_Dimension"
-                image="res/icon/gui/unitModelEmpty_24.png"
-                label="%tool.Unit_Dimension.label" tooltip="%tool.Unit_Dimension.tooltip">
+            <Tool id="Unit_Dimension" label="%tool.Unit_Dimension.label" tooltip="%tool.Unit_Dimension.tooltip" image="res/icon/gui/unitModelEmpty_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#UnitModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#UnitDimension"/>
@@ -4330,8 +2553,7 @@
                     <HParameter name="name" value="Unit Dimension"/>
                 </Handler>
             </Tool>
-            <Tool id="VM" image="res/icon/gui/VM_24.png"
-                label="%tool.VM.label" tooltip="%tool.VM.tooltip">
+            <Tool id="VM" label="%tool.VM.label" tooltip="%tool.VM.tooltip" image="res/icon/gui/VM_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#DeploymentTypeModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#VM"/>
@@ -4339,9 +2561,7 @@
                     <HParameter name="name" value="VM"/>
                 </Handler>
             </Tool>
-            <Tool id="VMMeasurement"
-                image="res/icon/gui/VMMeasurement_24.png"
-                label="%tool.VMMeasurement.label" tooltip="%tool.VMMeasurement.tooltip">
+            <Tool id="VMMeasurement" label="%tool.VMMeasurement.label" tooltip="%tool.VMMeasurement.tooltip" image="res/icon/gui/VMMeasurement_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#ExecutionModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#VMMeasurement"/>
@@ -4349,9 +2569,7 @@
                     <HParameter name="name" value="VM Measurement"/>
                 </Handler>
             </Tool>
-            <Tool id="VM_Instance"
-                image="res/icon/gui/VMInstance_24.png"
-                label="%tool.VM_Instance.label" tooltip="%tool.VM_Instance.tooltip">
+            <Tool id="VM_Instance" label="%tool.VM_Instance.label" tooltip="%tool.VM_Instance.tooltip" image="res/icon/gui/VMInstance_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#DeploymentInstanceModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#VMInstance"/>
@@ -4359,9 +2577,7 @@
                     <HParameter name="name" value="VM Instance"/>
                 </Handler>
             </Tool>
-            <Tool id="Vertical_Scaling_Action"
-                image="res/icon/gui/VerticalScalingAction_24.png"
-                label="%tool.Vertical_Scaling_Action.label" tooltip="%tool.Vertical_Scaling_Action.tooltip">
+            <Tool id="Vertical_Scaling_Action" label="%tool.Vertical_Scaling_Action.label" tooltip="%tool.Vertical_Scaling_Action.tooltip" image="res/icon/gui/VerticalScalingAction_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#ScalabilityModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#VerticalScalingAction"/>
@@ -4369,9 +2585,7 @@
                     <HParameter name="name" value="Verticale Scaling Action"/>
                 </Handler>
             </Tool>
-            <Tool id="Verticale_Scale_Requirement"
-                image="res/icon/gui/VerticalScaleRequirement_24.png"
-                label="%tool.Verticale_Scale_Requirement.label" tooltip="%tool.Verticale_Scale_Requirement.tooltip">
+            <Tool id="Verticale_Scale_Requirement" label="%tool.Verticale_Scale_Requirement.label" tooltip="%tool.Verticale_Scale_Requirement.tooltip" image="res/icon/gui/VerticalScaleRequirement_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#RequirementModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#VerticalScaleRequirement"/>
@@ -4379,8 +2593,7 @@
                     <HParameter name="name" value="Vertical Scale Requirement"/>
                 </Handler>
             </Tool>
-            <Tool id="Window" image="res/icon/gui/Window_24.png"
-                label="%tool.Window.label" tooltip="%tool.Window.tooltip">
+            <Tool id="Window" label="%tool.Window.label" tooltip="%tool.Window.tooltip" image="res/icon/gui/Window_24.png">
                 <Scope-source metaclass="Standard.Package" stereotype="CamelDesigner#MetricTypeModel"/>
                 <Handler class="Box">
                     <HParameter name="stereotype" value="CamelDesigner#Window"/>
@@ -4389,10 +2602,465 @@
                 </Handler>
             </Tool>
         </Tools>
+        <ContextualMenu>
+            <CommandRef refid="Camel_Model_diagram" group="%group.Create diagram.label" group-image="res/icon/gui/CamelDiagram.png"/>
+            <CommandRef refid="Data_Type_Model_diagram" group="%group.Create diagram.label" group-image="res/icon/gui/CamelDiagram.png"/>
+            <CommandRef refid="Data_Instance_Model_diagram" group="%group.Create diagram.label" group-image="res/icon/gui/CamelDiagram.png"/>
+            <CommandRef refid="Deployment_Type_Model_diagram" group="%group.Create diagram.label" group-image="res/icon/gui/CamelDiagram.png"/>
+            <CommandRef refid="Deployment_Instance_Model_diagram" group="%group.Create diagram.label" group-image="res/icon/gui/CamelDiagram.png"/>
+            <CommandRef refid="Execution_Model_diagram" group="%group.Create diagram.label" group-image="res/icon/gui/CamelDiagram.png"/>
+            <CommandRef refid="Location_Model_diagram" group="%group.Create diagram.label" group-image="res/icon/gui/CamelDiagram.png"/>
+            <CommandRef refid="Metadata_Model_diagram" group="%group.Create diagram.label" group-image="res/icon/gui/CamelDiagram.png"/>
+            <CommandRef refid="Metric_Type_Model_diagram" group="%group.Create diagram.label" group-image="res/icon/gui/CamelDiagram.png"/>
+            <CommandRef refid="Metric_Instance_Model_diagram" group="%group.Create diagram.label" group-image="res/icon/gui/CamelDiagram.png"/>
+            <CommandRef refid="Organisation_Model_diagram" group="%group.Create diagram.label" group-image="res/icon/gui/CamelDiagram.png"/>
+            <CommandRef refid="Requirement_Model_diagram" group="%group.Create diagram.label" group-image="res/icon/gui/CamelDiagram.png"/>
+            <CommandRef refid="Scalability_Model_diagram" group="%group.Create diagram.label" group-image="res/icon/gui/CamelDiagram.png"/>
+            <CommandRef refid="Security_Model_diagram" group="%group.Create diagram.label" group-image="res/icon/gui/CamelDiagram.png"/>
+            <CommandRef refid="Type_Model_diagram" group="%group.Create diagram.label" group-image="res/icon/gui/CamelDiagram.png"/>
+            <CommandRef refid="Unit_Model_diagram" group="%group.Create diagram.label" group-image="res/icon/gui/CamelDiagram.png"/>
+            <CommandRef refid="Camel_Model" group="%group.Create_element.label" group-image="res/icon/gui/CamelModel_24.png"/>
+            <CommandRef refid="Data_Type_Model" group="%group.Create_element.label" group-image="res/icon/gui/CamelModel_24.png"/>
+            <CommandRef refid="Data_Instance_Model" group="%group.Create_element.label" group-image="res/icon/gui/CamelModel_24.png"/>
+            <CommandRef refid="Deployment_Type_Model" group="%group.Create_element.label" group-image="res/icon/gui/CamelModel_24.png"/>
+            <CommandRef refid="Deployment_Instance_Model" group="%group.Create_element.label" group-image="res/icon/gui/CamelModel_24.png"/>
+            <CommandRef refid="Execution_Model" group="%group.Create_element.label" group-image="res/icon/gui/CamelModel_24.png"/>
+            <CommandRef refid="Location_Model" group="%group.Create_element.label" group-image="res/icon/gui/CamelModel_24.png"/>
+            <CommandRef refid="Metadata_Model" group="%group.Create_element.label" group-image="res/icon/gui/CamelModel_24.png"/>
+            <CommandRef refid="Metric_Type_Model" group="%group.Create_element.label" group-image="res/icon/gui/CamelModel_24.png"/>
+            <CommandRef refid="Metric_Instance_Model" group="%group.Create_element.label" group-image="res/icon/gui/CamelModel_24.png"/>
+            <CommandRef refid="Organisation_Model" group="%group.Create_element.label" group-image="res/icon/gui/CamelModel_24.png"/>
+            <CommandRef refid="Requirement_Model" group="%group.Create_element.label" group-image="res/icon/gui/CamelModel_24.png"/>
+            <CommandRef refid="Scalability_Model" group="%group.Create_element.label" group-image="res/icon/gui/CamelModel_24.png"/>
+            <CommandRef refid="Security_Model" group="%group.Create_element.label" group-image="res/icon/gui/CamelModel_24.png"/>
+            <CommandRef refid="Type_Model" group="%group.Create_element.label" group-image="res/icon/gui/CamelModel_24.png"/>
+            <CommandRef refid="Unit_Model" group="%group.Create_element.label" group-image="res/icon/gui/CamelModel_24.png"/>
+            <CommandRef refid="Export" group="" group-image=""/>
+            <CommandRef refid="Import" group="" group-image=""/>
+            <CommandRef refid="Checker" group="" group-image=""/>
+        </ContextualMenu>
+        <Diagrams>
+            <DiagramType base-diagram="Standard.ClassDiagram" stereotype="CamelDesigner#CamelModelDiagram">
+                <Palette keepBasePalette="false">
+                    <ToolRef refid="DataInstanceModel" group="%group.Camel_Sub_Models.label"/>
+                    <ToolRef refid="DataTypeModel" group="%group.Camel_Sub_Models.label"/>
+                    <ToolRef refid="Deployment_Instance_Model" group="%group.Camel_Sub_Models.label"/>
+                    <ToolRef refid="Deployment_Type_Model" group="%group.Camel_Sub_Models.label"/>
+                    <ToolRef refid="ExecutionModel" group="%group.Camel_Sub_Models.label"/>
+                    <ToolRef refid="LocationModel" group="%group.Camel_Sub_Models.label"/>
+                    <ToolRef refid="MetaDataModel" group="%group.Camel_Sub_Models.label"/>
+                    <ToolRef refid="MetricInstanceModel" group="%group.Camel_Sub_Models.label"/>
+                    <ToolRef refid="Metric_Type_Model" group="%group.Camel_Sub_Models.label"/>
+                    <ToolRef refid="OrganisationModel" group="%group.Camel_Sub_Models.label"/>
+                    <ToolRef refid="Requirement_Model" group="%group.Camel_Sub_Models.label"/>
+                    <ToolRef refid="ScalabilityModel" group="%group.Camel_Sub_Models.label"/>
+                    <ToolRef refid="SecurityModel" group="%group.Camel_Sub_Models.label"/>
+                    <ToolRef refid="TypeModel" group="%group.Camel_Sub_Models.label"/>
+                    <ToolRef refid="UnitModel" group="%group.Camel_Sub_Models.label"/>
+                    <ToolRef refid="CREATE_EXTERNDOCUMENT" group="%group.Common.label"/>
+                    <ToolRef refid="CREATE_RELATED_DIAGRAM_LINK" group="%group.Common.label"/>
+                    <ToolRef refid="CREATE_NOTE" group="%group.Common.label"/>
+                    <ToolRef refid="CREATE_TRACEABILITY" group="%group.Common.label"/>
+                    <ToolRef refid="CREATE_DRAWING_LINE" group="%group.Free_Drawing.label"/>
+                    <ToolRef refid="CREATE_DRAWING_RECTANGLE" group="%group.Free_Drawing.label"/>
+                    <ToolRef refid="CREATE_DRAWING_TEXT" group="%group.Free_Drawing.label"/>
+                    <ToolRef refid="CREATE_DRAWING_ELLIPSE" group="%group.Free_Drawing.label"/>
+                </Palette>
+                <Handler class="StandardCustomizer">
+                    <HParameter name="stereotype" value="CamelDesigner#CamelModelDiagram"/>
+                    <HParameter name="metaclass" value="Standard.ClassDiagram"/>
+                </Handler>
+            </DiagramType>
+            <DiagramType base-diagram="Standard.ClassDiagram" stereotype="CamelDesigner#CamelViewPoint">
+                <Palette keepBasePalette="false">
+                    <ToolRef refid="Feature" group="%group.Common.label"/>
+                    <ToolRef refid="CamelAttribute" group="%group.Common.label"/>
+                    <ToolRef refid="Measurable_Attribute" group="%group.Common.label"/>
+                    <ToolRef refid="CREATE_NOTE" group="%group.Common.label"/>
+                    <ToolRef refid="CREATE_RELATED_DIAGRAM_LINK" group="%group.Common.label"/>
+                    <ToolRef refid="CREATE_DRAWING_ELLIPSE" group="%group.Free_Drawing.label"/>
+                    <ToolRef refid="CREATE_DRAWING_RECTANGLE" group="%group.Free_Drawing.label"/>
+                    <ToolRef refid="CREATE_DRAWING_LINE" group="%group.Free_Drawing.label"/>
+                    <ToolRef refid="CREATE_DRAWING_TEXT" group="%group.Free_Drawing.label"/>
+                </Palette>
+                <Handler class="StandardCustomizer">
+                    <HParameter name="stereotype" value="CamelDesigner#CamelViewPoint"/>
+                    <HParameter name="metaclass" value="Standard.ClassDiagram"/>
+                </Handler>
+            </DiagramType>
+            <DiagramType base-diagram="Standard.ClassDiagram" stereotype="CamelDesigner#ConstraintModelDiagram">
+                <Palette keepBasePalette="false">
+                    <ToolRef refid="ConstraintModel" group="%group.Constraint.label"/>
+                    <ToolRef refid="Metric_Constraint" group="%group.Constraint.label"/>
+                    <ToolRef refid="Attribute_Constraint" group="%group.Constraint.label"/>
+                    <ToolRef refid="IfThen_Constraint" group="%group.Constraint.label"/>
+                    <ToolRef refid="Metric_Variable_Constraint" group="%group.Constraint.label"/>
+                    <ToolRef refid="Logical_Constraint" group="%group.Constraint.label"/>
+                    <ToolRef refid="Unary_Constraint" group="%group.Constraint.label"/>
+                    <ToolRef refid="CREATE_EXTERNDOCUMENT" group="%group.Common.label"/>
+                    <ToolRef refid="CREATE_NOTE" group="%group.Common.label"/>
+                    <ToolRef refid="CREATE_TRACEABILITY" group="%group.Common.label"/>
+                    <ToolRef refid="CREATE_RELATED_DIAGRAM_LINK" group="%group.Common.label"/>
+                    <ToolRef refid="PropertyDependency" group="%group.Common.label"/>
+                    <ToolRef refid="CREATE_DRAWING_ELLIPSE" group="%group.Free_Drawing.label"/>
+                    <ToolRef refid="CREATE_DRAWING_TEXT" group="%group.Free_Drawing.label"/>
+                    <ToolRef refid="CREATE_DRAWING_RECTANGLE" group="%group.Free_Drawing.label"/>
+                    <ToolRef refid="CREATE_DRAWING_LINE" group="%group.Free_Drawing.label"/>
+                </Palette>
+                <Handler class="StandardCustomizer">
+                    <HParameter name="stereotype" value="CamelDesigner#ConstraintModelDiagram"/>
+                    <HParameter name="metaclass" value="Standard.ClassDiagram"/>
+                </Handler>
+            </DiagramType>
+            <DiagramType base-diagram="Standard.ClassDiagram" stereotype="CamelDesigner#DataInstanceModelDiagram">
+                <Palette keepBasePalette="false">
+                    <ToolRef refid="DataInstance" group="%group.Data_Instance.label"/>
+                    <ToolRef refid="Data_Source_Instance" group="%group.Data_Instance.label"/>
+                    <ToolRef refid="Feature" group="%group.Common.label"/>
+                    <ToolRef refid="CamelAttribute" group="%group.Common.label"/>
+                    <ToolRef refid="Measurable_Attribute" group="%group.Common.label"/>
+                    <ToolRef refid="CREATE_NOTE" group="%group.Common.label"/>
+                    <ToolRef refid="CREATE_RELATED_DIAGRAM_LINK" group="%group.Common.label"/>
+                    <ToolRef refid="CREATE_DRAWING_ELLIPSE" group="%group.Free_Drawing.label"/>
+                    <ToolRef refid="CREATE_DRAWING_RECTANGLE" group="%group.Free_Drawing.label"/>
+                    <ToolRef refid="CREATE_DRAWING_LINE" group="%group.Free_Drawing.label"/>
+                    <ToolRef refid="CREATE_DRAWING_TEXT" group="%group.Free_Drawing.label"/>
+                </Palette>
+                <Handler class="StandardCustomizer">
+                    <HParameter name="stereotype" value="CamelDesigner#DataInstanceModelDiagram"/>
+                    <HParameter name="metaclass" value="Standard.ClassDiagram"/>
+                </Handler>
+            </DiagramType>
+            <DiagramType base-diagram="Standard.ClassDiagram" stereotype="CamelDesigner#DataTypeModelDiagram">
+                <Palette keepBasePalette="false">
+                    <ToolRef refid="Data" group="%group.Data.label"/>
+                    <ToolRef refid="Data_Source" group="%group.Data.label"/>
+                    <ToolRef refid="Feature" group="%group.Common.label"/>
+                    <ToolRef refid="CamelAttribute" group="%group.Common.label"/>
+                    <ToolRef refid="Measurable_Attribute" group="%group.Common.label"/>
+                    <ToolRef refid="CREATE_NOTE" group="%group.Common.label"/>
+                    <ToolRef refid="CREATE_RELATED_DIAGRAM_LINK" group="%group.Common.label"/>
+                    <ToolRef refid="CREATE_DRAWING_RECTANGLE" group="%group.Free_Drawing.label"/>
+                    <ToolRef refid="CREATE_DRAWING_TEXT" group="%group.Free_Drawing.label"/>
+                    <ToolRef refid="CREATE_DRAWING_ELLIPSE" group="%group.Free_Drawing.label"/>
+                    <ToolRef refid="CREATE_DRAWING_LINE" group="%group.Free_Drawing.label"/>
+                </Palette>
+                <Handler class="StandardCustomizer">
+                    <HParameter name="stereotype" value="CamelDesigner#DataTypeModelDiagram"/>
+                    <HParameter name="metaclass" value="Standard.ClassDiagram"/>
+                </Handler>
+            </DiagramType>
+            <DiagramType base-diagram="Standard.ClassDiagram" stereotype="CamelDesigner#DeploymentInstanceModelDiagram">
+                <Palette keepBasePalette="false">
+                    <ToolRef refid="Container_Instance" group="%group.Deployment_Instance.label"/>
+                    <ToolRef refid="VM_Instance" group="%group.Deployment_Instance.label"/>
+                    <ToolRef refid="Feature" group="%group.Common.label"/>
+                    <ToolRef refid="CamelAttribute" group="%group.Common.label"/>
+                    <ToolRef refid="Measurable_Attribute" group="%group.Common.label"/>
+                    <ToolRef refid="CREATE_NOTE" group="%group.Common.label"/>
+                    <ToolRef refid="CREATE_RELATED_DIAGRAM_LINK" group="%group.Common.label"/>
+                    <ToolRef refid="CREATE_DRAWING_RECTANGLE" group="%group.Free_Drawing.label"/>
+                    <ToolRef refid="CREATE_DRAWING_TEXT" group="%group.Free_Drawing.label"/>
+                    <ToolRef refid="CREATE_DRAWING_ELLIPSE" group="%group.Free_Drawing.label"/>
+                    <ToolRef refid="CREATE_DRAWING_LINE" group="%group.Free_Drawing.label"/>
+                </Palette>
+                <Handler class="StandardCustomizer">
+                    <HParameter name="stereotype" value="CamelDesigner#DeploymentInstanceModelDiagram"/>
+                    <HParameter name="metaclass" value="Standard.ClassDiagram"/>
+                </Handler>
+            </DiagramType>
+            <DiagramType base-diagram="Standard.ClassDiagram" stereotype="CamelDesigner#DeploymentTypeModelDiagram">
+                <Palette keepBasePalette="false">
+                    <ToolRef refid="Software_Component" group="%group.Deployment_Type.label"/>
+                    <ToolRef refid="RequirementSet" group="%group.Deployment_Type.label"/>
+                    <ToolRef refid="Container" group="%group.Deployment_Type.label"/>
+                    <ToolRef refid="PaaS" group="%group.Deployment_Type.label"/>
+                    <ToolRef refid="VM" group="%group.Deployment_Type.label"/>
+                    <ToolRef refid="Serverless_Configuration" group="%group.Configuration.label"/>
+                    <ToolRef refid="Build_Configuration" group="%group.Configuration.label"/>
+                    <ToolRef refid="Cluster_Configuration" group="%group.Configuration.label"/>
+                    <ToolRef refid="Event_Configuration" group="%group.Configuration.label"/>
+                    <ToolRef refid="PaaS_Configuration" group="%group.Configuration.label"/>
+                    <ToolRef refid="ScriptConfiguration" group="%group.Configuration.label"/>
+                    <ToolRef refid="RequiredHost" group="%group.Communication.label"/>
+                    <ToolRef refid="ProvidedHost" group="%group.Communication.label"/>
+                    <ToolRef refid="RequiredCommunication" group="%group.Communication.label"/>
+                    <ToolRef refid="ProvidedCommunication" group="%group.Communication.label"/>
+                    <ToolRef refid="CREATE_CONNECTOR" group="%group.Communication.label"/>
+                    <ToolRef refid="Feature" group="%group.Common.label"/>
+                    <ToolRef refid="CamelAttribute" group="%group.Common.label"/>
+                    <ToolRef refid="Measurable_Attribute" group="%group.Common.label"/>
+                    <ToolRef refid="CREATE_NOTE" group="%group.Common.label"/>
+                    <ToolRef refid="CREATE_RELATED_DIAGRAM_LINK" group="%group.Common.label"/>
+                    <ToolRef refid="CREATE_DRAWING_TEXT" group="%group.Free_Drawing.label"/>
+                    <ToolRef refid="CREATE_DRAWING_LINE" group="%group.Free_Drawing.label"/>
+                    <ToolRef refid="CREATE_DRAWING_RECTANGLE" group="%group.Free_Drawing.label"/>
+                    <ToolRef refid="CREATE_DRAWING_ELLIPSE" group="%group.Free_Drawing.label"/>
+                </Palette>
+                <Handler class="StandardCustomizer">
+                    <HParameter name="stereotype" value="CamelDesigner#DeploymentTypeModelDiagram"/>
+                    <HParameter name="metaclass" value="Standard.ClassDiagram"/>
+                </Handler>
+            </DiagramType>
+            <DiagramType base-diagram="Standard.ClassDiagram" stereotype="CamelDesigner#ExecutionModelDiagram">
+                <Palette keepBasePalette="false">
+                    <ToolRef refid="Action_Instance" group="%group.Execution.label"/>
+                    <ToolRef refid="ApplicationMeasurement" group="%group.Execution.label"/>
+                    <ToolRef refid="Cause" group="%group.Execution.label"/>
+                    <ToolRef refid="CommunicationMeasurement" group="%group.Execution.label"/>
+                    <ToolRef refid="ContainerMeasurement" group="%group.Execution.label"/>
+                    <ToolRef refid="DataMeasurement" group="%group.Execution.label"/>
+                    <ToolRef refid="HistoryInfo" group="%group.Execution.label"/>
+                    <ToolRef refid="HistoryRecord" group="%group.Execution.label"/>
+                    <ToolRef refid="PaasMeasurement" group="%group.Execution.label"/>
+                    <ToolRef refid="RuleTrigger" group="%group.Execution.label"/>
+                    <ToolRef refid="SLOViolation" group="%group.Execution.label"/>
+                    <ToolRef refid="SoftwareComponentMeasurement" group="%group.Execution.label"/>
+                    <ToolRef refid="VMMeasurement" group="%group.Execution.label"/>
+                    <ToolRef refid="Feature" group="%group.Common.label"/>
+                    <ToolRef refid="CamelAttribute" group="%group.Common.label"/>
+                    <ToolRef refid="Measurable_Attribute" group="%group.Common.label"/>
+                    <ToolRef refid="CREATE_NOTE" group="%group.Common.label"/>
+                    <ToolRef refid="CREATE_RELATED_DIAGRAM_LINK" group="%group.Common.label"/>
+                    <ToolRef refid="CREATE_DRAWING_RECTANGLE" group="%group.Free_Drawing.label"/>
+                    <ToolRef refid="CREATE_DRAWING_LINE" group="%group.Free_Drawing.label"/>
+                    <ToolRef refid="CREATE_DRAWING_ELLIPSE" group="%group.Free_Drawing.label"/>
+                    <ToolRef refid="CREATE_DRAWING_TEXT" group="%group.Free_Drawing.label"/>
+                </Palette>
+                <Handler class="StandardCustomizer">
+                    <HParameter name="stereotype" value="CamelDesigner#ExecutionModelDiagram"/>
+                    <HParameter name="metaclass" value="Standard.ClassDiagram"/>
+                </Handler>
+            </DiagramType>
+            <DiagramType base-diagram="Standard.ClassDiagram" stereotype="CamelDesigner#LocationModelDiagram">
+                <Palette keepBasePalette="false">
+                    <ToolRef refid="Cloud_Location" group="%group.Location.label"/>
+                    <ToolRef refid="Geographical_Region" group="%group.Location.label"/>
+                    <ToolRef refid="Feature" group="%group.Common.label"/>
+                    <ToolRef refid="CamelAttribute" group="%group.Common.label"/>
+                    <ToolRef refid="Measurable_Attribute" group="%group.Common.label"/>
+                    <ToolRef refid="CREATE_NOTE" group="%group.Common.label"/>
+                    <ToolRef refid="CREATE_RELATED_DIAGRAM_LINK" group="%group.Common.label"/>
+                    <ToolRef refid="CREATE_DRAWING_LINE" group="%group.Free_Drawing.label"/>
+                    <ToolRef refid="CREATE_DRAWING_TEXT" group="%group.Free_Drawing.label"/>
+                    <ToolRef refid="CREATE_DRAWING_ELLIPSE" group="%group.Free_Drawing.label"/>
+                    <ToolRef refid="CREATE_DRAWING_RECTANGLE" group="%group.Free_Drawing.label"/>
+                </Palette>
+                <Handler class="StandardCustomizer">
+                    <HParameter name="stereotype" value="CamelDesigner#LocationModelDiagram"/>
+                    <HParameter name="metaclass" value="Standard.ClassDiagram"/>
+                </Handler>
+            </DiagramType>
+            <DiagramType base-diagram="Standard.ClassDiagram" stereotype="CamelDesigner#MetadataModelDiagram">
+                <Palette keepBasePalette="false">
+                    <ToolRef refid="MMSConcept" group="%group.MetaData.label"/>
+                    <ToolRef refid="MMSConceptInstance" group="%group.MetaData.label"/>
+                    <ToolRef refid="MMSProperty" group="%group.MetaData.label"/>
+                    <ToolRef refid="MMS_Property_Instance" group="%group.MetaData.label"/>
+                    <ToolRef refid="CREATE_NOTE" group="%group.Common.label"/>
+                    <ToolRef refid="CREATE_RELATED_DIAGRAM_LINK" group="%group.Common.label"/>
+                    <ToolRef refid="CREATE_DRAWING_RECTANGLE" group="%group.Free_Drawing.label"/>
+                    <ToolRef refid="CREATE_DRAWING_ELLIPSE" group="%group.Free_Drawing.label"/>
+                    <ToolRef refid="CREATE_DRAWING_LINE" group="%group.Free_Drawing.label"/>
+                    <ToolRef refid="CREATE_DRAWING_TEXT" group="%group.Free_Drawing.label"/>
+                </Palette>
+                <Handler class="StandardCustomizer">
+                    <HParameter name="stereotype" value="CamelDesigner#MetadataModelDiagram"/>
+                    <HParameter name="metaclass" value="Standard.ClassDiagram"/>
+                </Handler>
+            </DiagramType>
+            <DiagramType base-diagram="Standard.ClassDiagram" stereotype="CamelDesigner#MetricInstanceModelDiagram">
+                <Palette keepBasePalette="false">
+                    <ToolRef refid="Metric_Instance" group="%group.Metric_Instance.label"/>
+                    <ToolRef refid="Metric_Object_Binding" group="%group.Metric_Instance.label"/>
+                    <ToolRef refid="Feature" group="%group.Common.label"/>
+                    <ToolRef refid="CamelAttribute" group="%group.Common.label"/>
+                    <ToolRef refid="Measurable_Attribute" group="%group.Common.label"/>
+                    <ToolRef refid="CREATE_NOTE" group="%group.Common.label"/>
+                    <ToolRef refid="CREATE_RELATED_DIAGRAM_LINK" group="%group.Common.label"/>
+                    <ToolRef refid="CREATE_DRAWING_RECTANGLE" group="%group.Free_Drawing.label"/>
+                    <ToolRef refid="CREATE_DRAWING_ELLIPSE" group="%group.Free_Drawing.label"/>
+                    <ToolRef refid="CREATE_DRAWING_LINE" group="%group.Free_Drawing.label"/>
+                    <ToolRef refid="CREATE_DRAWING_TEXT" group="%group.Free_Drawing.label"/>
+                </Palette>
+                <Handler class="StandardCustomizer">
+                    <HParameter name="stereotype" value="CamelDesigner#MetricInstanceModelDiagram"/>
+                    <HParameter name="metaclass" value="Standard.ClassDiagram"/>
+                </Handler>
+            </DiagramType>
+            <DiagramType base-diagram="Standard.ClassDiagram" stereotype="CamelDesigner#MetricTypeModelDiagram">
+                <Palette keepBasePalette="false">
+                    <ToolRef refid="Attribute_Context" group="%group.Metric.label"/>
+                    <ToolRef refid="Composite_Metric" group="%group.Metric.label"/>
+                    <ToolRef refid="Composite_Metric_Context" group="%group.Metric.label"/>
+                    <ToolRef refid="Function" group="%group.Metric.label"/>
+                    <ToolRef refid="Metric_Template" group="%group.Metric.label"/>
+                    <ToolRef refid="Metric_Variable" group="%group.Metric.label"/>
+                    <ToolRef refid="Object_Context" group="%group.Metric.label"/>
+                    <ToolRef refid="Raw_Metric" group="%group.Metric.label"/>
+                    <ToolRef refid="Raw_Metric_Context" group="%group.Metric.label"/>
+                    <ToolRef refid="Sensor" group="%group.Metric.label"/>
+                    <ToolRef refid="Window" group="%group.Metric.label"/>
+                    <ToolRef refid="Feature" group="%group.Common.label"/>
+                    <ToolRef refid="CamelAttribute" group="%group.Common.label"/>
+                    <ToolRef refid="Measurable_Attribute" group="%group.Common.label"/>
+                    <ToolRef refid="CREATE_NOTE" group="%group.Common.label"/>
+                    <ToolRef refid="CREATE_RELATED_DIAGRAM_LINK" group="%group.Common.label"/>
+                    <ToolRef refid="CREATE_DRAWING_LINE" group="%group.Free_Drawing.label"/>
+                    <ToolRef refid="CREATE_DRAWING_TEXT" group="%group.Free_Drawing.label"/>
+                    <ToolRef refid="CREATE_DRAWING_ELLIPSE" group="%group.Free_Drawing.label"/>
+                    <ToolRef refid="CREATE_DRAWING_RECTANGLE" group="%group.Free_Drawing.label"/>
+                </Palette>
+                <Handler class="StandardCustomizer">
+                    <HParameter name="stereotype" value="CamelDesigner#MetricTypeModelDiagram"/>
+                    <HParameter name="metaclass" value="Standard.ClassDiagram"/>
+                </Handler>
+            </DiagramType>
+            <DiagramType base-diagram="Standard.ClassDiagram" stereotype="CamelDesigner#OrganisationModelDiagram">
+                <Palette keepBasePalette="false">
+                    <ToolRef refid="Cloud_Credentials" group="%group.Organisation.label"/>
+                    <ToolRef refid="Cloud_Provider" group="%group.Organisation.label"/>
+                    <ToolRef refid="Data_Resource_Filter" group="%group.Organisation.label"/>
+                    <ToolRef refid="Model_Resource_Filter" group="%group.Organisation.label"/>
+                    <ToolRef refid="Organisation" group="%group.Organisation.label"/>
+                    <ToolRef refid="Feature" group="%group.Common.label"/>
+                    <ToolRef refid="CamelAttribute" group="%group.Common.label"/>
+                    <ToolRef refid="Measurable_Attribute" group="%group.Common.label"/>
+                    <ToolRef refid="CREATE_NOTE" group="%group.Common.label"/>
+                    <ToolRef refid="CREATE_RELATED_DIAGRAM_LINK" group="%group.Common.label"/>
+                    <ToolRef refid="CREATE_DRAWING_RECTANGLE" group="%group.Free_Drawing.label"/>
+                    <ToolRef refid="CREATE_DRAWING_ELLIPSE" group="%group.Free_Drawing.label"/>
+                    <ToolRef refid="CREATE_DRAWING_TEXT" group="%group.Free_Drawing.label"/>
+                    <ToolRef refid="CREATE_DRAWING_LINE" group="%group.Free_Drawing.label"/>
+                </Palette>
+                <Handler class="StandardCustomizer">
+                    <HParameter name="stereotype" value="CamelDesigner#OrganisationModelDiagram"/>
+                    <HParameter name="metaclass" value="Standard.ClassDiagram"/>
+                </Handler>
+            </DiagramType>
+            <DiagramType base-diagram="Standard.ClassDiagram" stereotype="CamelDesigner#RequirementModelDiagram">
+                <Palette keepBasePalette="false">
+                    <ToolRef refid="ResourceRequirement" group="%group.Requirement.label"/>
+                    <ToolRef refid="HorizontalScaleRequirement" group="%group.Requirement.label"/>
+                    <ToolRef refid="ImageRequirement" group="%group.Requirement.label"/>
+                    <ToolRef refid="ServiceLevelObjective" group="%group.Requirement.label"/>
+                    <ToolRef refid="OptimisationRequirement" group="%group.Requirement.label"/>
+                    <ToolRef refid="OSRequirement" group="%group.Requirement.label"/>
+                    <ToolRef refid="ProviderRequirement" group="%group.Requirement.label"/>
+                    <ToolRef refid="LocationRequirement" group="%group.Requirement.label"/>
+                    <ToolRef refid="PaaS_Requirement" group="%group.Requirement.label"/>
+                    <ToolRef refid="Verticale_Scale_Requirement" group="%group.Requirement.label"/>
+                    <ToolRef refid="Feature" group="%group.Common.label"/>
+                    <ToolRef refid="CamelAttribute" group="%group.Common.label"/>
+                    <ToolRef refid="Measurable_Attribute" group="%group.Common.label"/>
+                    <ToolRef refid="CREATE_NOTE" group="%group.Common.label"/>
+                    <ToolRef refid="CREATE_RELATED_DIAGRAM_LINK" group="%group.Common.label"/>
+                    <ToolRef refid="CREATE_DRAWING_TEXT" group="%group.Free_Drawing.label"/>
+                    <ToolRef refid="CREATE_DRAWING_RECTANGLE" group="%group.Free_Drawing.label"/>
+                    <ToolRef refid="CREATE_DRAWING_ELLIPSE" group="%group.Free_Drawing.label"/>
+                    <ToolRef refid="CREATE_DRAWING_LINE" group="%group.Free_Drawing.label"/>
+                </Palette>
+                <Handler class="StandardCustomizer">
+                    <HParameter name="stereotype" value="CamelDesigner#RequirementModelDiagram"/>
+                    <HParameter name="metaclass" value="Standard.ClassDiagram"/>
+                </Handler>
+            </DiagramType>
+            <DiagramType base-diagram="Standard.ClassDiagram" stereotype="CamelDesigner#ScalabilityModelDiagram">
+                <Palette keepBasePalette="false">
+                    <ToolRef refid="ScalabilityModel" group="%group.Scalability.label"/>
+                    <ToolRef refid="Scalability_Rule" group="%group.Scalability.label"/>
+                    <ToolRef refid="Single_Event" group="%group.Scalability.label"/>
+                    <ToolRef refid="Timer" group="%group.Scalability.label"/>
+                    <ToolRef refid="Unary_Event_Pattern" group="%group.Scalability.label"/>
+                    <ToolRef refid="Vertical_Scaling_Action" group="%group.Scalability.label"/>
+                    <ToolRef refid="Binary_Event_Pattern" group="%group.Scalability.label"/>
+                    <ToolRef refid="Event" group="%group.Scalability.label"/>
+                    <ToolRef refid="Event_Instance" group="%group.Scalability.label"/>
+                    <ToolRef refid="Event_Pattern" group="%group.Scalability.label"/>
+                    <ToolRef refid="Functional_Event" group="%group.Scalability.label"/>
+                    <ToolRef refid="Functional_Event_Instance" group="%group.Scalability.label"/>
+                    <ToolRef refid="Horizontal_Scaling_Action" group="%group.Scalability.label"/>
+                    <ToolRef refid="Non_Functional_Event" group="%group.Scalability.label"/>
+                    <ToolRef refid="Non_Functional_Event_Instance" group="%group.Scalability.label"/>
+                    <ToolRef refid="Feature" group="%group.Common.label"/>
+                    <ToolRef refid="CamelAttribute" group="%group.Common.label"/>
+                    <ToolRef refid="Measurable_Attribute" group="%group.Common.label"/>
+                    <ToolRef refid="CREATE_NOTE" group="%group.Common.label"/>
+                    <ToolRef refid="CREATE_RELATED_DIAGRAM_LINK" group="%group.Common.label"/>
+                    <ToolRef refid="CREATE_DRAWING_TEXT" group="%group.Free_Drawing.label"/>
+                    <ToolRef refid="CREATE_DRAWING_ELLIPSE" group="%group.Free_Drawing.label"/>
+                    <ToolRef refid="CREATE_DRAWING_LINE" group="%group.Free_Drawing.label"/>
+                    <ToolRef refid="CREATE_DRAWING_RECTANGLE" group="%group.Free_Drawing.label"/>
+                </Palette>
+                <Handler class="StandardCustomizer">
+                    <HParameter name="stereotype" value="CamelDesigner#ScalabilityModelDiagram"/>
+                    <HParameter name="metaclass" value="Standard.ClassDiagram"/>
+                </Handler>
+            </DiagramType>
+            <DiagramType base-diagram="Standard.ClassDiagram" stereotype="CamelDesigner#SecurityModelDiagram">
+                <Palette keepBasePalette="false">
+                    <ToolRef refid="Security_Attribute" group="%group.Security.label"/>
+                    <ToolRef refid="Security_Control" group="%group.Security.label"/>
+                    <ToolRef refid="Security_Domain" group="%group.Security.label"/>
+                    <ToolRef refid="Security_Metric_Instance" group="%group.Security.label"/>
+                    <ToolRef refid="Certifiable" group="%group.Security.label"/>
+                    <ToolRef refid="Composite_Security_Metric" group="%group.Security.label"/>
+                    <ToolRef refid="Raw_Secutiry_Metric" group="%group.Security.label"/>
+                    <ToolRef refid="SecuritySLO" group="%group.Security.label"/>
+                    <ToolRef refid="Feature" group="%group.Common.label"/>
+                    <ToolRef refid="CamelAttribute" group="%group.Common.label"/>
+                    <ToolRef refid="Measurable_Attribute" group="%group.Common.label"/>
+                    <ToolRef refid="CREATE_NOTE" group="%group.Common.label"/>
+                    <ToolRef refid="CREATE_RELATED_DIAGRAM_LINK" group="%group.Common.label"/>
+                    <ToolRef refid="CREATE_DRAWING_LINE" group="%group.Free_Drawing.label"/>
+                    <ToolRef refid="CREATE_DRAWING_ELLIPSE" group="%group.Free_Drawing.label"/>
+                    <ToolRef refid="CREATE_DRAWING_TEXT" group="%group.Free_Drawing.label"/>
+                    <ToolRef refid="CREATE_DRAWING_RECTANGLE" group="%group.Free_Drawing.label"/>
+                </Palette>
+                <Handler class="StandardCustomizer">
+                    <HParameter name="stereotype" value="CamelDesigner#SecurityModelDiagram"/>
+                    <HParameter name="metaclass" value="Standard.ClassDiagram"/>
+                </Handler>
+            </DiagramType>
+            <DiagramType base-diagram="Standard.ClassDiagram" stereotype="CamelDesigner#TypeModelDiagram">
+                <Palette keepBasePalette="false">
+                    <ToolRef refid="TypeModel" group="%group.Type.label"/>
+                    <ToolRef refid="Feature" group="%group.Common.label"/>
+                    <ToolRef refid="CamelAttribute" group="%group.Common.label"/>
+                    <ToolRef refid="Measurable_Attribute" group="%group.Common.label"/>
+                    <ToolRef refid="CREATE_NOTE" group="%group.Common.label"/>
+                    <ToolRef refid="CREATE_RELATED_DIAGRAM_LINK" group="%group.Common.label"/>
+                    <ToolRef refid="CREATE_DRAWING_ELLIPSE" group="%group.Free_Drawing.label"/>
+                    <ToolRef refid="CREATE_DRAWING_RECTANGLE" group="%group.Free_Drawing.label"/>
+                    <ToolRef refid="CREATE_DRAWING_LINE" group="%group.Free_Drawing.label"/>
+                    <ToolRef refid="CREATE_DRAWING_TEXT" group="%group.Free_Drawing.label"/>
+                </Palette>
+                <Handler class="StandardCustomizer">
+                    <HParameter name="stereotype" value="CamelDesigner#TypeModelDiagram"/>
+                    <HParameter name="metaclass" value="Standard.ClassDiagram"/>
+                </Handler>
+            </DiagramType>
+            <DiagramType base-diagram="Standard.ClassDiagram" stereotype="CamelDesigner#UnitModelDiagram">
+                <Palette keepBasePalette="false">
+                    <ToolRef refid="Unit_Dimension" group="%group.Unit.label"/>
+                    <ToolRef refid="Feature" group="%group.Common.label"/>
+                    <ToolRef refid="CamelAttribute" group="%group.Common.label"/>
+                    <ToolRef refid="Measurable_Attribute" group="%group.Common.label"/>
+                    <ToolRef refid="CREATE_NOTE" group="%group.Common.label"/>
+                    <ToolRef refid="CREATE_RELATED_DIAGRAM_LINK" group="%group.Common.label"/>
+                    <ToolRef refid="CREATE_DRAWING_ELLIPSE" group="%group.Free_Drawing.label"/>
+                    <ToolRef refid="CREATE_DRAWING_TEXT" group="%group.Free_Drawing.label"/>
+                    <ToolRef refid="CREATE_DRAWING_RECTANGLE" group="%group.Free_Drawing.label"/>
+                    <ToolRef refid="CREATE_DRAWING_LINE" group="%group.Free_Drawing.label"/>
+                </Palette>
+                <Handler class="StandardCustomizer">
+                    <HParameter name="stereotype" value="CamelDesigner#UnitModelDiagram"/>
+                    <HParameter name="metaclass" value="Standard.ClassDiagram"/>
+                </Handler>
+            </DiagramType>
+        </Diagrams>
         <Views>
-            <PropertyPage
-                class="fr.softeam.cameldesigner.handlers.propertypages.CamelPropertyPageHandler"
-                id="Camel" image="res/icon/gui/camel_only_24.png" label="%propertypage.Camel.label"/>
+            <PropertyPage id="Camel" class="fr.softeam.cameldesigner.handlers.propertypages.CamelPropertyPageHandler" label="%propertypage.Camel.label" image="res/icon/gui/camel_only_24.png"/>
         </Views>
     </Gui>
     <Resources>
diff --git a/src/main/conf/res/generated/patterns/framework.umlt b/src/main/conf/res/generated/patterns/framework.umlt
index 1334b955..298179e1 100644
Binary files a/src/main/conf/res/generated/patterns/framework.umlt and b/src/main/conf/res/generated/patterns/framework.umlt differ
diff --git a/src/main/java/fr/softeam/cameldesigner/api/camelcore/standard/package_/FeaturePackage.java b/src/main/java/fr/softeam/cameldesigner/api/camelcore/standard/package_/FeaturePackage.java
index e9329c95..4b7f1d56 100644
--- a/src/main/java/fr/softeam/cameldesigner/api/camelcore/standard/package_/FeaturePackage.java
+++ b/src/main/java/fr/softeam/cameldesigner/api/camelcore/standard/package_/FeaturePackage.java
@@ -9,10 +9,16 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.Objects;
 import com.modeliosoft.modelio.javadesigner.annotations.objid;
+import org.modelio.api.module.context.IModuleContext;
+import org.modelio.metamodel.uml.infrastructure.ModelTree;
+import org.modelio.metamodel.uml.infrastructure.Stereotype;
+import org.modelio.metamodel.uml.infrastructure.TagType;
+import org.modelio.metamodel.uml.statik.Package;
+import org.modelio.vcore.smkernel.mapi.MObject;
 import fr.softeam.cameldesigner.api.CamelDesignerProxyFactory;
 import fr.softeam.cameldesigner.api.ICamelDesignerPeerModule;
+import fr.softeam.cameldesigner.api.camelcore.infrastructure.modelelement.CamelElement;
 import fr.softeam.cameldesigner.api.camelcore.infrastructure.modelelement.Feature;
 import fr.softeam.cameldesigner.api.camelcore.standard.class_.AttributeClass;
 import fr.softeam.cameldesigner.api.camelcore.standard.class_.MeasurableAttributeClass;
@@ -36,19 +42,6 @@
 import fr.softeam.cameldesigner.api.typemodel.standard.package_.TypeModel;
 import fr.softeam.cameldesigner.api.unitmodel.standard.package_.UnitModel;
 import fr.softeam.cameldesigner.impl.CamelDesignerModule;
-import org.modelio.api.modelio.model.IModelingSession;
-import org.modelio.api.modelio.model.PropertyConverter;
-import org.modelio.api.module.context.IModuleContext;
-import org.modelio.metamodel.mmextensions.infrastructure.ExtensionNotFoundException;
-import org.modelio.metamodel.uml.infrastructure.Dependency;
-import org.modelio.metamodel.uml.infrastructure.ModelElement;
-import org.modelio.metamodel.uml.infrastructure.ModelTree;
-import org.modelio.metamodel.uml.infrastructure.Stereotype;
-import org.modelio.metamodel.uml.infrastructure.TagType;
-import org.modelio.metamodel.uml.infrastructure.properties.PropertyDefinition;
-import org.modelio.metamodel.uml.infrastructure.properties.PropertyTableDefinition;
-import org.modelio.metamodel.uml.statik.Package;
-import org.modelio.vcore.smkernel.mapi.MObject;
 
 /**
  * Proxy class to handle a {@link Package} with << Feature_Package >> stereotype.
@@ -64,7 +57,7 @@ public abstract class FeaturePackage extends Feature {
      * Tells whether a {@link FeaturePackage proxy} can be instantiated from a {@link MObject} checking it is a {@link Package} stereotyped << Feature_Package >>.
      * <p>
      * The method returns <code>false</code> if the instantiation cannot be carried out.
-     * 
+     *
      * @param elt a model object
      * @return <code>true</code> if the instantiation can be carried out else <code>false</code>.
      */
@@ -136,7 +129,7 @@ public List<AttributeClass> getAttributes() {
 
     /**
      * Get the underlying {@link Package}.
-     * 
+     *
      * @return the Package represented by this proxy, never null.
      */
     @objid ("7ab59d08-1a68-48d0-9fe1-562cb5f08bbd")
@@ -200,6 +193,14 @@ public List<FeaturePackage> getSubFeatures() {
         return Collections.unmodifiableList(results);
     }
 
+    @Override
+    public List<CamelElement> getChilds() {
+        List<CamelElement> result = new ArrayList<>();
+        result.addAll(super.getChilds());
+        result.addAll(getAttributes());
+        return result;
+    }
+
     @objid ("032316ff-60a6-4503-b2db-431f420860ea")
     @Override
     public int hashCode() {
diff --git a/src/main/java/fr/softeam/cameldesigner/api/camelcore/standard/package_/SubModel.java b/src/main/java/fr/softeam/cameldesigner/api/camelcore/standard/package_/SubModel.java
index ae19efef..bde3e743 100644
--- a/src/main/java/fr/softeam/cameldesigner/api/camelcore/standard/package_/SubModel.java
+++ b/src/main/java/fr/softeam/cameldesigner/api/camelcore/standard/package_/SubModel.java
@@ -7,11 +7,15 @@
 package fr.softeam.cameldesigner.api.camelcore.standard.package_;
 
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Objects;
+import java.util.List;
 import com.modeliosoft.modelio.javadesigner.annotations.objid;
-import fr.softeam.cameldesigner.api.CamelDesignerProxyFactory;
+import org.modelio.api.module.context.IModuleContext;
+import org.modelio.metamodel.uml.infrastructure.Stereotype;
+import org.modelio.metamodel.uml.infrastructure.TagType;
+import org.modelio.metamodel.uml.statik.Package;
+import org.modelio.vcore.smkernel.mapi.MObject;
 import fr.softeam.cameldesigner.api.ICamelDesignerPeerModule;
+import fr.softeam.cameldesigner.api.camelcore.infrastructure.modelelement.CamelElement;
 import fr.softeam.cameldesigner.api.constraintmodel.standard.package_.ConstraintModel;
 import fr.softeam.cameldesigner.api.datamodel.standard.package_.DataModel;
 import fr.softeam.cameldesigner.api.deploymentmodel.standard.package_.DeploymentModel;
@@ -26,18 +30,6 @@
 import fr.softeam.cameldesigner.api.typemodel.standard.package_.TypeModel;
 import fr.softeam.cameldesigner.api.unitmodel.standard.package_.UnitModel;
 import fr.softeam.cameldesigner.impl.CamelDesignerModule;
-import org.modelio.api.modelio.model.IModelingSession;
-import org.modelio.api.modelio.model.PropertyConverter;
-import org.modelio.api.module.context.IModuleContext;
-import org.modelio.metamodel.mmextensions.infrastructure.ExtensionNotFoundException;
-import org.modelio.metamodel.uml.infrastructure.Dependency;
-import org.modelio.metamodel.uml.infrastructure.ModelElement;
-import org.modelio.metamodel.uml.infrastructure.Stereotype;
-import org.modelio.metamodel.uml.infrastructure.TagType;
-import org.modelio.metamodel.uml.infrastructure.properties.PropertyDefinition;
-import org.modelio.metamodel.uml.infrastructure.properties.PropertyTableDefinition;
-import org.modelio.metamodel.uml.statik.Package;
-import org.modelio.vcore.smkernel.mapi.MObject;
 
 /**
  * Proxy class to handle a {@link Package} with << SubModel >> stereotype.
@@ -53,7 +45,7 @@ public abstract class SubModel extends FeaturePackage {
      * Tells whether a {@link SubModel proxy} can be instantiated from a {@link MObject} checking it is a {@link Package} stereotyped << SubModel >>.
      * <p>
      * The method returns <code>false</code> if the instantiation cannot be carried out.
-     * 
+     *
      * @param elt a model object
      * @return <code>true</code> if the instantiation can be carried out else <code>false</code>.
      */
@@ -79,6 +71,13 @@ public static SubModel instantiate(final Package obj) {
                                                         UnitModel.canInstantiate(obj) ? UnitModel.instantiate(obj) : null;
     }
 
+    @Override
+    public List<CamelElement> getChilds() {
+        List<CamelElement> result = new ArrayList<>();
+        result.addAll(super.getChilds());
+        return result;
+    }
+
     @objid ("308c5d47-d90e-4926-9428-2f3daa76a5f9")
     @Override
     public boolean equals(final Object obj) {
@@ -97,7 +96,7 @@ public boolean equals(final Object obj) {
 
     /**
      * Get the underlying {@link Package}.
-     * 
+     *
      * @return the Package represented by this proxy, never null.
      */
     @objid ("223df6df-6562-40e0-b621-b8a5a6057c6f")
diff --git a/src/main/java/fr/softeam/cameldesigner/exchange/exporter/ExporterFactory.java b/src/main/java/fr/softeam/cameldesigner/exchange/exporter/ExporterFactory.java
index 3b598644..7a7b702b 100644
--- a/src/main/java/fr/softeam/cameldesigner/exchange/exporter/ExporterFactory.java
+++ b/src/main/java/fr/softeam/cameldesigner/exchange/exporter/ExporterFactory.java
@@ -1,12 +1,33 @@
 package fr.softeam.cameldesigner.exchange.exporter;
 
 import com.modeliosoft.modelio.javadesigner.annotations.objid;
+import org.modelio.metamodel.mda.ModuleComponent;
+import org.modelio.metamodel.uml.infrastructure.Dependency;
+import org.modelio.metamodel.uml.infrastructure.Element;
+import org.modelio.metamodel.uml.infrastructure.ModelElement;
+import org.modelio.metamodel.uml.infrastructure.Stereotype;
+import org.modelio.metamodel.uml.statik.Artifact;
+import org.modelio.metamodel.uml.statik.Attribute;
+import org.modelio.metamodel.uml.statik.AttributeLink;
+import org.modelio.metamodel.uml.statik.Class;
+import org.modelio.metamodel.uml.statik.Component;
+import org.modelio.metamodel.uml.statik.Connector;
+import org.modelio.metamodel.uml.statik.DataType;
+import org.modelio.metamodel.uml.statik.Enumeration;
+import org.modelio.metamodel.uml.statik.GeneralClass;
+import org.modelio.metamodel.uml.statik.Instance;
+import org.modelio.metamodel.uml.statik.Package;
+import org.modelio.metamodel.uml.statik.Port;
+import org.modelio.metamodel.visitors.IDefaultInfrastructureVisitor;
+import org.modelio.metamodel.visitors.IDefaultModelVisitor;
+import org.modelio.metamodel.visitors.IInfrastructureVisitor;
 import fr.softeam.cameldesigner.api.ICamelDesignerPeerModule;
 import fr.softeam.cameldesigner.exchange.exporter.core.AttributeAttributeExporter;
 import fr.softeam.cameldesigner.exchange.exporter.core.AttributeClassExporter;
 import fr.softeam.cameldesigner.exchange.exporter.core.FeatureClassExporter;
 import fr.softeam.cameldesigner.exchange.exporter.core.FeatureInstanceExporter;
 import fr.softeam.cameldesigner.exchange.exporter.core.FeaturePortExporter;
+import fr.softeam.cameldesigner.exchange.exporter.core.MeasurableAttributeClassExporter;
 import fr.softeam.cameldesigner.exchange.exporter.data.DataExporter;
 import fr.softeam.cameldesigner.exchange.exporter.data.DataInstanceExporter;
 import fr.softeam.cameldesigner.exchange.exporter.data.DataInstanceModelExporter;
@@ -124,26 +145,6 @@
 import fr.softeam.cameldesigner.exchange.exporter.security.SecuritySLOExporter;
 import fr.softeam.cameldesigner.exchange.exporter.type.TypeModelExporter;
 import fr.softeam.cameldesigner.exchange.exporter.unit.UnitModelExporter;
-import org.modelio.metamodel.mda.ModuleComponent;
-import org.modelio.metamodel.uml.infrastructure.Dependency;
-import org.modelio.metamodel.uml.infrastructure.Element;
-import org.modelio.metamodel.uml.infrastructure.ModelElement;
-import org.modelio.metamodel.uml.infrastructure.Stereotype;
-import org.modelio.metamodel.uml.statik.Artifact;
-import org.modelio.metamodel.uml.statik.Attribute;
-import org.modelio.metamodel.uml.statik.AttributeLink;
-import org.modelio.metamodel.uml.statik.Class;
-import org.modelio.metamodel.uml.statik.Component;
-import org.modelio.metamodel.uml.statik.Connector;
-import org.modelio.metamodel.uml.statik.DataType;
-import org.modelio.metamodel.uml.statik.Enumeration;
-import org.modelio.metamodel.uml.statik.GeneralClass;
-import org.modelio.metamodel.uml.statik.Instance;
-import org.modelio.metamodel.uml.statik.Package;
-import org.modelio.metamodel.uml.statik.Port;
-import org.modelio.metamodel.visitors.IDefaultInfrastructureVisitor;
-import org.modelio.metamodel.visitors.IDefaultModelVisitor;
-import org.modelio.metamodel.visitors.IInfrastructureVisitor;
 
 /**
  * Factory that instantiates the right exporter class for a model element stereotyped by a 'CamelDesigner' module stereotype.
@@ -157,7 +158,7 @@ public class ExporterFactory {
      * Instantiates the right proxy class the given element.
      * <br/>The model element must be stereotyped by a 'CamelDesigner' module stereotype.
      * <br/>In the other case the method will return <i>null</i>.
-     * 
+     *
      * @param e A model element
      * @return the right proxy or <i>null</i>.
      */
@@ -176,7 +177,7 @@ public static final Object instantiateExporter(final ModelElement e) {
      * Instantiates the right proxy class the given element with a stereotype name.
      * The stereotype must be one of the 'CamelDesigner' module stereotypes.
      * In the other case the method will return <i>null</i>.
-     * 
+     *
      * @param e A model element.
      * @param stName A stereotype name.
      * @return the right proxy or <i>null</i>.
@@ -255,6 +256,7 @@ public final Object visitClass(Class obj) {
             switch (this.stName) {
             case fr.softeam.cameldesigner.api.camelcore.standard.class_.AttributeClass.STEREOTYPE_NAME: return new AttributeClassExporter<>(fr.softeam.cameldesigner.api.camelcore.standard.class_.AttributeClass.instantiate(obj));
             case fr.softeam.cameldesigner.api.camelcore.standard.class_.FeatureClass.STEREOTYPE_NAME: return new FeatureClassExporter<>(fr.softeam.cameldesigner.api.camelcore.standard.class_.FeatureClass.instantiate(obj));
+            case fr.softeam.cameldesigner.api.camelcore.standard.class_.MeasurableAttributeClass.STEREOTYPE_NAME: return new MeasurableAttributeClassExporter<>(fr.softeam.cameldesigner.api.camelcore.standard.class_.MeasurableAttributeClass.instantiate(obj));
             case fr.softeam.cameldesigner.api.datamodel.standard.class_.Data.STEREOTYPE_NAME: return new DataExporter<>(fr.softeam.cameldesigner.api.datamodel.standard.class_.Data.instantiate(obj));
             case fr.softeam.cameldesigner.api.datamodel.standard.class_.DataSource.STEREOTYPE_NAME: return new DataSourceExporter<>(fr.softeam.cameldesigner.api.datamodel.standard.class_.DataSource.instantiate(obj));
             case fr.softeam.cameldesigner.api.deploymentmodel.standard.class_.RequirementSet.STEREOTYPE_NAME: return new RequirementSetExporter<>(fr.softeam.cameldesigner.api.deploymentmodel.standard.class_.RequirementSet.instantiate(obj));
@@ -466,7 +468,7 @@ public final Object visitPort(Port obj) {
         /**
          * Get the visitor to delegate to when a {@link IInfrastructureVisitor} is needed.
          * <p>If null is returned the caller will return null.
-         * 
+         *
          * @return the {@link IInfrastructureVisitor} visitor or <i>null</i>.
          */
         @objid ("811fd899-8f65-4257-b11f-cffff1d5ef23")
diff --git a/src/main/java/fr/softeam/cameldesigner/exchange/exporter/core/MeasurableAttributeExporter.java b/src/main/java/fr/softeam/cameldesigner/exchange/exporter/core/MeasurableAttributeClassExporter.java
similarity index 91%
rename from src/main/java/fr/softeam/cameldesigner/exchange/exporter/core/MeasurableAttributeExporter.java
rename to src/main/java/fr/softeam/cameldesigner/exchange/exporter/core/MeasurableAttributeClassExporter.java
index 7b76eae8..6084f88d 100644
--- a/src/main/java/fr/softeam/cameldesigner/exchange/exporter/core/MeasurableAttributeExporter.java
+++ b/src/main/java/fr/softeam/cameldesigner/exchange/exporter/core/MeasurableAttributeClassExporter.java
@@ -9,9 +9,9 @@
 import org.eclipse.emf.cdo.CDOObject;
 
 @objid ("1e3affd3-a822-46b9-9f98-e4c113b6f02f")
-public class MeasurableAttributeExporter<T extends MeasurableAttributeClass> extends CamelAttributeExporter<T> {
+public class MeasurableAttributeClassExporter<T extends MeasurableAttributeClass> extends CamelAttributeExporter<T> {
     @objid ("f26414ea-1ff1-419c-b922-2d0bdbfea187")
-    public MeasurableAttributeExporter(T elt) {
+    public MeasurableAttributeClassExporter(T elt) {
         super(elt);
     }