diff --git a/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes.edit/META-INF/MANIFEST.MF b/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes.edit/META-INF/MANIFEST.MF
index 71a92b7..b0499c1 100755
--- a/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes.edit/META-INF/MANIFEST.MF
+++ b/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes.edit/META-INF/MANIFEST.MF
@@ -10,8 +10,9 @@
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.papyrus.model2doc.core.builtintypes.provider
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.15.0,4.0.0)";resolution:=optional;x-installation:=greedy,
- org.eclipse.papyrus.model2doc.core.builtintypes;bundle-version="[0.7.0,1.0.0)",
- org.eclipse.emf.edit;bundle-version="[2.14.0,3.0.0)"
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.15.0,4.0.0)";x-installation:=greedy;resolution:=optional,
+ org.eclipse.papyrus.model2doc.core.builtintypes;bundle-version="[0.7.0,1.0.0)";visibility:=reexport,
+ org.eclipse.emf.edit;bundle-version="[2.14.0,3.0.0)";visibility:=reexport,
+ org.eclipse.uml2.common.edit;visibility:=reexport
 Import-Package: org.osgi.framework
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes.edit/plugin.properties b/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes.edit/plugin.properties
index 4970322..9f57fb2 100755
--- a/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes.edit/plugin.properties
+++ b/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes.edit/plugin.properties
@@ -47,3 +47,7 @@
 _UI_IFileReference_type = IFile Reference
 _UI_DefaultFileReference_type = Default File Reference
 _UI_DefaultFileReference_filePath_feature = File Path
+_UI_ImageFileExtension_SVG_literal = SVG
+_UI_ImageFileExtension_PNG_literal = PNG
+_UI_ImageFormat_SVG_literal = SVG
+_UI_ImageFormat_PNG_literal = PNG
diff --git a/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/META-INF/MANIFEST.MF b/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/META-INF/MANIFEST.MF
index a8e98b7..16414cf 100755
--- a/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/META-INF/MANIFEST.MF
+++ b/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/META-INF/MANIFEST.MF
@@ -11,6 +11,6 @@
 Export-Package: org.eclipse.papyrus.model2doc.core.builtintypes,
  org.eclipse.papyrus.model2doc.core.builtintypes.impl,
  org.eclipse.papyrus.model2doc.core.builtintypes.util
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.15.0,4.0.0)";resolution:=optional;x-installation:=greedy,
- org.eclipse.emf.ecore;bundle-version="[2.17.0,3.0.0)"
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.15.0,4.0.0)";x-installation:=greedy;resolution:=optional,
+ org.eclipse.emf.ecore;bundle-version="[2.17.0,3.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/model/BuiltInTypes.di b/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/model/BuiltInTypes.di
index 8c549ee..0812886 100755
--- a/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/model/BuiltInTypes.di
+++ b/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/model/BuiltInTypes.di
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<architecture:ArchitectureDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" contextId="org.eclipse.papyrus.infra.services.edit.TypeContext"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<architecture:ArchitectureDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" contextId="org.eclipse.papyrus.infra.services.edit.TypeContext"/>
diff --git a/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/model/BuiltInTypes.ecore b/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/model/BuiltInTypes.ecore
index dd5a9f8..5d9751e 100755
--- a/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/model/BuiltInTypes.ecore
+++ b/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/model/BuiltInTypes.ecore
@@ -140,4 +140,11 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
+  <eClassifiers xsi:type="ecore:EEnum" name="ImageFormat">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="This enumeration provide the list of format for images"/>
+    </eAnnotations>
+    <eLiterals name="SVG"/>
+    <eLiterals name="PNG" value="1"/>
+  </eClassifiers>
 </ecore:EPackage>
diff --git a/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/model/BuiltInTypes.genmodel b/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/model/BuiltInTypes.genmodel
index 0c33eeb..7a711ee 100755
--- a/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/model/BuiltInTypes.genmodel
+++ b/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/model/BuiltInTypes.genmodel
@@ -45,6 +45,10 @@
       <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="BuiltInTypes.ecore#//CellLocation/ROW_HEADER"/>
       <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="BuiltInTypes.ecore#//CellLocation/BODY"/>
     </genEnums>
+    <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="BuiltInTypes.ecore#//ImageFormat">
+      <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="BuiltInTypes.ecore#//ImageFormat/SVG"/>
+      <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="BuiltInTypes.ecore#//ImageFormat/PNG"/>
+    </genEnums>
     <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="BuiltInTypes.ecore#//AbstractTable">
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute BuiltInTypes.ecore#//AbstractTable/caption"/>
       <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
diff --git a/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/model/BuiltInTypes.notation b/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/model/BuiltInTypes.notation
index 1b2baeb..a50c65a 100755
--- a/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/model/BuiltInTypes.notation
+++ b/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/model/BuiltInTypes.notation
@@ -1,591 +1,633 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
-  <notation:Diagram xmi:id="_WXAMEHAKEemJ-foOn68QUw" type="PapyrusUMLClassDiagram" name="Class Diagram" measurementUnit="Pixel">
-    <children xmi:type="notation:Shape" xmi:id="_lYJ3EHAKEemJ-foOn68QUw" type="Class_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_lYJ3EnAKEemJ-foOn68QUw" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_lYKeIHAKEemJ-foOn68QUw" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_lYKeIXAKEemJ-foOn68QUw" y="15"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_lYKeInAKEemJ-foOn68QUw" type="Class_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_oRTOcHAKEemJ-foOn68QUw" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="BuiltInTypes.uml#_oRLSoHAKEemJ-foOn68QUw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_oRTOcXAKEemJ-foOn68QUw"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_lYKeI3AKEemJ-foOn68QUw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_lYKeJHAKEemJ-foOn68QUw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_lYKeJXAKEemJ-foOn68QUw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lYKeJnAKEemJ-foOn68QUw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_lYKeJ3AKEemJ-foOn68QUw" type="Class_OperationCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_wrvEIHAKEemJ-foOn68QUw" type="Operation_ClassOperationLabel">
-          <element xmi:type="uml:Operation" href="BuiltInTypes.uml#_wrfzkHAKEemJ-foOn68QUw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_wrvEIXAKEemJ-foOn68QUw"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_y96iIHAKEemJ-foOn68QUw" type="Operation_ClassOperationLabel">
-          <element xmi:type="uml:Operation" href="BuiltInTypes.uml#_y91poHAKEemJ-foOn68QUw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_y96iIXAKEemJ-foOn68QUw"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_qry4sHC_EemO3N3fNOfMKQ" type="Operation_ClassOperationLabel">
-          <element xmi:type="uml:Operation" href="BuiltInTypes.uml#_qn5QIHC_EemO3N3fNOfMKQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_qry4sXC_EemO3N3fNOfMKQ"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_lYKeKHAKEemJ-foOn68QUw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_lYKeKXAKEemJ-foOn68QUw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_lYKeKnAKEemJ-foOn68QUw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lYKeK3AKEemJ-foOn68QUw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_lYKeLHAKEemJ-foOn68QUw" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_lYKeLXAKEemJ-foOn68QUw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_lYKeLnAKEemJ-foOn68QUw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_lYKeL3AKEemJ-foOn68QUw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lYKeMHAKEemJ-foOn68QUw"/>
-      </children>
-      <element xmi:type="uml:Class" href="BuiltInTypes.uml#_lYIB4HAKEemJ-foOn68QUw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lYJ3EXAKEemJ-foOn68QUw" x="380" y="100" width="381" height="201"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_54mcUHAKEemJ-foOn68QUw" type="Class_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_54mcUnAKEemJ-foOn68QUw" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_54mcU3AKEemJ-foOn68QUw" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_54mcVHAKEemJ-foOn68QUw" y="15"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_54mcVXAKEemJ-foOn68QUw" type="Class_AttributeCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_54mcVnAKEemJ-foOn68QUw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_54mcV3AKEemJ-foOn68QUw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_54mcWHAKEemJ-foOn68QUw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_54mcWXAKEemJ-foOn68QUw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_54mcWnAKEemJ-foOn68QUw" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_54mcW3AKEemJ-foOn68QUw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_54mcXHAKEemJ-foOn68QUw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_54mcXXAKEemJ-foOn68QUw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_54mcXnAKEemJ-foOn68QUw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_54mcX3AKEemJ-foOn68QUw" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_54mcYHAKEemJ-foOn68QUw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_54mcYXAKEemJ-foOn68QUw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_54mcYnAKEemJ-foOn68QUw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_54mcY3AKEemJ-foOn68QUw"/>
-      </children>
-      <element xmi:type="uml:Class" href="BuiltInTypes.uml#_54knIHAKEemJ-foOn68QUw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_54mcUXAKEemJ-foOn68QUw" x="380" y="480" width="381" height="181"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_-RiLcHAKEemJ-foOn68QUw" type="Interface_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_-RiLcnAKEemJ-foOn68QUw" type="Interface_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_-RiLc3AKEemJ-foOn68QUw" type="Interface_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_-RiLdHAKEemJ-foOn68QUw" y="15"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_-RiLdXAKEemJ-foOn68QUw" type="Interface_AttributeCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_-RiLdnAKEemJ-foOn68QUw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_-RiLd3AKEemJ-foOn68QUw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_-RiLeHAKEemJ-foOn68QUw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-RiLeXAKEemJ-foOn68QUw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_-RiygHAKEemJ-foOn68QUw" type="Interface_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_-RiygXAKEemJ-foOn68QUw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_-RiygnAKEemJ-foOn68QUw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_-Riyg3AKEemJ-foOn68QUw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-RiyhHAKEemJ-foOn68QUw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_-RiyhXAKEemJ-foOn68QUw" type="Interface_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_-RiyhnAKEemJ-foOn68QUw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_-Riyh3AKEemJ-foOn68QUw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_-RiyiHAKEemJ-foOn68QUw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-RiyiXAKEemJ-foOn68QUw"/>
-      </children>
-      <element xmi:type="uml:Interface" href="BuiltInTypes.uml#_-Rcr4HAKEemJ-foOn68QUw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-RiLcXAKEemJ-foOn68QUw" x="40" y="100" width="201" height="201"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="__NZ90HAKEemJ-foOn68QUw" type="Class_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="__NZ90nAKEemJ-foOn68QUw" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="__NZ903AKEemJ-foOn68QUw" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="__NZ91HAKEemJ-foOn68QUw" y="15"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="__NZ91XAKEemJ-foOn68QUw" type="Class_AttributeCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="__NZ91nAKEemJ-foOn68QUw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="__NZ913AKEemJ-foOn68QUw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="__NZ92HAKEemJ-foOn68QUw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__NZ92XAKEemJ-foOn68QUw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="__NZ92nAKEemJ-foOn68QUw" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="__NZ923AKEemJ-foOn68QUw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="__NZ93HAKEemJ-foOn68QUw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="__NZ93XAKEemJ-foOn68QUw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__NZ93nAKEemJ-foOn68QUw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="__NZ933AKEemJ-foOn68QUw" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="__NZ94HAKEemJ-foOn68QUw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="__NZ94XAKEemJ-foOn68QUw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="__NZ94nAKEemJ-foOn68QUw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__NZ943AKEemJ-foOn68QUw"/>
-      </children>
-      <element xmi:type="uml:Class" href="BuiltInTypes.uml#__NYvsHAKEemJ-foOn68QUw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__NZ90XAKEemJ-foOn68QUw" x="-120" y="100"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_EUWCcHALEemJ-foOn68QUw" type="Interface_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_EUWCcnALEemJ-foOn68QUw" type="Interface_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_EUWCc3ALEemJ-foOn68QUw" type="Interface_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_EUWCdHALEemJ-foOn68QUw" y="15"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_EUWCdXALEemJ-foOn68QUw" type="Interface_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_RDmjUHALEemJ-foOn68QUw" type="Property_InterfaceAttributeLabel">
-          <element xmi:type="uml:Property" href="BuiltInTypes.uml#_RDZH8HALEemJ-foOn68QUw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_RDmjUXALEemJ-foOn68QUw"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_EUWCdnALEemJ-foOn68QUw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_EUWCd3ALEemJ-foOn68QUw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_EUWCeHALEemJ-foOn68QUw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EUWCeXALEemJ-foOn68QUw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_EUWCenALEemJ-foOn68QUw" type="Interface_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_EUWCe3ALEemJ-foOn68QUw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_EUWCfHALEemJ-foOn68QUw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_EUWCfXALEemJ-foOn68QUw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EUWCfnALEemJ-foOn68QUw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_EUWCf3ALEemJ-foOn68QUw" type="Interface_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_EUWCgHALEemJ-foOn68QUw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_EUWCgXALEemJ-foOn68QUw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_EUWCgnALEemJ-foOn68QUw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EUWCg3ALEemJ-foOn68QUw"/>
-      </children>
-      <element xmi:type="uml:Interface" href="BuiltInTypes.uml#_EUUNQHALEemJ-foOn68QUw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EUWCcXALEemJ-foOn68QUw" x="40" y="380" width="201"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_H_h6wHALEemJ-foOn68QUw" type="Enumeration_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_H_h6wnALEemJ-foOn68QUw" type="Enumeration_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_H_h6w3ALEemJ-foOn68QUw" type="Enumeration_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_H_h6xHALEemJ-foOn68QUw" y="15"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_H_h6xXALEemJ-foOn68QUw" type="Enumeration_LiteralCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_I24ZgHALEemJ-foOn68QUw" type="EnumerationLiteral_LiteralLabel">
-          <element xmi:type="uml:EnumerationLiteral" href="BuiltInTypes.uml#_I2oh4HALEemJ-foOn68QUw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_I24ZgXALEemJ-foOn68QUw"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_JsnHoHALEemJ-foOn68QUw" type="EnumerationLiteral_LiteralLabel">
-          <element xmi:type="uml:EnumerationLiteral" href="BuiltInTypes.uml#_JsUzwHALEemJ-foOn68QUw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_JsnHoXALEemJ-foOn68QUw"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_LQq7YHALEemJ-foOn68QUw" type="EnumerationLiteral_LiteralLabel">
-          <element xmi:type="uml:EnumerationLiteral" href="BuiltInTypes.uml#_LQhKYHALEemJ-foOn68QUw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_LQq7YXALEemJ-foOn68QUw"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_NdafwHALEemJ-foOn68QUw" type="EnumerationLiteral_LiteralLabel">
-          <element xmi:type="uml:EnumerationLiteral" href="BuiltInTypes.uml#_NdPgoHALEemJ-foOn68QUw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_NdafwXALEemJ-foOn68QUw"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_H_h6xnALEemJ-foOn68QUw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_H_h6x3ALEemJ-foOn68QUw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_H_h6yHALEemJ-foOn68QUw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H_h6yXALEemJ-foOn68QUw"/>
-      </children>
-      <element xmi:type="uml:Enumeration" href="BuiltInTypes.uml#_H_dCQHALEemJ-foOn68QUw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H_h6wXALEemJ-foOn68QUw" x="-120" y="280"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_XySo4HALEemJ-foOn68QUw" type="Class_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_XyTP8HALEemJ-foOn68QUw" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_XyTP8XALEemJ-foOn68QUw" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_XyTP8nALEemJ-foOn68QUw" y="15"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_XyTP83ALEemJ-foOn68QUw" type="Class_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_Y5orcHALEemJ-foOn68QUw" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="BuiltInTypes.uml#_Y5VwgHALEemJ-foOn68QUw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_Y5orcXALEemJ-foOn68QUw"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_XyTP9HALEemJ-foOn68QUw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_XyTP9XALEemJ-foOn68QUw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_XyTP9nALEemJ-foOn68QUw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XyTP93ALEemJ-foOn68QUw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_XyTP-HALEemJ-foOn68QUw" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_XyTP-XALEemJ-foOn68QUw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_XyT3AHALEemJ-foOn68QUw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_XyT3AXALEemJ-foOn68QUw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XyT3AnALEemJ-foOn68QUw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_XyT3A3ALEemJ-foOn68QUw" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_XyT3BHALEemJ-foOn68QUw"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_XyT3BXALEemJ-foOn68QUw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_XyT3BnALEemJ-foOn68QUw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XyT3B3ALEemJ-foOn68QUw"/>
-      </children>
-      <element xmi:type="uml:Class" href="BuiltInTypes.uml#_XyQMoHALEemJ-foOn68QUw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XySo4XALEemJ-foOn68QUw" x="40" y="560" width="201"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_L-AboHsFEemo4rKYxRobdQ" type="Class_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_L-CQ0HsFEemo4rKYxRobdQ" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_L-C34HsFEemo4rKYxRobdQ" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_L-C34XsFEemo4rKYxRobdQ" y="15"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_L-C34nsFEemo4rKYxRobdQ" type="Class_AttributeCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_L-C343sFEemo4rKYxRobdQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_L-C35HsFEemo4rKYxRobdQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_L-C35XsFEemo4rKYxRobdQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L-C35nsFEemo4rKYxRobdQ"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_L-C353sFEemo4rKYxRobdQ" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_L-C36HsFEemo4rKYxRobdQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_L-C36XsFEemo4rKYxRobdQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_L-C36nsFEemo4rKYxRobdQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L-C363sFEemo4rKYxRobdQ"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_L-C37HsFEemo4rKYxRobdQ" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_L-De8HsFEemo4rKYxRobdQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_L-De8XsFEemo4rKYxRobdQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_L-De8nsFEemo4rKYxRobdQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L-De83sFEemo4rKYxRobdQ"/>
-      </children>
-      <element xmi:type="uml:Class" href="BuiltInTypes.uml#_L9zAQHsFEemo4rKYxRobdQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L-BCsHsFEemo4rKYxRobdQ" x="940" y="100" width="261" height="201"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_Pum_cHsFEemo4rKYxRobdQ" type="Interface_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_Pum_cnsFEemo4rKYxRobdQ" type="Interface_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Pum_c3sFEemo4rKYxRobdQ" type="Interface_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Pum_dHsFEemo4rKYxRobdQ" y="15"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_PunmgHsFEemo4rKYxRobdQ" type="Interface_AttributeCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_PunmgXsFEemo4rKYxRobdQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_PunmgnsFEemo4rKYxRobdQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Punmg3sFEemo4rKYxRobdQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PunmhHsFEemo4rKYxRobdQ"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_PunmhXsFEemo4rKYxRobdQ" type="Interface_OperationCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_VvJlkHsFEemo4rKYxRobdQ" type="Operation_InterfaceOperationLabel">
-          <element xmi:type="uml:Operation" href="BuiltInTypes.uml#_VueQIHsFEemo4rKYxRobdQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_VvJlkXsFEemo4rKYxRobdQ"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_PunmhnsFEemo4rKYxRobdQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_Punmh3sFEemo4rKYxRobdQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_PunmiHsFEemo4rKYxRobdQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PunmiXsFEemo4rKYxRobdQ"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_PunminsFEemo4rKYxRobdQ" type="Interface_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_Punmi3sFEemo4rKYxRobdQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_PunmjHsFEemo4rKYxRobdQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_PunmjXsFEemo4rKYxRobdQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PunmjnsFEemo4rKYxRobdQ"/>
-      </children>
-      <element xmi:type="uml:Interface" href="BuiltInTypes.uml#_PugRwHsFEemo4rKYxRobdQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Pum_cXsFEemo4rKYxRobdQ" x="1320" y="100" width="161" height="201"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_d6KfMHsFEemo4rKYxRobdQ" type="Class_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_d6KfMnsFEemo4rKYxRobdQ" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_d6LGQHsFEemo4rKYxRobdQ" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_d6LGQXsFEemo4rKYxRobdQ" y="15"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_d6LGQnsFEemo4rKYxRobdQ" type="Class_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_rUsxsHsFEemo4rKYxRobdQ" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="BuiltInTypes.uml#_rUG70HsFEemo4rKYxRobdQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_rUsxsXsFEemo4rKYxRobdQ"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_d6LGQ3sFEemo4rKYxRobdQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_d6LGRHsFEemo4rKYxRobdQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_d6LGRXsFEemo4rKYxRobdQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_d6LGRnsFEemo4rKYxRobdQ"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_d6LGR3sFEemo4rKYxRobdQ" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_d6LGSHsFEemo4rKYxRobdQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_d6LGSXsFEemo4rKYxRobdQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_d6LGSnsFEemo4rKYxRobdQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_d6LGS3sFEemo4rKYxRobdQ"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_d6LGTHsFEemo4rKYxRobdQ" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_d6LGTXsFEemo4rKYxRobdQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_d6LGTnsFEemo4rKYxRobdQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_d6LGT3sFEemo4rKYxRobdQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_d6LGUHsFEemo4rKYxRobdQ"/>
-      </children>
-      <element xmi:type="uml:Class" href="BuiltInTypes.uml#_d6G00HsFEemo4rKYxRobdQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_d6KfMXsFEemo4rKYxRobdQ" x="1320" y="480" width="161" height="181"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_iB8z8HsFEemo4rKYxRobdQ" type="Class_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_iB9bAHsFEemo4rKYxRobdQ" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_iB9bAXsFEemo4rKYxRobdQ" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_iB9bAnsFEemo4rKYxRobdQ" y="15"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_iB9bA3sFEemo4rKYxRobdQ" type="Class_AttributeCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_iB9bBHsFEemo4rKYxRobdQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_iB9bBXsFEemo4rKYxRobdQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_iB9bBnsFEemo4rKYxRobdQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iB9bB3sFEemo4rKYxRobdQ"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_iB9bCHsFEemo4rKYxRobdQ" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_iB9bCXsFEemo4rKYxRobdQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_iB9bCnsFEemo4rKYxRobdQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_iB9bC3sFEemo4rKYxRobdQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iB9bDHsFEemo4rKYxRobdQ"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_iB-CEHsFEemo4rKYxRobdQ" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_iB-CEXsFEemo4rKYxRobdQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_iB-CEnsFEemo4rKYxRobdQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_iB-CE3sFEemo4rKYxRobdQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iB-CFHsFEemo4rKYxRobdQ"/>
-      </children>
-      <element xmi:type="uml:Class" href="BuiltInTypes.uml#_iB5woHsFEemo4rKYxRobdQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iB8z8XsFEemo4rKYxRobdQ" x="940" y="480" width="261" height="181"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_o1ShAJQUEemHKPZQudxUGA" type="Interface_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_o1WycJQUEemHKPZQudxUGA" type="Interface_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_o1WycZQUEemHKPZQudxUGA" type="Interface_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_o1XZgJQUEemHKPZQudxUGA" y="15"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_o1XZgZQUEemHKPZQudxUGA" type="Interface_AttributeCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_o1XZgpQUEemHKPZQudxUGA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_o1XZg5QUEemHKPZQudxUGA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_o1XZhJQUEemHKPZQudxUGA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o1XZhZQUEemHKPZQudxUGA"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_o1XZhpQUEemHKPZQudxUGA" type="Interface_OperationCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_6H7tgJQUEemHKPZQudxUGA" type="Operation_InterfaceOperationLabel">
-          <element xmi:type="uml:Operation" href="BuiltInTypes.uml#_6HWesJQUEemHKPZQudxUGA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_6H7tgZQUEemHKPZQudxUGA"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_o1XZh5QUEemHKPZQudxUGA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_o1XZiJQUEemHKPZQudxUGA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_o1XZiZQUEemHKPZQudxUGA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o1XZipQUEemHKPZQudxUGA"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_o1XZi5QUEemHKPZQudxUGA" type="Interface_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_o1XZjJQUEemHKPZQudxUGA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_o1XZjZQUEemHKPZQudxUGA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_o1XZjpQUEemHKPZQudxUGA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o1XZj5QUEemHKPZQudxUGA"/>
-      </children>
-      <element xmi:type="uml:Interface" href="BuiltInTypes.uml#_o1CCUJQUEemHKPZQudxUGA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o1ShAZQUEemHKPZQudxUGA" x="40" y="780" width="201" height="121"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_tMGwQJQUEemHKPZQudxUGA" type="Class_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_tMHXUJQUEemHKPZQudxUGA" type="Class_NameLabel"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_tMHXUZQUEemHKPZQudxUGA" type="Class_FloatingNameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_tMHXUpQUEemHKPZQudxUGA" y="15"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_tMHXU5QUEemHKPZQudxUGA" type="Class_AttributeCompartment">
-        <children xmi:type="notation:Shape" xmi:id="_B6XvEJQVEemHKPZQudxUGA" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="BuiltInTypes.uml#_B56cEJQVEemHKPZQudxUGA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_B6XvEZQVEemHKPZQudxUGA"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_tMHXVJQUEemHKPZQudxUGA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_tMHXVZQUEemHKPZQudxUGA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_tMHXVpQUEemHKPZQudxUGA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tMHXV5QUEemHKPZQudxUGA"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_tMHXWJQUEemHKPZQudxUGA" type="Class_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_tMHXWZQUEemHKPZQudxUGA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_tMHXWpQUEemHKPZQudxUGA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_tMHXW5QUEemHKPZQudxUGA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tMHXXJQUEemHKPZQudxUGA"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_tMH-YJQUEemHKPZQudxUGA" type="Class_NestedClassifierCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_tMH-YZQUEemHKPZQudxUGA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_tMH-YpQUEemHKPZQudxUGA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_tMH-Y5QUEemHKPZQudxUGA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tMH-ZJQUEemHKPZQudxUGA"/>
-      </children>
-      <element xmi:type="uml:Class" href="BuiltInTypes.uml#_tL-NYJQUEemHKPZQudxUGA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tMGwQZQUEemHKPZQudxUGA" x="40" y="980" width="201"/>
-    </children>
-    <styles xmi:type="notation:StringValueStyle" xmi:id="_WXAMEXAKEemJ-foOn68QUw" name="diagram_compatibility_version" stringValue="1.4.0"/>
-    <styles xmi:type="notation:DiagramStyle" xmi:id="_WXAMEnAKEemJ-foOn68QUw"/>
-    <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_WXAME3AKEemJ-foOn68QUw" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
-      <owner xmi:type="uml:Model" href="BuiltInTypes.uml#_WW0l4HAKEemJ-foOn68QUw"/>
-    </styles>
-    <element xmi:type="uml:Model" href="BuiltInTypes.uml#_WW0l4HAKEemJ-foOn68QUw"/>
-    <edges xmi:type="notation:Connector" xmi:id="_8qDQQHAKEemJ-foOn68QUw" type="Generalization_Edge" source="_54mcUHAKEemJ-foOn68QUw" target="_lYJ3EHAKEemJ-foOn68QUw">
-      <children xmi:type="notation:DecorationNode" xmi:id="_8qDQQ3AKEemJ-foOn68QUw" type="Generalization_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_fmEH8HCfEemJ-foOn68QUw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_8qDQRHAKEemJ-foOn68QUw" y="40"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_8qDQQXAKEemJ-foOn68QUw"/>
-      <element xmi:type="uml:Generalization" href="BuiltInTypes.uml#_8p8ikHAKEemJ-foOn68QUw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8qDQQnAKEemJ-foOn68QUw" points="[360, 400, -643984, -643984]$[360, 359, -643984, -643984]$[580, 359, -643984, -643984]$[580, 301, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8qQEkHAKEemJ-foOn68QUw" id="(0.5249343832020997,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8qQEkXAKEemJ-foOn68QUw" id="(0.5249343832020997,1.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_C77eAHALEemJ-foOn68QUw" type="InterfaceRealization_Edge" source="__NZ90HAKEemJ-foOn68QUw" target="_-RiLcHAKEemJ-foOn68QUw">
-      <children xmi:type="notation:DecorationNode" xmi:id="_C77eA3ALEemJ-foOn68QUw" type="InterfaceRealization_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_hO6VEHCfEemJ-foOn68QUw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_C77eBHALEemJ-foOn68QUw" y="40"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_C77eBXALEemJ-foOn68QUw" type="InterfaceRealization_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_hPLa0HCfEemJ-foOn68QUw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_C77eBnALEemJ-foOn68QUw" y="60"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_C77eAXALEemJ-foOn68QUw"/>
-      <element xmi:type="uml:InterfaceRealization" href="BuiltInTypes.uml#_C7ojEHALEemJ-foOn68QUw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_C77eAnALEemJ-foOn68QUw" points="[-20, 160, -643984, -643984]$[0, 160, -643984, -643984]$[0, 140, -643984, -643984]$[40, 140, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_C8QOIHALEemJ-foOn68QUw" id="(1.0,0.4)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_C8QOIXALEemJ-foOn68QUw" id="(0.0,0.19900497512437812)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_FWDXEHALEemJ-foOn68QUw" type="Association_Edge" source="_-RiLcHAKEemJ-foOn68QUw" target="_EUWCcHALEemJ-foOn68QUw">
-      <children xmi:type="notation:DecorationNode" xmi:id="_FWDXE3ALEemJ-foOn68QUw" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_hNy6wHCfEemJ-foOn68QUw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_FWDXFHALEemJ-foOn68QUw" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_FWDXFXALEemJ-foOn68QUw" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_hN-g8HCfEemJ-foOn68QUw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_FWDXFnALEemJ-foOn68QUw" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_FWDXF3ALEemJ-foOn68QUw" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_hOJgEHCfEemJ-foOn68QUw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_FWDXGHALEemJ-foOn68QUw" x="29" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_FWDXGXALEemJ-foOn68QUw" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_hOVtUHCfEemJ-foOn68QUw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_FWD-IHALEemJ-foOn68QUw" x="-29" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_FWD-IXALEemJ-foOn68QUw" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_hOhTgHCfEemJ-foOn68QUw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_FWD-InALEemJ-foOn68QUw" x="29" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_FWD-I3ALEemJ-foOn68QUw" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_hOs5sHCfEemJ-foOn68QUw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_FWD-JHALEemJ-foOn68QUw" x="-29" y="-20"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_FWDXEXALEemJ-foOn68QUw"/>
-      <element xmi:type="uml:Association" href="BuiltInTypes.uml#_FVt_4HALEemJ-foOn68QUw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_FWDXEnALEemJ-foOn68QUw" points="[140, 301, -643984, -643984]$[140, 380, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FWeN0HALEemJ-foOn68QUw" id="(0.4975124378109453,1.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FWe04HALEemJ-foOn68QUw" id="(0.4975124378109453,0.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_cvs-EHALEemJ-foOn68QUw" type="InterfaceRealization_Edge" source="_XySo4HALEemJ-foOn68QUw" target="_EUWCcHALEemJ-foOn68QUw">
-      <children xmi:type="notation:DecorationNode" xmi:id="_cvs-E3ALEemJ-foOn68QUw" type="InterfaceRealization_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_inTEUHCfEemJ-foOn68QUw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cvs-FHALEemJ-foOn68QUw" y="40"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_cvs-FXALEemJ-foOn68QUw" type="InterfaceRealization_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ineqgHCfEemJ-foOn68QUw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cvs-FnALEemJ-foOn68QUw" y="60"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_cvs-EXALEemJ-foOn68QUw"/>
-      <element xmi:type="uml:InterfaceRealization" href="BuiltInTypes.uml#_cvcfYHALEemJ-foOn68QUw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_cvs-EnALEemJ-foOn68QUw" points="[140, 560, -643984, -643984]$[140, 520, -643984, -643984]$[140, 491, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_cwN7cHALEemJ-foOn68QUw" id="(0.4975124378109453,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_cwN7cXALEemJ-foOn68QUw" id="(0.4975124378109453,1.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_eFgTYHALEemJ-foOn68QUw" type="Association_Edge" source="_lYJ3EHAKEemJ-foOn68QUw" target="_-RiLcHAKEemJ-foOn68QUw">
-      <children xmi:type="notation:DecorationNode" xmi:id="_eFgTY3ALEemJ-foOn68QUw" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_fksO8HCfEemJ-foOn68QUw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_eFgTZHALEemJ-foOn68QUw" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_eFgTZXALEemJ-foOn68QUw" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_fk6RYHCfEemJ-foOn68QUw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_eFgTZnALEemJ-foOn68QUw" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_eFgTZ3ALEemJ-foOn68QUw" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_flHFsHCfEemJ-foOn68QUw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_eFgTaHALEemJ-foOn68QUw" x="6" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_eFgTaXALEemJ-foOn68QUw" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_flSr4HCfEemJ-foOn68QUw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_eFgTanALEemJ-foOn68QUw" x="-6" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_eFgTa3ALEemJ-foOn68QUw" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_fljKkHCfEemJ-foOn68QUw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_eFgTbHALEemJ-foOn68QUw" x="6" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_eFgTbXALEemJ-foOn68QUw" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_fl03YHCfEemJ-foOn68QUw" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_eFgTbnALEemJ-foOn68QUw" x="-6" y="-20"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_eFgTYXALEemJ-foOn68QUw"/>
-      <element xmi:type="uml:Association" href="BuiltInTypes.uml#_eFIf8HALEemJ-foOn68QUw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_eFgTYnALEemJ-foOn68QUw" points="[380, 160, -643984, -643984]$[201, 160, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_eGFiMHALEemJ-foOn68QUw" id="(0.0,0.29850746268656714)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_eGFiMXALEemJ-foOn68QUw" id="(1.0,0.29850746268656714)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_R4CxIHsFEemo4rKYxRobdQ" type="Association_Edge" source="_L-AboHsFEemo4rKYxRobdQ" target="_Pum_cHsFEemo4rKYxRobdQ">
-      <children xmi:type="notation:DecorationNode" xmi:id="_R4DYMHsFEemo4rKYxRobdQ" type="Association_StereotypeLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_R4DYMXsFEemo4rKYxRobdQ" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_R4DYMnsFEemo4rKYxRobdQ" type="Association_NameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_R4DYM3sFEemo4rKYxRobdQ" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_R4DYNHsFEemo4rKYxRobdQ" type="Association_TargetRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_R4DYNXsFEemo4rKYxRobdQ" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_R4DYNnsFEemo4rKYxRobdQ" type="Association_SourceRoleLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_R4DYN3sFEemo4rKYxRobdQ" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_R4DYOHsFEemo4rKYxRobdQ" type="Association_SourceMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_R4DYOXsFEemo4rKYxRobdQ" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_R4DYOnsFEemo4rKYxRobdQ" type="Association_TargetMultiplicityLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_R4DYO3sFEemo4rKYxRobdQ" y="-20"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_R4CxIXsFEemo4rKYxRobdQ"/>
-      <element xmi:type="uml:Association" href="BuiltInTypes.uml#_R3k3EHsFEemo4rKYxRobdQ"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_R4CxInsFEemo4rKYxRobdQ" points="[1201, 160, -643984, -643984]$[1320, 160, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_R5Er4HsFEemo4rKYxRobdQ" id="(1.0,0.29850746268656714)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_R5Er4XsFEemo4rKYxRobdQ" id="(0.0,0.29850746268656714)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_l5OAcHsFEemo4rKYxRobdQ" type="Generalization_Edge" source="_iB8z8HsFEemo4rKYxRobdQ" target="_L-AboHsFEemo4rKYxRobdQ">
-      <children xmi:type="notation:DecorationNode" xmi:id="_l5OngHsFEemo4rKYxRobdQ" type="Generalization_StereotypeLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_l5OngXsFEemo4rKYxRobdQ" y="40"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_l5OAcXsFEemo4rKYxRobdQ"/>
-      <element xmi:type="uml:Generalization" href="BuiltInTypes.uml#_l4mVYHsFEemo4rKYxRobdQ"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l5OAcnsFEemo4rKYxRobdQ" points="[1080, 480, -643984, -643984]$[1080, 301, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6ImcHsFEemo4rKYxRobdQ" id="(0.5363984674329502,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6ImcXsFEemo4rKYxRobdQ" id="(0.5363984674329502,1.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_opwOYHsFEemo4rKYxRobdQ" type="InterfaceRealization_Edge" source="_d6KfMHsFEemo4rKYxRobdQ" target="_Pum_cHsFEemo4rKYxRobdQ">
-      <children xmi:type="notation:DecorationNode" xmi:id="_opwOY3sFEemo4rKYxRobdQ" type="InterfaceRealization_StereotypeLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_opwOZHsFEemo4rKYxRobdQ" y="40"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_opwOZXsFEemo4rKYxRobdQ" type="InterfaceRealization_NameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_opwOZnsFEemo4rKYxRobdQ" y="60"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_opwOYXsFEemo4rKYxRobdQ"/>
-      <element xmi:type="uml:InterfaceRealization" href="BuiltInTypes.uml#_opH8QHsFEemo4rKYxRobdQ"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_opwOYnsFEemo4rKYxRobdQ" points="[1400, 480, -643984, -643984]$[1400, 399, -643984, -643984]$[1400, 301, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oq6E8HsFEemo4rKYxRobdQ" id="(0.4968944099378882,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oq6E8XsFEemo4rKYxRobdQ" id="(0.4968944099378882,1.0)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_5G3TQHvEEemmnMs_VyNz8A" type="Association_Edge" source="_Pum_cHsFEemo4rKYxRobdQ" target="_Pum_cHsFEemo4rKYxRobdQ">
-      <children xmi:type="notation:DecorationNode" xmi:id="_5G3TQ3vEEemmnMs_VyNz8A" type="Association_StereotypeLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_51pE0HvEEemmnMs_VyNz8A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_5G3TRHvEEemmnMs_VyNz8A" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_5G3TRXvEEemmnMs_VyNz8A" type="Association_NameLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_52NskHvEEemmnMs_VyNz8A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_5G3TRnvEEemmnMs_VyNz8A" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_5G3TR3vEEemmnMs_VyNz8A" type="Association_TargetRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_52rmoHvEEemmnMs_VyNz8A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_5G3TSHvEEemmnMs_VyNz8A" x="52" y="-60"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_5G36UHvEEemmnMs_VyNz8A" type="Association_SourceRoleLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_53ISkHvEEemmnMs_VyNz8A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_5G36UXvEEemmnMs_VyNz8A" x="-29" y="-43"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_5G36UnvEEemmnMs_VyNz8A" type="Association_SourceMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_53mzsHvEEemmnMs_VyNz8A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_5G36U3vEEemmnMs_VyNz8A" x="52" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_5G36VHvEEemmnMs_VyNz8A" type="Association_TargetMultiplicityLabel">
-        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_54FU0HvEEemmnMs_VyNz8A" name="IS_UPDATED_POSITION" booleanValue="true"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_5G36VXvEEemmnMs_VyNz8A" x="-29" y="-83"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_5G3TQXvEEemmnMs_VyNz8A"/>
-      <element xmi:type="uml:Association" href="BuiltInTypes.uml#_5GOaEHvEEemmnMs_VyNz8A"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_5G3TQnvEEemmnMs_VyNz8A" points="[1400, 100, -643984, -643984]$[1400, 60, -643984, -643984]$[1543, 60, -643984, -643984]$[1543, 200, -643984, -643984]$[1481, 200, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5H-tkHvEEemmnMs_VyNz8A" id="(0.4968944099378882,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5H_UoHvEEemmnMs_VyNz8A" id="(1.0,0.4975124378109453)"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_ALsmwJQVEemHKPZQudxUGA" type="InterfaceRealization_Edge" source="_tMGwQJQUEemHKPZQudxUGA" target="_o1ShAJQUEemHKPZQudxUGA">
-      <children xmi:type="notation:DecorationNode" xmi:id="_ALtN0JQVEemHKPZQudxUGA" type="InterfaceRealization_StereotypeLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ALtN0ZQVEemHKPZQudxUGA" y="40"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_ALtN0pQVEemHKPZQudxUGA" type="InterfaceRealization_NameLabel">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ALtN05QVEemHKPZQudxUGA" y="60"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_ALsmwZQVEemHKPZQudxUGA"/>
-      <element xmi:type="uml:InterfaceRealization" href="BuiltInTypes.uml#_AK-1EJQVEemHKPZQudxUGA"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ALsmwpQVEemHKPZQudxUGA" points="[140, 980, -643984, -643984]$[140, 891, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AM784JQVEemHKPZQudxUGA" id="(0.4975124378109453,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AM784ZQVEemHKPZQudxUGA" id="(0.4975124378109453,1.0)"/>
-    </edges>
-  </notation:Diagram>
-  <css:ModelStyleSheets xmi:id="_ePy4kHCfEemJ-foOn68QUw">
-    <stylesheets xmi:type="css:StyleSheetReference" xmi:id="_eP0GsHCfEemJ-foOn68QUw" path="/org.eclipse.papyrus.model2doc.core.builtintypes/model/custom.css"/>
-  </css:ModelStyleSheets>
-</xmi:XMI>
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:css="http://www.eclipse.org/papyrus/infra/gmfdiag/css" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.3/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
+  <notation:Diagram xmi:id="_WXAMEHAKEemJ-foOn68QUw" type="PapyrusUMLClassDiagram" name="Class Diagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_lYJ3EHAKEemJ-foOn68QUw" type="Class_Shape" fontName="Segoe UI" italic="true" fillColor="14538691" transparency="0" gradient="16777215, -1, 0" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_lYJ3EnAKEemJ-foOn68QUw" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_lYKeIHAKEemJ-foOn68QUw" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_lYKeIXAKEemJ-foOn68QUw" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lYKeInAKEemJ-foOn68QUw" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_oRTOcHAKEemJ-foOn68QUw" type="Property_ClassAttributeLabel" fontName="Segoe UI" fillColor="14012867" transparency="0" gradient="16777215, -1, 0" lineColor="0">
+          <element xmi:type="uml:Property" href="BuiltInTypes.uml#_oRLSoHAKEemJ-foOn68QUw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_oRTOcXAKEemJ-foOn68QUw"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lYKeI3AKEemJ-foOn68QUw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_lYKeJHAKEemJ-foOn68QUw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_lYKeJXAKEemJ-foOn68QUw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lYKeJnAKEemJ-foOn68QUw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lYKeJ3AKEemJ-foOn68QUw" type="Class_OperationCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_wrvEIHAKEemJ-foOn68QUw" type="Operation_ClassOperationLabel" fontName="Segoe UI" fillColor="14012867" transparency="0" gradient="16777215, -1, 0" lineColor="0">
+          <element xmi:type="uml:Operation" href="BuiltInTypes.uml#_wrfzkHAKEemJ-foOn68QUw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_wrvEIXAKEemJ-foOn68QUw"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_y96iIHAKEemJ-foOn68QUw" type="Operation_ClassOperationLabel" fontName="Segoe UI" fillColor="14012867" transparency="0" gradient="16777215, -1, 0" lineColor="0">
+          <element xmi:type="uml:Operation" href="BuiltInTypes.uml#_y91poHAKEemJ-foOn68QUw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_y96iIXAKEemJ-foOn68QUw"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_qry4sHC_EemO3N3fNOfMKQ" type="Operation_ClassOperationLabel" fontName="Segoe UI" fillColor="14012867" transparency="0" gradient="16777215, -1, 0" lineColor="0">
+          <element xmi:type="uml:Operation" href="BuiltInTypes.uml#_qn5QIHC_EemO3N3fNOfMKQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_qry4sXC_EemO3N3fNOfMKQ"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lYKeKHAKEemJ-foOn68QUw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_lYKeKXAKEemJ-foOn68QUw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_lYKeKnAKEemJ-foOn68QUw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lYKeK3AKEemJ-foOn68QUw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lYKeLHAKEemJ-foOn68QUw" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lYKeLXAKEemJ-foOn68QUw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_lYKeLnAKEemJ-foOn68QUw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_lYKeL3AKEemJ-foOn68QUw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lYKeMHAKEemJ-foOn68QUw"/>
+      </children>
+      <element xmi:type="uml:Class" href="BuiltInTypes.uml#_lYIB4HAKEemJ-foOn68QUw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lYJ3EXAKEemJ-foOn68QUw" x="380" y="100" width="381" height="201"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_54mcUHAKEemJ-foOn68QUw" type="Class_Shape" fontName="Segoe UI" fillColor="14538691" transparency="0" gradient="16777215, -1, 0" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_54mcUnAKEemJ-foOn68QUw" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_54mcU3AKEemJ-foOn68QUw" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_54mcVHAKEemJ-foOn68QUw" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_54mcVXAKEemJ-foOn68QUw" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_54mcVnAKEemJ-foOn68QUw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_54mcV3AKEemJ-foOn68QUw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_54mcWHAKEemJ-foOn68QUw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_54mcWXAKEemJ-foOn68QUw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_54mcWnAKEemJ-foOn68QUw" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_54mcW3AKEemJ-foOn68QUw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_54mcXHAKEemJ-foOn68QUw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_54mcXXAKEemJ-foOn68QUw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_54mcXnAKEemJ-foOn68QUw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_54mcX3AKEemJ-foOn68QUw" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_54mcYHAKEemJ-foOn68QUw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_54mcYXAKEemJ-foOn68QUw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_54mcYnAKEemJ-foOn68QUw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_54mcY3AKEemJ-foOn68QUw"/>
+      </children>
+      <element xmi:type="uml:Class" href="BuiltInTypes.uml#_54knIHAKEemJ-foOn68QUw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_54mcUXAKEemJ-foOn68QUw" x="380" y="480" width="381" height="181"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_-RiLcHAKEemJ-foOn68QUw" type="Interface_Shape" fontName="Segoe UI" fillColor="14012867" transparency="0" gradient="16777215, -1, 0" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_-RiLcnAKEemJ-foOn68QUw" type="Interface_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_-RiLc3AKEemJ-foOn68QUw" type="Interface_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_-RiLdHAKEemJ-foOn68QUw" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_-RiLdXAKEemJ-foOn68QUw" type="Interface_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_-RiLdnAKEemJ-foOn68QUw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_-RiLd3AKEemJ-foOn68QUw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_-RiLeHAKEemJ-foOn68QUw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-RiLeXAKEemJ-foOn68QUw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_-RiygHAKEemJ-foOn68QUw" type="Interface_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_-RiygXAKEemJ-foOn68QUw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_-RiygnAKEemJ-foOn68QUw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_-Riyg3AKEemJ-foOn68QUw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-RiyhHAKEemJ-foOn68QUw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_-RiyhXAKEemJ-foOn68QUw" type="Interface_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_-RiyhnAKEemJ-foOn68QUw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_-Riyh3AKEemJ-foOn68QUw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_-RiyiHAKEemJ-foOn68QUw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-RiyiXAKEemJ-foOn68QUw"/>
+      </children>
+      <element xmi:type="uml:Interface" href="BuiltInTypes.uml#_-Rcr4HAKEemJ-foOn68QUw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-RiLcXAKEemJ-foOn68QUw" x="40" y="100" width="201" height="201"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="__NZ90HAKEemJ-foOn68QUw" type="Class_Shape" fontName="Segoe UI" fillColor="14538691" transparency="0" gradient="16777215, -1, 0" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="__NZ90nAKEemJ-foOn68QUw" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="__NZ903AKEemJ-foOn68QUw" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__NZ91HAKEemJ-foOn68QUw" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__NZ91XAKEemJ-foOn68QUw" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__NZ91nAKEemJ-foOn68QUw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__NZ913AKEemJ-foOn68QUw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__NZ92HAKEemJ-foOn68QUw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__NZ92XAKEemJ-foOn68QUw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__NZ92nAKEemJ-foOn68QUw" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__NZ923AKEemJ-foOn68QUw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__NZ93HAKEemJ-foOn68QUw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__NZ93XAKEemJ-foOn68QUw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__NZ93nAKEemJ-foOn68QUw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__NZ933AKEemJ-foOn68QUw" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__NZ94HAKEemJ-foOn68QUw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__NZ94XAKEemJ-foOn68QUw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__NZ94nAKEemJ-foOn68QUw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__NZ943AKEemJ-foOn68QUw"/>
+      </children>
+      <element xmi:type="uml:Class" href="BuiltInTypes.uml#__NYvsHAKEemJ-foOn68QUw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__NZ90XAKEemJ-foOn68QUw" x="-120" y="100"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_EUWCcHALEemJ-foOn68QUw" type="Interface_Shape" fontName="Segoe UI" fillColor="14012867" transparency="0" gradient="16777215, -1, 0" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_EUWCcnALEemJ-foOn68QUw" type="Interface_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_EUWCc3ALEemJ-foOn68QUw" type="Interface_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_EUWCdHALEemJ-foOn68QUw" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_EUWCdXALEemJ-foOn68QUw" type="Interface_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_RDmjUHALEemJ-foOn68QUw" type="Property_InterfaceAttributeLabel" fontName="Segoe UI" fillColor="14012867" transparency="0" gradient="16777215, -1, 0" lineColor="0">
+          <element xmi:type="uml:Property" href="BuiltInTypes.uml#_RDZH8HALEemJ-foOn68QUw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_RDmjUXALEemJ-foOn68QUw"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_EUWCdnALEemJ-foOn68QUw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_EUWCd3ALEemJ-foOn68QUw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_EUWCeHALEemJ-foOn68QUw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EUWCeXALEemJ-foOn68QUw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_EUWCenALEemJ-foOn68QUw" type="Interface_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_EUWCe3ALEemJ-foOn68QUw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_EUWCfHALEemJ-foOn68QUw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_EUWCfXALEemJ-foOn68QUw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EUWCfnALEemJ-foOn68QUw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_EUWCf3ALEemJ-foOn68QUw" type="Interface_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_EUWCgHALEemJ-foOn68QUw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_EUWCgXALEemJ-foOn68QUw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_EUWCgnALEemJ-foOn68QUw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EUWCg3ALEemJ-foOn68QUw"/>
+      </children>
+      <element xmi:type="uml:Interface" href="BuiltInTypes.uml#_EUUNQHALEemJ-foOn68QUw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EUWCcXALEemJ-foOn68QUw" x="40" y="380" width="201"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_H_h6wHALEemJ-foOn68QUw" type="Enumeration_Shape" fontName="Segoe UI" fillColor="14012867" transparency="0" gradient="16777215, -1, 0" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_H_h6wnALEemJ-foOn68QUw" type="Enumeration_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_H_h6w3ALEemJ-foOn68QUw" type="Enumeration_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_H_h6xHALEemJ-foOn68QUw" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_H_h6xXALEemJ-foOn68QUw" type="Enumeration_LiteralCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_I24ZgHALEemJ-foOn68QUw" type="EnumerationLiteral_LiteralLabel" fontName="Segoe UI" fillColor="14012867" transparency="0" gradient="16777215, -1, 0" lineColor="0">
+          <element xmi:type="uml:EnumerationLiteral" href="BuiltInTypes.uml#_I2oh4HALEemJ-foOn68QUw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_I24ZgXALEemJ-foOn68QUw"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_JsnHoHALEemJ-foOn68QUw" type="EnumerationLiteral_LiteralLabel" fontName="Segoe UI" fillColor="14012867" transparency="0" gradient="16777215, -1, 0" lineColor="0">
+          <element xmi:type="uml:EnumerationLiteral" href="BuiltInTypes.uml#_JsUzwHALEemJ-foOn68QUw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_JsnHoXALEemJ-foOn68QUw"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_LQq7YHALEemJ-foOn68QUw" type="EnumerationLiteral_LiteralLabel" fontName="Segoe UI" fillColor="14012867" transparency="0" gradient="16777215, -1, 0" lineColor="0">
+          <element xmi:type="uml:EnumerationLiteral" href="BuiltInTypes.uml#_LQhKYHALEemJ-foOn68QUw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_LQq7YXALEemJ-foOn68QUw"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_NdafwHALEemJ-foOn68QUw" type="EnumerationLiteral_LiteralLabel" fontName="Segoe UI" fillColor="14012867" transparency="0" gradient="16777215, -1, 0" lineColor="0">
+          <element xmi:type="uml:EnumerationLiteral" href="BuiltInTypes.uml#_NdPgoHALEemJ-foOn68QUw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_NdafwXALEemJ-foOn68QUw"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_H_h6xnALEemJ-foOn68QUw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_H_h6x3ALEemJ-foOn68QUw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_H_h6yHALEemJ-foOn68QUw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H_h6yXALEemJ-foOn68QUw"/>
+      </children>
+      <element xmi:type="uml:Enumeration" href="BuiltInTypes.uml#_H_dCQHALEemJ-foOn68QUw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H_h6wXALEemJ-foOn68QUw" x="-120" y="280"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_XySo4HALEemJ-foOn68QUw" type="Class_Shape" fontName="Segoe UI" fillColor="14538691" transparency="0" gradient="16777215, -1, 0" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_XyTP8HALEemJ-foOn68QUw" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_XyTP8XALEemJ-foOn68QUw" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_XyTP8nALEemJ-foOn68QUw" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_XyTP83ALEemJ-foOn68QUw" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_Y5orcHALEemJ-foOn68QUw" type="Property_ClassAttributeLabel" fontName="Segoe UI" fillColor="14012867" transparency="0" gradient="16777215, -1, 0" lineColor="0">
+          <element xmi:type="uml:Property" href="BuiltInTypes.uml#_Y5VwgHALEemJ-foOn68QUw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_Y5orcXALEemJ-foOn68QUw"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_XyTP9HALEemJ-foOn68QUw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_XyTP9XALEemJ-foOn68QUw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_XyTP9nALEemJ-foOn68QUw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XyTP93ALEemJ-foOn68QUw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_XyTP-HALEemJ-foOn68QUw" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_XyTP-XALEemJ-foOn68QUw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_XyT3AHALEemJ-foOn68QUw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_XyT3AXALEemJ-foOn68QUw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XyT3AnALEemJ-foOn68QUw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_XyT3A3ALEemJ-foOn68QUw" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_XyT3BHALEemJ-foOn68QUw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_XyT3BXALEemJ-foOn68QUw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_XyT3BnALEemJ-foOn68QUw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XyT3B3ALEemJ-foOn68QUw"/>
+      </children>
+      <element xmi:type="uml:Class" href="BuiltInTypes.uml#_XyQMoHALEemJ-foOn68QUw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XySo4XALEemJ-foOn68QUw" x="40" y="560" width="201"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_L-AboHsFEemo4rKYxRobdQ" type="Class_Shape" fontName="Segoe UI" italic="true" fillColor="14538691" transparency="0" gradient="16777215, -1, 0" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_L-CQ0HsFEemo4rKYxRobdQ" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_L-C34HsFEemo4rKYxRobdQ" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_L-C34XsFEemo4rKYxRobdQ" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_L-C34nsFEemo4rKYxRobdQ" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_L-C343sFEemo4rKYxRobdQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_L-C35HsFEemo4rKYxRobdQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_L-C35XsFEemo4rKYxRobdQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L-C35nsFEemo4rKYxRobdQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_L-C353sFEemo4rKYxRobdQ" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_L-C36HsFEemo4rKYxRobdQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_L-C36XsFEemo4rKYxRobdQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_L-C36nsFEemo4rKYxRobdQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L-C363sFEemo4rKYxRobdQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_L-C37HsFEemo4rKYxRobdQ" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_L-De8HsFEemo4rKYxRobdQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_L-De8XsFEemo4rKYxRobdQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_L-De8nsFEemo4rKYxRobdQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L-De83sFEemo4rKYxRobdQ"/>
+      </children>
+      <element xmi:type="uml:Class" href="BuiltInTypes.uml#_L9zAQHsFEemo4rKYxRobdQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L-BCsHsFEemo4rKYxRobdQ" x="940" y="100" width="261" height="201"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_Pum_cHsFEemo4rKYxRobdQ" type="Interface_Shape" fontName="Segoe UI" fillColor="14012867" transparency="0" gradient="16777215, -1, 0" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Pum_cnsFEemo4rKYxRobdQ" type="Interface_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Pum_c3sFEemo4rKYxRobdQ" type="Interface_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Pum_dHsFEemo4rKYxRobdQ" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_PunmgHsFEemo4rKYxRobdQ" type="Interface_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_PunmgXsFEemo4rKYxRobdQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_PunmgnsFEemo4rKYxRobdQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Punmg3sFEemo4rKYxRobdQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PunmhHsFEemo4rKYxRobdQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_PunmhXsFEemo4rKYxRobdQ" type="Interface_OperationCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_VvJlkHsFEemo4rKYxRobdQ" type="Operation_InterfaceOperationLabel" fontName="Segoe UI" fillColor="14012867" transparency="0" gradient="16777215, -1, 0" lineColor="0">
+          <element xmi:type="uml:Operation" href="BuiltInTypes.uml#_VueQIHsFEemo4rKYxRobdQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_VvJlkXsFEemo4rKYxRobdQ"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_PunmhnsFEemo4rKYxRobdQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Punmh3sFEemo4rKYxRobdQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_PunmiHsFEemo4rKYxRobdQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PunmiXsFEemo4rKYxRobdQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_PunminsFEemo4rKYxRobdQ" type="Interface_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Punmi3sFEemo4rKYxRobdQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_PunmjHsFEemo4rKYxRobdQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_PunmjXsFEemo4rKYxRobdQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PunmjnsFEemo4rKYxRobdQ"/>
+      </children>
+      <element xmi:type="uml:Interface" href="BuiltInTypes.uml#_PugRwHsFEemo4rKYxRobdQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Pum_cXsFEemo4rKYxRobdQ" x="1320" y="100" width="161" height="201"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_d6KfMHsFEemo4rKYxRobdQ" type="Class_Shape" fontName="Segoe UI" fillColor="14538691" transparency="0" gradient="16777215, -1, 0" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_d6KfMnsFEemo4rKYxRobdQ" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_d6LGQHsFEemo4rKYxRobdQ" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_d6LGQXsFEemo4rKYxRobdQ" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_d6LGQnsFEemo4rKYxRobdQ" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_rUsxsHsFEemo4rKYxRobdQ" type="Property_ClassAttributeLabel" fontName="Segoe UI" fillColor="14012867" transparency="0" gradient="16777215, -1, 0" lineColor="0">
+          <element xmi:type="uml:Property" href="BuiltInTypes.uml#_rUG70HsFEemo4rKYxRobdQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_rUsxsXsFEemo4rKYxRobdQ"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_d6LGQ3sFEemo4rKYxRobdQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_d6LGRHsFEemo4rKYxRobdQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_d6LGRXsFEemo4rKYxRobdQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_d6LGRnsFEemo4rKYxRobdQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_d6LGR3sFEemo4rKYxRobdQ" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_d6LGSHsFEemo4rKYxRobdQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_d6LGSXsFEemo4rKYxRobdQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_d6LGSnsFEemo4rKYxRobdQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_d6LGS3sFEemo4rKYxRobdQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_d6LGTHsFEemo4rKYxRobdQ" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_d6LGTXsFEemo4rKYxRobdQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_d6LGTnsFEemo4rKYxRobdQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_d6LGT3sFEemo4rKYxRobdQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_d6LGUHsFEemo4rKYxRobdQ"/>
+      </children>
+      <element xmi:type="uml:Class" href="BuiltInTypes.uml#_d6G00HsFEemo4rKYxRobdQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_d6KfMXsFEemo4rKYxRobdQ" x="1320" y="480" width="161" height="181"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_iB8z8HsFEemo4rKYxRobdQ" type="Class_Shape" fontName="Segoe UI" fillColor="14538691" transparency="0" gradient="16777215, -1, 0" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_iB9bAHsFEemo4rKYxRobdQ" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_iB9bAXsFEemo4rKYxRobdQ" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_iB9bAnsFEemo4rKYxRobdQ" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_iB9bA3sFEemo4rKYxRobdQ" type="Class_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_iB9bBHsFEemo4rKYxRobdQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_iB9bBXsFEemo4rKYxRobdQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_iB9bBnsFEemo4rKYxRobdQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iB9bB3sFEemo4rKYxRobdQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_iB9bCHsFEemo4rKYxRobdQ" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_iB9bCXsFEemo4rKYxRobdQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_iB9bCnsFEemo4rKYxRobdQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_iB9bC3sFEemo4rKYxRobdQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iB9bDHsFEemo4rKYxRobdQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_iB-CEHsFEemo4rKYxRobdQ" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_iB-CEXsFEemo4rKYxRobdQ"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_iB-CEnsFEemo4rKYxRobdQ"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_iB-CE3sFEemo4rKYxRobdQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iB-CFHsFEemo4rKYxRobdQ"/>
+      </children>
+      <element xmi:type="uml:Class" href="BuiltInTypes.uml#_iB5woHsFEemo4rKYxRobdQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iB8z8XsFEemo4rKYxRobdQ" x="940" y="480" width="261" height="181"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_o1ShAJQUEemHKPZQudxUGA" type="Interface_Shape" fontName="Segoe UI" fillColor="14012867" transparency="0" gradient="16777215, -1, 0" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_o1WycJQUEemHKPZQudxUGA" type="Interface_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_o1WycZQUEemHKPZQudxUGA" type="Interface_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_o1XZgJQUEemHKPZQudxUGA" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_o1XZgZQUEemHKPZQudxUGA" type="Interface_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_o1XZgpQUEemHKPZQudxUGA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_o1XZg5QUEemHKPZQudxUGA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_o1XZhJQUEemHKPZQudxUGA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o1XZhZQUEemHKPZQudxUGA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_o1XZhpQUEemHKPZQudxUGA" type="Interface_OperationCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_6H7tgJQUEemHKPZQudxUGA" type="Operation_InterfaceOperationLabel" fontName="Segoe UI" fillColor="14012867" transparency="0" gradient="16777215, -1, 0" lineColor="0">
+          <element xmi:type="uml:Operation" href="BuiltInTypes.uml#_6HWesJQUEemHKPZQudxUGA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_6H7tgZQUEemHKPZQudxUGA"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_o1XZh5QUEemHKPZQudxUGA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_o1XZiJQUEemHKPZQudxUGA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_o1XZiZQUEemHKPZQudxUGA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o1XZipQUEemHKPZQudxUGA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_o1XZi5QUEemHKPZQudxUGA" type="Interface_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_o1XZjJQUEemHKPZQudxUGA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_o1XZjZQUEemHKPZQudxUGA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_o1XZjpQUEemHKPZQudxUGA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o1XZj5QUEemHKPZQudxUGA"/>
+      </children>
+      <element xmi:type="uml:Interface" href="BuiltInTypes.uml#_o1CCUJQUEemHKPZQudxUGA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o1ShAZQUEemHKPZQudxUGA" x="40" y="780" width="201" height="121"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_tMGwQJQUEemHKPZQudxUGA" type="Class_Shape" fontName="Segoe UI" fillColor="14538691" transparency="0" gradient="16777215, -1, 0" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_tMHXUJQUEemHKPZQudxUGA" type="Class_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_tMHXUZQUEemHKPZQudxUGA" type="Class_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_tMHXUpQUEemHKPZQudxUGA" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_tMHXU5QUEemHKPZQudxUGA" type="Class_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_B6XvEJQVEemHKPZQudxUGA" type="Property_ClassAttributeLabel" fontName="Segoe UI" fillColor="14012867" transparency="0" gradient="16777215, -1, 0" lineColor="0">
+          <element xmi:type="uml:Property" href="BuiltInTypes.uml#_B56cEJQVEemHKPZQudxUGA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_B6XvEZQVEemHKPZQudxUGA"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_tMHXVJQUEemHKPZQudxUGA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_tMHXVZQUEemHKPZQudxUGA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_tMHXVpQUEemHKPZQudxUGA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tMHXV5QUEemHKPZQudxUGA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_tMHXWJQUEemHKPZQudxUGA" type="Class_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_tMHXWZQUEemHKPZQudxUGA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_tMHXWpQUEemHKPZQudxUGA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_tMHXW5QUEemHKPZQudxUGA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tMHXXJQUEemHKPZQudxUGA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_tMH-YJQUEemHKPZQudxUGA" type="Class_NestedClassifierCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_tMH-YZQUEemHKPZQudxUGA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_tMH-YpQUEemHKPZQudxUGA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_tMH-Y5QUEemHKPZQudxUGA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tMH-ZJQUEemHKPZQudxUGA"/>
+      </children>
+      <element xmi:type="uml:Class" href="BuiltInTypes.uml#_tL-NYJQUEemHKPZQudxUGA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tMGwQZQUEemHKPZQudxUGA" x="40" y="980" width="201"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_WXAMEXAKEemJ-foOn68QUw" name="diagram_compatibility_version" stringValue="1.4.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_WXAMEnAKEemJ-foOn68QUw"/>
+    <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_WXAME3AKEemJ-foOn68QUw" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
+      <owner xmi:type="uml:Model" href="BuiltInTypes.uml#_WW0l4HAKEemJ-foOn68QUw"/>
+    </styles>
+    <element xmi:type="uml:Model" href="BuiltInTypes.uml#_WW0l4HAKEemJ-foOn68QUw"/>
+    <edges xmi:type="notation:Connector" xmi:id="_8qDQQHAKEemJ-foOn68QUw" type="Generalization_Edge" source="_54mcUHAKEemJ-foOn68QUw" target="_lYJ3EHAKEemJ-foOn68QUw" routing="Rectilinear" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_8qDQQ3AKEemJ-foOn68QUw" type="Generalization_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_fmEH8HCfEemJ-foOn68QUw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_8qDQRHAKEemJ-foOn68QUw" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_8qDQQXAKEemJ-foOn68QUw" fontName="Segoe UI"/>
+      <element xmi:type="uml:Generalization" href="BuiltInTypes.uml#_8p8ikHAKEemJ-foOn68QUw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8qDQQnAKEemJ-foOn68QUw" points="[360, 400, -643984, -643984]$[360, 359, -643984, -643984]$[580, 359, -643984, -643984]$[580, 301, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8qQEkHAKEemJ-foOn68QUw" id="(0.5249343832020997,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8qQEkXAKEemJ-foOn68QUw" id="(0.5249343832020997,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_C77eAHALEemJ-foOn68QUw" type="InterfaceRealization_Edge" source="__NZ90HAKEemJ-foOn68QUw" target="_-RiLcHAKEemJ-foOn68QUw" routing="Rectilinear" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_C77eA3ALEemJ-foOn68QUw" type="InterfaceRealization_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_hO6VEHCfEemJ-foOn68QUw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_C77eBHALEemJ-foOn68QUw" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_C77eBXALEemJ-foOn68QUw" type="InterfaceRealization_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_hPLa0HCfEemJ-foOn68QUw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_C77eBnALEemJ-foOn68QUw" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_C77eAXALEemJ-foOn68QUw" fontName="Segoe UI"/>
+      <element xmi:type="uml:InterfaceRealization" href="BuiltInTypes.uml#_C7ojEHALEemJ-foOn68QUw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_C77eAnALEemJ-foOn68QUw" points="[-20, 160, -643984, -643984]$[0, 160, -643984, -643984]$[0, 140, -643984, -643984]$[40, 140, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_C8QOIHALEemJ-foOn68QUw" id="(1.0,0.4)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_C8QOIXALEemJ-foOn68QUw" id="(0.0,0.19900497512437812)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_FWDXEHALEemJ-foOn68QUw" type="Association_Edge" source="_-RiLcHAKEemJ-foOn68QUw" target="_EUWCcHALEemJ-foOn68QUw" routing="Rectilinear" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_FWDXE3ALEemJ-foOn68QUw" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_hNy6wHCfEemJ-foOn68QUw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_FWDXFHALEemJ-foOn68QUw" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_FWDXFXALEemJ-foOn68QUw" visible="false" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_hN-g8HCfEemJ-foOn68QUw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_FWDXFnALEemJ-foOn68QUw" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_FWDXF3ALEemJ-foOn68QUw" visible="false" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_hOJgEHCfEemJ-foOn68QUw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_FWDXGHALEemJ-foOn68QUw" x="29" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_FWDXGXALEemJ-foOn68QUw" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_hOVtUHCfEemJ-foOn68QUw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_FWD-IHALEemJ-foOn68QUw" x="-29" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_FWD-IXALEemJ-foOn68QUw" visible="false" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_hOhTgHCfEemJ-foOn68QUw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_FWD-InALEemJ-foOn68QUw" x="29" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_FWD-I3ALEemJ-foOn68QUw" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_hOs5sHCfEemJ-foOn68QUw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_FWD-JHALEemJ-foOn68QUw" x="-29" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_FWDXEXALEemJ-foOn68QUw" fontName="Segoe UI"/>
+      <element xmi:type="uml:Association" href="BuiltInTypes.uml#_FVt_4HALEemJ-foOn68QUw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_FWDXEnALEemJ-foOn68QUw" points="[140, 301, -643984, -643984]$[140, 380, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FWeN0HALEemJ-foOn68QUw" id="(0.4975124378109453,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FWe04HALEemJ-foOn68QUw" id="(0.4975124378109453,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_cvs-EHALEemJ-foOn68QUw" type="InterfaceRealization_Edge" source="_XySo4HALEemJ-foOn68QUw" target="_EUWCcHALEemJ-foOn68QUw" routing="Rectilinear" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_cvs-E3ALEemJ-foOn68QUw" type="InterfaceRealization_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_inTEUHCfEemJ-foOn68QUw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_cvs-FHALEemJ-foOn68QUw" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_cvs-FXALEemJ-foOn68QUw" type="InterfaceRealization_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_ineqgHCfEemJ-foOn68QUw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_cvs-FnALEemJ-foOn68QUw" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_cvs-EXALEemJ-foOn68QUw" fontName="Segoe UI"/>
+      <element xmi:type="uml:InterfaceRealization" href="BuiltInTypes.uml#_cvcfYHALEemJ-foOn68QUw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_cvs-EnALEemJ-foOn68QUw" points="[140, 560, -643984, -643984]$[140, 520, -643984, -643984]$[140, 491, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_cwN7cHALEemJ-foOn68QUw" id="(0.4975124378109453,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_cwN7cXALEemJ-foOn68QUw" id="(0.4975124378109453,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_eFgTYHALEemJ-foOn68QUw" type="Association_Edge" source="_lYJ3EHAKEemJ-foOn68QUw" target="_-RiLcHAKEemJ-foOn68QUw" routing="Rectilinear" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_eFgTY3ALEemJ-foOn68QUw" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_fksO8HCfEemJ-foOn68QUw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_eFgTZHALEemJ-foOn68QUw" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_eFgTZXALEemJ-foOn68QUw" visible="false" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_fk6RYHCfEemJ-foOn68QUw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_eFgTZnALEemJ-foOn68QUw" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_eFgTZ3ALEemJ-foOn68QUw" visible="false" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_flHFsHCfEemJ-foOn68QUw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_eFgTaHALEemJ-foOn68QUw" x="6" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_eFgTaXALEemJ-foOn68QUw" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_flSr4HCfEemJ-foOn68QUw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_eFgTanALEemJ-foOn68QUw" x="-6" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_eFgTa3ALEemJ-foOn68QUw" visible="false" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_fljKkHCfEemJ-foOn68QUw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_eFgTbHALEemJ-foOn68QUw" x="6" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_eFgTbXALEemJ-foOn68QUw" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_fl03YHCfEemJ-foOn68QUw" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_eFgTbnALEemJ-foOn68QUw" x="-6" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_eFgTYXALEemJ-foOn68QUw" fontName="Segoe UI"/>
+      <element xmi:type="uml:Association" href="BuiltInTypes.uml#_eFIf8HALEemJ-foOn68QUw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_eFgTYnALEemJ-foOn68QUw" points="[380, 160, -643984, -643984]$[201, 160, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_eGFiMHALEemJ-foOn68QUw" id="(0.0,0.29850746268656714)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_eGFiMXALEemJ-foOn68QUw" id="(1.0,0.29850746268656714)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_R4CxIHsFEemo4rKYxRobdQ" type="Association_Edge" source="_L-AboHsFEemo4rKYxRobdQ" target="_Pum_cHsFEemo4rKYxRobdQ" routing="Rectilinear" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_R4DYMHsFEemo4rKYxRobdQ" type="Association_StereotypeLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_R4DYMXsFEemo4rKYxRobdQ" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_R4DYMnsFEemo4rKYxRobdQ" visible="false" type="Association_NameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_R4DYM3sFEemo4rKYxRobdQ" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_R4DYNHsFEemo4rKYxRobdQ" visible="false" type="Association_TargetRoleLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_R4DYNXsFEemo4rKYxRobdQ" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_R4DYNnsFEemo4rKYxRobdQ" type="Association_SourceRoleLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_R4DYN3sFEemo4rKYxRobdQ" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_R4DYOHsFEemo4rKYxRobdQ" visible="false" type="Association_SourceMultiplicityLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_R4DYOXsFEemo4rKYxRobdQ" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_R4DYOnsFEemo4rKYxRobdQ" type="Association_TargetMultiplicityLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_R4DYO3sFEemo4rKYxRobdQ" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_R4CxIXsFEemo4rKYxRobdQ" fontName="Segoe UI"/>
+      <element xmi:type="uml:Association" href="BuiltInTypes.uml#_R3k3EHsFEemo4rKYxRobdQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_R4CxInsFEemo4rKYxRobdQ" points="[1201, 160, -643984, -643984]$[1320, 160, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_R5Er4HsFEemo4rKYxRobdQ" id="(1.0,0.29850746268656714)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_R5Er4XsFEemo4rKYxRobdQ" id="(0.0,0.29850746268656714)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_l5OAcHsFEemo4rKYxRobdQ" type="Generalization_Edge" source="_iB8z8HsFEemo4rKYxRobdQ" target="_L-AboHsFEemo4rKYxRobdQ" routing="Rectilinear" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_l5OngHsFEemo4rKYxRobdQ" type="Generalization_StereotypeLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_l5OngXsFEemo4rKYxRobdQ" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_l5OAcXsFEemo4rKYxRobdQ" fontName="Segoe UI"/>
+      <element xmi:type="uml:Generalization" href="BuiltInTypes.uml#_l4mVYHsFEemo4rKYxRobdQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l5OAcnsFEemo4rKYxRobdQ" points="[1080, 480, -643984, -643984]$[1080, 301, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6ImcHsFEemo4rKYxRobdQ" id="(0.5363984674329502,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6ImcXsFEemo4rKYxRobdQ" id="(0.5363984674329502,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_opwOYHsFEemo4rKYxRobdQ" type="InterfaceRealization_Edge" source="_d6KfMHsFEemo4rKYxRobdQ" target="_Pum_cHsFEemo4rKYxRobdQ" routing="Rectilinear" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_opwOY3sFEemo4rKYxRobdQ" type="InterfaceRealization_StereotypeLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_opwOZHsFEemo4rKYxRobdQ" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_opwOZXsFEemo4rKYxRobdQ" type="InterfaceRealization_NameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_opwOZnsFEemo4rKYxRobdQ" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_opwOYXsFEemo4rKYxRobdQ" fontName="Segoe UI"/>
+      <element xmi:type="uml:InterfaceRealization" href="BuiltInTypes.uml#_opH8QHsFEemo4rKYxRobdQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_opwOYnsFEemo4rKYxRobdQ" points="[1400, 480, -643984, -643984]$[1400, 399, -643984, -643984]$[1400, 301, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oq6E8HsFEemo4rKYxRobdQ" id="(0.4968944099378882,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oq6E8XsFEemo4rKYxRobdQ" id="(0.4968944099378882,1.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_5G3TQHvEEemmnMs_VyNz8A" type="Association_Edge" source="_Pum_cHsFEemo4rKYxRobdQ" target="_Pum_cHsFEemo4rKYxRobdQ" routing="Rectilinear" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_5G3TQ3vEEemmnMs_VyNz8A" type="Association_StereotypeLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_51pE0HvEEemmnMs_VyNz8A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_5G3TRHvEEemmnMs_VyNz8A" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_5G3TRXvEEemmnMs_VyNz8A" visible="false" type="Association_NameLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_52NskHvEEemmnMs_VyNz8A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_5G3TRnvEEemmnMs_VyNz8A" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_5G3TR3vEEemmnMs_VyNz8A" visible="false" type="Association_TargetRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_52rmoHvEEemmnMs_VyNz8A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_5G3TSHvEEemmnMs_VyNz8A" x="52" y="-60"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_5G36UHvEEemmnMs_VyNz8A" type="Association_SourceRoleLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_53ISkHvEEemmnMs_VyNz8A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_5G36UXvEEemmnMs_VyNz8A" x="-29" y="-43"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_5G36UnvEEemmnMs_VyNz8A" visible="false" type="Association_SourceMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_53mzsHvEEemmnMs_VyNz8A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_5G36U3vEEemmnMs_VyNz8A" x="52" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_5G36VHvEEemmnMs_VyNz8A" type="Association_TargetMultiplicityLabel">
+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_54FU0HvEEemmnMs_VyNz8A" name="IS_UPDATED_POSITION" booleanValue="true"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_5G36VXvEEemmnMs_VyNz8A" x="-29" y="-83"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_5G3TQXvEEemmnMs_VyNz8A" fontName="Segoe UI"/>
+      <element xmi:type="uml:Association" href="BuiltInTypes.uml#_5GOaEHvEEemmnMs_VyNz8A"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_5G3TQnvEEemmnMs_VyNz8A" points="[1400, 100, -643984, -643984]$[1400, 60, -643984, -643984]$[1543, 60, -643984, -643984]$[1543, 200, -643984, -643984]$[1481, 200, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5H-tkHvEEemmnMs_VyNz8A" id="(0.4968944099378882,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5H_UoHvEEemmnMs_VyNz8A" id="(1.0,0.4975124378109453)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_ALsmwJQVEemHKPZQudxUGA" type="InterfaceRealization_Edge" source="_tMGwQJQUEemHKPZQudxUGA" target="_o1ShAJQUEemHKPZQudxUGA" routing="Rectilinear" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ALtN0JQVEemHKPZQudxUGA" type="InterfaceRealization_StereotypeLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ALtN0ZQVEemHKPZQudxUGA" y="40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ALtN0pQVEemHKPZQudxUGA" type="InterfaceRealization_NameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ALtN05QVEemHKPZQudxUGA" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_ALsmwZQVEemHKPZQudxUGA" fontName="Segoe UI"/>
+      <element xmi:type="uml:InterfaceRealization" href="BuiltInTypes.uml#_AK-1EJQVEemHKPZQudxUGA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ALsmwpQVEemHKPZQudxUGA" points="[140, 980, -643984, -643984]$[140, 891, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AM784JQVEemHKPZQudxUGA" id="(0.4975124378109453,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AM784ZQVEemHKPZQudxUGA" id="(0.4975124378109453,1.0)"/>
+    </edges>
+  </notation:Diagram>
+  <css:ModelStyleSheets xmi:id="_ePy4kHCfEemJ-foOn68QUw">
+    <stylesheets xmi:type="css:StyleSheetReference" xmi:id="_eP0GsHCfEemJ-foOn68QUw" path="/org.eclipse.papyrus.model2doc.core.builtintypes/model/custom.css"/>
+  </css:ModelStyleSheets>
+  <notation:Diagram xmi:id="_E1Ad0Bn9EeunG-PlCrg2Pg" type="PapyrusUMLClassDiagram" name="ImageTypeDiagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_I9bEsBn9EeunG-PlCrg2Pg" type="Enumeration_Shape" fontName="Segoe UI" fillColor="14012867" transparency="0" gradient="16777215, -1, 0" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_I9evEBn9EeunG-PlCrg2Pg" type="Enumeration_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_I9fWIBn9EeunG-PlCrg2Pg" type="Enumeration_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_I9fWIRn9EeunG-PlCrg2Pg" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_I9fWIhn9EeunG-PlCrg2Pg" type="Enumeration_LiteralCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_qjyjkB28EeuC_v9WQLDVcQ" type="EnumerationLiteral_LiteralLabel" fontName="Segoe UI" fillColor="14012867" transparency="0" gradient="16777215, -1, 0" lineColor="0">
+          <element xmi:type="uml:EnumerationLiteral" href="BuiltInTypes.uml#_qjV3oB28EeuC_v9WQLDVcQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_qjyjkR28EeuC_v9WQLDVcQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_rzhtIB28EeuC_v9WQLDVcQ" type="EnumerationLiteral_LiteralLabel" fontName="Segoe UI" fillColor="14012867" transparency="0" gradient="16777215, -1, 0" lineColor="0">
+          <element xmi:type="uml:EnumerationLiteral" href="BuiltInTypes.uml#_rzcNkB28EeuC_v9WQLDVcQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_rzhtIR28EeuC_v9WQLDVcQ"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_I9fWIxn9EeunG-PlCrg2Pg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_I9fWJBn9EeunG-PlCrg2Pg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_I9fWJRn9EeunG-PlCrg2Pg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_I9fWJhn9EeunG-PlCrg2Pg"/>
+      </children>
+      <element xmi:type="uml:Enumeration" href="BuiltInTypes.uml#_I9QFkBn9EeunG-PlCrg2Pg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_I9bEsRn9EeunG-PlCrg2Pg" x="140" y="100"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_ulewEB9sEeufppQNI_9Idw" type="Comment_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ulhzYB9sEeufppQNI_9Idw" type="Comment_BodyLabel"/>
+      <element xmi:type="uml:Comment" href="BuiltInTypes.uml#_sHK6kB9sEeufppQNI_9Idw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ulewER9sEeufppQNI_9Idw" x="320" y="120"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_E1Ad0Rn9EeunG-PlCrg2Pg" name="diagram_compatibility_version" stringValue="1.4.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_E1Ad0hn9EeunG-PlCrg2Pg"/>
+    <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_E1Ad0xn9EeunG-PlCrg2Pg" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
+      <owner xmi:type="uml:Model" href="BuiltInTypes.uml#_WW0l4HAKEemJ-foOn68QUw"/>
+    </styles>
+    <element xmi:type="uml:Model" href="BuiltInTypes.uml#_WW0l4HAKEemJ-foOn68QUw"/>
+    <edges xmi:type="notation:Connector" xmi:id="_v--SkB9sEeufppQNI_9Idw" type="Comment_AnnotatedElementEdge" source="_ulewEB9sEeufppQNI_9Idw" target="_I9bEsBn9EeunG-PlCrg2Pg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_v--5oB9sEeufppQNI_9Idw"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_v--5oR9sEeufppQNI_9Idw" points="[360, 180, -643984, -643984]$[243, 160, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_v_czsB9sEeufppQNI_9Idw" id="(0.0,0.6666666666666666)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_v_dawB9sEeufppQNI_9Idw" id="(1.0,0.6)"/>
+    </edges>
+  </notation:Diagram>
+</xmi:XMI>
diff --git a/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/model/BuiltInTypes.uml b/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/model/BuiltInTypes.uml
index 0bc0b9b..97ecda6 100755
--- a/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/model/BuiltInTypes.uml
+++ b/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/model/BuiltInTypes.uml
@@ -1,216 +1,223 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Ecore="http://www.eclipse.org/uml2/schemas/Ecore/5" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/uml2/schemas/Ecore/5 pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA">
-  <uml:Model xmi:id="_WW0l4HAKEemJ-foOn68QUw" name="BuiltInTypes" URI="http://www.eclipse.org/papyrus/model2doc/core/1.0.0/BuiltInTypes">
-    <ownedComment xmi:type="uml:Comment" xmi:id="_Ik67gJQVEemHKPZQudxUGA" annotatedElement="_WW0l4HAKEemJ-foOn68QUw">
-      <body>Common interface to reference a file.</body>
-    </ownedComment>
-    <packageImport xmi:type="uml:PackageImport" xmi:id="_WaIYkHAKEemJ-foOn68QUw">
-      <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
-    </packageImport>
-    <packagedElement xmi:type="uml:Class" xmi:id="_lYIB4HAKEemJ-foOn68QUw" name="AbstractTable" isAbstract="true">
-      <ownedComment xmi:type="uml:Comment" xmi:id="_8e9l4HCfEemJ-foOn68QUw" annotatedElement="_lYIB4HAKEemJ-foOn68QUw">
-        <body>Abstract class used to represent a Table in the Model2Doc API.</body>
-      </ownedComment>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_oRLSoHAKEemJ-foOn68QUw" name="caption" visibility="public">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_CDrLoHCgEemJ-foOn68QUw" annotatedElement="_oRLSoHAKEemJ-foOn68QUw">
-          <body>The caption of the table.</body>
-        </ownedComment>
-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_eFJHAHALEemJ-foOn68QUw" name="rows" visibility="public" type="_-Rcr4HAKEemJ-foOn68QUw" aggregation="composite" association="_eFIf8HALEemJ-foOn68QUw">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_XTCFUHCgEemJ-foOn68QUw" annotatedElement="_eFJHAHALEemJ-foOn68QUw">
-          <body>The rows owned by the table.</body>
-        </ownedComment>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_eFJHAXALEemJ-foOn68QUw"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_eFJHAnALEemJ-foOn68QUw" value="*"/>
-      </ownedAttribute>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_wrfzkHAKEemJ-foOn68QUw" name="getRowsNumber">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_sSYlYHCmEemJ-foOn68QUw" source="http://www.eclipse.org/emf/2002/GenModel">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_sSYlYXCmEemJ-foOn68QUw" key="body" value="return getRows().size();"/>
-        </eAnnotations>
-        <ownedComment xmi:type="uml:Comment" xmi:id="_LbLGgHCgEemJ-foOn68QUw" annotatedElement="_wrfzkHAKEemJ-foOn68QUw">
-          <body>This method returns the numbers of rows of the table.</body>
-        </ownedComment>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_3SMawHAKEemJ-foOn68QUw" name="return" direction="return">
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EInt"/>
-          <defaultValue xmi:type="uml:LiteralInteger" xmi:id="_GBxY4HCgEemJ-foOn68QUw" name="DEFAULT_VALUE"/>
-        </ownedParameter>
-      </ownedOperation>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_y91poHAKEemJ-foOn68QUw" name="getColumnsNumber">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_poKa0nCmEemJ-foOn68QUw" source="http://www.eclipse.org/emf/2002/GenModel">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_poKa03CmEemJ-foOn68QUw" key="body" value="if (getRowsNumber() > 0) {&#xA;&#x9;// we assume all rows have the same number of cells.&#xA;&#x9;final Row firstRow = getRows().get(0);&#xA;&#x9;if (null != firstRow) {&#xA;&#x9;&#x9;return firstRow.getCells().size();&#xA;&#x9;}&#xA;}&#xA;return 0;"/>
-        </eAnnotations>
-        <ownedComment xmi:type="uml:Comment" xmi:id="_Na-bEHCgEemJ-foOn68QUw" annotatedElement="_y91poHAKEemJ-foOn68QUw">
-          <body>This method returns the number of columns of the table.</body>
-        </ownedComment>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_49v9oHAKEemJ-foOn68QUw" name="return" direction="return">
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EInt"/>
-          <defaultValue xmi:type="uml:LiteralInteger" xmi:id="_Im6PIHCgEemJ-foOn68QUw" name="DEFAULT_VALUE"/>
-        </ownedParameter>
-      </ownedOperation>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_qn5QIHC_EemO3N3fNOfMKQ" name="getAllCells">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Vu06EHDAEemO3N3fNOfMKQ" source="http://www.eclipse.org/emf/2002/GenModel">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Vu06EXDAEemO3N3fNOfMKQ" key="body" value="final java.util.List&lt;Cell> cells = new  java.util.ArrayList&lt;Cell>();&#xA;for (final Row row : getRows()) {&#xA;&#x9;cells.addAll(row.getCells());&#xA;}&#xA;return  org.eclipse.emf.common.util.ECollections.toEList(cells);&#xA;"/>
-        </eAnnotations>
-        <ownedComment xmi:type="uml:Comment" xmi:id="_SoBhMHDAEemO3N3fNOfMKQ" annotatedElement="_qn5QIHC_EemO3N3fNOfMKQ">
-          <body>This method returns all Cells as a List. This list concatenates the Cells Row by Row. So for a table with 3 columns and 5 rows.&#xD;
-The 3 first cells will represents the first row, then the cell, 4, 5 and 6, will represents the 2 rows, and so on.</body>
-        </ownedComment>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_yHsCgHC_EemO3N3fNOfMKQ" name="return" type="_EUUNQHALEemJ-foOn68QUw" direction="return">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_3OZBIHDAEemO3N3fNOfMKQ"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3OsjIHDAEemO3N3fNOfMKQ" value="*"/>
-        </ownedParameter>
-      </ownedOperation>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_54knIHAKEemJ-foOn68QUw" name="BasicTable">
-      <ownedComment xmi:type="uml:Comment" xmi:id="_AZzq0HCgEemJ-foOn68QUw" annotatedElement="_54knIHAKEemJ-foOn68QUw">
-        <body>Default implementation provided for a table.</body>
-      </ownedComment>
-      <generalization xmi:type="uml:Generalization" xmi:id="_8p8ikHAKEemJ-foOn68QUw" general="_lYIB4HAKEemJ-foOn68QUw"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Interface" xmi:id="_-Rcr4HAKEemJ-foOn68QUw" name="Row">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_FVvOAnALEemJ-foOn68QUw" name="cells" type="_EUUNQHALEemJ-foOn68QUw" aggregation="composite" association="_FVt_4HALEemJ-foOn68QUw">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_Qu64EHCgEemJ-foOn68QUw" annotatedElement="_FVvOAnALEemJ-foOn68QUw">
-          <body>The cells owned by the row.</body>
-        </ownedComment>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_FVv1EHALEemJ-foOn68QUw"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FVv1EXALEemJ-foOn68QUw" value="*"/>
-      </ownedAttribute>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="__NYvsHAKEemJ-foOn68QUw" name="BasicRow">
-      <ownedComment xmi:type="uml:Comment" xmi:id="_bgPsoHCgEemJ-foOn68QUw" annotatedElement="__NYvsHAKEemJ-foOn68QUw">
-        <body>Default Row implementation.</body>
-      </ownedComment>
-      <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_C7ojEHALEemJ-foOn68QUw" client="__NYvsHAKEemJ-foOn68QUw" supplier="_-Rcr4HAKEemJ-foOn68QUw" contract="_-Rcr4HAKEemJ-foOn68QUw"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Interface" xmi:id="_EUUNQHALEemJ-foOn68QUw" name="Cell">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_RDZH8HALEemJ-foOn68QUw" name="location" type="_H_dCQHALEemJ-foOn68QUw">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_f1hq0HCgEemJ-foOn68QUw" annotatedElement="_RDZH8HALEemJ-foOn68QUw">
-          <body>The location of the cells.</body>
-        </ownedComment>
-        <defaultValue xmi:type="uml:LiteralString" xmi:id="_WzxyMHALEemJ-foOn68QUw" name="DEFAULT_VALUE" value="BODY"/>
-      </ownedAttribute>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_FVt_4HALEemJ-foOn68QUw" memberEnd="_FVvOAnALEemJ-foOn68QUw _FVwcIHALEemJ-foOn68QUw">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FVvOAHALEemJ-foOn68QUw" source="org.eclipse.papyrus">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FVvOAXALEemJ-foOn68QUw" key="nature" value="UML_Nature"/>
-      </eAnnotations>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_FVwcIHALEemJ-foOn68QUw" name="row" type="_-Rcr4HAKEemJ-foOn68QUw" association="_FVt_4HALEemJ-foOn68QUw"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Enumeration" xmi:id="_H_dCQHALEemJ-foOn68QUw" name="CellLocation">
-      <ownedComment xmi:type="uml:Comment" xmi:id="_eB1foHCgEemJ-foOn68QUw" annotatedElement="_H_dCQHALEemJ-foOn68QUw">
-        <body>This enumeration allows to define the location of each cell.</body>
-      </ownedComment>
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_I2oh4HALEemJ-foOn68QUw" name="CORNER"/>
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_JsUzwHALEemJ-foOn68QUw" name="COLUMN_HEADER"/>
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_LQhKYHALEemJ-foOn68QUw" name="ROW_HEADER"/>
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_NdPgoHALEemJ-foOn68QUw" name="BODY"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_XyQMoHALEemJ-foOn68QUw" name="TextCell">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_Y5VwgHALEemJ-foOn68QUw" name="text">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_imNCsHCgEemJ-foOn68QUw" annotatedElement="_Y5VwgHALEemJ-foOn68QUw">
-          <body>The text owned by the cells.</body>
-        </ownedComment>
-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
-        <defaultValue xmi:type="uml:LiteralString" xmi:id="_5KR7gHC_EemO3N3fNOfMKQ" name="DEFAULT_VALUE" value=""/>
-      </ownedAttribute>
-      <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_cvcfYHALEemJ-foOn68QUw" client="_XyQMoHALEemJ-foOn68QUw" supplier="_EUUNQHALEemJ-foOn68QUw" contract="_EUUNQHALEemJ-foOn68QUw"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_eFIf8HALEemJ-foOn68QUw" memberEnd="_eFJHAHALEemJ-foOn68QUw _eFJHA3ALEemJ-foOn68QUw">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_eFIf8XALEemJ-foOn68QUw" source="org.eclipse.papyrus">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_eFIf8nALEemJ-foOn68QUw" key="nature" value="UML_Nature"/>
-      </eAnnotations>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_eFJHA3ALEemJ-foOn68QUw" name="abstracttable" type="_lYIB4HAKEemJ-foOn68QUw" association="_eFIf8HALEemJ-foOn68QUw"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_L9zAQHsFEemo4rKYxRobdQ" name="AbstractList" isAbstract="true">
-      <ownedComment xmi:type="uml:Comment" xmi:id="_597E4HsFEemo4rKYxRobdQ" annotatedElement="_L9zAQHsFEemo4rKYxRobdQ">
-        <body>The abstract element to use to create a new List type</body>
-      </ownedComment>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_R3n6YHsFEemo4rKYxRobdQ" name="items" type="_PugRwHsFEemo4rKYxRobdQ" isOrdered="true" aggregation="composite" association="_R3k3EHsFEemo4rKYxRobdQ">
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_TSVk4HsFEemo4rKYxRobdQ"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_TMYG0HsFEemo4rKYxRobdQ" value="*"/>
-      </ownedAttribute>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Interface" xmi:id="_PugRwHsFEemo4rKYxRobdQ" name="ListItem">
-      <ownedComment xmi:type="uml:Comment" xmi:id="_986qAHsFEemo4rKYxRobdQ" annotatedElement="_PugRwHsFEemo4rKYxRobdQ">
-        <body>Interface to use to create new kind of ListItem</body>
-      </ownedComment>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_5GSEcXvEEemmnMs_VyNz8A" name="subItems" type="_PugRwHsFEemo4rKYxRobdQ" isOrdered="true" aggregation="composite" association="_5GOaEHvEEemmnMs_VyNz8A">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_R0fjQHvIEemmnMs_VyNz8A" annotatedElement="_5GSEcXvEEemmnMs_VyNz8A">
-          <body>This property allows us to make items with children called subItems.</body>
-        </ownedComment>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8NDBEHvEEemmnMs_VyNz8A"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5GSrgHvEEemmnMs_VyNz8A" value="*"/>
-      </ownedAttribute>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_VueQIHsFEemo4rKYxRobdQ" name="getLevel">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FfywIHsHEemo4rKYxRobdQ" source="http://www.eclipse.org/emf/2002/GenModel">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FfywIXsHEemo4rKYxRobdQ" key="body" value="int level = 1;&#xA;org.eclipse.emf.ecore.EObject eContainer = eContainer();&#xA;while (eContainer != null &amp;&amp; eContainer instanceof org.eclipse.papyrus.model2doc.core.builtintypes.ListItem) {&#xA;&#x9;level++;&#xA;&#x9;eContainer = eContainer.eContainer();&#xA;}&#xA;return level;"/>
-        </eAnnotations>
-        <ownedComment xmi:type="uml:Comment" xmi:id="_zObRkHsGEemo4rKYxRobdQ" annotatedElement="_VueQIHsFEemo4rKYxRobdQ">
-          <body>This operation returns the level of the ListItem. Default value is 1;</body>
-        </ownedComment>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_a_EAAHsFEemo4rKYxRobdQ" name="return" direction="return">
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EInt"/>
-          <defaultValue xmi:type="uml:LiteralInteger" xmi:id="_21I5kHsGEemo4rKYxRobdQ" name="DEFAULT_LEVEL_VALUE" value="1"/>
-        </ownedParameter>
-      </ownedOperation>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_R3k3EHsFEemo4rKYxRobdQ" memberEnd="_R3n6YHsFEemo4rKYxRobdQ _R3ohcXsFEemo4rKYxRobdQ">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R3msQHsFEemo4rKYxRobdQ" source="org.eclipse.papyrus">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R3msQXsFEemo4rKYxRobdQ" key="nature" value="UML_Nature"/>
-      </eAnnotations>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_R3ohcXsFEemo4rKYxRobdQ" name="abstractlist" type="_L9zAQHsFEemo4rKYxRobdQ" association="_R3k3EHsFEemo4rKYxRobdQ"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_d6G00HsFEemo4rKYxRobdQ" name="TextListItem">
-      <ownedComment xmi:type="uml:Comment" xmi:id="_Cub4QHsGEemo4rKYxRobdQ" annotatedElement="_d6G00HsFEemo4rKYxRobdQ">
-        <body>Default implementation for ListItem. This one allows to defines Text for the Item</body>
-      </ownedComment>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_rUG70HsFEemo4rKYxRobdQ" name="text">
-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
-        <defaultValue xmi:type="uml:LiteralString" xmi:id="_zIyZEHsFEemo4rKYxRobdQ" name="emptyString" value=""/>
-      </ownedAttribute>
-      <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_opH8QHsFEemo4rKYxRobdQ" client="_d6G00HsFEemo4rKYxRobdQ" supplier="_PugRwHsFEemo4rKYxRobdQ" contract="_PugRwHsFEemo4rKYxRobdQ"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_iB5woHsFEemo4rKYxRobdQ" name="BasicList">
-      <ownedComment xmi:type="uml:Comment" xmi:id="_7z9ZcHsFEemo4rKYxRobdQ" annotatedElement="_iB5woHsFEemo4rKYxRobdQ">
-        <body>The default implementation for List</body>
-      </ownedComment>
-      <generalization xmi:type="uml:Generalization" xmi:id="_l4mVYHsFEemo4rKYxRobdQ" general="_L9zAQHsFEemo4rKYxRobdQ"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Association" xmi:id="_5GOaEHvEEemmnMs_VyNz8A" memberEnd="_5GSEcXvEEemmnMs_VyNz8A _5GSrgXvEEemmnMs_VyNz8A">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5GRdYHvEEemmnMs_VyNz8A" source="org.eclipse.papyrus">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5GSEcHvEEemmnMs_VyNz8A" key="nature" value="UML_Nature"/>
-      </eAnnotations>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_5GSrgXvEEemmnMs_VyNz8A" name="listitem" type="_PugRwHsFEemo4rKYxRobdQ" association="_5GOaEHvEEemmnMs_VyNz8A"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Interface" xmi:id="_o1CCUJQUEemHKPZQudxUGA" name="IFileReference">
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_6HWesJQUEemHKPZQudxUGA" name="getFilePath">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_ddP1QJQVEemHKPZQudxUGA" annotatedElement="_6HWesJQUEemHKPZQudxUGA">
-          <body>Return the path of the referenced file. The path can be a platform:/resource, a platform:/plugin, a path in the current project or a system path (ex: c:\MyDocuments).</body>
-        </ownedComment>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_-zjIEJQUEemHKPZQudxUGA" name="return" direction="return">
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
-        </ownedParameter>
-      </ownedOperation>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_tL-NYJQUEemHKPZQudxUGA" name="DefaultFileReference">
-      <ownedComment xmi:type="uml:Comment" xmi:id="_pzARAJQVEemHKPZQudxUGA" annotatedElement="_tL-NYJQUEemHKPZQudxUGA">
-        <body>Default implementation of IFileReference.</body>
-      </ownedComment>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_B56cEJQVEemHKPZQudxUGA" name="filePath">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_kNey8JQVEemHKPZQudxUGA" annotatedElement="_B56cEJQVEemHKPZQudxUGA">
-          <body>This element allow to reference a file (.txt, odt, ... ). Return the path of the referenced file. The path can be a platform:/resource, a platform:/plugin, a path in the current project or a system path (ex: c:\MyDocuments).</body>
-        </ownedComment>
-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
-      </ownedAttribute>
-      <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_AK-1EJQVEemHKPZQudxUGA" client="_tL-NYJQUEemHKPZQudxUGA" supplier="_o1CCUJQUEemHKPZQudxUGA" contract="_o1CCUJQUEemHKPZQudxUGA"/>
-    </packagedElement>
-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_txSQgHCfEemJ-foOn68QUw">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_txVT0HCfEemJ-foOn68QUw" source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <references xmi:type="ecore:EPackage" href="pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA"/>
-      </eAnnotations>
-      <appliedProfile xmi:type="uml:Profile" href="pathmap://UML_PROFILES/Ecore.profile.uml#_0"/>
-    </profileApplication>
-  </uml:Model>
-  <Ecore:EPackage xmi:id="_u3RBIHCfEemJ-foOn68QUw" base_Package="_WW0l4HAKEemJ-foOn68QUw" packageName="builtintypes" nsPrefix="builtintypes" basePackage="org.eclipse.papyrus.model2doc.core" prefix="BuiltInTypes"/>
-</xmi:XMI>
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Ecore="http://www.eclipse.org/uml2/schemas/Ecore/5" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/uml2/schemas/Ecore/5 pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA">
+  <uml:Model xmi:id="_WW0l4HAKEemJ-foOn68QUw" name="BuiltInTypes" URI="http://www.eclipse.org/papyrus/model2doc/core/1.0.0/BuiltInTypes">
+    <ownedComment xmi:type="uml:Comment" xmi:id="_Ik67gJQVEemHKPZQudxUGA" annotatedElement="_WW0l4HAKEemJ-foOn68QUw">
+      <body>Common interface to reference a file.</body>
+    </ownedComment>
+    <packageImport xmi:type="uml:PackageImport" xmi:id="_WaIYkHAKEemJ-foOn68QUw">
+      <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+    </packageImport>
+    <packagedElement xmi:type="uml:Class" xmi:id="_lYIB4HAKEemJ-foOn68QUw" name="AbstractTable" isAbstract="true">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_8e9l4HCfEemJ-foOn68QUw" annotatedElement="_lYIB4HAKEemJ-foOn68QUw">
+        <body>Abstract class used to represent a Table in the Model2Doc API.</body>
+      </ownedComment>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_oRLSoHAKEemJ-foOn68QUw" name="caption" visibility="public">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_CDrLoHCgEemJ-foOn68QUw" annotatedElement="_oRLSoHAKEemJ-foOn68QUw">
+          <body>The caption of the table.</body>
+        </ownedComment>
+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_eFJHAHALEemJ-foOn68QUw" name="rows" visibility="public" type="_-Rcr4HAKEemJ-foOn68QUw" aggregation="composite" association="_eFIf8HALEemJ-foOn68QUw">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_XTCFUHCgEemJ-foOn68QUw" annotatedElement="_eFJHAHALEemJ-foOn68QUw">
+          <body>The rows owned by the table.</body>
+        </ownedComment>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_eFJHAXALEemJ-foOn68QUw"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_eFJHAnALEemJ-foOn68QUw" value="*"/>
+      </ownedAttribute>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_wrfzkHAKEemJ-foOn68QUw" name="getRowsNumber">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_sSYlYHCmEemJ-foOn68QUw" source="http://www.eclipse.org/emf/2002/GenModel">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_sSYlYXCmEemJ-foOn68QUw" key="body" value="return getRows().size();"/>
+        </eAnnotations>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_LbLGgHCgEemJ-foOn68QUw" annotatedElement="_wrfzkHAKEemJ-foOn68QUw">
+          <body>This method returns the numbers of rows of the table.</body>
+        </ownedComment>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_3SMawHAKEemJ-foOn68QUw" name="return" direction="return">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EInt"/>
+          <defaultValue xmi:type="uml:LiteralInteger" xmi:id="_GBxY4HCgEemJ-foOn68QUw" name="DEFAULT_VALUE"/>
+        </ownedParameter>
+      </ownedOperation>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_y91poHAKEemJ-foOn68QUw" name="getColumnsNumber">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_poKa0nCmEemJ-foOn68QUw" source="http://www.eclipse.org/emf/2002/GenModel">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_poKa03CmEemJ-foOn68QUw" key="body" value="if (getRowsNumber() > 0) {&#xA;&#x9;// we assume all rows have the same number of cells.&#xA;&#x9;final Row firstRow = getRows().get(0);&#xA;&#x9;if (null != firstRow) {&#xA;&#x9;&#x9;return firstRow.getCells().size();&#xA;&#x9;}&#xA;}&#xA;return 0;"/>
+        </eAnnotations>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_Na-bEHCgEemJ-foOn68QUw" annotatedElement="_y91poHAKEemJ-foOn68QUw">
+          <body>This method returns the number of columns of the table.</body>
+        </ownedComment>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_49v9oHAKEemJ-foOn68QUw" name="return" direction="return">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EInt"/>
+          <defaultValue xmi:type="uml:LiteralInteger" xmi:id="_Im6PIHCgEemJ-foOn68QUw" name="DEFAULT_VALUE"/>
+        </ownedParameter>
+      </ownedOperation>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_qn5QIHC_EemO3N3fNOfMKQ" name="getAllCells">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Vu06EHDAEemO3N3fNOfMKQ" source="http://www.eclipse.org/emf/2002/GenModel">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Vu06EXDAEemO3N3fNOfMKQ" key="body" value="final java.util.List&lt;Cell> cells = new  java.util.ArrayList&lt;Cell>();&#xA;for (final Row row : getRows()) {&#xA;&#x9;cells.addAll(row.getCells());&#xA;}&#xA;return  org.eclipse.emf.common.util.ECollections.toEList(cells);&#xA;"/>
+        </eAnnotations>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_SoBhMHDAEemO3N3fNOfMKQ" annotatedElement="_qn5QIHC_EemO3N3fNOfMKQ">
+          <body>This method returns all Cells as a List. This list concatenates the Cells Row by Row. So for a table with 3 columns and 5 rows.&#xD;
+The 3 first cells will represents the first row, then the cell, 4, 5 and 6, will represents the 2 rows, and so on.</body>
+        </ownedComment>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_yHsCgHC_EemO3N3fNOfMKQ" name="return" type="_EUUNQHALEemJ-foOn68QUw" direction="return">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_3OZBIHDAEemO3N3fNOfMKQ"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3OsjIHDAEemO3N3fNOfMKQ" value="*"/>
+        </ownedParameter>
+      </ownedOperation>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="_54knIHAKEemJ-foOn68QUw" name="BasicTable">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_AZzq0HCgEemJ-foOn68QUw" annotatedElement="_54knIHAKEemJ-foOn68QUw">
+        <body>Default implementation provided for a table.</body>
+      </ownedComment>
+      <generalization xmi:type="uml:Generalization" xmi:id="_8p8ikHAKEemJ-foOn68QUw" general="_lYIB4HAKEemJ-foOn68QUw"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Interface" xmi:id="_-Rcr4HAKEemJ-foOn68QUw" name="Row">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_FVvOAnALEemJ-foOn68QUw" name="cells" type="_EUUNQHALEemJ-foOn68QUw" aggregation="composite" association="_FVt_4HALEemJ-foOn68QUw">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_Qu64EHCgEemJ-foOn68QUw" annotatedElement="_FVvOAnALEemJ-foOn68QUw">
+          <body>The cells owned by the row.</body>
+        </ownedComment>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_FVv1EHALEemJ-foOn68QUw"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FVv1EXALEemJ-foOn68QUw" value="*"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="__NYvsHAKEemJ-foOn68QUw" name="BasicRow">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_bgPsoHCgEemJ-foOn68QUw" annotatedElement="__NYvsHAKEemJ-foOn68QUw">
+        <body>Default Row implementation.</body>
+      </ownedComment>
+      <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_C7ojEHALEemJ-foOn68QUw" client="__NYvsHAKEemJ-foOn68QUw" supplier="_-Rcr4HAKEemJ-foOn68QUw" contract="_-Rcr4HAKEemJ-foOn68QUw"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Interface" xmi:id="_EUUNQHALEemJ-foOn68QUw" name="Cell">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_RDZH8HALEemJ-foOn68QUw" name="location" type="_H_dCQHALEemJ-foOn68QUw">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_f1hq0HCgEemJ-foOn68QUw" annotatedElement="_RDZH8HALEemJ-foOn68QUw">
+          <body>The location of the cells.</body>
+        </ownedComment>
+        <defaultValue xmi:type="uml:LiteralString" xmi:id="_WzxyMHALEemJ-foOn68QUw" name="DEFAULT_VALUE" value="BODY"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="_FVt_4HALEemJ-foOn68QUw" memberEnd="_FVvOAnALEemJ-foOn68QUw _FVwcIHALEemJ-foOn68QUw">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FVvOAHALEemJ-foOn68QUw" source="org.eclipse.papyrus">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FVvOAXALEemJ-foOn68QUw" key="nature" value="UML_Nature"/>
+      </eAnnotations>
+      <ownedEnd xmi:type="uml:Property" xmi:id="_FVwcIHALEemJ-foOn68QUw" name="row" type="_-Rcr4HAKEemJ-foOn68QUw" association="_FVt_4HALEemJ-foOn68QUw"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Enumeration" xmi:id="_H_dCQHALEemJ-foOn68QUw" name="CellLocation">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_eB1foHCgEemJ-foOn68QUw" annotatedElement="_H_dCQHALEemJ-foOn68QUw">
+        <body>This enumeration allows to define the location of each cell.</body>
+      </ownedComment>
+      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_I2oh4HALEemJ-foOn68QUw" name="CORNER"/>
+      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_JsUzwHALEemJ-foOn68QUw" name="COLUMN_HEADER"/>
+      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_LQhKYHALEemJ-foOn68QUw" name="ROW_HEADER"/>
+      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_NdPgoHALEemJ-foOn68QUw" name="BODY"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="_XyQMoHALEemJ-foOn68QUw" name="TextCell">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_Y5VwgHALEemJ-foOn68QUw" name="text">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_imNCsHCgEemJ-foOn68QUw" annotatedElement="_Y5VwgHALEemJ-foOn68QUw">
+          <body>The text owned by the cells.</body>
+        </ownedComment>
+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
+        <defaultValue xmi:type="uml:LiteralString" xmi:id="_5KR7gHC_EemO3N3fNOfMKQ" name="DEFAULT_VALUE" value=""/>
+      </ownedAttribute>
+      <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_cvcfYHALEemJ-foOn68QUw" client="_XyQMoHALEemJ-foOn68QUw" supplier="_EUUNQHALEemJ-foOn68QUw" contract="_EUUNQHALEemJ-foOn68QUw"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="_eFIf8HALEemJ-foOn68QUw" memberEnd="_eFJHAHALEemJ-foOn68QUw _eFJHA3ALEemJ-foOn68QUw">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_eFIf8XALEemJ-foOn68QUw" source="org.eclipse.papyrus">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_eFIf8nALEemJ-foOn68QUw" key="nature" value="UML_Nature"/>
+      </eAnnotations>
+      <ownedEnd xmi:type="uml:Property" xmi:id="_eFJHA3ALEemJ-foOn68QUw" name="abstracttable" type="_lYIB4HAKEemJ-foOn68QUw" association="_eFIf8HALEemJ-foOn68QUw"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="_L9zAQHsFEemo4rKYxRobdQ" name="AbstractList" isAbstract="true">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_597E4HsFEemo4rKYxRobdQ" annotatedElement="_L9zAQHsFEemo4rKYxRobdQ">
+        <body>The abstract element to use to create a new List type</body>
+      </ownedComment>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_R3n6YHsFEemo4rKYxRobdQ" name="items" type="_PugRwHsFEemo4rKYxRobdQ" isOrdered="true" aggregation="composite" association="_R3k3EHsFEemo4rKYxRobdQ">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_TSVk4HsFEemo4rKYxRobdQ"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_TMYG0HsFEemo4rKYxRobdQ" value="*"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Interface" xmi:id="_PugRwHsFEemo4rKYxRobdQ" name="ListItem">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_986qAHsFEemo4rKYxRobdQ" annotatedElement="_PugRwHsFEemo4rKYxRobdQ">
+        <body>Interface to use to create new kind of ListItem</body>
+      </ownedComment>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_5GSEcXvEEemmnMs_VyNz8A" name="subItems" type="_PugRwHsFEemo4rKYxRobdQ" isOrdered="true" aggregation="composite" association="_5GOaEHvEEemmnMs_VyNz8A">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_R0fjQHvIEemmnMs_VyNz8A" annotatedElement="_5GSEcXvEEemmnMs_VyNz8A">
+          <body>This property allows us to make items with children called subItems.</body>
+        </ownedComment>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8NDBEHvEEemmnMs_VyNz8A"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5GSrgHvEEemmnMs_VyNz8A" value="*"/>
+      </ownedAttribute>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_VueQIHsFEemo4rKYxRobdQ" name="getLevel">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FfywIHsHEemo4rKYxRobdQ" source="http://www.eclipse.org/emf/2002/GenModel">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FfywIXsHEemo4rKYxRobdQ" key="body" value="int level = 1;&#xA;org.eclipse.emf.ecore.EObject eContainer = eContainer();&#xA;while (eContainer != null &amp;&amp; eContainer instanceof org.eclipse.papyrus.model2doc.core.builtintypes.ListItem) {&#xA;&#x9;level++;&#xA;&#x9;eContainer = eContainer.eContainer();&#xA;}&#xA;return level;"/>
+        </eAnnotations>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_zObRkHsGEemo4rKYxRobdQ" annotatedElement="_VueQIHsFEemo4rKYxRobdQ">
+          <body>This operation returns the level of the ListItem. Default value is 1;</body>
+        </ownedComment>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_a_EAAHsFEemo4rKYxRobdQ" name="return" direction="return">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EInt"/>
+          <defaultValue xmi:type="uml:LiteralInteger" xmi:id="_21I5kHsGEemo4rKYxRobdQ" name="DEFAULT_LEVEL_VALUE" value="1"/>
+        </ownedParameter>
+      </ownedOperation>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="_R3k3EHsFEemo4rKYxRobdQ" memberEnd="_R3n6YHsFEemo4rKYxRobdQ _R3ohcXsFEemo4rKYxRobdQ">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R3msQHsFEemo4rKYxRobdQ" source="org.eclipse.papyrus">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R3msQXsFEemo4rKYxRobdQ" key="nature" value="UML_Nature"/>
+      </eAnnotations>
+      <ownedEnd xmi:type="uml:Property" xmi:id="_R3ohcXsFEemo4rKYxRobdQ" name="abstractlist" type="_L9zAQHsFEemo4rKYxRobdQ" association="_R3k3EHsFEemo4rKYxRobdQ"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="_d6G00HsFEemo4rKYxRobdQ" name="TextListItem">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_Cub4QHsGEemo4rKYxRobdQ" annotatedElement="_d6G00HsFEemo4rKYxRobdQ">
+        <body>Default implementation for ListItem. This one allows to defines Text for the Item</body>
+      </ownedComment>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_rUG70HsFEemo4rKYxRobdQ" name="text">
+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
+        <defaultValue xmi:type="uml:LiteralString" xmi:id="_zIyZEHsFEemo4rKYxRobdQ" name="emptyString" value=""/>
+      </ownedAttribute>
+      <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_opH8QHsFEemo4rKYxRobdQ" client="_d6G00HsFEemo4rKYxRobdQ" supplier="_PugRwHsFEemo4rKYxRobdQ" contract="_PugRwHsFEemo4rKYxRobdQ"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="_iB5woHsFEemo4rKYxRobdQ" name="BasicList">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_7z9ZcHsFEemo4rKYxRobdQ" annotatedElement="_iB5woHsFEemo4rKYxRobdQ">
+        <body>The default implementation for List</body>
+      </ownedComment>
+      <generalization xmi:type="uml:Generalization" xmi:id="_l4mVYHsFEemo4rKYxRobdQ" general="_L9zAQHsFEemo4rKYxRobdQ"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="_5GOaEHvEEemmnMs_VyNz8A" memberEnd="_5GSEcXvEEemmnMs_VyNz8A _5GSrgXvEEemmnMs_VyNz8A">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5GRdYHvEEemmnMs_VyNz8A" source="org.eclipse.papyrus">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5GSEcHvEEemmnMs_VyNz8A" key="nature" value="UML_Nature"/>
+      </eAnnotations>
+      <ownedEnd xmi:type="uml:Property" xmi:id="_5GSrgXvEEemmnMs_VyNz8A" name="listitem" type="_PugRwHsFEemo4rKYxRobdQ" association="_5GOaEHvEEemmnMs_VyNz8A"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Interface" xmi:id="_o1CCUJQUEemHKPZQudxUGA" name="IFileReference">
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_6HWesJQUEemHKPZQudxUGA" name="getFilePath">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_ddP1QJQVEemHKPZQudxUGA" annotatedElement="_6HWesJQUEemHKPZQudxUGA">
+          <body>Return the path of the referenced file. The path can be a platform:/resource, a platform:/plugin, a path in the current project or a system path (ex: c:\MyDocuments).</body>
+        </ownedComment>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_-zjIEJQUEemHKPZQudxUGA" name="return" direction="return">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
+        </ownedParameter>
+      </ownedOperation>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="_tL-NYJQUEemHKPZQudxUGA" name="DefaultFileReference">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_pzARAJQVEemHKPZQudxUGA" annotatedElement="_tL-NYJQUEemHKPZQudxUGA">
+        <body>Default implementation of IFileReference.</body>
+      </ownedComment>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_B56cEJQVEemHKPZQudxUGA" name="filePath">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_kNey8JQVEemHKPZQudxUGA" annotatedElement="_B56cEJQVEemHKPZQudxUGA">
+          <body>This element allow to reference a file (.txt, odt, ... ). Return the path of the referenced file. The path can be a platform:/resource, a platform:/plugin, a path in the current project or a system path (ex: c:\MyDocuments).</body>
+        </ownedComment>
+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
+      </ownedAttribute>
+      <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_AK-1EJQVEemHKPZQudxUGA" client="_tL-NYJQUEemHKPZQudxUGA" supplier="_o1CCUJQUEemHKPZQudxUGA" contract="_o1CCUJQUEemHKPZQudxUGA"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Enumeration" xmi:id="_I9QFkBn9EeunG-PlCrg2Pg" name="ImageFormat">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_sHK6kB9sEeufppQNI_9Idw" annotatedElement="_I9QFkBn9EeunG-PlCrg2Pg">
+        <body>This enumeration provide the list of format for images</body>
+      </ownedComment>
+      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_qjV3oB28EeuC_v9WQLDVcQ" name="SVG"/>
+      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_rzcNkB28EeuC_v9WQLDVcQ" name="PNG"/>
+    </packagedElement>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_txSQgHCfEemJ-foOn68QUw">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_txVT0HCfEemJ-foOn68QUw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://UML_PROFILES/Ecore.profile.uml#_0"/>
+    </profileApplication>
+  </uml:Model>
+  <Ecore:EPackage xmi:id="_u3RBIHCfEemJ-foOn68QUw" base_Package="_WW0l4HAKEemJ-foOn68QUw" packageName="builtintypes" nsPrefix="builtintypes" basePackage="org.eclipse.papyrus.model2doc.core" prefix="BuiltInTypes"/>
+</xmi:XMI>
diff --git a/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/src-gen/org/eclipse/papyrus/model2doc/core/builtintypes/AbstractTable.java b/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/src-gen/org/eclipse/papyrus/model2doc/core/builtintypes/AbstractTable.java
index efc4f90..314d814 100755
--- a/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/src-gen/org/eclipse/papyrus/model2doc/core/builtintypes/AbstractTable.java
+++ b/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/src-gen/org/eclipse/papyrus/model2doc/core/builtintypes/AbstractTable.java
@@ -61,7 +61,7 @@
 	 * <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *                  the new value of the '<em>Caption</em>' attribute.
+	 *            the new value of the '<em>Caption</em>' attribute.
 	 * @see #getCaption()
 	 * @generated
 	 */
diff --git a/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/src-gen/org/eclipse/papyrus/model2doc/core/builtintypes/BuiltInTypesPackage.java b/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/src-gen/org/eclipse/papyrus/model2doc/core/builtintypes/BuiltInTypesPackage.java
index fc2aae3..d23b17d 100755
--- a/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/src-gen/org/eclipse/papyrus/model2doc/core/builtintypes/BuiltInTypesPackage.java
+++ b/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/src-gen/org/eclipse/papyrus/model2doc/core/builtintypes/BuiltInTypesPackage.java
@@ -711,6 +711,17 @@
 	 */
 	int CELL_LOCATION = 12;
 
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.model2doc.core.builtintypes.ImageFormat <em>Image Format</em>}' enum.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.papyrus.model2doc.core.builtintypes.ImageFormat
+	 * @see org.eclipse.papyrus.model2doc.core.builtintypes.impl.BuiltInTypesPackageImpl#getImageFormat()
+	 * @generated
+	 */
+	int IMAGE_FORMAT = 13;
+
 
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.model2doc.core.builtintypes.AbstractTable <em>Abstract Table</em>}'.
@@ -1019,6 +1030,17 @@
 	EEnum getCellLocation();
 
 	/**
+	 * Returns the meta object for enum '{@link org.eclipse.papyrus.model2doc.core.builtintypes.ImageFormat <em>Image Format</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for enum '<em>Image Format</em>'.
+	 * @see org.eclipse.papyrus.model2doc.core.builtintypes.ImageFormat
+	 * @generated
+	 */
+	EEnum getImageFormat();
+
+	/**
 	 * Returns the factory that creates the instances of the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1312,6 +1334,17 @@
 		 */
 		EEnum CELL_LOCATION = eINSTANCE.getCellLocation();
 
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.model2doc.core.builtintypes.ImageFormat <em>Image Format</em>}' enum.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @see org.eclipse.papyrus.model2doc.core.builtintypes.ImageFormat
+		 * @see org.eclipse.papyrus.model2doc.core.builtintypes.impl.BuiltInTypesPackageImpl#getImageFormat()
+		 * @generated
+		 */
+		EEnum IMAGE_FORMAT = eINSTANCE.getImageFormat();
+
 	}
 
 } // BuiltInTypesPackage
diff --git a/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/src-gen/org/eclipse/papyrus/model2doc/core/builtintypes/Cell.java b/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/src-gen/org/eclipse/papyrus/model2doc/core/builtintypes/Cell.java
index e964b73..308706a 100755
--- a/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/src-gen/org/eclipse/papyrus/model2doc/core/builtintypes/Cell.java
+++ b/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/src-gen/org/eclipse/papyrus/model2doc/core/builtintypes/Cell.java
@@ -57,7 +57,7 @@
 	 * <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *                  the new value of the '<em>Location</em>' attribute.
+	 *            the new value of the '<em>Location</em>' attribute.
 	 * @see org.eclipse.papyrus.model2doc.core.builtintypes.CellLocation
 	 * @see #getLocation()
 	 * @generated
diff --git a/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/src-gen/org/eclipse/papyrus/model2doc/core/builtintypes/CellLocation.java b/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/src-gen/org/eclipse/papyrus/model2doc/core/builtintypes/CellLocation.java
index b476b66..8e728b2 100755
--- a/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/src-gen/org/eclipse/papyrus/model2doc/core/builtintypes/CellLocation.java
+++ b/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/src-gen/org/eclipse/papyrus/model2doc/core/builtintypes/CellLocation.java
@@ -154,7 +154,7 @@
 	 * <!-- end-user-doc -->
 	 *
 	 * @param literal
-	 *                    the literal.
+	 *            the literal.
 	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
@@ -174,7 +174,7 @@
 	 * <!-- end-user-doc -->
 	 *
 	 * @param name
-	 *                 the name.
+	 *            the name.
 	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
@@ -194,7 +194,7 @@
 	 * <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *                  the integer value.
+	 *            the integer value.
 	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
diff --git a/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/src-gen/org/eclipse/papyrus/model2doc/core/builtintypes/DefaultFileReference.java b/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/src-gen/org/eclipse/papyrus/model2doc/core/builtintypes/DefaultFileReference.java
index a028778..03be064 100755
--- a/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/src-gen/org/eclipse/papyrus/model2doc/core/builtintypes/DefaultFileReference.java
+++ b/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/src-gen/org/eclipse/papyrus/model2doc/core/builtintypes/DefaultFileReference.java
@@ -58,7 +58,7 @@
 	 * <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *                  the new value of the '<em>File Path</em>' attribute.
+	 *            the new value of the '<em>File Path</em>' attribute.
 	 * @see #getFilePath()
 	 * @generated
 	 */
diff --git a/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/src-gen/org/eclipse/papyrus/model2doc/core/builtintypes/ImageFormat.java b/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/src-gen/org/eclipse/papyrus/model2doc/core/builtintypes/ImageFormat.java
new file mode 100755
index 0000000..1d7b2cb
--- /dev/null
+++ b/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/src-gen/org/eclipse/papyrus/model2doc/core/builtintypes/ImageFormat.java
@@ -0,0 +1,245 @@
+/**
+ * Copyright (c) 2019 CEA LIST.
+ *
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License 2.0
+ *  which accompanies this distribution, and is available at
+ *  https://www.eclipse.org/legal/epl-2.0/
+ *
+ *  SPDX-License-Identifier: EPL-2.0
+ *
+ *  Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.model2doc.core.builtintypes;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.common.util.Enumerator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the literals of the enumeration '<em><b>Image Format</b></em>',
+ * and utility methods for working with them.
+ * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * This enumeration provide the list of format for images
+ * <!-- end-model-doc -->
+ *
+ * @see org.eclipse.papyrus.model2doc.core.builtintypes.BuiltInTypesPackage#getImageFormat()
+ * @model
+ * @generated
+ */
+public enum ImageFormat implements Enumerator {
+	/**
+	 * The '<em><b>SVG</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #SVG_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	SVG(0, "SVG", "SVG"), //$NON-NLS-1$ //$NON-NLS-2$
+
+	/**
+	 * The '<em><b>PNG</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #PNG_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	PNG(1, "PNG", "PNG"); //$NON-NLS-1$ //$NON-NLS-2$
+
+	/**
+	 * The '<em><b>SVG</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #SVG
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int SVG_VALUE = 0;
+
+	/**
+	 * The '<em><b>PNG</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #PNG
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int PNG_VALUE = 1;
+
+	/**
+	 * An array of all the '<em><b>Image Format</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private static final ImageFormat[] VALUES_ARRAY = new ImageFormat[] {
+			SVG,
+			PNG,
+	};
+
+	/**
+	 * A public read-only list of all the '<em><b>Image Format</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public static final List<ImageFormat> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+
+	/**
+	 * Returns the '<em><b>Image Format</b></em>' literal with the specified literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param literal
+	 *            the literal.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static ImageFormat get(String literal) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			ImageFormat result = VALUES_ARRAY[i];
+			if (result.toString().equals(literal)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Image Format</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param name
+	 *            the name.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static ImageFormat getByName(String name) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			ImageFormat result = VALUES_ARRAY[i];
+			if (result.getName().equals(name)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Image Format</b></em>' literal with the specified integer value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *            the integer value.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static ImageFormat get(int value) {
+		switch (value) {
+		case SVG_VALUE:
+			return SVG;
+		case PNG_VALUE:
+			return PNG;
+		}
+		return null;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private final int value;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private final String name;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private final String literal;
+
+	/**
+	 * Only this class can construct instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private ImageFormat(int value, String name, String literal) {
+		this.value = value;
+		this.name = name;
+		this.literal = literal;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public int getValue() {
+		return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getLiteral() {
+		return literal;
+	}
+
+	/**
+	 * Returns the literal value of the enumerator, which is its string representation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		return literal;
+	}
+
+} // ImageFormat
diff --git a/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/src-gen/org/eclipse/papyrus/model2doc/core/builtintypes/TextCell.java b/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/src-gen/org/eclipse/papyrus/model2doc/core/builtintypes/TextCell.java
index cceb5e9..0cba860 100755
--- a/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/src-gen/org/eclipse/papyrus/model2doc/core/builtintypes/TextCell.java
+++ b/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/src-gen/org/eclipse/papyrus/model2doc/core/builtintypes/TextCell.java
@@ -54,7 +54,7 @@
 	 * <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *                  the new value of the '<em>Text</em>' attribute.
+	 *            the new value of the '<em>Text</em>' attribute.
 	 * @see #getText()
 	 * @generated
 	 */
diff --git a/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/src-gen/org/eclipse/papyrus/model2doc/core/builtintypes/TextListItem.java b/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/src-gen/org/eclipse/papyrus/model2doc/core/builtintypes/TextListItem.java
index b4f4736..c803f9f 100755
--- a/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/src-gen/org/eclipse/papyrus/model2doc/core/builtintypes/TextListItem.java
+++ b/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/src-gen/org/eclipse/papyrus/model2doc/core/builtintypes/TextListItem.java
@@ -59,7 +59,7 @@
 	 * <!-- end-user-doc -->
 	 *
 	 * @param value
-	 *                  the new value of the '<em>Text</em>' attribute.
+	 *            the new value of the '<em>Text</em>' attribute.
 	 * @see #getText()
 	 * @generated
 	 */
diff --git a/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/src-gen/org/eclipse/papyrus/model2doc/core/builtintypes/impl/BuiltInTypesFactoryImpl.java b/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/src-gen/org/eclipse/papyrus/model2doc/core/builtintypes/impl/BuiltInTypesFactoryImpl.java
index 65f0853..12d726b 100755
--- a/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/src-gen/org/eclipse/papyrus/model2doc/core/builtintypes/impl/BuiltInTypesFactoryImpl.java
+++ b/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/src-gen/org/eclipse/papyrus/model2doc/core/builtintypes/impl/BuiltInTypesFactoryImpl.java
@@ -99,6 +99,8 @@
 		switch (eDataType.getClassifierID()) {
 		case BuiltInTypesPackage.CELL_LOCATION:
 			return createCellLocationFromString(eDataType, initialValue);
+		case BuiltInTypesPackage.IMAGE_FORMAT:
+			return createImageFormatFromString(eDataType, initialValue);
 		default:
 			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
 		}
@@ -115,6 +117,8 @@
 		switch (eDataType.getClassifierID()) {
 		case BuiltInTypesPackage.CELL_LOCATION:
 			return convertCellLocationToString(eDataType, instanceValue);
+		case BuiltInTypesPackage.IMAGE_FORMAT:
+			return convertImageFormatToString(eDataType, instanceValue);
 		default:
 			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
 		}
@@ -223,6 +227,31 @@
 	 *
 	 * @generated
 	 */
+	public ImageFormat createImageFormatFromString(EDataType eDataType, String initialValue) {
+		ImageFormat result = ImageFormat.get(initialValue);
+		if (result == null)
+		 {
+			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		}
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public String convertImageFormatToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
 	@Override
 	public BuiltInTypesPackage getBuiltInTypesPackage() {
 		return (BuiltInTypesPackage) getEPackage();
diff --git a/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/src-gen/org/eclipse/papyrus/model2doc/core/builtintypes/impl/BuiltInTypesPackageImpl.java b/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/src-gen/org/eclipse/papyrus/model2doc/core/builtintypes/impl/BuiltInTypesPackageImpl.java
index 5552ea6..04e76e7 100755
--- a/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/src-gen/org/eclipse/papyrus/model2doc/core/builtintypes/impl/BuiltInTypesPackageImpl.java
+++ b/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/src-gen/org/eclipse/papyrus/model2doc/core/builtintypes/impl/BuiltInTypesPackageImpl.java
@@ -33,6 +33,7 @@
 import org.eclipse.papyrus.model2doc.core.builtintypes.CellLocation;
 import org.eclipse.papyrus.model2doc.core.builtintypes.DefaultFileReference;
 import org.eclipse.papyrus.model2doc.core.builtintypes.IFileReference;
+import org.eclipse.papyrus.model2doc.core.builtintypes.ImageFormat;
 import org.eclipse.papyrus.model2doc.core.builtintypes.ListItem;
 import org.eclipse.papyrus.model2doc.core.builtintypes.Row;
 import org.eclipse.papyrus.model2doc.core.builtintypes.TextCell;
@@ -151,6 +152,14 @@
 	private EEnum cellLocationEEnum = null;
 
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EEnum imageFormatEEnum = null;
+
+	/**
 	 * Creates an instance of the model <b>Package</b>, registered with
 	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
 	 * package URI value.
@@ -522,6 +531,17 @@
 	 * @generated
 	 */
 	@Override
+	public EEnum getImageFormat() {
+		return imageFormatEEnum;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
 	public BuiltInTypesFactory getBuiltInTypesFactory() {
 		return (BuiltInTypesFactory) getEFactoryInstance();
 	}
@@ -589,6 +609,7 @@
 
 		// Create enums
 		cellLocationEEnum = createEEnum(CELL_LOCATION);
+		imageFormatEEnum = createEEnum(IMAGE_FORMAT);
 	}
 
 	/**
@@ -681,6 +702,10 @@
 		addEEnumLiteral(cellLocationEEnum, CellLocation.ROW_HEADER);
 		addEEnumLiteral(cellLocationEEnum, CellLocation.BODY);
 
+		initEEnum(imageFormatEEnum, ImageFormat.class, "ImageFormat"); //$NON-NLS-1$
+		addEEnumLiteral(imageFormatEEnum, ImageFormat.SVG);
+		addEEnumLiteral(imageFormatEEnum, ImageFormat.PNG);
+
 		// Create resource
 		createResource(eNS_URI);
 
diff --git a/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/src-gen/org/eclipse/papyrus/model2doc/core/builtintypes/util/BuiltInTypesAdapterFactory.java b/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/src-gen/org/eclipse/papyrus/model2doc/core/builtintypes/util/BuiltInTypesAdapterFactory.java
index bba96ac..342ab1f 100755
--- a/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/src-gen/org/eclipse/papyrus/model2doc/core/builtintypes/util/BuiltInTypesAdapterFactory.java
+++ b/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/src-gen/org/eclipse/papyrus/model2doc/core/builtintypes/util/BuiltInTypesAdapterFactory.java
@@ -154,7 +154,7 @@
 	 * <!-- end-user-doc -->
 	 *
 	 * @param target
-	 *                   the object to adapt.
+	 *            the object to adapt.
 	 * @return the adapter for the <code>target</code>.
 	 * @generated
 	 */
diff --git a/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/src-gen/org/eclipse/papyrus/model2doc/core/builtintypes/util/BuiltInTypesSwitch.java b/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/src-gen/org/eclipse/papyrus/model2doc/core/builtintypes/util/BuiltInTypesSwitch.java
index cacb398..3979d03 100755
--- a/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/src-gen/org/eclipse/papyrus/model2doc/core/builtintypes/util/BuiltInTypesSwitch.java
+++ b/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/src-gen/org/eclipse/papyrus/model2doc/core/builtintypes/util/BuiltInTypesSwitch.java
@@ -63,7 +63,7 @@
 	 * <!-- end-user-doc -->
 	 *
 	 * @param ePackage
-	 *                     the package in question.
+	 *            the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
 	 */
@@ -210,7 +210,7 @@
 	 * <!-- end-user-doc -->
 	 *
 	 * @param object
-	 *                   the target of the switch.
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Abstract Table</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -227,7 +227,7 @@
 	 * <!-- end-user-doc -->
 	 *
 	 * @param object
-	 *                   the target of the switch.
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Row</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -244,7 +244,7 @@
 	 * <!-- end-user-doc -->
 	 *
 	 * @param object
-	 *                   the target of the switch.
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Cell</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -261,7 +261,7 @@
 	 * <!-- end-user-doc -->
 	 *
 	 * @param object
-	 *                   the target of the switch.
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Basic Table</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -278,7 +278,7 @@
 	 * <!-- end-user-doc -->
 	 *
 	 * @param object
-	 *                   the target of the switch.
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Basic Row</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -295,7 +295,7 @@
 	 * <!-- end-user-doc -->
 	 *
 	 * @param object
-	 *                   the target of the switch.
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Text Cell</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -312,7 +312,7 @@
 	 * <!-- end-user-doc -->
 	 *
 	 * @param object
-	 *                   the target of the switch.
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Abstract List</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -329,7 +329,7 @@
 	 * <!-- end-user-doc -->
 	 *
 	 * @param object
-	 *                   the target of the switch.
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>List Item</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -346,7 +346,7 @@
 	 * <!-- end-user-doc -->
 	 *
 	 * @param object
-	 *                   the target of the switch.
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Text List Item</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -363,7 +363,7 @@
 	 * <!-- end-user-doc -->
 	 *
 	 * @param object
-	 *                   the target of the switch.
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Basic List</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -380,7 +380,7 @@
 	 * <!-- end-user-doc -->
 	 *
 	 * @param object
-	 *                   the target of the switch.
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>IFile Reference</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -397,7 +397,7 @@
 	 * <!-- end-user-doc -->
 	 *
 	 * @param object
-	 *                   the target of the switch.
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Default File Reference</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -414,7 +414,7 @@
 	 * <!-- end-user-doc -->
 	 *
 	 * @param object
-	 *                   the target of the switch.
+	 *            the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
 	 * @generated
diff --git a/plugins/docx/org.eclipse.papyrus.model2doc.docx/META-INF/MANIFEST.MF b/plugins/docx/org.eclipse.papyrus.model2doc.docx/META-INF/MANIFEST.MF
index cbe972b..8c253f9 100755
--- a/plugins/docx/org.eclipse.papyrus.model2doc.docx/META-INF/MANIFEST.MF
+++ b/plugins/docx/org.eclipse.papyrus.model2doc.docx/META-INF/MANIFEST.MF
@@ -9,7 +9,9 @@
  org.eclipse.core.runtime;bundle-version="[3.15.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.17.0,3.0.0)",
  org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
+ org.apache.poi;bundle-version="[3.9.0,4.0.0)",
  org.apache.poi.ooxml;bundle-version="[3.9.0,4.0.0)",
+ org.apache.poi.ooxml.schemas;bundle-version="[3.9.0,4.0.0)",
  org.eclipse.papyrus.model2doc.core;bundle-version="[0.8.0,1.0.0)",
  org.eclipse.papyrus.model2doc.core.generatorconfiguration;bundle-version="[0.8.0,1.0.0)",
  org.eclipse.papyrus.model2doc.core.builtintypes;bundle-version="[0.8.0,1.0.0)",
@@ -18,5 +20,5 @@
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.papyrus.model2doc.docx
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.papyrus.model2doc.docx.internal.transcription
 Bundle-Vendor: %providerName
+Export-Package: org.eclipse.papyrus.model2doc.docx.internal.transcription
diff --git a/plugins/docx/org.eclipse.papyrus.model2doc.docx/src/org/eclipse/papyrus/model2doc/docx/internal/transcription/DocxTranscription.java b/plugins/docx/org.eclipse.papyrus.model2doc.docx/src/org/eclipse/papyrus/model2doc/docx/internal/transcription/DocxTranscription.java
index 3a4db79..86e36e5 100755
--- a/plugins/docx/org.eclipse.papyrus.model2doc.docx/src/org/eclipse/papyrus/model2doc/docx/internal/transcription/DocxTranscription.java
+++ b/plugins/docx/org.eclipse.papyrus.model2doc.docx/src/org/eclipse/papyrus/model2doc/docx/internal/transcription/DocxTranscription.java
@@ -14,6 +14,7 @@
 package org.eclipse.papyrus.model2doc.docx.internal.transcription;
 
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -22,10 +23,15 @@
 import java.util.Iterator;
 import java.util.List;
 
+import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
+import org.apache.poi.xwpf.usermodel.Document;
 import org.apache.poi.xwpf.usermodel.XWPFDocument;
 import org.apache.poi.xwpf.usermodel.XWPFParagraph;
 import org.apache.poi.xwpf.usermodel.XWPFRun;
 import org.apache.poi.xwpf.usermodel.XWPFTable;
+import org.apache.xmlbeans.XmlException;
+import org.apache.xmlbeans.XmlToken;
+import org.eclipse.core.runtime.Assert;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.papyrus.model2doc.core.author.IAuthor;
 import org.eclipse.papyrus.model2doc.core.builtintypes.AbstractTable;
@@ -39,8 +45,12 @@
 import org.eclipse.papyrus.model2doc.core.transcription.ImageDescription;
 import org.eclipse.papyrus.model2doc.core.transcription.Transcription;
 import org.eclipse.papyrus.model2doc.docx.Activator;
+import org.eclipse.papyrus.model2doc.docx.internal.util.ImageUtils;
 import org.eclipse.papyrus.model2doc.docx.services.StyleService;
 import org.eclipse.papyrus.model2doc.docx.services.StyleServiceImpl;
+import org.openxmlformats.schemas.drawingml.x2006.main.CTNonVisualDrawingProps;
+import org.openxmlformats.schemas.drawingml.x2006.main.CTPositiveSize2D;
+import org.openxmlformats.schemas.drawingml.x2006.wordprocessingDrawing.CTInline;
 
 public class DocxTranscription implements Transcription {
 
@@ -203,8 +213,92 @@
 
 	@Override
 	public void writeImage(String imagePath, String caption) {
-		// TODO Auto-generated method stub
+		Assert.isTrue(false == imagePath.endsWith("svg"));
 
+		// XWPFParagraph paragraph = document.createParagraph();
+		// XWPFRun run = paragraph.createRun();
+		FileInputStream inputStream;
+		try {
+			inputStream = new FileInputStream(imagePath);
+			String imageId = document.addPictureData(inputStream, Document.PICTURE_TYPE_PNG); // TODO move to import image
+
+			// XWPFPicture picture = run.addPicture(inputStream, Document.PICTURE_TYPE_PNG, imageId, Units.toEMU(100), Units.toEMU(100));
+			// CTBlipFillProperties blipFill = picture.getCTPicture().addNewBlipFill();
+			// CTBlip blip = blipFill.addNewBlip();
+			// blip.setEmbed(imageId);
+			int[] size = ImageUtils.getImageSize(imagePath, document);
+			createPicture(imageId, document.getNextPicNameNumber(Document.PICTURE_TYPE_PNG), size[0], size[1]);
+		} catch (FileNotFoundException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (InvalidFormatException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
+
+	public void createPicture(String blipId, int id, int width, int height) {
+		final int EMU = 9525;
+		// width *= EMU;
+		// height *= EMU;
+		// String blipId = getAllPictures().get(id).getPackageRelationship().getId();
+
+
+		CTInline inline = document.createParagraph().createRun().getCTR().addNewDrawing().addNewInline();
+
+		String picXml = "" +
+				"<a:graphic xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\">" +
+				"   <a:graphicData uri=\"http://schemas.openxmlformats.org/drawingml/2006/picture\">" +
+				"      <pic:pic xmlns:pic=\"http://schemas.openxmlformats.org/drawingml/2006/picture\">" +
+				"         <pic:nvPicPr>" +
+				"            <pic:cNvPr id=\"" + id + "\" name=\"GrapheEtats1$Implementation$diagramme__9HrYoDaVEeqBYNTyU5E5qA.png\"/>" + // Changed
+				"            <pic:cNvPicPr/>" +
+				"         </pic:nvPicPr>" +
+				"         <pic:blipFill>" +
+				"            <a:blip r:embed=\"" + blipId + "\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\"/>" +
+				"            <a:stretch>" +
+				"               <a:fillRect/>" +
+				"            </a:stretch>" +
+				"         </pic:blipFill>" +
+				"         <pic:spPr>" +
+				"            <a:xfrm>" +
+				"               <a:off x=\"0\" y=\"0\"/>" +
+				"               <a:ext cx=\"" + width + "\" cy=\"" + height + "\"/>" +
+				"            </a:xfrm>" +
+				"            <a:prstGeom prst=\"rect\">" +
+				"               <a:avLst/>" +
+				"            </a:prstGeom>" +
+				"         </pic:spPr>" +
+				"      </pic:pic>" +
+				"   </a:graphicData>" +
+				"</a:graphic>";
+
+		// CTGraphicalObjectData graphicData = inline.addNewGraphic().addNewGraphicData();
+		XmlToken xmlToken = null;
+		try {
+			xmlToken = XmlToken.Factory.parse(picXml);
+		} catch (XmlException xe) {
+			xe.printStackTrace();
+		}
+		inline.set(xmlToken);
+		// graphicData.set(xmlToken);
+
+		inline.setDistT(0);
+		inline.setDistB(0);
+		inline.setDistL(0);
+		inline.setDistR(0);
+
+		CTPositiveSize2D extent = inline.addNewExtent();
+		extent.setCx(width);// Changed
+		extent.setCy(height);// Changed
+
+		CTNonVisualDrawingProps docPr = inline.addNewDocPr();
+		docPr.setId(id);
+		docPr.setName("Drawing " + id);// Changed
+		docPr.setDescr("Generated");
 	}
 
 	@Override
diff --git a/plugins/docx/org.eclipse.papyrus.model2doc.docx/src/org/eclipse/papyrus/model2doc/docx/internal/util/ImageUtils.java b/plugins/docx/org.eclipse.papyrus.model2doc.docx/src/org/eclipse/papyrus/model2doc/docx/internal/util/ImageUtils.java
new file mode 100755
index 0000000..a9ae015
--- /dev/null
+++ b/plugins/docx/org.eclipse.papyrus.model2doc.docx/src/org/eclipse/papyrus/model2doc/docx/internal/util/ImageUtils.java
@@ -0,0 +1,90 @@
+/*****************************************************************************
+ * Copyright (c) 2020 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.model2doc.docx.internal.util;
+
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+
+import javax.imageio.ImageIO;
+
+import org.apache.poi.util.Units;
+import org.apache.poi.xwpf.usermodel.XWPFDocument;
+import org.eclipse.papyrus.model2doc.docx.Activator;
+
+/**
+ *
+ */
+public class ImageUtils {
+
+	// FIXME we should get the size from the document
+	private static final int PAGE_WIDTH = 450;
+
+	private static final int PAGE_HEIGHT = 700;
+
+	/**
+	 *
+	 * @param imagePath
+	 * @param document
+	 * @return
+	 */
+	public static final int[] getImageSize(String imagePath, XWPFDocument document) {
+		int[] result = new int[2];
+
+		File f = new File(imagePath);
+		BufferedImage image;
+		try {
+			image = ImageIO.read(f);
+
+			int imageWidth = image.getWidth();
+			int imageHeight = image.getHeight();
+
+			if (imageWidth <= PAGE_WIDTH && imageWidth <= PAGE_HEIGHT) {
+				result[0] = imageWidth;
+				result[1] = imageHeight;
+			} else if (imageWidth >= PAGE_WIDTH) {
+				// align the size of the picture on the width of the page
+				result[0] = PAGE_WIDTH;
+				result[1] = (PAGE_WIDTH * imageHeight) / imageWidth;
+				if (result[1] > PAGE_HEIGHT) {
+					// if the picture is still to big we align the size of the picture on the height of the page
+					imageWidth = result[0];
+					imageHeight = result[1];
+					result[0] = (PAGE_HEIGHT * imageWidth) / imageHeight;
+					result[1] = PAGE_HEIGHT;
+				}
+			} else if (imageHeight >= PAGE_HEIGHT) {
+				// align the size of the picture on the height of the page
+				result[0] = (PAGE_HEIGHT * imageWidth) / imageHeight;
+				result[1] = PAGE_HEIGHT;
+				if (result[0] > PAGE_WIDTH) {
+					// if the picture is still to big we align the size of the picture on the width of the page
+					imageWidth = result[0];
+					imageHeight = result[1];
+					result[0] = (PAGE_HEIGHT * imageWidth) / imageHeight;
+					result[1] = PAGE_HEIGHT;
+				}
+			}
+			result[0] = Units.toEMU(result[0]);
+			result[1] = Units.toEMU(result[1]);
+			// CTSectPr sect = document.getDocument().getBody().getSectPr();
+		} catch (IOException e) {
+			Activator.log.error(e);
+		}
+		return result;
+	}
+
+}
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.edit/META-INF/MANIFEST.MF b/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.edit/META-INF/MANIFEST.MF
index aca5b47..a6ae627 100755
--- a/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.edit/META-INF/MANIFEST.MF
+++ b/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.edit/META-INF/MANIFEST.MF
@@ -10,15 +10,16 @@
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.provider
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.15.0,4.0.0)";resolution:=optional;x-installation:=greedy,
- org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate;bundle-version="[0.7.0,1.0.0)",
- org.eclipse.emf.edit;bundle-version="[2.14.0,3.0.0)",
- org.eclipse.papyrus.model2doc.emf.documentstructuretemplate;bundle-version="[0.7.0,1.0.0)",
- org.eclipse.papyrus.model2doc.emf.documentstructuretemplate.edit;bundle-version="[0.7.0,1.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.17.0,3.0.0)",
- org.eclipse.emf.ecore.edit;bundle-version="[2.12.0,3.0.0)",
- org.eclipse.papyrus.model2doc.core.generatorconfiguration;bundle-version="[0.7.0,1.0.0)",
- org.eclipse.papyrus.model2doc.core.generatorconfiguration.edit;bundle-version="[0.7.0,1.0.0)",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.15.0,4.0.0)";x-installation:=greedy;resolution:=optional,
+ org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate;bundle-version="[0.7.0,1.0.0)";visibility:=reexport,
+ org.eclipse.emf.edit;bundle-version="[2.14.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.model2doc.emf.documentstructuretemplate;bundle-version="[0.7.0,1.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.model2doc.emf.documentstructuretemplate.edit;bundle-version="[0.7.0,1.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore;bundle-version="[2.17.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore.edit;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.model2doc.core.generatorconfiguration;bundle-version="[0.7.0,1.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.model2doc.core.generatorconfiguration.edit;bundle-version="[0.7.0,1.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.model2doc.core.author;visibility:=reexport,
  org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.properties;bundle-version="[0.7.0,1.0.0)",
  org.eclipse.papyrus.model2doc.emf.documentstructure.edit;bundle-version="[0.7.0,1.0.0)",
  org.eclipse.ui.views.properties.tabbed;bundle-version="[3.8.0,4.0.0)",
@@ -28,9 +29,11 @@
  org.eclipse.papyrus.infra.gmfdiag.representation;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.infra.architecture.representation;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.infra.architecture;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.emf.expressions;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.papyrus.infra.emf.expressions.edit;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.papyrus.model2doc.core.author.edit;bundle-version="[0.7.0,1.0.0)",
- org.eclipse.papyrus.model2doc.core.builtintypes;bundle-version="[0.7.0,1.0.0)",
- org.eclipse.papyrus.model2doc.core.builtintypes.edit;bundle-version="[0.7.0,1.0.0)"
+ org.eclipse.papyrus.infra.emf.expressions;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.emf.expressions.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
+ org.eclipse.uml2.common.edit;visibility:=reexport,
+ org.eclipse.papyrus.model2doc.core.author.edit;bundle-version="[0.7.0,1.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.model2doc.core.builtintypes;bundle-version="[0.7.0,1.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.model2doc.core.builtintypes.edit;bundle-version="[0.7.0,1.0.0)";visibility:=reexport
+Import-Package: org.osgi.framework
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.edit/plugin.properties b/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.edit/plugin.properties
index c8f17a4..31f4a1a 100755
--- a/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.edit/plugin.properties
+++ b/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.edit/plugin.properties
@@ -31,3 +31,5 @@
 _UI_ContextFilterBehavior_GRAPHICAL_CONTEXT_literal = GRAPHICAL_CONTEXT
 _UI_ContextFilterBehavior_BOTH_literal = BOTH
 _UI_PapyrusGMFDiagramView_diagramImageMargin_feature = Diagram Image Margin
+_UI_PapyrusGMFDiagramView_fileExtension_feature = File Extension
+_UI_PapyrusGMFDiagramView_imageFormat_feature = Image Format
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.edit/plugin.xml b/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.edit/plugin.xml
index 2c3dfdd..1161b7b 100755
--- a/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.edit/plugin.xml
+++ b/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.edit/plugin.xml
@@ -35,10 +35,6 @@
       <extender
             uri="http://www.eclipse.org/papyrus/model2doc/emf/1.0.0/documentstructuretemplate"
             class="org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.provider.PapyrusGMFDocumentStructureTemplateItemProviderAdapterFactory$DocumentStructureTemplateChildCreationExtender"/>
-      <extender
-            class="org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.edit.internal.childextenders.CustomExpressionForPapyrusGMFDocumentStructureTemplateChildExtender"
-            uri="http://www.eclipse.org/papyrus/model2doc/gmf/integration/1.0.0/documentstructuretemplate">
-      </extender>
    </extension>
 
    <extension
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.edit/src-gen/org/eclipse/papyrus/model2doc/integration/gmf/documentstructuretemplate/provider/PapyrusGMFDiagramViewItemProvider.java b/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.edit/src-gen/org/eclipse/papyrus/model2doc/integration/gmf/documentstructuretemplate/provider/PapyrusGMFDiagramViewItemProvider.java
index d284e51..b3c190a 100755
--- a/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.edit/src-gen/org/eclipse/papyrus/model2doc/integration/gmf/documentstructuretemplate/provider/PapyrusGMFDiagramViewItemProvider.java
+++ b/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.edit/src-gen/org/eclipse/papyrus/model2doc/integration/gmf/documentstructuretemplate/provider/PapyrusGMFDiagramViewItemProvider.java
@@ -87,6 +87,7 @@
 			addDiagramTypePropertyDescriptor(object);
 			addContextFilterRulePropertyDescriptor(object);
 			addDiagramImageMarginPropertyDescriptor(object);
+			addImageFormatPropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
 	}
@@ -241,6 +242,27 @@
 	}
 
 	/**
+	 * This adds a property descriptor for the Image Format feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected void addImageFormatPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(),
+				getString("_UI_PapyrusGMFDiagramView_imageFormat_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_PapyrusGMFDiagramView_imageFormat_feature", "_UI_PapyrusGMFDiagramView_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				PapyrusGMFDocumentStructureTemplatePackage.Literals.PAPYRUS_GMF_DIAGRAM_VIEW__IMAGE_FORMAT,
+				true,
+				false,
+				false,
+				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				null,
+				null));
+	}
+
+	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
@@ -330,6 +352,7 @@
 		case PapyrusGMFDocumentStructureTemplatePackage.PAPYRUS_GMF_DIAGRAM_VIEW__DIAGRAM_TYPE:
 		case PapyrusGMFDocumentStructureTemplatePackage.PAPYRUS_GMF_DIAGRAM_VIEW__CONTEXT_FILTER_RULE:
 		case PapyrusGMFDocumentStructureTemplatePackage.PAPYRUS_GMF_DIAGRAM_VIEW__DIAGRAM_IMAGE_MARGIN:
+		case PapyrusGMFDocumentStructureTemplatePackage.PAPYRUS_GMF_DIAGRAM_VIEW__IMAGE_FORMAT:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 			return;
 		case PapyrusGMFDocumentStructureTemplatePackage.PAPYRUS_GMF_DIAGRAM_VIEW__GENERATE_BRANCH_CONDITION:
@@ -374,6 +397,27 @@
 	}
 
 	/**
+	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
+		Object childFeature = feature;
+		Object childObject = child;
+
+		boolean qualify = childFeature == DocumentStructureTemplatePackage.Literals.IBODY_SECTION_PART_TEMPLATE__GENERATE_BRANCH_CONDITION;
+
+		if (qualify) {
+			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
+					new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+		}
+		return super.getCreateChildText(owner, feature, child, selection);
+	}
+
+	/**
 	 * Return the resource locator for this item provider's resources.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.edit/src-gen/org/eclipse/papyrus/model2doc/integration/gmf/documentstructuretemplate/provider/PapyrusGMFDocumentStructureTemplateEditPlugin.java b/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.edit/src-gen/org/eclipse/papyrus/model2doc/integration/gmf/documentstructuretemplate/provider/PapyrusGMFDocumentStructureTemplateEditPlugin.java
index 3816931..9af8d6c 100755
--- a/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.edit/src-gen/org/eclipse/papyrus/model2doc/integration/gmf/documentstructuretemplate/provider/PapyrusGMFDocumentStructureTemplateEditPlugin.java
+++ b/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.edit/src-gen/org/eclipse/papyrus/model2doc/integration/gmf/documentstructuretemplate/provider/PapyrusGMFDocumentStructureTemplateEditPlugin.java
@@ -67,8 +67,8 @@
 				EcoreEditPlugin.INSTANCE,
 				GeneratorconfigurationEditPlugin.INSTANCE,
 				AuthorEditPlugin.INSTANCE,
-				ExpressionsEditPlugin.INSTANCE,
 				BuiltInTypesEditPlugin.INSTANCE,
+				ExpressionsEditPlugin.INSTANCE,
 		});
 	}
 
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate/META-INF/MANIFEST.MF b/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate/META-INF/MANIFEST.MF
index 07bae3f..539cb47 100755
--- a/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate/META-INF/MANIFEST.MF
+++ b/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate/META-INF/MANIFEST.MF
@@ -8,16 +8,16 @@
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui;bundle-version="[3.113.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.15.0,4.0.0)";resolution:=optional;x-installation:=greedy,
+ org.eclipse.core.runtime;bundle-version="[3.15.0,4.0.0)";x-installation:=greedy;resolution:=optional,
  org.eclipse.gmf.runtime.notation;bundle-version="[1.9.0,2.0.0)",
  org.eclipse.papyrus.model2doc.gmf.documentstructuretemplate;bundle-version="[0.7.0,1.0.0)",
- org.eclipse.papyrus.model2doc.emf.documentstructuretemplate;bundle-version="[0.7.0,1.0.0)",
- org.eclipse.papyrus.model2doc.core.generatorconfiguration;bundle-version="[0.7.0,1.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.17.0,3.0.0)",
+ org.eclipse.papyrus.model2doc.emf.documentstructuretemplate;bundle-version="[0.7.0,1.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.model2doc.core.generatorconfiguration;bundle-version="[0.7.0,1.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore;bundle-version="[2.17.0,3.0.0)";visibility:=reexport,
  org.eclipse.papyrus.infra.gmfdiag.style;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.emf.expressions;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.papyrus.model2doc.core.author;bundle-version="[0.7.0,1.0.0)",
- org.eclipse.papyrus.model2doc.core.builtintypes;bundle-version="[0.7.0,1.0.0)"
+ org.eclipse.papyrus.infra.emf.expressions;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.model2doc.core.author;bundle-version="[0.7.0,1.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.model2doc.core.builtintypes;bundle-version="[0.7.0,1.0.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate,
  org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.impl,
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate/model/papyrusgmfdocumentstructuretemplate.di b/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate/model/papyrusgmfdocumentstructuretemplate.di
index 8c549ee..0812886 100755
--- a/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate/model/papyrusgmfdocumentstructuretemplate.di
+++ b/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate/model/papyrusgmfdocumentstructuretemplate.di
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<architecture:ArchitectureDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" contextId="org.eclipse.papyrus.infra.services.edit.TypeContext"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<architecture:ArchitectureDescription xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" contextId="org.eclipse.papyrus.infra.services.edit.TypeContext"/>
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate/model/papyrusgmfdocumentstructuretemplate.ecore b/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate/model/papyrusgmfdocumentstructuretemplate.ecore
index c81a26a..7a37efa 100755
--- a/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate/model/papyrusgmfdocumentstructuretemplate.ecore
+++ b/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate/model/papyrusgmfdocumentstructuretemplate.ecore
@@ -52,6 +52,9 @@
         <details key="documentation" value="This field allows to define the size of the margin around the diagram snapshot. The value is interpreted as Pixel. The default value is 10."/>
       </eAnnotations>
     </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="imageFormat" ordered="false"
+        lowerBound="1" eType="ecore:EEnum ../../org.eclipse.papyrus.model2doc.core.builtintypes/model/BuiltInTypes.ecore#//ImageFormat"
+        defaultValueLiteral="SVG"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EEnum" name="ContextFilterBehavior">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate/model/papyrusgmfdocumentstructuretemplate.genmodel b/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate/model/papyrusgmfdocumentstructuretemplate.genmodel
index 3790175..0980f88 100755
--- a/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate/model/papyrusgmfdocumentstructuretemplate.genmodel
+++ b/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate/model/papyrusgmfdocumentstructuretemplate.genmodel
@@ -11,7 +11,7 @@
     nonNLSMarkers="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
     codeFormatting="true" commentFormatting="true" testsDirectory="/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.tests/src-gen"
     importerID="org.eclipse.uml2.uml.ecore.importer" complianceLevel="8.0" copyrightFields="false"
-    usedGenPackages="../../org.eclipse.papyrus.model2doc.emf.documentstructuretemplate/model/documentstructuretemplate.genmodel#//documentstructuretemplate ../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.papyrus.model2doc.core.generatorconfiguration/model/generatorconfiguration.genmodel#//generatorconfiguration ../../org.eclipse.papyrus.model2doc.core.author/model/author.genmodel#//author ../../org.eclipse.papyrus.infra.emf.expressions/model/expressions.genmodel#//expressions ../../org.eclipse.papyrus.model2doc.core.builtintypes/model/BuiltInTypes.genmodel#//builtintypes"
+    usedGenPackages="../../org.eclipse.papyrus.model2doc.emf.documentstructuretemplate/model/documentstructuretemplate.genmodel#//documentstructuretemplate ../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.papyrus.model2doc.core.generatorconfiguration/model/generatorconfiguration.genmodel#//generatorconfiguration ../../org.eclipse.papyrus.model2doc.core.author/model/author.genmodel#//author ../../org.eclipse.papyrus.model2doc.core.builtintypes/model/BuiltInTypes.genmodel#//builtintypes ../../org.eclipse.papyrus.infra.emf.expressions/model/expressions.genmodel#//expressions/booleanexpressions ../../org.eclipse.papyrus.infra.emf.expressions/model/expressions.genmodel#//expressions"
     operationReflection="true" importOrganizing="true" cleanup="true" oSGiCompatible="true"
     pluralizedGetters="true">
   <genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/importer/org.eclipse.uml2.uml.ecore.importer">
@@ -54,6 +54,7 @@
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute papyrusgmfdocumentstructuretemplate.ecore#//PapyrusGMFDiagramView/diagramType"/>
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute papyrusgmfdocumentstructuretemplate.ecore#//PapyrusGMFDiagramView/contextFilterRule"/>
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute papyrusgmfdocumentstructuretemplate.ecore#//PapyrusGMFDiagramView/diagramImageMargin"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute papyrusgmfdocumentstructuretemplate.ecore#//PapyrusGMFDiagramView/imageFormat"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="papyrusgmfdocumentstructuretemplate.ecore#//PapyrusGMFDiagramView/getMatchingDiagrams">
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="papyrusgmfdocumentstructuretemplate.ecore#//PapyrusGMFDiagramView/getMatchingDiagrams/expectedDiagramContext"/>
       </genOperations>
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate/model/papyrusgmfdocumentstructuretemplate.notation b/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate/model/papyrusgmfdocumentstructuretemplate.notation
index 34bc1df..db834de 100755
--- a/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate/model/papyrusgmfdocumentstructuretemplate.notation
+++ b/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate/model/papyrusgmfdocumentstructuretemplate.notation
@@ -1,211 +1,215 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_WLlO8FxxEemyeb6zzD570Q" type="PapyrusUMLClassDiagram" name="Class Diagram" measurementUnit="Pixel">
-  <children xmi:type="notation:Shape" xmi:id="_QbaegF0eEemxcMQajU1fyA" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_QbmrwF0eEemxcMQajU1fyA" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_QbmrwV0eEemxcMQajU1fyA" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Qbmrwl0eEemxcMQajU1fyA" y="15"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_Qbn54F0eEemxcMQajU1fyA" type="Class_AttributeCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_gqlb0F0eEemxcMQajU1fyA" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="papyrusgmfdocumentstructuretemplate.uml#_gqYAcF0eEemxcMQajU1fyA"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_gqlb0V0eEemxcMQajU1fyA"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_PnVwUF9aEemxcMQajU1fyA" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="papyrusgmfdocumentstructuretemplate.uml#_PnGfwF9aEemxcMQajU1fyA"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_PnVwUV9aEemxcMQajU1fyA"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_OTtPAGXNEemOJZbgd4DmNg" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="papyrusgmfdocumentstructuretemplate.uml#_OS1sUGXNEemOJZbgd4DmNg"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_OTtPAWXNEemOJZbgd4DmNg"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_788Q4F7DEeq_NYEfEw1Skw" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="papyrusgmfdocumentstructuretemplate.uml#_78Ul0F7DEeq_NYEfEw1Skw"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_788Q4V7DEeq_NYEfEw1Skw"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_Qbn54V0eEemxcMQajU1fyA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_Qbn54l0eEemxcMQajU1fyA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Qbn5410eEemxcMQajU1fyA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qbn55F0eEemxcMQajU1fyA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_Qbn55V0eEemxcMQajU1fyA" type="Class_OperationCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_UviZMF9aEemxcMQajU1fyA" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="papyrusgmfdocumentstructuretemplate.uml#_UvNpEF9aEemxcMQajU1fyA"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_UviZMV9aEemxcMQajU1fyA"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_JSOkoIX3EemhaembVcoeKQ" type="Operation_ClassOperationLabel">
-        <element xmi:type="uml:Operation" href="papyrusgmfdocumentstructuretemplate.uml#_JRxRoIX3EemhaembVcoeKQ"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_JSOkoYX3EemhaembVcoeKQ"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_Qbn55l0eEemxcMQajU1fyA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_Qbn5510eEemxcMQajU1fyA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Qbn56F0eEemxcMQajU1fyA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qbn56V0eEemxcMQajU1fyA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_Qbn56l0eEemxcMQajU1fyA" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_Qbn5610eEemxcMQajU1fyA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_Qbn57F0eEemxcMQajU1fyA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_Qbn57V0eEemxcMQajU1fyA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qbn57l0eEemxcMQajU1fyA"/>
-    </children>
-    <element xmi:type="uml:Class" href="papyrusgmfdocumentstructuretemplate.uml#_QbIxsF0eEemxcMQajU1fyA"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QbbFkF0eEemxcMQajU1fyA" x="100" y="400" width="601" height="261"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_IyIzEF9aEemxcMQajU1fyA" type="Interface_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_IyJaIF9aEemxcMQajU1fyA" type="Interface_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_IyJaIV9aEemxcMQajU1fyA" type="Interface_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_IyJaIl9aEemxcMQajU1fyA" y="15"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_IyKBMF9aEemxcMQajU1fyA" type="Interface_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_IyKBMV9aEemxcMQajU1fyA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_IyKBMl9aEemxcMQajU1fyA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_IyKBM19aEemxcMQajU1fyA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IyKBNF9aEemxcMQajU1fyA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_IyKBNV9aEemxcMQajU1fyA" type="Interface_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_IyKBNl9aEemxcMQajU1fyA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_IyKBN19aEemxcMQajU1fyA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_IyKBOF9aEemxcMQajU1fyA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IyKBOV9aEemxcMQajU1fyA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_IyKBOl9aEemxcMQajU1fyA" type="Interface_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_IyKBO19aEemxcMQajU1fyA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_IyKBPF9aEemxcMQajU1fyA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_IyKBPV9aEemxcMQajU1fyA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IyKBPl9aEemxcMQajU1fyA"/>
-    </children>
-    <element xmi:type="uml:Interface" href="pathmap://DOCUMENT_STRUCTURE_TEMPLATE/documentstructuretemplate.uml#_R99HIFX-EemKJasCEBKPhQ"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IyIzEV9aEemxcMQajU1fyA" x="120" y="20" width="201"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_JZUH0F9aEemxcMQajU1fyA" type="Interface_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_JZUH0l9aEemxcMQajU1fyA" type="Interface_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_JZUH019aEemxcMQajU1fyA" type="Interface_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_JZUH1F9aEemxcMQajU1fyA" y="15"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_JZUH1V9aEemxcMQajU1fyA" type="Interface_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_JZUH1l9aEemxcMQajU1fyA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_JZUH119aEemxcMQajU1fyA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_JZUH2F9aEemxcMQajU1fyA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JZUH2V9aEemxcMQajU1fyA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_JZUH2l9aEemxcMQajU1fyA" type="Interface_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_JZUH219aEemxcMQajU1fyA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_JZUH3F9aEemxcMQajU1fyA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_JZUH3V9aEemxcMQajU1fyA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JZUH3l9aEemxcMQajU1fyA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_JZUH319aEemxcMQajU1fyA" type="Interface_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_JZUH4F9aEemxcMQajU1fyA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_JZUH4V9aEemxcMQajU1fyA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_JZUH4l9aEemxcMQajU1fyA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JZUH419aEemxcMQajU1fyA"/>
-    </children>
-    <element xmi:type="uml:Interface" href="pathmap://DOCUMENT_STRUCTURE_TEMPLATE/documentstructuretemplate.uml#_DwGdIFYFEemKJasCEBKPhQ"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JZUH0V9aEemxcMQajU1fyA" x="500" y="20" width="201"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_ck4k0F9aEemxcMQajU1fyA" type="Interface_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_ck5L4F9aEemxcMQajU1fyA" type="Interface_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_ck5L4V9aEemxcMQajU1fyA" type="Interface_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_ck5y8F9aEemxcMQajU1fyA" y="15"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_ck5y8V9aEemxcMQajU1fyA" type="Interface_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_ck5y8l9aEemxcMQajU1fyA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_ck5y819aEemxcMQajU1fyA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ck5y9F9aEemxcMQajU1fyA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ck5y9V9aEemxcMQajU1fyA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_ck5y9l9aEemxcMQajU1fyA" type="Interface_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_ck5y919aEemxcMQajU1fyA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_ck5y-F9aEemxcMQajU1fyA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ck5y-V9aEemxcMQajU1fyA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ck5y-l9aEemxcMQajU1fyA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_ck5y-19aEemxcMQajU1fyA" type="Interface_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_ck5y_F9aEemxcMQajU1fyA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_ck5y_V9aEemxcMQajU1fyA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ck5y_l9aEemxcMQajU1fyA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ck5y_19aEemxcMQajU1fyA"/>
-    </children>
-    <element xmi:type="uml:Interface" href="papyrusgmfdocumentstructuretemplate.uml#_ck2IkF9aEemxcMQajU1fyA"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ck4k0V9aEemxcMQajU1fyA" x="760" y="260"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_zDzIIGXMEemOJZbgd4DmNg" type="Enumeration_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_zD1kYGXMEemOJZbgd4DmNg" type="Enumeration_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_zD1kYWXMEemOJZbgd4DmNg" type="Enumeration_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_zD1kYmXMEemOJZbgd4DmNg" y="15"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_zD2LcGXMEemOJZbgd4DmNg" type="Enumeration_LiteralCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_1sfosGXMEemOJZbgd4DmNg" type="EnumerationLiteral_LiteralLabel">
-        <element xmi:type="uml:EnumerationLiteral" href="papyrusgmfdocumentstructuretemplate.uml#_1sFZAGXMEemOJZbgd4DmNg"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_1sfosWXMEemOJZbgd4DmNg"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_5Nd1EGXMEemOJZbgd4DmNg" type="EnumerationLiteral_LiteralLabel">
-        <element xmi:type="uml:EnumerationLiteral" href="papyrusgmfdocumentstructuretemplate.uml#_5NJE8GXMEemOJZbgd4DmNg"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_5Nd1EWXMEemOJZbgd4DmNg"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_7wl5IGXMEemOJZbgd4DmNg" type="EnumerationLiteral_LiteralLabel">
-        <element xmi:type="uml:EnumerationLiteral" href="papyrusgmfdocumentstructuretemplate.uml#_7wWokGXMEemOJZbgd4DmNg"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_7wl5IWXMEemOJZbgd4DmNg"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_zD2LcWXMEemOJZbgd4DmNg"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zD2LcmXMEemOJZbgd4DmNg"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zD2Lc2XMEemOJZbgd4DmNg"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zD2LdGXMEemOJZbgd4DmNg"/>
-    </children>
-    <element xmi:type="uml:Enumeration" href="papyrusgmfdocumentstructuretemplate.uml#_zDXDQGXMEemOJZbgd4DmNg"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zDzIIWXMEemOJZbgd4DmNg" x="760" y="400" width="261" height="161"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_5S8Iw17DEeq_NYEfEw1Skw" type="StereotypeComment">
-    <styles xmi:type="notation:TitleStyle" xmi:id="_5S8IxF7DEeq_NYEfEw1Skw"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_5S8v0F7DEeq_NYEfEw1Skw" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Interface" href="papyrusgmfdocumentstructuretemplate.uml#_ck2IkF9aEemxcMQajU1fyA"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5S8IxV7DEeq_NYEfEw1Skw" x="960" y="260"/>
-  </children>
-  <styles xmi:type="notation:StringValueStyle" xmi:id="_WLlO8VxxEemyeb6zzD570Q" name="diagram_compatibility_version" stringValue="1.4.0"/>
-  <styles xmi:type="notation:DiagramStyle" xmi:id="_WLlO8lxxEemyeb6zzD570Q"/>
-  <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_WLlO81xxEemyeb6zzD570Q" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
-    <owner xmi:type="uml:Model" href="papyrusgmfdocumentstructuretemplate.uml#_WLRF4FxxEemyeb6zzD570Q"/>
-  </styles>
-  <element xmi:type="uml:Model" href="papyrusgmfdocumentstructuretemplate.uml#_WLRF4FxxEemyeb6zzD570Q"/>
-  <edges xmi:type="notation:Connector" xmi:id="_OWInIF9aEemxcMQajU1fyA" type="InterfaceRealization_Edge" source="_QbaegF0eEemxcMQajU1fyA" target="_JZUH0F9aEemxcMQajU1fyA" routing="Rectilinear">
-    <children xmi:type="notation:DecorationNode" xmi:id="_OWInI19aEemxcMQajU1fyA" type="InterfaceRealization_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_k7_ZsF9aEemxcMQajU1fyA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_OWJOMF9aEemxcMQajU1fyA" y="39"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_OWJOMV9aEemxcMQajU1fyA" type="InterfaceRealization_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_k8IjoF9aEemxcMQajU1fyA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_OWJOMl9aEemxcMQajU1fyA" y="59"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_OWInIV9aEemxcMQajU1fyA"/>
-    <element xmi:type="uml:InterfaceRealization" href="papyrusgmfdocumentstructuretemplate.uml#_OV4vgF9aEemxcMQajU1fyA"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_OWInIl9aEemxcMQajU1fyA" points="[400, 400, -643984, -643984]$[400, 260, -643984, -643984]$[600, 260, -643984, -643984]$[600, 124, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OWd-UF9aEemxcMQajU1fyA" id="(0.49916805324459235,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OWelYF9aEemxcMQajU1fyA" id="(0.4975124378109453,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_O4bb4F9aEemxcMQajU1fyA" type="InterfaceRealization_Edge" source="_QbaegF0eEemxcMQajU1fyA" target="_IyIzEF9aEemxcMQajU1fyA" routing="Rectilinear">
-    <children xmi:type="notation:DecorationNode" xmi:id="_O4bb419aEemxcMQajU1fyA" type="InterfaceRealization_StereotypeLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_k8SUoF9aEemxcMQajU1fyA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_O4bb5F9aEemxcMQajU1fyA" y="39"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_O4bb5V9aEemxcMQajU1fyA" type="InterfaceRealization_NameLabel">
-      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_k8dTwF9aEemxcMQajU1fyA" name="IS_UPDATED_POSITION" booleanValue="true"/>
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_O4bb5l9aEemxcMQajU1fyA" y="59"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_O4bb4V9aEemxcMQajU1fyA"/>
-    <element xmi:type="uml:InterfaceRealization" href="papyrusgmfdocumentstructuretemplate.uml#_O4OAgF9aEemxcMQajU1fyA"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_O4bb4l9aEemxcMQajU1fyA" points="[400, 400, -643984, -643984]$[400, 260, -643984, -643984]$[220, 260, -643984, -643984]$[220, 124, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_O4u94F9aEemxcMQajU1fyA" id="(0.49916805324459235,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_O4u94V9aEemxcMQajU1fyA" id="(0.4975124378109453,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_5S8v0V7DEeq_NYEfEw1Skw" type="StereotypeCommentLink" source="_ck4k0F9aEemxcMQajU1fyA" target="_5S8Iw17DEeq_NYEfEw1Skw">
-    <styles xmi:type="notation:FontStyle" xmi:id="_5S8v0l7DEeq_NYEfEw1Skw"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_5S8v1l7DEeq_NYEfEw1Skw" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Interface" href="papyrusgmfdocumentstructuretemplate.uml#_ck2IkF9aEemxcMQajU1fyA"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_5S8v017DEeq_NYEfEw1Skw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5S8v1F7DEeq_NYEfEw1Skw"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5S8v1V7DEeq_NYEfEw1Skw"/>
-  </edges>
-</notation:Diagram>
+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.3/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_WLlO8FxxEemyeb6zzD570Q" type="PapyrusUMLClassDiagram" name="Class Diagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_QbaegF0eEemxcMQajU1fyA" type="Class_Shape" fontName="Segoe UI" fillColor="14538691" transparency="0" gradient="16777215, -1, 0" lineColor="0">
+    <children xmi:type="notation:DecorationNode" xmi:id="_QbmrwF0eEemxcMQajU1fyA" type="Class_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_QbmrwV0eEemxcMQajU1fyA" type="Class_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Qbmrwl0eEemxcMQajU1fyA" y="15"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_Qbn54F0eEemxcMQajU1fyA" type="Class_AttributeCompartment">
+      <children xmi:type="notation:Shape" xmi:id="_gqlb0F0eEemxcMQajU1fyA" type="Property_ClassAttributeLabel" fontName="Segoe UI" fillColor="14012867" transparency="0" gradient="16777215, -1, 0" lineColor="0">
+        <element xmi:type="uml:Property" href="papyrusgmfdocumentstructuretemplate.uml#_gqYAcF0eEemxcMQajU1fyA"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_gqlb0V0eEemxcMQajU1fyA"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_PnVwUF9aEemxcMQajU1fyA" type="Property_ClassAttributeLabel" fontName="Segoe UI" fillColor="14012867" transparency="0" gradient="16777215, -1, 0" lineColor="0">
+        <element xmi:type="uml:Property" href="papyrusgmfdocumentstructuretemplate.uml#_PnGfwF9aEemxcMQajU1fyA"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_PnVwUV9aEemxcMQajU1fyA"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_OTtPAGXNEemOJZbgd4DmNg" type="Property_ClassAttributeLabel" fontName="Segoe UI" fillColor="14012867" transparency="0" gradient="16777215, -1, 0" lineColor="0">
+        <element xmi:type="uml:Property" href="papyrusgmfdocumentstructuretemplate.uml#_OS1sUGXNEemOJZbgd4DmNg"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_OTtPAWXNEemOJZbgd4DmNg"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_788Q4F7DEeq_NYEfEw1Skw" type="Property_ClassAttributeLabel" fontName="Segoe UI" fillColor="14012867" transparency="0" gradient="16777215, -1, 0" lineColor="0">
+        <element xmi:type="uml:Property" href="papyrusgmfdocumentstructuretemplate.uml#_78Ul0F7DEeq_NYEfEw1Skw"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_788Q4V7DEeq_NYEfEw1Skw"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_UaFFAB29EeuToo8VLEZPVg" type="Property_ClassAttributeLabel" fontName="Segoe UI" fillColor="14012867" transparency="0" gradient="16777215, -1, 0" lineColor="0">
+        <element xmi:type="uml:Property" href="papyrusgmfdocumentstructuretemplate.uml#_UYg-wB29EeuToo8VLEZPVg"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UaFFAR29EeuToo8VLEZPVg"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Qbn54V0eEemxcMQajU1fyA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Qbn54l0eEemxcMQajU1fyA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Qbn5410eEemxcMQajU1fyA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qbn55F0eEemxcMQajU1fyA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_Qbn55V0eEemxcMQajU1fyA" type="Class_OperationCompartment">
+      <children xmi:type="notation:Shape" xmi:id="_UviZMF9aEemxcMQajU1fyA" type="Operation_ClassOperationLabel" fontName="Segoe UI" fillColor="14012867" transparency="0" gradient="16777215, -1, 0" lineColor="0">
+        <element xmi:type="uml:Operation" href="papyrusgmfdocumentstructuretemplate.uml#_UvNpEF9aEemxcMQajU1fyA"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UviZMV9aEemxcMQajU1fyA"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_JSOkoIX3EemhaembVcoeKQ" type="Operation_ClassOperationLabel" fontName="Segoe UI" fillColor="14012867" transparency="0" gradient="16777215, -1, 0" lineColor="0">
+        <element xmi:type="uml:Operation" href="papyrusgmfdocumentstructuretemplate.uml#_JRxRoIX3EemhaembVcoeKQ"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_JSOkoYX3EemhaembVcoeKQ"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Qbn55l0eEemxcMQajU1fyA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Qbn5510eEemxcMQajU1fyA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Qbn56F0eEemxcMQajU1fyA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qbn56V0eEemxcMQajU1fyA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_Qbn56l0eEemxcMQajU1fyA" type="Class_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Qbn5610eEemxcMQajU1fyA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_Qbn57F0eEemxcMQajU1fyA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_Qbn57V0eEemxcMQajU1fyA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qbn57l0eEemxcMQajU1fyA"/>
+    </children>
+    <element xmi:type="uml:Class" href="papyrusgmfdocumentstructuretemplate.uml#_QbIxsF0eEemxcMQajU1fyA"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QbbFkF0eEemxcMQajU1fyA" x="100" y="400" width="601" height="261"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_IyIzEF9aEemxcMQajU1fyA" type="Interface_Shape" fontName="Segoe UI" fillColor="14012867" transparency="0" gradient="16777215, -1, 0" lineColor="0">
+    <children xmi:type="notation:DecorationNode" xmi:id="_IyJaIF9aEemxcMQajU1fyA" type="Interface_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_IyJaIV9aEemxcMQajU1fyA" type="Interface_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_IyJaIl9aEemxcMQajU1fyA" y="15"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_IyKBMF9aEemxcMQajU1fyA" type="Interface_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_IyKBMV9aEemxcMQajU1fyA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_IyKBMl9aEemxcMQajU1fyA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_IyKBM19aEemxcMQajU1fyA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IyKBNF9aEemxcMQajU1fyA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_IyKBNV9aEemxcMQajU1fyA" type="Interface_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_IyKBNl9aEemxcMQajU1fyA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_IyKBN19aEemxcMQajU1fyA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_IyKBOF9aEemxcMQajU1fyA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IyKBOV9aEemxcMQajU1fyA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_IyKBOl9aEemxcMQajU1fyA" type="Interface_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_IyKBO19aEemxcMQajU1fyA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_IyKBPF9aEemxcMQajU1fyA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_IyKBPV9aEemxcMQajU1fyA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IyKBPl9aEemxcMQajU1fyA"/>
+    </children>
+    <element xmi:type="uml:Interface" href="pathmap://DOCUMENT_STRUCTURE_TEMPLATE/documentstructuretemplate.uml#_R99HIFX-EemKJasCEBKPhQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IyIzEV9aEemxcMQajU1fyA" x="120" y="20" width="201"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_JZUH0F9aEemxcMQajU1fyA" type="Interface_Shape" fontName="Segoe UI" fillColor="14012867" transparency="0" gradient="16777215, -1, 0" lineColor="0">
+    <children xmi:type="notation:DecorationNode" xmi:id="_JZUH0l9aEemxcMQajU1fyA" type="Interface_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_JZUH019aEemxcMQajU1fyA" type="Interface_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_JZUH1F9aEemxcMQajU1fyA" y="15"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_JZUH1V9aEemxcMQajU1fyA" type="Interface_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_JZUH1l9aEemxcMQajU1fyA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_JZUH119aEemxcMQajU1fyA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_JZUH2F9aEemxcMQajU1fyA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JZUH2V9aEemxcMQajU1fyA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_JZUH2l9aEemxcMQajU1fyA" type="Interface_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_JZUH219aEemxcMQajU1fyA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_JZUH3F9aEemxcMQajU1fyA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_JZUH3V9aEemxcMQajU1fyA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JZUH3l9aEemxcMQajU1fyA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_JZUH319aEemxcMQajU1fyA" type="Interface_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_JZUH4F9aEemxcMQajU1fyA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_JZUH4V9aEemxcMQajU1fyA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_JZUH4l9aEemxcMQajU1fyA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JZUH419aEemxcMQajU1fyA"/>
+    </children>
+    <element xmi:type="uml:Interface" href="pathmap://DOCUMENT_STRUCTURE_TEMPLATE/documentstructuretemplate.uml#_DwGdIFYFEemKJasCEBKPhQ"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JZUH0V9aEemxcMQajU1fyA" x="500" y="20" width="201"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_ck4k0F9aEemxcMQajU1fyA" type="Interface_Shape" fontName="Segoe UI" fillColor="14012867" transparency="0" gradient="16777215, -1, 0" lineColor="0">
+    <children xmi:type="notation:DecorationNode" xmi:id="_ck5L4F9aEemxcMQajU1fyA" type="Interface_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_ck5L4V9aEemxcMQajU1fyA" type="Interface_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_ck5y8F9aEemxcMQajU1fyA" y="15"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_ck5y8V9aEemxcMQajU1fyA" type="Interface_AttributeCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_ck5y8l9aEemxcMQajU1fyA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_ck5y819aEemxcMQajU1fyA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_ck5y9F9aEemxcMQajU1fyA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ck5y9V9aEemxcMQajU1fyA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_ck5y9l9aEemxcMQajU1fyA" type="Interface_OperationCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_ck5y919aEemxcMQajU1fyA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_ck5y-F9aEemxcMQajU1fyA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_ck5y-V9aEemxcMQajU1fyA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ck5y-l9aEemxcMQajU1fyA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_ck5y-19aEemxcMQajU1fyA" type="Interface_NestedClassifierCompartment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_ck5y_F9aEemxcMQajU1fyA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_ck5y_V9aEemxcMQajU1fyA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_ck5y_l9aEemxcMQajU1fyA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ck5y_19aEemxcMQajU1fyA"/>
+    </children>
+    <element xmi:type="uml:Interface" href="papyrusgmfdocumentstructuretemplate.uml#_ck2IkF9aEemxcMQajU1fyA"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ck4k0V9aEemxcMQajU1fyA" x="760" y="260"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_zDzIIGXMEemOJZbgd4DmNg" type="Enumeration_Shape" fontName="Segoe UI" fillColor="14012867" transparency="0" gradient="16777215, -1, 0" lineColor="0">
+    <children xmi:type="notation:DecorationNode" xmi:id="_zD1kYGXMEemOJZbgd4DmNg" type="Enumeration_NameLabel"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_zD1kYWXMEemOJZbgd4DmNg" type="Enumeration_FloatingNameLabel">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_zD1kYmXMEemOJZbgd4DmNg" y="15"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_zD2LcGXMEemOJZbgd4DmNg" type="Enumeration_LiteralCompartment">
+      <children xmi:type="notation:Shape" xmi:id="_1sfosGXMEemOJZbgd4DmNg" type="EnumerationLiteral_LiteralLabel" fontName="Segoe UI" fillColor="14012867" transparency="0" gradient="16777215, -1, 0" lineColor="0">
+        <element xmi:type="uml:EnumerationLiteral" href="papyrusgmfdocumentstructuretemplate.uml#_1sFZAGXMEemOJZbgd4DmNg"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_1sfosWXMEemOJZbgd4DmNg"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_5Nd1EGXMEemOJZbgd4DmNg" type="EnumerationLiteral_LiteralLabel" fontName="Segoe UI" fillColor="14012867" transparency="0" gradient="16777215, -1, 0" lineColor="0">
+        <element xmi:type="uml:EnumerationLiteral" href="papyrusgmfdocumentstructuretemplate.uml#_5NJE8GXMEemOJZbgd4DmNg"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_5Nd1EWXMEemOJZbgd4DmNg"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_7wl5IGXMEemOJZbgd4DmNg" type="EnumerationLiteral_LiteralLabel" fontName="Segoe UI" fillColor="14012867" transparency="0" gradient="16777215, -1, 0" lineColor="0">
+        <element xmi:type="uml:EnumerationLiteral" href="papyrusgmfdocumentstructuretemplate.uml#_7wWokGXMEemOJZbgd4DmNg"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_7wl5IWXMEemOJZbgd4DmNg"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_zD2LcWXMEemOJZbgd4DmNg"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_zD2LcmXMEemOJZbgd4DmNg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_zD2Lc2XMEemOJZbgd4DmNg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zD2LdGXMEemOJZbgd4DmNg"/>
+    </children>
+    <element xmi:type="uml:Enumeration" href="papyrusgmfdocumentstructuretemplate.uml#_zDXDQGXMEemOJZbgd4DmNg"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zDzIIWXMEemOJZbgd4DmNg" x="760" y="400" width="261" height="161"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_aRF_4CAnEeuyYawtPCaZsA" visible="false" type="StereotypeComment" fontName="Segoe UI" fillColor="14012867" transparency="0" gradient="16777215, -1, 0" lineColor="0">
+    <styles xmi:type="notation:TitleStyle" xmi:id="_aRF_4SAnEeuyYawtPCaZsA" showTitle="true"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_aRF_4yAnEeuyYawtPCaZsA" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Interface" href="papyrusgmfdocumentstructuretemplate.uml#_ck2IkF9aEemxcMQajU1fyA"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aRF_4iAnEeuyYawtPCaZsA" x="960" y="260"/>
+  </children>
+  <styles xmi:type="notation:StringValueStyle" xmi:id="_WLlO8VxxEemyeb6zzD570Q" name="diagram_compatibility_version" stringValue="1.4.0"/>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_WLlO8lxxEemyeb6zzD570Q"/>
+  <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_WLlO81xxEemyeb6zzD570Q" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
+    <owner xmi:type="uml:Model" href="papyrusgmfdocumentstructuretemplate.uml#_WLRF4FxxEemyeb6zzD570Q"/>
+  </styles>
+  <element xmi:type="uml:Model" href="papyrusgmfdocumentstructuretemplate.uml#_WLRF4FxxEemyeb6zzD570Q"/>
+  <edges xmi:type="notation:Connector" xmi:id="_OWInIF9aEemxcMQajU1fyA" type="InterfaceRealization_Edge" source="_QbaegF0eEemxcMQajU1fyA" target="_JZUH0F9aEemxcMQajU1fyA" routing="Rectilinear" lineColor="0">
+    <children xmi:type="notation:DecorationNode" xmi:id="_OWInI19aEemxcMQajU1fyA" type="InterfaceRealization_StereotypeLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_k7_ZsF9aEemxcMQajU1fyA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_OWJOMF9aEemxcMQajU1fyA" y="39"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_OWJOMV9aEemxcMQajU1fyA" type="InterfaceRealization_NameLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_k8IjoF9aEemxcMQajU1fyA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_OWJOMl9aEemxcMQajU1fyA" y="59"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_OWInIV9aEemxcMQajU1fyA" fontName="Segoe UI"/>
+    <element xmi:type="uml:InterfaceRealization" href="papyrusgmfdocumentstructuretemplate.uml#_OV4vgF9aEemxcMQajU1fyA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_OWInIl9aEemxcMQajU1fyA" points="[400, 400, -643984, -643984]$[400, 260, -643984, -643984]$[600, 260, -643984, -643984]$[600, 124, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OWd-UF9aEemxcMQajU1fyA" id="(0.49916805324459235,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OWelYF9aEemxcMQajU1fyA" id="(0.4975124378109453,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_O4bb4F9aEemxcMQajU1fyA" type="InterfaceRealization_Edge" source="_QbaegF0eEemxcMQajU1fyA" target="_IyIzEF9aEemxcMQajU1fyA" routing="Rectilinear" lineColor="0">
+    <children xmi:type="notation:DecorationNode" xmi:id="_O4bb419aEemxcMQajU1fyA" type="InterfaceRealization_StereotypeLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_k8SUoF9aEemxcMQajU1fyA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_O4bb5F9aEemxcMQajU1fyA" y="39"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_O4bb5V9aEemxcMQajU1fyA" type="InterfaceRealization_NameLabel">
+      <styles xmi:type="notation:BooleanValueStyle" xmi:id="_k8dTwF9aEemxcMQajU1fyA" name="IS_UPDATED_POSITION" booleanValue="true"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_O4bb5l9aEemxcMQajU1fyA" y="59"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_O4bb4V9aEemxcMQajU1fyA" fontName="Segoe UI"/>
+    <element xmi:type="uml:InterfaceRealization" href="papyrusgmfdocumentstructuretemplate.uml#_O4OAgF9aEemxcMQajU1fyA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_O4bb4l9aEemxcMQajU1fyA" points="[400, 400, -643984, -643984]$[400, 260, -643984, -643984]$[220, 260, -643984, -643984]$[220, 124, -643984, -643984]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_O4u94F9aEemxcMQajU1fyA" id="(0.49916805324459235,0.0)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_O4u94V9aEemxcMQajU1fyA" id="(0.4975124378109453,1.0)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_aRGm8CAnEeuyYawtPCaZsA" type="StereotypeCommentLink" source="_ck4k0F9aEemxcMQajU1fyA" target="_aRF_4CAnEeuyYawtPCaZsA" lineColor="0">
+    <styles xmi:type="notation:FontStyle" xmi:id="_aRGm8SAnEeuyYawtPCaZsA" fontName="Segoe UI"/>
+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_aRHOASAnEeuyYawtPCaZsA" name="BASE_ELEMENT">
+      <eObjectValue xmi:type="uml:Interface" href="papyrusgmfdocumentstructuretemplate.uml#_ck2IkF9aEemxcMQajU1fyA"/>
+    </styles>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_aRGm8iAnEeuyYawtPCaZsA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aRGm8yAnEeuyYawtPCaZsA"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aRHOACAnEeuyYawtPCaZsA"/>
+  </edges>
+</notation:Diagram>
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate/model/papyrusgmfdocumentstructuretemplate.uml b/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate/model/papyrusgmfdocumentstructuretemplate.uml
index 246e76f..3e00667 100755
--- a/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate/model/papyrusgmfdocumentstructuretemplate.uml
+++ b/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate/model/papyrusgmfdocumentstructuretemplate.uml
@@ -1,120 +1,127 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Ecore="http://www.eclipse.org/uml2/schemas/Ecore/5" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/uml2/schemas/Ecore/5 pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA">
-  <uml:Model xmi:id="_WLRF4FxxEemyeb6zzD570Q" name="PapyrusGMFDocumentStructureTemplate" URI="http://www.eclipse.org/papyrus/model2doc/gmf/integration/1.0.0/documentstructuretemplate">
-    <packageImport xmi:type="uml:PackageImport" xmi:id="_WQFUcFxxEemyeb6zzD570Q">
-      <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
-    </packageImport>
-    <packageImport xmi:type="uml:PackageImport" xmi:id="_A4xDEF9aEemxcMQajU1fyA">
-      <importedPackage xmi:type="uml:Model" href="pathmap://DOCUMENT_STRUCTURE_TEMPLATE/documentstructuretemplate.uml#_qN46sB17Eem3fboELVTtYQ"/>
-    </packageImport>
-    <packagedElement xmi:type="uml:Class" xmi:id="_QbIxsF0eEemxcMQajU1fyA" name="PapyrusGMFDiagramView">
-      <ownedComment xmi:type="uml:Comment" xmi:id="_tSAPUF0eEemxcMQajU1fyA" annotatedElement="_QbIxsF0eEemxcMQajU1fyA">
-        <body>This element allows to represent Papyrus Diagram. These diagrams are an extension of GMF Notation Diagram, but they have a kind in addition of the type field provided by GMF.&#xD;
-This View doesn't extend the GMFDiagramView provided by the model gmfdocumentstructuretemplate in order to allow to install the Papyrus GMF Diagram version without depending of the code managing the GMFDiagramView</body>
-      </ownedComment>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_gqYAcF0eEemxcMQajU1fyA" name="diagramKindId">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5SLAYGsmEemM1ofOaZkzvg" source="http://www.eclipse.org/emf/2002/GenModel">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AL4qMGsnEemM1ofOaZkzvg" key="propertyEditorFactory" value="editor://papyrusgmfdocumentstructuretemplate/PapyrusGMFDiagramView/diagramKindId/"/>
-        </eAnnotations>
-        <ownedComment xmi:type="uml:Comment" xmi:id="_y50zcF0eEemxcMQajU1fyA" annotatedElement="_gqYAcF0eEemxcMQajU1fyA">
-          <body>The kind of the diagram. This field can be empty. In this case, all diagrams will be integrated into the final document.</body>
-        </ownedComment>
-        <type xmi:type="uml:PrimitiveType" href="pathmap://ECORE_METAMODEL_LIBRARY/Ecore.uml#_SeWkisX_EduPJbEsMYXjUQ"/>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_k62-MF0eEemxcMQajU1fyA"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_PnGfwF9aEemxcMQajU1fyA" name="diagramType">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_KKOioGsnEemM1ofOaZkzvg" source="http://www.eclipse.org/emf/2002/GenModel">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_KKOioWsnEemM1ofOaZkzvg" key="propertyEditorFactory" value="editor://papyrusgmfdocumentstructuretemplate/PapyrusGMFDiagramView/diagramType/"/>
-        </eAnnotations>
-        <ownedComment xmi:type="uml:Comment" xmi:id="_1SjYcF9aEemxcMQajU1fyA" annotatedElement="_PnGfwF9aEemxcMQajU1fyA">
-          <body>The type of diagram to manage. If no type is defined, we will take all diagrams.</body>
-        </ownedComment>
-        <type xmi:type="uml:PrimitiveType" href="pathmap://ECORE_METAMODEL_LIBRARY/Ecore.uml#_SeWkisX_EduPJbEsMYXjUQ"/>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Sr-mAF9aEemxcMQajU1fyA"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_OS1sUGXNEemOJZbgd4DmNg" name="contextFilterRule" type="_zDXDQGXMEemOJZbgd4DmNg">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_fYMDsGXNEemOJZbgd4DmNg" annotatedElement="_OS1sUGXNEemOJZbgd4DmNg">
-          <body>This property allows to define how to use the parameter of the method getMatchingDiagram.</body>
-        </ownedComment>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_78Ul0F7DEeq_NYEfEw1Skw" name="diagramImageMargin">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_G3oc0F7EEeq_NYEfEw1Skw" annotatedElement="_78Ul0F7DEeq_NYEfEw1Skw">
-          <body>This field allows to define the size of the margin around the diagram snapshot. The value is interpreted as Pixel. The default value is 10.</body>
-        </ownedComment>
-        <type xmi:type="uml:PrimitiveType" href="pathmap://ECORE_METAMODEL_LIBRARY/Ecore.uml#_SeWkZcX_EduPJbEsMYXjUQ"/>
-        <defaultValue xmi:type="uml:LiteralInteger" xmi:id="_CuL7MF7EEeq_NYEfEw1Skw" name="DEFAULT_VALUE" value="10">
-          <ownedComment xmi:type="uml:Comment" xmi:id="_MWXWYF7EEeq_NYEfEw1Skw" annotatedElement="_CuL7MF7EEeq_NYEfEw1Skw">
-            <body>Default value for the margin (10 pixels), to get the initial GMF behavior, we use the same value than declared in org.eclipse.gmf.runtime.diagram.ui.render.clipboard.DiagramGenerator.DEFAULT_IMAGE_MARGIN_PIXELS.</body>
-          </ownedComment>
-        </defaultValue>
-      </ownedAttribute>
-      <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_OV4vgF9aEemxcMQajU1fyA" client="_QbIxsF0eEemxcMQajU1fyA">
-        <supplier xmi:type="uml:Interface" href="pathmap://DOCUMENT_STRUCTURE_TEMPLATE/documentstructuretemplate.uml#_DwGdIFYFEemKJasCEBKPhQ"/>
-        <contract xmi:type="uml:Interface" href="pathmap://DOCUMENT_STRUCTURE_TEMPLATE/documentstructuretemplate.uml#_DwGdIFYFEemKJasCEBKPhQ"/>
-      </interfaceRealization>
-      <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_O4OAgF9aEemxcMQajU1fyA" client="_QbIxsF0eEemxcMQajU1fyA">
-        <supplier xmi:type="uml:Interface" href="pathmap://DOCUMENT_STRUCTURE_TEMPLATE/documentstructuretemplate.uml#_R99HIFX-EemKJasCEBKPhQ"/>
-        <contract xmi:type="uml:Interface" href="pathmap://DOCUMENT_STRUCTURE_TEMPLATE/documentstructuretemplate.uml#_R99HIFX-EemKJasCEBKPhQ"/>
-      </interfaceRealization>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_UvNpEF9aEemxcMQajU1fyA" name="getMatchingDiagrams">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_zST_AF9aEemxcMQajU1fyA" annotatedElement="_UvNpEF9aEemxcMQajU1fyA">
-          <body>This method returns the diagram owned by the parameter expectedDiagramContext, according to the type and the kind of the diagram.&#xD;
-If type and kind are not defined, the method will returns all diagrams owned by the argument.&#xD;
-If the diagram doesn't have a PapryusDiagramStyle, this method returns false. </body>
-        </ownedComment>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_aAIwIF9aEemxcMQajU1fyA" name="expectedDiagramContext">
-          <type xmi:type="uml:Class" href="pathmap://ECORE_METAMODEL_LIBRARY/Ecore.uml#_SeWijsX_EduPJbEsMYXjUQ"/>
-        </ownedParameter>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_bXrx4F9aEemxcMQajU1fyA" name="return " type="_ck2IkF9aEemxcMQajU1fyA" direction="return">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_W9YroF9sEemxcMQajU1fyA"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_W9xGIF9sEemxcMQajU1fyA" value="*"/>
-        </ownedParameter>
-      </ownedOperation>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_JRxRoIX3EemhaembVcoeKQ" name="buildPartTemplateTitle">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RY7mAIX3EemhaembVcoeKQ" source="http://www.eclipse.org/emf/2002/GenModel">
-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R9nAYIX3EemhaembVcoeKQ" key="body" value="return org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.internal.operations.PapyrusGMFBodySectionPartTemplateTitleOperations.PAPYRUS_GMF_INSTANCE.buildPartTemplateTitle(this,context);"/>
-        </eAnnotations>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_McrucIX3EemhaembVcoeKQ" name="context">
-          <type xmi:type="uml:Class" href="pathmap://ECORE_METAMODEL_LIBRARY/Ecore.uml#_SeWijsX_EduPJbEsMYXjUQ"/>
-        </ownedParameter>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_OQJQIIX3EemhaembVcoeKQ" name="returnValue" direction="return">
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
-        </ownedParameter>
-        <redefinedOperation xmi:type="uml:Operation" href="pathmap://DOCUMENT_STRUCTURE_TEMPLATE/documentstructuretemplate.uml#__h3MoHV1EemQUasExi-pKA"/>
-      </ownedOperation>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Interface" xmi:id="_ck2IkF9aEemxcMQajU1fyA" name="Diagram">
-      <ownedComment xmi:type="uml:Comment" xmi:id="_3NeNAF9aEemxcMQajU1fyA" annotatedElement="_ck2IkF9aEemxcMQajU1fyA">
-        <body>This interface allows to represent the GMF Diagram element.</body>
-      </ownedComment>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Enumeration" xmi:id="_zDXDQGXMEemOJZbgd4DmNg" name="ContextFilterBehavior">
-      <ownedComment xmi:type="uml:Comment" xmi:id="_CPw8AGXNEemOJZbgd4DmNg" annotatedElement="_zDXDQGXMEemOJZbgd4DmNg">
-        <body>This enumeration allows to define wich context must be used to find diagrams.</body>
-      </ownedComment>
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_1sFZAGXMEemOJZbgd4DmNg" name="SEMANTIC_CONTEXT">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_xtC7IGXNEemOJZbgd4DmNg" annotatedElement="_1sFZAGXMEemOJZbgd4DmNg">
-          <body>(In Papyrus, this concept is called Diagram Root Element)</body>
-        </ownedComment>
-      </ownedLiteral>
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5NJE8GXMEemOJZbgd4DmNg" name="GRAPHICAL_CONTEXT">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_vgsYUGXNEemOJZbgd4DmNg" annotatedElement="_5NJE8GXMEemOJZbgd4DmNg">
-          <body>(In Papyrus, this concept is called Diagram Owner)</body>
-        </ownedComment>
-      </ownedLiteral>
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_7wWokGXMEemOJZbgd4DmNg" name="BOTH">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_JfaZkGXNEemOJZbgd4DmNg" annotatedElement="_7wWokGXMEemOJZbgd4DmNg">
-          <body>We look matching diagrams using the element as semantic context and graphical context.</body>
-        </ownedComment>
-      </ownedLiteral>
-    </packagedElement>
-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_7G9M8F0eEemxcMQajU1fyA">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_7HBeYF0eEemxcMQajU1fyA" source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <references xmi:type="ecore:EPackage" href="pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA"/>
-      </eAnnotations>
-      <appliedProfile xmi:type="uml:Profile" href="pathmap://UML_PROFILES/Ecore.profile.uml#_0"/>
-    </profileApplication>
-  </uml:Model>
-  <Ecore:EPackage xmi:id="_78JIgF0eEemxcMQajU1fyA" base_Package="_WLRF4FxxEemyeb6zzD570Q" packageName="documentstructuretemplate" nsPrefix="documentstructuretemplate" basePackage="org.eclipse.papyrus.model2doc.integration.gmf" prefix="PapyrusGMFDocumentStructureTemplate"/>
-  <Ecore:EClass xmi:id="_fzwUkF9aEemxcMQajU1fyA" instanceClassName="org.eclipse.gmf.runtime.notation.Diagram" base_Interface="_ck2IkF9aEemxcMQajU1fyA" className="Diagram"/>
-</xmi:XMI>
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Ecore="http://www.eclipse.org/uml2/schemas/Ecore/5" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/uml2/schemas/Ecore/5 pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA">
+  <uml:Model xmi:id="_WLRF4FxxEemyeb6zzD570Q" name="PapyrusGMFDocumentStructureTemplate" URI="http://www.eclipse.org/papyrus/model2doc/gmf/integration/1.0.0/documentstructuretemplate">
+    <packageImport xmi:type="uml:PackageImport" xmi:id="_WQFUcFxxEemyeb6zzD570Q">
+      <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+    </packageImport>
+    <packageImport xmi:type="uml:PackageImport" xmi:id="_A4xDEF9aEemxcMQajU1fyA">
+      <importedPackage xmi:type="uml:Model" href="pathmap://DOCUMENT_STRUCTURE_TEMPLATE/documentstructuretemplate.uml#_qN46sB17Eem3fboELVTtYQ"/>
+    </packageImport>
+    <packagedElement xmi:type="uml:Class" xmi:id="_QbIxsF0eEemxcMQajU1fyA" name="PapyrusGMFDiagramView">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_tSAPUF0eEemxcMQajU1fyA" annotatedElement="_QbIxsF0eEemxcMQajU1fyA">
+        <body>This element allows to represent Papyrus Diagram. These diagrams are an extension of GMF Notation Diagram, but they have a kind in addition of the type field provided by GMF.&#xD;
+This View doesn't extend the GMFDiagramView provided by the model gmfdocumentstructuretemplate in order to allow to install the Papyrus GMF Diagram version without depending of the code managing the GMFDiagramView</body>
+      </ownedComment>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_gqYAcF0eEemxcMQajU1fyA" name="diagramKindId">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5SLAYGsmEemM1ofOaZkzvg" source="http://www.eclipse.org/emf/2002/GenModel">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AL4qMGsnEemM1ofOaZkzvg" key="propertyEditorFactory" value="editor://papyrusgmfdocumentstructuretemplate/PapyrusGMFDiagramView/diagramKindId/"/>
+        </eAnnotations>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_y50zcF0eEemxcMQajU1fyA" annotatedElement="_gqYAcF0eEemxcMQajU1fyA">
+          <body>The kind of the diagram. This field can be empty. In this case, all diagrams will be integrated into the final document.</body>
+        </ownedComment>
+        <type xmi:type="uml:PrimitiveType" href="pathmap://ECORE_METAMODEL_LIBRARY/Ecore.uml#_SeWkisX_EduPJbEsMYXjUQ"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_k62-MF0eEemxcMQajU1fyA"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_PnGfwF9aEemxcMQajU1fyA" name="diagramType">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_KKOioGsnEemM1ofOaZkzvg" source="http://www.eclipse.org/emf/2002/GenModel">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_KKOioWsnEemM1ofOaZkzvg" key="propertyEditorFactory" value="editor://papyrusgmfdocumentstructuretemplate/PapyrusGMFDiagramView/diagramType/"/>
+        </eAnnotations>
+        <ownedComment xmi:type="uml:Comment" xmi:id="_1SjYcF9aEemxcMQajU1fyA" annotatedElement="_PnGfwF9aEemxcMQajU1fyA">
+          <body>The type of diagram to manage. If no type is defined, we will take all diagrams.</body>
+        </ownedComment>
+        <type xmi:type="uml:PrimitiveType" href="pathmap://ECORE_METAMODEL_LIBRARY/Ecore.uml#_SeWkisX_EduPJbEsMYXjUQ"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Sr-mAF9aEemxcMQajU1fyA"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_OS1sUGXNEemOJZbgd4DmNg" name="contextFilterRule" type="_zDXDQGXMEemOJZbgd4DmNg">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_fYMDsGXNEemOJZbgd4DmNg" annotatedElement="_OS1sUGXNEemOJZbgd4DmNg">
+          <body>This property allows to define how to use the parameter of the method getMatchingDiagram.</body>
+        </ownedComment>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_78Ul0F7DEeq_NYEfEw1Skw" name="diagramImageMargin">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_G3oc0F7EEeq_NYEfEw1Skw" annotatedElement="_78Ul0F7DEeq_NYEfEw1Skw">
+          <body>This field allows to define the size of the margin around the diagram snapshot. The value is interpreted as Pixel. The default value is 10.</body>
+        </ownedComment>
+        <type xmi:type="uml:PrimitiveType" href="pathmap://ECORE_METAMODEL_LIBRARY/Ecore.uml#_SeWkZcX_EduPJbEsMYXjUQ"/>
+        <defaultValue xmi:type="uml:LiteralInteger" xmi:id="_CuL7MF7EEeq_NYEfEw1Skw" name="DEFAULT_VALUE" value="10">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_MWXWYF7EEeq_NYEfEw1Skw" annotatedElement="_CuL7MF7EEeq_NYEfEw1Skw">
+            <body>Default value for the margin (10 pixels), to get the initial GMF behavior, we use the same value than declared in org.eclipse.gmf.runtime.diagram.ui.render.clipboard.DiagramGenerator.DEFAULT_IMAGE_MARGIN_PIXELS.</body>
+          </ownedComment>
+        </defaultValue>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_UYg-wB29EeuToo8VLEZPVg" name="imageFormat">
+        <type xmi:type="uml:Enumeration" href="pathmap://MODEL2DOC/BUILTIN_TYPES/BuiltInTypes.uml#_I9QFkBn9EeunG-PlCrg2Pg"/>
+        <defaultValue xmi:type="uml:InstanceValue" xmi:id="_iOBaMCAnEeuyYawtPCaZsA" name="SVG">
+          <type xmi:type="uml:Enumeration" href="pathmap://MODEL2DOC/BUILTIN_TYPES/BuiltInTypes.uml#_I9QFkBn9EeunG-PlCrg2Pg"/>
+          <instance xmi:type="uml:EnumerationLiteral" href="pathmap://MODEL2DOC/BUILTIN_TYPES/BuiltInTypes.uml#_qjV3oB28EeuC_v9WQLDVcQ"/>
+        </defaultValue>
+      </ownedAttribute>
+      <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_OV4vgF9aEemxcMQajU1fyA" client="_QbIxsF0eEemxcMQajU1fyA">
+        <supplier xmi:type="uml:Interface" href="pathmap://DOCUMENT_STRUCTURE_TEMPLATE/documentstructuretemplate.uml#_DwGdIFYFEemKJasCEBKPhQ"/>
+        <contract xmi:type="uml:Interface" href="pathmap://DOCUMENT_STRUCTURE_TEMPLATE/documentstructuretemplate.uml#_DwGdIFYFEemKJasCEBKPhQ"/>
+      </interfaceRealization>
+      <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_O4OAgF9aEemxcMQajU1fyA" client="_QbIxsF0eEemxcMQajU1fyA">
+        <supplier xmi:type="uml:Interface" href="pathmap://DOCUMENT_STRUCTURE_TEMPLATE/documentstructuretemplate.uml#_R99HIFX-EemKJasCEBKPhQ"/>
+        <contract xmi:type="uml:Interface" href="pathmap://DOCUMENT_STRUCTURE_TEMPLATE/documentstructuretemplate.uml#_R99HIFX-EemKJasCEBKPhQ"/>
+      </interfaceRealization>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_UvNpEF9aEemxcMQajU1fyA" name="getMatchingDiagrams">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_zST_AF9aEemxcMQajU1fyA" annotatedElement="_UvNpEF9aEemxcMQajU1fyA">
+          <body>This method returns the diagram owned by the parameter expectedDiagramContext, according to the type and the kind of the diagram.&#xD;
+If type and kind are not defined, the method will returns all diagrams owned by the argument.&#xD;
+If the diagram doesn't have a PapryusDiagramStyle, this method returns false. </body>
+        </ownedComment>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_aAIwIF9aEemxcMQajU1fyA" name="expectedDiagramContext">
+          <type xmi:type="uml:Class" href="pathmap://ECORE_METAMODEL_LIBRARY/Ecore.uml#_SeWijsX_EduPJbEsMYXjUQ"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_bXrx4F9aEemxcMQajU1fyA" name="return " type="_ck2IkF9aEemxcMQajU1fyA" direction="return">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_W9YroF9sEemxcMQajU1fyA"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_W9xGIF9sEemxcMQajU1fyA" value="*"/>
+        </ownedParameter>
+      </ownedOperation>
+      <ownedOperation xmi:type="uml:Operation" xmi:id="_JRxRoIX3EemhaembVcoeKQ" name="buildPartTemplateTitle">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RY7mAIX3EemhaembVcoeKQ" source="http://www.eclipse.org/emf/2002/GenModel">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R9nAYIX3EemhaembVcoeKQ" key="body" value="return org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.internal.operations.PapyrusGMFBodySectionPartTemplateTitleOperations.PAPYRUS_GMF_INSTANCE.buildPartTemplateTitle(this,context);"/>
+        </eAnnotations>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_McrucIX3EemhaembVcoeKQ" name="context">
+          <type xmi:type="uml:Class" href="pathmap://ECORE_METAMODEL_LIBRARY/Ecore.uml#_SeWijsX_EduPJbEsMYXjUQ"/>
+        </ownedParameter>
+        <ownedParameter xmi:type="uml:Parameter" xmi:id="_OQJQIIX3EemhaembVcoeKQ" name="returnValue" direction="return">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
+        </ownedParameter>
+        <redefinedOperation xmi:type="uml:Operation" href="pathmap://DOCUMENT_STRUCTURE_TEMPLATE/documentstructuretemplate.uml#__h3MoHV1EemQUasExi-pKA"/>
+      </ownedOperation>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Interface" xmi:id="_ck2IkF9aEemxcMQajU1fyA" name="Diagram">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_3NeNAF9aEemxcMQajU1fyA" annotatedElement="_ck2IkF9aEemxcMQajU1fyA">
+        <body>This interface allows to represent the GMF Diagram element.</body>
+      </ownedComment>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Enumeration" xmi:id="_zDXDQGXMEemOJZbgd4DmNg" name="ContextFilterBehavior">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_CPw8AGXNEemOJZbgd4DmNg" annotatedElement="_zDXDQGXMEemOJZbgd4DmNg">
+        <body>This enumeration allows to define wich context must be used to find diagrams.</body>
+      </ownedComment>
+      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_1sFZAGXMEemOJZbgd4DmNg" name="SEMANTIC_CONTEXT">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_xtC7IGXNEemOJZbgd4DmNg" annotatedElement="_1sFZAGXMEemOJZbgd4DmNg">
+          <body>(In Papyrus, this concept is called Diagram Root Element)</body>
+        </ownedComment>
+      </ownedLiteral>
+      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_5NJE8GXMEemOJZbgd4DmNg" name="GRAPHICAL_CONTEXT">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_vgsYUGXNEemOJZbgd4DmNg" annotatedElement="_5NJE8GXMEemOJZbgd4DmNg">
+          <body>(In Papyrus, this concept is called Diagram Owner)</body>
+        </ownedComment>
+      </ownedLiteral>
+      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_7wWokGXMEemOJZbgd4DmNg" name="BOTH">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_JfaZkGXNEemOJZbgd4DmNg" annotatedElement="_7wWokGXMEemOJZbgd4DmNg">
+          <body>We look matching diagrams using the element as semantic context and graphical context.</body>
+        </ownedComment>
+      </ownedLiteral>
+    </packagedElement>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_7G9M8F0eEemxcMQajU1fyA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_7HBeYF0eEemxcMQajU1fyA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://UML_PROFILES/Ecore.profile.uml#_0"/>
+    </profileApplication>
+  </uml:Model>
+  <Ecore:EPackage xmi:id="_78JIgF0eEemxcMQajU1fyA" base_Package="_WLRF4FxxEemyeb6zzD570Q" packageName="documentstructuretemplate" nsPrefix="documentstructuretemplate" basePackage="org.eclipse.papyrus.model2doc.integration.gmf" prefix="PapyrusGMFDocumentStructureTemplate"/>
+  <Ecore:EClass xmi:id="_fzwUkF9aEemxcMQajU1fyA" instanceClassName="org.eclipse.gmf.runtime.notation.Diagram" base_Interface="_ck2IkF9aEemxcMQajU1fyA" className="Diagram"/>
+</xmi:XMI>
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate/src-gen/org/eclipse/papyrus/model2doc/integration/gmf/documentstructuretemplate/PapyrusGMFDiagramView.java b/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate/src-gen/org/eclipse/papyrus/model2doc/integration/gmf/documentstructuretemplate/PapyrusGMFDiagramView.java
index 8f4491b..408adf6 100755
--- a/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate/src-gen/org/eclipse/papyrus/model2doc/integration/gmf/documentstructuretemplate/PapyrusGMFDiagramView.java
+++ b/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate/src-gen/org/eclipse/papyrus/model2doc/integration/gmf/documentstructuretemplate/PapyrusGMFDiagramView.java
@@ -14,11 +14,9 @@
 package org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate;
 
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.gmf.runtime.notation.Diagram;
-
+import org.eclipse.papyrus.model2doc.core.builtintypes.ImageFormat;
 import org.eclipse.papyrus.model2doc.emf.documentstructuretemplate.ILeafBodyPartTemplate;
 import org.eclipse.papyrus.model2doc.emf.documentstructuretemplate.ITemplatePartView;
 
@@ -40,6 +38,7 @@
  * <li>{@link org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.PapyrusGMFDiagramView#getDiagramType <em>Diagram Type</em>}</li>
  * <li>{@link org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.PapyrusGMFDiagramView#getContextFilterRule <em>Context Filter Rule</em>}</li>
  * <li>{@link org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.PapyrusGMFDiagramView#getDiagramImageMargin <em>Diagram Image Margin</em>}</li>
+ * <li>{@link org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.PapyrusGMFDiagramView#getImageFormat <em>Image Format</em>}</li>
  * </ul>
  *
  * @see org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.PapyrusGMFDocumentStructureTemplatePackage#getPapyrusGMFDiagramView()
@@ -164,6 +163,39 @@
 	void setDiagramImageMargin(int value);
 
 	/**
+	 * Returns the value of the '<em><b>Image Format</b></em>' attribute.
+	 * The default value is <code>"SVG"</code>.
+	 * The literals are from the enumeration {@link org.eclipse.papyrus.model2doc.core.builtintypes.ImageFormat}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Image Format</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Image Format</em>' attribute.
+	 * @see org.eclipse.papyrus.model2doc.core.builtintypes.ImageFormat
+	 * @see #setImageFormat(ImageFormat)
+	 * @see org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.PapyrusGMFDocumentStructureTemplatePackage#getPapyrusGMFDiagramView_ImageFormat()
+	 * @model default="SVG" required="true" ordered="false"
+	 * @generated
+	 */
+	ImageFormat getImageFormat();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.PapyrusGMFDiagramView#getImageFormat <em>Image Format</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value
+	 *                  the new value of the '<em>Image Format</em>' attribute.
+	 * @see org.eclipse.papyrus.model2doc.core.builtintypes.ImageFormat
+	 * @see #getImageFormat()
+	 * @generated
+	 */
+	void setImageFormat(ImageFormat value);
+
+	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * <!-- begin-model-doc -->
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate/src-gen/org/eclipse/papyrus/model2doc/integration/gmf/documentstructuretemplate/PapyrusGMFDocumentStructureTemplatePackage.java b/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate/src-gen/org/eclipse/papyrus/model2doc/integration/gmf/documentstructuretemplate/PapyrusGMFDocumentStructureTemplatePackage.java
index 6d9aadf..7f9694e 100755
--- a/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate/src-gen/org/eclipse/papyrus/model2doc/integration/gmf/documentstructuretemplate/PapyrusGMFDocumentStructureTemplatePackage.java
+++ b/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate/src-gen/org/eclipse/papyrus/model2doc/integration/gmf/documentstructuretemplate/PapyrusGMFDocumentStructureTemplatePackage.java
@@ -168,6 +168,16 @@
 	int PAPYRUS_GMF_DIAGRAM_VIEW__DIAGRAM_IMAGE_MARGIN = DocumentStructureTemplatePackage.ITEMPLATE_PART_VIEW_FEATURE_COUNT + 7;
 
 	/**
+	 * The feature id for the '<em><b>Image Format</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int PAPYRUS_GMF_DIAGRAM_VIEW__IMAGE_FORMAT = DocumentStructureTemplatePackage.ITEMPLATE_PART_VIEW_FEATURE_COUNT + 8;
+
+	/**
 	 * The number of structural features of the '<em>Papyrus GMF Diagram View</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -175,7 +185,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PAPYRUS_GMF_DIAGRAM_VIEW_FEATURE_COUNT = DocumentStructureTemplatePackage.ITEMPLATE_PART_VIEW_FEATURE_COUNT + 8;
+	int PAPYRUS_GMF_DIAGRAM_VIEW_FEATURE_COUNT = DocumentStructureTemplatePackage.ITEMPLATE_PART_VIEW_FEATURE_COUNT + 9;
 
 	/**
 	 * The operation id for the '<em>Build Part Template Title</em>' operation.
@@ -320,6 +330,18 @@
 	EAttribute getPapyrusGMFDiagramView_DiagramImageMargin();
 
 	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.PapyrusGMFDiagramView#getImageFormat <em>Image Format</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Image Format</em>'.
+	 * @see org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.PapyrusGMFDiagramView#getImageFormat()
+	 * @see #getPapyrusGMFDiagramView()
+	 * @generated
+	 */
+	EAttribute getPapyrusGMFDiagramView_ImageFormat();
+
+	/**
 	 * Returns the meta object for the '{@link org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.PapyrusGMFDiagramView#getMatchingDiagrams(org.eclipse.emf.ecore.EObject) <em>Get Matching Diagrams</em>}' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -426,6 +448,15 @@
 		EAttribute PAPYRUS_GMF_DIAGRAM_VIEW__DIAGRAM_IMAGE_MARGIN = eINSTANCE.getPapyrusGMFDiagramView_DiagramImageMargin();
 
 		/**
+		 * The meta object literal for the '<em><b>Image Format</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EAttribute PAPYRUS_GMF_DIAGRAM_VIEW__IMAGE_FORMAT = eINSTANCE.getPapyrusGMFDiagramView_ImageFormat();
+
+		/**
 		 * The meta object literal for the '<em><b>Get Matching Diagrams</b></em>' operation.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate/src-gen/org/eclipse/papyrus/model2doc/integration/gmf/documentstructuretemplate/impl/PapyrusGMFDiagramViewImpl.java b/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate/src-gen/org/eclipse/papyrus/model2doc/integration/gmf/documentstructuretemplate/impl/PapyrusGMFDiagramViewImpl.java
index 897b5fa..06c6ce3 100755
--- a/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate/src-gen/org/eclipse/papyrus/model2doc/integration/gmf/documentstructuretemplate/impl/PapyrusGMFDiagramViewImpl.java
+++ b/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate/src-gen/org/eclipse/papyrus/model2doc/integration/gmf/documentstructuretemplate/impl/PapyrusGMFDiagramViewImpl.java
@@ -16,25 +16,20 @@
 import java.lang.reflect.InvocationTargetException;
 
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
-
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
 import org.eclipse.gmf.runtime.notation.Diagram;
-
 import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.IBooleanEObjectExpression;
+import org.eclipse.papyrus.model2doc.core.builtintypes.ImageFormat;
 import org.eclipse.papyrus.model2doc.emf.documentstructuretemplate.DocumentStructureTemplatePackage;
 import org.eclipse.papyrus.model2doc.emf.documentstructuretemplate.IBodyPartTemplate;
 import org.eclipse.papyrus.model2doc.emf.documentstructuretemplate.IBodySectionPartTemplate;
 import org.eclipse.papyrus.model2doc.emf.documentstructuretemplate.ILeafBodyPartTemplate;
-
 import org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.ContextFilterBehavior;
 import org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.PapyrusGMFDiagramView;
 import org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.PapyrusGMFDocumentStructureTemplatePackage;
@@ -55,6 +50,7 @@
  * <li>{@link org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.impl.PapyrusGMFDiagramViewImpl#getDiagramType <em>Diagram Type</em>}</li>
  * <li>{@link org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.impl.PapyrusGMFDiagramViewImpl#getContextFilterRule <em>Context Filter Rule</em>}</li>
  * <li>{@link org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.impl.PapyrusGMFDiagramViewImpl#getDiagramImageMargin <em>Diagram Image Margin</em>}</li>
+ * <li>{@link org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.impl.PapyrusGMFDiagramViewImpl#getImageFormat <em>Image Format</em>}</li>
  * </ul>
  *
  * @generated
@@ -226,6 +222,28 @@
 	protected int diagramImageMargin = DIAGRAM_IMAGE_MARGIN_EDEFAULT;
 
 	/**
+	 * The default value of the '{@link #getImageFormat() <em>Image Format</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getImageFormat()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final ImageFormat IMAGE_FORMAT_EDEFAULT = ImageFormat.SVG;
+
+	/**
+	 * The cached value of the '{@link #getImageFormat() <em>Image Format</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getImageFormat()
+	 * @generated
+	 * @ordered
+	 */
+	protected ImageFormat imageFormat = IMAGE_FORMAT_EDEFAULT;
+
+	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
@@ -491,6 +509,32 @@
 	 * @generated
 	 */
 	@Override
+	public ImageFormat getImageFormat() {
+		return imageFormat;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setImageFormat(ImageFormat newImageFormat) {
+		ImageFormat oldImageFormat = imageFormat;
+		imageFormat = newImageFormat == null ? IMAGE_FORMAT_EDEFAULT : newImageFormat;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, PapyrusGMFDocumentStructureTemplatePackage.PAPYRUS_GMF_DIAGRAM_VIEW__IMAGE_FORMAT, oldImageFormat, imageFormat));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
 	public String buildPartTemplateTitle(final EObject context) {
 		return org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.internal.operations.PapyrusGMFBodySectionPartTemplateTitleOperations.PAPYRUS_GMF_INSTANCE.buildPartTemplateTitle(this, context);
 	}
@@ -566,6 +610,8 @@
 			return getContextFilterRule();
 		case PapyrusGMFDocumentStructureTemplatePackage.PAPYRUS_GMF_DIAGRAM_VIEW__DIAGRAM_IMAGE_MARGIN:
 			return getDiagramImageMargin();
+		case PapyrusGMFDocumentStructureTemplatePackage.PAPYRUS_GMF_DIAGRAM_VIEW__IMAGE_FORMAT:
+			return getImageFormat();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -603,6 +649,9 @@
 		case PapyrusGMFDocumentStructureTemplatePackage.PAPYRUS_GMF_DIAGRAM_VIEW__DIAGRAM_IMAGE_MARGIN:
 			setDiagramImageMargin((Integer) newValue);
 			return;
+		case PapyrusGMFDocumentStructureTemplatePackage.PAPYRUS_GMF_DIAGRAM_VIEW__IMAGE_FORMAT:
+			setImageFormat((ImageFormat) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -640,6 +689,9 @@
 		case PapyrusGMFDocumentStructureTemplatePackage.PAPYRUS_GMF_DIAGRAM_VIEW__DIAGRAM_IMAGE_MARGIN:
 			setDiagramImageMargin(DIAGRAM_IMAGE_MARGIN_EDEFAULT);
 			return;
+		case PapyrusGMFDocumentStructureTemplatePackage.PAPYRUS_GMF_DIAGRAM_VIEW__IMAGE_FORMAT:
+			setImageFormat(IMAGE_FORMAT_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -669,6 +721,8 @@
 			return contextFilterRule != CONTEXT_FILTER_RULE_EDEFAULT;
 		case PapyrusGMFDocumentStructureTemplatePackage.PAPYRUS_GMF_DIAGRAM_VIEW__DIAGRAM_IMAGE_MARGIN:
 			return diagramImageMargin != DIAGRAM_IMAGE_MARGIN_EDEFAULT;
+		case PapyrusGMFDocumentStructureTemplatePackage.PAPYRUS_GMF_DIAGRAM_VIEW__IMAGE_FORMAT:
+			return imageFormat != IMAGE_FORMAT_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -826,6 +880,8 @@
 		result.append(contextFilterRule);
 		result.append(", diagramImageMargin: "); //$NON-NLS-1$
 		result.append(diagramImageMargin);
+		result.append(", imageFormat: "); //$NON-NLS-1$
+		result.append(imageFormat);
 		result.append(')');
 		return result.toString();
 	}
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate/src-gen/org/eclipse/papyrus/model2doc/integration/gmf/documentstructuretemplate/impl/PapyrusGMFDocumentStructureTemplatePackageImpl.java b/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate/src-gen/org/eclipse/papyrus/model2doc/integration/gmf/documentstructuretemplate/impl/PapyrusGMFDocumentStructureTemplatePackageImpl.java
index d522fc7..2e69be8 100755
--- a/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate/src-gen/org/eclipse/papyrus/model2doc/integration/gmf/documentstructuretemplate/impl/PapyrusGMFDocumentStructureTemplatePackageImpl.java
+++ b/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate/src-gen/org/eclipse/papyrus/model2doc/integration/gmf/documentstructuretemplate/impl/PapyrusGMFDocumentStructureTemplatePackageImpl.java
@@ -25,6 +25,7 @@
 import org.eclipse.gmf.runtime.notation.Diagram;
 
 import org.eclipse.papyrus.infra.emf.expressions.ExpressionsPackage;
+import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsPackage;
 import org.eclipse.papyrus.model2doc.core.author.AuthorPackage;
 import org.eclipse.papyrus.model2doc.core.builtintypes.BuiltInTypesPackage;
 import org.eclipse.papyrus.model2doc.core.generatorconfiguration.GeneratorConfigurationPackage;
@@ -129,8 +130,9 @@
 		EcorePackage.eINSTANCE.eClass();
 		GeneratorConfigurationPackage.eINSTANCE.eClass();
 		AuthorPackage.eINSTANCE.eClass();
-		ExpressionsPackage.eINSTANCE.eClass();
 		BuiltInTypesPackage.eINSTANCE.eClass();
+		BooleanExpressionsPackage.eINSTANCE.eClass();
+		ExpressionsPackage.eINSTANCE.eClass();
 
 		// Create package meta-data objects
 		thePapyrusGMFDocumentStructureTemplatePackage.createPackageContents();
@@ -208,6 +210,17 @@
 	 * @generated
 	 */
 	@Override
+	public EAttribute getPapyrusGMFDiagramView_ImageFormat() {
+		return (EAttribute) papyrusGMFDiagramViewEClass.getEStructuralFeatures().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
 	public EOperation getPapyrusGMFDiagramView__GetMatchingDiagrams__EObject() {
 		return papyrusGMFDiagramViewEClass.getEOperations().get(0);
 	}
@@ -273,6 +286,7 @@
 		createEAttribute(papyrusGMFDiagramViewEClass, PAPYRUS_GMF_DIAGRAM_VIEW__DIAGRAM_TYPE);
 		createEAttribute(papyrusGMFDiagramViewEClass, PAPYRUS_GMF_DIAGRAM_VIEW__CONTEXT_FILTER_RULE);
 		createEAttribute(papyrusGMFDiagramViewEClass, PAPYRUS_GMF_DIAGRAM_VIEW__DIAGRAM_IMAGE_MARGIN);
+		createEAttribute(papyrusGMFDiagramViewEClass, PAPYRUS_GMF_DIAGRAM_VIEW__IMAGE_FORMAT);
 		createEOperation(papyrusGMFDiagramViewEClass, PAPYRUS_GMF_DIAGRAM_VIEW___GET_MATCHING_DIAGRAMS__EOBJECT);
 
 		diagramEClass = createEClass(DIAGRAM);
@@ -311,6 +325,7 @@
 		// Obtain other dependent packages
 		DocumentStructureTemplatePackage theDocumentStructureTemplatePackage = (DocumentStructureTemplatePackage) EPackage.Registry.INSTANCE.getEPackage(DocumentStructureTemplatePackage.eNS_URI);
 		EcorePackage theEcorePackage = (EcorePackage) EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
+		BuiltInTypesPackage theBuiltInTypesPackage = (BuiltInTypesPackage) EPackage.Registry.INSTANCE.getEPackage(BuiltInTypesPackage.eNS_URI);
 
 		// Create type parameters
 
@@ -328,6 +343,8 @@
 				!IS_ORDERED);
 		initEAttribute(getPapyrusGMFDiagramView_DiagramImageMargin(), theEcorePackage.getEInt(), "diagramImageMargin", "10", 1, 1, PapyrusGMFDiagramView.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, //$NON-NLS-1$ //$NON-NLS-2$
 				!IS_ORDERED);
+		initEAttribute(getPapyrusGMFDiagramView_ImageFormat(), theBuiltInTypesPackage.getImageFormat(), "imageFormat", "SVG", 1, 1, PapyrusGMFDiagramView.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, //$NON-NLS-1$ //$NON-NLS-2$
+				!IS_ORDERED);
 
 		EOperation op = initEOperation(getPapyrusGMFDiagramView__GetMatchingDiagrams__EObject(), this.getDiagram(), "getMatchingDiagrams", 0, -1, IS_UNIQUE, !IS_ORDERED); //$NON-NLS-1$
 		addEParameter(op, theEcorePackage.getEObject(), "expectedDiagramContext", 1, 1, IS_UNIQUE, !IS_ORDERED); //$NON-NLS-1$
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.template2structure/META-INF/MANIFEST.MF b/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.template2structure/META-INF/MANIFEST.MF
index 83db233..d6d2e59 100755
--- a/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.template2structure/META-INF/MANIFEST.MF
+++ b/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.template2structure/META-INF/MANIFEST.MF
@@ -16,7 +16,8 @@
  org.eclipse.papyrus.model2doc.emf.documentstructure;bundle-version="[0.7.0,1.0.0)",
  org.eclipse.papyrus.model2doc.core.generatorconfiguration;bundle-version="[0.7.0,1.0.0)",
  org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.8.0,2.0.0)"
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.8.0,2.0.0)",
+ org.eclipse.papyrus.model2doc.core.builtintypes
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.papyrus.model2doc.integration.gmf.template2structure
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.template2structure/src/org/eclipse/papyrus/model2doc/integration/gmf/template2structure/internal/mapping/GMFDiagramImageUtils.java b/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.template2structure/src/org/eclipse/papyrus/model2doc/integration/gmf/template2structure/internal/mapping/GMFDiagramImageUtils.java
index 6c6adc5..09ba292 100755
--- a/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.template2structure/src/org/eclipse/papyrus/model2doc/integration/gmf/template2structure/internal/mapping/GMFDiagramImageUtils.java
+++ b/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.template2structure/src/org/eclipse/papyrus/model2doc/integration/gmf/template2structure/internal/mapping/GMFDiagramImageUtils.java
@@ -17,7 +17,6 @@
 
 import java.io.File;
 
-import org.eclipse.core.runtime.Assert;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.NullProgressMonitor;
@@ -26,6 +25,7 @@
 import org.eclipse.gmf.runtime.diagram.ui.image.ImageFileFormat;
 import org.eclipse.gmf.runtime.diagram.ui.render.util.CopyToImageUtil;
 import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.papyrus.model2doc.core.builtintypes.ImageFormat;
 import org.eclipse.papyrus.model2doc.integration.gmf.template2structure.Activator;
 
 
@@ -40,17 +40,20 @@
 	public static final String SVG_EXTENSION = "svg"; //$NON-NLS-1$
 
 	/**
+	 * the png file extension
+	 */
+	public static final String PNG_EXTENSION = "png"; //$NON-NLS-1$
+
+	/**
 	 * Generate image of diagram.
 	 *
 	 * @param diagram
 	 * @param pathRoot
 	 * @param margin
+	 * @param format
 	 * @return
 	 */
-	public static void generateImageOfDiagram(final Diagram diagram, final String pathRoot, final int margin) {
-		// to be sure, but currently, we only propose svg, so, it should be ok.
-		Assert.isTrue(pathRoot.endsWith(SVG_EXTENSION));
-
+	public static void generateImageOfDiagram(final Diagram diagram, final String pathRoot, final int margin, ImageFormat format) {
 		final Path imagePath = new Path(pathRoot.toString());
 
 		// we check all folders tree already exists, and we create them if not
@@ -69,7 +72,7 @@
 			// Dimension d = new Dimension(1402, 757).scale(0.70);
 			// copyImageUtil.copyToConstrainedImage(diagram, imagePath, ImageFileFormat.SVG, d.width, d.height, new NullProgressMonitor(),
 			// PreferencesHint.USE_DEFAULTS, false);
-			copyImageUtil.copyToImage(diagram, imagePath, ImageFileFormat.SVG, new NullProgressMonitor(),
+			copyImageUtil.copyToImage(diagram, imagePath, getFileFormat(format), new NullProgressMonitor(),
 					PreferencesHint.USE_DEFAULTS);
 		} catch (CoreException e) {
 			Activator.log.error(e);
@@ -79,4 +82,18 @@
 		}
 
 	}
+
+	/**
+	 * @param format
+	 * @return
+	 */
+	private static ImageFileFormat getFileFormat(ImageFormat format) {
+		switch (format) {
+		case PNG:
+			return ImageFileFormat.PNG;
+		case SVG:
+		default:
+			return ImageFileFormat.SVG;
+		}
+	}
 }
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.template2structure/src/org/eclipse/papyrus/model2doc/integration/gmf/template2structure/internal/mapping/PapyrusGMFDiagramViewMapper.java b/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.template2structure/src/org/eclipse/papyrus/model2doc/integration/gmf/template2structure/internal/mapping/PapyrusGMFDiagramViewMapper.java
index b187104..83cba74 100755
--- a/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.template2structure/src/org/eclipse/papyrus/model2doc/integration/gmf/template2structure/internal/mapping/PapyrusGMFDiagramViewMapper.java
+++ b/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.template2structure/src/org/eclipse/papyrus/model2doc/integration/gmf/template2structure/internal/mapping/PapyrusGMFDiagramViewMapper.java
@@ -105,9 +105,9 @@
 					imageNameBuilder.append(XMI_ID);
 				}
 			}
-			String imagePath = GeneratorConfigurationOperations.getImageFileLocalPath(conf, imageNameBuilder.toString(), GMFDiagramImageUtils.SVG_EXTENSION);
+			String imagePath = GeneratorConfigurationOperations.getImageFileLocalPath(conf, imageNameBuilder.toString(), getFileExtension(gmfDiagramView));
 			imagePath = imagePath.replaceAll("file:/", ""); //$NON-NLS-1$ //$NON-NLS-2$
-			GMFDiagramImageUtils.generateImageOfDiagram(current, imagePath, gmfDiagramView.getDiagramImageMargin());
+			GMFDiagramImageUtils.generateImageOfDiagram(current, imagePath, gmfDiagramView.getDiagramImageMargin(), gmfDiagramView.getImageFormat());
 			image.setImagePath(imagePath);
 			if (null == title) {
 				returnedValue.add(returnedClassType.cast(image));
@@ -118,4 +118,18 @@
 		return returnedValue;
 	}
 
+	/**
+	 * @param gmfDiagramView
+	 * @return
+	 */
+	private String getFileExtension(PapyrusGMFDiagramView gmfDiagramView) {
+		switch (gmfDiagramView.getImageFormat()) {
+		case PNG:
+			return GMFDiagramImageUtils.PNG_EXTENSION;
+		case SVG:
+		default:
+			return GMFDiagramImageUtils.SVG_EXTENSION;
+		}
+	}
+
 }