Bug 580697
 Update the library
Change-Id: Ie0b0acf4c7bc1114e36df4575ca9e1d044761d85
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/META-INF/MANIFEST.MF b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/META-INF/MANIFEST.MF
index c7d83ba..210f8aa 100644
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/META-INF/MANIFEST.MF
+++ b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/META-INF/MANIFEST.MF
@@ -11,15 +11,4 @@
  org.eclipse.emf.ecore;bundle-version="2.13.0";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.priorityandimportanceconcerns,
- org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.priorityandimportanceconcerns.impl,
- org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns,
- org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.impl,
- org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementclassificationconcerns,
- org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementclassificationconcerns.impl,
- org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementscharacteristicsconcerns,
- org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementscharacteristicsconcerns.impl,
- org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.verificationandvalidationconcerns,
- org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.verificationandvalidationconcerns.impl,
- org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.set
 Automatic-Module-Name: org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/plugin.xml b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/plugin.xml
index cf5c8d6..3e2d694 100644
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/plugin.xml
+++ b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/plugin.xml
@@ -1,104 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
-<!--
-    Copyright (c) 2017 CEA LIST.
-    All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
-    which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
-   
-    Contributors:
-    	Sébastien Gerard (CEA LIST) <sebastien.gerard@cea.fr> - Initial API and implementation
-        Yupanqui Munoz Julho (CEA LIST) <yupanqui.munozjulho@cea.fr> - initial API and implementation
- -->
+
 
 <plugin>
-   <extension point="org.eclipse.emf.ecore.generated_package">
-      <!-- @generated PapyrusRE_StandardUtils.modellibrary -->
-      <package
-            uri="http://www.eclipse.org/papyrus/requirements/sysml14/0.7.0/PapyrusRE/ModelLibrary/PapyrusREStandardUtils/RequirementClassificationConcerns"
-            class="org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementclassificationconcerns.RequirementClassificationConcernsPackage"
-            genModel="resources/modellibrary/PapyrusRE_StandardUtils.modellibrary.genmodel"/>
-   </extension>
-
-   <extension point="org.eclipse.emf.ecore.generated_package">
-      <!-- @generated PapyrusRE_StandardUtils.modellibrary -->
-      <package
-            uri="http://www.eclipse.org/papyrus/requirements/sysml14/0.7.0/PapyrusRE/ModelLibrary/PapyrusREStandardUtils/RequirementsCharacteristicsConcerns"
-            class="org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementscharacteristicsconcerns.RequirementsCharacteristicsConcernsPackage"
-            genModel="resources/modellibrary/PapyrusRE_StandardUtils.modellibrary.genmodel"/>
-   </extension>
-
-   <extension point="org.eclipse.emf.ecore.generated_package">
-      <!-- @generated PapyrusRE_StandardUtils.modellibrary -->
-      <package
-            uri="http://www.eclipse.org/papyrus/requirements/sysml14/0.7.0/PapyrusRE/ModelLibrary/PapyrusREStandardUtils/RequirementAndProcessConcerns"
-            class="org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.RequirementAndProcessConcernsPackage"
-            genModel="resources/modellibrary/PapyrusRE_StandardUtils.modellibrary.genmodel"/>
-   </extension>
-   
-   <extension point="org.eclipse.emf.ecore.generated_package">
-      <!-- @generated PapyrusRE_StandardUtils.modellibrary -->
-      <package
-            uri="http://www.eclipse.org/papyrus/requirements/sysml14/0.7.0/PapyrusRE/ModelLibrary/PapyrusREStandardUtils/PriorityAndImportanceConcerns"
-            class="org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.priorityandimportanceconcerns.PriorityAndImportanceConcernsPackage"
-            genModel="resources/modellibrary/PapyrusRE_StandardUtils.modellibrary.genmodel"/>
-   </extension>
-   
-   <extension point="org.eclipse.emf.ecore.generated_package">
-      <!-- @generated PapyrusRE_StandardUtils.modellibrary -->
-      <package
-            uri="http://www.eclipse.org/papyrus/requirements/sysml14/0.7.0/PapyrusRE/ModelLibrary/PapyrusREStandardUtils/VerificationAndValidationConcerns"
-            class="org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.verificationandvalidationconcerns.VerificationAndValidationConcernsPackage"
-            genModel="resources/modellibrary/PapyrusRE_StandardUtils.modellibrary.genmodel"/>
-   </extension>
-
-	<extension
+   <extension
          point="org.eclipse.emf.ecore.uri_mapping">
       <mapping
-            source="pathmap://PAPYRUSRE_STANDARDUTILS_MODELLIBARY/"
-            target="platform:/plugin/org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary/resources/modellibrary/">
+            source="pathmap://PAPYRUSRE_LIBRARIES/"
+            target="platform:/plugin/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/resources/modellibrary/">
       </mapping>
    </extension>
-   
-   <extension
-         point="org.eclipse.uml2.uml.generated_package">
-      <profile
-            location="pathmap://PAPYRUSRE_STANDARDUTILS_MODELLIBARY/PapyrusRE_StandardUtils.modellibrary.uml#_BZPAQFOQEeCXkoFpHlFAkw"
-            uri="http://www.eclipse.org/papyrus/requirements/sysml14/0.7.0/PapyrusRE/ModelLibrary/PapyrusREStandardUtils/RequirementClassificationConcerns">
-      </profile>
-   </extension>
-   
-   <extension
-         point="org.eclipse.uml2.uml.generated_package">
-      <profile
-            location="pathmap://PAPYRUSRE_STANDARDUTILS_MODELLIBARY/PapyrusRE_StandardUtils.modellibrary.uml#_hdrPUFOfEeCXkoFpHlFAkw"
-            uri="http://www.eclipse.org/papyrus/requirements/sysml14/0.7.0/PapyrusRE/ModelLibrary/PapyrusREStandardUtils/RequirementsCharacteristicsConcerns">
-      </profile>
-   </extension>
-   
-   <extension
-         point="org.eclipse.uml2.uml.generated_package">
-      <profile
-            location="pathmap://PAPYRUSRE_STANDARDUTILS_MODELLIBARY/PapyrusRE_StandardUtils.modellibrary.uml#_h4KL4FOfEeCXkoFpHlFAkw"
-            uri="http://www.eclipse.org/papyrus/requirements/sysml14/0.7.0/PapyrusRE/ModelLibrary/PapyrusREStandardUtils/PriorityAndImportanceConcerns">
-      </profile>
-   </extension>
-
-   <extension
-         point="org.eclipse.uml2.uml.generated_package">
-      <profile
-            location="pathmap://PAPYRUSRE_STANDARDUTILS_MODELLIBARY/PapyrusRE_StandardUtils.modellibrary.uml#_jGcj8FOfEeCXkoFpHlFAkw"
-            uri="http://www.eclipse.org/papyrus/requirements/sysml14/0.7.0/PapyrusRE/ModelLibrary/PapyrusREStandardUtils/RequirementAndProcessConcerns">
-      </profile>
-   </extension>
-
-   <extension
-         point="org.eclipse.uml2.uml.generated_package">
-      <profile
-            location="pathmap://PAPYRUSRE_STANDARDUTILS_MODELLIBARY/PapyrusRE_StandardUtils.modellibrary.uml#_jh-pYFOfEeCXkoFpHlFAkw"
-            uri="http://www.eclipse.org/papyrus/requirements/sysml14/0.7.0/PapyrusRE/ModelLibrary/PapyrusREStandardUtils/VerificationAndValidationConcerns">
-      </profile>
-   </extension>
+     <extension
+        point="org.eclipse.papyrus.uml.extensionpoints.UMLLibrary">
+     <library
+           description="Librarie for Requirements"
+           name="Papyrus Requirement Library"
+           path="pathmap://PAPYRUSRE_LIBRARIES/PapyrusRE_StandardUtils.modellibrary.uml"
+           provider="Eclipse Modeling Project">
+     </library>   
+</extension>   
    
 </plugin>
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/resources/modellibrary/PapyrusRE_StandardUtils.modellibrary.genmodel b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/resources/modellibrary/PapyrusRE_StandardUtils.modellibrary.genmodel
index 97a98a5..520fa90 100644
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/resources/modellibrary/PapyrusRE_StandardUtils.modellibrary.genmodel
+++ b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/resources/modellibrary/PapyrusRE_StandardUtils.modellibrary.genmodel
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:genmodel="http://www.eclipse.org/uml2/2.2.0/GenModel" copyrightText="Copyright (c) 2017 CEA LIST.&#xD;&#xA;&#xD;&#xA; All rights reserved. This program and the accompanying materials&#xD;&#xA; are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA; which accompanies this distribution, and is available at&#xD;&#xA; http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;  Sébastien Gerard (CEA LIST) &lt;sebastien.gerard@cea.fr> - Initial API and implementation&#xD;&#xA;  Yupanqui Munoz Julho (CEA LIST) &lt;yupanqui.munozjulho@cea.fr> - Initial API and implementation&#xD;&#xA;"
-    modelDirectory="/org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary/src-gen"
-    editDirectory="/org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.edit/src-gen"
-    editorDirectory="/org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.editor/src-gen"
-    modelPluginID="org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary"
-    modelName="PapyrusREStandardUtils" editPluginClass="org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.provider.PapyrusREStandardUtilsEditPlugin"
-    editorPluginClass="org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.presentation.PapyrusREStandardUtilsEditorPlugin"
+    xmlns:genmodel="http://www.eclipse.org/uml2/2.2.0/GenModel" copyrightText="  Copyright (c) 2020 CEA LIST and others.&#xA; &#xA;  All rights reserved. This program and the accompanying materials&#xA;  are made available under the terms of the Eclipse Public License 2.0&#xA;  which accompanies this distribution, and is available at&#xA;  http://www.eclipse.org/legal/epl-2.0/&#xA; &#xA;  SPDX-License-Identifier: EPL-2.0"
+    modelDirectory="/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen"
+    editDirectory="/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary.edit/src-gen"
+    editorDirectory="/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary.editor/src-gen"
+    modelPluginID="org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary"
+    modelName="PapyrusREStandardUtils" editPluginClass="org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary.papyrusrestandardutils.provider.PapyrusREStandardUtilsEditPlugin"
+    editorPluginClass="org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary.papyrusrestandardutils.presentation.PapyrusREStandardUtilsEditorPlugin"
     nonNLSMarkers="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    testsDirectory="/org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.tests/src-gen"
-    testSuiteClass="org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.tests.PapyrusREStandardUtilsAllTests"
+    testsDirectory="/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary.tests/src-gen"
+    testSuiteClass="org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary.papyrusrestandardutils.tests.PapyrusREStandardUtilsAllTests"
     importerID="org.eclipse.uml2.uml.ecore.importer" complianceLevel="8.0" copyrightFields="false"
+    editorPluginID="org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary.editor"
     operationReflection="true" importOrganizing="true">
   <genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/importer/org.eclipse.uml2.uml.ecore.importer">
     <details key="OPPOSITE_ROLE_NAMES" value="IGNORE"/>
@@ -37,131 +38,51 @@
     <details key="VALIDATION_DELEGATES" value="IGNORE"/>
   </genAnnotations>
   <foreignModel>PapyrusRE_StandardUtils.modellibrary.uml</foreignModel>
-  <genPackages xsi:type="genmodel:GenPackage" prefix="PapyrusREStandardUtils" basePackage="org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary"
+  <genPackages xsi:type="genmodel:GenPackage" prefix="PapyrusREStandardUtils" basePackage="org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary"
       disposableProviderFactory="true" ecorePackage="papyrusrestandardutils.ecore#/">
-    <nestedGenPackages xsi:type="genmodel:GenPackage" prefix="RequirementClassificationConcerns"
-        basePackage="org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils"
-        disposableProviderFactory="true" ecorePackage="papyrusrestandardutils.ecore#//requirementclassificationconcerns">
-      <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="papyrusrestandardutils.ecore#//requirementclassificationconcerns/QualityKind">
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementclassificationconcerns/QualityKind/Adaptability"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementclassificationconcerns/QualityKind/Availability"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementclassificationconcerns/QualityKind/Compatability"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementclassificationconcerns/QualityKind/Maintainability"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementclassificationconcerns/QualityKind/Portability"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementclassificationconcerns/QualityKind/Reliability"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementclassificationconcerns/QualityKind/Safety"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementclassificationconcerns/QualityKind/Security"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementclassificationconcerns/QualityKind/Usability"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementclassificationconcerns/QualityKind/Variability"/>
-      </genEnums>
-      <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="papyrusrestandardutils.ecore#//requirementclassificationconcerns/ConstraintKind">
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementclassificationconcerns/ConstraintKind/Cultural"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementclassificationconcerns/ConstraintKind/Design"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementclassificationconcerns/ConstraintKind/Environment"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementclassificationconcerns/ConstraintKind/Implementation"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementclassificationconcerns/ConstraintKind/Interface"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementclassificationconcerns/ConstraintKind/Physical"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementclassificationconcerns/ConstraintKind/Standard"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementclassificationconcerns/ConstraintKind/Other"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementclassificationconcerns/ConstraintKind/Undefined"/>
-      </genEnums>
-      <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="papyrusrestandardutils.ecore#//requirementclassificationconcerns/WorkloadCapacitiesKind">
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementclassificationconcerns/WorkloadCapacitiesKind/Bound"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementclassificationconcerns/WorkloadCapacitiesKind/Memory"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementclassificationconcerns/WorkloadCapacitiesKind/Speed"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementclassificationconcerns/WorkloadCapacitiesKind/Throughput"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementclassificationconcerns/WorkloadCapacitiesKind/Time"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementclassificationconcerns/WorkloadCapacitiesKind/Volume"/>
-      </genEnums>
+    <nestedGenPackages xsi:type="genmodel:GenPackage" prefix="QualityKind" disposableProviderFactory="true"
+        ecorePackage="papyrusrestandardutils.ecore#//QualityKind">
+      <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="papyrusrestandardutils.ecore#//QualityKind/Adaptability"/>
+      <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="papyrusrestandardutils.ecore#//QualityKind/Availability"/>
+      <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="papyrusrestandardutils.ecore#//QualityKind/Compatibility"/>
+      <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="papyrusrestandardutils.ecore#//QualityKind/Maintainability"/>
+      <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="papyrusrestandardutils.ecore#//QualityKind/Portability"/>
+      <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="papyrusrestandardutils.ecore#//QualityKind/Reliability"/>
+      <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="papyrusrestandardutils.ecore#//QualityKind/Safety"/>
+      <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="papyrusrestandardutils.ecore#//QualityKind/Security"/>
+      <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="papyrusrestandardutils.ecore#//QualityKind/Usability"/>
+      <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="papyrusrestandardutils.ecore#//QualityKind/Variability"/>
     </nestedGenPackages>
-    <nestedGenPackages xsi:type="genmodel:GenPackage" prefix="RequirementsCharacteristicsConcerns"
-        basePackage="org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils"
-        disposableProviderFactory="true" ecorePackage="papyrusrestandardutils.ecore#//requirementscharacteristicsconcerns">
-      <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="papyrusrestandardutils.ecore#//requirementscharacteristicsconcerns/LifeCyclePhaseKind">
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementscharacteristicsconcerns/LifeCyclePhaseKind/PreConcept"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementscharacteristicsconcerns/LifeCyclePhaseKind/Concept"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementscharacteristicsconcerns/LifeCyclePhaseKind/Development"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementscharacteristicsconcerns/LifeCyclePhaseKind/Manufacturing"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementscharacteristicsconcerns/LifeCyclePhaseKind/Integration"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementscharacteristicsconcerns/LifeCyclePhaseKind/Test"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementscharacteristicsconcerns/LifeCyclePhaseKind/Deployment"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementscharacteristicsconcerns/LifeCyclePhaseKind/Delivery"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementscharacteristicsconcerns/LifeCyclePhaseKind/Installation"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementscharacteristicsconcerns/LifeCyclePhaseKind/Operation"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementscharacteristicsconcerns/LifeCyclePhaseKind/Support"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementscharacteristicsconcerns/LifeCyclePhaseKind/Disposal"/>
-      </genEnums>
-      <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="papyrusrestandardutils.ecore#//requirementscharacteristicsconcerns/AbstractionLevelKind">
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementscharacteristicsconcerns/AbstractionLevelKind/SpecificationLevel"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementscharacteristicsconcerns/AbstractionLevelKind/AnalysisLevel"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementscharacteristicsconcerns/AbstractionLevelKind/DesignLevel"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementscharacteristicsconcerns/AbstractionLevelKind/ImplementationLevel"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementscharacteristicsconcerns/AbstractionLevelKind/Specfication_level"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementscharacteristicsconcerns/AbstractionLevelKind/OperationalLevel"/>
-      </genEnums>
+    <nestedGenPackages xsi:type="genmodel:GenPackage" prefix="ConstraintKind" disposableProviderFactory="true"
+        ecorePackage="papyrusrestandardutils.ecore#//ConstraintKind">
+      <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="papyrusrestandardutils.ecore#//ConstraintKind/Cultural"/>
+      <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="papyrusrestandardutils.ecore#//ConstraintKind/Design"/>
+      <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="papyrusrestandardutils.ecore#//ConstraintKind/Environment"/>
+      <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="papyrusrestandardutils.ecore#//ConstraintKind/Implementation"/>
+      <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="papyrusrestandardutils.ecore#//ConstraintKind/Interface"/>
+      <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="papyrusrestandardutils.ecore#//ConstraintKind/Physical"/>
+      <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="papyrusrestandardutils.ecore#//ConstraintKind/Standard"/>
     </nestedGenPackages>
-    <nestedGenPackages xsi:type="genmodel:GenPackage" prefix="PriorityAndImportanceConcerns"
-        basePackage="org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils"
-        disposableProviderFactory="true" ecorePackage="papyrusrestandardutils.ecore#//priorityandimportanceconcerns">
-      <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="papyrusrestandardutils.ecore#//priorityandimportanceconcerns/PriorityKind">
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//priorityandimportanceconcerns/PriorityKind/Mandatory"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//priorityandimportanceconcerns/PriorityKind/Optional"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//priorityandimportanceconcerns/PriorityKind/NotDefined"/>
-      </genEnums>
-      <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="papyrusrestandardutils.ecore#//priorityandimportanceconcerns/ImportanceKind">
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//priorityandimportanceconcerns/ImportanceKind/Importance1"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//priorityandimportanceconcerns/ImportanceKind/Importance2"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//priorityandimportanceconcerns/ImportanceKind/Importance3"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//priorityandimportanceconcerns/ImportanceKind/Importance4"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//priorityandimportanceconcerns/ImportanceKind/Importance5"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//priorityandimportanceconcerns/ImportanceKind/Importance6"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//priorityandimportanceconcerns/ImportanceKind/Importance7"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//priorityandimportanceconcerns/ImportanceKind/Importance8"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//priorityandimportanceconcerns/ImportanceKind/Importance9"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//priorityandimportanceconcerns/ImportanceKind/Importance10"/>
-      </genEnums>
+    <nestedGenPackages xsi:type="genmodel:GenPackage" prefix="LevelKind" disposableProviderFactory="true"
+        ecorePackage="papyrusrestandardutils.ecore#//LevelKind">
+      <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="papyrusrestandardutils.ecore#//LevelKind/System"/>
+      <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="papyrusrestandardutils.ecore#//LevelKind/Domain"/>
+      <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="papyrusrestandardutils.ecore#//LevelKind/Business"/>
     </nestedGenPackages>
-    <nestedGenPackages xsi:type="genmodel:GenPackage" prefix="RequirementAndProcessConcerns"
-        basePackage="org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils"
-        disposableProviderFactory="true" ecorePackage="papyrusrestandardutils.ecore#//requirementandprocessconcerns">
-      <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="papyrusrestandardutils.ecore#//requirementandprocessconcerns/AgreementStatusKind">
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementandprocessconcerns/AgreementStatusKind/Submitted"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementandprocessconcerns/AgreementStatusKind/ToBeRefined"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementandprocessconcerns/AgreementStatusKind/Accepted"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementandprocessconcerns/AgreementStatusKind/Draft"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementandprocessconcerns/AgreementStatusKind/Rejected"/>
-      </genEnums>
-      <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="papyrusrestandardutils.ecore#//requirementandprocessconcerns/QualificationStatusKind">
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementandprocessconcerns/QualificationStatusKind/NotQualified"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementandprocessconcerns/QualificationStatusKind/Qualified"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementandprocessconcerns/QualificationStatusKind/Suspect"/>
-      </genEnums>
-      <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="papyrusrestandardutils.ecore#//requirementandprocessconcerns/SatisfactionStatusKind">
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementandprocessconcerns/SatisfactionStatusKind/NotSatisfied"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementandprocessconcerns/SatisfactionStatusKind/Satisfied"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementandprocessconcerns/SatisfactionStatusKind/Suspect"/>
-      </genEnums>
-      <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="papyrusrestandardutils.ecore#//requirementandprocessconcerns/ReviewStatusKind">
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementandprocessconcerns/ReviewStatusKind/ToBeReviewed"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementandprocessconcerns/ReviewStatusKind/Accepted"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//requirementandprocessconcerns/ReviewStatusKind/Rejected"/>
-      </genEnums>
+    <nestedGenPackages xsi:type="genmodel:GenPackage" prefix="StatusKind" disposableProviderFactory="true"
+        ecorePackage="papyrusrestandardutils.ecore#//StatusKind">
+      <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="papyrusrestandardutils.ecore#//StatusKind/Draft"/>
+      <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="papyrusrestandardutils.ecore#//StatusKind/Submitted"/>
+      <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="papyrusrestandardutils.ecore#//StatusKind/ToBeRefined"/>
+      <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="papyrusrestandardutils.ecore#//StatusKind/Accepted"/>
+      <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="papyrusrestandardutils.ecore#//StatusKind/Rejected"/>
+      <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="papyrusrestandardutils.ecore#//StatusKind/Conflicting"/>
     </nestedGenPackages>
-    <nestedGenPackages xsi:type="genmodel:GenPackage" prefix="VerificationAndValidationConcerns"
-        basePackage="org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils"
-        disposableProviderFactory="true" ecorePackage="papyrusrestandardutils.ecore#//verificationandvalidationconcerns">
-      <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="papyrusrestandardutils.ecore#//verificationandvalidationconcerns/VV_MethodKind">
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//verificationandvalidationconcerns/VV_MethodKind/Analysis"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//verificationandvalidationconcerns/VV_MethodKind/Inspection"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//verificationandvalidationconcerns/VV_MethodKind/SystemTest"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//verificationandvalidationconcerns/VV_MethodKind/ComponentTest"/>
-      </genEnums>
-      <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="papyrusrestandardutils.ecore#//verificationandvalidationconcerns/VV_StatusKind">
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//verificationandvalidationconcerns/VV_StatusKind/Pending"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//verificationandvalidationconcerns/VV_StatusKind/Passed"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//verificationandvalidationconcerns/VV_StatusKind/Failed"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="papyrusrestandardutils.ecore#//verificationandvalidationconcerns/VV_StatusKind/Inconclusive"/>
-      </genEnums>
+    <nestedGenPackages xsi:type="genmodel:GenPackage" prefix="RequirementSourceKind"
+        disposableProviderFactory="true" ecorePackage="papyrusrestandardutils.ecore#//RequirementSourceKind">
+      <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="papyrusrestandardutils.ecore#//RequirementSourceKind/Stakeholders"/>
+      <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="papyrusrestandardutils.ecore#//RequirementSourceKind/Document"/>
+      <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="papyrusrestandardutils.ecore#//RequirementSourceKind/SystemInOperation"/>
     </nestedGenPackages>
   </genPackages>
 </genmodel:GenModel>
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/resources/modellibrary/PapyrusRE_StandardUtils.modellibrary.notation b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/resources/modellibrary/PapyrusRE_StandardUtils.modellibrary.notation
index bf9abab..a8fc7b5 100644
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/resources/modellibrary/PapyrusRE_StandardUtils.modellibrary.notation
+++ b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/resources/modellibrary/PapyrusRE_StandardUtils.modellibrary.notation
@@ -1,2 +1,1145 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
+<xmi:XMI 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">
+  <notation:Diagram xmi:id="_WHN98DW1Ee2vDLwjKYNI0Q" type="PapyrusUMLClassDiagram" name="NewClassDiagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_XxwNIDW1Ee2vDLwjKYNI0Q" type="PrimitiveType_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_XxxbQDW1Ee2vDLwjKYNI0Q" type="PrimitiveType_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_XxxbQTW1Ee2vDLwjKYNI0Q" type="PrimitiveType_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_XxxbQjW1Ee2vDLwjKYNI0Q" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_XxyCUDW1Ee2vDLwjKYNI0Q" type="PrimitiveType_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_XxyCUTW1Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_XxyCUjW1Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_XxyCUzW1Ee2vDLwjKYNI0Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XxyCVDW1Ee2vDLwjKYNI0Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_XxyCVTW1Ee2vDLwjKYNI0Q" type="PrimitiveType_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_XxyCVjW1Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_XxyCVzW1Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_XxyCWDW1Ee2vDLwjKYNI0Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XxyCWTW1Ee2vDLwjKYNI0Q"/>
+      </children>
+      <element xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_XxsiwDW1Ee2vDLwjKYNI0Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XxwNITW1Ee2vDLwjKYNI0Q" x="40" y="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_X5ksYDW1Ee2vDLwjKYNI0Q" type="PrimitiveType_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_X5l6gDW1Ee2vDLwjKYNI0Q" type="PrimitiveType_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_X5l6gTW1Ee2vDLwjKYNI0Q" type="PrimitiveType_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_X5l6gjW1Ee2vDLwjKYNI0Q" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_X5mhkDW1Ee2vDLwjKYNI0Q" type="PrimitiveType_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_X5mhkTW1Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_X5mhkjW1Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_X5mhkzW1Ee2vDLwjKYNI0Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X5mhlDW1Ee2vDLwjKYNI0Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_X5mhlTW1Ee2vDLwjKYNI0Q" type="PrimitiveType_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_X5mhljW1Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_X5mhlzW1Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_X5mhmDW1Ee2vDLwjKYNI0Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X5mhmTW1Ee2vDLwjKYNI0Q"/>
+      </children>
+      <element xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_X5i3MDW1Ee2vDLwjKYNI0Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X5ksYTW1Ee2vDLwjKYNI0Q" x="200" y="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_YA74oDW1Ee2vDLwjKYNI0Q" type="PrimitiveType_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_YA74ojW1Ee2vDLwjKYNI0Q" type="PrimitiveType_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_YA74ozW1Ee2vDLwjKYNI0Q" type="PrimitiveType_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_YA74pDW1Ee2vDLwjKYNI0Q" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_YA8fsDW1Ee2vDLwjKYNI0Q" type="PrimitiveType_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_YA8fsTW1Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_YA8fsjW1Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_YA8fszW1Ee2vDLwjKYNI0Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YA8ftDW1Ee2vDLwjKYNI0Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_YA8ftTW1Ee2vDLwjKYNI0Q" type="PrimitiveType_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_YA8ftjW1Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_YA8ftzW1Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_YA8fuDW1Ee2vDLwjKYNI0Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YA8fuTW1Ee2vDLwjKYNI0Q"/>
+      </children>
+      <element xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_YA6DcDW1Ee2vDLwjKYNI0Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YA74oTW1Ee2vDLwjKYNI0Q" x="360" y="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_YHHZIDW1Ee2vDLwjKYNI0Q" type="PrimitiveType_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_YHHZIjW1Ee2vDLwjKYNI0Q" type="PrimitiveType_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_YHHZIzW1Ee2vDLwjKYNI0Q" type="PrimitiveType_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_YHHZJDW1Ee2vDLwjKYNI0Q" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_YHHZJTW1Ee2vDLwjKYNI0Q" type="PrimitiveType_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_YHHZJjW1Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_YHHZJzW1Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_YHHZKDW1Ee2vDLwjKYNI0Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YHHZKTW1Ee2vDLwjKYNI0Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_YHHZKjW1Ee2vDLwjKYNI0Q" type="PrimitiveType_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_YHHZKzW1Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_YHHZLDW1Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_YHHZLTW1Ee2vDLwjKYNI0Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YHHZLjW1Ee2vDLwjKYNI0Q"/>
+      </children>
+      <element xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_YHGLADW1Ee2vDLwjKYNI0Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YHHZITW1Ee2vDLwjKYNI0Q" x="540" y="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_YN8Z4DW1Ee2vDLwjKYNI0Q" type="PrimitiveType_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_YN8Z4jW1Ee2vDLwjKYNI0Q" type="PrimitiveType_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_YN8Z4zW1Ee2vDLwjKYNI0Q" type="PrimitiveType_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_YN8Z5DW1Ee2vDLwjKYNI0Q" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_YN9A8DW1Ee2vDLwjKYNI0Q" type="PrimitiveType_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_YN9A8TW1Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_YN9A8jW1Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_YN9A8zW1Ee2vDLwjKYNI0Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YN9A9DW1Ee2vDLwjKYNI0Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_YN9A9TW1Ee2vDLwjKYNI0Q" type="PrimitiveType_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_YN9A9jW1Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_YN9A9zW1Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_YN9A-DW1Ee2vDLwjKYNI0Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YN9A-TW1Ee2vDLwjKYNI0Q"/>
+      </children>
+      <element xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_YN7LwDW1Ee2vDLwjKYNI0Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YN8Z4TW1Ee2vDLwjKYNI0Q" x="700" y="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_ZRorgDW1Ee2vDLwjKYNI0Q" type="PrimitiveType_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ZRpSkDW1Ee2vDLwjKYNI0Q" type="PrimitiveType_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ZRpSkTW1Ee2vDLwjKYNI0Q" type="PrimitiveType_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZRpSkjW1Ee2vDLwjKYNI0Q" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_ZRpSkzW1Ee2vDLwjKYNI0Q" type="PrimitiveType_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_ZRpSlDW1Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_ZRpSlTW1Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_ZRpSljW1Ee2vDLwjKYNI0Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZRpSlzW1Ee2vDLwjKYNI0Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_ZRpSmDW1Ee2vDLwjKYNI0Q" type="PrimitiveType_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_ZRpSmTW1Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_ZRpSmjW1Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_ZRpSmzW1Ee2vDLwjKYNI0Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZRpSnDW1Ee2vDLwjKYNI0Q"/>
+      </children>
+      <element xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_ZRm2UDW1Ee2vDLwjKYNI0Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZRorgTW1Ee2vDLwjKYNI0Q" x="880" y="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_ZaBygDW1Ee2vDLwjKYNI0Q" type="PrimitiveType_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ZaCZkDW1Ee2vDLwjKYNI0Q" type="PrimitiveType_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ZaCZkTW1Ee2vDLwjKYNI0Q" type="PrimitiveType_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZaCZkjW1Ee2vDLwjKYNI0Q" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_ZaCZkzW1Ee2vDLwjKYNI0Q" type="PrimitiveType_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_ZaCZlDW1Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_ZaCZlTW1Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_ZaCZljW1Ee2vDLwjKYNI0Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZaCZlzW1Ee2vDLwjKYNI0Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_ZaCZmDW1Ee2vDLwjKYNI0Q" type="PrimitiveType_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_ZaCZmTW1Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_ZaCZmjW1Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_ZaCZmzW1Ee2vDLwjKYNI0Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZaCZnDW1Ee2vDLwjKYNI0Q"/>
+      </children>
+      <element xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_ZZ_9UDW1Ee2vDLwjKYNI0Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZaBygTW1Ee2vDLwjKYNI0Q" x="1040" y="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_ZiDtIDW1Ee2vDLwjKYNI0Q" type="PrimitiveType_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_ZiEUMDW1Ee2vDLwjKYNI0Q" type="PrimitiveType_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ZiEUMTW1Ee2vDLwjKYNI0Q" type="PrimitiveType_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZiEUMjW1Ee2vDLwjKYNI0Q" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_ZiEUMzW1Ee2vDLwjKYNI0Q" type="PrimitiveType_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_ZiEUNDW1Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_ZiEUNTW1Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_ZiEUNjW1Ee2vDLwjKYNI0Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZiEUNzW1Ee2vDLwjKYNI0Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_ZiEUODW1Ee2vDLwjKYNI0Q" type="PrimitiveType_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_ZiEUOTW1Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_ZiEUOjW1Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_ZiEUOzW1Ee2vDLwjKYNI0Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZiEUPDW1Ee2vDLwjKYNI0Q"/>
+      </children>
+      <element xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_ZiCfADW1Ee2vDLwjKYNI0Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZiDtITW1Ee2vDLwjKYNI0Q" x="1220" y="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_Zr1UMDW1Ee2vDLwjKYNI0Q" type="PrimitiveType_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Zr1UMjW1Ee2vDLwjKYNI0Q" type="PrimitiveType_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Zr1UMzW1Ee2vDLwjKYNI0Q" type="PrimitiveType_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Zr17QDW1Ee2vDLwjKYNI0Q" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Zr17QTW1Ee2vDLwjKYNI0Q" type="PrimitiveType_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Zr17QjW1Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Zr17QzW1Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Zr17RDW1Ee2vDLwjKYNI0Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Zr17RTW1Ee2vDLwjKYNI0Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Zr17RjW1Ee2vDLwjKYNI0Q" type="PrimitiveType_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Zr17RzW1Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Zr17SDW1Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Zr17STW1Ee2vDLwjKYNI0Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Zr17SjW1Ee2vDLwjKYNI0Q"/>
+      </children>
+      <element xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_Zr0GEDW1Ee2vDLwjKYNI0Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Zr1UMTW1Ee2vDLwjKYNI0Q" x="1380" y="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_Z1zvkDW1Ee2vDLwjKYNI0Q" type="PrimitiveType_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Z1zvkjW1Ee2vDLwjKYNI0Q" type="PrimitiveType_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Z1zvkzW1Ee2vDLwjKYNI0Q" type="PrimitiveType_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Z1zvlDW1Ee2vDLwjKYNI0Q" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Z1zvlTW1Ee2vDLwjKYNI0Q" type="PrimitiveType_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Z1zvljW1Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Z1zvlzW1Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Z1zvmDW1Ee2vDLwjKYNI0Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z1zvmTW1Ee2vDLwjKYNI0Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Z1zvmjW1Ee2vDLwjKYNI0Q" type="PrimitiveType_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Z1zvmzW1Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Z1zvnDW1Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Z1zvnTW1Ee2vDLwjKYNI0Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z1zvnjW1Ee2vDLwjKYNI0Q"/>
+      </children>
+      <element xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_Z1yhcDW1Ee2vDLwjKYNI0Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z1zvkTW1Ee2vDLwjKYNI0Q" x="1560" y="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_mP6EUDgcEe2OmLtrWap8Dg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_mP6EUTgcEe2OmLtrWap8Dg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mP6EUzgcEe2OmLtrWap8Dg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_XxsiwDW1Ee2vDLwjKYNI0Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mP6EUjgcEe2OmLtrWap8Dg" x="240" y="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_mP-80zgcEe2OmLtrWap8Dg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_mP-81DgcEe2OmLtrWap8Dg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mP_j4DgcEe2OmLtrWap8Dg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_X5i3MDW1Ee2vDLwjKYNI0Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mP-81TgcEe2OmLtrWap8Dg" x="400" y="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_mQFDcDgcEe2OmLtrWap8Dg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_mQFDcTgcEe2OmLtrWap8Dg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mQFDczgcEe2OmLtrWap8Dg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_YA6DcDW1Ee2vDLwjKYNI0Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mQFDcjgcEe2OmLtrWap8Dg" x="560" y="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_mQKjADgcEe2OmLtrWap8Dg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_mQKjATgcEe2OmLtrWap8Dg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mQKjAzgcEe2OmLtrWap8Dg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_YHGLADW1Ee2vDLwjKYNI0Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mQKjAjgcEe2OmLtrWap8Dg" x="740" y="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_mQR3wDgcEe2OmLtrWap8Dg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_mQR3wTgcEe2OmLtrWap8Dg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mQR3wzgcEe2OmLtrWap8Dg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_YN7LwDW1Ee2vDLwjKYNI0Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mQR3wjgcEe2OmLtrWap8Dg" x="900" y="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_mQYlcDgcEe2OmLtrWap8Dg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_mQYlcTgcEe2OmLtrWap8Dg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mQYlczgcEe2OmLtrWap8Dg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_ZRm2UDW1Ee2vDLwjKYNI0Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mQYlcjgcEe2OmLtrWap8Dg" x="1080" y="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_mQf6MDgcEe2OmLtrWap8Dg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_mQf6MTgcEe2OmLtrWap8Dg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mQf6MzgcEe2OmLtrWap8Dg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_ZZ_9UDW1Ee2vDLwjKYNI0Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mQf6MjgcEe2OmLtrWap8Dg" x="1240" y="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_mQlZwDgcEe2OmLtrWap8Dg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_mQlZwTgcEe2OmLtrWap8Dg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mQlZwzgcEe2OmLtrWap8Dg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_ZiCfADW1Ee2vDLwjKYNI0Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mQlZwjgcEe2OmLtrWap8Dg" x="1420" y="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_mQrgYDgcEe2OmLtrWap8Dg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_mQrgYTgcEe2OmLtrWap8Dg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mQrgYzgcEe2OmLtrWap8Dg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_Zr0GEDW1Ee2vDLwjKYNI0Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mQrgYjgcEe2OmLtrWap8Dg" x="1580" y="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_mQxnADgcEe2OmLtrWap8Dg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_mQxnATgcEe2OmLtrWap8Dg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mQxnAzgcEe2OmLtrWap8Dg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_Z1yhcDW1Ee2vDLwjKYNI0Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mQxnAjgcEe2OmLtrWap8Dg" x="1760" y="40"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_WHN98TW1Ee2vDLwjKYNI0Q" name="diagram_compatibility_version" stringValue="1.4.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_WHN98jW1Ee2vDLwjKYNI0Q"/>
+    <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_WHN98zW1Ee2vDLwjKYNI0Q" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
+      <owner xmi:type="uml:Package" href="PapyrusRE_StandardUtils.modellibrary.uml#_TfOoADW1Ee2vDLwjKYNI0Q"/>
+    </styles>
+    <element xmi:type="uml:Package" href="PapyrusRE_StandardUtils.modellibrary.uml#_TfOoADW1Ee2vDLwjKYNI0Q"/>
+    <edges xmi:type="notation:Connector" xmi:id="_mP6EVDgcEe2OmLtrWap8Dg" type="StereotypeCommentLink" source="_XxwNIDW1Ee2vDLwjKYNI0Q" target="_mP6EUDgcEe2OmLtrWap8Dg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_mP6EVTgcEe2OmLtrWap8Dg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mP6EWTgcEe2OmLtrWap8Dg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_XxsiwDW1Ee2vDLwjKYNI0Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mP6EVjgcEe2OmLtrWap8Dg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mP6EVzgcEe2OmLtrWap8Dg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mP6EWDgcEe2OmLtrWap8Dg"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_mP_j4TgcEe2OmLtrWap8Dg" type="StereotypeCommentLink" source="_X5ksYDW1Ee2vDLwjKYNI0Q" target="_mP-80zgcEe2OmLtrWap8Dg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_mP_j4jgcEe2OmLtrWap8Dg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mP_j5jgcEe2OmLtrWap8Dg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_X5i3MDW1Ee2vDLwjKYNI0Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mP_j4zgcEe2OmLtrWap8Dg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mP_j5DgcEe2OmLtrWap8Dg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mP_j5TgcEe2OmLtrWap8Dg"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_mQFDdDgcEe2OmLtrWap8Dg" type="StereotypeCommentLink" source="_YA74oDW1Ee2vDLwjKYNI0Q" target="_mQFDcDgcEe2OmLtrWap8Dg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_mQFDdTgcEe2OmLtrWap8Dg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mQFDeTgcEe2OmLtrWap8Dg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_YA6DcDW1Ee2vDLwjKYNI0Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mQFDdjgcEe2OmLtrWap8Dg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mQFDdzgcEe2OmLtrWap8Dg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mQFDeDgcEe2OmLtrWap8Dg"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_mQKjBDgcEe2OmLtrWap8Dg" type="StereotypeCommentLink" source="_YHHZIDW1Ee2vDLwjKYNI0Q" target="_mQKjADgcEe2OmLtrWap8Dg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_mQKjBTgcEe2OmLtrWap8Dg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mQKjCTgcEe2OmLtrWap8Dg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_YHGLADW1Ee2vDLwjKYNI0Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mQKjBjgcEe2OmLtrWap8Dg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mQKjBzgcEe2OmLtrWap8Dg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mQKjCDgcEe2OmLtrWap8Dg"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_mQR3xDgcEe2OmLtrWap8Dg" type="StereotypeCommentLink" source="_YN8Z4DW1Ee2vDLwjKYNI0Q" target="_mQR3wDgcEe2OmLtrWap8Dg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_mQR3xTgcEe2OmLtrWap8Dg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mQR3yTgcEe2OmLtrWap8Dg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_YN7LwDW1Ee2vDLwjKYNI0Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mQR3xjgcEe2OmLtrWap8Dg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mQR3xzgcEe2OmLtrWap8Dg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mQR3yDgcEe2OmLtrWap8Dg"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_mQYldDgcEe2OmLtrWap8Dg" type="StereotypeCommentLink" source="_ZRorgDW1Ee2vDLwjKYNI0Q" target="_mQYlcDgcEe2OmLtrWap8Dg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_mQYldTgcEe2OmLtrWap8Dg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mQZMgjgcEe2OmLtrWap8Dg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_ZRm2UDW1Ee2vDLwjKYNI0Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mQYldjgcEe2OmLtrWap8Dg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mQZMgDgcEe2OmLtrWap8Dg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mQZMgTgcEe2OmLtrWap8Dg"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_mQf6NDgcEe2OmLtrWap8Dg" type="StereotypeCommentLink" source="_ZaBygDW1Ee2vDLwjKYNI0Q" target="_mQf6MDgcEe2OmLtrWap8Dg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_mQf6NTgcEe2OmLtrWap8Dg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mQf6OTgcEe2OmLtrWap8Dg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_ZZ_9UDW1Ee2vDLwjKYNI0Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mQf6NjgcEe2OmLtrWap8Dg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mQf6NzgcEe2OmLtrWap8Dg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mQf6ODgcEe2OmLtrWap8Dg"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_mQlZxDgcEe2OmLtrWap8Dg" type="StereotypeCommentLink" source="_ZiDtIDW1Ee2vDLwjKYNI0Q" target="_mQlZwDgcEe2OmLtrWap8Dg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_mQlZxTgcEe2OmLtrWap8Dg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mQlZyTgcEe2OmLtrWap8Dg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_ZiCfADW1Ee2vDLwjKYNI0Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mQlZxjgcEe2OmLtrWap8Dg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mQlZxzgcEe2OmLtrWap8Dg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mQlZyDgcEe2OmLtrWap8Dg"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_mQrgZDgcEe2OmLtrWap8Dg" type="StereotypeCommentLink" source="_Zr1UMDW1Ee2vDLwjKYNI0Q" target="_mQrgYDgcEe2OmLtrWap8Dg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_mQrgZTgcEe2OmLtrWap8Dg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mQrgaTgcEe2OmLtrWap8Dg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_Zr0GEDW1Ee2vDLwjKYNI0Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mQrgZjgcEe2OmLtrWap8Dg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mQrgZzgcEe2OmLtrWap8Dg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mQrgaDgcEe2OmLtrWap8Dg"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_mQxnBDgcEe2OmLtrWap8Dg" type="StereotypeCommentLink" source="_Z1zvkDW1Ee2vDLwjKYNI0Q" target="_mQxnADgcEe2OmLtrWap8Dg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_mQxnBTgcEe2OmLtrWap8Dg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_mQxnCTgcEe2OmLtrWap8Dg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_Z1yhcDW1Ee2vDLwjKYNI0Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mQxnBjgcEe2OmLtrWap8Dg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mQxnBzgcEe2OmLtrWap8Dg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mQxnCDgcEe2OmLtrWap8Dg"/>
+    </edges>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_El1f8DW3Ee2vDLwjKYNI0Q" type="PapyrusUMLClassDiagram" name="ConstraintKind" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_G2JVsDW3Ee2vDLwjKYNI0Q" type="PrimitiveType_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_G2JVsjW3Ee2vDLwjKYNI0Q" type="PrimitiveType_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_G2JVszW3Ee2vDLwjKYNI0Q" type="PrimitiveType_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_G2JVtDW3Ee2vDLwjKYNI0Q" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_G2JVtTW3Ee2vDLwjKYNI0Q" type="PrimitiveType_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_G2JVtjW3Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_G2JVtzW3Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_G2JVuDW3Ee2vDLwjKYNI0Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_G2JVuTW3Ee2vDLwjKYNI0Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_G2JVujW3Ee2vDLwjKYNI0Q" type="PrimitiveType_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_G2JVuzW3Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_G2JVvDW3Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_G2JVvTW3Ee2vDLwjKYNI0Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_G2JVvjW3Ee2vDLwjKYNI0Q"/>
+      </children>
+      <element xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_G2IHkDW3Ee2vDLwjKYNI0Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_G2JVsTW3Ee2vDLwjKYNI0Q" x="40" y="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_G8lU4DW3Ee2vDLwjKYNI0Q" type="PrimitiveType_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_G8l78DW3Ee2vDLwjKYNI0Q" type="PrimitiveType_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_G8l78TW3Ee2vDLwjKYNI0Q" type="PrimitiveType_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_G8l78jW3Ee2vDLwjKYNI0Q" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_G8l78zW3Ee2vDLwjKYNI0Q" type="PrimitiveType_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_G8l79DW3Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_G8l79TW3Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_G8l79jW3Ee2vDLwjKYNI0Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_G8l79zW3Ee2vDLwjKYNI0Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_G8l7-DW3Ee2vDLwjKYNI0Q" type="PrimitiveType_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_G8l7-TW3Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_G8l7-jW3Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_G8l7-zW3Ee2vDLwjKYNI0Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_G8l7_DW3Ee2vDLwjKYNI0Q"/>
+      </children>
+      <element xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_G8kt0DW3Ee2vDLwjKYNI0Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_G8lU4TW3Ee2vDLwjKYNI0Q" x="200" y="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_HDMTMDW3Ee2vDLwjKYNI0Q" type="PrimitiveType_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_HDMTMjW3Ee2vDLwjKYNI0Q" type="PrimitiveType_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_HDMTMzW3Ee2vDLwjKYNI0Q" type="PrimitiveType_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_HDMTNDW3Ee2vDLwjKYNI0Q" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_HDMTNTW3Ee2vDLwjKYNI0Q" type="PrimitiveType_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_HDMTNjW3Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_HDMTNzW3Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_HDMTODW3Ee2vDLwjKYNI0Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HDMTOTW3Ee2vDLwjKYNI0Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_HDMTOjW3Ee2vDLwjKYNI0Q" type="PrimitiveType_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_HDMTOzW3Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_HDMTPDW3Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_HDMTPTW3Ee2vDLwjKYNI0Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HDMTPjW3Ee2vDLwjKYNI0Q"/>
+      </children>
+      <element xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_HDLFEDW3Ee2vDLwjKYNI0Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HDMTMTW3Ee2vDLwjKYNI0Q" x="360" y="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_HKqNIDW3Ee2vDLwjKYNI0Q" type="PrimitiveType_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_HKqNIjW3Ee2vDLwjKYNI0Q" type="PrimitiveType_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_HKqNIzW3Ee2vDLwjKYNI0Q" type="PrimitiveType_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_HKqNJDW3Ee2vDLwjKYNI0Q" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_HKqNJTW3Ee2vDLwjKYNI0Q" type="PrimitiveType_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_HKqNJjW3Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_HKqNJzW3Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_HKqNKDW3Ee2vDLwjKYNI0Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HKqNKTW3Ee2vDLwjKYNI0Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_HKqNKjW3Ee2vDLwjKYNI0Q" type="PrimitiveType_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_HKqNKzW3Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_HKqNLDW3Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_HKqNLTW3Ee2vDLwjKYNI0Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HKqNLjW3Ee2vDLwjKYNI0Q"/>
+      </children>
+      <element xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_HKo_ADW3Ee2vDLwjKYNI0Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HKqNITW3Ee2vDLwjKYNI0Q" x="540" y="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_Hb1csDW3Ee2vDLwjKYNI0Q" type="PrimitiveType_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Hb2DwDW3Ee2vDLwjKYNI0Q" type="PrimitiveType_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Hb2DwTW3Ee2vDLwjKYNI0Q" type="PrimitiveType_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Hb2DwjW3Ee2vDLwjKYNI0Q" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Hb2DwzW3Ee2vDLwjKYNI0Q" type="PrimitiveType_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Hb2DxDW3Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Hb2DxTW3Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Hb2DxjW3Ee2vDLwjKYNI0Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Hb2DxzW3Ee2vDLwjKYNI0Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Hb2DyDW3Ee2vDLwjKYNI0Q" type="PrimitiveType_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Hb2DyTW3Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Hb2DyjW3Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Hb2DyzW3Ee2vDLwjKYNI0Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Hb2DzDW3Ee2vDLwjKYNI0Q"/>
+      </children>
+      <element xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_Hb01oDW3Ee2vDLwjKYNI0Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Hb1csTW3Ee2vDLwjKYNI0Q" x="700" y="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_HjrxIDW3Ee2vDLwjKYNI0Q" type="PrimitiveType_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_HjrxIjW3Ee2vDLwjKYNI0Q" type="PrimitiveType_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_HjrxIzW3Ee2vDLwjKYNI0Q" type="PrimitiveType_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_HjrxJDW3Ee2vDLwjKYNI0Q" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_HjrxJTW3Ee2vDLwjKYNI0Q" type="PrimitiveType_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_HjrxJjW3Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_HjrxJzW3Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_HjrxKDW3Ee2vDLwjKYNI0Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HjrxKTW3Ee2vDLwjKYNI0Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_HjrxKjW3Ee2vDLwjKYNI0Q" type="PrimitiveType_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_HjrxKzW3Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_HjrxLDW3Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_HjrxLTW3Ee2vDLwjKYNI0Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HjrxLjW3Ee2vDLwjKYNI0Q"/>
+      </children>
+      <element xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_HjqjADW3Ee2vDLwjKYNI0Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HjrxITW3Ee2vDLwjKYNI0Q" x="880" y="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_HrNVcDW3Ee2vDLwjKYNI0Q" type="PrimitiveType_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_HrN8gDW3Ee2vDLwjKYNI0Q" type="PrimitiveType_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_HrN8gTW3Ee2vDLwjKYNI0Q" type="PrimitiveType_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_HrN8gjW3Ee2vDLwjKYNI0Q" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_HrN8gzW3Ee2vDLwjKYNI0Q" type="PrimitiveType_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_HrN8hDW3Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_HrN8hTW3Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_HrN8hjW3Ee2vDLwjKYNI0Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HrN8hzW3Ee2vDLwjKYNI0Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_HrN8iDW3Ee2vDLwjKYNI0Q" type="PrimitiveType_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_HrN8iTW3Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_HrN8ijW3Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_HrN8izW3Ee2vDLwjKYNI0Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HrN8jDW3Ee2vDLwjKYNI0Q"/>
+      </children>
+      <element xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_HrMuYDW3Ee2vDLwjKYNI0Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HrNVcTW3Ee2vDLwjKYNI0Q" x="1040" y="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_7E3hADgcEe2OmLtrWap8Dg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_7E3hATgcEe2OmLtrWap8Dg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_7E3hAzgcEe2OmLtrWap8Dg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_G2IHkDW3Ee2vDLwjKYNI0Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7E3hAjgcEe2OmLtrWap8Dg" x="240" y="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_7E9AkzgcEe2OmLtrWap8Dg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_7E9AlDgcEe2OmLtrWap8Dg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_7E9AljgcEe2OmLtrWap8Dg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_G8kt0DW3Ee2vDLwjKYNI0Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7E9AlTgcEe2OmLtrWap8Dg" x="400" y="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_7FCgIzgcEe2OmLtrWap8Dg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_7FCgJDgcEe2OmLtrWap8Dg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_7FDHMDgcEe2OmLtrWap8Dg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_HDLFEDW3Ee2vDLwjKYNI0Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7FCgJTgcEe2OmLtrWap8Dg" x="560" y="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_7FImwDgcEe2OmLtrWap8Dg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_7FImwTgcEe2OmLtrWap8Dg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_7FImwzgcEe2OmLtrWap8Dg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_HKo_ADW3Ee2vDLwjKYNI0Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7FImwjgcEe2OmLtrWap8Dg" x="740" y="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_7FOtYDgcEe2OmLtrWap8Dg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_7FOtYTgcEe2OmLtrWap8Dg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_7FOtYzgcEe2OmLtrWap8Dg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_Hb01oDW3Ee2vDLwjKYNI0Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7FOtYjgcEe2OmLtrWap8Dg" x="900" y="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_7FUM8zgcEe2OmLtrWap8Dg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_7FUM9DgcEe2OmLtrWap8Dg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_7FUM9jgcEe2OmLtrWap8Dg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_HjqjADW3Ee2vDLwjKYNI0Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7FUM9TgcEe2OmLtrWap8Dg" x="1080" y="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_7FZFczgcEe2OmLtrWap8Dg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_7FZFdDgcEe2OmLtrWap8Dg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_7FZsgDgcEe2OmLtrWap8Dg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_HrMuYDW3Ee2vDLwjKYNI0Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7FZFdTgcEe2OmLtrWap8Dg" x="1240" y="40"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_El1f8TW3Ee2vDLwjKYNI0Q" name="diagram_compatibility_version" stringValue="1.4.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_El1f8jW3Ee2vDLwjKYNI0Q"/>
+    <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_El1f8zW3Ee2vDLwjKYNI0Q" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
+      <owner xmi:type="uml:Package" href="PapyrusRE_StandardUtils.modellibrary.uml#___UAwDW2Ee2vDLwjKYNI0Q"/>
+    </styles>
+    <element xmi:type="uml:Package" href="PapyrusRE_StandardUtils.modellibrary.uml#___UAwDW2Ee2vDLwjKYNI0Q"/>
+    <edges xmi:type="notation:Connector" xmi:id="_7E3hBDgcEe2OmLtrWap8Dg" type="StereotypeCommentLink" source="_G2JVsDW3Ee2vDLwjKYNI0Q" target="_7E3hADgcEe2OmLtrWap8Dg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_7E3hBTgcEe2OmLtrWap8Dg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_7E3hCTgcEe2OmLtrWap8Dg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_G2IHkDW3Ee2vDLwjKYNI0Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7E3hBjgcEe2OmLtrWap8Dg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7E3hBzgcEe2OmLtrWap8Dg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7E3hCDgcEe2OmLtrWap8Dg"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_7E9AlzgcEe2OmLtrWap8Dg" type="StereotypeCommentLink" source="_G8lU4DW3Ee2vDLwjKYNI0Q" target="_7E9AkzgcEe2OmLtrWap8Dg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_7E9AmDgcEe2OmLtrWap8Dg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_7E9nojgcEe2OmLtrWap8Dg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_G8kt0DW3Ee2vDLwjKYNI0Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7E9AmTgcEe2OmLtrWap8Dg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7E9noDgcEe2OmLtrWap8Dg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7E9noTgcEe2OmLtrWap8Dg"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_7FDHMTgcEe2OmLtrWap8Dg" type="StereotypeCommentLink" source="_HDMTMDW3Ee2vDLwjKYNI0Q" target="_7FCgIzgcEe2OmLtrWap8Dg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_7FDHMjgcEe2OmLtrWap8Dg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_7FDHNjgcEe2OmLtrWap8Dg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_HDLFEDW3Ee2vDLwjKYNI0Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7FDHMzgcEe2OmLtrWap8Dg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7FDHNDgcEe2OmLtrWap8Dg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7FDHNTgcEe2OmLtrWap8Dg"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_7FImxDgcEe2OmLtrWap8Dg" type="StereotypeCommentLink" source="_HKqNIDW3Ee2vDLwjKYNI0Q" target="_7FImwDgcEe2OmLtrWap8Dg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_7FImxTgcEe2OmLtrWap8Dg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_7FImyTgcEe2OmLtrWap8Dg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_HKo_ADW3Ee2vDLwjKYNI0Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7FImxjgcEe2OmLtrWap8Dg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7FImxzgcEe2OmLtrWap8Dg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7FImyDgcEe2OmLtrWap8Dg"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_7FOtZDgcEe2OmLtrWap8Dg" type="StereotypeCommentLink" source="_Hb1csDW3Ee2vDLwjKYNI0Q" target="_7FOtYDgcEe2OmLtrWap8Dg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_7FOtZTgcEe2OmLtrWap8Dg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_7FPUcTgcEe2OmLtrWap8Dg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_Hb01oDW3Ee2vDLwjKYNI0Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7FOtZjgcEe2OmLtrWap8Dg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7FOtZzgcEe2OmLtrWap8Dg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7FPUcDgcEe2OmLtrWap8Dg"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_7FUM9zgcEe2OmLtrWap8Dg" type="StereotypeCommentLink" source="_HjrxIDW3Ee2vDLwjKYNI0Q" target="_7FUM8zgcEe2OmLtrWap8Dg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_7FUM-DgcEe2OmLtrWap8Dg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_7FUM_DgcEe2OmLtrWap8Dg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_HjqjADW3Ee2vDLwjKYNI0Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7FUM-TgcEe2OmLtrWap8Dg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7FUM-jgcEe2OmLtrWap8Dg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7FUM-zgcEe2OmLtrWap8Dg"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_7FZsgTgcEe2OmLtrWap8Dg" type="StereotypeCommentLink" source="_HrNVcDW3Ee2vDLwjKYNI0Q" target="_7FZFczgcEe2OmLtrWap8Dg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_7FZsgjgcEe2OmLtrWap8Dg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_7FZshjgcEe2OmLtrWap8Dg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_HrMuYDW3Ee2vDLwjKYNI0Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7FZsgzgcEe2OmLtrWap8Dg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7FZshDgcEe2OmLtrWap8Dg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7FZshTgcEe2OmLtrWap8Dg"/>
+    </edges>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_S3tbYDW9Ee2vDLwjKYNI0Q" type="PapyrusUMLClassDiagram" name="LevelKind" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_UBdRsDW9Ee2vDLwjKYNI0Q" type="PrimitiveType_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UBdRsjW9Ee2vDLwjKYNI0Q" type="PrimitiveType_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_UBdRszW9Ee2vDLwjKYNI0Q" type="PrimitiveType_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UBdRtDW9Ee2vDLwjKYNI0Q" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_UBdRtTW9Ee2vDLwjKYNI0Q" type="PrimitiveType_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_UBdRtjW9Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_UBdRtzW9Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_UBdRuDW9Ee2vDLwjKYNI0Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UBdRuTW9Ee2vDLwjKYNI0Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_UBdRujW9Ee2vDLwjKYNI0Q" type="PrimitiveType_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_UBdRuzW9Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_UBdRvDW9Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_UBdRvTW9Ee2vDLwjKYNI0Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UBdRvjW9Ee2vDLwjKYNI0Q"/>
+      </children>
+      <element xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_UBcDkDW9Ee2vDLwjKYNI0Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UBdRsTW9Ee2vDLwjKYNI0Q" x="40" y="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_UJJOEDW9Ee2vDLwjKYNI0Q" type="PrimitiveType_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UJJ1IDW9Ee2vDLwjKYNI0Q" type="PrimitiveType_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_UJJ1ITW9Ee2vDLwjKYNI0Q" type="PrimitiveType_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UJJ1IjW9Ee2vDLwjKYNI0Q" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_UJJ1IzW9Ee2vDLwjKYNI0Q" type="PrimitiveType_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_UJJ1JDW9Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_UJJ1JTW9Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_UJJ1JjW9Ee2vDLwjKYNI0Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UJJ1JzW9Ee2vDLwjKYNI0Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_UJJ1KDW9Ee2vDLwjKYNI0Q" type="PrimitiveType_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_UJJ1KTW9Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_UJJ1KjW9Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_UJJ1KzW9Ee2vDLwjKYNI0Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UJJ1LDW9Ee2vDLwjKYNI0Q"/>
+      </children>
+      <element xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_UJInADW9Ee2vDLwjKYNI0Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UJJOETW9Ee2vDLwjKYNI0Q" x="200" y="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_UP9nwDW9Ee2vDLwjKYNI0Q" type="PrimitiveType_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UP9nwjW9Ee2vDLwjKYNI0Q" type="PrimitiveType_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_UP9nwzW9Ee2vDLwjKYNI0Q" type="PrimitiveType_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UP-O0DW9Ee2vDLwjKYNI0Q" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_UP-O0TW9Ee2vDLwjKYNI0Q" type="PrimitiveType_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_UP-O0jW9Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_UP-O0zW9Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_UP-O1DW9Ee2vDLwjKYNI0Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UP-O1TW9Ee2vDLwjKYNI0Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_UP-O1jW9Ee2vDLwjKYNI0Q" type="PrimitiveType_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_UP-O1zW9Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_UP-O2DW9Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_UP-O2TW9Ee2vDLwjKYNI0Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UP-O2jW9Ee2vDLwjKYNI0Q"/>
+      </children>
+      <element xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_UP7ykDW9Ee2vDLwjKYNI0Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UP9nwTW9Ee2vDLwjKYNI0Q" x="360" y="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_jt0c5DW9Ee2vDLwjKYNI0Q" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_jt0c5TW9Ee2vDLwjKYNI0Q"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jt0c5zW9Ee2vDLwjKYNI0Q" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_UBcDkDW9Ee2vDLwjKYNI0Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jt0c5jW9Ee2vDLwjKYNI0Q" x="240" y="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_ki7f9DW9Ee2vDLwjKYNI0Q" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_ki7f9TW9Ee2vDLwjKYNI0Q"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_ki7f9zW9Ee2vDLwjKYNI0Q" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_UJInADW9Ee2vDLwjKYNI0Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ki7f9jW9Ee2vDLwjKYNI0Q" x="400" y="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_lbCMoDW9Ee2vDLwjKYNI0Q" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_lbCMoTW9Ee2vDLwjKYNI0Q"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lbCMozW9Ee2vDLwjKYNI0Q" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_UP7ykDW9Ee2vDLwjKYNI0Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lbCMojW9Ee2vDLwjKYNI0Q" x="560" y="40"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_S3tbYTW9Ee2vDLwjKYNI0Q" name="diagram_compatibility_version" stringValue="1.4.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_S3tbYjW9Ee2vDLwjKYNI0Q"/>
+    <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_S3tbYzW9Ee2vDLwjKYNI0Q" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
+      <owner xmi:type="uml:Package" href="PapyrusRE_StandardUtils.modellibrary.uml#_py1v0DW8Ee2vDLwjKYNI0Q"/>
+    </styles>
+    <element xmi:type="uml:Package" href="PapyrusRE_StandardUtils.modellibrary.uml#_py1v0DW8Ee2vDLwjKYNI0Q"/>
+    <edges xmi:type="notation:Connector" xmi:id="_jt0c6DW9Ee2vDLwjKYNI0Q" type="StereotypeCommentLink" source="_UBdRsDW9Ee2vDLwjKYNI0Q" target="_jt0c5DW9Ee2vDLwjKYNI0Q">
+      <styles xmi:type="notation:FontStyle" xmi:id="_jt0c6TW9Ee2vDLwjKYNI0Q"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_jt1D8jW9Ee2vDLwjKYNI0Q" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_UBcDkDW9Ee2vDLwjKYNI0Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jt0c6jW9Ee2vDLwjKYNI0Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jt1D8DW9Ee2vDLwjKYNI0Q"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jt1D8TW9Ee2vDLwjKYNI0Q"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_ki7f-DW9Ee2vDLwjKYNI0Q" type="StereotypeCommentLink" source="_UJJOEDW9Ee2vDLwjKYNI0Q" target="_ki7f9DW9Ee2vDLwjKYNI0Q">
+      <styles xmi:type="notation:FontStyle" xmi:id="_ki7f-TW9Ee2vDLwjKYNI0Q"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_ki8HATW9Ee2vDLwjKYNI0Q" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_UJInADW9Ee2vDLwjKYNI0Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ki7f-jW9Ee2vDLwjKYNI0Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ki7f-zW9Ee2vDLwjKYNI0Q"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ki8HADW9Ee2vDLwjKYNI0Q"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_lbCMpDW9Ee2vDLwjKYNI0Q" type="StereotypeCommentLink" source="_UP9nwDW9Ee2vDLwjKYNI0Q" target="_lbCMoDW9Ee2vDLwjKYNI0Q">
+      <styles xmi:type="notation:FontStyle" xmi:id="_lbCMpTW9Ee2vDLwjKYNI0Q"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_lbCMqTW9Ee2vDLwjKYNI0Q" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_UP7ykDW9Ee2vDLwjKYNI0Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lbCMpjW9Ee2vDLwjKYNI0Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lbCMpzW9Ee2vDLwjKYNI0Q"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lbCMqDW9Ee2vDLwjKYNI0Q"/>
+    </edges>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_1BsYcDW9Ee2vDLwjKYNI0Q" type="PapyrusUMLClassDiagram" name="StatusKind" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_8iqPgDW9Ee2vDLwjKYNI0Q" type="PrimitiveType_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_8iqPgjW9Ee2vDLwjKYNI0Q" type="PrimitiveType_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_8iqPgzW9Ee2vDLwjKYNI0Q" type="PrimitiveType_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_8iqPhDW9Ee2vDLwjKYNI0Q" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_8iq2kDW9Ee2vDLwjKYNI0Q" type="PrimitiveType_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_8iq2kTW9Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_8iq2kjW9Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_8iq2kzW9Ee2vDLwjKYNI0Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8iq2lDW9Ee2vDLwjKYNI0Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_8iq2lTW9Ee2vDLwjKYNI0Q" type="PrimitiveType_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_8iq2ljW9Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_8iq2lzW9Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_8iq2mDW9Ee2vDLwjKYNI0Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8iq2mTW9Ee2vDLwjKYNI0Q"/>
+      </children>
+      <element xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_8ipocDW9Ee2vDLwjKYNI0Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8iqPgTW9Ee2vDLwjKYNI0Q" x="40" y="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_8r98gDW9Ee2vDLwjKYNI0Q" type="PrimitiveType_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_8r98gjW9Ee2vDLwjKYNI0Q" type="PrimitiveType_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_8r98gzW9Ee2vDLwjKYNI0Q" type="PrimitiveType_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_8r98hDW9Ee2vDLwjKYNI0Q" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_8r98hTW9Ee2vDLwjKYNI0Q" type="PrimitiveType_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_8r98hjW9Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_8r98hzW9Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_8r98iDW9Ee2vDLwjKYNI0Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8r98iTW9Ee2vDLwjKYNI0Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_8r98ijW9Ee2vDLwjKYNI0Q" type="PrimitiveType_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_8r98izW9Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_8r98jDW9Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_8r98jTW9Ee2vDLwjKYNI0Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8r98jjW9Ee2vDLwjKYNI0Q"/>
+      </children>
+      <element xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_8r8uYDW9Ee2vDLwjKYNI0Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8r98gTW9Ee2vDLwjKYNI0Q" x="200" y="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_8z37UDW9Ee2vDLwjKYNI0Q" type="PrimitiveType_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_8z37UjW9Ee2vDLwjKYNI0Q" type="PrimitiveType_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_8z37UzW9Ee2vDLwjKYNI0Q" type="PrimitiveType_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_8z37VDW9Ee2vDLwjKYNI0Q" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_8z4iYDW9Ee2vDLwjKYNI0Q" type="PrimitiveType_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_8z4iYTW9Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_8z4iYjW9Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_8z4iYzW9Ee2vDLwjKYNI0Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8z4iZDW9Ee2vDLwjKYNI0Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_8z4iZTW9Ee2vDLwjKYNI0Q" type="PrimitiveType_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_8z4iZjW9Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_8z4iZzW9Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_8z4iaDW9Ee2vDLwjKYNI0Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8z4iaTW9Ee2vDLwjKYNI0Q"/>
+      </children>
+      <element xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_8z2tMDW9Ee2vDLwjKYNI0Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8z37UTW9Ee2vDLwjKYNI0Q" x="360" y="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_872LkDW9Ee2vDLwjKYNI0Q" type="PrimitiveType_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_872LkjW9Ee2vDLwjKYNI0Q" type="PrimitiveType_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_872LkzW9Ee2vDLwjKYNI0Q" type="PrimitiveType_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_872LlDW9Ee2vDLwjKYNI0Q" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_872LlTW9Ee2vDLwjKYNI0Q" type="PrimitiveType_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_872LljW9Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_872LlzW9Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_872LmDW9Ee2vDLwjKYNI0Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_872LmTW9Ee2vDLwjKYNI0Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_872LmjW9Ee2vDLwjKYNI0Q" type="PrimitiveType_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_872LmzW9Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_872LnDW9Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_872LnTW9Ee2vDLwjKYNI0Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_872LnjW9Ee2vDLwjKYNI0Q"/>
+      </children>
+      <element xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_8709cDW9Ee2vDLwjKYNI0Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_872LkTW9Ee2vDLwjKYNI0Q" x="540" y="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_9EGvsDW9Ee2vDLwjKYNI0Q" type="PrimitiveType_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_9EGvsjW9Ee2vDLwjKYNI0Q" type="PrimitiveType_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_9EGvszW9Ee2vDLwjKYNI0Q" type="PrimitiveType_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_9EGvtDW9Ee2vDLwjKYNI0Q" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_9EGvtTW9Ee2vDLwjKYNI0Q" type="PrimitiveType_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_9EGvtjW9Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_9EGvtzW9Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_9EGvuDW9Ee2vDLwjKYNI0Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9EGvuTW9Ee2vDLwjKYNI0Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_9EGvujW9Ee2vDLwjKYNI0Q" type="PrimitiveType_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_9EGvuzW9Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_9EGvvDW9Ee2vDLwjKYNI0Q"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_9EGvvTW9Ee2vDLwjKYNI0Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9EGvvjW9Ee2vDLwjKYNI0Q"/>
+      </children>
+      <element xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_9EFhkDW9Ee2vDLwjKYNI0Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9EGvsTW9Ee2vDLwjKYNI0Q" x="700" y="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_rUfrcDgPEe2OmLtrWap8Dg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_rUfrcTgPEe2OmLtrWap8Dg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_rUfrczgPEe2OmLtrWap8Dg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_8ipocDW9Ee2vDLwjKYNI0Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rUfrcjgPEe2OmLtrWap8Dg" x="240" y="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_rUpccDgPEe2OmLtrWap8Dg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_rUpccTgPEe2OmLtrWap8Dg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_rUpcczgPEe2OmLtrWap8Dg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_8r8uYDW9Ee2vDLwjKYNI0Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rUpccjgPEe2OmLtrWap8Dg" x="400" y="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_rUx_UDgPEe2OmLtrWap8Dg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_rUx_UTgPEe2OmLtrWap8Dg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_rUymYDgPEe2OmLtrWap8Dg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_8z2tMDW9Ee2vDLwjKYNI0Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rUx_UjgPEe2OmLtrWap8Dg" x="560" y="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_rU6iMDgPEe2OmLtrWap8Dg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_rU6iMTgPEe2OmLtrWap8Dg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_rU6iMzgPEe2OmLtrWap8Dg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_8709cDW9Ee2vDLwjKYNI0Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rU6iMjgPEe2OmLtrWap8Dg" x="740" y="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_rVDFEDgPEe2OmLtrWap8Dg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_rVDFETgPEe2OmLtrWap8Dg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_rVDsIDgPEe2OmLtrWap8Dg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_9EFhkDW9Ee2vDLwjKYNI0Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rVDFEjgPEe2OmLtrWap8Dg" x="900" y="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_QzxMgDgUEe2OmLtrWap8Dg" type="PrimitiveType_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_QzxzkDgUEe2OmLtrWap8Dg" type="PrimitiveType_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_QzxzkTgUEe2OmLtrWap8Dg" type="PrimitiveType_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QzxzkjgUEe2OmLtrWap8Dg" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_QzxzkzgUEe2OmLtrWap8Dg" type="PrimitiveType_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_QzxzlDgUEe2OmLtrWap8Dg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_QzxzlTgUEe2OmLtrWap8Dg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_QzxzljgUEe2OmLtrWap8Dg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QzxzlzgUEe2OmLtrWap8Dg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_QzyaoDgUEe2OmLtrWap8Dg" type="PrimitiveType_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_QzyaoTgUEe2OmLtrWap8Dg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_QzyaojgUEe2OmLtrWap8Dg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_QzyaozgUEe2OmLtrWap8Dg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QzyapDgUEe2OmLtrWap8Dg"/>
+      </children>
+      <element xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_Qzv-YDgUEe2OmLtrWap8Dg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QzxMgTgUEe2OmLtrWap8Dg" x="840" y="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_T6jXRDgUEe2OmLtrWap8Dg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_T6jXRTgUEe2OmLtrWap8Dg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_T6jXRzgUEe2OmLtrWap8Dg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_Qzv-YDgUEe2OmLtrWap8Dg"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_T6jXRjgUEe2OmLtrWap8Dg" x="1040" y="40"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_1BsYcTW9Ee2vDLwjKYNI0Q" name="diagram_compatibility_version" stringValue="1.4.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_1BsYcjW9Ee2vDLwjKYNI0Q"/>
+    <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_1BsYczW9Ee2vDLwjKYNI0Q" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
+      <owner xmi:type="uml:Package" href="PapyrusRE_StandardUtils.modellibrary.uml#_xzxq8DW9Ee2vDLwjKYNI0Q"/>
+    </styles>
+    <element xmi:type="uml:Package" href="PapyrusRE_StandardUtils.modellibrary.uml#_xzxq8DW9Ee2vDLwjKYNI0Q"/>
+    <edges xmi:type="notation:Connector" xmi:id="_rUgSgDgPEe2OmLtrWap8Dg" type="StereotypeCommentLink" source="_8iqPgDW9Ee2vDLwjKYNI0Q" target="_rUfrcDgPEe2OmLtrWap8Dg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_rUgSgTgPEe2OmLtrWap8Dg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_rUgShTgPEe2OmLtrWap8Dg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_8ipocDW9Ee2vDLwjKYNI0Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rUgSgjgPEe2OmLtrWap8Dg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rUgSgzgPEe2OmLtrWap8Dg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rUgShDgPEe2OmLtrWap8Dg"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_rUqDgDgPEe2OmLtrWap8Dg" type="StereotypeCommentLink" source="_8r98gDW9Ee2vDLwjKYNI0Q" target="_rUpccDgPEe2OmLtrWap8Dg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_rUqDgTgPEe2OmLtrWap8Dg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_rUqDhTgPEe2OmLtrWap8Dg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_8r8uYDW9Ee2vDLwjKYNI0Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rUqDgjgPEe2OmLtrWap8Dg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rUqDgzgPEe2OmLtrWap8Dg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rUqDhDgPEe2OmLtrWap8Dg"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_rUymYTgPEe2OmLtrWap8Dg" type="StereotypeCommentLink" source="_8z37UDW9Ee2vDLwjKYNI0Q" target="_rUx_UDgPEe2OmLtrWap8Dg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_rUymYjgPEe2OmLtrWap8Dg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_rUymZjgPEe2OmLtrWap8Dg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_8z2tMDW9Ee2vDLwjKYNI0Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rUymYzgPEe2OmLtrWap8Dg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rUymZDgPEe2OmLtrWap8Dg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rUymZTgPEe2OmLtrWap8Dg"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_rU6iNDgPEe2OmLtrWap8Dg" type="StereotypeCommentLink" source="_872LkDW9Ee2vDLwjKYNI0Q" target="_rU6iMDgPEe2OmLtrWap8Dg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_rU6iNTgPEe2OmLtrWap8Dg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_rU6iOTgPEe2OmLtrWap8Dg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_8709cDW9Ee2vDLwjKYNI0Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rU6iNjgPEe2OmLtrWap8Dg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rU6iNzgPEe2OmLtrWap8Dg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rU6iODgPEe2OmLtrWap8Dg"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_rVDsITgPEe2OmLtrWap8Dg" type="StereotypeCommentLink" source="_9EGvsDW9Ee2vDLwjKYNI0Q" target="_rVDFEDgPEe2OmLtrWap8Dg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_rVDsIjgPEe2OmLtrWap8Dg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_rVDsJjgPEe2OmLtrWap8Dg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_9EFhkDW9Ee2vDLwjKYNI0Q"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rVDsIzgPEe2OmLtrWap8Dg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rVDsJDgPEe2OmLtrWap8Dg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rVDsJTgPEe2OmLtrWap8Dg"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_T6jXSDgUEe2OmLtrWap8Dg" type="StereotypeCommentLink" source="_QzxMgDgUEe2OmLtrWap8Dg" target="_T6jXRDgUEe2OmLtrWap8Dg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_T6jXSTgUEe2OmLtrWap8Dg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_T6j-UTgUEe2OmLtrWap8Dg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_Qzv-YDgUEe2OmLtrWap8Dg"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_T6jXSjgUEe2OmLtrWap8Dg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_T6jXSzgUEe2OmLtrWap8Dg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_T6j-UDgUEe2OmLtrWap8Dg"/>
+    </edges>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_HzDWwDgQEe2OmLtrWap8Dg" type="PapyrusUMLClassDiagram" name="RequirementSourceKind" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_jGaaQDgQEe2OmLtrWap8Dg" type="PrimitiveType_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_jGbBUDgQEe2OmLtrWap8Dg" type="PrimitiveType_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_jGbBUTgQEe2OmLtrWap8Dg" type="PrimitiveType_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_jGbBUjgQEe2OmLtrWap8Dg" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_jGbBUzgQEe2OmLtrWap8Dg" type="PrimitiveType_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_jGbBVDgQEe2OmLtrWap8Dg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_jGbBVTgQEe2OmLtrWap8Dg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_jGbBVjgQEe2OmLtrWap8Dg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jGbBVzgQEe2OmLtrWap8Dg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_jGbBWDgQEe2OmLtrWap8Dg" type="PrimitiveType_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_jGbBWTgQEe2OmLtrWap8Dg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_jGbBWjgQEe2OmLtrWap8Dg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_jGbBWzgQEe2OmLtrWap8Dg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jGbBXDgQEe2OmLtrWap8Dg"/>
+      </children>
+      <element xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_jGYlEDgQEe2OmLtrWap8Dg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jGaaQTgQEe2OmLtrWap8Dg" x="320" y="100"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_jjwdkDgQEe2OmLtrWap8Dg" type="PrimitiveType_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_jjwdkjgQEe2OmLtrWap8Dg" type="PrimitiveType_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_jjwdkzgQEe2OmLtrWap8Dg" type="PrimitiveType_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_jjwdlDgQEe2OmLtrWap8Dg" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_jjxEoDgQEe2OmLtrWap8Dg" type="PrimitiveType_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_jjxEoTgQEe2OmLtrWap8Dg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_jjxEojgQEe2OmLtrWap8Dg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_jjxEozgQEe2OmLtrWap8Dg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jjxEpDgQEe2OmLtrWap8Dg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_jjxEpTgQEe2OmLtrWap8Dg" type="PrimitiveType_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_jjxEpjgQEe2OmLtrWap8Dg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_jjxEpzgQEe2OmLtrWap8Dg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_jjxEqDgQEe2OmLtrWap8Dg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jjxEqTgQEe2OmLtrWap8Dg"/>
+      </children>
+      <element xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_jjuoYDgQEe2OmLtrWap8Dg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jjwdkTgQEe2OmLtrWap8Dg" x="500" y="100"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_kQiEADgQEe2OmLtrWap8Dg" type="PrimitiveType_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_kQirEDgQEe2OmLtrWap8Dg" type="PrimitiveType_NameLabel"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_kQirETgQEe2OmLtrWap8Dg" type="PrimitiveType_FloatingNameLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_kQirEjgQEe2OmLtrWap8Dg" y="15"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kQirEzgQEe2OmLtrWap8Dg" type="PrimitiveType_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kQirFDgQEe2OmLtrWap8Dg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_kQirFTgQEe2OmLtrWap8Dg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_kQirFjgQEe2OmLtrWap8Dg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kQirFzgQEe2OmLtrWap8Dg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kQirGDgQEe2OmLtrWap8Dg" type="PrimitiveType_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kQirGTgQEe2OmLtrWap8Dg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_kQirGjgQEe2OmLtrWap8Dg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_kQirGzgQEe2OmLtrWap8Dg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kQirHDgQEe2OmLtrWap8Dg"/>
+      </children>
+      <element xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_kQg14DgQEe2OmLtrWap8Dg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kQiEATgQEe2OmLtrWap8Dg" x="660" y="100"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_rcQD1DgQEe2OmLtrWap8Dg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_rcQD1TgQEe2OmLtrWap8Dg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_rcQq4TgQEe2OmLtrWap8Dg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_jGYlEDgQEe2OmLtrWap8Dg"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rcQq4DgQEe2OmLtrWap8Dg" x="520" y="100"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_tORbFDgQEe2OmLtrWap8Dg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_tORbFTgQEe2OmLtrWap8Dg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_tOSCIDgQEe2OmLtrWap8Dg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_jjuoYDgQEe2OmLtrWap8Dg"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tORbFjgQEe2OmLtrWap8Dg" x="700" y="100"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_uShGVzgQEe2OmLtrWap8Dg" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_uShGWDgQEe2OmLtrWap8Dg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_uShGWjgQEe2OmLtrWap8Dg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_kQg14DgQEe2OmLtrWap8Dg"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uShGWTgQEe2OmLtrWap8Dg" x="860" y="100"/>
+    </children>
+    <styles xmi:type="notation:StringValueStyle" xmi:id="_HzDWwTgQEe2OmLtrWap8Dg" name="diagram_compatibility_version" stringValue="1.4.0"/>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_HzDWwjgQEe2OmLtrWap8Dg"/>
+    <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_HzDWwzgQEe2OmLtrWap8Dg" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
+      <owner xmi:type="uml:Package" href="PapyrusRE_StandardUtils.modellibrary.uml#_-IPQwDW-Ee2vDLwjKYNI0Q"/>
+    </styles>
+    <element xmi:type="uml:Package" href="PapyrusRE_StandardUtils.modellibrary.uml#_-IPQwDW-Ee2vDLwjKYNI0Q"/>
+    <edges xmi:type="notation:Connector" xmi:id="_rcQq4jgQEe2OmLtrWap8Dg" type="StereotypeCommentLink" source="_jGaaQDgQEe2OmLtrWap8Dg" target="_rcQD1DgQEe2OmLtrWap8Dg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_rcQq4zgQEe2OmLtrWap8Dg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_rcQq5zgQEe2OmLtrWap8Dg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_jGYlEDgQEe2OmLtrWap8Dg"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rcQq5DgQEe2OmLtrWap8Dg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rcQq5TgQEe2OmLtrWap8Dg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rcQq5jgQEe2OmLtrWap8Dg"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_tOSCITgQEe2OmLtrWap8Dg" type="StereotypeCommentLink" source="_jjwdkDgQEe2OmLtrWap8Dg" target="_tORbFDgQEe2OmLtrWap8Dg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_tOSCIjgQEe2OmLtrWap8Dg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_tOSCJjgQEe2OmLtrWap8Dg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_jjuoYDgQEe2OmLtrWap8Dg"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tOSCIzgQEe2OmLtrWap8Dg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tOSCJDgQEe2OmLtrWap8Dg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tOSCJTgQEe2OmLtrWap8Dg"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_uShGWzgQEe2OmLtrWap8Dg" type="StereotypeCommentLink" source="_kQiEADgQEe2OmLtrWap8Dg" target="_uShGVzgQEe2OmLtrWap8Dg">
+      <styles xmi:type="notation:FontStyle" xmi:id="_uShGXDgQEe2OmLtrWap8Dg"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_uShtYjgQEe2OmLtrWap8Dg" name="BASE_ELEMENT">
+        <eObjectValue xmi:type="uml:PrimitiveType" href="PapyrusRE_StandardUtils.modellibrary.uml#_kQg14DgQEe2OmLtrWap8Dg"/>
+      </styles>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uShGXTgQEe2OmLtrWap8Dg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uShtYDgQEe2OmLtrWap8Dg"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uShtYTgQEe2OmLtrWap8Dg"/>
+    </edges>
+  </notation:Diagram>
+</xmi:XMI>
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/resources/modellibrary/PapyrusRE_StandardUtils.modellibrary.uml b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/resources/modellibrary/PapyrusRE_StandardUtils.modellibrary.uml
index 75e12bb..7b24e60 100644
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/resources/modellibrary/PapyrusRE_StandardUtils.modellibrary.uml
+++ b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/resources/modellibrary/PapyrusRE_StandardUtils.modellibrary.uml
@@ -1,118 +1,77 @@
 <?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:standard="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard" 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">
+<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:PapyrusRE.RequirementKind="PapyrusRE/RequirementKind" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:standard="http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard" 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 PapyrusRE/RequirementKind PapyrusRE#//RequirementKind">
   <uml:Model xmi:id="_03nSwFOPEeCXkoFpHlFAkw" name="PapyrusRE_StandardUtils">
-    <packagedElement xmi:type="uml:Package" xmi:id="_BZPAQFOQEeCXkoFpHlFAkw" name="RequirementClassificationConcerns">
-      <packagedElement xmi:type="uml:Enumeration" xmi:id="_aChacFOhEeCXkoFpHlFAkw" name="QualityKind">
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_bdPE8FOhEeCXkoFpHlFAkw" name="Adaptability"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_bxpOsFOhEeCXkoFpHlFAkw" name="Availability"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_cA1hQFOhEeCXkoFpHlFAkw" name="Compatability"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_cRqykFOhEeCXkoFpHlFAkw" name="Maintainability"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_cwDXsFOhEeCXkoFpHlFAkw" name="Portability"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_dTp0AFOhEeCXkoFpHlFAkw" name="Reliability"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_dmR1EFOhEeCXkoFpHlFAkw" name="Safety"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_d4veEFOhEeCXkoFpHlFAkw" name="Security"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_eNmTwFOhEeCXkoFpHlFAkw" name="Usability"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ehHFoFOhEeCXkoFpHlFAkw" name="Variability"/>
+    <packagedElement xmi:type="uml:Package" xmi:id="_TfOoADW1Ee2vDLwjKYNI0Q" name="QualityKind">
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_XxsiwDW1Ee2vDLwjKYNI0Q" name="Adaptability"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_X5i3MDW1Ee2vDLwjKYNI0Q" name="Availability"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_YA6DcDW1Ee2vDLwjKYNI0Q" name="Compatibility"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_YHGLADW1Ee2vDLwjKYNI0Q" name="Maintainability"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_YN7LwDW1Ee2vDLwjKYNI0Q" name="Portability"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_ZRm2UDW1Ee2vDLwjKYNI0Q" name="Reliability"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_ZZ_9UDW1Ee2vDLwjKYNI0Q" name="Safety"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_ZiCfADW1Ee2vDLwjKYNI0Q" name="Security"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_Zr0GEDW1Ee2vDLwjKYNI0Q" name="Usability"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_Z1yhcDW1Ee2vDLwjKYNI0Q" name="Variability"/>
+      <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_4-naoDW1Ee2vDLwjKYNI0Q">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4-oowDW1Ee2vDLwjKYNI0Q" source="http://www.eclipse.org/uml2/2.0.0/UML">
+          <references xmi:type="ecore:EPackage" href="PapyrusRE#//RequirementKind"/>
+        </eAnnotations>
+        <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUSRE_PROFILE/PapyrusRE.profile.uml#_uLR-oC6IEe2R7Ja825gmOA"/>
+      </profileApplication>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Package" xmi:id="___UAwDW2Ee2vDLwjKYNI0Q" name="ConstraintKind">
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_G2IHkDW3Ee2vDLwjKYNI0Q" name="Cultural"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_G8kt0DW3Ee2vDLwjKYNI0Q" name="Design"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_HDLFEDW3Ee2vDLwjKYNI0Q" name="Environment"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_HKo_ADW3Ee2vDLwjKYNI0Q" name="Implementation"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_Hb01oDW3Ee2vDLwjKYNI0Q" name="Interface"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_HjqjADW3Ee2vDLwjKYNI0Q" name="Physical"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_HrMuYDW3Ee2vDLwjKYNI0Q" name="Standard"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Package" xmi:id="_py1v0DW8Ee2vDLwjKYNI0Q" name="LevelKind">
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_UBcDkDW9Ee2vDLwjKYNI0Q" name="System">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_1ZTGUDgREe2OmLtrWap8Dg">
+          <body>notion used in IREB</body>
+        </ownedComment>
       </packagedElement>
-      <packagedElement xmi:type="uml:Enumeration" xmi:id="_azPFsFOhEeCXkoFpHlFAkw" name="ConstraintKind">
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_pOUPMFOhEeCXkoFpHlFAkw" name="Cultural"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_pfAWkFOhEeCXkoFpHlFAkw" name="Design"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_pxnwkFOhEeCXkoFpHlFAkw" name="Environment"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_p_LEYFOhEeCXkoFpHlFAkw" name="Implementation"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_qRNPkFOhEeCXkoFpHlFAkw" name="Interface"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_qjX9oFOhEeCXkoFpHlFAkw" name="Physical"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_4_IvgJMMEeeXis3ri3jkBA" name="Standard"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_8zH-gJMMEeeXis3ri3jkBA" name="Other"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="__aV4YJMMEeeXis3ri3jkBA" name="Undefined"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_UJInADW9Ee2vDLwjKYNI0Q" name="Domain">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_3tJ_UDgREe2OmLtrWap8Dg">
+          <body>notion used in IREB</body>
+        </ownedComment>
       </packagedElement>
-      <packagedElement xmi:type="uml:Enumeration" xmi:id="_bDBOIFOhEeCXkoFpHlFAkw" name="WorkloadCapacitiesKind">
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_q5k3IFOhEeCXkoFpHlFAkw" name="Bound"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_rQzrYFOhEeCXkoFpHlFAkw" name="Memory"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_rftDAFOhEeCXkoFpHlFAkw" name="Speed"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_sACI4FOhEeCXkoFpHlFAkw" name="Throughput"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_sQkfQFOhEeCXkoFpHlFAkw" name="Time"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_sjyWMFOhEeCXkoFpHlFAkw" name="Volume"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_UP7ykDW9Ee2vDLwjKYNI0Q" name="Business">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_4DajMDgREe2OmLtrWap8Dg">
+          <body>notion used in IREB</body>
+        </ownedComment>
       </packagedElement>
     </packagedElement>
-    <packagedElement xmi:type="uml:Package" xmi:id="_hdrPUFOfEeCXkoFpHlFAkw" name="RequirementsCharacteristicsConcerns">
-      <packagedElement xmi:type="uml:Enumeration" xmi:id="_HF8JwFOjEeCXkoFpHlFAkw" name="LifeCyclePhaseKind">
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_dXIecFOkEeCXkoFpHlFAkw" name="PreConcept"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_eKOIQFOkEeCXkoFpHlFAkw" name="Concept"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_eadjsFOkEeCXkoFpHlFAkw" name="Development"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ewznIFOkEeCXkoFpHlFAkw" name="Manufacturing"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_fCE9UFOkEeCXkoFpHlFAkw" name="Integration"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_fSBd0FOkEeCXkoFpHlFAkw" name="Test"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_fiaDMFOkEeCXkoFpHlFAkw" name="Deployment"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_gBiPMFOkEeCXkoFpHlFAkw" name="Delivery"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_gksmoFOkEeCXkoFpHlFAkw" name="Installation"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_g2kZwFOkEeCXkoFpHlFAkw" name="Operation"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_hHZrEFOkEeCXkoFpHlFAkw" name="Support"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_hXofcFOkEeCXkoFpHlFAkw" name="Disposal"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Enumeration" xmi:id="_HWoRIFOjEeCXkoFpHlFAkw" name="AbstractionLevelKind">
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_HyefoFOjEeCXkoFpHlFAkw" name="SpecificationLevel"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_IAnpUFOjEeCXkoFpHlFAkw" name="AnalysisLevel"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_IQG20FOjEeCXkoFpHlFAkw" name="DesignLevel"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_cF8jYFOkEeCXkoFpHlFAkw" name="ImplementationLevel"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_cV4c0FOkEeCXkoFpHlFAkw" name="Specfication_level"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_sXUgIFOkEeCXkoFpHlFAkw" name="OperationalLevel"/>
+    <packagedElement xmi:type="uml:Package" xmi:id="_xzxq8DW9Ee2vDLwjKYNI0Q" name="StatusKind">
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_8709cDW9Ee2vDLwjKYNI0Q" name="Draft"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_8ipocDW9Ee2vDLwjKYNI0Q" name="Submitted"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_8r8uYDW9Ee2vDLwjKYNI0Q" name="ToBeRefined"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_8z2tMDW9Ee2vDLwjKYNI0Q" name="Accepted"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_9EFhkDW9Ee2vDLwjKYNI0Q" name="Rejected"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_Qzv-YDgUEe2OmLtrWap8Dg" name="Conflicting">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_PaX7MDgVEe2OmLtrWap8Dg">
+          <body>notion used in IREB</body>
+        </ownedComment>
       </packagedElement>
     </packagedElement>
-    <packagedElement xmi:type="uml:Package" xmi:id="_h4KL4FOfEeCXkoFpHlFAkw" name="PriorityAndImportanceConcerns">
-      <packagedElement xmi:type="uml:Enumeration" xmi:id="_Fx9ugFOlEeCXkoFpHlFAkw" name="PriorityKind">
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_4FQHEFPJEeCXkoFpHlFAkw" name="Mandatory"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_4XbcMFPJEeCXkoFpHlFAkw" name="Optional"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_4nEasFPJEeCXkoFpHlFAkw" name="NotDefined"/>
+    <packagedElement xmi:type="uml:Package" xmi:id="_-IPQwDW-Ee2vDLwjKYNI0Q" name="RequirementSourceKind">
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_jGYlEDgQEe2OmLtrWap8Dg" name="Stakeholders">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_4tQKYDgREe2OmLtrWap8Dg">
+          <body>notion used in IREB</body>
+        </ownedComment>
       </packagedElement>
-      <packagedElement xmi:type="uml:Enumeration" xmi:id="_GAtVIFOlEeCXkoFpHlFAkw" name="ImportanceKind">
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_gF5PIFPCEeCXkoFpHlFAkw" name="1"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_gj_gYFPCEeCXkoFpHlFAkw" name="2"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_bYp_wFPJEeCXkoFpHlFAkw" name="3"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_blUiwFPJEeCXkoFpHlFAkw" name="4"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_b2mgAFPJEeCXkoFpHlFAkw" name="5"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_cNZPYFPJEeCXkoFpHlFAkw" name="6"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_crybkFPJEeCXkoFpHlFAkw" name="7"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_c9OJ0FPJEeCXkoFpHlFAkw" name="8"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_dNdlQFPJEeCXkoFpHlFAkw" name="9"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_dc9Z0FPJEeCXkoFpHlFAkw" name="10"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_jjuoYDgQEe2OmLtrWap8Dg" name="Document">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_4-iusDgREe2OmLtrWap8Dg">
+          <body>notion used in IREB</body>
+        </ownedComment>
       </packagedElement>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Package" xmi:id="_jGcj8FOfEeCXkoFpHlFAkw" name="RequirementAndProcessConcerns">
-      <packagedElement xmi:type="uml:Enumeration" xmi:id="_ZUhvYFPKEeCXkoFpHlFAkw" name="AgreementStatusKind">
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_c7L3kFPLEeCXkoFpHlFAkw" name="Submitted"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_dLIYEFPLEeCXkoFpHlFAkw" name="ToBeRefined"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_daLgsFPLEeCXkoFpHlFAkw" name="Accepted"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_KAfiQJMOEeeXis3ri3jkBA" name="Draft"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_SEIokJMOEeeXis3ri3jkBA" name="Rejected"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Enumeration" xmi:id="_Zh75QFPKEeCXkoFpHlFAkw" name="QualificationStatusKind">
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_gMhFcFPLEeCXkoFpHlFAkw" name="NotQualified"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_gaOKQFPLEeCXkoFpHlFAkw" name="Qualified"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_g4KqgFPLEeCXkoFpHlFAkw" name="Suspect"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Enumeration" xmi:id="_ZnvmUFPKEeCXkoFpHlFAkw" name="SatisfactionStatusKind">
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_j8PfgFPLEeCXkoFpHlFAkw" name="NotSatisfied"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_kJppYFPLEeCXkoFpHlFAkw" name="Satisfied"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_kaVwwFPLEeCXkoFpHlFAkw" name="Suspect"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Enumeration" xmi:id="_ZuThUFPKEeCXkoFpHlFAkw" name="ReviewStatusKind">
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_nb4PIFPLEeCXkoFpHlFAkw" name="ToBeReviewed"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_no1tEFPLEeCXkoFpHlFAkw" name="Accepted"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_n4LwoFPLEeCXkoFpHlFAkw" name="Rejected"/>
-      </packagedElement>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Package" xmi:id="_jh-pYFOfEeCXkoFpHlFAkw" name="VerificationAndValidationConcerns">
-      <packagedElement xmi:type="uml:Enumeration" xmi:id="__xkAkFPLEeCXkoFpHlFAkw" name="VV_MethodKind">
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_AcnvwFPMEeCXkoFpHlFAkw" name="Analysis"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_AtdBEFPMEeCXkoFpHlFAkw" name="Inspection"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_A881oFPMEeCXkoFpHlFAkw" name="SystemTest"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_BoKV0FPMEeCXkoFpHlFAkw" name="ComponentTest"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Enumeration" xmi:id="_AF-KUFPMEeCXkoFpHlFAkw" name="VV_StatusKind">
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_B3WoYFPMEeCXkoFpHlFAkw" name="Pending"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_CE6jQFPMEeCXkoFpHlFAkw" name="Passed"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_CTg_8FPMEeCXkoFpHlFAkw" name="Failed"/>
-        <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ClikEFPMEeCXkoFpHlFAkw" name="Inconclusive"/>
+      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_kQg14DgQEe2OmLtrWap8Dg" name="SystemInOperation">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_5PdfkDgREe2OmLtrWap8Dg">
+          <body>notion used in IREB</body>
+        </ownedComment>
       </packagedElement>
     </packagedElement>
     <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_FWPoYFOQEeCXkoFpHlFAkw">
@@ -127,27 +86,42 @@
       </eAnnotations>
       <appliedProfile xmi:type="uml:Profile" href="pathmap://UML_PROFILES/Ecore.profile.uml#_0"/>
     </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_hKJmQDW9Ee2vDLwjKYNI0Q">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hKKNUDW9Ee2vDLwjKYNI0Q" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="PapyrusRE#//RequirementKind"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUSRE_PROFILE/PapyrusRE.profile.uml#_uLR-oC6IEe2R7Ja825gmOA"/>
+    </profileApplication>
   </uml:Model>
-  <standard:ModelLibrary xmi:id="_A_4BEF_vEeeOZqSO0VwLaQ" base_Package="_jGcj8FOfEeCXkoFpHlFAkw"/>
-  <standard:ModelLibrary xmi:id="_B-kd8F_vEeeOZqSO0VwLaQ" base_Package="_h4KL4FOfEeCXkoFpHlFAkw"/>
-  <standard:ModelLibrary xmi:id="_EQIQ4F_vEeeOZqSO0VwLaQ" base_Package="_hdrPUFOfEeCXkoFpHlFAkw"/>
-  <standard:ModelLibrary xmi:id="_FEJu0F_vEeeOZqSO0VwLaQ" base_Package="_BZPAQFOQEeCXkoFpHlFAkw"/>
-  <standard:ModelLibrary xmi:id="_uZgQ8F_wEeeOZqSO0VwLaQ" base_Package="_jh-pYFOfEeCXkoFpHlFAkw"/>
-  <Ecore:EEnumLiteral xmi:id="_AWGWQJ6jEeemerk4ddBG7Q" base_EnumerationLiteral="_gF5PIFPCEeCXkoFpHlFAkw" enumLiteralName="Importance1" literal="1"/>
-  <Ecore:EEnumLiteral xmi:id="_9vdZQJ6kEeemerk4ddBG7Q" base_EnumerationLiteral="_gj_gYFPCEeCXkoFpHlFAkw" enumLiteralName="Importance2" literal="2"/>
-  <Ecore:EEnumLiteral xmi:id="_Ak6jcJ6lEeemerk4ddBG7Q" base_EnumerationLiteral="_bYp_wFPJEeCXkoFpHlFAkw" enumLiteralName="Importance3" literal="3"/>
-  <Ecore:EEnumLiteral xmi:id="_D1MBYJ6lEeemerk4ddBG7Q" base_EnumerationLiteral="_blUiwFPJEeCXkoFpHlFAkw" enumLiteralName="Importance4" literal="4"/>
-  <Ecore:EEnumLiteral xmi:id="_JtQoAJ6lEeemerk4ddBG7Q" base_EnumerationLiteral="_b2mgAFPJEeCXkoFpHlFAkw" enumLiteralName="Importance5" literal="5"/>
-  <Ecore:EEnumLiteral xmi:id="_L64WIJ6lEeemerk4ddBG7Q" base_EnumerationLiteral="_cNZPYFPJEeCXkoFpHlFAkw" enumLiteralName="Importance6" literal="6"/>
-  <Ecore:EEnumLiteral xmi:id="_OgKWUJ6lEeemerk4ddBG7Q" base_EnumerationLiteral="_crybkFPJEeCXkoFpHlFAkw" enumLiteralName="Importance7" literal="7"/>
-  <Ecore:EEnumLiteral xmi:id="_Q7LAMJ6lEeemerk4ddBG7Q" base_EnumerationLiteral="_c9OJ0FPJEeCXkoFpHlFAkw" enumLiteralName="Importance8" literal="8"/>
-  <Ecore:EEnumLiteral xmi:id="_TnHpEJ6lEeemerk4ddBG7Q" base_EnumerationLiteral="_dNdlQFPJEeCXkoFpHlFAkw" enumLiteralName="Importance9" literal="9"/>
-  <Ecore:EEnumLiteral xmi:id="_WNJQIJ6lEeemerk4ddBG7Q" base_EnumerationLiteral="_dc9Z0FPJEeCXkoFpHlFAkw" enumLiteralName="Importance10" literal="10"/>
-  <Ecore:EPackage xmi:id="_Xy5tAKOHEeeuXsxbHFzK8w" base_Package="_BZPAQFOQEeCXkoFpHlFAkw" packageName="requirementclassificationconcerns" nsPrefix="requirementclassificationconcerns" nsURI="http://www.eclipse.org/papyrus/requirements/sysml14/0.7.0/PapyrusRE/ModelLibrary/PapyrusREStandardUtils/RequirementClassificationConcerns" basePackage="org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils" prefix="RequirementClassificationConcerns"/>
-  <Ecore:EPackage xmi:id="_xzhWQKOHEeeuXsxbHFzK8w" base_Package="_hdrPUFOfEeCXkoFpHlFAkw" packageName="requirementscharacteristicsconcerns" nsPrefix="RequirementsCharacteristicsConcerns" nsURI="http://www.eclipse.org/papyrus/requirements/sysml14/0.7.0/PapyrusRE/ModelLibrary/PapyrusREStandardUtils/RequirementsCharacteristicsConcerns" basePackage="org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils" prefix="RequirementsCharacteristicsConcerns"/>
-  <Ecore:EPackage xmi:id="_SRZW0KOIEeeuXsxbHFzK8w" base_Package="_h4KL4FOfEeCXkoFpHlFAkw" packageName="priorityandimportanceconcerns" nsPrefix="PriorityAndImportanceConcerns" nsURI="http://www.eclipse.org/papyrus/requirements/sysml14/0.7.0/PapyrusRE/ModelLibrary/PapyrusREStandardUtils/PriorityAndImportanceConcerns" basePackage="org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils" prefix="PriorityAndImportanceConcerns"/>
-  <Ecore:EPackage xmi:id="_lBKBkKOIEeeuXsxbHFzK8w" base_Package="_jGcj8FOfEeCXkoFpHlFAkw" packageName="requirementandprocessconcerns" nsPrefix="RequirementAndProcessConcerns" nsURI="http://www.eclipse.org/papyrus/requirements/sysml14/0.7.0/PapyrusRE/ModelLibrary/PapyrusREStandardUtils/RequirementAndProcessConcerns" basePackage="org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils" prefix="RequirementAndProcessConcerns"/>
-  <Ecore:EPackage xmi:id="_vJLacKOIEeeuXsxbHFzK8w" base_Package="_jh-pYFOfEeCXkoFpHlFAkw" packageName="verificationandvalidationconcerns" nsPrefix="VerificationAndValidationConcerns" nsURI="http://www.eclipse.org/papyrus/requirements/sysml14/0.7.0/PapyrusRE/ModelLibrary/PapyrusREStandardUtils/VerificationAndValidationConcerns" basePackage="org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils" prefix="VerificationAndValidationConcerns"/>
   <standard:ModelLibrary xmi:id="_GIbTQFOQEeCXkoFpHlFAkw" base_Package="_03nSwFOPEeCXkoFpHlFAkw"/>
-  <Ecore:EPackage xmi:id="_E1Hp0KOGEeeuXsxbHFzK8w" base_Package="_03nSwFOPEeCXkoFpHlFAkw" packageName="papyrusrestandardutils" nsPrefix="PapyrusREStandardUtils" nsURI="http://www.eclipse.org/papyrus/requirements/sysml14/0.7.0/PapyrusRE/ModelLibrary/PapyrusREStandardUtils" basePackage="org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary" prefix="PapyrusREStandardUtils"/>
+  <Ecore:EPackage xmi:id="_E1Hp0KOGEeeuXsxbHFzK8w" base_Package="_03nSwFOPEeCXkoFpHlFAkw" packageName="papyrusrestandardutils" nsPrefix="PapyrusREStandardUtils" nsURI="PapyrusREStandardUtils" basePackage="org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary" prefix="PapyrusREStandardUtils"/>
+  <PapyrusRE.RequirementKind:QualityKind xmi:id="_6ZoAEDW1Ee2vDLwjKYNI0Q" base_PrimitiveType="_XxsiwDW1Ee2vDLwjKYNI0Q"/>
+  <PapyrusRE.RequirementKind:QualityKind xmi:id="_7eA1QDW1Ee2vDLwjKYNI0Q" base_PrimitiveType="_X5i3MDW1Ee2vDLwjKYNI0Q"/>
+  <PapyrusRE.RequirementKind:QualityKind xmi:id="_8QhQQDW1Ee2vDLwjKYNI0Q" base_PrimitiveType="_YA6DcDW1Ee2vDLwjKYNI0Q"/>
+  <PapyrusRE.RequirementKind:QualityKind xmi:id="_9HIvMDW1Ee2vDLwjKYNI0Q" base_PrimitiveType="_YHGLADW1Ee2vDLwjKYNI0Q"/>
+  <PapyrusRE.RequirementKind:QualityKind xmi:id="_96FPEDW1Ee2vDLwjKYNI0Q" base_PrimitiveType="_YN7LwDW1Ee2vDLwjKYNI0Q"/>
+  <PapyrusRE.RequirementKind:QualityKind xmi:id="_-wItUDW1Ee2vDLwjKYNI0Q" base_PrimitiveType="_ZRm2UDW1Ee2vDLwjKYNI0Q"/>
+  <PapyrusRE.RequirementKind:QualityKind xmi:id="__nqLMDW1Ee2vDLwjKYNI0Q" base_PrimitiveType="_ZZ_9UDW1Ee2vDLwjKYNI0Q"/>
+  <PapyrusRE.RequirementKind:QualityKind xmi:id="_6lNIgDW2Ee2vDLwjKYNI0Q" base_PrimitiveType="_ZiCfADW1Ee2vDLwjKYNI0Q"/>
+  <PapyrusRE.RequirementKind:QualityKind xmi:id="_7kh3gDW2Ee2vDLwjKYNI0Q" base_PrimitiveType="_Zr0GEDW1Ee2vDLwjKYNI0Q"/>
+  <PapyrusRE.RequirementKind:QualityKind xmi:id="_8awU4DW2Ee2vDLwjKYNI0Q" base_PrimitiveType="_Z1yhcDW1Ee2vDLwjKYNI0Q"/>
+  <PapyrusRE.RequirementKind:LevelKind xmi:id="_jteeoDW9Ee2vDLwjKYNI0Q" base_PrimitiveType="_UBcDkDW9Ee2vDLwjKYNI0Q"/>
+  <PapyrusRE.RequirementKind:LevelKind xmi:id="_kirBQDW9Ee2vDLwjKYNI0Q" base_PrimitiveType="_UJInADW9Ee2vDLwjKYNI0Q"/>
+  <PapyrusRE.RequirementKind:LevelKind xmi:id="_lauDkDW9Ee2vDLwjKYNI0Q" base_PrimitiveType="_UP7ykDW9Ee2vDLwjKYNI0Q"/>
+  <PapyrusRE.RequirementKind:ConstraintKind xmi:id="_pD7l8DW9Ee2vDLwjKYNI0Q" base_PrimitiveType="_G2IHkDW3Ee2vDLwjKYNI0Q"/>
+  <PapyrusRE.RequirementKind:ConstraintKind xmi:id="_p_zYUDW9Ee2vDLwjKYNI0Q" base_PrimitiveType="_G8kt0DW3Ee2vDLwjKYNI0Q"/>
+  <PapyrusRE.RequirementKind:ConstraintKind xmi:id="_qy7eYDW9Ee2vDLwjKYNI0Q" base_PrimitiveType="_HDLFEDW3Ee2vDLwjKYNI0Q"/>
+  <PapyrusRE.RequirementKind:ConstraintKind xmi:id="_rqNrsDW9Ee2vDLwjKYNI0Q" base_PrimitiveType="_HKo_ADW3Ee2vDLwjKYNI0Q"/>
+  <PapyrusRE.RequirementKind:ConstraintKind xmi:id="_smuXQDW9Ee2vDLwjKYNI0Q" base_PrimitiveType="_Hb01oDW3Ee2vDLwjKYNI0Q"/>
+  <PapyrusRE.RequirementKind:ConstraintKind xmi:id="_ta6NQDW9Ee2vDLwjKYNI0Q" base_PrimitiveType="_HjqjADW3Ee2vDLwjKYNI0Q"/>
+  <PapyrusRE.RequirementKind:ConstraintKind xmi:id="_uOJoEDW9Ee2vDLwjKYNI0Q" base_PrimitiveType="_HrMuYDW3Ee2vDLwjKYNI0Q"/>
+  <PapyrusRE.RequirementKind:StatusKind xmi:id="_RuD2QDW-Ee2vDLwjKYNI0Q" base_PrimitiveType="_8ipocDW9Ee2vDLwjKYNI0Q"/>
+  <PapyrusRE.RequirementKind:StatusKind xmi:id="_THd5MDW-Ee2vDLwjKYNI0Q" base_PrimitiveType="_8r8uYDW9Ee2vDLwjKYNI0Q"/>
+  <PapyrusRE.RequirementKind:StatusKind xmi:id="_UP2dkDW-Ee2vDLwjKYNI0Q" base_PrimitiveType="_8z2tMDW9Ee2vDLwjKYNI0Q"/>
+  <PapyrusRE.RequirementKind:StatusKind xmi:id="_VRQQMDW-Ee2vDLwjKYNI0Q" base_PrimitiveType="_8709cDW9Ee2vDLwjKYNI0Q"/>
+  <PapyrusRE.RequirementKind:StatusKind xmi:id="_WP30kDW-Ee2vDLwjKYNI0Q" base_PrimitiveType="_9EFhkDW9Ee2vDLwjKYNI0Q"/>
+  <PapyrusRE.RequirementKind:RequirementSourceKind xmi:id="_rb10IDgQEe2OmLtrWap8Dg" base_PrimitiveType="_jGYlEDgQEe2OmLtrWap8Dg"/>
+  <PapyrusRE.RequirementKind:RequirementSourceKind xmi:id="_tN_HMDgQEe2OmLtrWap8Dg" base_PrimitiveType="_jjuoYDgQEe2OmLtrWap8Dg"/>
+  <PapyrusRE.RequirementKind:RequirementSourceKind xmi:id="_uSROsDgQEe2OmLtrWap8Dg" base_PrimitiveType="_kQg14DgQEe2OmLtrWap8Dg"/>
+  <PapyrusRE.RequirementKind:StatusKind xmi:id="_T6POMDgUEe2OmLtrWap8Dg" base_PrimitiveType="_Qzv-YDgUEe2OmLtrWap8Dg"/>
 </xmi:XMI>
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/resources/modellibrary/papyrusrestandardutils.ecore b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/resources/modellibrary/papyrusrestandardutils.ecore
index 143649e..e60f17b 100644
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/resources/modellibrary/papyrusrestandardutils.ecore
+++ b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/resources/modellibrary/papyrusrestandardutils.ecore
@@ -1,182 +1,51 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="papyrusrestandardutils" nsURI="http://www.eclipse.org/papyrus/requirements/sysml14/0.7.0/PapyrusRE/ModelLibrary/PapyrusREStandardUtils"
-    nsPrefix="PapyrusREStandardUtils">
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="papyrusrestandardutils" nsURI="PapyrusREStandardUtils" nsPrefix="PapyrusREStandardUtils">
   <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
     <details key="originalName" value="PapyrusRE_StandardUtils"/>
   </eAnnotations>
-  <eSubpackages name="requirementclassificationconcerns" nsURI="http://www.eclipse.org/papyrus/requirements/sysml14/0.7.0/PapyrusRE/ModelLibrary/PapyrusREStandardUtils/RequirementClassificationConcerns"
-      nsPrefix="requirementclassificationconcerns">
-    <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
-      <details key="originalName" value="RequirementClassificationConcerns"/>
-    </eAnnotations>
-    <eClassifiers xsi:type="ecore:EEnum" name="QualityKind">
-      <eLiterals name="Adaptability"/>
-      <eLiterals name="Availability" value="1"/>
-      <eLiterals name="Compatability" value="2"/>
-      <eLiterals name="Maintainability" value="3"/>
-      <eLiterals name="Portability" value="4"/>
-      <eLiterals name="Reliability" value="5"/>
-      <eLiterals name="Safety" value="6"/>
-      <eLiterals name="Security" value="7"/>
-      <eLiterals name="Usability" value="8"/>
-      <eLiterals name="Variability" value="9"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EEnum" name="ConstraintKind">
-      <eLiterals name="Cultural"/>
-      <eLiterals name="Design" value="1"/>
-      <eLiterals name="Environment" value="2"/>
-      <eLiterals name="Implementation" value="3"/>
-      <eLiterals name="Interface" value="4"/>
-      <eLiterals name="Physical" value="5"/>
-      <eLiterals name="Standard" value="6"/>
-      <eLiterals name="Other" value="7"/>
-      <eLiterals name="Undefined" value="8"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EEnum" name="WorkloadCapacitiesKind">
-      <eLiterals name="Bound"/>
-      <eLiterals name="Memory" value="1"/>
-      <eLiterals name="Speed" value="2"/>
-      <eLiterals name="Throughput" value="3"/>
-      <eLiterals name="Time" value="4"/>
-      <eLiterals name="Volume" value="5"/>
-    </eClassifiers>
+  <eSubpackages name="QualityKind" nsURI="http:///PapyrusRE_StandardUtils/QualityKind.ecore"
+      nsPrefix="PapyrusRE_StandardUtils.QualityKind">
+    <eClassifiers xsi:type="ecore:EDataType" name="Adaptability" instanceClassName="Adaptability"/>
+    <eClassifiers xsi:type="ecore:EDataType" name="Availability" instanceClassName="Availability"/>
+    <eClassifiers xsi:type="ecore:EDataType" name="Compatibility" instanceClassName="Compatibility"/>
+    <eClassifiers xsi:type="ecore:EDataType" name="Maintainability" instanceClassName="Maintainability"/>
+    <eClassifiers xsi:type="ecore:EDataType" name="Portability" instanceClassName="Portability"/>
+    <eClassifiers xsi:type="ecore:EDataType" name="Reliability" instanceClassName="Reliability"/>
+    <eClassifiers xsi:type="ecore:EDataType" name="Safety" instanceClassName="Safety"/>
+    <eClassifiers xsi:type="ecore:EDataType" name="Security" instanceClassName="Security"/>
+    <eClassifiers xsi:type="ecore:EDataType" name="Usability" instanceClassName="Usability"/>
+    <eClassifiers xsi:type="ecore:EDataType" name="Variability" instanceClassName="Variability"/>
   </eSubpackages>
-  <eSubpackages name="requirementscharacteristicsconcerns" nsURI="http://www.eclipse.org/papyrus/requirements/sysml14/0.7.0/PapyrusRE/ModelLibrary/PapyrusREStandardUtils/RequirementsCharacteristicsConcerns"
-      nsPrefix="RequirementsCharacteristicsConcerns">
-    <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
-      <details key="originalName" value="RequirementsCharacteristicsConcerns"/>
-    </eAnnotations>
-    <eClassifiers xsi:type="ecore:EEnum" name="LifeCyclePhaseKind">
-      <eLiterals name="PreConcept"/>
-      <eLiterals name="Concept" value="1"/>
-      <eLiterals name="Development" value="2"/>
-      <eLiterals name="Manufacturing" value="3"/>
-      <eLiterals name="Integration" value="4"/>
-      <eLiterals name="Test" value="5"/>
-      <eLiterals name="Deployment" value="6"/>
-      <eLiterals name="Delivery" value="7"/>
-      <eLiterals name="Installation" value="8"/>
-      <eLiterals name="Operation" value="9"/>
-      <eLiterals name="Support" value="10"/>
-      <eLiterals name="Disposal" value="11"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EEnum" name="AbstractionLevelKind">
-      <eLiterals name="SpecificationLevel"/>
-      <eLiterals name="AnalysisLevel" value="1"/>
-      <eLiterals name="DesignLevel" value="2"/>
-      <eLiterals name="ImplementationLevel" value="3"/>
-      <eLiterals name="Specfication_level" value="4"/>
-      <eLiterals name="OperationalLevel" value="5"/>
-    </eClassifiers>
+  <eSubpackages name="ConstraintKind" nsURI="http:///PapyrusRE_StandardUtils/ConstraintKind.ecore"
+      nsPrefix="PapyrusRE_StandardUtils.ConstraintKind">
+    <eClassifiers xsi:type="ecore:EDataType" name="Cultural" instanceClassName="Cultural"/>
+    <eClassifiers xsi:type="ecore:EDataType" name="Design" instanceClassName="Design"/>
+    <eClassifiers xsi:type="ecore:EDataType" name="Environment" instanceClassName="Environment"/>
+    <eClassifiers xsi:type="ecore:EDataType" name="Implementation" instanceClassName="Implementation"/>
+    <eClassifiers xsi:type="ecore:EDataType" name="Interface" instanceClassName="Interface"/>
+    <eClassifiers xsi:type="ecore:EDataType" name="Physical" instanceClassName="Physical"/>
+    <eClassifiers xsi:type="ecore:EDataType" name="Standard" instanceClassName="Standard"/>
   </eSubpackages>
-  <eSubpackages name="priorityandimportanceconcerns" nsURI="http://www.eclipse.org/papyrus/requirements/sysml14/0.7.0/PapyrusRE/ModelLibrary/PapyrusREStandardUtils/PriorityAndImportanceConcerns"
-      nsPrefix="PriorityAndImportanceConcerns">
-    <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
-      <details key="originalName" value="PriorityAndImportanceConcerns"/>
-    </eAnnotations>
-    <eClassifiers xsi:type="ecore:EEnum" name="PriorityKind">
-      <eLiterals name="Mandatory"/>
-      <eLiterals name="Optional" value="1"/>
-      <eLiterals name="NotDefined" value="2"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EEnum" name="ImportanceKind">
-      <eLiterals name="Importance1" literal="1">
-        <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
-          <details key="originalName" value="_1"/>
-        </eAnnotations>
-      </eLiterals>
-      <eLiterals name="Importance2" value="1" literal="2">
-        <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
-          <details key="originalName" value="_2"/>
-        </eAnnotations>
-      </eLiterals>
-      <eLiterals name="Importance3" value="2" literal="3">
-        <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
-          <details key="originalName" value="_3"/>
-        </eAnnotations>
-      </eLiterals>
-      <eLiterals name="Importance4" value="3" literal="4">
-        <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
-          <details key="originalName" value="_4"/>
-        </eAnnotations>
-      </eLiterals>
-      <eLiterals name="Importance5" value="4" literal="5">
-        <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
-          <details key="originalName" value="_5"/>
-        </eAnnotations>
-      </eLiterals>
-      <eLiterals name="Importance6" value="5" literal="6">
-        <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
-          <details key="originalName" value="_6"/>
-        </eAnnotations>
-      </eLiterals>
-      <eLiterals name="Importance7" value="6" literal="7">
-        <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
-          <details key="originalName" value="_7"/>
-        </eAnnotations>
-      </eLiterals>
-      <eLiterals name="Importance8" value="7" literal="8">
-        <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
-          <details key="originalName" value="_8"/>
-        </eAnnotations>
-      </eLiterals>
-      <eLiterals name="Importance9" value="8" literal="9">
-        <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
-          <details key="originalName" value="_9"/>
-        </eAnnotations>
-      </eLiterals>
-      <eLiterals name="Importance10" value="9" literal="10">
-        <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
-          <details key="originalName" value="_10"/>
-        </eAnnotations>
-      </eLiterals>
-    </eClassifiers>
+  <eSubpackages name="LevelKind" nsURI="http:///PapyrusRE_StandardUtils/LevelKind.ecore"
+      nsPrefix="PapyrusRE_StandardUtils.LevelKind">
+    <eClassifiers xsi:type="ecore:EDataType" name="System" instanceClassName="System"/>
+    <eClassifiers xsi:type="ecore:EDataType" name="Domain" instanceClassName="Domain"/>
+    <eClassifiers xsi:type="ecore:EDataType" name="Business" instanceClassName="Business"/>
   </eSubpackages>
-  <eSubpackages name="requirementandprocessconcerns" nsURI="http://www.eclipse.org/papyrus/requirements/sysml14/0.7.0/PapyrusRE/ModelLibrary/PapyrusREStandardUtils/RequirementAndProcessConcerns"
-      nsPrefix="RequirementAndProcessConcerns">
-    <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
-      <details key="originalName" value="RequirementAndProcessConcerns"/>
-    </eAnnotations>
-    <eClassifiers xsi:type="ecore:EEnum" name="AgreementStatusKind">
-      <eLiterals name="Submitted"/>
-      <eLiterals name="ToBeRefined" value="1"/>
-      <eLiterals name="Accepted" value="2"/>
-      <eLiterals name="Draft" value="3"/>
-      <eLiterals name="Rejected" value="4"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EEnum" name="QualificationStatusKind">
-      <eLiterals name="NotQualified"/>
-      <eLiterals name="Qualified" value="1"/>
-      <eLiterals name="Suspect" value="2"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EEnum" name="SatisfactionStatusKind">
-      <eLiterals name="NotSatisfied"/>
-      <eLiterals name="Satisfied" value="1"/>
-      <eLiterals name="Suspect" value="2"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EEnum" name="ReviewStatusKind">
-      <eLiterals name="ToBeReviewed"/>
-      <eLiterals name="Accepted" value="1"/>
-      <eLiterals name="Rejected" value="2"/>
-    </eClassifiers>
+  <eSubpackages name="StatusKind" nsURI="http:///PapyrusRE_StandardUtils/StatusKind.ecore"
+      nsPrefix="PapyrusRE_StandardUtils.StatusKind">
+    <eClassifiers xsi:type="ecore:EDataType" name="Draft" instanceClassName="Draft"/>
+    <eClassifiers xsi:type="ecore:EDataType" name="Submitted" instanceClassName="Submitted"/>
+    <eClassifiers xsi:type="ecore:EDataType" name="ToBeRefined" instanceClassName="ToBeRefined"/>
+    <eClassifiers xsi:type="ecore:EDataType" name="Accepted" instanceClassName="Accepted"/>
+    <eClassifiers xsi:type="ecore:EDataType" name="Rejected" instanceClassName="Rejected"/>
+    <eClassifiers xsi:type="ecore:EDataType" name="Conflicting" instanceClassName="Conflicting"/>
   </eSubpackages>
-  <eSubpackages name="verificationandvalidationconcerns" nsURI="http://www.eclipse.org/papyrus/requirements/sysml14/0.7.0/PapyrusRE/ModelLibrary/PapyrusREStandardUtils/VerificationAndValidationConcerns"
-      nsPrefix="VerificationAndValidationConcerns">
-    <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
-      <details key="originalName" value="VerificationAndValidationConcerns"/>
-    </eAnnotations>
-    <eClassifiers xsi:type="ecore:EEnum" name="VV_MethodKind">
-      <eLiterals name="Analysis"/>
-      <eLiterals name="Inspection" value="1"/>
-      <eLiterals name="SystemTest" value="2"/>
-      <eLiterals name="ComponentTest" value="3"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EEnum" name="VV_StatusKind">
-      <eLiterals name="Pending"/>
-      <eLiterals name="Passed" value="1"/>
-      <eLiterals name="Failed" value="2"/>
-      <eLiterals name="Inconclusive" value="3"/>
-    </eClassifiers>
+  <eSubpackages name="RequirementSourceKind" nsURI="http:///PapyrusRE_StandardUtils/RequirementSourceKind.ecore"
+      nsPrefix="PapyrusRE_StandardUtils.RequirementSourceKind">
+    <eClassifiers xsi:type="ecore:EDataType" name="Stakeholders" instanceClassName="Stakeholders"/>
+    <eClassifiers xsi:type="ecore:EDataType" name="Document" instanceClassName="Document"/>
+    <eClassifiers xsi:type="ecore:EDataType" name="SystemInOperation" instanceClassName="SystemInOperation"/>
   </eSubpackages>
 </ecore:EPackage>
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/priorityandimportanceconcerns/ImportanceKind.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/priorityandimportanceconcerns/ImportanceKind.java
deleted file mode 100644
index 278b69c..0000000
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/priorityandimportanceconcerns/ImportanceKind.java
+++ /dev/null
@@ -1,451 +0,0 @@
-/**
- * Copyright (c) 2017 CEA LIST.
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *   Sébastien Gerard (CEA LIST) <sebastien.gerard@cea.fr> - Initial API and implementation
- *   Yupanqui Munoz Julho (CEA LIST) <yupanqui.munozjulho@cea.fr> - Initial API and implementation
- * 
- */
-package org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.priorityandimportanceconcerns;
-
-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>Importance Kind</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.priorityandimportanceconcerns.PriorityAndImportanceConcernsPackage#getImportanceKind()
- * @model
- * @generated
- */
-public enum ImportanceKind implements Enumerator {
-	/**
-	 * The '<em><b>Importance1</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #IMPORTANCE1_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	IMPORTANCE1(0, "Importance1", "1"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Importance2</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #IMPORTANCE2_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	IMPORTANCE2(1, "Importance2", "2"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Importance3</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #IMPORTANCE3_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	IMPORTANCE3(2, "Importance3", "3"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Importance4</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #IMPORTANCE4_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	IMPORTANCE4(3, "Importance4", "4"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Importance5</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #IMPORTANCE5_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	IMPORTANCE5(4, "Importance5", "5"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Importance6</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #IMPORTANCE6_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	IMPORTANCE6(5, "Importance6", "6"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Importance7</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #IMPORTANCE7_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	IMPORTANCE7(6, "Importance7", "7"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Importance8</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #IMPORTANCE8_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	IMPORTANCE8(7, "Importance8", "8"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Importance9</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #IMPORTANCE9_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	IMPORTANCE9(8, "Importance9", "9"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Importance10</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #IMPORTANCE10_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	IMPORTANCE10(9, "Importance10", "10"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Importance1</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Importance1</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #IMPORTANCE1
-	 * @model name="Importance1" literal="1"
-	 *        annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='_1'"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int IMPORTANCE1_VALUE = 0;
-
-	/**
-	 * The '<em><b>Importance2</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Importance2</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #IMPORTANCE2
-	 * @model name="Importance2" literal="2"
-	 *        annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='_2'"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int IMPORTANCE2_VALUE = 1;
-
-	/**
-	 * The '<em><b>Importance3</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Importance3</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #IMPORTANCE3
-	 * @model name="Importance3" literal="3"
-	 *        annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='_3'"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int IMPORTANCE3_VALUE = 2;
-
-	/**
-	 * The '<em><b>Importance4</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Importance4</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #IMPORTANCE4
-	 * @model name="Importance4" literal="4"
-	 *        annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='_4'"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int IMPORTANCE4_VALUE = 3;
-
-	/**
-	 * The '<em><b>Importance5</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Importance5</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #IMPORTANCE5
-	 * @model name="Importance5" literal="5"
-	 *        annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='_5'"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int IMPORTANCE5_VALUE = 4;
-
-	/**
-	 * The '<em><b>Importance6</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Importance6</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #IMPORTANCE6
-	 * @model name="Importance6" literal="6"
-	 *        annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='_6'"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int IMPORTANCE6_VALUE = 5;
-
-	/**
-	 * The '<em><b>Importance7</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Importance7</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #IMPORTANCE7
-	 * @model name="Importance7" literal="7"
-	 *        annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='_7'"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int IMPORTANCE7_VALUE = 6;
-
-	/**
-	 * The '<em><b>Importance8</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Importance8</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #IMPORTANCE8
-	 * @model name="Importance8" literal="8"
-	 *        annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='_8'"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int IMPORTANCE8_VALUE = 7;
-
-	/**
-	 * The '<em><b>Importance9</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Importance9</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #IMPORTANCE9
-	 * @model name="Importance9" literal="9"
-	 *        annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='_9'"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int IMPORTANCE9_VALUE = 8;
-
-	/**
-	 * The '<em><b>Importance10</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Importance10</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #IMPORTANCE10
-	 * @model name="Importance10" literal="10"
-	 *        annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='_10'"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int IMPORTANCE10_VALUE = 9;
-
-	/**
-	 * An array of all the '<em><b>Importance Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final ImportanceKind[] VALUES_ARRAY =
-		new ImportanceKind[] {
-			IMPORTANCE1,
-			IMPORTANCE2,
-			IMPORTANCE3,
-			IMPORTANCE4,
-			IMPORTANCE5,
-			IMPORTANCE6,
-			IMPORTANCE7,
-			IMPORTANCE8,
-			IMPORTANCE9,
-			IMPORTANCE10,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Importance Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<ImportanceKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Importance Kind</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 ImportanceKind get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			ImportanceKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Importance Kind</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 ImportanceKind getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			ImportanceKind result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Importance Kind</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 ImportanceKind get(int value) {
-		switch (value) {
-			case IMPORTANCE1_VALUE: return IMPORTANCE1;
-			case IMPORTANCE2_VALUE: return IMPORTANCE2;
-			case IMPORTANCE3_VALUE: return IMPORTANCE3;
-			case IMPORTANCE4_VALUE: return IMPORTANCE4;
-			case IMPORTANCE5_VALUE: return IMPORTANCE5;
-			case IMPORTANCE6_VALUE: return IMPORTANCE6;
-			case IMPORTANCE7_VALUE: return IMPORTANCE7;
-			case IMPORTANCE8_VALUE: return IMPORTANCE8;
-			case IMPORTANCE9_VALUE: return IMPORTANCE9;
-			case IMPORTANCE10_VALUE: return IMPORTANCE10;
-		}
-		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 ImportanceKind(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-	  return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-	  return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	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;
-	}
-	
-} //ImportanceKind
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/priorityandimportanceconcerns/PriorityAndImportanceConcernsFactory.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/priorityandimportanceconcerns/PriorityAndImportanceConcernsFactory.java
deleted file mode 100644
index dbbe33a..0000000
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/priorityandimportanceconcerns/PriorityAndImportanceConcernsFactory.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Copyright (c) 2017 CEA LIST.
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *   Sébastien Gerard (CEA LIST) <sebastien.gerard@cea.fr> - Initial API and implementation
- *   Yupanqui Munoz Julho (CEA LIST) <yupanqui.munozjulho@cea.fr> - Initial API and implementation
- * 
- */
-package org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.priorityandimportanceconcerns;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.priorityandimportanceconcerns.PriorityAndImportanceConcernsPackage
- * @generated
- */
-public interface PriorityAndImportanceConcernsFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	PriorityAndImportanceConcernsFactory eINSTANCE = org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.priorityandimportanceconcerns.impl.PriorityAndImportanceConcernsFactoryImpl.init();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	PriorityAndImportanceConcernsPackage getPriorityAndImportanceConcernsPackage();
-
-} //PriorityAndImportanceConcernsFactory
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/priorityandimportanceconcerns/PriorityAndImportanceConcernsPackage.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/priorityandimportanceconcerns/PriorityAndImportanceConcernsPackage.java
deleted file mode 100644
index dcd7fa3..0000000
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/priorityandimportanceconcerns/PriorityAndImportanceConcernsPackage.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/**
- * Copyright (c) 2017 CEA LIST.
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *   Sébastien Gerard (CEA LIST) <sebastien.gerard@cea.fr> - Initial API and implementation
- *   Yupanqui Munoz Julho (CEA LIST) <yupanqui.munozjulho@cea.fr> - Initial API and implementation
- * 
- */
-package org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.priorityandimportanceconcerns;
-
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each operation of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.priorityandimportanceconcerns.PriorityAndImportanceConcernsFactory
- * @model kind="package"
- *        annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='PriorityAndImportanceConcerns'"
- * @generated
- */
-public interface PriorityAndImportanceConcernsPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "priorityandimportanceconcerns"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http://www.eclipse.org/papyrus/requirements/sysml14/0.7.0/PapyrusRE/ModelLibrary/PapyrusREStandardUtils/PriorityAndImportanceConcerns"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "PriorityAndImportanceConcerns"; //$NON-NLS-1$
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	PriorityAndImportanceConcernsPackage eINSTANCE = org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.priorityandimportanceconcerns.impl.PriorityAndImportanceConcernsPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.priorityandimportanceconcerns.PriorityKind <em>Priority Kind</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.priorityandimportanceconcerns.PriorityKind
-	 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.priorityandimportanceconcerns.impl.PriorityAndImportanceConcernsPackageImpl#getPriorityKind()
-	 * @generated
-	 */
-	int PRIORITY_KIND = 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.priorityandimportanceconcerns.ImportanceKind <em>Importance Kind</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.priorityandimportanceconcerns.ImportanceKind
-	 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.priorityandimportanceconcerns.impl.PriorityAndImportanceConcernsPackageImpl#getImportanceKind()
-	 * @generated
-	 */
-	int IMPORTANCE_KIND = 1;
-
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.priorityandimportanceconcerns.PriorityKind <em>Priority Kind</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Priority Kind</em>'.
-	 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.priorityandimportanceconcerns.PriorityKind
-	 * @generated
-	 */
-	EEnum getPriorityKind();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.priorityandimportanceconcerns.ImportanceKind <em>Importance Kind</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Importance Kind</em>'.
-	 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.priorityandimportanceconcerns.ImportanceKind
-	 * @generated
-	 */
-	EEnum getImportanceKind();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	PriorityAndImportanceConcernsFactory getPriorityAndImportanceConcernsFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each operation of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.priorityandimportanceconcerns.PriorityKind <em>Priority Kind</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.priorityandimportanceconcerns.PriorityKind
-		 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.priorityandimportanceconcerns.impl.PriorityAndImportanceConcernsPackageImpl#getPriorityKind()
-		 * @generated
-		 */
-		EEnum PRIORITY_KIND = eINSTANCE.getPriorityKind();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.priorityandimportanceconcerns.ImportanceKind <em>Importance Kind</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.priorityandimportanceconcerns.ImportanceKind
-		 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.priorityandimportanceconcerns.impl.PriorityAndImportanceConcernsPackageImpl#getImportanceKind()
-		 * @generated
-		 */
-		EEnum IMPORTANCE_KIND = eINSTANCE.getImportanceKind();
-
-	}
-
-} //PriorityAndImportanceConcernsPackage
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/priorityandimportanceconcerns/PriorityKind.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/priorityandimportanceconcerns/PriorityKind.java
deleted file mode 100644
index a7d50ea..0000000
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/priorityandimportanceconcerns/PriorityKind.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/**
- * Copyright (c) 2017 CEA LIST.
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *   S�bastien Gerard (CEA LIST) <sebastien.gerard@cea.fr> - Initial API and implementation
- *   Yupanqui Munoz Julho (CEA LIST) <yupanqui.munozjulho@cea.fr> - Initial API and implementation
- * 
- */
-package org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.priorityandimportanceconcerns;
-
-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>Priority Kind</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.priorityandimportanceconcerns.PriorityAndImportanceConcernsPackage#getPriorityKind()
- * @model
- * @generated
- */
-public enum PriorityKind implements Enumerator {
-	//$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Mandatory</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #MANDATORY_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	MANDATORY(0, "Mandatory", "Mandatory"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Optional</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #OPTIONAL_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	OPTIONAL(1, "Optional", "Optional"), /**
-	 * The '<em><b>Not Defined</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #NOT_DEFINED_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	NOT_DEFINED(2, "NotDefined", "NotDefined"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Mandatory</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Mandatory</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #MANDATORY
-	 * @model name="Mandatory"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int MANDATORY_VALUE = 0;
-
-	/**
-	 * The '<em><b>Optional</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Optional</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #OPTIONAL
-	 * @model name="Optional"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int OPTIONAL_VALUE = 1;
-
-	/**
-	 * The '<em><b>Not Defined</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Not Defined</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #NOT_DEFINED
-	 * @model name="NotDefined"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int NOT_DEFINED_VALUE = 2;
-
-	/**
-	 * An array of all the '<em><b>Priority Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final PriorityKind[] VALUES_ARRAY =
-		new PriorityKind[] {
-			MANDATORY,
-			OPTIONAL,
-			NOT_DEFINED,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Priority Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<PriorityKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Priority Kind</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 PriorityKind get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			PriorityKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Priority Kind</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 PriorityKind getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			PriorityKind result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Priority Kind</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 PriorityKind get(int value) {
-		switch (value) {
-			case MANDATORY_VALUE: return MANDATORY;
-			case OPTIONAL_VALUE: return OPTIONAL;
-			case NOT_DEFINED_VALUE: return NOT_DEFINED;
-		}
-		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 PriorityKind(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-	  return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-	  return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	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;
-	}
-	
-} //PriorityKind
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/priorityandimportanceconcerns/impl/PriorityAndImportanceConcernsFactoryImpl.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/priorityandimportanceconcerns/impl/PriorityAndImportanceConcernsFactoryImpl.java
deleted file mode 100644
index 6150449..0000000
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/priorityandimportanceconcerns/impl/PriorityAndImportanceConcernsFactoryImpl.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/**
- * Copyright (c) 2017 CEA LIST.
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *   Sébastien Gerard (CEA LIST) <sebastien.gerard@cea.fr> - Initial API and implementation
- *   Yupanqui Munoz Julho (CEA LIST) <yupanqui.munozjulho@cea.fr> - Initial API and implementation
- * 
- */
-package org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.priorityandimportanceconcerns.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.priorityandimportanceconcerns.*;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class PriorityAndImportanceConcernsFactoryImpl extends EFactoryImpl implements PriorityAndImportanceConcernsFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static PriorityAndImportanceConcernsFactory init() {
-		try {
-			PriorityAndImportanceConcernsFactory thePriorityAndImportanceConcernsFactory = (PriorityAndImportanceConcernsFactory)EPackage.Registry.INSTANCE.getEFactory(PriorityAndImportanceConcernsPackage.eNS_URI);
-			if (thePriorityAndImportanceConcernsFactory != null) {
-				return thePriorityAndImportanceConcernsFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new PriorityAndImportanceConcernsFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PriorityAndImportanceConcernsFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case PriorityAndImportanceConcernsPackage.PRIORITY_KIND:
-				return createPriorityKindFromString(eDataType, initialValue);
-			case PriorityAndImportanceConcernsPackage.IMPORTANCE_KIND:
-				return createImportanceKindFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case PriorityAndImportanceConcernsPackage.PRIORITY_KIND:
-				return convertPriorityKindToString(eDataType, instanceValue);
-			case PriorityAndImportanceConcernsPackage.IMPORTANCE_KIND:
-				return convertImportanceKindToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PriorityKind createPriorityKindFromString(EDataType eDataType, String initialValue) {
-		PriorityKind result = PriorityKind.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 convertPriorityKindToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ImportanceKind createImportanceKindFromString(EDataType eDataType, String initialValue) {
-		ImportanceKind result = ImportanceKind.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 convertImportanceKindToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PriorityAndImportanceConcernsPackage getPriorityAndImportanceConcernsPackage() {
-		return (PriorityAndImportanceConcernsPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static PriorityAndImportanceConcernsPackage getPackage() {
-		return PriorityAndImportanceConcernsPackage.eINSTANCE;
-	}
-
-} //PriorityAndImportanceConcernsFactoryImpl
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/priorityandimportanceconcerns/impl/PriorityAndImportanceConcernsPackageImpl.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/priorityandimportanceconcerns/impl/PriorityAndImportanceConcernsPackageImpl.java
deleted file mode 100644
index 5e91b26..0000000
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/priorityandimportanceconcerns/impl/PriorityAndImportanceConcernsPackageImpl.java
+++ /dev/null
@@ -1,313 +0,0 @@
-/**
- * Copyright (c) 2017 CEA LIST.
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *   S�bastien Gerard (CEA LIST) <sebastien.gerard@cea.fr> - Initial API and implementation
- *   Yupanqui Munoz Julho (CEA LIST) <yupanqui.munozjulho@cea.fr> - Initial API and implementation
- * 
- */
-package org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.priorityandimportanceconcerns.impl;
-
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.priorityandimportanceconcerns.ImportanceKind;
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.priorityandimportanceconcerns.PriorityAndImportanceConcernsFactory;
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.priorityandimportanceconcerns.PriorityAndImportanceConcernsPackage;
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.priorityandimportanceconcerns.PriorityKind;
-
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.RequirementAndProcessConcernsPackage;
-
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.impl.RequirementAndProcessConcernsPackageImpl;
-
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementclassificationconcerns.RequirementClassificationConcernsPackage;
-
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementclassificationconcerns.impl.RequirementClassificationConcernsPackageImpl;
-
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementscharacteristicsconcerns.RequirementsCharacteristicsConcernsPackage;
-
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementscharacteristicsconcerns.impl.RequirementsCharacteristicsConcernsPackageImpl;
-
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.verificationandvalidationconcerns.VerificationAndValidationConcernsPackage;
-
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.verificationandvalidationconcerns.impl.VerificationAndValidationConcernsPackageImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class PriorityAndImportanceConcernsPackageImpl extends EPackageImpl implements PriorityAndImportanceConcernsPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum priorityKindEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum importanceKindEEnum = 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.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.priorityandimportanceconcerns.PriorityAndImportanceConcernsPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private PriorityAndImportanceConcernsPackageImpl() {
-		super(eNS_URI, PriorityAndImportanceConcernsFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
-	 * <p>This method is used to initialize {@link PriorityAndImportanceConcernsPackage#eINSTANCE} when that field is accessed.
-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static PriorityAndImportanceConcernsPackage init() {
-		if (isInited) return (PriorityAndImportanceConcernsPackage)EPackage.Registry.INSTANCE.getEPackage(PriorityAndImportanceConcernsPackage.eNS_URI);
-
-		// Obtain or create and register package
-		PriorityAndImportanceConcernsPackageImpl thePriorityAndImportanceConcernsPackage = (PriorityAndImportanceConcernsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof PriorityAndImportanceConcernsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new PriorityAndImportanceConcernsPackageImpl());
-
-		isInited = true;
-
-		// Obtain or create and register interdependencies
-		RequirementClassificationConcernsPackageImpl theRequirementClassificationConcernsPackage = (RequirementClassificationConcernsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(RequirementClassificationConcernsPackage.eNS_URI) instanceof RequirementClassificationConcernsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(RequirementClassificationConcernsPackage.eNS_URI) : RequirementClassificationConcernsPackage.eINSTANCE);
-		RequirementsCharacteristicsConcernsPackageImpl theRequirementsCharacteristicsConcernsPackage = (RequirementsCharacteristicsConcernsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(RequirementsCharacteristicsConcernsPackage.eNS_URI) instanceof RequirementsCharacteristicsConcernsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(RequirementsCharacteristicsConcernsPackage.eNS_URI) : RequirementsCharacteristicsConcernsPackage.eINSTANCE);
-		RequirementAndProcessConcernsPackageImpl theRequirementAndProcessConcernsPackage = (RequirementAndProcessConcernsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(RequirementAndProcessConcernsPackage.eNS_URI) instanceof RequirementAndProcessConcernsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(RequirementAndProcessConcernsPackage.eNS_URI) : RequirementAndProcessConcernsPackage.eINSTANCE);
-		VerificationAndValidationConcernsPackageImpl theVerificationAndValidationConcernsPackage = (VerificationAndValidationConcernsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(VerificationAndValidationConcernsPackage.eNS_URI) instanceof VerificationAndValidationConcernsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(VerificationAndValidationConcernsPackage.eNS_URI) : VerificationAndValidationConcernsPackage.eINSTANCE);
-
-		// Create package meta-data objects
-		thePriorityAndImportanceConcernsPackage.createPackageContents();
-		theRequirementClassificationConcernsPackage.createPackageContents();
-		theRequirementsCharacteristicsConcernsPackage.createPackageContents();
-		theRequirementAndProcessConcernsPackage.createPackageContents();
-		theVerificationAndValidationConcernsPackage.createPackageContents();
-
-		// Initialize created meta-data
-		thePriorityAndImportanceConcernsPackage.initializePackageContents();
-		theRequirementClassificationConcernsPackage.initializePackageContents();
-		theRequirementsCharacteristicsConcernsPackage.initializePackageContents();
-		theRequirementAndProcessConcernsPackage.initializePackageContents();
-		theVerificationAndValidationConcernsPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		thePriorityAndImportanceConcernsPackage.freeze();
-
-  
-		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(PriorityAndImportanceConcernsPackage.eNS_URI, thePriorityAndImportanceConcernsPackage);
-		return thePriorityAndImportanceConcernsPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getPriorityKind() {
-		return priorityKindEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getImportanceKind() {
-		return importanceKindEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PriorityAndImportanceConcernsFactory getPriorityAndImportanceConcernsFactory() {
-		return (PriorityAndImportanceConcernsFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create enums
-		priorityKindEEnum = createEEnum(PRIORITY_KIND);
-		importanceKindEEnum = createEEnum(IMPORTANCE_KIND);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Initialize enums and add enum literals
-		initEEnum(priorityKindEEnum, PriorityKind.class, "PriorityKind"); //$NON-NLS-1$
-		addEEnumLiteral(priorityKindEEnum, PriorityKind.MANDATORY);
-		addEEnumLiteral(priorityKindEEnum, PriorityKind.OPTIONAL);
-		addEEnumLiteral(priorityKindEEnum, PriorityKind.NOT_DEFINED);
-
-		initEEnum(importanceKindEEnum, ImportanceKind.class, "ImportanceKind"); //$NON-NLS-1$
-		addEEnumLiteral(importanceKindEEnum, ImportanceKind.IMPORTANCE1);
-		addEEnumLiteral(importanceKindEEnum, ImportanceKind.IMPORTANCE2);
-		addEEnumLiteral(importanceKindEEnum, ImportanceKind.IMPORTANCE3);
-		addEEnumLiteral(importanceKindEEnum, ImportanceKind.IMPORTANCE4);
-		addEEnumLiteral(importanceKindEEnum, ImportanceKind.IMPORTANCE5);
-		addEEnumLiteral(importanceKindEEnum, ImportanceKind.IMPORTANCE6);
-		addEEnumLiteral(importanceKindEEnum, ImportanceKind.IMPORTANCE7);
-		addEEnumLiteral(importanceKindEEnum, ImportanceKind.IMPORTANCE8);
-		addEEnumLiteral(importanceKindEEnum, ImportanceKind.IMPORTANCE9);
-		addEEnumLiteral(importanceKindEEnum, ImportanceKind.IMPORTANCE10);
-
-		// Create resource
-		createResource(eNS_URI);
-
-		// Create annotations
-		// http://www.eclipse.org/uml2/2.0.0/UML
-		createUMLAnnotations();
-	}
-
-	/**
-	 * Initializes the annotations for <b>http://www.eclipse.org/uml2/2.0.0/UML</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void createUMLAnnotations() {
-		String source = "http://www.eclipse.org/uml2/2.0.0/UML"; //$NON-NLS-1$	
-		addAnnotation
-		  (this, 
-		   source, 
-		   new String[] {
-			 "originalName", "PriorityAndImportanceConcerns" //$NON-NLS-1$ //$NON-NLS-2$
-		   });	
-		addAnnotation
-		  (importanceKindEEnum.getELiterals().get(0), 
-		   source, 
-		   new String[] {
-			 "originalName", "_1" //$NON-NLS-1$ //$NON-NLS-2$
-		   });	
-		addAnnotation
-		  (importanceKindEEnum.getELiterals().get(1), 
-		   source, 
-		   new String[] {
-			 "originalName", "_2" //$NON-NLS-1$ //$NON-NLS-2$
-		   });	
-		addAnnotation
-		  (importanceKindEEnum.getELiterals().get(2), 
-		   source, 
-		   new String[] {
-			 "originalName", "_3" //$NON-NLS-1$ //$NON-NLS-2$
-		   });	
-		addAnnotation
-		  (importanceKindEEnum.getELiterals().get(3), 
-		   source, 
-		   new String[] {
-			 "originalName", "_4" //$NON-NLS-1$ //$NON-NLS-2$
-		   });	
-		addAnnotation
-		  (importanceKindEEnum.getELiterals().get(4), 
-		   source, 
-		   new String[] {
-			 "originalName", "_5" //$NON-NLS-1$ //$NON-NLS-2$
-		   });	
-		addAnnotation
-		  (importanceKindEEnum.getELiterals().get(5), 
-		   source, 
-		   new String[] {
-			 "originalName", "_6" //$NON-NLS-1$ //$NON-NLS-2$
-		   });	
-		addAnnotation
-		  (importanceKindEEnum.getELiterals().get(6), 
-		   source, 
-		   new String[] {
-			 "originalName", "_7" //$NON-NLS-1$ //$NON-NLS-2$
-		   });	
-		addAnnotation
-		  (importanceKindEEnum.getELiterals().get(7), 
-		   source, 
-		   new String[] {
-			 "originalName", "_8" //$NON-NLS-1$ //$NON-NLS-2$
-		   });	
-		addAnnotation
-		  (importanceKindEEnum.getELiterals().get(8), 
-		   source, 
-		   new String[] {
-			 "originalName", "_9" //$NON-NLS-1$ //$NON-NLS-2$
-		   });	
-		addAnnotation
-		  (importanceKindEEnum.getELiterals().get(9), 
-		   source, 
-		   new String[] {
-			 "originalName", "_10" //$NON-NLS-1$ //$NON-NLS-2$
-		   });
-	}
-
-} //PriorityAndImportanceConcernsPackageImpl
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementandprocessconcerns/AgreementStatusKind.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementandprocessconcerns/AgreementStatusKind.java
deleted file mode 100644
index 948757a..0000000
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementandprocessconcerns/AgreementStatusKind.java
+++ /dev/null
@@ -1,306 +0,0 @@
-/**
- * Copyright (c) 2017 CEA LIST.
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *   Sébastien Gerard (CEA LIST) <sebastien.gerard@cea.fr> - Initial API and implementation
- *   Yupanqui Munoz Julho (CEA LIST) <yupanqui.munozjulho@cea.fr> - Initial API and implementation
- * 
- */
-package org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns;
-
-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>Agreement Status Kind</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.RequirementAndProcessConcernsPackage#getAgreementStatusKind()
- * @model
- * @generated
- */
-public enum AgreementStatusKind implements Enumerator {
-	/**
-	 * The '<em><b>Submitted</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #SUBMITTED_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	SUBMITTED(0, "Submitted", "Submitted"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>To Be Refined</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #TO_BE_REFINED_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	TO_BE_REFINED(1, "ToBeRefined", "ToBeRefined"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Accepted</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #ACCEPTED_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	ACCEPTED(2, "Accepted", "Accepted"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Draft</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #DRAFT_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	DRAFT(3, "Draft", "Draft"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Rejected</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #REJECTED_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	REJECTED(4, "Rejected", "Rejected"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Submitted</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Submitted</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #SUBMITTED
-	 * @model name="Submitted"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int SUBMITTED_VALUE = 0;
-
-	/**
-	 * The '<em><b>To Be Refined</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>To Be Refined</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #TO_BE_REFINED
-	 * @model name="ToBeRefined"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int TO_BE_REFINED_VALUE = 1;
-
-	/**
-	 * The '<em><b>Accepted</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Accepted</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #ACCEPTED
-	 * @model name="Accepted"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ACCEPTED_VALUE = 2;
-
-	/**
-	 * The '<em><b>Draft</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Draft</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #DRAFT
-	 * @model name="Draft"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int DRAFT_VALUE = 3;
-
-	/**
-	 * The '<em><b>Rejected</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Rejected</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #REJECTED
-	 * @model name="Rejected"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int REJECTED_VALUE = 4;
-
-	/**
-	 * An array of all the '<em><b>Agreement Status Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final AgreementStatusKind[] VALUES_ARRAY =
-		new AgreementStatusKind[] {
-			SUBMITTED,
-			TO_BE_REFINED,
-			ACCEPTED,
-			DRAFT,
-			REJECTED,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Agreement Status Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<AgreementStatusKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Agreement Status Kind</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 AgreementStatusKind get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			AgreementStatusKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Agreement Status Kind</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 AgreementStatusKind getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			AgreementStatusKind result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Agreement Status Kind</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 AgreementStatusKind get(int value) {
-		switch (value) {
-			case SUBMITTED_VALUE: return SUBMITTED;
-			case TO_BE_REFINED_VALUE: return TO_BE_REFINED;
-			case ACCEPTED_VALUE: return ACCEPTED;
-			case DRAFT_VALUE: return DRAFT;
-			case REJECTED_VALUE: return REJECTED;
-		}
-		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 AgreementStatusKind(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-	  return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-	  return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	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;
-	}
-	
-} //AgreementStatusKind
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementandprocessconcerns/QualificationStatusKind.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementandprocessconcerns/QualificationStatusKind.java
deleted file mode 100644
index 4b978bb..0000000
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementandprocessconcerns/QualificationStatusKind.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/**
- * Copyright (c) 2017 CEA LIST.
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *   Sébastien Gerard (CEA LIST) <sebastien.gerard@cea.fr> - Initial API and implementation
- *   Yupanqui Munoz Julho (CEA LIST) <yupanqui.munozjulho@cea.fr> - Initial API and implementation
- * 
- */
-package org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns;
-
-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>Qualification Status Kind</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.RequirementAndProcessConcernsPackage#getQualificationStatusKind()
- * @model
- * @generated
- */
-public enum QualificationStatusKind implements Enumerator {
-	/**
-	 * The '<em><b>Not Qualified</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #NOT_QUALIFIED_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	NOT_QUALIFIED(0, "NotQualified", "NotQualified"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Qualified</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #QUALIFIED_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	QUALIFIED(1, "Qualified", "Qualified"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Suspect</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #SUSPECT_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	SUSPECT(2, "Suspect", "Suspect"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Not Qualified</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Not Qualified</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #NOT_QUALIFIED
-	 * @model name="NotQualified"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int NOT_QUALIFIED_VALUE = 0;
-
-	/**
-	 * The '<em><b>Qualified</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Qualified</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #QUALIFIED
-	 * @model name="Qualified"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int QUALIFIED_VALUE = 1;
-
-	/**
-	 * The '<em><b>Suspect</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Suspect</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #SUSPECT
-	 * @model name="Suspect"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int SUSPECT_VALUE = 2;
-
-	/**
-	 * An array of all the '<em><b>Qualification Status Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final QualificationStatusKind[] VALUES_ARRAY =
-		new QualificationStatusKind[] {
-			NOT_QUALIFIED,
-			QUALIFIED,
-			SUSPECT,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Qualification Status Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<QualificationStatusKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Qualification Status Kind</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 QualificationStatusKind get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			QualificationStatusKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Qualification Status Kind</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 QualificationStatusKind getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			QualificationStatusKind result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Qualification Status Kind</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 QualificationStatusKind get(int value) {
-		switch (value) {
-			case NOT_QUALIFIED_VALUE: return NOT_QUALIFIED;
-			case QUALIFIED_VALUE: return QUALIFIED;
-			case SUSPECT_VALUE: return SUSPECT;
-		}
-		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 QualificationStatusKind(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-	  return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-	  return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	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;
-	}
-	
-} //QualificationStatusKind
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementandprocessconcerns/RequirementAndProcessConcernsFactory.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementandprocessconcerns/RequirementAndProcessConcernsFactory.java
deleted file mode 100644
index 5fb69ad..0000000
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementandprocessconcerns/RequirementAndProcessConcernsFactory.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Copyright (c) 2017 CEA LIST.
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *   Sébastien Gerard (CEA LIST) <sebastien.gerard@cea.fr> - Initial API and implementation
- *   Yupanqui Munoz Julho (CEA LIST) <yupanqui.munozjulho@cea.fr> - Initial API and implementation
- * 
- */
-package org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.RequirementAndProcessConcernsPackage
- * @generated
- */
-public interface RequirementAndProcessConcernsFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	RequirementAndProcessConcernsFactory eINSTANCE = org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.impl.RequirementAndProcessConcernsFactoryImpl.init();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	RequirementAndProcessConcernsPackage getRequirementAndProcessConcernsPackage();
-
-} //RequirementAndProcessConcernsFactory
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementandprocessconcerns/RequirementAndProcessConcernsPackage.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementandprocessconcerns/RequirementAndProcessConcernsPackage.java
deleted file mode 100644
index b36c3b0..0000000
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementandprocessconcerns/RequirementAndProcessConcernsPackage.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/**
- * Copyright (c) 2017 CEA LIST.
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *   Sébastien Gerard (CEA LIST) <sebastien.gerard@cea.fr> - Initial API and implementation
- *   Yupanqui Munoz Julho (CEA LIST) <yupanqui.munozjulho@cea.fr> - Initial API and implementation
- * 
- */
-package org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns;
-
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each operation of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.RequirementAndProcessConcernsFactory
- * @model kind="package"
- *        annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='RequirementAndProcessConcerns'"
- * @generated
- */
-public interface RequirementAndProcessConcernsPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "requirementandprocessconcerns"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http://www.eclipse.org/papyrus/requirements/sysml14/0.7.0/PapyrusRE/ModelLibrary/PapyrusREStandardUtils/RequirementAndProcessConcerns"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "RequirementAndProcessConcerns"; //$NON-NLS-1$
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	RequirementAndProcessConcernsPackage eINSTANCE = org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.impl.RequirementAndProcessConcernsPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.AgreementStatusKind <em>Agreement Status Kind</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.AgreementStatusKind
-	 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.impl.RequirementAndProcessConcernsPackageImpl#getAgreementStatusKind()
-	 * @generated
-	 */
-	int AGREEMENT_STATUS_KIND = 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.QualificationStatusKind <em>Qualification Status Kind</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.QualificationStatusKind
-	 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.impl.RequirementAndProcessConcernsPackageImpl#getQualificationStatusKind()
-	 * @generated
-	 */
-	int QUALIFICATION_STATUS_KIND = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.SatisfactionStatusKind <em>Satisfaction Status Kind</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.SatisfactionStatusKind
-	 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.impl.RequirementAndProcessConcernsPackageImpl#getSatisfactionStatusKind()
-	 * @generated
-	 */
-	int SATISFACTION_STATUS_KIND = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.ReviewStatusKind <em>Review Status Kind</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.ReviewStatusKind
-	 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.impl.RequirementAndProcessConcernsPackageImpl#getReviewStatusKind()
-	 * @generated
-	 */
-	int REVIEW_STATUS_KIND = 3;
-
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.AgreementStatusKind <em>Agreement Status Kind</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Agreement Status Kind</em>'.
-	 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.AgreementStatusKind
-	 * @generated
-	 */
-	EEnum getAgreementStatusKind();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.QualificationStatusKind <em>Qualification Status Kind</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Qualification Status Kind</em>'.
-	 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.QualificationStatusKind
-	 * @generated
-	 */
-	EEnum getQualificationStatusKind();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.SatisfactionStatusKind <em>Satisfaction Status Kind</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Satisfaction Status Kind</em>'.
-	 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.SatisfactionStatusKind
-	 * @generated
-	 */
-	EEnum getSatisfactionStatusKind();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.ReviewStatusKind <em>Review Status Kind</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Review Status Kind</em>'.
-	 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.ReviewStatusKind
-	 * @generated
-	 */
-	EEnum getReviewStatusKind();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	RequirementAndProcessConcernsFactory getRequirementAndProcessConcernsFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each operation of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.AgreementStatusKind <em>Agreement Status Kind</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.AgreementStatusKind
-		 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.impl.RequirementAndProcessConcernsPackageImpl#getAgreementStatusKind()
-		 * @generated
-		 */
-		EEnum AGREEMENT_STATUS_KIND = eINSTANCE.getAgreementStatusKind();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.QualificationStatusKind <em>Qualification Status Kind</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.QualificationStatusKind
-		 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.impl.RequirementAndProcessConcernsPackageImpl#getQualificationStatusKind()
-		 * @generated
-		 */
-		EEnum QUALIFICATION_STATUS_KIND = eINSTANCE.getQualificationStatusKind();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.SatisfactionStatusKind <em>Satisfaction Status Kind</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.SatisfactionStatusKind
-		 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.impl.RequirementAndProcessConcernsPackageImpl#getSatisfactionStatusKind()
-		 * @generated
-		 */
-		EEnum SATISFACTION_STATUS_KIND = eINSTANCE.getSatisfactionStatusKind();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.ReviewStatusKind <em>Review Status Kind</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.ReviewStatusKind
-		 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.impl.RequirementAndProcessConcernsPackageImpl#getReviewStatusKind()
-		 * @generated
-		 */
-		EEnum REVIEW_STATUS_KIND = eINSTANCE.getReviewStatusKind();
-
-	}
-
-} //RequirementAndProcessConcernsPackage
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementandprocessconcerns/ReviewStatusKind.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementandprocessconcerns/ReviewStatusKind.java
deleted file mode 100644
index 2e0af70..0000000
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementandprocessconcerns/ReviewStatusKind.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/**
- * Copyright (c) 2017 CEA LIST.
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *   Sébastien Gerard (CEA LIST) <sebastien.gerard@cea.fr> - Initial API and implementation
- *   Yupanqui Munoz Julho (CEA LIST) <yupanqui.munozjulho@cea.fr> - Initial API and implementation
- * 
- */
-package org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns;
-
-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>Review Status Kind</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.RequirementAndProcessConcernsPackage#getReviewStatusKind()
- * @model
- * @generated
- */
-public enum ReviewStatusKind implements Enumerator {
-	/**
-	 * The '<em><b>To Be Reviewed</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #TO_BE_REVIEWED_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	TO_BE_REVIEWED(0, "ToBeReviewed", "ToBeReviewed"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Accepted</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #ACCEPTED_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	ACCEPTED(1, "Accepted", "Accepted"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Rejected</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #REJECTED_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	REJECTED(2, "Rejected", "Rejected"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>To Be Reviewed</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>To Be Reviewed</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #TO_BE_REVIEWED
-	 * @model name="ToBeReviewed"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int TO_BE_REVIEWED_VALUE = 0;
-
-	/**
-	 * The '<em><b>Accepted</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Accepted</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #ACCEPTED
-	 * @model name="Accepted"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ACCEPTED_VALUE = 1;
-
-	/**
-	 * The '<em><b>Rejected</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Rejected</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #REJECTED
-	 * @model name="Rejected"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int REJECTED_VALUE = 2;
-
-	/**
-	 * An array of all the '<em><b>Review Status Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final ReviewStatusKind[] VALUES_ARRAY =
-		new ReviewStatusKind[] {
-			TO_BE_REVIEWED,
-			ACCEPTED,
-			REJECTED,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Review Status Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<ReviewStatusKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Review Status Kind</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 ReviewStatusKind get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			ReviewStatusKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Review Status Kind</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 ReviewStatusKind getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			ReviewStatusKind result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Review Status Kind</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 ReviewStatusKind get(int value) {
-		switch (value) {
-			case TO_BE_REVIEWED_VALUE: return TO_BE_REVIEWED;
-			case ACCEPTED_VALUE: return ACCEPTED;
-			case REJECTED_VALUE: return REJECTED;
-		}
-		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 ReviewStatusKind(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-	  return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-	  return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	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;
-	}
-	
-} //ReviewStatusKind
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementandprocessconcerns/SatisfactionStatusKind.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementandprocessconcerns/SatisfactionStatusKind.java
deleted file mode 100644
index f23b96e..0000000
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementandprocessconcerns/SatisfactionStatusKind.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/**
- * Copyright (c) 2017 CEA LIST.
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *   Sébastien Gerard (CEA LIST) <sebastien.gerard@cea.fr> - Initial API and implementation
- *   Yupanqui Munoz Julho (CEA LIST) <yupanqui.munozjulho@cea.fr> - Initial API and implementation
- * 
- */
-package org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns;
-
-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>Satisfaction Status Kind</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.RequirementAndProcessConcernsPackage#getSatisfactionStatusKind()
- * @model
- * @generated
- */
-public enum SatisfactionStatusKind implements Enumerator {
-	/**
-	 * The '<em><b>Not Satisfied</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #NOT_SATISFIED_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	NOT_SATISFIED(0, "NotSatisfied", "NotSatisfied"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Satisfied</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #SATISFIED_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	SATISFIED(1, "Satisfied", "Satisfied"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Suspect</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #SUSPECT_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	SUSPECT(2, "Suspect", "Suspect"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Not Satisfied</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Not Satisfied</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #NOT_SATISFIED
-	 * @model name="NotSatisfied"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int NOT_SATISFIED_VALUE = 0;
-
-	/**
-	 * The '<em><b>Satisfied</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Satisfied</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #SATISFIED
-	 * @model name="Satisfied"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int SATISFIED_VALUE = 1;
-
-	/**
-	 * The '<em><b>Suspect</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Suspect</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #SUSPECT
-	 * @model name="Suspect"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int SUSPECT_VALUE = 2;
-
-	/**
-	 * An array of all the '<em><b>Satisfaction Status Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final SatisfactionStatusKind[] VALUES_ARRAY =
-		new SatisfactionStatusKind[] {
-			NOT_SATISFIED,
-			SATISFIED,
-			SUSPECT,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Satisfaction Status Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<SatisfactionStatusKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Satisfaction Status Kind</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 SatisfactionStatusKind get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			SatisfactionStatusKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Satisfaction Status Kind</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 SatisfactionStatusKind getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			SatisfactionStatusKind result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Satisfaction Status Kind</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 SatisfactionStatusKind get(int value) {
-		switch (value) {
-			case NOT_SATISFIED_VALUE: return NOT_SATISFIED;
-			case SATISFIED_VALUE: return SATISFIED;
-			case SUSPECT_VALUE: return SUSPECT;
-		}
-		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 SatisfactionStatusKind(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-	  return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-	  return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	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;
-	}
-	
-} //SatisfactionStatusKind
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementandprocessconcerns/impl/RequirementAndProcessConcernsFactoryImpl.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementandprocessconcerns/impl/RequirementAndProcessConcernsFactoryImpl.java
deleted file mode 100644
index 5cda133..0000000
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementandprocessconcerns/impl/RequirementAndProcessConcernsFactoryImpl.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/**
- * Copyright (c) 2017 CEA LIST.
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *   Sébastien Gerard (CEA LIST) <sebastien.gerard@cea.fr> - Initial API and implementation
- *   Yupanqui Munoz Julho (CEA LIST) <yupanqui.munozjulho@cea.fr> - Initial API and implementation
- * 
- */
-package org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.*;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class RequirementAndProcessConcernsFactoryImpl extends EFactoryImpl implements RequirementAndProcessConcernsFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static RequirementAndProcessConcernsFactory init() {
-		try {
-			RequirementAndProcessConcernsFactory theRequirementAndProcessConcernsFactory = (RequirementAndProcessConcernsFactory)EPackage.Registry.INSTANCE.getEFactory(RequirementAndProcessConcernsPackage.eNS_URI);
-			if (theRequirementAndProcessConcernsFactory != null) {
-				return theRequirementAndProcessConcernsFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new RequirementAndProcessConcernsFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RequirementAndProcessConcernsFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case RequirementAndProcessConcernsPackage.AGREEMENT_STATUS_KIND:
-				return createAgreementStatusKindFromString(eDataType, initialValue);
-			case RequirementAndProcessConcernsPackage.QUALIFICATION_STATUS_KIND:
-				return createQualificationStatusKindFromString(eDataType, initialValue);
-			case RequirementAndProcessConcernsPackage.SATISFACTION_STATUS_KIND:
-				return createSatisfactionStatusKindFromString(eDataType, initialValue);
-			case RequirementAndProcessConcernsPackage.REVIEW_STATUS_KIND:
-				return createReviewStatusKindFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case RequirementAndProcessConcernsPackage.AGREEMENT_STATUS_KIND:
-				return convertAgreementStatusKindToString(eDataType, instanceValue);
-			case RequirementAndProcessConcernsPackage.QUALIFICATION_STATUS_KIND:
-				return convertQualificationStatusKindToString(eDataType, instanceValue);
-			case RequirementAndProcessConcernsPackage.SATISFACTION_STATUS_KIND:
-				return convertSatisfactionStatusKindToString(eDataType, instanceValue);
-			case RequirementAndProcessConcernsPackage.REVIEW_STATUS_KIND:
-				return convertReviewStatusKindToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AgreementStatusKind createAgreementStatusKindFromString(EDataType eDataType, String initialValue) {
-		AgreementStatusKind result = AgreementStatusKind.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 convertAgreementStatusKindToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public QualificationStatusKind createQualificationStatusKindFromString(EDataType eDataType, String initialValue) {
-		QualificationStatusKind result = QualificationStatusKind.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 convertQualificationStatusKindToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SatisfactionStatusKind createSatisfactionStatusKindFromString(EDataType eDataType, String initialValue) {
-		SatisfactionStatusKind result = SatisfactionStatusKind.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 convertSatisfactionStatusKindToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ReviewStatusKind createReviewStatusKindFromString(EDataType eDataType, String initialValue) {
-		ReviewStatusKind result = ReviewStatusKind.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 convertReviewStatusKindToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RequirementAndProcessConcernsPackage getRequirementAndProcessConcernsPackage() {
-		return (RequirementAndProcessConcernsPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static RequirementAndProcessConcernsPackage getPackage() {
-		return RequirementAndProcessConcernsPackage.eINSTANCE;
-	}
-
-} //RequirementAndProcessConcernsFactoryImpl
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementandprocessconcerns/impl/RequirementAndProcessConcernsPackageImpl.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementandprocessconcerns/impl/RequirementAndProcessConcernsPackageImpl.java
deleted file mode 100644
index 2fece4a..0000000
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementandprocessconcerns/impl/RequirementAndProcessConcernsPackageImpl.java
+++ /dev/null
@@ -1,294 +0,0 @@
-/**
- * Copyright (c) 2017 CEA LIST.
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *   Sébastien Gerard (CEA LIST) <sebastien.gerard@cea.fr> - Initial API and implementation
- *   Yupanqui Munoz Julho (CEA LIST) <yupanqui.munozjulho@cea.fr> - Initial API and implementation
- * 
- */
-package org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.impl;
-
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.priorityandimportanceconcerns.PriorityAndImportanceConcernsPackage;
-
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.priorityandimportanceconcerns.impl.PriorityAndImportanceConcernsPackageImpl;
-
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.AgreementStatusKind;
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.QualificationStatusKind;
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.RequirementAndProcessConcernsFactory;
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.RequirementAndProcessConcernsPackage;
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.ReviewStatusKind;
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.SatisfactionStatusKind;
-
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementclassificationconcerns.RequirementClassificationConcernsPackage;
-
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementclassificationconcerns.impl.RequirementClassificationConcernsPackageImpl;
-
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementscharacteristicsconcerns.RequirementsCharacteristicsConcernsPackage;
-
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementscharacteristicsconcerns.impl.RequirementsCharacteristicsConcernsPackageImpl;
-
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.verificationandvalidationconcerns.VerificationAndValidationConcernsPackage;
-
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.verificationandvalidationconcerns.impl.VerificationAndValidationConcernsPackageImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class RequirementAndProcessConcernsPackageImpl extends EPackageImpl implements RequirementAndProcessConcernsPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum agreementStatusKindEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum qualificationStatusKindEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum satisfactionStatusKindEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum reviewStatusKindEEnum = 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.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.RequirementAndProcessConcernsPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private RequirementAndProcessConcernsPackageImpl() {
-		super(eNS_URI, RequirementAndProcessConcernsFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
-	 * <p>This method is used to initialize {@link RequirementAndProcessConcernsPackage#eINSTANCE} when that field is accessed.
-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static RequirementAndProcessConcernsPackage init() {
-		if (isInited) return (RequirementAndProcessConcernsPackage)EPackage.Registry.INSTANCE.getEPackage(RequirementAndProcessConcernsPackage.eNS_URI);
-
-		// Obtain or create and register package
-		RequirementAndProcessConcernsPackageImpl theRequirementAndProcessConcernsPackage = (RequirementAndProcessConcernsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof RequirementAndProcessConcernsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new RequirementAndProcessConcernsPackageImpl());
-
-		isInited = true;
-
-		// Obtain or create and register interdependencies
-		RequirementClassificationConcernsPackageImpl theRequirementClassificationConcernsPackage = (RequirementClassificationConcernsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(RequirementClassificationConcernsPackage.eNS_URI) instanceof RequirementClassificationConcernsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(RequirementClassificationConcernsPackage.eNS_URI) : RequirementClassificationConcernsPackage.eINSTANCE);
-		RequirementsCharacteristicsConcernsPackageImpl theRequirementsCharacteristicsConcernsPackage = (RequirementsCharacteristicsConcernsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(RequirementsCharacteristicsConcernsPackage.eNS_URI) instanceof RequirementsCharacteristicsConcernsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(RequirementsCharacteristicsConcernsPackage.eNS_URI) : RequirementsCharacteristicsConcernsPackage.eINSTANCE);
-		PriorityAndImportanceConcernsPackageImpl thePriorityAndImportanceConcernsPackage = (PriorityAndImportanceConcernsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(PriorityAndImportanceConcernsPackage.eNS_URI) instanceof PriorityAndImportanceConcernsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(PriorityAndImportanceConcernsPackage.eNS_URI) : PriorityAndImportanceConcernsPackage.eINSTANCE);
-		VerificationAndValidationConcernsPackageImpl theVerificationAndValidationConcernsPackage = (VerificationAndValidationConcernsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(VerificationAndValidationConcernsPackage.eNS_URI) instanceof VerificationAndValidationConcernsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(VerificationAndValidationConcernsPackage.eNS_URI) : VerificationAndValidationConcernsPackage.eINSTANCE);
-
-		// Create package meta-data objects
-		theRequirementAndProcessConcernsPackage.createPackageContents();
-		theRequirementClassificationConcernsPackage.createPackageContents();
-		theRequirementsCharacteristicsConcernsPackage.createPackageContents();
-		thePriorityAndImportanceConcernsPackage.createPackageContents();
-		theVerificationAndValidationConcernsPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theRequirementAndProcessConcernsPackage.initializePackageContents();
-		theRequirementClassificationConcernsPackage.initializePackageContents();
-		theRequirementsCharacteristicsConcernsPackage.initializePackageContents();
-		thePriorityAndImportanceConcernsPackage.initializePackageContents();
-		theVerificationAndValidationConcernsPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theRequirementAndProcessConcernsPackage.freeze();
-
-  
-		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(RequirementAndProcessConcernsPackage.eNS_URI, theRequirementAndProcessConcernsPackage);
-		return theRequirementAndProcessConcernsPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getAgreementStatusKind() {
-		return agreementStatusKindEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getQualificationStatusKind() {
-		return qualificationStatusKindEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getSatisfactionStatusKind() {
-		return satisfactionStatusKindEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getReviewStatusKind() {
-		return reviewStatusKindEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RequirementAndProcessConcernsFactory getRequirementAndProcessConcernsFactory() {
-		return (RequirementAndProcessConcernsFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create enums
-		agreementStatusKindEEnum = createEEnum(AGREEMENT_STATUS_KIND);
-		qualificationStatusKindEEnum = createEEnum(QUALIFICATION_STATUS_KIND);
-		satisfactionStatusKindEEnum = createEEnum(SATISFACTION_STATUS_KIND);
-		reviewStatusKindEEnum = createEEnum(REVIEW_STATUS_KIND);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Initialize enums and add enum literals
-		initEEnum(agreementStatusKindEEnum, AgreementStatusKind.class, "AgreementStatusKind"); //$NON-NLS-1$
-		addEEnumLiteral(agreementStatusKindEEnum, AgreementStatusKind.SUBMITTED);
-		addEEnumLiteral(agreementStatusKindEEnum, AgreementStatusKind.TO_BE_REFINED);
-		addEEnumLiteral(agreementStatusKindEEnum, AgreementStatusKind.ACCEPTED);
-		addEEnumLiteral(agreementStatusKindEEnum, AgreementStatusKind.DRAFT);
-		addEEnumLiteral(agreementStatusKindEEnum, AgreementStatusKind.REJECTED);
-
-		initEEnum(qualificationStatusKindEEnum, QualificationStatusKind.class, "QualificationStatusKind"); //$NON-NLS-1$
-		addEEnumLiteral(qualificationStatusKindEEnum, QualificationStatusKind.NOT_QUALIFIED);
-		addEEnumLiteral(qualificationStatusKindEEnum, QualificationStatusKind.QUALIFIED);
-		addEEnumLiteral(qualificationStatusKindEEnum, QualificationStatusKind.SUSPECT);
-
-		initEEnum(satisfactionStatusKindEEnum, SatisfactionStatusKind.class, "SatisfactionStatusKind"); //$NON-NLS-1$
-		addEEnumLiteral(satisfactionStatusKindEEnum, SatisfactionStatusKind.NOT_SATISFIED);
-		addEEnumLiteral(satisfactionStatusKindEEnum, SatisfactionStatusKind.SATISFIED);
-		addEEnumLiteral(satisfactionStatusKindEEnum, SatisfactionStatusKind.SUSPECT);
-
-		initEEnum(reviewStatusKindEEnum, ReviewStatusKind.class, "ReviewStatusKind"); //$NON-NLS-1$
-		addEEnumLiteral(reviewStatusKindEEnum, ReviewStatusKind.TO_BE_REVIEWED);
-		addEEnumLiteral(reviewStatusKindEEnum, ReviewStatusKind.ACCEPTED);
-		addEEnumLiteral(reviewStatusKindEEnum, ReviewStatusKind.REJECTED);
-
-		// Create resource
-		createResource(eNS_URI);
-
-		// Create annotations
-		// http://www.eclipse.org/uml2/2.0.0/UML
-		createUMLAnnotations();
-	}
-
-	/**
-	 * Initializes the annotations for <b>http://www.eclipse.org/uml2/2.0.0/UML</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void createUMLAnnotations() {
-		String source = "http://www.eclipse.org/uml2/2.0.0/UML"; //$NON-NLS-1$	
-		addAnnotation
-		  (this, 
-		   source, 
-		   new String[] {
-			 "originalName", "RequirementAndProcessConcerns" //$NON-NLS-1$ //$NON-NLS-2$
-		   });
-	}
-
-} //RequirementAndProcessConcernsPackageImpl
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementclassificationconcerns/ConstraintKind.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementclassificationconcerns/ConstraintKind.java
deleted file mode 100644
index cc89bf9..0000000
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementclassificationconcerns/ConstraintKind.java
+++ /dev/null
@@ -1,414 +0,0 @@
-/**
- * Copyright (c) 2017 CEA LIST.
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *   Sébastien Gerard (CEA LIST) <sebastien.gerard@cea.fr> - Initial API and implementation
- *   Yupanqui Munoz Julho (CEA LIST) <yupanqui.munozjulho@cea.fr> - Initial API and implementation
- * 
- */
-package org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementclassificationconcerns;
-
-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>Constraint Kind</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementclassificationconcerns.RequirementClassificationConcernsPackage#getConstraintKind()
- * @model
- * @generated
- */
-public enum ConstraintKind implements Enumerator {
-	/**
-	 * The '<em><b>Cultural</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #CULTURAL_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	CULTURAL(0, "Cultural", "Cultural"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Design</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #DESIGN_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	DESIGN(1, "Design", "Design"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Environment</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #ENVIRONMENT_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	ENVIRONMENT(2, "Environment", "Environment"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Implementation</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #IMPLEMENTATION_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	IMPLEMENTATION(3, "Implementation", "Implementation"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Interface</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #INTERFACE_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	INTERFACE(4, "Interface", "Interface"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Physical</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #PHYSICAL_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	PHYSICAL(5, "Physical", "Physical"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Standard</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #STANDARD_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	STANDARD(6, "Standard", "Standard"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Other</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #OTHER_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	OTHER(7, "Other", "Other"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Undefined</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #UNDEFINED_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	UNDEFINED(8, "Undefined", "Undefined"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Cultural</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Cultural</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #CULTURAL
-	 * @model name="Cultural"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int CULTURAL_VALUE = 0;
-
-	/**
-	 * The '<em><b>Design</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Design</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #DESIGN
-	 * @model name="Design"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int DESIGN_VALUE = 1;
-
-	/**
-	 * The '<em><b>Environment</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Environment</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #ENVIRONMENT
-	 * @model name="Environment"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ENVIRONMENT_VALUE = 2;
-
-	/**
-	 * The '<em><b>Implementation</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Implementation</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #IMPLEMENTATION
-	 * @model name="Implementation"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int IMPLEMENTATION_VALUE = 3;
-
-	/**
-	 * The '<em><b>Interface</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Interface</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #INTERFACE
-	 * @model name="Interface"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int INTERFACE_VALUE = 4;
-
-	/**
-	 * The '<em><b>Physical</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Physical</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #PHYSICAL
-	 * @model name="Physical"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int PHYSICAL_VALUE = 5;
-
-	/**
-	 * The '<em><b>Standard</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Standard</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #STANDARD
-	 * @model name="Standard"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int STANDARD_VALUE = 6;
-
-	/**
-	 * The '<em><b>Other</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Other</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #OTHER
-	 * @model name="Other"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int OTHER_VALUE = 7;
-
-	/**
-	 * The '<em><b>Undefined</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Undefined</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #UNDEFINED
-	 * @model name="Undefined"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int UNDEFINED_VALUE = 8;
-
-	/**
-	 * An array of all the '<em><b>Constraint Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final ConstraintKind[] VALUES_ARRAY =
-		new ConstraintKind[] {
-			CULTURAL,
-			DESIGN,
-			ENVIRONMENT,
-			IMPLEMENTATION,
-			INTERFACE,
-			PHYSICAL,
-			STANDARD,
-			OTHER,
-			UNDEFINED,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Constraint Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<ConstraintKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Constraint Kind</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 ConstraintKind get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			ConstraintKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Constraint Kind</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 ConstraintKind getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			ConstraintKind result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Constraint Kind</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 ConstraintKind get(int value) {
-		switch (value) {
-			case CULTURAL_VALUE: return CULTURAL;
-			case DESIGN_VALUE: return DESIGN;
-			case ENVIRONMENT_VALUE: return ENVIRONMENT;
-			case IMPLEMENTATION_VALUE: return IMPLEMENTATION;
-			case INTERFACE_VALUE: return INTERFACE;
-			case PHYSICAL_VALUE: return PHYSICAL;
-			case STANDARD_VALUE: return STANDARD;
-			case OTHER_VALUE: return OTHER;
-			case UNDEFINED_VALUE: return UNDEFINED;
-		}
-		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 ConstraintKind(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-	  return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-	  return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	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;
-	}
-	
-} //ConstraintKind
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementclassificationconcerns/QualityKind.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementclassificationconcerns/QualityKind.java
deleted file mode 100644
index ee87c04..0000000
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementclassificationconcerns/QualityKind.java
+++ /dev/null
@@ -1,441 +0,0 @@
-/**
- * Copyright (c) 2017 CEA LIST.
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *   Sébastien Gerard (CEA LIST) <sebastien.gerard@cea.fr> - Initial API and implementation
- *   Yupanqui Munoz Julho (CEA LIST) <yupanqui.munozjulho@cea.fr> - Initial API and implementation
- * 
- */
-package org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementclassificationconcerns;
-
-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>Quality Kind</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementclassificationconcerns.RequirementClassificationConcernsPackage#getQualityKind()
- * @model
- * @generated
- */
-public enum QualityKind implements Enumerator {
-	/**
-	 * The '<em><b>Adaptability</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #ADAPTABILITY_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	ADAPTABILITY(0, "Adaptability", "Adaptability"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Availability</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #AVAILABILITY_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	AVAILABILITY(1, "Availability", "Availability"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Compatability</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #COMPATABILITY_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	COMPATABILITY(2, "Compatability", "Compatability"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Maintainability</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #MAINTAINABILITY_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	MAINTAINABILITY(3, "Maintainability", "Maintainability"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Portability</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #PORTABILITY_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	PORTABILITY(4, "Portability", "Portability"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Reliability</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #RELIABILITY_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	RELIABILITY(5, "Reliability", "Reliability"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Safety</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #SAFETY_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	SAFETY(6, "Safety", "Safety"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Security</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #SECURITY_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	SECURITY(7, "Security", "Security"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Usability</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #USABILITY_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	USABILITY(8, "Usability", "Usability"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Variability</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #VARIABILITY_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	VARIABILITY(9, "Variability", "Variability"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Adaptability</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Adaptability</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #ADAPTABILITY
-	 * @model name="Adaptability"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ADAPTABILITY_VALUE = 0;
-
-	/**
-	 * The '<em><b>Availability</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Availability</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #AVAILABILITY
-	 * @model name="Availability"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int AVAILABILITY_VALUE = 1;
-
-	/**
-	 * The '<em><b>Compatability</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Compatability</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #COMPATABILITY
-	 * @model name="Compatability"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int COMPATABILITY_VALUE = 2;
-
-	/**
-	 * The '<em><b>Maintainability</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Maintainability</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #MAINTAINABILITY
-	 * @model name="Maintainability"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int MAINTAINABILITY_VALUE = 3;
-
-	/**
-	 * The '<em><b>Portability</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Portability</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #PORTABILITY
-	 * @model name="Portability"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int PORTABILITY_VALUE = 4;
-
-	/**
-	 * The '<em><b>Reliability</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Reliability</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #RELIABILITY
-	 * @model name="Reliability"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int RELIABILITY_VALUE = 5;
-
-	/**
-	 * The '<em><b>Safety</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Safety</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #SAFETY
-	 * @model name="Safety"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int SAFETY_VALUE = 6;
-
-	/**
-	 * The '<em><b>Security</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Security</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #SECURITY
-	 * @model name="Security"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int SECURITY_VALUE = 7;
-
-	/**
-	 * The '<em><b>Usability</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Usability</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #USABILITY
-	 * @model name="Usability"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int USABILITY_VALUE = 8;
-
-	/**
-	 * The '<em><b>Variability</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Variability</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #VARIABILITY
-	 * @model name="Variability"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int VARIABILITY_VALUE = 9;
-
-	/**
-	 * An array of all the '<em><b>Quality Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final QualityKind[] VALUES_ARRAY =
-		new QualityKind[] {
-			ADAPTABILITY,
-			AVAILABILITY,
-			COMPATABILITY,
-			MAINTAINABILITY,
-			PORTABILITY,
-			RELIABILITY,
-			SAFETY,
-			SECURITY,
-			USABILITY,
-			VARIABILITY,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Quality Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<QualityKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Quality Kind</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 QualityKind get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			QualityKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Quality Kind</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 QualityKind getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			QualityKind result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Quality Kind</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 QualityKind get(int value) {
-		switch (value) {
-			case ADAPTABILITY_VALUE: return ADAPTABILITY;
-			case AVAILABILITY_VALUE: return AVAILABILITY;
-			case COMPATABILITY_VALUE: return COMPATABILITY;
-			case MAINTAINABILITY_VALUE: return MAINTAINABILITY;
-			case PORTABILITY_VALUE: return PORTABILITY;
-			case RELIABILITY_VALUE: return RELIABILITY;
-			case SAFETY_VALUE: return SAFETY;
-			case SECURITY_VALUE: return SECURITY;
-			case USABILITY_VALUE: return USABILITY;
-			case VARIABILITY_VALUE: return VARIABILITY;
-		}
-		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 QualityKind(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-	  return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-	  return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	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;
-	}
-	
-} //QualityKind
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementclassificationconcerns/RequirementClassificationConcernsFactory.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementclassificationconcerns/RequirementClassificationConcernsFactory.java
deleted file mode 100644
index e9ddb6c..0000000
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementclassificationconcerns/RequirementClassificationConcernsFactory.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Copyright (c) 2017 CEA LIST.
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *   Sébastien Gerard (CEA LIST) <sebastien.gerard@cea.fr> - Initial API and implementation
- *   Yupanqui Munoz Julho (CEA LIST) <yupanqui.munozjulho@cea.fr> - Initial API and implementation
- * 
- */
-package org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementclassificationconcerns;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementclassificationconcerns.RequirementClassificationConcernsPackage
- * @generated
- */
-public interface RequirementClassificationConcernsFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	RequirementClassificationConcernsFactory eINSTANCE = org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementclassificationconcerns.impl.RequirementClassificationConcernsFactoryImpl.init();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	RequirementClassificationConcernsPackage getRequirementClassificationConcernsPackage();
-
-} //RequirementClassificationConcernsFactory
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementclassificationconcerns/RequirementClassificationConcernsPackage.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementclassificationconcerns/RequirementClassificationConcernsPackage.java
deleted file mode 100644
index 3ff4a5d..0000000
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementclassificationconcerns/RequirementClassificationConcernsPackage.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/**
- * Copyright (c) 2017 CEA LIST.
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *   Sébastien Gerard (CEA LIST) <sebastien.gerard@cea.fr> - Initial API and implementation
- *   Yupanqui Munoz Julho (CEA LIST) <yupanqui.munozjulho@cea.fr> - Initial API and implementation
- * 
- */
-package org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementclassificationconcerns;
-
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each operation of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementclassificationconcerns.RequirementClassificationConcernsFactory
- * @model kind="package"
- *        annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='RequirementClassificationConcerns'"
- * @generated
- */
-public interface RequirementClassificationConcernsPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "requirementclassificationconcerns"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http://www.eclipse.org/papyrus/requirements/sysml14/0.7.0/PapyrusRE/ModelLibrary/PapyrusREStandardUtils/RequirementClassificationConcerns"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "requirementclassificationconcerns"; //$NON-NLS-1$
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	RequirementClassificationConcernsPackage eINSTANCE = org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementclassificationconcerns.impl.RequirementClassificationConcernsPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementclassificationconcerns.QualityKind <em>Quality Kind</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementclassificationconcerns.QualityKind
-	 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementclassificationconcerns.impl.RequirementClassificationConcernsPackageImpl#getQualityKind()
-	 * @generated
-	 */
-	int QUALITY_KIND = 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementclassificationconcerns.ConstraintKind <em>Constraint Kind</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementclassificationconcerns.ConstraintKind
-	 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementclassificationconcerns.impl.RequirementClassificationConcernsPackageImpl#getConstraintKind()
-	 * @generated
-	 */
-	int CONSTRAINT_KIND = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementclassificationconcerns.WorkloadCapacitiesKind <em>Workload Capacities Kind</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementclassificationconcerns.WorkloadCapacitiesKind
-	 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementclassificationconcerns.impl.RequirementClassificationConcernsPackageImpl#getWorkloadCapacitiesKind()
-	 * @generated
-	 */
-	int WORKLOAD_CAPACITIES_KIND = 2;
-
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementclassificationconcerns.QualityKind <em>Quality Kind</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Quality Kind</em>'.
-	 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementclassificationconcerns.QualityKind
-	 * @generated
-	 */
-	EEnum getQualityKind();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementclassificationconcerns.ConstraintKind <em>Constraint Kind</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Constraint Kind</em>'.
-	 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementclassificationconcerns.ConstraintKind
-	 * @generated
-	 */
-	EEnum getConstraintKind();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementclassificationconcerns.WorkloadCapacitiesKind <em>Workload Capacities Kind</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Workload Capacities Kind</em>'.
-	 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementclassificationconcerns.WorkloadCapacitiesKind
-	 * @generated
-	 */
-	EEnum getWorkloadCapacitiesKind();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	RequirementClassificationConcernsFactory getRequirementClassificationConcernsFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each operation of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementclassificationconcerns.QualityKind <em>Quality Kind</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementclassificationconcerns.QualityKind
-		 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementclassificationconcerns.impl.RequirementClassificationConcernsPackageImpl#getQualityKind()
-		 * @generated
-		 */
-		EEnum QUALITY_KIND = eINSTANCE.getQualityKind();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementclassificationconcerns.ConstraintKind <em>Constraint Kind</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementclassificationconcerns.ConstraintKind
-		 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementclassificationconcerns.impl.RequirementClassificationConcernsPackageImpl#getConstraintKind()
-		 * @generated
-		 */
-		EEnum CONSTRAINT_KIND = eINSTANCE.getConstraintKind();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementclassificationconcerns.WorkloadCapacitiesKind <em>Workload Capacities Kind</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementclassificationconcerns.WorkloadCapacitiesKind
-		 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementclassificationconcerns.impl.RequirementClassificationConcernsPackageImpl#getWorkloadCapacitiesKind()
-		 * @generated
-		 */
-		EEnum WORKLOAD_CAPACITIES_KIND = eINSTANCE.getWorkloadCapacitiesKind();
-
-	}
-
-} //RequirementClassificationConcernsPackage
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementclassificationconcerns/WorkloadCapacitiesKind.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementclassificationconcerns/WorkloadCapacitiesKind.java
deleted file mode 100644
index deaff37..0000000
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementclassificationconcerns/WorkloadCapacitiesKind.java
+++ /dev/null
@@ -1,333 +0,0 @@
-/**
- * Copyright (c) 2017 CEA LIST.
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *   Sébastien Gerard (CEA LIST) <sebastien.gerard@cea.fr> - Initial API and implementation
- *   Yupanqui Munoz Julho (CEA LIST) <yupanqui.munozjulho@cea.fr> - Initial API and implementation
- * 
- */
-package org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementclassificationconcerns;
-
-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>Workload Capacities Kind</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementclassificationconcerns.RequirementClassificationConcernsPackage#getWorkloadCapacitiesKind()
- * @model
- * @generated
- */
-public enum WorkloadCapacitiesKind implements Enumerator {
-	/**
-	 * The '<em><b>Bound</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #BOUND_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	BOUND(0, "Bound", "Bound"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Memory</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #MEMORY_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	MEMORY(1, "Memory", "Memory"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Speed</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #SPEED_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	SPEED(2, "Speed", "Speed"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Throughput</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #THROUGHPUT_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	THROUGHPUT(3, "Throughput", "Throughput"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Time</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #TIME_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	TIME(4, "Time", "Time"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Volume</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #VOLUME_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	VOLUME(5, "Volume", "Volume"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Bound</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Bound</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #BOUND
-	 * @model name="Bound"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int BOUND_VALUE = 0;
-
-	/**
-	 * The '<em><b>Memory</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Memory</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #MEMORY
-	 * @model name="Memory"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int MEMORY_VALUE = 1;
-
-	/**
-	 * The '<em><b>Speed</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Speed</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #SPEED
-	 * @model name="Speed"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int SPEED_VALUE = 2;
-
-	/**
-	 * The '<em><b>Throughput</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Throughput</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #THROUGHPUT
-	 * @model name="Throughput"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int THROUGHPUT_VALUE = 3;
-
-	/**
-	 * The '<em><b>Time</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Time</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #TIME
-	 * @model name="Time"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int TIME_VALUE = 4;
-
-	/**
-	 * The '<em><b>Volume</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Volume</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #VOLUME
-	 * @model name="Volume"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int VOLUME_VALUE = 5;
-
-	/**
-	 * An array of all the '<em><b>Workload Capacities Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final WorkloadCapacitiesKind[] VALUES_ARRAY =
-		new WorkloadCapacitiesKind[] {
-			BOUND,
-			MEMORY,
-			SPEED,
-			THROUGHPUT,
-			TIME,
-			VOLUME,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Workload Capacities Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<WorkloadCapacitiesKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Workload Capacities Kind</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 WorkloadCapacitiesKind get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			WorkloadCapacitiesKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Workload Capacities Kind</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 WorkloadCapacitiesKind getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			WorkloadCapacitiesKind result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Workload Capacities Kind</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 WorkloadCapacitiesKind get(int value) {
-		switch (value) {
-			case BOUND_VALUE: return BOUND;
-			case MEMORY_VALUE: return MEMORY;
-			case SPEED_VALUE: return SPEED;
-			case THROUGHPUT_VALUE: return THROUGHPUT;
-			case TIME_VALUE: return TIME;
-			case VOLUME_VALUE: return VOLUME;
-		}
-		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 WorkloadCapacitiesKind(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-	  return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-	  return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	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;
-	}
-	
-} //WorkloadCapacitiesKind
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementclassificationconcerns/impl/RequirementClassificationConcernsFactoryImpl.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementclassificationconcerns/impl/RequirementClassificationConcernsFactoryImpl.java
deleted file mode 100644
index 7f950cc..0000000
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementclassificationconcerns/impl/RequirementClassificationConcernsFactoryImpl.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/**
- * Copyright (c) 2017 CEA LIST.
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *   Sébastien Gerard (CEA LIST) <sebastien.gerard@cea.fr> - Initial API and implementation
- *   Yupanqui Munoz Julho (CEA LIST) <yupanqui.munozjulho@cea.fr> - Initial API and implementation
- * 
- */
-package org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementclassificationconcerns.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementclassificationconcerns.*;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class RequirementClassificationConcernsFactoryImpl extends EFactoryImpl implements RequirementClassificationConcernsFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static RequirementClassificationConcernsFactory init() {
-		try {
-			RequirementClassificationConcernsFactory theRequirementClassificationConcernsFactory = (RequirementClassificationConcernsFactory)EPackage.Registry.INSTANCE.getEFactory(RequirementClassificationConcernsPackage.eNS_URI);
-			if (theRequirementClassificationConcernsFactory != null) {
-				return theRequirementClassificationConcernsFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new RequirementClassificationConcernsFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RequirementClassificationConcernsFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case RequirementClassificationConcernsPackage.QUALITY_KIND:
-				return createQualityKindFromString(eDataType, initialValue);
-			case RequirementClassificationConcernsPackage.CONSTRAINT_KIND:
-				return createConstraintKindFromString(eDataType, initialValue);
-			case RequirementClassificationConcernsPackage.WORKLOAD_CAPACITIES_KIND:
-				return createWorkloadCapacitiesKindFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case RequirementClassificationConcernsPackage.QUALITY_KIND:
-				return convertQualityKindToString(eDataType, instanceValue);
-			case RequirementClassificationConcernsPackage.CONSTRAINT_KIND:
-				return convertConstraintKindToString(eDataType, instanceValue);
-			case RequirementClassificationConcernsPackage.WORKLOAD_CAPACITIES_KIND:
-				return convertWorkloadCapacitiesKindToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public QualityKind createQualityKindFromString(EDataType eDataType, String initialValue) {
-		QualityKind result = QualityKind.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 convertQualityKindToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ConstraintKind createConstraintKindFromString(EDataType eDataType, String initialValue) {
-		ConstraintKind result = ConstraintKind.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 convertConstraintKindToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public WorkloadCapacitiesKind createWorkloadCapacitiesKindFromString(EDataType eDataType, String initialValue) {
-		WorkloadCapacitiesKind result = WorkloadCapacitiesKind.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 convertWorkloadCapacitiesKindToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RequirementClassificationConcernsPackage getRequirementClassificationConcernsPackage() {
-		return (RequirementClassificationConcernsPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static RequirementClassificationConcernsPackage getPackage() {
-		return RequirementClassificationConcernsPackage.eINSTANCE;
-	}
-
-} //RequirementClassificationConcernsFactoryImpl
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementclassificationconcerns/impl/RequirementClassificationConcernsPackageImpl.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementclassificationconcerns/impl/RequirementClassificationConcernsPackageImpl.java
deleted file mode 100644
index b09cd9e..0000000
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementclassificationconcerns/impl/RequirementClassificationConcernsPackageImpl.java
+++ /dev/null
@@ -1,285 +0,0 @@
-/**
- * Copyright (c) 2017 CEA LIST.
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *   Sébastien Gerard (CEA LIST) <sebastien.gerard@cea.fr> - Initial API and implementation
- *   Yupanqui Munoz Julho (CEA LIST) <yupanqui.munozjulho@cea.fr> - Initial API and implementation
- * 
- */
-package org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementclassificationconcerns.impl;
-
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.priorityandimportanceconcerns.PriorityAndImportanceConcernsPackage;
-
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.priorityandimportanceconcerns.impl.PriorityAndImportanceConcernsPackageImpl;
-
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.RequirementAndProcessConcernsPackage;
-
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.impl.RequirementAndProcessConcernsPackageImpl;
-
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementclassificationconcerns.ConstraintKind;
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementclassificationconcerns.QualityKind;
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementclassificationconcerns.RequirementClassificationConcernsFactory;
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementclassificationconcerns.RequirementClassificationConcernsPackage;
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementclassificationconcerns.WorkloadCapacitiesKind;
-
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementscharacteristicsconcerns.RequirementsCharacteristicsConcernsPackage;
-
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementscharacteristicsconcerns.impl.RequirementsCharacteristicsConcernsPackageImpl;
-
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.verificationandvalidationconcerns.VerificationAndValidationConcernsPackage;
-
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.verificationandvalidationconcerns.impl.VerificationAndValidationConcernsPackageImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class RequirementClassificationConcernsPackageImpl extends EPackageImpl implements RequirementClassificationConcernsPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum qualityKindEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum constraintKindEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum workloadCapacitiesKindEEnum = 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.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementclassificationconcerns.RequirementClassificationConcernsPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private RequirementClassificationConcernsPackageImpl() {
-		super(eNS_URI, RequirementClassificationConcernsFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
-	 * <p>This method is used to initialize {@link RequirementClassificationConcernsPackage#eINSTANCE} when that field is accessed.
-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static RequirementClassificationConcernsPackage init() {
-		if (isInited) return (RequirementClassificationConcernsPackage)EPackage.Registry.INSTANCE.getEPackage(RequirementClassificationConcernsPackage.eNS_URI);
-
-		// Obtain or create and register package
-		RequirementClassificationConcernsPackageImpl theRequirementClassificationConcernsPackage = (RequirementClassificationConcernsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof RequirementClassificationConcernsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new RequirementClassificationConcernsPackageImpl());
-
-		isInited = true;
-
-		// Obtain or create and register interdependencies
-		RequirementsCharacteristicsConcernsPackageImpl theRequirementsCharacteristicsConcernsPackage = (RequirementsCharacteristicsConcernsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(RequirementsCharacteristicsConcernsPackage.eNS_URI) instanceof RequirementsCharacteristicsConcernsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(RequirementsCharacteristicsConcernsPackage.eNS_URI) : RequirementsCharacteristicsConcernsPackage.eINSTANCE);
-		PriorityAndImportanceConcernsPackageImpl thePriorityAndImportanceConcernsPackage = (PriorityAndImportanceConcernsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(PriorityAndImportanceConcernsPackage.eNS_URI) instanceof PriorityAndImportanceConcernsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(PriorityAndImportanceConcernsPackage.eNS_URI) : PriorityAndImportanceConcernsPackage.eINSTANCE);
-		RequirementAndProcessConcernsPackageImpl theRequirementAndProcessConcernsPackage = (RequirementAndProcessConcernsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(RequirementAndProcessConcernsPackage.eNS_URI) instanceof RequirementAndProcessConcernsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(RequirementAndProcessConcernsPackage.eNS_URI) : RequirementAndProcessConcernsPackage.eINSTANCE);
-		VerificationAndValidationConcernsPackageImpl theVerificationAndValidationConcernsPackage = (VerificationAndValidationConcernsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(VerificationAndValidationConcernsPackage.eNS_URI) instanceof VerificationAndValidationConcernsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(VerificationAndValidationConcernsPackage.eNS_URI) : VerificationAndValidationConcernsPackage.eINSTANCE);
-
-		// Create package meta-data objects
-		theRequirementClassificationConcernsPackage.createPackageContents();
-		theRequirementsCharacteristicsConcernsPackage.createPackageContents();
-		thePriorityAndImportanceConcernsPackage.createPackageContents();
-		theRequirementAndProcessConcernsPackage.createPackageContents();
-		theVerificationAndValidationConcernsPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theRequirementClassificationConcernsPackage.initializePackageContents();
-		theRequirementsCharacteristicsConcernsPackage.initializePackageContents();
-		thePriorityAndImportanceConcernsPackage.initializePackageContents();
-		theRequirementAndProcessConcernsPackage.initializePackageContents();
-		theVerificationAndValidationConcernsPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theRequirementClassificationConcernsPackage.freeze();
-
-  
-		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(RequirementClassificationConcernsPackage.eNS_URI, theRequirementClassificationConcernsPackage);
-		return theRequirementClassificationConcernsPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getQualityKind() {
-		return qualityKindEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getConstraintKind() {
-		return constraintKindEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getWorkloadCapacitiesKind() {
-		return workloadCapacitiesKindEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RequirementClassificationConcernsFactory getRequirementClassificationConcernsFactory() {
-		return (RequirementClassificationConcernsFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create enums
-		qualityKindEEnum = createEEnum(QUALITY_KIND);
-		constraintKindEEnum = createEEnum(CONSTRAINT_KIND);
-		workloadCapacitiesKindEEnum = createEEnum(WORKLOAD_CAPACITIES_KIND);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Initialize enums and add enum literals
-		initEEnum(qualityKindEEnum, QualityKind.class, "QualityKind"); //$NON-NLS-1$
-		addEEnumLiteral(qualityKindEEnum, QualityKind.ADAPTABILITY);
-		addEEnumLiteral(qualityKindEEnum, QualityKind.AVAILABILITY);
-		addEEnumLiteral(qualityKindEEnum, QualityKind.COMPATABILITY);
-		addEEnumLiteral(qualityKindEEnum, QualityKind.MAINTAINABILITY);
-		addEEnumLiteral(qualityKindEEnum, QualityKind.PORTABILITY);
-		addEEnumLiteral(qualityKindEEnum, QualityKind.RELIABILITY);
-		addEEnumLiteral(qualityKindEEnum, QualityKind.SAFETY);
-		addEEnumLiteral(qualityKindEEnum, QualityKind.SECURITY);
-		addEEnumLiteral(qualityKindEEnum, QualityKind.USABILITY);
-		addEEnumLiteral(qualityKindEEnum, QualityKind.VARIABILITY);
-
-		initEEnum(constraintKindEEnum, ConstraintKind.class, "ConstraintKind"); //$NON-NLS-1$
-		addEEnumLiteral(constraintKindEEnum, ConstraintKind.CULTURAL);
-		addEEnumLiteral(constraintKindEEnum, ConstraintKind.DESIGN);
-		addEEnumLiteral(constraintKindEEnum, ConstraintKind.ENVIRONMENT);
-		addEEnumLiteral(constraintKindEEnum, ConstraintKind.IMPLEMENTATION);
-		addEEnumLiteral(constraintKindEEnum, ConstraintKind.INTERFACE);
-		addEEnumLiteral(constraintKindEEnum, ConstraintKind.PHYSICAL);
-		addEEnumLiteral(constraintKindEEnum, ConstraintKind.STANDARD);
-		addEEnumLiteral(constraintKindEEnum, ConstraintKind.OTHER);
-		addEEnumLiteral(constraintKindEEnum, ConstraintKind.UNDEFINED);
-
-		initEEnum(workloadCapacitiesKindEEnum, WorkloadCapacitiesKind.class, "WorkloadCapacitiesKind"); //$NON-NLS-1$
-		addEEnumLiteral(workloadCapacitiesKindEEnum, WorkloadCapacitiesKind.BOUND);
-		addEEnumLiteral(workloadCapacitiesKindEEnum, WorkloadCapacitiesKind.MEMORY);
-		addEEnumLiteral(workloadCapacitiesKindEEnum, WorkloadCapacitiesKind.SPEED);
-		addEEnumLiteral(workloadCapacitiesKindEEnum, WorkloadCapacitiesKind.THROUGHPUT);
-		addEEnumLiteral(workloadCapacitiesKindEEnum, WorkloadCapacitiesKind.TIME);
-		addEEnumLiteral(workloadCapacitiesKindEEnum, WorkloadCapacitiesKind.VOLUME);
-
-		// Create resource
-		createResource(eNS_URI);
-
-		// Create annotations
-		// http://www.eclipse.org/uml2/2.0.0/UML
-		createUMLAnnotations();
-	}
-
-	/**
-	 * Initializes the annotations for <b>http://www.eclipse.org/uml2/2.0.0/UML</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void createUMLAnnotations() {
-		String source = "http://www.eclipse.org/uml2/2.0.0/UML"; //$NON-NLS-1$	
-		addAnnotation
-		  (this, 
-		   source, 
-		   new String[] {
-			 "originalName", "RequirementClassificationConcerns" //$NON-NLS-1$ //$NON-NLS-2$
-		   });
-	}
-
-} //RequirementClassificationConcernsPackageImpl
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementscharacteristicsconcerns/AbstractionLevelKind.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementscharacteristicsconcerns/AbstractionLevelKind.java
deleted file mode 100644
index d51cf7b..0000000
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementscharacteristicsconcerns/AbstractionLevelKind.java
+++ /dev/null
@@ -1,333 +0,0 @@
-/**
- * Copyright (c) 2017 CEA LIST.
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *   Sébastien Gerard (CEA LIST) <sebastien.gerard@cea.fr> - Initial API and implementation
- *   Yupanqui Munoz Julho (CEA LIST) <yupanqui.munozjulho@cea.fr> - Initial API and implementation
- * 
- */
-package org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementscharacteristicsconcerns;
-
-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>Abstraction Level Kind</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementscharacteristicsconcerns.RequirementsCharacteristicsConcernsPackage#getAbstractionLevelKind()
- * @model
- * @generated
- */
-public enum AbstractionLevelKind implements Enumerator {
-	/**
-	 * The '<em><b>Specification Level</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #SPECIFICATION_LEVEL_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	SPECIFICATION_LEVEL(0, "SpecificationLevel", "SpecificationLevel"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Analysis Level</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #ANALYSIS_LEVEL_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	ANALYSIS_LEVEL(1, "AnalysisLevel", "AnalysisLevel"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Design Level</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #DESIGN_LEVEL_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	DESIGN_LEVEL(2, "DesignLevel", "DesignLevel"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Implementation Level</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #IMPLEMENTATION_LEVEL_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	IMPLEMENTATION_LEVEL(3, "ImplementationLevel", "ImplementationLevel"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Specfication level</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #SPECFICATION_LEVEL_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	SPECFICATION_LEVEL(4, "Specfication_level", "Specfication_level"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Operational Level</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #OPERATIONAL_LEVEL_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	OPERATIONAL_LEVEL(5, "OperationalLevel", "OperationalLevel"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Specification Level</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Specification Level</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #SPECIFICATION_LEVEL
-	 * @model name="SpecificationLevel"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int SPECIFICATION_LEVEL_VALUE = 0;
-
-	/**
-	 * The '<em><b>Analysis Level</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Analysis Level</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #ANALYSIS_LEVEL
-	 * @model name="AnalysisLevel"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ANALYSIS_LEVEL_VALUE = 1;
-
-	/**
-	 * The '<em><b>Design Level</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Design Level</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #DESIGN_LEVEL
-	 * @model name="DesignLevel"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int DESIGN_LEVEL_VALUE = 2;
-
-	/**
-	 * The '<em><b>Implementation Level</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Implementation Level</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #IMPLEMENTATION_LEVEL
-	 * @model name="ImplementationLevel"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int IMPLEMENTATION_LEVEL_VALUE = 3;
-
-	/**
-	 * The '<em><b>Specfication level</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Specfication level</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #SPECFICATION_LEVEL
-	 * @model name="Specfication_level"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int SPECFICATION_LEVEL_VALUE = 4;
-
-	/**
-	 * The '<em><b>Operational Level</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Operational Level</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #OPERATIONAL_LEVEL
-	 * @model name="OperationalLevel"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int OPERATIONAL_LEVEL_VALUE = 5;
-
-	/**
-	 * An array of all the '<em><b>Abstraction Level Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final AbstractionLevelKind[] VALUES_ARRAY =
-		new AbstractionLevelKind[] {
-			SPECIFICATION_LEVEL,
-			ANALYSIS_LEVEL,
-			DESIGN_LEVEL,
-			IMPLEMENTATION_LEVEL,
-			SPECFICATION_LEVEL,
-			OPERATIONAL_LEVEL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Abstraction Level Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<AbstractionLevelKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Abstraction Level Kind</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 AbstractionLevelKind get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			AbstractionLevelKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Abstraction Level Kind</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 AbstractionLevelKind getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			AbstractionLevelKind result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Abstraction Level Kind</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 AbstractionLevelKind get(int value) {
-		switch (value) {
-			case SPECIFICATION_LEVEL_VALUE: return SPECIFICATION_LEVEL;
-			case ANALYSIS_LEVEL_VALUE: return ANALYSIS_LEVEL;
-			case DESIGN_LEVEL_VALUE: return DESIGN_LEVEL;
-			case IMPLEMENTATION_LEVEL_VALUE: return IMPLEMENTATION_LEVEL;
-			case SPECFICATION_LEVEL_VALUE: return SPECFICATION_LEVEL;
-			case OPERATIONAL_LEVEL_VALUE: return OPERATIONAL_LEVEL;
-		}
-		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 AbstractionLevelKind(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-	  return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-	  return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	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;
-	}
-	
-} //AbstractionLevelKind
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementscharacteristicsconcerns/LifeCyclePhaseKind.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementscharacteristicsconcerns/LifeCyclePhaseKind.java
deleted file mode 100644
index f67ffd6..0000000
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementscharacteristicsconcerns/LifeCyclePhaseKind.java
+++ /dev/null
@@ -1,495 +0,0 @@
-/**
- * Copyright (c) 2017 CEA LIST.
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *   Sébastien Gerard (CEA LIST) <sebastien.gerard@cea.fr> - Initial API and implementation
- *   Yupanqui Munoz Julho (CEA LIST) <yupanqui.munozjulho@cea.fr> - Initial API and implementation
- * 
- */
-package org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementscharacteristicsconcerns;
-
-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>Life Cycle Phase Kind</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementscharacteristicsconcerns.RequirementsCharacteristicsConcernsPackage#getLifeCyclePhaseKind()
- * @model
- * @generated
- */
-public enum LifeCyclePhaseKind implements Enumerator {
-	/**
-	 * The '<em><b>Pre Concept</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #PRE_CONCEPT_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	PRE_CONCEPT(0, "PreConcept", "PreConcept"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Concept</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #CONCEPT_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	CONCEPT(1, "Concept", "Concept"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Development</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #DEVELOPMENT_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	DEVELOPMENT(2, "Development", "Development"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Manufacturing</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #MANUFACTURING_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	MANUFACTURING(3, "Manufacturing", "Manufacturing"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Integration</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #INTEGRATION_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	INTEGRATION(4, "Integration", "Integration"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Test</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #TEST_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	TEST(5, "Test", "Test"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Deployment</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #DEPLOYMENT_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	DEPLOYMENT(6, "Deployment", "Deployment"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Delivery</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #DELIVERY_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	DELIVERY(7, "Delivery", "Delivery"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Installation</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #INSTALLATION_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	INSTALLATION(8, "Installation", "Installation"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Operation</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #OPERATION_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	OPERATION(9, "Operation", "Operation"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Support</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #SUPPORT_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	SUPPORT(10, "Support", "Support"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Disposal</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #DISPOSAL_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	DISPOSAL(11, "Disposal", "Disposal"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Pre Concept</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Pre Concept</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #PRE_CONCEPT
-	 * @model name="PreConcept"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int PRE_CONCEPT_VALUE = 0;
-
-	/**
-	 * The '<em><b>Concept</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Concept</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #CONCEPT
-	 * @model name="Concept"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int CONCEPT_VALUE = 1;
-
-	/**
-	 * The '<em><b>Development</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Development</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #DEVELOPMENT
-	 * @model name="Development"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int DEVELOPMENT_VALUE = 2;
-
-	/**
-	 * The '<em><b>Manufacturing</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Manufacturing</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #MANUFACTURING
-	 * @model name="Manufacturing"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int MANUFACTURING_VALUE = 3;
-
-	/**
-	 * The '<em><b>Integration</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Integration</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #INTEGRATION
-	 * @model name="Integration"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int INTEGRATION_VALUE = 4;
-
-	/**
-	 * The '<em><b>Test</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Test</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #TEST
-	 * @model name="Test"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int TEST_VALUE = 5;
-
-	/**
-	 * The '<em><b>Deployment</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Deployment</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #DEPLOYMENT
-	 * @model name="Deployment"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int DEPLOYMENT_VALUE = 6;
-
-	/**
-	 * The '<em><b>Delivery</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Delivery</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #DELIVERY
-	 * @model name="Delivery"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int DELIVERY_VALUE = 7;
-
-	/**
-	 * The '<em><b>Installation</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Installation</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #INSTALLATION
-	 * @model name="Installation"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int INSTALLATION_VALUE = 8;
-
-	/**
-	 * The '<em><b>Operation</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Operation</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #OPERATION
-	 * @model name="Operation"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int OPERATION_VALUE = 9;
-
-	/**
-	 * The '<em><b>Support</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Support</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #SUPPORT
-	 * @model name="Support"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int SUPPORT_VALUE = 10;
-
-	/**
-	 * The '<em><b>Disposal</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Disposal</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #DISPOSAL
-	 * @model name="Disposal"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int DISPOSAL_VALUE = 11;
-
-	/**
-	 * An array of all the '<em><b>Life Cycle Phase Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final LifeCyclePhaseKind[] VALUES_ARRAY =
-		new LifeCyclePhaseKind[] {
-			PRE_CONCEPT,
-			CONCEPT,
-			DEVELOPMENT,
-			MANUFACTURING,
-			INTEGRATION,
-			TEST,
-			DEPLOYMENT,
-			DELIVERY,
-			INSTALLATION,
-			OPERATION,
-			SUPPORT,
-			DISPOSAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Life Cycle Phase Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<LifeCyclePhaseKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Life Cycle Phase Kind</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 LifeCyclePhaseKind get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			LifeCyclePhaseKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Life Cycle Phase Kind</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 LifeCyclePhaseKind getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			LifeCyclePhaseKind result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Life Cycle Phase Kind</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 LifeCyclePhaseKind get(int value) {
-		switch (value) {
-			case PRE_CONCEPT_VALUE: return PRE_CONCEPT;
-			case CONCEPT_VALUE: return CONCEPT;
-			case DEVELOPMENT_VALUE: return DEVELOPMENT;
-			case MANUFACTURING_VALUE: return MANUFACTURING;
-			case INTEGRATION_VALUE: return INTEGRATION;
-			case TEST_VALUE: return TEST;
-			case DEPLOYMENT_VALUE: return DEPLOYMENT;
-			case DELIVERY_VALUE: return DELIVERY;
-			case INSTALLATION_VALUE: return INSTALLATION;
-			case OPERATION_VALUE: return OPERATION;
-			case SUPPORT_VALUE: return SUPPORT;
-			case DISPOSAL_VALUE: return DISPOSAL;
-		}
-		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 LifeCyclePhaseKind(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-	  return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-	  return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	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;
-	}
-	
-} //LifeCyclePhaseKind
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementscharacteristicsconcerns/RequirementsCharacteristicsConcernsFactory.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementscharacteristicsconcerns/RequirementsCharacteristicsConcernsFactory.java
deleted file mode 100644
index 2499014..0000000
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementscharacteristicsconcerns/RequirementsCharacteristicsConcernsFactory.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Copyright (c) 2017 CEA LIST.
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *   Sébastien Gerard (CEA LIST) <sebastien.gerard@cea.fr> - Initial API and implementation
- *   Yupanqui Munoz Julho (CEA LIST) <yupanqui.munozjulho@cea.fr> - Initial API and implementation
- * 
- */
-package org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementscharacteristicsconcerns;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementscharacteristicsconcerns.RequirementsCharacteristicsConcernsPackage
- * @generated
- */
-public interface RequirementsCharacteristicsConcernsFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	RequirementsCharacteristicsConcernsFactory eINSTANCE = org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementscharacteristicsconcerns.impl.RequirementsCharacteristicsConcernsFactoryImpl.init();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	RequirementsCharacteristicsConcernsPackage getRequirementsCharacteristicsConcernsPackage();
-
-} //RequirementsCharacteristicsConcernsFactory
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementscharacteristicsconcerns/RequirementsCharacteristicsConcernsPackage.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementscharacteristicsconcerns/RequirementsCharacteristicsConcernsPackage.java
deleted file mode 100644
index 7db2054..0000000
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementscharacteristicsconcerns/RequirementsCharacteristicsConcernsPackage.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/**
- * Copyright (c) 2017 CEA LIST.
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *   Sébastien Gerard (CEA LIST) <sebastien.gerard@cea.fr> - Initial API and implementation
- *   Yupanqui Munoz Julho (CEA LIST) <yupanqui.munozjulho@cea.fr> - Initial API and implementation
- * 
- */
-package org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementscharacteristicsconcerns;
-
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each operation of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementscharacteristicsconcerns.RequirementsCharacteristicsConcernsFactory
- * @model kind="package"
- *        annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='RequirementsCharacteristicsConcerns'"
- * @generated
- */
-public interface RequirementsCharacteristicsConcernsPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "requirementscharacteristicsconcerns"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http://www.eclipse.org/papyrus/requirements/sysml14/0.7.0/PapyrusRE/ModelLibrary/PapyrusREStandardUtils/RequirementsCharacteristicsConcerns"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "RequirementsCharacteristicsConcerns"; //$NON-NLS-1$
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	RequirementsCharacteristicsConcernsPackage eINSTANCE = org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementscharacteristicsconcerns.impl.RequirementsCharacteristicsConcernsPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementscharacteristicsconcerns.LifeCyclePhaseKind <em>Life Cycle Phase Kind</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementscharacteristicsconcerns.LifeCyclePhaseKind
-	 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementscharacteristicsconcerns.impl.RequirementsCharacteristicsConcernsPackageImpl#getLifeCyclePhaseKind()
-	 * @generated
-	 */
-	int LIFE_CYCLE_PHASE_KIND = 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementscharacteristicsconcerns.AbstractionLevelKind <em>Abstraction Level Kind</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementscharacteristicsconcerns.AbstractionLevelKind
-	 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementscharacteristicsconcerns.impl.RequirementsCharacteristicsConcernsPackageImpl#getAbstractionLevelKind()
-	 * @generated
-	 */
-	int ABSTRACTION_LEVEL_KIND = 1;
-
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementscharacteristicsconcerns.LifeCyclePhaseKind <em>Life Cycle Phase Kind</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Life Cycle Phase Kind</em>'.
-	 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementscharacteristicsconcerns.LifeCyclePhaseKind
-	 * @generated
-	 */
-	EEnum getLifeCyclePhaseKind();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementscharacteristicsconcerns.AbstractionLevelKind <em>Abstraction Level Kind</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Abstraction Level Kind</em>'.
-	 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementscharacteristicsconcerns.AbstractionLevelKind
-	 * @generated
-	 */
-	EEnum getAbstractionLevelKind();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	RequirementsCharacteristicsConcernsFactory getRequirementsCharacteristicsConcernsFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each operation of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementscharacteristicsconcerns.LifeCyclePhaseKind <em>Life Cycle Phase Kind</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementscharacteristicsconcerns.LifeCyclePhaseKind
-		 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementscharacteristicsconcerns.impl.RequirementsCharacteristicsConcernsPackageImpl#getLifeCyclePhaseKind()
-		 * @generated
-		 */
-		EEnum LIFE_CYCLE_PHASE_KIND = eINSTANCE.getLifeCyclePhaseKind();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementscharacteristicsconcerns.AbstractionLevelKind <em>Abstraction Level Kind</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementscharacteristicsconcerns.AbstractionLevelKind
-		 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementscharacteristicsconcerns.impl.RequirementsCharacteristicsConcernsPackageImpl#getAbstractionLevelKind()
-		 * @generated
-		 */
-		EEnum ABSTRACTION_LEVEL_KIND = eINSTANCE.getAbstractionLevelKind();
-
-	}
-
-} //RequirementsCharacteristicsConcernsPackage
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementscharacteristicsconcerns/impl/RequirementsCharacteristicsConcernsFactoryImpl.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementscharacteristicsconcerns/impl/RequirementsCharacteristicsConcernsFactoryImpl.java
deleted file mode 100644
index 12b0f92..0000000
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementscharacteristicsconcerns/impl/RequirementsCharacteristicsConcernsFactoryImpl.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/**
- * Copyright (c) 2017 CEA LIST.
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *   Sébastien Gerard (CEA LIST) <sebastien.gerard@cea.fr> - Initial API and implementation
- *   Yupanqui Munoz Julho (CEA LIST) <yupanqui.munozjulho@cea.fr> - Initial API and implementation
- * 
- */
-package org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementscharacteristicsconcerns.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementscharacteristicsconcerns.*;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class RequirementsCharacteristicsConcernsFactoryImpl extends EFactoryImpl implements RequirementsCharacteristicsConcernsFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static RequirementsCharacteristicsConcernsFactory init() {
-		try {
-			RequirementsCharacteristicsConcernsFactory theRequirementsCharacteristicsConcernsFactory = (RequirementsCharacteristicsConcernsFactory)EPackage.Registry.INSTANCE.getEFactory(RequirementsCharacteristicsConcernsPackage.eNS_URI);
-			if (theRequirementsCharacteristicsConcernsFactory != null) {
-				return theRequirementsCharacteristicsConcernsFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new RequirementsCharacteristicsConcernsFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RequirementsCharacteristicsConcernsFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case RequirementsCharacteristicsConcernsPackage.LIFE_CYCLE_PHASE_KIND:
-				return createLifeCyclePhaseKindFromString(eDataType, initialValue);
-			case RequirementsCharacteristicsConcernsPackage.ABSTRACTION_LEVEL_KIND:
-				return createAbstractionLevelKindFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case RequirementsCharacteristicsConcernsPackage.LIFE_CYCLE_PHASE_KIND:
-				return convertLifeCyclePhaseKindToString(eDataType, instanceValue);
-			case RequirementsCharacteristicsConcernsPackage.ABSTRACTION_LEVEL_KIND:
-				return convertAbstractionLevelKindToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public LifeCyclePhaseKind createLifeCyclePhaseKindFromString(EDataType eDataType, String initialValue) {
-		LifeCyclePhaseKind result = LifeCyclePhaseKind.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 convertLifeCyclePhaseKindToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AbstractionLevelKind createAbstractionLevelKindFromString(EDataType eDataType, String initialValue) {
-		AbstractionLevelKind result = AbstractionLevelKind.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 convertAbstractionLevelKindToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RequirementsCharacteristicsConcernsPackage getRequirementsCharacteristicsConcernsPackage() {
-		return (RequirementsCharacteristicsConcernsPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static RequirementsCharacteristicsConcernsPackage getPackage() {
-		return RequirementsCharacteristicsConcernsPackage.eINSTANCE;
-	}
-
-} //RequirementsCharacteristicsConcernsFactoryImpl
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementscharacteristicsconcerns/impl/RequirementsCharacteristicsConcernsPackageImpl.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementscharacteristicsconcerns/impl/RequirementsCharacteristicsConcernsPackageImpl.java
deleted file mode 100644
index 3af30f8..0000000
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/requirementscharacteristicsconcerns/impl/RequirementsCharacteristicsConcernsPackageImpl.java
+++ /dev/null
@@ -1,258 +0,0 @@
-/**
- * Copyright (c) 2017 CEA LIST.
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *   Sébastien Gerard (CEA LIST) <sebastien.gerard@cea.fr> - Initial API and implementation
- *   Yupanqui Munoz Julho (CEA LIST) <yupanqui.munozjulho@cea.fr> - Initial API and implementation
- * 
- */
-package org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementscharacteristicsconcerns.impl;
-
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.priorityandimportanceconcerns.PriorityAndImportanceConcernsPackage;
-
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.priorityandimportanceconcerns.impl.PriorityAndImportanceConcernsPackageImpl;
-
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.RequirementAndProcessConcernsPackage;
-
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.impl.RequirementAndProcessConcernsPackageImpl;
-
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementclassificationconcerns.RequirementClassificationConcernsPackage;
-
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementclassificationconcerns.impl.RequirementClassificationConcernsPackageImpl;
-
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementscharacteristicsconcerns.AbstractionLevelKind;
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementscharacteristicsconcerns.LifeCyclePhaseKind;
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementscharacteristicsconcerns.RequirementsCharacteristicsConcernsFactory;
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementscharacteristicsconcerns.RequirementsCharacteristicsConcernsPackage;
-
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.verificationandvalidationconcerns.VerificationAndValidationConcernsPackage;
-
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.verificationandvalidationconcerns.impl.VerificationAndValidationConcernsPackageImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class RequirementsCharacteristicsConcernsPackageImpl extends EPackageImpl implements RequirementsCharacteristicsConcernsPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum lifeCyclePhaseKindEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum abstractionLevelKindEEnum = 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.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementscharacteristicsconcerns.RequirementsCharacteristicsConcernsPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private RequirementsCharacteristicsConcernsPackageImpl() {
-		super(eNS_URI, RequirementsCharacteristicsConcernsFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
-	 * <p>This method is used to initialize {@link RequirementsCharacteristicsConcernsPackage#eINSTANCE} when that field is accessed.
-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static RequirementsCharacteristicsConcernsPackage init() {
-		if (isInited) return (RequirementsCharacteristicsConcernsPackage)EPackage.Registry.INSTANCE.getEPackage(RequirementsCharacteristicsConcernsPackage.eNS_URI);
-
-		// Obtain or create and register package
-		RequirementsCharacteristicsConcernsPackageImpl theRequirementsCharacteristicsConcernsPackage = (RequirementsCharacteristicsConcernsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof RequirementsCharacteristicsConcernsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new RequirementsCharacteristicsConcernsPackageImpl());
-
-		isInited = true;
-
-		// Obtain or create and register interdependencies
-		RequirementClassificationConcernsPackageImpl theRequirementClassificationConcernsPackage = (RequirementClassificationConcernsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(RequirementClassificationConcernsPackage.eNS_URI) instanceof RequirementClassificationConcernsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(RequirementClassificationConcernsPackage.eNS_URI) : RequirementClassificationConcernsPackage.eINSTANCE);
-		PriorityAndImportanceConcernsPackageImpl thePriorityAndImportanceConcernsPackage = (PriorityAndImportanceConcernsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(PriorityAndImportanceConcernsPackage.eNS_URI) instanceof PriorityAndImportanceConcernsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(PriorityAndImportanceConcernsPackage.eNS_URI) : PriorityAndImportanceConcernsPackage.eINSTANCE);
-		RequirementAndProcessConcernsPackageImpl theRequirementAndProcessConcernsPackage = (RequirementAndProcessConcernsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(RequirementAndProcessConcernsPackage.eNS_URI) instanceof RequirementAndProcessConcernsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(RequirementAndProcessConcernsPackage.eNS_URI) : RequirementAndProcessConcernsPackage.eINSTANCE);
-		VerificationAndValidationConcernsPackageImpl theVerificationAndValidationConcernsPackage = (VerificationAndValidationConcernsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(VerificationAndValidationConcernsPackage.eNS_URI) instanceof VerificationAndValidationConcernsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(VerificationAndValidationConcernsPackage.eNS_URI) : VerificationAndValidationConcernsPackage.eINSTANCE);
-
-		// Create package meta-data objects
-		theRequirementsCharacteristicsConcernsPackage.createPackageContents();
-		theRequirementClassificationConcernsPackage.createPackageContents();
-		thePriorityAndImportanceConcernsPackage.createPackageContents();
-		theRequirementAndProcessConcernsPackage.createPackageContents();
-		theVerificationAndValidationConcernsPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theRequirementsCharacteristicsConcernsPackage.initializePackageContents();
-		theRequirementClassificationConcernsPackage.initializePackageContents();
-		thePriorityAndImportanceConcernsPackage.initializePackageContents();
-		theRequirementAndProcessConcernsPackage.initializePackageContents();
-		theVerificationAndValidationConcernsPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theRequirementsCharacteristicsConcernsPackage.freeze();
-
-  
-		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(RequirementsCharacteristicsConcernsPackage.eNS_URI, theRequirementsCharacteristicsConcernsPackage);
-		return theRequirementsCharacteristicsConcernsPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getLifeCyclePhaseKind() {
-		return lifeCyclePhaseKindEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getAbstractionLevelKind() {
-		return abstractionLevelKindEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RequirementsCharacteristicsConcernsFactory getRequirementsCharacteristicsConcernsFactory() {
-		return (RequirementsCharacteristicsConcernsFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create enums
-		lifeCyclePhaseKindEEnum = createEEnum(LIFE_CYCLE_PHASE_KIND);
-		abstractionLevelKindEEnum = createEEnum(ABSTRACTION_LEVEL_KIND);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Initialize enums and add enum literals
-		initEEnum(lifeCyclePhaseKindEEnum, LifeCyclePhaseKind.class, "LifeCyclePhaseKind"); //$NON-NLS-1$
-		addEEnumLiteral(lifeCyclePhaseKindEEnum, LifeCyclePhaseKind.PRE_CONCEPT);
-		addEEnumLiteral(lifeCyclePhaseKindEEnum, LifeCyclePhaseKind.CONCEPT);
-		addEEnumLiteral(lifeCyclePhaseKindEEnum, LifeCyclePhaseKind.DEVELOPMENT);
-		addEEnumLiteral(lifeCyclePhaseKindEEnum, LifeCyclePhaseKind.MANUFACTURING);
-		addEEnumLiteral(lifeCyclePhaseKindEEnum, LifeCyclePhaseKind.INTEGRATION);
-		addEEnumLiteral(lifeCyclePhaseKindEEnum, LifeCyclePhaseKind.TEST);
-		addEEnumLiteral(lifeCyclePhaseKindEEnum, LifeCyclePhaseKind.DEPLOYMENT);
-		addEEnumLiteral(lifeCyclePhaseKindEEnum, LifeCyclePhaseKind.DELIVERY);
-		addEEnumLiteral(lifeCyclePhaseKindEEnum, LifeCyclePhaseKind.INSTALLATION);
-		addEEnumLiteral(lifeCyclePhaseKindEEnum, LifeCyclePhaseKind.OPERATION);
-		addEEnumLiteral(lifeCyclePhaseKindEEnum, LifeCyclePhaseKind.SUPPORT);
-		addEEnumLiteral(lifeCyclePhaseKindEEnum, LifeCyclePhaseKind.DISPOSAL);
-
-		initEEnum(abstractionLevelKindEEnum, AbstractionLevelKind.class, "AbstractionLevelKind"); //$NON-NLS-1$
-		addEEnumLiteral(abstractionLevelKindEEnum, AbstractionLevelKind.SPECIFICATION_LEVEL);
-		addEEnumLiteral(abstractionLevelKindEEnum, AbstractionLevelKind.ANALYSIS_LEVEL);
-		addEEnumLiteral(abstractionLevelKindEEnum, AbstractionLevelKind.DESIGN_LEVEL);
-		addEEnumLiteral(abstractionLevelKindEEnum, AbstractionLevelKind.IMPLEMENTATION_LEVEL);
-		addEEnumLiteral(abstractionLevelKindEEnum, AbstractionLevelKind.SPECFICATION_LEVEL);
-		addEEnumLiteral(abstractionLevelKindEEnum, AbstractionLevelKind.OPERATIONAL_LEVEL);
-
-		// Create resource
-		createResource(eNS_URI);
-
-		// Create annotations
-		// http://www.eclipse.org/uml2/2.0.0/UML
-		createUMLAnnotations();
-	}
-
-	/**
-	 * Initializes the annotations for <b>http://www.eclipse.org/uml2/2.0.0/UML</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void createUMLAnnotations() {
-		String source = "http://www.eclipse.org/uml2/2.0.0/UML"; //$NON-NLS-1$	
-		addAnnotation
-		  (this, 
-		   source, 
-		   new String[] {
-			 "originalName", "RequirementsCharacteristicsConcerns" //$NON-NLS-1$ //$NON-NLS-2$
-		   });
-	}
-
-} //RequirementsCharacteristicsConcernsPackageImpl
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/verificationandvalidationconcerns/VV_MethodKind.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/verificationandvalidationconcerns/VV_MethodKind.java
deleted file mode 100644
index 253456d..0000000
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/verificationandvalidationconcerns/VV_MethodKind.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/**
- * Copyright (c) 2017 CEA LIST.
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *   Sébastien Gerard (CEA LIST) <sebastien.gerard@cea.fr> - Initial API and implementation
- *   Yupanqui Munoz Julho (CEA LIST) <yupanqui.munozjulho@cea.fr> - Initial API and implementation
- * 
- */
-package org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.verificationandvalidationconcerns;
-
-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>VV Method Kind</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.verificationandvalidationconcerns.VerificationAndValidationConcernsPackage#getVV_MethodKind()
- * @model
- * @generated
- */
-public enum VV_MethodKind implements Enumerator {
-	/**
-	 * The '<em><b>Analysis</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #ANALYSIS_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	ANALYSIS(0, "Analysis", "Analysis"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Inspection</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #INSPECTION_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	INSPECTION(1, "Inspection", "Inspection"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>System Test</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #SYSTEM_TEST_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	SYSTEM_TEST(2, "SystemTest", "SystemTest"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Component Test</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #COMPONENT_TEST_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	COMPONENT_TEST(3, "ComponentTest", "ComponentTest"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Analysis</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Analysis</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #ANALYSIS
-	 * @model name="Analysis"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ANALYSIS_VALUE = 0;
-
-	/**
-	 * The '<em><b>Inspection</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Inspection</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #INSPECTION
-	 * @model name="Inspection"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int INSPECTION_VALUE = 1;
-
-	/**
-	 * The '<em><b>System Test</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>System Test</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #SYSTEM_TEST
-	 * @model name="SystemTest"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int SYSTEM_TEST_VALUE = 2;
-
-	/**
-	 * The '<em><b>Component Test</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Component Test</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #COMPONENT_TEST
-	 * @model name="ComponentTest"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int COMPONENT_TEST_VALUE = 3;
-
-	/**
-	 * An array of all the '<em><b>VV Method Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final VV_MethodKind[] VALUES_ARRAY =
-		new VV_MethodKind[] {
-			ANALYSIS,
-			INSPECTION,
-			SYSTEM_TEST,
-			COMPONENT_TEST,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>VV Method Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<VV_MethodKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>VV Method Kind</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 VV_MethodKind get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			VV_MethodKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>VV Method Kind</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 VV_MethodKind getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			VV_MethodKind result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>VV Method Kind</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 VV_MethodKind get(int value) {
-		switch (value) {
-			case ANALYSIS_VALUE: return ANALYSIS;
-			case INSPECTION_VALUE: return INSPECTION;
-			case SYSTEM_TEST_VALUE: return SYSTEM_TEST;
-			case COMPONENT_TEST_VALUE: return COMPONENT_TEST;
-		}
-		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 VV_MethodKind(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-	  return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-	  return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	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;
-	}
-	
-} //VV_MethodKind
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/verificationandvalidationconcerns/VV_StatusKind.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/verificationandvalidationconcerns/VV_StatusKind.java
deleted file mode 100644
index 0652fa0..0000000
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/verificationandvalidationconcerns/VV_StatusKind.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/**
- * Copyright (c) 2017 CEA LIST.
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *   Sébastien Gerard (CEA LIST) <sebastien.gerard@cea.fr> - Initial API and implementation
- *   Yupanqui Munoz Julho (CEA LIST) <yupanqui.munozjulho@cea.fr> - Initial API and implementation
- * 
- */
-package org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.verificationandvalidationconcerns;
-
-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>VV Status Kind</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.verificationandvalidationconcerns.VerificationAndValidationConcernsPackage#getVV_StatusKind()
- * @model
- * @generated
- */
-public enum VV_StatusKind implements Enumerator {
-	/**
-	 * The '<em><b>Pending</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #PENDING_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	PENDING(0, "Pending", "Pending"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Passed</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #PASSED_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	PASSED(1, "Passed", "Passed"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Failed</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #FAILED_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	FAILED(2, "Failed", "Failed"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Inconclusive</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #INCONCLUSIVE_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	INCONCLUSIVE(3, "Inconclusive", "Inconclusive"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Pending</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Pending</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #PENDING
-	 * @model name="Pending"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int PENDING_VALUE = 0;
-
-	/**
-	 * The '<em><b>Passed</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Passed</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #PASSED
-	 * @model name="Passed"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int PASSED_VALUE = 1;
-
-	/**
-	 * The '<em><b>Failed</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Failed</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #FAILED
-	 * @model name="Failed"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int FAILED_VALUE = 2;
-
-	/**
-	 * The '<em><b>Inconclusive</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Inconclusive</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #INCONCLUSIVE
-	 * @model name="Inconclusive"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int INCONCLUSIVE_VALUE = 3;
-
-	/**
-	 * An array of all the '<em><b>VV Status Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final VV_StatusKind[] VALUES_ARRAY =
-		new VV_StatusKind[] {
-			PENDING,
-			PASSED,
-			FAILED,
-			INCONCLUSIVE,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>VV Status Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<VV_StatusKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>VV Status Kind</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 VV_StatusKind get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			VV_StatusKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>VV Status Kind</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 VV_StatusKind getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			VV_StatusKind result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>VV Status Kind</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 VV_StatusKind get(int value) {
-		switch (value) {
-			case PENDING_VALUE: return PENDING;
-			case PASSED_VALUE: return PASSED;
-			case FAILED_VALUE: return FAILED;
-			case INCONCLUSIVE_VALUE: return INCONCLUSIVE;
-		}
-		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 VV_StatusKind(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-	  return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-	  return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	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;
-	}
-	
-} //VV_StatusKind
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/verificationandvalidationconcerns/VerificationAndValidationConcernsFactory.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/verificationandvalidationconcerns/VerificationAndValidationConcernsFactory.java
deleted file mode 100644
index f11e2d5..0000000
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/verificationandvalidationconcerns/VerificationAndValidationConcernsFactory.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Copyright (c) 2017 CEA LIST.
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *   Sébastien Gerard (CEA LIST) <sebastien.gerard@cea.fr> - Initial API and implementation
- *   Yupanqui Munoz Julho (CEA LIST) <yupanqui.munozjulho@cea.fr> - Initial API and implementation
- * 
- */
-package org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.verificationandvalidationconcerns;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.verificationandvalidationconcerns.VerificationAndValidationConcernsPackage
- * @generated
- */
-public interface VerificationAndValidationConcernsFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	VerificationAndValidationConcernsFactory eINSTANCE = org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.verificationandvalidationconcerns.impl.VerificationAndValidationConcernsFactoryImpl.init();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	VerificationAndValidationConcernsPackage getVerificationAndValidationConcernsPackage();
-
-} //VerificationAndValidationConcernsFactory
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/verificationandvalidationconcerns/VerificationAndValidationConcernsPackage.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/verificationandvalidationconcerns/VerificationAndValidationConcernsPackage.java
deleted file mode 100644
index 6e99d7d..0000000
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/verificationandvalidationconcerns/VerificationAndValidationConcernsPackage.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/**
- * Copyright (c) 2017 CEA LIST.
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *   Sébastien Gerard (CEA LIST) <sebastien.gerard@cea.fr> - Initial API and implementation
- *   Yupanqui Munoz Julho (CEA LIST) <yupanqui.munozjulho@cea.fr> - Initial API and implementation
- * 
- */
-package org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.verificationandvalidationconcerns;
-
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each operation of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.verificationandvalidationconcerns.VerificationAndValidationConcernsFactory
- * @model kind="package"
- *        annotation="http://www.eclipse.org/uml2/2.0.0/UML originalName='VerificationAndValidationConcerns'"
- * @generated
- */
-public interface VerificationAndValidationConcernsPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "verificationandvalidationconcerns"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http://www.eclipse.org/papyrus/requirements/sysml14/0.7.0/PapyrusRE/ModelLibrary/PapyrusREStandardUtils/VerificationAndValidationConcerns"; //$NON-NLS-1$
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "VerificationAndValidationConcerns"; //$NON-NLS-1$
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	VerificationAndValidationConcernsPackage eINSTANCE = org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.verificationandvalidationconcerns.impl.VerificationAndValidationConcernsPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.verificationandvalidationconcerns.VV_MethodKind <em>VV Method Kind</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.verificationandvalidationconcerns.VV_MethodKind
-	 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.verificationandvalidationconcerns.impl.VerificationAndValidationConcernsPackageImpl#getVV_MethodKind()
-	 * @generated
-	 */
-	int VV_METHOD_KIND = 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.verificationandvalidationconcerns.VV_StatusKind <em>VV Status Kind</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.verificationandvalidationconcerns.VV_StatusKind
-	 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.verificationandvalidationconcerns.impl.VerificationAndValidationConcernsPackageImpl#getVV_StatusKind()
-	 * @generated
-	 */
-	int VV_STATUS_KIND = 1;
-
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.verificationandvalidationconcerns.VV_MethodKind <em>VV Method Kind</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>VV Method Kind</em>'.
-	 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.verificationandvalidationconcerns.VV_MethodKind
-	 * @generated
-	 */
-	EEnum getVV_MethodKind();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.verificationandvalidationconcerns.VV_StatusKind <em>VV Status Kind</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>VV Status Kind</em>'.
-	 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.verificationandvalidationconcerns.VV_StatusKind
-	 * @generated
-	 */
-	EEnum getVV_StatusKind();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	VerificationAndValidationConcernsFactory getVerificationAndValidationConcernsFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each operation of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.verificationandvalidationconcerns.VV_MethodKind <em>VV Method Kind</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.verificationandvalidationconcerns.VV_MethodKind
-		 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.verificationandvalidationconcerns.impl.VerificationAndValidationConcernsPackageImpl#getVV_MethodKind()
-		 * @generated
-		 */
-		EEnum VV_METHOD_KIND = eINSTANCE.getVV_MethodKind();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.verificationandvalidationconcerns.VV_StatusKind <em>VV Status Kind</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.verificationandvalidationconcerns.VV_StatusKind
-		 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.verificationandvalidationconcerns.impl.VerificationAndValidationConcernsPackageImpl#getVV_StatusKind()
-		 * @generated
-		 */
-		EEnum VV_STATUS_KIND = eINSTANCE.getVV_StatusKind();
-
-	}
-
-} //VerificationAndValidationConcernsPackage
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/verificationandvalidationconcerns/impl/VerificationAndValidationConcernsFactoryImpl.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/verificationandvalidationconcerns/impl/VerificationAndValidationConcernsFactoryImpl.java
deleted file mode 100644
index b13c049..0000000
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/verificationandvalidationconcerns/impl/VerificationAndValidationConcernsFactoryImpl.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/**
- * Copyright (c) 2017 CEA LIST.
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *   Sébastien Gerard (CEA LIST) <sebastien.gerard@cea.fr> - Initial API and implementation
- *   Yupanqui Munoz Julho (CEA LIST) <yupanqui.munozjulho@cea.fr> - Initial API and implementation
- * 
- */
-package org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.verificationandvalidationconcerns.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.verificationandvalidationconcerns.*;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class VerificationAndValidationConcernsFactoryImpl extends EFactoryImpl implements VerificationAndValidationConcernsFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static VerificationAndValidationConcernsFactory init() {
-		try {
-			VerificationAndValidationConcernsFactory theVerificationAndValidationConcernsFactory = (VerificationAndValidationConcernsFactory)EPackage.Registry.INSTANCE.getEFactory(VerificationAndValidationConcernsPackage.eNS_URI);
-			if (theVerificationAndValidationConcernsFactory != null) {
-				return theVerificationAndValidationConcernsFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new VerificationAndValidationConcernsFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public VerificationAndValidationConcernsFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case VerificationAndValidationConcernsPackage.VV_METHOD_KIND:
-				return createVV_MethodKindFromString(eDataType, initialValue);
-			case VerificationAndValidationConcernsPackage.VV_STATUS_KIND:
-				return createVV_StatusKindFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case VerificationAndValidationConcernsPackage.VV_METHOD_KIND:
-				return convertVV_MethodKindToString(eDataType, instanceValue);
-			case VerificationAndValidationConcernsPackage.VV_STATUS_KIND:
-				return convertVV_StatusKindToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public VV_MethodKind createVV_MethodKindFromString(EDataType eDataType, String initialValue) {
-		VV_MethodKind result = VV_MethodKind.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 convertVV_MethodKindToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public VV_StatusKind createVV_StatusKindFromString(EDataType eDataType, String initialValue) {
-		VV_StatusKind result = VV_StatusKind.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 convertVV_StatusKindToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public VerificationAndValidationConcernsPackage getVerificationAndValidationConcernsPackage() {
-		return (VerificationAndValidationConcernsPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static VerificationAndValidationConcernsPackage getPackage() {
-		return VerificationAndValidationConcernsPackage.eINSTANCE;
-	}
-
-} //VerificationAndValidationConcernsFactoryImpl
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/verificationandvalidationconcerns/impl/VerificationAndValidationConcernsPackageImpl.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/verificationandvalidationconcerns/impl/VerificationAndValidationConcernsPackageImpl.java
deleted file mode 100644
index 5e0e99b..0000000
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src-gen/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/papyrusrestandardutils/verificationandvalidationconcerns/impl/VerificationAndValidationConcernsPackageImpl.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/**
- * Copyright (c) 2017 CEA LIST.
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *   Sébastien Gerard (CEA LIST) <sebastien.gerard@cea.fr> - Initial API and implementation
- *   Yupanqui Munoz Julho (CEA LIST) <yupanqui.munozjulho@cea.fr> - Initial API and implementation
- * 
- */
-package org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.verificationandvalidationconcerns.impl;
-
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.priorityandimportanceconcerns.PriorityAndImportanceConcernsPackage;
-
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.priorityandimportanceconcerns.impl.PriorityAndImportanceConcernsPackageImpl;
-
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.RequirementAndProcessConcernsPackage;
-
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementandprocessconcerns.impl.RequirementAndProcessConcernsPackageImpl;
-
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementclassificationconcerns.RequirementClassificationConcernsPackage;
-
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementclassificationconcerns.impl.RequirementClassificationConcernsPackageImpl;
-
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementscharacteristicsconcerns.RequirementsCharacteristicsConcernsPackage;
-
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.requirementscharacteristicsconcerns.impl.RequirementsCharacteristicsConcernsPackageImpl;
-
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.verificationandvalidationconcerns.VV_MethodKind;
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.verificationandvalidationconcerns.VV_StatusKind;
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.verificationandvalidationconcerns.VerificationAndValidationConcernsFactory;
-import org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.verificationandvalidationconcerns.VerificationAndValidationConcernsPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class VerificationAndValidationConcernsPackageImpl extends EPackageImpl implements VerificationAndValidationConcernsPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum vV_MethodKindEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum vV_StatusKindEEnum = 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.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.papyrusrestandardutils.verificationandvalidationconcerns.VerificationAndValidationConcernsPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private VerificationAndValidationConcernsPackageImpl() {
-		super(eNS_URI, VerificationAndValidationConcernsFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
-	 * <p>This method is used to initialize {@link VerificationAndValidationConcernsPackage#eINSTANCE} when that field is accessed.
-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static VerificationAndValidationConcernsPackage init() {
-		if (isInited) return (VerificationAndValidationConcernsPackage)EPackage.Registry.INSTANCE.getEPackage(VerificationAndValidationConcernsPackage.eNS_URI);
-
-		// Obtain or create and register package
-		VerificationAndValidationConcernsPackageImpl theVerificationAndValidationConcernsPackage = (VerificationAndValidationConcernsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof VerificationAndValidationConcernsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new VerificationAndValidationConcernsPackageImpl());
-
-		isInited = true;
-
-		// Obtain or create and register interdependencies
-		RequirementClassificationConcernsPackageImpl theRequirementClassificationConcernsPackage = (RequirementClassificationConcernsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(RequirementClassificationConcernsPackage.eNS_URI) instanceof RequirementClassificationConcernsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(RequirementClassificationConcernsPackage.eNS_URI) : RequirementClassificationConcernsPackage.eINSTANCE);
-		RequirementsCharacteristicsConcernsPackageImpl theRequirementsCharacteristicsConcernsPackage = (RequirementsCharacteristicsConcernsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(RequirementsCharacteristicsConcernsPackage.eNS_URI) instanceof RequirementsCharacteristicsConcernsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(RequirementsCharacteristicsConcernsPackage.eNS_URI) : RequirementsCharacteristicsConcernsPackage.eINSTANCE);
-		PriorityAndImportanceConcernsPackageImpl thePriorityAndImportanceConcernsPackage = (PriorityAndImportanceConcernsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(PriorityAndImportanceConcernsPackage.eNS_URI) instanceof PriorityAndImportanceConcernsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(PriorityAndImportanceConcernsPackage.eNS_URI) : PriorityAndImportanceConcernsPackage.eINSTANCE);
-		RequirementAndProcessConcernsPackageImpl theRequirementAndProcessConcernsPackage = (RequirementAndProcessConcernsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(RequirementAndProcessConcernsPackage.eNS_URI) instanceof RequirementAndProcessConcernsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(RequirementAndProcessConcernsPackage.eNS_URI) : RequirementAndProcessConcernsPackage.eINSTANCE);
-
-		// Create package meta-data objects
-		theVerificationAndValidationConcernsPackage.createPackageContents();
-		theRequirementClassificationConcernsPackage.createPackageContents();
-		theRequirementsCharacteristicsConcernsPackage.createPackageContents();
-		thePriorityAndImportanceConcernsPackage.createPackageContents();
-		theRequirementAndProcessConcernsPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theVerificationAndValidationConcernsPackage.initializePackageContents();
-		theRequirementClassificationConcernsPackage.initializePackageContents();
-		theRequirementsCharacteristicsConcernsPackage.initializePackageContents();
-		thePriorityAndImportanceConcernsPackage.initializePackageContents();
-		theRequirementAndProcessConcernsPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theVerificationAndValidationConcernsPackage.freeze();
-
-  
-		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(VerificationAndValidationConcernsPackage.eNS_URI, theVerificationAndValidationConcernsPackage);
-		return theVerificationAndValidationConcernsPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getVV_MethodKind() {
-		return vV_MethodKindEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getVV_StatusKind() {
-		return vV_StatusKindEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public VerificationAndValidationConcernsFactory getVerificationAndValidationConcernsFactory() {
-		return (VerificationAndValidationConcernsFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create enums
-		vV_MethodKindEEnum = createEEnum(VV_METHOD_KIND);
-		vV_StatusKindEEnum = createEEnum(VV_STATUS_KIND);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Initialize enums and add enum literals
-		initEEnum(vV_MethodKindEEnum, VV_MethodKind.class, "VV_MethodKind"); //$NON-NLS-1$
-		addEEnumLiteral(vV_MethodKindEEnum, VV_MethodKind.ANALYSIS);
-		addEEnumLiteral(vV_MethodKindEEnum, VV_MethodKind.INSPECTION);
-		addEEnumLiteral(vV_MethodKindEEnum, VV_MethodKind.SYSTEM_TEST);
-		addEEnumLiteral(vV_MethodKindEEnum, VV_MethodKind.COMPONENT_TEST);
-
-		initEEnum(vV_StatusKindEEnum, VV_StatusKind.class, "VV_StatusKind"); //$NON-NLS-1$
-		addEEnumLiteral(vV_StatusKindEEnum, VV_StatusKind.PENDING);
-		addEEnumLiteral(vV_StatusKindEEnum, VV_StatusKind.PASSED);
-		addEEnumLiteral(vV_StatusKindEEnum, VV_StatusKind.FAILED);
-		addEEnumLiteral(vV_StatusKindEEnum, VV_StatusKind.INCONCLUSIVE);
-
-		// Create resource
-		createResource(eNS_URI);
-
-		// Create annotations
-		// http://www.eclipse.org/uml2/2.0.0/UML
-		createUMLAnnotations();
-	}
-
-	/**
-	 * Initializes the annotations for <b>http://www.eclipse.org/uml2/2.0.0/UML</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void createUMLAnnotations() {
-		String source = "http://www.eclipse.org/uml2/2.0.0/UML"; //$NON-NLS-1$	
-		addAnnotation
-		  (this, 
-		   source, 
-		   new String[] {
-			 "originalName", "VerificationAndValidationConcerns" //$NON-NLS-1$ //$NON-NLS-2$
-		   });
-	}
-
-} //VerificationAndValidationConcernsPackageImpl
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/set/PapyrusREStandardUtilsSet.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/set/PapyrusREStandardUtilsSet.java
deleted file mode 100644
index a4ff06a..0000000
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary/src/org/eclipse/papyrus/requirements/sysml14/papyrusre/modellibrary/set/PapyrusREStandardUtilsSet.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2017 CEA List.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Yupanqui Munoz Julho (CEA LIST) <yupanqui.munozjulho@cea.fr> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.papyrus.requirements.sysml14.papyrusre.modellibrary.set;
-
-public class PapyrusREStandardUtilsSet {
-	
-	/** PapyrusRE StandardUtils model library path. */
-    public static final String MODELLIBRARY_PATH =
-        "pathmap://PAPYRUSRE_STANDARDUTILS_MODELLIBARY/PapyrusRE_StandardUtils.modellibrary.uml"; //$NON-NLS-1$
-
-}
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/resources/profile/PapyrusRE.profile.genmodel b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/resources/profile/PapyrusRE.profile.genmodel
index 0352f5d..6b4d6c1 100644
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/resources/profile/PapyrusRE.profile.genmodel
+++ b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/resources/profile/PapyrusRE.profile.genmodel
@@ -45,18 +45,18 @@
         disposableProviderFactory="true" ecorePackage="papyrusre.ecore#//BasicRequirement">
       <genClasses xsi:type="genmodel:GenClass" ecoreClass="papyrusre.ecore#//BasicRequirement/Requirement"/>
       <genClasses xsi:type="genmodel:GenClass" ecoreClass="papyrusre.ecore#//BasicRequirement/AuthorReq">
-        <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute papyrusre.ecore#//BasicRequirement/AuthorReq/author"/>
+        <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EReference papyrusre.ecore#//BasicRequirement/AuthorReq/author"/>
       </genClasses>
-      <genClasses xsi:type="genmodel:GenClass" ecoreClass="papyrusre.ecore#//BasicRequirement/PriorityReqCharac">
-        <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute papyrusre.ecore#//BasicRequirement/PriorityReqCharac/priority"/>
+      <genClasses xsi:type="genmodel:GenClass" ecoreClass="papyrusre.ecore#//BasicRequirement/PriorityReq">
+        <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute papyrusre.ecore#//BasicRequirement/PriorityReq/priority"/>
       </genClasses>
       <genClasses xsi:type="genmodel:GenClass" ecoreClass="papyrusre.ecore#//BasicRequirement/SourceReq">
         <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
             propertySortChoices="true" ecoreFeature="ecore:EReference papyrusre.ecore#//BasicRequirement/SourceReq/source"/>
       </genClasses>
-      <genClasses xsi:type="genmodel:GenClass" ecoreClass="papyrusre.ecore#//BasicRequirement/ReviewStatusReqCharac">
+      <genClasses xsi:type="genmodel:GenClass" ecoreClass="papyrusre.ecore#//BasicRequirement/ReviewStatusReq">
         <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-            propertySortChoices="true" ecoreFeature="ecore:EReference papyrusre.ecore#//BasicRequirement/ReviewStatusReqCharac/reviewStatus"/>
+            propertySortChoices="true" ecoreFeature="ecore:EReference papyrusre.ecore#//BasicRequirement/ReviewStatusReq/status"/>
       </genClasses>
       <genClasses xsi:type="genmodel:GenClass" ecoreClass="papyrusre.ecore#//BasicRequirement/VersionReq">
         <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute papyrusre.ecore#//BasicRequirement/VersionReq/version"/>
@@ -65,6 +65,9 @@
         <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
             propertySortChoices="true" ecoreFeature="ecore:EReference papyrusre.ecore#//BasicRequirement/LevelReq/level"/>
       </genClasses>
+      <genClasses xsi:type="genmodel:GenClass" ecoreClass="papyrusre.ecore#//BasicRequirement/EffortReq">
+        <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute papyrusre.ecore#//BasicRequirement/EffortReq/effort"/>
+      </genClasses>
       <genClasses xsi:type="genmodel:GenClass" ecoreClass="papyrusre.ecore#//BasicRequirement/Backlog">
         <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
             propertySortChoices="true" ecoreFeature="ecore:EReference papyrusre.ecore#//BasicRequirement/Backlog/base_Package"/>
@@ -76,13 +79,15 @@
         <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
             propertySortChoices="true" ecoreFeature="ecore:EReference papyrusre.ecore#//Stakeholder/StakeHolder/base_Actor"/>
       </genClasses>
-      <genClasses xsi:type="genmodel:GenClass" ecoreClass="papyrusre.ecore#//Stakeholder/User"/>
       <genClasses xsi:type="genmodel:GenClass" ecoreClass="papyrusre.ecore#//Stakeholder/RequirementSource">
         <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
             propertySortChoices="true" ecoreFeature="ecore:EReference papyrusre.ecore#//Stakeholder/RequirementSource/base_Element"/>
         <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
             propertySortChoices="true" ecoreFeature="ecore:EReference papyrusre.ecore#//Stakeholder/RequirementSource/kind"/>
+        <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute papyrusre.ecore#//Stakeholder/RequirementSource/description"/>
       </genClasses>
+      <genClasses xsi:type="genmodel:GenClass" ecoreClass="papyrusre.ecore#//Stakeholder/User"/>
+      <genClasses xsi:type="genmodel:GenClass" ecoreClass="papyrusre.ecore#//Stakeholder/RequirementEngineer"/>
     </nestedGenPackages>
     <nestedGenPackages xsi:type="genmodel:GenPackage" prefix="RequirementKind" basePackage="org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre"
         disposableProviderFactory="true" ecorePackage="papyrusre.ecore#//RequirementKind">
@@ -102,10 +107,6 @@
         <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
             propertySortChoices="true" ecoreFeature="ecore:EReference papyrusre.ecore#//RequirementKind/QualityKind/base_PrimitiveType"/>
       </genClasses>
-      <genClasses xsi:type="genmodel:GenClass" ecoreClass="papyrusre.ecore#//RequirementKind/FunctionalRequirementKind">
-        <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-            propertySortChoices="true" ecoreFeature="ecore:EReference papyrusre.ecore#//RequirementKind/FunctionalRequirementKind/base_PrimitiveType"/>
-      </genClasses>
       <genClasses xsi:type="genmodel:GenClass" ecoreClass="papyrusre.ecore#//RequirementKind/RequirementSourceKind">
         <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
             propertySortChoices="true" ecoreFeature="ecore:EReference papyrusre.ecore#//RequirementKind/RequirementSourceKind/base_PrimitiveType"/>
@@ -114,10 +115,7 @@
     <nestedGenPackages xsi:type="genmodel:GenPackage" prefix="RequirementClassification"
         basePackage="org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre" disposableProviderFactory="true"
         ecorePackage="papyrusre.ecore#//RequirementClassification">
-      <genClasses xsi:type="genmodel:GenClass" ecoreClass="papyrusre.ecore#//RequirementClassification/FunctionalRequirement">
-        <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-            propertySortChoices="true" ecoreFeature="ecore:EReference papyrusre.ecore#//RequirementClassification/FunctionalRequirement/functionalRequirementKind"/>
-      </genClasses>
+      <genClasses xsi:type="genmodel:GenClass" ecoreClass="papyrusre.ecore#//RequirementClassification/FunctionalRequirement"/>
       <genClasses xsi:type="genmodel:GenClass" ecoreClass="papyrusre.ecore#//RequirementClassification/ConstraintRequirement">
         <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
             propertySortChoices="true" ecoreFeature="ecore:EReference papyrusre.ecore#//RequirementClassification/ConstraintRequirement/constraintKind"/>
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/resources/profile/PapyrusRE.profile.notation b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/resources/profile/PapyrusRE.profile.notation
index 34eb7c1..c21d39c 100644
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/resources/profile/PapyrusRE.profile.notation
+++ b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/resources/profile/PapyrusRE.profile.notation
@@ -183,7 +183,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mGttwDqKEeCmwNGSFJpOjg"/>
       </children>
       <element xmi:type="uml:Stereotype" href="PapyrusRE.profile.uml#_qIm20Dp_EeCmwNGSFJpOjg"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mGttsTqKEeCmwNGSFJpOjg" x="28" y="139" width="303" height="482"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mGttsTqKEeCmwNGSFJpOjg" x="28" y="139" width="303" height="582"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_xS0rkDKjEeiCRcmDqF2OVg" type="Stereotype_Shape" gradient="16777215, -1, 0">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_AzEbcDKmEeiCRcmDqF2OVg" source="PapyrusCSSForceValue">
@@ -293,7 +293,7 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5s4GzDKjEeiCRcmDqF2OVg"/>
       </children>
       <element xmi:type="uml:Stereotype" href="PapyrusRE.profile.uml#_5szOQDKjEeiCRcmDqF2OVg"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5s4GwTKjEeiCRcmDqF2OVg" x="550" y="470" width="271" height="61"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5s4GwTKjEeiCRcmDqF2OVg" x="550" y="470" width="271" height="71"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_-7m1cDKjEeiCRcmDqF2OVg" type="Stereotype_Shape" gradient="16777215, -1, 0">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_AzKiEDKmEeiCRcmDqF2OVg" source="PapyrusCSSForceValue">
@@ -423,6 +423,10 @@
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_booEsSUlEe2VZ5x8BKm0Kg" x="550" y="150" width="271" height="61"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_2v1kMC6JEe2R7Ja825gmOA" type="Stereotype_Shape">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_cECKYDgVEe2N9cYC_YqjxA" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_cECKYTgVEe2N9cYC_YqjxA" key="gradient" value="true"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_cXVg4DgVEe2N9cYC_YqjxA" key="fillColor" value="true"/>
+      </eAnnotations>
       <children xmi:type="notation:DecorationNode" xmi:id="_2v1kMi6JEe2R7Ja825gmOA" type="Stereotype_NameLabel"/>
       <children xmi:type="notation:BasicCompartment" xmi:id="_2v2LQC6JEe2R7Ja825gmOA" visible="false" type="Stereotype_AttributeCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_2v2LQS6JEe2R7Ja825gmOA"/>
@@ -440,17 +444,49 @@
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2v1kMS6JEe2R7Ja825gmOA" x="1000" y="530"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_2wo1cC6JEe2R7Ja825gmOA" type="Class_MetaclassShape">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_c9WYADgVEe2N9cYC_YqjxA" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_c9WYATgVEe2N9cYC_YqjxA" key="fillColor" value="true"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dGTfsDgVEe2N9cYC_YqjxA" key="gradient" value="true"/>
+      </eAnnotations>
       <children xmi:type="notation:DecorationNode" xmi:id="_2wpcgC6JEe2R7Ja825gmOA" type="Class_MetaclassNameLabel"/>
       <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2wo1cS6JEe2R7Ja825gmOA" x="1000" y="350"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_1-d_Yy6OEe2R7Ja825gmOA" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_1-d_ZC6OEe2R7Ja825gmOA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1-d_Zi6OEe2R7Ja825gmOA" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_ubQoEDgPEe2N9cYC_YqjxA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_ubQoETgPEe2N9cYC_YqjxA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_ubQoEzgPEe2N9cYC_YqjxA" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1-d_ZS6OEe2R7Ja825gmOA" x="1200" y="350"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ubQoEjgPEe2N9cYC_YqjxA" x="1200" y="350"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_gFhfUDgUEe2N9cYC_YqjxA" type="Stereotype_Shape">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZZ6GcDgVEe2N9cYC_YqjxA" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZZ6tgDgVEe2N9cYC_YqjxA" key="gradient" value="true"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZxQ2gDgVEe2N9cYC_YqjxA" key="fillColor" value="true"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_gFhfUjgUEe2N9cYC_YqjxA" type="Stereotype_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_gFhfUzgUEe2N9cYC_YqjxA" type="Stereotype_AttributeCompartment">
+        <children xmi:type="notation:Shape" xmi:id="_TgkUgDgVEe2N9cYC_YqjxA" type="Property_ClassAttributeLabel">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tCblMDgVEe2N9cYC_YqjxA" source="displayNameLabelIcon">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tCcMQDgVEe2N9cYC_YqjxA" key="displayNameLabelIcon_value" value="false"/>
+          </eAnnotations>
+          <element xmi:type="uml:Property" href="PapyrusRE.profile.uml#_TgI2sDgVEe2N9cYC_YqjxA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_TgkUgTgVEe2N9cYC_YqjxA"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_gFhfVDgUEe2N9cYC_YqjxA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_gFhfVTgUEe2N9cYC_YqjxA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_gFhfVjgUEe2N9cYC_YqjxA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gFhfVzgUEe2N9cYC_YqjxA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_gFhfWDgUEe2N9cYC_YqjxA" visible="false" type="Stereotype_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_gFhfWTgUEe2N9cYC_YqjxA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_gFhfWjgUEe2N9cYC_YqjxA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_gFhfWzgUEe2N9cYC_YqjxA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gFhfXDgUEe2N9cYC_YqjxA"/>
+      </children>
+      <element xmi:type="uml:Stereotype" href="PapyrusRE.profile.uml#_gFecADgUEe2N9cYC_YqjxA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gFhfUTgUEe2N9cYC_YqjxA" x="550" y="660" width="271" height="61"/>
     </children>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_WgSzcTp_EeCmwNGSFJpOjg"/>
     <styles xmi:type="notation:StringValueStyle" xmi:id="_DuKuoFxSEeelPYvPzDlaIw" name="diagram_compatibility_version" stringValue="1.4.0"/>
@@ -480,7 +516,7 @@
       <styles xmi:type="notation:FontStyle" xmi:id="_pNVDwTKmEeiCRcmDqF2OVg"/>
       <element xmi:type="uml:Generalization" href="PapyrusRE.profile.uml#_pND-ADKmEeiCRcmDqF2OVg"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_pNVDwjKmEeiCRcmDqF2OVg" points="[331, 170, -643984, -643984]$[550, 170, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pN5EcDKmEeiCRcmDqF2OVg" id="(1.0,0.25103734439834025)"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pN5EcDKmEeiCRcmDqF2OVg" id="(1.0,0.20790378006872853)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pN5EcTKmEeiCRcmDqF2OVg" id="(0.0,0.4918032786885246)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_tyIrsDKmEeiCRcmDqF2OVg" type="Generalization_Edge" source="_mGttsDqKEeCmwNGSFJpOjg" target="_0VvC8DKjEeiCRcmDqF2OVg">
@@ -491,7 +527,7 @@
       <styles xmi:type="notation:FontStyle" xmi:id="_tyIrsTKmEeiCRcmDqF2OVg"/>
       <element xmi:type="uml:Generalization" href="PapyrusRE.profile.uml#_tx73YDKmEeiCRcmDqF2OVg"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tyIrsjKmEeiCRcmDqF2OVg" points="[331, 660, -643984, -643984]$[550, 660, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tykwkDKmEeiCRcmDqF2OVg" id="(1.0,0.4170124481327801)"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tykwkDKmEeiCRcmDqF2OVg" id="(1.0,0.34536082474226804)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tykwkTKmEeiCRcmDqF2OVg" id="(0.0,0.4918032786885246)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_uhByADKmEeiCRcmDqF2OVg" type="Generalization_Edge" source="_mGttsDqKEeCmwNGSFJpOjg" target="_-7m1cDKjEeiCRcmDqF2OVg">
@@ -502,7 +538,7 @@
       <styles xmi:type="notation:FontStyle" xmi:id="_uhByATKmEeiCRcmDqF2OVg"/>
       <element xmi:type="uml:Generalization" href="PapyrusRE.profile.uml#_uf37cDKmEeiCRcmDqF2OVg"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uhByAjKmEeiCRcmDqF2OVg"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uhsgYDKmEeiCRcmDqF2OVg" id="(1.0,0.58298755186722)"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uhsgYDKmEeiCRcmDqF2OVg" id="(1.0,0.48281786941580757)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uhsgYTKmEeiCRcmDqF2OVg" id="(0.0,0.4918032786885246)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_wEfv4DKmEeiCRcmDqF2OVg" type="Generalization_Edge" source="_mGttsDqKEeCmwNGSFJpOjg" target="_5s4GwDKjEeiCRcmDqF2OVg">
@@ -513,8 +549,8 @@
       <styles xmi:type="notation:FontStyle" xmi:id="_wEfv4TKmEeiCRcmDqF2OVg"/>
       <element xmi:type="uml:Generalization" href="PapyrusRE.profile.uml#_wES7kDKmEeiCRcmDqF2OVg"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wEfv4jKmEeiCRcmDqF2OVg" points="[331, 870, -643984, -643984]$[550, 870, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wE8b0DKmEeiCRcmDqF2OVg" id="(1.0,0.7489626556016598)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wE8b0TKmEeiCRcmDqF2OVg" id="(0.0,0.4918032786885246)"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wE8b0DKmEeiCRcmDqF2OVg" id="(1.0,0.6202749140893471)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wE8b0TKmEeiCRcmDqF2OVg" id="(0.0,0.4225352112676056)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_wzOMgCRcEe2L_4aZcs4v_g" type="Generalization_Edge" source="_mGttsDqKEeCmwNGSFJpOjg" target="_mQ-VwCRcEe2L_4aZcs4v_g">
       <children xmi:type="notation:DecorationNode" xmi:id="_wzOMgyRcEe2L_4aZcs4v_g" type="Generalization_StereotypeLabel">
@@ -523,7 +559,7 @@
       <styles xmi:type="notation:FontStyle" xmi:id="_wzOMgSRcEe2L_4aZcs4v_g"/>
       <element xmi:type="uml:Generalization" href="PapyrusRE.profile.uml#_wxCbMCRcEe2L_4aZcs4v_g"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wzOMgiRcEe2L_4aZcs4v_g" points="[280, 621, -643984, -643984]$[550, 590, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w3oLYCRcEe2L_4aZcs4v_g" id="(1.0,0.9356846473029046)"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w3oLYCRcEe2L_4aZcs4v_g" id="(1.0,0.7749140893470791)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w3oLYSRcEe2L_4aZcs4v_g" id="(0.0,0.5633802816901409)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_foWpoCUlEe2VZ5x8BKm0Kg" type="Generalization_Edge" source="_mGttsDqKEeCmwNGSFJpOjg" target="_booEsCUlEe2VZ5x8BKm0Kg">
@@ -534,7 +570,7 @@
       <styles xmi:type="notation:FontStyle" xmi:id="_foWpoSUlEe2VZ5x8BKm0Kg"/>
       <element xmi:type="uml:Generalization" href="PapyrusRE.profile.uml#_fl6ZoCUlEe2VZ5x8BKm0Kg"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_foWpoiUlEe2VZ5x8BKm0Kg" points="[320, 139, -643984, -643984]$[570, 110, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ftPwsCUlEe2VZ5x8BKm0Kg" id="(1.0,0.10580912863070539)"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ftPwsCUlEe2VZ5x8BKm0Kg" id="(1.0,0.08762886597938144)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ftPwsSUlEe2VZ5x8BKm0Kg" id="(0.0,0.6557377049180327)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_2xOEQC6JEe2R7Ja825gmOA" type="Extension_Edge" source="_2v1kMC6JEe2R7Ja825gmOA" target="_2wo1cC6JEe2R7Ja825gmOA">
@@ -555,15 +591,25 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6v0AwC6JEe2R7Ja825gmOA" id="(0.0,0.5)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6v0AwS6JEe2R7Ja825gmOA" id="(1.0,0.4225352112676056)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_1-emcC6OEe2R7Ja825gmOA" type="StereotypeCommentLink" source="_2wo1cC6JEe2R7Ja825gmOA" target="_1-d_Yy6OEe2R7Ja825gmOA">
-      <styles xmi:type="notation:FontStyle" xmi:id="_1-emcS6OEe2R7Ja825gmOA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1-emdS6OEe2R7Ja825gmOA" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_ubRPIDgPEe2N9cYC_YqjxA" type="StereotypeCommentLink" source="_2wo1cC6JEe2R7Ja825gmOA" target="_ubQoEDgPEe2N9cYC_YqjxA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_ubRPITgPEe2N9cYC_YqjxA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_ubR2MTgPEe2N9cYC_YqjxA" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1-emci6OEe2R7Ja825gmOA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1-emcy6OEe2R7Ja825gmOA"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1-emdC6OEe2R7Ja825gmOA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ubRPIjgPEe2N9cYC_YqjxA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ubRPIzgPEe2N9cYC_YqjxA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ubR2MDgPEe2N9cYC_YqjxA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_SPuXsDgVEe2N9cYC_YqjxA" type="Generalization_Edge" source="_mGttsDqKEeCmwNGSFJpOjg" target="_gFhfUDgUEe2N9cYC_YqjxA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_SPuXszgVEe2N9cYC_YqjxA" type="Generalization_StereotypeLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_SPuXtDgVEe2N9cYC_YqjxA" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_SPuXsTgVEe2N9cYC_YqjxA"/>
+      <element xmi:type="uml:Generalization" href="PapyrusRE.profile.uml#_SB4wADgVEe2N9cYC_YqjxA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_SPuXsjgVEe2N9cYC_YqjxA" points="[331, 680, -643984, -643984]$[550, 680, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Sr1r8DgVEe2N9cYC_YqjxA" id="(1.0,0.929553264604811)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Sr1r8TgVEe2N9cYC_YqjxA" id="(0.0,0.32786885245901637)"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_lvuLADp_EeCmwNGSFJpOjg" type="PapyrusUMLProfileDiagram" name="Requirement classification profile diagram." measurementUnit="Pixel">
@@ -627,10 +673,6 @@
         <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_g4jH0C6JEe2R7Ja825gmOA" source="PapyrusCSSForceValue">
           <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_g4jH0S6JEe2R7Ja825gmOA" key="visible" value="true"/>
         </eAnnotations>
-        <children xmi:type="notation:Shape" xmi:id="_j_cnUC6JEe2R7Ja825gmOA" type="Property_ClassAttributeLabel">
-          <element xmi:type="uml:Property" href="PapyrusRE.profile.uml#_j_VSkC6JEe2R7Ja825gmOA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_j_cnUS6JEe2R7Ja825gmOA"/>
-        </children>
         <styles xmi:type="notation:SortingStyle" xmi:id="_BuPrajqAEeCmwNGSFJpOjg"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_BuPrazqAEeCmwNGSFJpOjg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BuPrbDqAEeCmwNGSFJpOjg"/>
@@ -659,6 +701,9 @@
       <children xmi:type="notation:DecorationNode" xmi:id="_IBWyxjqBEeCmwNGSFJpOjg" type="Stereotype_NameLabel"/>
       <children xmi:type="notation:BasicCompartment" xmi:id="_IBWyxzqBEeCmwNGSFJpOjg" type="Stereotype_AttributeCompartment">
         <children xmi:type="notation:Shape" xmi:id="_JJCaQTqGEeCmwNGSFJpOjg" type="Property_ClassAttributeLabel" fontHeight="8" lineColor="0">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wXeOYDgVEe2N9cYC_YqjxA" source="displayNameLabelIcon">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wXeOYTgVEe2N9cYC_YqjxA" key="displayNameLabelIcon_value" value="false"/>
+          </eAnnotations>
           <styles xmi:type="notation:StringListValueStyle" xmi:id="_B7vJAJMLEeeXis3ri3jkBA" name="maskLabel">
             <stringListValue>multiplicity</stringListValue>
             <stringListValue>name</stringListValue>
@@ -696,6 +741,9 @@
       <children xmi:type="notation:DecorationNode" xmi:id="_Q2oGKDqIEeCmwNGSFJpOjg" type="Stereotype_NameLabel"/>
       <children xmi:type="notation:BasicCompartment" xmi:id="_Q2oGKTqIEeCmwNGSFJpOjg" type="Stereotype_AttributeCompartment">
         <children xmi:type="notation:Shape" xmi:id="_9r_n0DqIEeCmwNGSFJpOjg" type="Property_ClassAttributeLabel" fontHeight="8" lineColor="0">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v3efsDgVEe2N9cYC_YqjxA" source="displayNameLabelIcon">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v3efsTgVEe2N9cYC_YqjxA" key="displayNameLabelIcon_value" value="false"/>
+          </eAnnotations>
           <styles xmi:type="notation:StringListValueStyle" xmi:id="_BNKy0JMLEeeXis3ri3jkBA" name="maskLabel">
             <stringListValue>multiplicity</stringListValue>
             <stringListValue>name</stringListValue>
@@ -839,13 +887,13 @@
       <element xmi:type="uml:Stereotype" href="PapyrusRE.profile.uml#_mAdYECRdEe2L_4aZcs4v_g"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mAemMSRdEe2L_4aZcs4v_g" x="200" y="220"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_1_8mEy6OEe2R7Ja825gmOA" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_1_8mFC6OEe2R7Ja825gmOA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1_8mFi6OEe2R7Ja825gmOA" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_SLq68DgREe2N9cYC_YqjxA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_SLq68TgREe2N9cYC_YqjxA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_SLq68zgREe2N9cYC_YqjxA" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1_8mFS6OEe2R7Ja825gmOA" x="380" y="80"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SLq68jgREe2N9cYC_YqjxA" x="380" y="80"/>
     </children>
     <styles xmi:type="notation:StringValueStyle" xmi:id="_dYX9YSRcEe2L_4aZcs4v_g" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_dYX9YiRcEe2L_4aZcs4v_g"/>
@@ -877,19 +925,26 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oqU9UCRdEe2L_4aZcs4v_g" id="(0.6,0.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oqU9USRdEe2L_4aZcs4v_g" id="(0.18181818181818182,1.0)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_1_8mFy6OEe2R7Ja825gmOA" type="StereotypeCommentLink" source="_jcOWMCRcEe2L_4aZcs4v_g" target="_1_8mEy6OEe2R7Ja825gmOA">
-      <styles xmi:type="notation:FontStyle" xmi:id="_1_8mGC6OEe2R7Ja825gmOA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1_8mHC6OEe2R7Ja825gmOA" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_SLq69DgREe2N9cYC_YqjxA" type="StereotypeCommentLink" source="_jcOWMCRcEe2L_4aZcs4v_g" target="_SLq68DgREe2N9cYC_YqjxA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_SLq69TgREe2N9cYC_YqjxA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_SLq6-TgREe2N9cYC_YqjxA" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1_8mGS6OEe2R7Ja825gmOA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1_8mGi6OEe2R7Ja825gmOA"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1_8mGy6OEe2R7Ja825gmOA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_SLq69jgREe2N9cYC_YqjxA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SLq69zgREe2N9cYC_YqjxA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SLq6-DgREe2N9cYC_YqjxA"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_Wz-l0CRoEe2L_4aZcs4v_g" type="PapyrusUMLProfileDiagram" name="Glossary" measurementUnit="Pixel">
     <children xmi:type="notation:Shape" xmi:id="_XgkmECRoEe2L_4aZcs4v_g" type="Stereotype_Shape">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1o-kQDgVEe2N9cYC_YqjxA" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1o-kQTgVEe2N9cYC_YqjxA" key="gradient" value="true"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2F2tgDgVEe2N9cYC_YqjxA" key="fillColor" value="true"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2wyg4DgVEe2N9cYC_YqjxA" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2wzH8DgVEe2N9cYC_YqjxA" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
       <children xmi:type="notation:DecorationNode" xmi:id="_XglNICRoEe2L_4aZcs4v_g" type="Stereotype_NameLabel"/>
       <children xmi:type="notation:BasicCompartment" xmi:id="_XglNISRoEe2L_4aZcs4v_g" type="Stereotype_AttributeCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_XglNIiRoEe2L_4aZcs4v_g"/>
@@ -907,14 +962,25 @@
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XgkmESRoEe2L_4aZcs4v_g" x="345" y="215"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_XgtI8CRoEe2L_4aZcs4v_g" type="Class_MetaclassShape">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3e2gwDgVEe2N9cYC_YqjxA" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3e2gwTgVEe2N9cYC_YqjxA" key="fillColor" value="true"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3oEHIDgVEe2N9cYC_YqjxA" key="gradient" value="true"/>
+      </eAnnotations>
       <children xmi:type="notation:DecorationNode" xmi:id="_XgtI8iRoEe2L_4aZcs4v_g" type="Class_MetaclassNameLabel"/>
       <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XgtI8SRoEe2L_4aZcs4v_g" x="345" y="15"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_eAXUACRoEe2L_4aZcs4v_g" type="Stereotype_Shape">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_y_ic0DgVEe2N9cYC_YqjxA" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_y_ic0TgVEe2N9cYC_YqjxA" key="fillColor" value="true"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zTQDADgVEe2N9cYC_YqjxA" key="gradient" value="true"/>
+      </eAnnotations>
       <children xmi:type="notation:DecorationNode" xmi:id="_eAXUAiRoEe2L_4aZcs4v_g" type="Stereotype_NameLabel"/>
       <children xmi:type="notation:BasicCompartment" xmi:id="_eAXUAyRoEe2L_4aZcs4v_g" type="Stereotype_AttributeCompartment">
         <children xmi:type="notation:Shape" xmi:id="_fMRGcCRoEe2L_4aZcs4v_g" type="Property_ClassAttributeLabel">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_02zgcDgVEe2N9cYC_YqjxA" source="displayNameLabelIcon">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_020HgDgVEe2N9cYC_YqjxA" key="displayNameLabelIcon_value" value="false"/>
+          </eAnnotations>
           <element xmi:type="uml:Property" href="PapyrusRE.profile.uml#_fMOqMCRoEe2L_4aZcs4v_g"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_fMRGcSRoEe2L_4aZcs4v_g"/>
         </children>
@@ -940,25 +1006,29 @@
         <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r-k7USRoEe2L_4aZcs4v_g" key="PropStereoDisplay" value=""/>
         <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r-k7UiRoEe2L_4aZcs4v_g" key="StereotypePropertyLocation" value="Compartment"/>
       </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4Rs6ADgVEe2N9cYC_YqjxA" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4Rs6ATgVEe2N9cYC_YqjxA" key="gradient" value="true"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4wZBIDgVEe2N9cYC_YqjxA" key="fillColor" value="true"/>
+      </eAnnotations>
       <children xmi:type="notation:DecorationNode" xmi:id="_r-kUQiRoEe2L_4aZcs4v_g" type="Class_MetaclassNameLabel"/>
       <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#PrimitiveType"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_r-kUQyRoEe2L_4aZcs4v_g" x="560" y="20"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_2AmGUy6OEe2R7Ja825gmOA" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_2AmGVC6OEe2R7Ja825gmOA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2AmGVi6OEe2R7Ja825gmOA" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_Sdm_gDgREe2N9cYC_YqjxA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Sdm_gTgREe2N9cYC_YqjxA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_Sdm_gzgREe2N9cYC_YqjxA" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2AmGVS6OEe2R7Ja825gmOA" x="545" y="15"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Sdm_gjgREe2N9cYC_YqjxA" x="545" y="15"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_2Arl4y6OEe2R7Ja825gmOA" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_2Arl5C6OEe2R7Ja825gmOA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2Arl5i6OEe2R7Ja825gmOA" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_SdwwgzgREe2N9cYC_YqjxA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_SdwwhDgREe2N9cYC_YqjxA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_SdwwhjgREe2N9cYC_YqjxA" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#PrimitiveType"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2Arl5S6OEe2R7Ja825gmOA" x="760" y="20"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SdwwhTgREe2N9cYC_YqjxA" x="760" y="20"/>
     </children>
     <styles xmi:type="notation:StringValueStyle" xmi:id="_Wz-l0SRoEe2L_4aZcs4v_g" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_Wz-l0iRoEe2L_4aZcs4v_g"/>
@@ -978,54 +1048,54 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_thhUwCRoEe2L_4aZcs4v_g" id="(0.375,0.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_thh70CRoEe2L_4aZcs4v_g" id="(0.6,1.0)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_2AmGVy6OEe2R7Ja825gmOA" type="StereotypeCommentLink" source="_XgtI8CRoEe2L_4aZcs4v_g" target="_2AmGUy6OEe2R7Ja825gmOA">
-      <styles xmi:type="notation:FontStyle" xmi:id="_2AmGWC6OEe2R7Ja825gmOA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2AmGXC6OEe2R7Ja825gmOA" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_Sdm_hDgREe2N9cYC_YqjxA" type="StereotypeCommentLink" source="_XgtI8CRoEe2L_4aZcs4v_g" target="_Sdm_gDgREe2N9cYC_YqjxA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Sdm_hTgREe2N9cYC_YqjxA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_SdnmkjgREe2N9cYC_YqjxA" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2AmGWS6OEe2R7Ja825gmOA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2AmGWi6OEe2R7Ja825gmOA"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2AmGWy6OEe2R7Ja825gmOA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Sdm_hjgREe2N9cYC_YqjxA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SdnmkDgREe2N9cYC_YqjxA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SdnmkTgREe2N9cYC_YqjxA"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_2Arl5y6OEe2R7Ja825gmOA" type="StereotypeCommentLink" source="_r-kUQCRoEe2L_4aZcs4v_g" target="_2Arl4y6OEe2R7Ja825gmOA">
-      <styles xmi:type="notation:FontStyle" xmi:id="_2Arl6C6OEe2R7Ja825gmOA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2Arl7C6OEe2R7Ja825gmOA" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_SdwwhzgREe2N9cYC_YqjxA" type="StereotypeCommentLink" source="_r-kUQCRoEe2L_4aZcs4v_g" target="_SdwwgzgREe2N9cYC_YqjxA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_SdwwiDgREe2N9cYC_YqjxA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_SdwwjDgREe2N9cYC_YqjxA" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#PrimitiveType"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2Arl6S6OEe2R7Ja825gmOA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2Arl6i6OEe2R7Ja825gmOA"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2Arl6y6OEe2R7Ja825gmOA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_SdwwiTgREe2N9cYC_YqjxA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SdwwijgREe2N9cYC_YqjxA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SdwwizgREe2N9cYC_YqjxA"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_Mr0joCUkEe2VZ5x8BKm0Kg" type="PapyrusUMLProfileDiagram" name="stakeholder" measurementUnit="Pixel">
     <children xmi:type="notation:Shape" xmi:id="_SoTwMCUkEe2VZ5x8BKm0Kg" type="Stereotype_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_SoU-UCUkEe2VZ5x8BKm0Kg" type="Stereotype_NameLabel"/>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_SoU-USUkEe2VZ5x8BKm0Kg" type="Stereotype_AttributeCompartment">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_SoU-USUkEe2VZ5x8BKm0Kg" visible="false" type="Stereotype_AttributeCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_SoU-UiUkEe2VZ5x8BKm0Kg"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_SoU-UyUkEe2VZ5x8BKm0Kg"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_SoU-VCUkEe2VZ5x8BKm0Kg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SoU-VSUkEe2VZ5x8BKm0Kg"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_SoU-ViUkEe2VZ5x8BKm0Kg" type="Stereotype_OperationCompartment">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_SoU-ViUkEe2VZ5x8BKm0Kg" visible="false" type="Stereotype_OperationCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_SoU-VyUkEe2VZ5x8BKm0Kg"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_SoU-WCUkEe2VZ5x8BKm0Kg"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_SoU-WSUkEe2VZ5x8BKm0Kg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SoU-WiUkEe2VZ5x8BKm0Kg"/>
       </children>
       <element xmi:type="uml:Stereotype" href="PapyrusRE.profile.uml#_-H-ZYCRXEe2L_4aZcs4v_g"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SoTwMSUkEe2VZ5x8BKm0Kg" x="120" y="160"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SoTwMSUkEe2VZ5x8BKm0Kg" x="120" y="160" width="301"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_Ut0EICUkEe2VZ5x8BKm0Kg" type="Stereotype_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_Ut0rMCUkEe2VZ5x8BKm0Kg" type="Stereotype_NameLabel"/>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_Ut0rMSUkEe2VZ5x8BKm0Kg" type="Stereotype_AttributeCompartment">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Ut0rMSUkEe2VZ5x8BKm0Kg" visible="false" type="Stereotype_AttributeCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_Ut0rMiUkEe2VZ5x8BKm0Kg"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_Ut0rMyUkEe2VZ5x8BKm0Kg"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_Ut0rNCUkEe2VZ5x8BKm0Kg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ut0rNSUkEe2VZ5x8BKm0Kg"/>
       </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_Ut0rNiUkEe2VZ5x8BKm0Kg" type="Stereotype_OperationCompartment">
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Ut0rNiUkEe2VZ5x8BKm0Kg" visible="false" type="Stereotype_OperationCompartment">
         <styles xmi:type="notation:TitleStyle" xmi:id="_Ut0rNyUkEe2VZ5x8BKm0Kg"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_Ut0rOCUkEe2VZ5x8BKm0Kg"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_Ut0rOSUkEe2VZ5x8BKm0Kg"/>
@@ -1041,6 +1111,10 @@
           <element xmi:type="uml:Property" href="PapyrusRE.profile.uml#_bS7tsC6KEe2R7Ja825gmOA"/>
           <layoutConstraint xmi:type="notation:Location" xmi:id="_bTDCcS6KEe2R7Ja825gmOA"/>
         </children>
+        <children xmi:type="notation:Shape" xmi:id="_TbfkEDgREe2N9cYC_YqjxA" type="Property_ClassAttributeLabel">
+          <element xmi:type="uml:Property" href="PapyrusRE.profile.uml#_TbRhoDgREe2N9cYC_YqjxA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_TbfkETgREe2N9cYC_YqjxA"/>
+        </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="_WPVhRCUkEe2VZ5x8BKm0Kg"/>
         <styles xmi:type="notation:SortingStyle" xmi:id="_WPVhRSUkEe2VZ5x8BKm0Kg"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_WPVhRiUkEe2VZ5x8BKm0Kg"/>
@@ -1053,33 +1127,50 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WPVhTCUkEe2VZ5x8BKm0Kg"/>
       </children>
       <element xmi:type="uml:Stereotype" href="PapyrusRE.profile.uml#_V_8UECRYEe2L_4aZcs4v_g"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WPVhQSUkEe2VZ5x8BKm0Kg" x="360" y="160"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WPVhQSUkEe2VZ5x8BKm0Kg" x="560" y="160"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_XkJ_ICUkEe2VZ5x8BKm0Kg" type="Class_MetaclassShape">
       <children xmi:type="notation:DecorationNode" xmi:id="_XkJ_IiUkEe2VZ5x8BKm0Kg" type="Class_MetaclassNameLabel"/>
       <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XkJ_ISUkEe2VZ5x8BKm0Kg" x="360" y="20" width="161"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XkJ_ISUkEe2VZ5x8BKm0Kg" x="560" y="20" width="221"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_YA8BwCUkEe2VZ5x8BKm0Kg" type="Class_MetaclassShape">
       <children xmi:type="notation:DecorationNode" xmi:id="_YA8BwiUkEe2VZ5x8BKm0Kg" type="Class_MetaclassNameLabel"/>
       <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Actor"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YA8BwSUkEe2VZ5x8BKm0Kg" x="120" y="20"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YA8BwSUkEe2VZ5x8BKm0Kg" x="120" y="20" width="301"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_2CMo0y6OEe2R7Ja825gmOA" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_2CMo1C6OEe2R7Ja825gmOA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2CMo1i6OEe2R7Ja825gmOA" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_43mOoDgQEe2N9cYC_YqjxA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_43mOoTgQEe2N9cYC_YqjxA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_43m1sDgQEe2N9cYC_YqjxA" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2CMo1S6OEe2R7Ja825gmOA" x="560" y="20"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_43mOojgQEe2N9cYC_YqjxA" x="560" y="20"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_2CQ6Qy6OEe2R7Ja825gmOA" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_2CQ6RC6OEe2R7Ja825gmOA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2CQ6Ri6OEe2R7Ja825gmOA" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_43v_oDgQEe2N9cYC_YqjxA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_43v_oTgQEe2N9cYC_YqjxA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_43v_ozgQEe2N9cYC_YqjxA" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Actor"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2CQ6RS6OEe2R7Ja825gmOA" x="320" y="20"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_43v_ojgQEe2N9cYC_YqjxA" x="320" y="20"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_Bak8UDgREe2N9cYC_YqjxA" type="Stereotype_Shape">
+      <children xmi:type="notation:DecorationNode" xmi:id="_BaljYDgREe2N9cYC_YqjxA" type="Stereotype_NameLabel"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_BaljYTgREe2N9cYC_YqjxA" visible="false" type="Stereotype_AttributeCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_BaljYjgREe2N9cYC_YqjxA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_BaljYzgREe2N9cYC_YqjxA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_BaljZDgREe2N9cYC_YqjxA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BaljZTgREe2N9cYC_YqjxA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_BaljZjgREe2N9cYC_YqjxA" visible="false" type="Stereotype_OperationCompartment">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_BaljZzgREe2N9cYC_YqjxA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_BaljaDgREe2N9cYC_YqjxA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_BaljaTgREe2N9cYC_YqjxA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BaljajgREe2N9cYC_YqjxA"/>
+      </children>
+      <element xmi:type="uml:Stereotype" href="PapyrusRE.profile.uml#_BajuMDgREe2N9cYC_YqjxA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Bak8UTgREe2N9cYC_YqjxA" x="300" y="360"/>
     </children>
     <styles xmi:type="notation:StringValueStyle" xmi:id="_Mr0joSUkEe2VZ5x8BKm0Kg" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_Mr0joiUkEe2VZ5x8BKm0Kg"/>
@@ -1099,21 +1190,21 @@
       <element xmi:type="uml:Generalization" href="PapyrusRE.profile.uml#_BNTyoCRYEe2L_4aZcs4v_g"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UuD7wiUkEe2VZ5x8BKm0Kg" points="[0, 0, -643984, -643984]$[380, 256, -643984, -643984]"/>
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VNitECUkEe2VZ5x8BKm0Kg" id="(0.4,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VNitESUkEe2VZ5x8BKm0Kg" id="(0.4,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VNitESUkEe2VZ5x8BKm0Kg" id="(0.132890365448505,1.0)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_XkpHUCUkEe2VZ5x8BKm0Kg" type="Extension_Edge" source="_WPVhQCUkEe2VZ5x8BKm0Kg" target="_XkJ_ICUkEe2VZ5x8BKm0Kg">
       <styles xmi:type="notation:FontStyle" xmi:id="_XkpHUSUkEe2VZ5x8BKm0Kg"/>
       <element xmi:type="uml:Extension" href="PapyrusRE.profile.uml#_bLPUQCRYEe2L_4aZcs4v_g"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XkpHUiUkEe2VZ5x8BKm0Kg" points="[291, 319, -643984, -643984]$[0, 0, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ZjSlUCUkEe2VZ5x8BKm0Kg" id="(0.3418803418803419,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ZjSlUSUkEe2VZ5x8BKm0Kg" id="(0.4968944099378882,1.0)"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ZjSlUCUkEe2VZ5x8BKm0Kg" id="(0.3686635944700461,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ZjSlUSUkEe2VZ5x8BKm0Kg" id="(0.36199095022624433,1.0)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_YBai4CUkEe2VZ5x8BKm0Kg" type="Extension_Edge" source="_SoTwMCUkEe2VZ5x8BKm0Kg" target="_YA8BwCUkEe2VZ5x8BKm0Kg">
       <styles xmi:type="notation:FontStyle" xmi:id="_YBai4SUkEe2VZ5x8BKm0Kg"/>
       <element xmi:type="uml:Extension" href="PapyrusRE.profile.uml#_c6nAICRYEe2L_4aZcs4v_g"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YBai4iUkEe2VZ5x8BKm0Kg" points="[360, 131, -643984, -643984]$[0, 0, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aJJEYCUkEe2VZ5x8BKm0Kg" id="(0.6,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aJJEYSUkEe2VZ5x8BKm0Kg" id="(0.6,1.0)"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aJJEYCUkEe2VZ5x8BKm0Kg" id="(0.46511627906976744,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aJJEYSUkEe2VZ5x8BKm0Kg" id="(0.46511627906976744,1.0)"/>
     </edges>
     <edges xmi:type="notation:Connector" xmi:id="_YiEY4CUkEe2VZ5x8BKm0Kg" type="Generalization_Edge" source="_SoTwMCUkEe2VZ5x8BKm0Kg" target="_WPVhQCUkEe2VZ5x8BKm0Kg">
       <children xmi:type="notation:DecorationNode" xmi:id="_YiEY4yUkEe2VZ5x8BKm0Kg" type="Generalization_StereotypeLabel">
@@ -1123,28 +1214,38 @@
       <styles xmi:type="notation:FontStyle" xmi:id="_YiEY4SUkEe2VZ5x8BKm0Kg"/>
       <element xmi:type="uml:Generalization" href="PapyrusRE.profile.uml#_aasBECRYEe2L_4aZcs4v_g"/>
       <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YiEY4iUkEe2VZ5x8BKm0Kg" points="[393, 200, -643984, -643984]$[354, 319, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_axDY8CUkEe2VZ5x8BKm0Kg" id="(1.0,0.2)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_axEAACUkEe2VZ5x8BKm0Kg" id="(0.0,0.2)"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_axDY8CUkEe2VZ5x8BKm0Kg" id="(1.0,0.4)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_axEAACUkEe2VZ5x8BKm0Kg" id="(0.0,0.33613445378151263)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_2CMo1y6OEe2R7Ja825gmOA" type="StereotypeCommentLink" source="_XkJ_ICUkEe2VZ5x8BKm0Kg" target="_2CMo0y6OEe2R7Ja825gmOA">
-      <styles xmi:type="notation:FontStyle" xmi:id="_2CMo2C6OEe2R7Ja825gmOA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2CMo3C6OEe2R7Ja825gmOA" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_43m1sTgQEe2N9cYC_YqjxA" type="StereotypeCommentLink" source="_XkJ_ICUkEe2VZ5x8BKm0Kg" target="_43mOoDgQEe2N9cYC_YqjxA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_43m1sjgQEe2N9cYC_YqjxA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_43m1tjgQEe2N9cYC_YqjxA" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2CMo2S6OEe2R7Ja825gmOA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2CMo2i6OEe2R7Ja825gmOA"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2CMo2y6OEe2R7Ja825gmOA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_43m1szgQEe2N9cYC_YqjxA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_43m1tDgQEe2N9cYC_YqjxA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_43m1tTgQEe2N9cYC_YqjxA"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_2CQ6Ry6OEe2R7Ja825gmOA" type="StereotypeCommentLink" source="_YA8BwCUkEe2VZ5x8BKm0Kg" target="_2CQ6Qy6OEe2R7Ja825gmOA">
-      <styles xmi:type="notation:FontStyle" xmi:id="_2CQ6SC6OEe2R7Ja825gmOA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2CQ6TC6OEe2R7Ja825gmOA" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_43v_pDgQEe2N9cYC_YqjxA" type="StereotypeCommentLink" source="_YA8BwCUkEe2VZ5x8BKm0Kg" target="_43v_oDgQEe2N9cYC_YqjxA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_43v_pTgQEe2N9cYC_YqjxA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_43v_qTgQEe2N9cYC_YqjxA" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Actor"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2CQ6SS6OEe2R7Ja825gmOA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2CQ6Si6OEe2R7Ja825gmOA"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2CQ6Sy6OEe2R7Ja825gmOA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_43v_pjgQEe2N9cYC_YqjxA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_43v_pzgQEe2N9cYC_YqjxA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_43v_qDgQEe2N9cYC_YqjxA"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_EYI5oDgREe2N9cYC_YqjxA" type="Generalization_Edge" source="_Bak8UDgREe2N9cYC_YqjxA" target="_SoTwMCUkEe2VZ5x8BKm0Kg">
+      <children xmi:type="notation:DecorationNode" xmi:id="_EYI5ozgREe2N9cYC_YqjxA" type="Generalization_StereotypeLabel">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_EYI5pDgREe2N9cYC_YqjxA" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_EYI5oTgREe2N9cYC_YqjxA"/>
+      <element xmi:type="uml:Generalization" href="PapyrusRE.profile.uml#_EX8FUDgREe2N9cYC_YqjxA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EYI5ojgREe2N9cYC_YqjxA" points="[360, 360, -643984, -643984]$[200, 260, -643984, -643984]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EYjwYDgREe2N9cYC_YqjxA" id="(0.47244094488188976,0.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EYjwYTgREe2N9cYC_YqjxA" id="(0.7973421926910299,1.0)"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_yLhg8C6IEe2R7Ja825gmOA" type="PapyrusUMLProfileDiagram" name="ValueKind" measurementUnit="Pixel">
@@ -1221,23 +1322,6 @@
       <element xmi:type="uml:Stereotype" href="PapyrusRE.profile.uml#_5IrCMCUlEe2VZ5x8BKm0Kg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MkeKoS6JEe2R7Ja825gmOA" x="480" y="380"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_rOSMkC6JEe2R7Ja825gmOA" type="Stereotype_Shape">
-      <children xmi:type="notation:DecorationNode" xmi:id="_rOSMki6JEe2R7Ja825gmOA" type="Stereotype_NameLabel"/>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_rOSMky6JEe2R7Ja825gmOA" visible="false" type="Stereotype_AttributeCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_rOSMlC6JEe2R7Ja825gmOA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_rOSMlS6JEe2R7Ja825gmOA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_rOSMli6JEe2R7Ja825gmOA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rOSMly6JEe2R7Ja825gmOA"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_rOSMmC6JEe2R7Ja825gmOA" visible="false" type="Stereotype_OperationCompartment">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_rOSMmS6JEe2R7Ja825gmOA"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_rOSMmi6JEe2R7Ja825gmOA"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_rOSMmy6JEe2R7Ja825gmOA"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rOSMnC6JEe2R7Ja825gmOA"/>
-      </children>
-      <element xmi:type="uml:Stereotype" href="PapyrusRE.profile.uml#_rOQXYC6JEe2R7Ja825gmOA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rOSMkS6JEe2R7Ja825gmOA" x="760" y="380"/>
-    </children>
     <children xmi:type="notation:Shape" xmi:id="_gM2qAC6KEe2R7Ja825gmOA" type="Stereotype_Shape">
       <children xmi:type="notation:DecorationNode" xmi:id="_gM2qAi6KEe2R7Ja825gmOA" type="Stereotype_NameLabel"/>
       <children xmi:type="notation:BasicCompartment" xmi:id="_gM2qAy6KEe2R7Ja825gmOA" type="Stereotype_AttributeCompartment">
@@ -1255,13 +1339,13 @@
       <element xmi:type="uml:Stereotype" href="PapyrusRE.profile.uml#_gM1b4C6KEe2R7Ja825gmOA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gM2qAS6KEe2R7Ja825gmOA" x="960" y="380"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_2BXiYC6OEe2R7Ja825gmOA" type="StereotypeComment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_2BXiYS6OEe2R7Ja825gmOA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2BXiYy6OEe2R7Ja825gmOA" name="BASE_ELEMENT">
+    <children xmi:type="notation:Shape" xmi:id="_bNtjMDgREe2N9cYC_YqjxA" type="StereotypeComment">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_bNtjMTgREe2N9cYC_YqjxA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_bNtjMzgREe2N9cYC_YqjxA" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#PrimitiveType"/>
       </styles>
       <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2BXiYi6OEe2R7Ja825gmOA" x="396" y="186"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bNtjMjgREe2N9cYC_YqjxA" x="396" y="186"/>
     </children>
     <styles xmi:type="notation:StringValueStyle" xmi:id="_yLhg8S6IEe2R7Ja825gmOA" name="diagram_compatibility_version" stringValue="1.4.0"/>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_yLhg8i6IEe2R7Ja825gmOA"/>
@@ -1297,13 +1381,6 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OHy-kC6JEe2R7Ja825gmOA" id="(0.6,0.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NfscwC6JEe2R7Ja825gmOA" id="(0.5348066298342542,1.0)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_vTOosC6JEe2R7Ja825gmOA" type="Extension_Edge" source="_rOSMkC6JEe2R7Ja825gmOA" target="_3cGpwC6IEe2R7Ja825gmOA">
-      <styles xmi:type="notation:FontStyle" xmi:id="_vTOosS6JEe2R7Ja825gmOA"/>
-      <element xmi:type="uml:Extension" href="PapyrusRE.profile.uml#_vS-KAC6JEe2R7Ja825gmOA"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vTOosi6JEe2R7Ja825gmOA" points="[800, 380, -643984, -643984]$[800, 236, -643984, -643984]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vTfHYC6JEe2R7Ja825gmOA" id="(0.2484472049689441,0.0)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vTfHYS6JEe2R7Ja825gmOA" id="(0.6674033149171271,1.0)"/>
-    </edges>
     <edges xmi:type="notation:Connector" xmi:id="_igij4C6KEe2R7Ja825gmOA" type="Extension_Edge" source="_gM2qAC6KEe2R7Ja825gmOA" target="_3cGpwC6IEe2R7Ja825gmOA">
       <styles xmi:type="notation:FontStyle" xmi:id="_igij4S6KEe2R7Ja825gmOA"/>
       <element xmi:type="uml:Extension" href="PapyrusRE.profile.uml#_igcdQC6KEe2R7Ja825gmOA"/>
@@ -1311,15 +1388,15 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_igsU4C6KEe2R7Ja825gmOA" id="(0.425531914893617,0.0)"/>
       <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_igsU4S6KEe2R7Ja825gmOA" id="(0.9104972375690608,1.0)"/>
     </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_2BXiZC6OEe2R7Ja825gmOA" type="StereotypeCommentLink" source="_3cGpwC6IEe2R7Ja825gmOA" target="_2BXiYC6OEe2R7Ja825gmOA">
-      <styles xmi:type="notation:FontStyle" xmi:id="_2BXiZS6OEe2R7Ja825gmOA"/>
-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_2BXiaS6OEe2R7Ja825gmOA" name="BASE_ELEMENT">
+    <edges xmi:type="notation:Connector" xmi:id="_bNtjNDgREe2N9cYC_YqjxA" type="StereotypeCommentLink" source="_3cGpwC6IEe2R7Ja825gmOA" target="_bNtjMDgREe2N9cYC_YqjxA">
+      <styles xmi:type="notation:FontStyle" xmi:id="_bNtjNTgREe2N9cYC_YqjxA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_bNtjOTgREe2N9cYC_YqjxA" name="BASE_ELEMENT">
         <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#PrimitiveType"/>
       </styles>
       <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2BXiZi6OEe2R7Ja825gmOA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2BXiZy6OEe2R7Ja825gmOA"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2BXiaC6OEe2R7Ja825gmOA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_bNtjNjgREe2N9cYC_YqjxA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bNtjNzgREe2N9cYC_YqjxA"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bNtjODgREe2N9cYC_YqjxA"/>
     </edges>
   </notation:Diagram>
 </xmi:XMI>
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/resources/profile/PapyrusRE.profile.uml b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/resources/profile/PapyrusRE.profile.uml
index 7a96604..d8c433d 100644
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/resources/profile/PapyrusRE.profile.uml
+++ b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/resources/profile/PapyrusRE.profile.uml
@@ -43,6 +43,9 @@
         <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#PrimitiveType"/>
       </elementImport>
       <packagedElement xmi:type="uml:Stereotype" xmi:id="_qIm20Dp_EeCmwNGSFJpOjg" name="Requirement">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_pJ5xQDgREe2N9cYC_YqjxA">
+          <body>notion used in IREB</body>
+        </ownedComment>
         <generalization xmi:type="uml:Generalization" xmi:id="_O_aoUJInEeeji413eaUmIg">
           <general xmi:type="uml:Stereotype" href="pathmap://SysML16_PROFILES/SysML.profile.uml#SysML.package_packagedElement_Requirements.stereotype_packagedElement_Requirement"/>
         </generalization>
@@ -52,42 +55,60 @@
         <generalization xmi:type="uml:Generalization" xmi:id="_wES7kDKmEeiCRcmDqF2OVg" general="_5szOQDKjEeiCRcmDqF2OVg"/>
         <generalization xmi:type="uml:Generalization" xmi:id="_wxCbMCRcEe2L_4aZcs4v_g" general="_mQ9HoCRcEe2L_4aZcs4v_g"/>
         <generalization xmi:type="uml:Generalization" xmi:id="_fl6ZoCUlEe2VZ5x8BKm0Kg" general="_bom2kCUlEe2VZ5x8BKm0Kg"/>
+        <generalization xmi:type="uml:Generalization" xmi:id="_SB4wADgVEe2N9cYC_YqjxA" general="_gFecADgUEe2N9cYC_YqjxA"/>
       </packagedElement>
       <packagedElement xmi:type="uml:Stereotype" xmi:id="_xStW0DKjEeiCRcmDqF2OVg" name="AuthorReq">
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_l1s5YDqOEeCmwNGSFJpOjg" name="author" visibility="public">
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_l1s5YDqOEeCmwNGSFJpOjg" name="author" visibility="public" type="_BajuMDgREe2N9cYC_YqjxA">
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_n3ys8DqOEeCmwNGSFJpOjg"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_n3724DqOEeCmwNGSFJpOjg" value="1"/>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Stereotype" xmi:id="_0VqxgDKjEeiCRcmDqF2OVg" name="PriorityReqCharac">
+      <packagedElement xmi:type="uml:Stereotype" xmi:id="_0VqxgDKjEeiCRcmDqF2OVg" name="PriorityReq">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_qkZZUDgREe2N9cYC_YqjxA">
+          <body>notion used in IREB</body>
+        </ownedComment>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_rPQ_EDqOEeCmwNGSFJpOjg" name="priority" visibility="public">
           <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_rc0S4DqOEeCmwNGSFJpOjg"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rc-D4DqOEeCmwNGSFJpOjg" value="1"/>
         </ownedAttribute>
       </packagedElement>
-      <packagedElement xmi:type="uml:Stereotype" xmi:id="_5szOQDKjEeiCRcmDqF2OVg" name="ReviewStatusReqCharac">
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_7EGJwDqOEeCmwNGSFJpOjg" name="reviewStatus" visibility="public" type="_RzkrICUlEe2VZ5x8BKm0Kg">
+      <packagedElement xmi:type="uml:Stereotype" xmi:id="_5szOQDKjEeiCRcmDqF2OVg" name="ReviewStatusReq">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_rP5NYDgREe2N9cYC_YqjxA">
+          <body>notion used in IREB</body>
+        </ownedComment>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_7EGJwDqOEeCmwNGSFJpOjg" name="status" visibility="public" type="_RzkrICUlEe2VZ5x8BKm0Kg">
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8LLGkDqOEeCmwNGSFJpOjg"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8LUQgDqOEeCmwNGSFJpOjg" value="1"/>
         </ownedAttribute>
       </packagedElement>
       <packagedElement xmi:type="uml:Stereotype" xmi:id="_-7h88DKjEeiCRcmDqF2OVg" name="SourceReq">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_ryLbEDgREe2N9cYC_YqjxA">
+          <body>notion used in IREB</body>
+        </ownedComment>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_H2A9EDqPEeCmwNGSFJpOjg" name="source" visibility="public" type="_V_8UECRYEe2L_4aZcs4v_g">
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ICYlIDqPEeCmwNGSFJpOjg" value="*"/>
         </ownedAttribute>
       </packagedElement>
       <packagedElement xmi:type="uml:Stereotype" xmi:id="_mQ9HoCRcEe2L_4aZcs4v_g" name="VersionReq">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_s_aqQDgREe2N9cYC_YqjxA">
+          <body>notion used in IREB</body>
+        </ownedComment>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_2joToCRWEe2L_4aZcs4v_g" name="version">
           <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
           <defaultValue xmi:type="uml:LiteralString" xmi:id="__EDckCRWEe2L_4aZcs4v_g" name="default value" value="1.0.0"/>
         </ownedAttribute>
       </packagedElement>
       <packagedElement xmi:type="uml:Stereotype" xmi:id="_bom2kCUlEe2VZ5x8BKm0Kg" name="LevelReq">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_tlCf0DgREe2N9cYC_YqjxA">
+          <body>notion used in IREB</body>
+        </ownedComment>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_8eYFsCRUEe2L_4aZcs4v_g" name="level" type="_8eDfECUkEe2VZ5x8BKm0Kg"/>
       </packagedElement>
       <packagedElement xmi:type="uml:Stereotype" xmi:id="_fG_bUCRcEe2L_4aZcs4v_g" name="Backlog">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_uI6B4DgREe2N9cYC_YqjxA">
+          <body>notion used in IREB</body>
+        </ownedComment>
         <generalization xmi:type="uml:Generalization" xmi:id="_7a7LACRcEe2L_4aZcs4v_g" general="_mQ9HoCRcEe2L_4aZcs4v_g"/>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_khU9ECRcEe2L_4aZcs4v_g" name="base_Package" association="_khUWACRcEe2L_4aZcs4v_g">
           <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>
@@ -97,6 +118,13 @@
       <packagedElement xmi:type="uml:Extension" xmi:id="_khUWACRcEe2L_4aZcs4v_g" name="E_Backlog_Package16" memberEnd="_khUWASRcEe2L_4aZcs4v_g _khU9ECRcEe2L_4aZcs4v_g">
         <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_khUWASRcEe2L_4aZcs4v_g" name="extension_Backlog" type="_fG_bUCRcEe2L_4aZcs4v_g" aggregation="composite" association="_khUWACRcEe2L_4aZcs4v_g"/>
       </packagedElement>
+      <packagedElement xmi:type="uml:Stereotype" xmi:id="_gFecADgUEe2N9cYC_YqjxA" name="EffortReq">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_TgI2sDgVEe2N9cYC_YqjxA" name="effort" visibility="public">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_TgI2sTgVEe2N9cYC_YqjxA"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_TgI2sjgVEe2N9cYC_YqjxA" value="1"/>
+        </ownedAttribute>
+      </packagedElement>
       <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_ofvaoKK_EeeYBKEUTtrY-A">
         <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ofx24KK_EeeYBKEUTtrY-A" source="http://www.eclipse.org/uml2/2.0.0/UML">
           <references xmi:type="ecore:EPackage" href="pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA"/>
@@ -109,12 +137,15 @@
         <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#PrimitiveType"/>
       </elementImport>
       <packagedElement xmi:type="uml:Stereotype" xmi:id="_BuF6YDqAEeCmwNGSFJpOjg" name="FunctionalRequirement">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_voTYEDgREe2N9cYC_YqjxA">
+          <body>notion used in IREB</body>
+        </ownedComment>
         <generalization xmi:type="uml:Generalization" xmi:id="_dW3NMDqAEeCmwNGSFJpOjg" general="_qIm20Dp_EeCmwNGSFJpOjg"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_j_VSkC6JEe2R7Ja825gmOA" name="functionalRequirementKind" type="_rOQXYC6JEe2R7Ja825gmOA">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_FWCYkC6KEe2R7Ja825gmOA"/>
-        </ownedAttribute>
       </packagedElement>
       <packagedElement xmi:type="uml:Stereotype" xmi:id="_IBDQwDqBEeCmwNGSFJpOjg" name="ConstraintRequirement">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_v5vGUDgREe2N9cYC_YqjxA">
+          <body>notion used in IREB</body>
+        </ownedComment>
         <generalization xmi:type="uml:Generalization" xmi:id="_sAAOkDqFEeCmwNGSFJpOjg" general="_qIm20Dp_EeCmwNGSFJpOjg"/>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_JJCaQDqGEeCmwNGSFJpOjg" name="constraintKind" visibility="public" type="_8rsdACUlEe2VZ5x8BKm0Kg">
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_JVaCUDqGEeCmwNGSFJpOjg" value="1"/>
@@ -122,8 +153,11 @@
         </ownedAttribute>
       </packagedElement>
       <packagedElement xmi:type="uml:Stereotype" xmi:id="_Q2eVIDqIEeCmwNGSFJpOjg" name="QualityRequirement">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_wK2EcDgREe2N9cYC_YqjxA">
+          <body>notion used in IREB</body>
+        </ownedComment>
         <generalization xmi:type="uml:Generalization" xmi:id="_R5JBIDqKEeCmwNGSFJpOjg" general="_qIm20Dp_EeCmwNGSFJpOjg"/>
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_9r120DqIEeCmwNGSFJpOjg" name="specificQualityKind" visibility="public" type="_8rsdACUlEe2VZ5x8BKm0Kg">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_9r120DqIEeCmwNGSFJpOjg" name="specificQualityKind" visibility="public" type="_5IrCMCUlEe2VZ5x8BKm0Kg">
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_9105QDqIEeCmwNGSFJpOjg" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_91-qQDqIEeCmwNGSFJpOjg" value="1"/>
         </ownedAttribute>
@@ -140,6 +174,9 @@
         <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#PrimitiveType"/>
       </elementImport>
       <packagedElement xmi:type="uml:Stereotype" xmi:id="_mAdYECRdEe2L_4aZcs4v_g" name="Glossary">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_w-zQ8DgREe2N9cYC_YqjxA">
+          <body>notion used in IREB</body>
+        </ownedComment>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_oqEeoSRdEe2L_4aZcs4v_g" name="base_Package" association="_oqD3kCRdEe2L_4aZcs4v_g">
           <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_oqEeoiRdEe2L_4aZcs4v_g"/>
@@ -168,6 +205,9 @@
         <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Actor"/>
       </elementImport>
       <packagedElement xmi:type="uml:Stereotype" xmi:id="_-H-ZYCRXEe2L_4aZcs4v_g" name="StakeHolder">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_jQGFQDgREe2N9cYC_YqjxA">
+          <body>notion used in IREB</body>
+        </ownedComment>
         <generalization xmi:type="uml:Generalization" xmi:id="_aasBECRYEe2L_4aZcs4v_g" general="_V_8UECRYEe2L_4aZcs4v_g"/>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_c6nnMSRYEe2L_4aZcs4v_g" name="base_Actor" association="_c6nAICRYEe2L_4aZcs4v_g">
           <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Actor"/>
@@ -175,14 +215,24 @@
         </ownedAttribute>
       </packagedElement>
       <packagedElement xmi:type="uml:Stereotype" xmi:id="__1dO4CRXEe2L_4aZcs4v_g" name="User">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_myhDIDgREe2N9cYC_YqjxA">
+          <body>notion used in IREB</body>
+        </ownedComment>
         <generalization xmi:type="uml:Generalization" xmi:id="_BNTyoCRYEe2L_4aZcs4v_g" general="_-H-ZYCRXEe2L_4aZcs4v_g"/>
       </packagedElement>
       <packagedElement xmi:type="uml:Stereotype" xmi:id="_V_8UECRYEe2L_4aZcs4v_g" name="RequirementSource">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_mCnQMDgREe2N9cYC_YqjxA">
+          <body>notion used in IREB</body>
+        </ownedComment>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_bLSXkCRYEe2L_4aZcs4v_g" name="base_Element" association="_bLPUQCRYEe2L_4aZcs4v_g">
           <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bLSXkSRYEe2L_4aZcs4v_g"/>
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_bS7tsC6KEe2R7Ja825gmOA" name="kind" type="_gM1b4C6KEe2R7Ja825gmOA"/>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_TbRhoDgREe2N9cYC_YqjxA" name="description">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Y60TgDgREe2N9cYC_YqjxA"/>
+        </ownedAttribute>
       </packagedElement>
       <packagedElement xmi:type="uml:Extension" xmi:id="_bLPUQCRYEe2L_4aZcs4v_g" name="E_RequiementSource_Element21" memberEnd="_bLRwgCRYEe2L_4aZcs4v_g _bLSXkCRYEe2L_4aZcs4v_g">
         <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_bLRwgCRYEe2L_4aZcs4v_g" name="extension_RequiementSource" type="_V_8UECRYEe2L_4aZcs4v_g" aggregation="composite" association="_bLPUQCRYEe2L_4aZcs4v_g"/>
@@ -190,6 +240,9 @@
       <packagedElement xmi:type="uml:Extension" xmi:id="_c6nAICRYEe2L_4aZcs4v_g" name="E_StakeHolder_Actor22" memberEnd="_c6nnMCRYEe2L_4aZcs4v_g _c6nnMSRYEe2L_4aZcs4v_g">
         <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_c6nnMCRYEe2L_4aZcs4v_g" name="extension_StakeHolder" type="_-H-ZYCRXEe2L_4aZcs4v_g" aggregation="composite" association="_c6nAICRYEe2L_4aZcs4v_g"/>
       </packagedElement>
+      <packagedElement xmi:type="uml:Stereotype" xmi:id="_BajuMDgREe2N9cYC_YqjxA" name="RequirementEngineer">
+        <generalization xmi:type="uml:Generalization" xmi:id="_EX8FUDgREe2N9cYC_YqjxA" general="_-H-ZYCRXEe2L_4aZcs4v_g"/>
+      </packagedElement>
     </packagedElement>
     <packagedElement xmi:type="uml:Profile" xmi:id="_uLR-oC6IEe2R7Ja825gmOA" name="RequirementKind">
       <packagedElement xmi:type="uml:Stereotype" xmi:id="_8eDfECUkEe2VZ5x8BKm0Kg" name="LevelKind">
@@ -228,15 +281,6 @@
       <packagedElement xmi:type="uml:Extension" xmi:id="_Ci79MCUmEe2VZ5x8BKm0Kg" name="E_ConstraintKind_PrimitiveType9" memberEnd="_Ci79MSUmEe2VZ5x8BKm0Kg _Ci8kQCUmEe2VZ5x8BKm0Kg">
         <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_Ci79MSUmEe2VZ5x8BKm0Kg" name="extension_ConstraintKind" type="_8rsdACUlEe2VZ5x8BKm0Kg" aggregation="composite" association="_Ci79MCUmEe2VZ5x8BKm0Kg"/>
       </packagedElement>
-      <packagedElement xmi:type="uml:Stereotype" xmi:id="_rOQXYC6JEe2R7Ja825gmOA" name="FunctionalRequirementKind">
-        <ownedAttribute xmi:type="uml:Property" xmi:id="_vTBNUC6JEe2R7Ja825gmOA" name="base_PrimitiveType" association="_vS-KAC6JEe2R7Ja825gmOA">
-          <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#PrimitiveType"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_vTBNUS6JEe2R7Ja825gmOA"/>
-        </ownedAttribute>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Extension" xmi:id="_vS-KAC6JEe2R7Ja825gmOA" name="E_FunctionalRequirementKind_PrimitiveType10" memberEnd="_vS__MC6JEe2R7Ja825gmOA _vTBNUC6JEe2R7Ja825gmOA">
-        <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_vS__MC6JEe2R7Ja825gmOA" name="extension_FunctionalRequirementKind" type="_rOQXYC6JEe2R7Ja825gmOA" aggregation="composite" association="_vS-KAC6JEe2R7Ja825gmOA"/>
-      </packagedElement>
       <packagedElement xmi:type="uml:Stereotype" xmi:id="_gM1b4C6KEe2R7Ja825gmOA" name="RequirementSourceKind">
         <ownedAttribute xmi:type="uml:Property" xmi:id="_igdrYS6KEe2R7Ja825gmOA" name="base_PrimitiveType" association="_igcdQC6KEe2R7Ja825gmOA">
           <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#PrimitiveType"/>
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/resources/profile/papyrusre.ecore b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/resources/profile/papyrusre.ecore
index 23d0ad8..1744f0b 100644
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/resources/profile/papyrusre.ecore
+++ b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/resources/profile/papyrusre.ecore
@@ -6,12 +6,12 @@
   </eAnnotations>
   <eClassifiers xsi:type="ecore:EClass" name="DummyStereotype"/>
   <eSubpackages name="BasicRequirement" nsURI="PapyrusRE/BasicRequirement" nsPrefix="PapyrusRE.BasicRequirement">
-    <eClassifiers xsi:type="ecore:EClass" name="Requirement" eSuperTypes="../../../org.eclipse.papyrus.sysml16/resources/profile/SysML.profile.ecore#//requirements/Requirement #//BasicRequirement/AuthorReq #//BasicRequirement/LevelReq #//BasicRequirement/PriorityReqCharac #//BasicRequirement/ReviewStatusReqCharac #//BasicRequirement/SourceReq #//BasicRequirement/VersionReq"/>
+    <eClassifiers xsi:type="ecore:EClass" name="Requirement" eSuperTypes="../../../org.eclipse.papyrus.sysml16/resources/profile/SysML.profile.ecore#//requirements/Requirement #//BasicRequirement/AuthorReq #//BasicRequirement/EffortReq #//BasicRequirement/LevelReq #//BasicRequirement/PriorityReq #//BasicRequirement/ReviewStatusReq #//BasicRequirement/SourceReq #//BasicRequirement/VersionReq"/>
     <eClassifiers xsi:type="ecore:EClass" name="AuthorReq">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="author" ordered="false"
-          eType="ecore:EDataType ../../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="author" ordered="false"
+          eType="#//Stakeholder/RequirementEngineer"/>
     </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="PriorityReqCharac">
+    <eClassifiers xsi:type="ecore:EClass" name="PriorityReq">
       <eStructuralFeatures xsi:type="ecore:EAttribute" name="priority" ordered="false"
           eType="ecore:EDataType ../../../org.eclipse.uml2.types/model/Types.ecore#//Integer"/>
     </eClassifiers>
@@ -19,8 +19,8 @@
       <eStructuralFeatures xsi:type="ecore:EReference" name="source" ordered="false"
           lowerBound="1" upperBound="-1" eType="#//Stakeholder/RequirementSource"/>
     </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="ReviewStatusReqCharac">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="reviewStatus" ordered="false"
+    <eClassifiers xsi:type="ecore:EClass" name="ReviewStatusReq">
+      <eStructuralFeatures xsi:type="ecore:EReference" name="status" ordered="false"
           eType="#//RequirementKind/StatusKind"/>
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="VersionReq">
@@ -32,6 +32,10 @@
       <eStructuralFeatures xsi:type="ecore:EReference" name="level" ordered="false"
           lowerBound="1" eType="#//RequirementKind/LevelKind"/>
     </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="EffortReq">
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="effort" ordered="false"
+          eType="ecore:EDataType ../../../org.eclipse.uml2.types/model/Types.ecore#//Integer"/>
+    </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="Backlog" eSuperTypes="#//BasicRequirement/VersionReq">
       <eStructuralFeatures xsi:type="ecore:EReference" name="base_Package" ordered="false"
           eType="ecore:EClass ../../../org.eclipse.uml2.uml/model/UML.ecore#//Package"/>
@@ -42,13 +46,16 @@
       <eStructuralFeatures xsi:type="ecore:EReference" name="base_Actor" ordered="false"
           eType="ecore:EClass ../../../org.eclipse.uml2.uml/model/UML.ecore#//Actor"/>
     </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="User" eSuperTypes="#//Stakeholder/StakeHolder"/>
     <eClassifiers xsi:type="ecore:EClass" name="RequirementSource">
       <eStructuralFeatures xsi:type="ecore:EReference" name="base_Element" ordered="false"
           eType="ecore:EClass ../../../org.eclipse.uml2.uml/model/UML.ecore#//Element"/>
       <eStructuralFeatures xsi:type="ecore:EReference" name="kind" ordered="false"
           lowerBound="1" eType="#//RequirementKind/RequirementSourceKind"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" ordered="false"
+          eType="ecore:EDataType ../../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
     </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="User" eSuperTypes="#//Stakeholder/StakeHolder"/>
+    <eClassifiers xsi:type="ecore:EClass" name="RequirementEngineer" eSuperTypes="#//Stakeholder/StakeHolder"/>
   </eSubpackages>
   <eSubpackages name="RequirementKind" nsURI="PapyrusRE/RequirementKind" nsPrefix="PapyrusRE.RequirementKind">
     <eClassifiers xsi:type="ecore:EClass" name="LevelKind">
@@ -67,10 +74,6 @@
       <eStructuralFeatures xsi:type="ecore:EReference" name="base_PrimitiveType" ordered="false"
           eType="ecore:EClass ../../../org.eclipse.uml2.uml/model/UML.ecore#//PrimitiveType"/>
     </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="FunctionalRequirementKind">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="base_PrimitiveType" ordered="false"
-          eType="ecore:EClass ../../../org.eclipse.uml2.uml/model/UML.ecore#//PrimitiveType"/>
-    </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="RequirementSourceKind">
       <eStructuralFeatures xsi:type="ecore:EReference" name="base_PrimitiveType" ordered="false"
           eType="ecore:EClass ../../../org.eclipse.uml2.uml/model/UML.ecore#//PrimitiveType"/>
@@ -78,17 +81,14 @@
   </eSubpackages>
   <eSubpackages name="RequirementClassification" nsURI="PapyrusRE/RequirementClassification"
       nsPrefix="PapyrusRE.RequirementClassification">
-    <eClassifiers xsi:type="ecore:EClass" name="FunctionalRequirement" eSuperTypes="#//BasicRequirement/Requirement">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="functionalRequirementKind"
-          ordered="false" eType="#//RequirementKind/FunctionalRequirementKind"/>
-    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="FunctionalRequirement" eSuperTypes="#//BasicRequirement/Requirement"/>
     <eClassifiers xsi:type="ecore:EClass" name="ConstraintRequirement" eSuperTypes="#//BasicRequirement/Requirement">
       <eStructuralFeatures xsi:type="ecore:EReference" name="constraintKind" ordered="false"
           lowerBound="1" eType="#//RequirementKind/ConstraintKind"/>
     </eClassifiers>
     <eClassifiers xsi:type="ecore:EClass" name="QualityRequirement" eSuperTypes="#//BasicRequirement/Requirement">
       <eStructuralFeatures xsi:type="ecore:EReference" name="specificQualityKind"
-          ordered="false" lowerBound="1" eType="#//RequirementKind/ConstraintKind"/>
+          ordered="false" lowerBound="1" eType="#//RequirementKind/QualityKind"/>
     </eClassifiers>
   </eSubpackages>
   <eSubpackages name="Glossary" nsURI="PapyrusRE/Glossary" nsPrefix="PapyrusRE.Glossary">
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/AuthorReq.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/AuthorReq.java
index 430f5c2..3722f0b 100644
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/AuthorReq.java
+++ b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/AuthorReq.java
@@ -6,6 +6,7 @@
 package org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement;
 
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.Stakeholder.RequirementEngineer;
 
 /**
  * <!-- begin-user-doc -->
@@ -25,29 +26,29 @@
  */
 public interface AuthorReq extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Author</b></em>' attribute.
+	 * Returns the value of the '<em><b>Author</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Author</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Author</em>' attribute.
-	 * @see #setAuthor(String)
+	 * @return the value of the '<em>Author</em>' reference.
+	 * @see #setAuthor(RequirementEngineer)
 	 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.BasicRequirementPackage#getAuthorReq_Author()
-	 * @model dataType="org.eclipse.uml2.types.String" ordered="false"
+	 * @model ordered="false"
 	 * @generated
 	 */
-	String getAuthor();
+	RequirementEngineer getAuthor();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.AuthorReq#getAuthor <em>Author</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.AuthorReq#getAuthor <em>Author</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Author</em>' attribute.
+	 * @param value the new value of the '<em>Author</em>' reference.
 	 * @see #getAuthor()
 	 * @generated
 	 */
-	void setAuthor(String value);
+	void setAuthor(RequirementEngineer value);
 
 } // AuthorReq
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/BasicRequirementFactory.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/BasicRequirementFactory.java
index f40c909..af71562 100644
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/BasicRequirementFactory.java
+++ b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/BasicRequirementFactory.java
@@ -43,13 +43,13 @@
 	AuthorReq createAuthorReq();
 
 	/**
-	 * Returns a new object of class '<em>Priority Req Charac</em>'.
+	 * Returns a new object of class '<em>Priority Req</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Priority Req Charac</em>'.
+	 * @return a new object of class '<em>Priority Req</em>'.
 	 * @generated
 	 */
-	PriorityReqCharac createPriorityReqCharac();
+	PriorityReq createPriorityReq();
 
 	/**
 	 * Returns a new object of class '<em>Source Req</em>'.
@@ -61,13 +61,13 @@
 	SourceReq createSourceReq();
 
 	/**
-	 * Returns a new object of class '<em>Review Status Req Charac</em>'.
+	 * Returns a new object of class '<em>Review Status Req</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Review Status Req Charac</em>'.
+	 * @return a new object of class '<em>Review Status Req</em>'.
 	 * @generated
 	 */
-	ReviewStatusReqCharac createReviewStatusReqCharac();
+	ReviewStatusReq createReviewStatusReq();
 
 	/**
 	 * Returns a new object of class '<em>Version Req</em>'.
@@ -88,6 +88,15 @@
 	LevelReq createLevelReq();
 
 	/**
+	 * Returns a new object of class '<em>Effort Req</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Effort Req</em>'.
+	 * @generated
+	 */
+	EffortReq createEffortReq();
+
+	/**
 	 * Returns a new object of class '<em>Backlog</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/BasicRequirementPackage.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/BasicRequirementPackage.java
index 294b104..65fde5a 100644
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/BasicRequirementPackage.java
+++ b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/BasicRequirementPackage.java
@@ -171,7 +171,7 @@
 	int REQUIREMENT__BASE_CLASS = RequirementsPackage.REQUIREMENT__BASE_CLASS;
 
 	/**
-	 * The feature id for the '<em><b>Author</b></em>' attribute.
+	 * The feature id for the '<em><b>Author</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -180,13 +180,22 @@
 	int REQUIREMENT__AUTHOR = RequirementsPackage.REQUIREMENT_FEATURE_COUNT + 0;
 
 	/**
+	 * The feature id for the '<em><b>Effort</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int REQUIREMENT__EFFORT = RequirementsPackage.REQUIREMENT_FEATURE_COUNT + 1;
+
+	/**
 	 * The feature id for the '<em><b>Level</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int REQUIREMENT__LEVEL = RequirementsPackage.REQUIREMENT_FEATURE_COUNT + 1;
+	int REQUIREMENT__LEVEL = RequirementsPackage.REQUIREMENT_FEATURE_COUNT + 2;
 
 	/**
 	 * The feature id for the '<em><b>Priority</b></em>' attribute.
@@ -195,16 +204,16 @@
 	 * @generated
 	 * @ordered
 	 */
-	int REQUIREMENT__PRIORITY = RequirementsPackage.REQUIREMENT_FEATURE_COUNT + 2;
+	int REQUIREMENT__PRIORITY = RequirementsPackage.REQUIREMENT_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>Review Status</b></em>' reference.
+	 * The feature id for the '<em><b>Status</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int REQUIREMENT__REVIEW_STATUS = RequirementsPackage.REQUIREMENT_FEATURE_COUNT + 3;
+	int REQUIREMENT__STATUS = RequirementsPackage.REQUIREMENT_FEATURE_COUNT + 4;
 
 	/**
 	 * The feature id for the '<em><b>Source</b></em>' reference list.
@@ -213,7 +222,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int REQUIREMENT__SOURCE = RequirementsPackage.REQUIREMENT_FEATURE_COUNT + 4;
+	int REQUIREMENT__SOURCE = RequirementsPackage.REQUIREMENT_FEATURE_COUNT + 5;
 
 	/**
 	 * The feature id for the '<em><b>Version</b></em>' attribute.
@@ -222,7 +231,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int REQUIREMENT__VERSION = RequirementsPackage.REQUIREMENT_FEATURE_COUNT + 5;
+	int REQUIREMENT__VERSION = RequirementsPackage.REQUIREMENT_FEATURE_COUNT + 6;
 
 	/**
 	 * The number of structural features of the '<em>Requirement</em>' class.
@@ -231,7 +240,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int REQUIREMENT_FEATURE_COUNT = RequirementsPackage.REQUIREMENT_FEATURE_COUNT + 6;
+	int REQUIREMENT_FEATURE_COUNT = RequirementsPackage.REQUIREMENT_FEATURE_COUNT + 7;
 
 	/**
 	 * The operation id for the '<em>Get Satisfied By</em>' operation.
@@ -316,7 +325,7 @@
 	int AUTHOR_REQ = 1;
 
 	/**
-	 * The feature id for the '<em><b>Author</b></em>' attribute.
+	 * The feature id for the '<em><b>Author</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -343,14 +352,14 @@
 	int AUTHOR_REQ_OPERATION_COUNT = 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.impl.PriorityReqCharacImpl <em>Priority Req Charac</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.impl.PriorityReqImpl <em>Priority Req</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.impl.PriorityReqCharacImpl
-	 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.impl.BasicRequirementPackageImpl#getPriorityReqCharac()
+	 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.impl.PriorityReqImpl
+	 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.impl.BasicRequirementPackageImpl#getPriorityReq()
 	 * @generated
 	 */
-	int PRIORITY_REQ_CHARAC = 2;
+	int PRIORITY_REQ = 2;
 
 	/**
 	 * The feature id for the '<em><b>Priority</b></em>' attribute.
@@ -359,25 +368,25 @@
 	 * @generated
 	 * @ordered
 	 */
-	int PRIORITY_REQ_CHARAC__PRIORITY = 0;
+	int PRIORITY_REQ__PRIORITY = 0;
 
 	/**
-	 * The number of structural features of the '<em>Priority Req Charac</em>' class.
+	 * The number of structural features of the '<em>Priority Req</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int PRIORITY_REQ_CHARAC_FEATURE_COUNT = 1;
+	int PRIORITY_REQ_FEATURE_COUNT = 1;
 
 	/**
-	 * The number of operations of the '<em>Priority Req Charac</em>' class.
+	 * The number of operations of the '<em>Priority Req</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int PRIORITY_REQ_CHARAC_OPERATION_COUNT = 0;
+	int PRIORITY_REQ_OPERATION_COUNT = 0;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.impl.SourceReqImpl <em>Source Req</em>}' class.
@@ -417,41 +426,41 @@
 	int SOURCE_REQ_OPERATION_COUNT = 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.impl.ReviewStatusReqCharacImpl <em>Review Status Req Charac</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.impl.ReviewStatusReqImpl <em>Review Status Req</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.impl.ReviewStatusReqCharacImpl
-	 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.impl.BasicRequirementPackageImpl#getReviewStatusReqCharac()
+	 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.impl.ReviewStatusReqImpl
+	 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.impl.BasicRequirementPackageImpl#getReviewStatusReq()
 	 * @generated
 	 */
-	int REVIEW_STATUS_REQ_CHARAC = 4;
+	int REVIEW_STATUS_REQ = 4;
 
 	/**
-	 * The feature id for the '<em><b>Review Status</b></em>' reference.
+	 * The feature id for the '<em><b>Status</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int REVIEW_STATUS_REQ_CHARAC__REVIEW_STATUS = 0;
+	int REVIEW_STATUS_REQ__STATUS = 0;
 
 	/**
-	 * The number of structural features of the '<em>Review Status Req Charac</em>' class.
+	 * The number of structural features of the '<em>Review Status Req</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int REVIEW_STATUS_REQ_CHARAC_FEATURE_COUNT = 1;
+	int REVIEW_STATUS_REQ_FEATURE_COUNT = 1;
 
 	/**
-	 * The number of operations of the '<em>Review Status Req Charac</em>' class.
+	 * The number of operations of the '<em>Review Status Req</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int REVIEW_STATUS_REQ_CHARAC_OPERATION_COUNT = 0;
+	int REVIEW_STATUS_REQ_OPERATION_COUNT = 0;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.impl.VersionReqImpl <em>Version Req</em>}' class.
@@ -528,6 +537,43 @@
 	int LEVEL_REQ_OPERATION_COUNT = 0;
 
 	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.impl.EffortReqImpl <em>Effort Req</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.impl.EffortReqImpl
+	 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.impl.BasicRequirementPackageImpl#getEffortReq()
+	 * @generated
+	 */
+	int EFFORT_REQ = 7;
+
+	/**
+	 * The feature id for the '<em><b>Effort</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EFFORT_REQ__EFFORT = 0;
+
+	/**
+	 * The number of structural features of the '<em>Effort Req</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EFFORT_REQ_FEATURE_COUNT = 1;
+
+	/**
+	 * The number of operations of the '<em>Effort Req</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EFFORT_REQ_OPERATION_COUNT = 0;
+
+	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.impl.BacklogImpl <em>Backlog</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -535,7 +581,7 @@
 	 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.impl.BasicRequirementPackageImpl#getBacklog()
 	 * @generated
 	 */
-	int BACKLOG = 7;
+	int BACKLOG = 8;
 
 	/**
 	 * The feature id for the '<em><b>Version</b></em>' attribute.
@@ -595,36 +641,36 @@
 	EClass getAuthorReq();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.AuthorReq#getAuthor <em>Author</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.AuthorReq#getAuthor <em>Author</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Author</em>'.
+	 * @return the meta object for the reference '<em>Author</em>'.
 	 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.AuthorReq#getAuthor()
 	 * @see #getAuthorReq()
 	 * @generated
 	 */
-	EAttribute getAuthorReq_Author();
+	EReference getAuthorReq_Author();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.PriorityReqCharac <em>Priority Req Charac</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.PriorityReq <em>Priority Req</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Priority Req Charac</em>'.
-	 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.PriorityReqCharac
+	 * @return the meta object for class '<em>Priority Req</em>'.
+	 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.PriorityReq
 	 * @generated
 	 */
-	EClass getPriorityReqCharac();
+	EClass getPriorityReq();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.PriorityReqCharac#getPriority <em>Priority</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.PriorityReq#getPriority <em>Priority</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Priority</em>'.
-	 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.PriorityReqCharac#getPriority()
-	 * @see #getPriorityReqCharac()
+	 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.PriorityReq#getPriority()
+	 * @see #getPriorityReq()
 	 * @generated
 	 */
-	EAttribute getPriorityReqCharac_Priority();
+	EAttribute getPriorityReq_Priority();
 
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.SourceReq <em>Source Req</em>}'.
@@ -648,25 +694,25 @@
 	EReference getSourceReq_Source();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.ReviewStatusReqCharac <em>Review Status Req Charac</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.ReviewStatusReq <em>Review Status Req</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Review Status Req Charac</em>'.
-	 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.ReviewStatusReqCharac
+	 * @return the meta object for class '<em>Review Status Req</em>'.
+	 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.ReviewStatusReq
 	 * @generated
 	 */
-	EClass getReviewStatusReqCharac();
+	EClass getReviewStatusReq();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.ReviewStatusReqCharac#getReviewStatus <em>Review Status</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.ReviewStatusReq#getStatus <em>Status</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Review Status</em>'.
-	 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.ReviewStatusReqCharac#getReviewStatus()
-	 * @see #getReviewStatusReqCharac()
+	 * @return the meta object for the reference '<em>Status</em>'.
+	 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.ReviewStatusReq#getStatus()
+	 * @see #getReviewStatusReq()
 	 * @generated
 	 */
-	EReference getReviewStatusReqCharac_ReviewStatus();
+	EReference getReviewStatusReq_Status();
 
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.VersionReq <em>Version Req</em>}'.
@@ -711,6 +757,27 @@
 	EReference getLevelReq_Level();
 
 	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.EffortReq <em>Effort Req</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Effort Req</em>'.
+	 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.EffortReq
+	 * @generated
+	 */
+	EClass getEffortReq();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.EffortReq#getEffort <em>Effort</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Effort</em>'.
+	 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.EffortReq#getEffort()
+	 * @see #getEffortReq()
+	 * @generated
+	 */
+	EAttribute getEffortReq_Effort();
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.Backlog <em>Backlog</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -775,22 +842,22 @@
 		EClass AUTHOR_REQ = eINSTANCE.getAuthorReq();
 
 		/**
-		 * The meta object literal for the '<em><b>Author</b></em>' attribute feature.
+		 * The meta object literal for the '<em><b>Author</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute AUTHOR_REQ__AUTHOR = eINSTANCE.getAuthorReq_Author();
+		EReference AUTHOR_REQ__AUTHOR = eINSTANCE.getAuthorReq_Author();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.impl.PriorityReqCharacImpl <em>Priority Req Charac</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.impl.PriorityReqImpl <em>Priority Req</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.impl.PriorityReqCharacImpl
-		 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.impl.BasicRequirementPackageImpl#getPriorityReqCharac()
+		 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.impl.PriorityReqImpl
+		 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.impl.BasicRequirementPackageImpl#getPriorityReq()
 		 * @generated
 		 */
-		EClass PRIORITY_REQ_CHARAC = eINSTANCE.getPriorityReqCharac();
+		EClass PRIORITY_REQ = eINSTANCE.getPriorityReq();
 
 		/**
 		 * The meta object literal for the '<em><b>Priority</b></em>' attribute feature.
@@ -798,7 +865,7 @@
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute PRIORITY_REQ_CHARAC__PRIORITY = eINSTANCE.getPriorityReqCharac_Priority();
+		EAttribute PRIORITY_REQ__PRIORITY = eINSTANCE.getPriorityReq_Priority();
 
 		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.impl.SourceReqImpl <em>Source Req</em>}' class.
@@ -819,22 +886,22 @@
 		EReference SOURCE_REQ__SOURCE = eINSTANCE.getSourceReq_Source();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.impl.ReviewStatusReqCharacImpl <em>Review Status Req Charac</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.impl.ReviewStatusReqImpl <em>Review Status Req</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.impl.ReviewStatusReqCharacImpl
-		 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.impl.BasicRequirementPackageImpl#getReviewStatusReqCharac()
+		 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.impl.ReviewStatusReqImpl
+		 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.impl.BasicRequirementPackageImpl#getReviewStatusReq()
 		 * @generated
 		 */
-		EClass REVIEW_STATUS_REQ_CHARAC = eINSTANCE.getReviewStatusReqCharac();
+		EClass REVIEW_STATUS_REQ = eINSTANCE.getReviewStatusReq();
 
 		/**
-		 * The meta object literal for the '<em><b>Review Status</b></em>' reference feature.
+		 * The meta object literal for the '<em><b>Status</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference REVIEW_STATUS_REQ_CHARAC__REVIEW_STATUS = eINSTANCE.getReviewStatusReqCharac_ReviewStatus();
+		EReference REVIEW_STATUS_REQ__STATUS = eINSTANCE.getReviewStatusReq_Status();
 
 		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.impl.VersionReqImpl <em>Version Req</em>}' class.
@@ -873,6 +940,24 @@
 		EReference LEVEL_REQ__LEVEL = eINSTANCE.getLevelReq_Level();
 
 		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.impl.EffortReqImpl <em>Effort Req</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.impl.EffortReqImpl
+		 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.impl.BasicRequirementPackageImpl#getEffortReq()
+		 * @generated
+		 */
+		EClass EFFORT_REQ = eINSTANCE.getEffortReq();
+
+		/**
+		 * The meta object literal for the '<em><b>Effort</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute EFFORT_REQ__EFFORT = eINSTANCE.getEffortReq_Effort();
+
+		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.impl.BacklogImpl <em>Backlog</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/EffortReq.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/EffortReq.java
new file mode 100644
index 0000000..b97fcdf
--- /dev/null
+++ b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/EffortReq.java
@@ -0,0 +1,53 @@
+/**
+ * Copyright (c) 2017 CEA LIST. All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available a; http://www.eclipse.org/legal/epl-v10.html Contributors:  - Initial API and implementation  Yupanqui Munoz Julho (CEA LIST)  - Initial API and implementation
+ */
+package org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Effort Req</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.EffortReq#getEffort <em>Effort</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.BasicRequirementPackage#getEffortReq()
+ * @model
+ * @generated
+ */
+public interface EffortReq extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Effort</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Effort</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Effort</em>' attribute.
+	 * @see #setEffort(int)
+	 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.BasicRequirementPackage#getEffortReq_Effort()
+	 * @model dataType="org.eclipse.uml2.types.Integer" ordered="false"
+	 * @generated
+	 */
+	int getEffort();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.EffortReq#getEffort <em>Effort</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Effort</em>' attribute.
+	 * @see #getEffort()
+	 * @generated
+	 */
+	void setEffort(int value);
+
+} // EffortReq
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/PriorityReq.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/PriorityReq.java
new file mode 100644
index 0000000..e72cc51
--- /dev/null
+++ b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/PriorityReq.java
@@ -0,0 +1,53 @@
+/**
+ * Copyright (c) 2017 CEA LIST. All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available a; http://www.eclipse.org/legal/epl-v10.html Contributors:  - Initial API and implementation  Yupanqui Munoz Julho (CEA LIST)  - Initial API and implementation
+ */
+package org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Priority Req</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.PriorityReq#getPriority <em>Priority</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.BasicRequirementPackage#getPriorityReq()
+ * @model
+ * @generated
+ */
+public interface PriorityReq extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Priority</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Priority</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Priority</em>' attribute.
+	 * @see #setPriority(int)
+	 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.BasicRequirementPackage#getPriorityReq_Priority()
+	 * @model dataType="org.eclipse.uml2.types.Integer" ordered="false"
+	 * @generated
+	 */
+	int getPriority();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.PriorityReq#getPriority <em>Priority</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Priority</em>' attribute.
+	 * @see #getPriority()
+	 * @generated
+	 */
+	void setPriority(int value);
+
+} // PriorityReq
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/Requirement.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/Requirement.java
index 8027334..fc0c17d 100644
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/Requirement.java
+++ b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/Requirement.java
@@ -16,5 +16,5 @@
  * @model
  * @generated
  */
-public interface Requirement extends org.eclipse.papyrus.sysml16.requirements.Requirement, AuthorReq, LevelReq, PriorityReqCharac, ReviewStatusReqCharac, SourceReq, VersionReq {
+public interface Requirement extends org.eclipse.papyrus.sysml16.requirements.Requirement, AuthorReq, EffortReq, LevelReq, PriorityReq, ReviewStatusReq, SourceReq, VersionReq {
 } // Requirement
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/ReviewStatusReq.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/ReviewStatusReq.java
new file mode 100644
index 0000000..b39a39d
--- /dev/null
+++ b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/ReviewStatusReq.java
@@ -0,0 +1,55 @@
+/**
+ * Copyright (c) 2017 CEA LIST. All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available a; http://www.eclipse.org/legal/epl-v10.html Contributors:  - Initial API and implementation  Yupanqui Munoz Julho (CEA LIST)  - Initial API and implementation
+ */
+package org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement;
+
+import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.RequirementKind.StatusKind;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Review Status Req</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.ReviewStatusReq#getStatus <em>Status</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.BasicRequirementPackage#getReviewStatusReq()
+ * @model
+ * @generated
+ */
+public interface ReviewStatusReq extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Status</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Status</em>' reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Status</em>' reference.
+	 * @see #setStatus(StatusKind)
+	 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.BasicRequirementPackage#getReviewStatusReq_Status()
+	 * @model ordered="false"
+	 * @generated
+	 */
+	StatusKind getStatus();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.ReviewStatusReq#getStatus <em>Status</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Status</em>' reference.
+	 * @see #getStatus()
+	 * @generated
+	 */
+	void setStatus(StatusKind value);
+
+} // ReviewStatusReq
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/impl/AuthorReqImpl.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/impl/AuthorReqImpl.java
index 14c43f2..ea5292d 100644
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/impl/AuthorReqImpl.java
+++ b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/impl/AuthorReqImpl.java
@@ -9,11 +9,13 @@
 
 import org.eclipse.emf.ecore.EClass;
 
+import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 
 import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.AuthorReq;
 import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.BasicRequirementPackage;
+import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.Stakeholder.RequirementEngineer;
 
 /**
  * <!-- begin-user-doc -->
@@ -30,24 +32,14 @@
  */
 public class AuthorReqImpl extends MinimalEObjectImpl.Container implements AuthorReq {
 	/**
-	 * The default value of the '{@link #getAuthor() <em>Author</em>}' attribute.
+	 * The cached value of the '{@link #getAuthor() <em>Author</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @see #getAuthor()
 	 * @generated
 	 * @ordered
 	 */
-	protected static final String AUTHOR_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAuthor() <em>Author</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAuthor()
-	 * @generated
-	 * @ordered
-	 */
-	protected String author = AUTHOR_EDEFAULT;
+	protected RequirementEngineer author;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -74,7 +66,24 @@
 	 * @generated
 	 */
 	@Override
-	public String getAuthor() {
+	public RequirementEngineer getAuthor() {
+		if (author != null && author.eIsProxy()) {
+			InternalEObject oldAuthor = (InternalEObject)author;
+			author = (RequirementEngineer)eResolveProxy(oldAuthor);
+			if (author != oldAuthor) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BasicRequirementPackage.AUTHOR_REQ__AUTHOR, oldAuthor, author));
+			}
+		}
+		return author;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public RequirementEngineer basicGetAuthor() {
 		return author;
 	}
 
@@ -84,8 +93,8 @@
 	 * @generated
 	 */
 	@Override
-	public void setAuthor(String newAuthor) {
-		String oldAuthor = author;
+	public void setAuthor(RequirementEngineer newAuthor) {
+		RequirementEngineer oldAuthor = author;
 		author = newAuthor;
 		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, BasicRequirementPackage.AUTHOR_REQ__AUTHOR, oldAuthor, author));
@@ -100,7 +109,8 @@
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
 			case BasicRequirementPackage.AUTHOR_REQ__AUTHOR:
-				return getAuthor();
+				if (resolve) return getAuthor();
+				return basicGetAuthor();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -114,7 +124,7 @@
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
 			case BasicRequirementPackage.AUTHOR_REQ__AUTHOR:
-				setAuthor((String)newValue);
+				setAuthor((RequirementEngineer)newValue);
 				return;
 		}
 		super.eSet(featureID, newValue);
@@ -129,7 +139,7 @@
 	public void eUnset(int featureID) {
 		switch (featureID) {
 			case BasicRequirementPackage.AUTHOR_REQ__AUTHOR:
-				setAuthor(AUTHOR_EDEFAULT);
+				setAuthor((RequirementEngineer)null);
 				return;
 		}
 		super.eUnset(featureID);
@@ -144,25 +154,9 @@
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
 			case BasicRequirementPackage.AUTHOR_REQ__AUTHOR:
-				return AUTHOR_EDEFAULT == null ? author != null : !AUTHOR_EDEFAULT.equals(author);
+				return author != null;
 		}
 		return super.eIsSet(featureID);
 	}
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuilder result = new StringBuilder(super.toString());
-		result.append(" (author: "); //$NON-NLS-1$
-		result.append(author);
-		result.append(')');
-		return result.toString();
-	}
-
 } //AuthorReqImpl
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/impl/BasicRequirementFactoryImpl.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/impl/BasicRequirementFactoryImpl.java
index 9ed8828..fff35e5 100644
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/impl/BasicRequirementFactoryImpl.java
+++ b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/impl/BasicRequirementFactoryImpl.java
@@ -61,11 +61,12 @@
 		switch (eClass.getClassifierID()) {
 			case BasicRequirementPackage.REQUIREMENT: return createRequirement();
 			case BasicRequirementPackage.AUTHOR_REQ: return createAuthorReq();
-			case BasicRequirementPackage.PRIORITY_REQ_CHARAC: return createPriorityReqCharac();
+			case BasicRequirementPackage.PRIORITY_REQ: return createPriorityReq();
 			case BasicRequirementPackage.SOURCE_REQ: return createSourceReq();
-			case BasicRequirementPackage.REVIEW_STATUS_REQ_CHARAC: return createReviewStatusReqCharac();
+			case BasicRequirementPackage.REVIEW_STATUS_REQ: return createReviewStatusReq();
 			case BasicRequirementPackage.VERSION_REQ: return createVersionReq();
 			case BasicRequirementPackage.LEVEL_REQ: return createLevelReq();
+			case BasicRequirementPackage.EFFORT_REQ: return createEffortReq();
 			case BasicRequirementPackage.BACKLOG: return createBacklog();
 			default:
 				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
@@ -100,9 +101,9 @@
 	 * @generated
 	 */
 	@Override
-	public PriorityReqCharac createPriorityReqCharac() {
-		PriorityReqCharacImpl priorityReqCharac = new PriorityReqCharacImpl();
-		return priorityReqCharac;
+	public PriorityReq createPriorityReq() {
+		PriorityReqImpl priorityReq = new PriorityReqImpl();
+		return priorityReq;
 	}
 
 	/**
@@ -122,9 +123,9 @@
 	 * @generated
 	 */
 	@Override
-	public ReviewStatusReqCharac createReviewStatusReqCharac() {
-		ReviewStatusReqCharacImpl reviewStatusReqCharac = new ReviewStatusReqCharacImpl();
-		return reviewStatusReqCharac;
+	public ReviewStatusReq createReviewStatusReq() {
+		ReviewStatusReqImpl reviewStatusReq = new ReviewStatusReqImpl();
+		return reviewStatusReq;
 	}
 
 	/**
@@ -155,6 +156,17 @@
 	 * @generated
 	 */
 	@Override
+	public EffortReq createEffortReq() {
+		EffortReqImpl effortReq = new EffortReqImpl();
+		return effortReq;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
 	public Backlog createBacklog() {
 		BacklogImpl backlog = new BacklogImpl();
 		return backlog;
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/impl/BasicRequirementPackageImpl.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/impl/BasicRequirementPackageImpl.java
index ffb93b5..6caa3bc 100644
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/impl/BasicRequirementPackageImpl.java
+++ b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/impl/BasicRequirementPackageImpl.java
@@ -17,10 +17,11 @@
 import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.Backlog;
 import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.BasicRequirementFactory;
 import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.BasicRequirementPackage;
+import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.EffortReq;
 import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.LevelReq;
-import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.PriorityReqCharac;
+import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.PriorityReq;
 import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.Requirement;
-import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.ReviewStatusReqCharac;
+import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.ReviewStatusReq;
 import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.SourceReq;
 import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.VersionReq;
 
@@ -78,7 +79,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private EClass priorityReqCharacEClass = null;
+	private EClass priorityReqEClass = null;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -92,7 +93,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private EClass reviewStatusReqCharacEClass = null;
+	private EClass reviewStatusReqEClass = null;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -113,6 +114,13 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	private EClass effortReqEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	private EClass backlogEClass = null;
 
 	/**
@@ -231,8 +239,8 @@
 	 * @generated
 	 */
 	@Override
-	public EAttribute getAuthorReq_Author() {
-		return (EAttribute)authorReqEClass.getEStructuralFeatures().get(0);
+	public EReference getAuthorReq_Author() {
+		return (EReference)authorReqEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -241,8 +249,8 @@
 	 * @generated
 	 */
 	@Override
-	public EClass getPriorityReqCharac() {
-		return priorityReqCharacEClass;
+	public EClass getPriorityReq() {
+		return priorityReqEClass;
 	}
 
 	/**
@@ -251,8 +259,8 @@
 	 * @generated
 	 */
 	@Override
-	public EAttribute getPriorityReqCharac_Priority() {
-		return (EAttribute)priorityReqCharacEClass.getEStructuralFeatures().get(0);
+	public EAttribute getPriorityReq_Priority() {
+		return (EAttribute)priorityReqEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -281,8 +289,8 @@
 	 * @generated
 	 */
 	@Override
-	public EClass getReviewStatusReqCharac() {
-		return reviewStatusReqCharacEClass;
+	public EClass getReviewStatusReq() {
+		return reviewStatusReqEClass;
 	}
 
 	/**
@@ -291,8 +299,8 @@
 	 * @generated
 	 */
 	@Override
-	public EReference getReviewStatusReqCharac_ReviewStatus() {
-		return (EReference)reviewStatusReqCharacEClass.getEStructuralFeatures().get(0);
+	public EReference getReviewStatusReq_Status() {
+		return (EReference)reviewStatusReqEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -341,6 +349,26 @@
 	 * @generated
 	 */
 	@Override
+	public EClass getEffortReq() {
+		return effortReqEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EAttribute getEffortReq_Effort() {
+		return (EAttribute)effortReqEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
 	public EClass getBacklog() {
 		return backlogEClass;
 	}
@@ -387,16 +415,16 @@
 		requirementEClass = createEClass(REQUIREMENT);
 
 		authorReqEClass = createEClass(AUTHOR_REQ);
-		createEAttribute(authorReqEClass, AUTHOR_REQ__AUTHOR);
+		createEReference(authorReqEClass, AUTHOR_REQ__AUTHOR);
 
-		priorityReqCharacEClass = createEClass(PRIORITY_REQ_CHARAC);
-		createEAttribute(priorityReqCharacEClass, PRIORITY_REQ_CHARAC__PRIORITY);
+		priorityReqEClass = createEClass(PRIORITY_REQ);
+		createEAttribute(priorityReqEClass, PRIORITY_REQ__PRIORITY);
 
 		sourceReqEClass = createEClass(SOURCE_REQ);
 		createEReference(sourceReqEClass, SOURCE_REQ__SOURCE);
 
-		reviewStatusReqCharacEClass = createEClass(REVIEW_STATUS_REQ_CHARAC);
-		createEReference(reviewStatusReqCharacEClass, REVIEW_STATUS_REQ_CHARAC__REVIEW_STATUS);
+		reviewStatusReqEClass = createEClass(REVIEW_STATUS_REQ);
+		createEReference(reviewStatusReqEClass, REVIEW_STATUS_REQ__STATUS);
 
 		versionReqEClass = createEClass(VERSION_REQ);
 		createEAttribute(versionReqEClass, VERSION_REQ__VERSION);
@@ -404,6 +432,9 @@
 		levelReqEClass = createEClass(LEVEL_REQ);
 		createEReference(levelReqEClass, LEVEL_REQ__LEVEL);
 
+		effortReqEClass = createEClass(EFFORT_REQ);
+		createEAttribute(effortReqEClass, EFFORT_REQ__EFFORT);
+
 		backlogEClass = createEClass(BACKLOG);
 		createEReference(backlogEClass, BACKLOG__BASE_PACKAGE);
 	}
@@ -433,8 +464,8 @@
 
 		// Obtain other dependent packages
 		RequirementsPackage theRequirementsPackage = (RequirementsPackage)EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI);
-		TypesPackage theTypesPackage = (TypesPackage)EPackage.Registry.INSTANCE.getEPackage(TypesPackage.eNS_URI);
 		StakeholderPackage theStakeholderPackage = (StakeholderPackage)EPackage.Registry.INSTANCE.getEPackage(StakeholderPackage.eNS_URI);
+		TypesPackage theTypesPackage = (TypesPackage)EPackage.Registry.INSTANCE.getEPackage(TypesPackage.eNS_URI);
 		RequirementKindPackage theRequirementKindPackage = (RequirementKindPackage)EPackage.Registry.INSTANCE.getEPackage(RequirementKindPackage.eNS_URI);
 		UMLPackage theUMLPackage = (UMLPackage)EPackage.Registry.INSTANCE.getEPackage(UMLPackage.eNS_URI);
 
@@ -445,9 +476,10 @@
 		// Add supertypes to classes
 		requirementEClass.getESuperTypes().add(theRequirementsPackage.getRequirement());
 		requirementEClass.getESuperTypes().add(this.getAuthorReq());
+		requirementEClass.getESuperTypes().add(this.getEffortReq());
 		requirementEClass.getESuperTypes().add(this.getLevelReq());
-		requirementEClass.getESuperTypes().add(this.getPriorityReqCharac());
-		requirementEClass.getESuperTypes().add(this.getReviewStatusReqCharac());
+		requirementEClass.getESuperTypes().add(this.getPriorityReq());
+		requirementEClass.getESuperTypes().add(this.getReviewStatusReq());
 		requirementEClass.getESuperTypes().add(this.getSourceReq());
 		requirementEClass.getESuperTypes().add(this.getVersionReq());
 		backlogEClass.getESuperTypes().add(this.getVersionReq());
@@ -456,16 +488,16 @@
 		initEClass(requirementEClass, Requirement.class, "Requirement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
 		initEClass(authorReqEClass, AuthorReq.class, "AuthorReq", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getAuthorReq_Author(), theTypesPackage.getString(), "author", null, 0, 1, AuthorReq.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getAuthorReq_Author(), theStakeholderPackage.getRequirementEngineer(), null, "author", null, 0, 1, AuthorReq.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(priorityReqCharacEClass, PriorityReqCharac.class, "PriorityReqCharac", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getPriorityReqCharac_Priority(), theTypesPackage.getInteger(), "priority", null, 0, 1, PriorityReqCharac.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEClass(priorityReqEClass, PriorityReq.class, "PriorityReq", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(getPriorityReq_Priority(), theTypesPackage.getInteger(), "priority", null, 0, 1, PriorityReq.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 
 		initEClass(sourceReqEClass, SourceReq.class, "SourceReq", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 		initEReference(getSourceReq_Source(), theStakeholderPackage.getRequirementSource(), null, "source", null, 1, -1, SourceReq.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(reviewStatusReqCharacEClass, ReviewStatusReqCharac.class, "ReviewStatusReqCharac", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getReviewStatusReqCharac_ReviewStatus(), theRequirementKindPackage.getStatusKind(), null, "reviewStatus", null, 0, 1, ReviewStatusReqCharac.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEClass(reviewStatusReqEClass, ReviewStatusReq.class, "ReviewStatusReq", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEReference(getReviewStatusReq_Status(), theRequirementKindPackage.getStatusKind(), null, "status", null, 0, 1, ReviewStatusReq.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 
 		initEClass(versionReqEClass, VersionReq.class, "VersionReq", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 		initEAttribute(getVersionReq_Version(), theTypesPackage.getString(), "version", "1.0.0", 1, 1, VersionReq.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
@@ -473,6 +505,9 @@
 		initEClass(levelReqEClass, LevelReq.class, "LevelReq", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 		initEReference(getLevelReq_Level(), theRequirementKindPackage.getLevelKind(), null, "level", null, 1, 1, LevelReq.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 
+		initEClass(effortReqEClass, EffortReq.class, "EffortReq", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(getEffortReq_Effort(), theTypesPackage.getInteger(), "effort", null, 0, 1, EffortReq.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+
 		initEClass(backlogEClass, Backlog.class, "Backlog", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 		initEReference(getBacklog_Base_Package(), theUMLPackage.getPackage(), null, "base_Package", null, 0, 1, Backlog.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 	}
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/impl/PriorityReqCharacImpl.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/impl/EffortReqImpl.java
similarity index 66%
copy from plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/impl/PriorityReqCharacImpl.java
copy to plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/impl/EffortReqImpl.java
index 7588da4..34097ef 100644
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/impl/PriorityReqCharacImpl.java
+++ b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/impl/EffortReqImpl.java
@@ -13,48 +13,48 @@
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 
 import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.BasicRequirementPackage;
-import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.PriorityReqCharac;
+import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.EffortReq;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Priority Req Charac</b></em>'.
+ * An implementation of the model object '<em><b>Effort Req</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.impl.PriorityReqCharacImpl#getPriority <em>Priority</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.impl.EffortReqImpl#getEffort <em>Effort</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class PriorityReqCharacImpl extends MinimalEObjectImpl.Container implements PriorityReqCharac {
+public class EffortReqImpl extends MinimalEObjectImpl.Container implements EffortReq {
 	/**
-	 * The default value of the '{@link #getPriority() <em>Priority</em>}' attribute.
+	 * The default value of the '{@link #getEffort() <em>Effort</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getPriority()
+	 * @see #getEffort()
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int PRIORITY_EDEFAULT = 0;
+	protected static final int EFFORT_EDEFAULT = 0;
 
 	/**
-	 * The cached value of the '{@link #getPriority() <em>Priority</em>}' attribute.
+	 * The cached value of the '{@link #getEffort() <em>Effort</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getPriority()
+	 * @see #getEffort()
 	 * @generated
 	 * @ordered
 	 */
-	protected int priority = PRIORITY_EDEFAULT;
+	protected int effort = EFFORT_EDEFAULT;
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected PriorityReqCharacImpl() {
+	protected EffortReqImpl() {
 		super();
 	}
 
@@ -65,7 +65,7 @@
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return BasicRequirementPackage.Literals.PRIORITY_REQ_CHARAC;
+		return BasicRequirementPackage.Literals.EFFORT_REQ;
 	}
 
 	/**
@@ -74,8 +74,8 @@
 	 * @generated
 	 */
 	@Override
-	public int getPriority() {
-		return priority;
+	public int getEffort() {
+		return effort;
 	}
 
 	/**
@@ -84,11 +84,11 @@
 	 * @generated
 	 */
 	@Override
-	public void setPriority(int newPriority) {
-		int oldPriority = priority;
-		priority = newPriority;
+	public void setEffort(int newEffort) {
+		int oldEffort = effort;
+		effort = newEffort;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BasicRequirementPackage.PRIORITY_REQ_CHARAC__PRIORITY, oldPriority, priority));
+			eNotify(new ENotificationImpl(this, Notification.SET, BasicRequirementPackage.EFFORT_REQ__EFFORT, oldEffort, effort));
 	}
 
 	/**
@@ -99,8 +99,8 @@
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case BasicRequirementPackage.PRIORITY_REQ_CHARAC__PRIORITY:
-				return getPriority();
+			case BasicRequirementPackage.EFFORT_REQ__EFFORT:
+				return getEffort();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -113,8 +113,8 @@
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case BasicRequirementPackage.PRIORITY_REQ_CHARAC__PRIORITY:
-				setPriority((Integer)newValue);
+			case BasicRequirementPackage.EFFORT_REQ__EFFORT:
+				setEffort((Integer)newValue);
 				return;
 		}
 		super.eSet(featureID, newValue);
@@ -128,8 +128,8 @@
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case BasicRequirementPackage.PRIORITY_REQ_CHARAC__PRIORITY:
-				setPriority(PRIORITY_EDEFAULT);
+			case BasicRequirementPackage.EFFORT_REQ__EFFORT:
+				setEffort(EFFORT_EDEFAULT);
 				return;
 		}
 		super.eUnset(featureID);
@@ -143,8 +143,8 @@
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case BasicRequirementPackage.PRIORITY_REQ_CHARAC__PRIORITY:
-				return priority != PRIORITY_EDEFAULT;
+			case BasicRequirementPackage.EFFORT_REQ__EFFORT:
+				return effort != EFFORT_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -159,10 +159,10 @@
 		if (eIsProxy()) return super.toString();
 
 		StringBuilder result = new StringBuilder(super.toString());
-		result.append(" (priority: "); //$NON-NLS-1$
-		result.append(priority);
+		result.append(" (effort: "); //$NON-NLS-1$
+		result.append(effort);
 		result.append(')');
 		return result.toString();
 	}
 
-} //PriorityReqCharacImpl
+} //EffortReqImpl
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/impl/PriorityReqCharacImpl.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/impl/PriorityReqImpl.java
similarity index 82%
rename from plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/impl/PriorityReqCharacImpl.java
rename to plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/impl/PriorityReqImpl.java
index 7588da4..ffd4589 100644
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/impl/PriorityReqCharacImpl.java
+++ b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/impl/PriorityReqImpl.java
@@ -13,22 +13,22 @@
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 
 import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.BasicRequirementPackage;
-import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.PriorityReqCharac;
+import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.PriorityReq;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Priority Req Charac</b></em>'.
+ * An implementation of the model object '<em><b>Priority Req</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.impl.PriorityReqCharacImpl#getPriority <em>Priority</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.impl.PriorityReqImpl#getPriority <em>Priority</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class PriorityReqCharacImpl extends MinimalEObjectImpl.Container implements PriorityReqCharac {
+public class PriorityReqImpl extends MinimalEObjectImpl.Container implements PriorityReq {
 	/**
 	 * The default value of the '{@link #getPriority() <em>Priority</em>}' attribute.
 	 * <!-- begin-user-doc -->
@@ -54,7 +54,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected PriorityReqCharacImpl() {
+	protected PriorityReqImpl() {
 		super();
 	}
 
@@ -65,7 +65,7 @@
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return BasicRequirementPackage.Literals.PRIORITY_REQ_CHARAC;
+		return BasicRequirementPackage.Literals.PRIORITY_REQ;
 	}
 
 	/**
@@ -88,7 +88,7 @@
 		int oldPriority = priority;
 		priority = newPriority;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BasicRequirementPackage.PRIORITY_REQ_CHARAC__PRIORITY, oldPriority, priority));
+			eNotify(new ENotificationImpl(this, Notification.SET, BasicRequirementPackage.PRIORITY_REQ__PRIORITY, oldPriority, priority));
 	}
 
 	/**
@@ -99,7 +99,7 @@
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case BasicRequirementPackage.PRIORITY_REQ_CHARAC__PRIORITY:
+			case BasicRequirementPackage.PRIORITY_REQ__PRIORITY:
 				return getPriority();
 		}
 		return super.eGet(featureID, resolve, coreType);
@@ -113,7 +113,7 @@
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case BasicRequirementPackage.PRIORITY_REQ_CHARAC__PRIORITY:
+			case BasicRequirementPackage.PRIORITY_REQ__PRIORITY:
 				setPriority((Integer)newValue);
 				return;
 		}
@@ -128,7 +128,7 @@
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case BasicRequirementPackage.PRIORITY_REQ_CHARAC__PRIORITY:
+			case BasicRequirementPackage.PRIORITY_REQ__PRIORITY:
 				setPriority(PRIORITY_EDEFAULT);
 				return;
 		}
@@ -143,7 +143,7 @@
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case BasicRequirementPackage.PRIORITY_REQ_CHARAC__PRIORITY:
+			case BasicRequirementPackage.PRIORITY_REQ__PRIORITY:
 				return priority != PRIORITY_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
@@ -165,4 +165,4 @@
 		return result.toString();
 	}
 
-} //PriorityReqCharacImpl
+} //PriorityReqImpl
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/impl/RequirementImpl.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/impl/RequirementImpl.java
index bc43600..b43bdba 100644
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/impl/RequirementImpl.java
+++ b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/impl/RequirementImpl.java
@@ -20,16 +20,18 @@
 
 import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.AuthorReq;
 import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.BasicRequirementPackage;
+import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.EffortReq;
 import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.LevelReq;
-import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.PriorityReqCharac;
+import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.PriorityReq;
 import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.Requirement;
-import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.ReviewStatusReqCharac;
+import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.ReviewStatusReq;
 import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.SourceReq;
 import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.VersionReq;
 
 import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.RequirementKind.LevelKind;
 import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.RequirementKind.StatusKind;
 
+import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.Stakeholder.RequirementEngineer;
 import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.Stakeholder.RequirementSource;
 
 /**
@@ -41,9 +43,10 @@
  * </p>
  * <ul>
  *   <li>{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.impl.RequirementImpl#getAuthor <em>Author</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.impl.RequirementImpl#getEffort <em>Effort</em>}</li>
  *   <li>{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.impl.RequirementImpl#getLevel <em>Level</em>}</li>
  *   <li>{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.impl.RequirementImpl#getPriority <em>Priority</em>}</li>
- *   <li>{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.impl.RequirementImpl#getReviewStatus <em>Review Status</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.impl.RequirementImpl#getStatus <em>Status</em>}</li>
  *   <li>{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.impl.RequirementImpl#getSource <em>Source</em>}</li>
  *   <li>{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.impl.RequirementImpl#getVersion <em>Version</em>}</li>
  * </ul>
@@ -52,24 +55,34 @@
  */
 public class RequirementImpl extends org.eclipse.papyrus.sysml16.requirements.internal.impl.RequirementImpl implements Requirement {
 	/**
-	 * The default value of the '{@link #getAuthor() <em>Author</em>}' attribute.
+	 * The cached value of the '{@link #getAuthor() <em>Author</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @see #getAuthor()
 	 * @generated
 	 * @ordered
 	 */
-	protected static final String AUTHOR_EDEFAULT = null;
+	protected RequirementEngineer author;
 
 	/**
-	 * The cached value of the '{@link #getAuthor() <em>Author</em>}' attribute.
+	 * The default value of the '{@link #getEffort() <em>Effort</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getAuthor()
+	 * @see #getEffort()
 	 * @generated
 	 * @ordered
 	 */
-	protected String author = AUTHOR_EDEFAULT;
+	protected static final int EFFORT_EDEFAULT = 0;
+
+	/**
+	 * The cached value of the '{@link #getEffort() <em>Effort</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getEffort()
+	 * @generated
+	 * @ordered
+	 */
+	protected int effort = EFFORT_EDEFAULT;
 
 	/**
 	 * The cached value of the '{@link #getLevel() <em>Level</em>}' reference.
@@ -102,14 +115,14 @@
 	protected int priority = PRIORITY_EDEFAULT;
 
 	/**
-	 * The cached value of the '{@link #getReviewStatus() <em>Review Status</em>}' reference.
+	 * The cached value of the '{@link #getStatus() <em>Status</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getReviewStatus()
+	 * @see #getStatus()
 	 * @generated
 	 * @ordered
 	 */
-	protected StatusKind reviewStatus;
+	protected StatusKind status;
 
 	/**
 	 * The cached value of the '{@link #getSource() <em>Source</em>}' reference list.
@@ -166,7 +179,24 @@
 	 * @generated
 	 */
 	@Override
-	public String getAuthor() {
+	public RequirementEngineer getAuthor() {
+		if (author != null && author.eIsProxy()) {
+			InternalEObject oldAuthor = (InternalEObject)author;
+			author = (RequirementEngineer)eResolveProxy(oldAuthor);
+			if (author != oldAuthor) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BasicRequirementPackage.REQUIREMENT__AUTHOR, oldAuthor, author));
+			}
+		}
+		return author;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public RequirementEngineer basicGetAuthor() {
 		return author;
 	}
 
@@ -176,8 +206,8 @@
 	 * @generated
 	 */
 	@Override
-	public void setAuthor(String newAuthor) {
-		String oldAuthor = author;
+	public void setAuthor(RequirementEngineer newAuthor) {
+		RequirementEngineer oldAuthor = author;
 		author = newAuthor;
 		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, BasicRequirementPackage.REQUIREMENT__AUTHOR, oldAuthor, author));
@@ -189,6 +219,29 @@
 	 * @generated
 	 */
 	@Override
+	public int getEffort() {
+		return effort;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setEffort(int newEffort) {
+		int oldEffort = effort;
+		effort = newEffort;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, BasicRequirementPackage.REQUIREMENT__EFFORT, oldEffort, effort));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
 	public LevelKind getLevel() {
 		if (level != null && level.eIsProxy()) {
 			InternalEObject oldLevel = (InternalEObject)level;
@@ -252,16 +305,16 @@
 	 * @generated
 	 */
 	@Override
-	public StatusKind getReviewStatus() {
-		if (reviewStatus != null && reviewStatus.eIsProxy()) {
-			InternalEObject oldReviewStatus = (InternalEObject)reviewStatus;
-			reviewStatus = (StatusKind)eResolveProxy(oldReviewStatus);
-			if (reviewStatus != oldReviewStatus) {
+	public StatusKind getStatus() {
+		if (status != null && status.eIsProxy()) {
+			InternalEObject oldStatus = (InternalEObject)status;
+			status = (StatusKind)eResolveProxy(oldStatus);
+			if (status != oldStatus) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BasicRequirementPackage.REQUIREMENT__REVIEW_STATUS, oldReviewStatus, reviewStatus));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BasicRequirementPackage.REQUIREMENT__STATUS, oldStatus, status));
 			}
 		}
-		return reviewStatus;
+		return status;
 	}
 
 	/**
@@ -269,8 +322,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public StatusKind basicGetReviewStatus() {
-		return reviewStatus;
+	public StatusKind basicGetStatus() {
+		return status;
 	}
 
 	/**
@@ -279,11 +332,11 @@
 	 * @generated
 	 */
 	@Override
-	public void setReviewStatus(StatusKind newReviewStatus) {
-		StatusKind oldReviewStatus = reviewStatus;
-		reviewStatus = newReviewStatus;
+	public void setStatus(StatusKind newStatus) {
+		StatusKind oldStatus = status;
+		status = newStatus;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BasicRequirementPackage.REQUIREMENT__REVIEW_STATUS, oldReviewStatus, reviewStatus));
+			eNotify(new ENotificationImpl(this, Notification.SET, BasicRequirementPackage.REQUIREMENT__STATUS, oldStatus, status));
 	}
 
 	/**
@@ -331,15 +384,18 @@
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
 			case BasicRequirementPackage.REQUIREMENT__AUTHOR:
-				return getAuthor();
+				if (resolve) return getAuthor();
+				return basicGetAuthor();
+			case BasicRequirementPackage.REQUIREMENT__EFFORT:
+				return getEffort();
 			case BasicRequirementPackage.REQUIREMENT__LEVEL:
 				if (resolve) return getLevel();
 				return basicGetLevel();
 			case BasicRequirementPackage.REQUIREMENT__PRIORITY:
 				return getPriority();
-			case BasicRequirementPackage.REQUIREMENT__REVIEW_STATUS:
-				if (resolve) return getReviewStatus();
-				return basicGetReviewStatus();
+			case BasicRequirementPackage.REQUIREMENT__STATUS:
+				if (resolve) return getStatus();
+				return basicGetStatus();
 			case BasicRequirementPackage.REQUIREMENT__SOURCE:
 				return getSource();
 			case BasicRequirementPackage.REQUIREMENT__VERSION:
@@ -358,7 +414,10 @@
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
 			case BasicRequirementPackage.REQUIREMENT__AUTHOR:
-				setAuthor((String)newValue);
+				setAuthor((RequirementEngineer)newValue);
+				return;
+			case BasicRequirementPackage.REQUIREMENT__EFFORT:
+				setEffort((Integer)newValue);
 				return;
 			case BasicRequirementPackage.REQUIREMENT__LEVEL:
 				setLevel((LevelKind)newValue);
@@ -366,8 +425,8 @@
 			case BasicRequirementPackage.REQUIREMENT__PRIORITY:
 				setPriority((Integer)newValue);
 				return;
-			case BasicRequirementPackage.REQUIREMENT__REVIEW_STATUS:
-				setReviewStatus((StatusKind)newValue);
+			case BasicRequirementPackage.REQUIREMENT__STATUS:
+				setStatus((StatusKind)newValue);
 				return;
 			case BasicRequirementPackage.REQUIREMENT__SOURCE:
 				getSource().clear();
@@ -389,7 +448,10 @@
 	public void eUnset(int featureID) {
 		switch (featureID) {
 			case BasicRequirementPackage.REQUIREMENT__AUTHOR:
-				setAuthor(AUTHOR_EDEFAULT);
+				setAuthor((RequirementEngineer)null);
+				return;
+			case BasicRequirementPackage.REQUIREMENT__EFFORT:
+				setEffort(EFFORT_EDEFAULT);
 				return;
 			case BasicRequirementPackage.REQUIREMENT__LEVEL:
 				setLevel((LevelKind)null);
@@ -397,8 +459,8 @@
 			case BasicRequirementPackage.REQUIREMENT__PRIORITY:
 				setPriority(PRIORITY_EDEFAULT);
 				return;
-			case BasicRequirementPackage.REQUIREMENT__REVIEW_STATUS:
-				setReviewStatus((StatusKind)null);
+			case BasicRequirementPackage.REQUIREMENT__STATUS:
+				setStatus((StatusKind)null);
 				return;
 			case BasicRequirementPackage.REQUIREMENT__SOURCE:
 				getSource().clear();
@@ -419,13 +481,15 @@
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
 			case BasicRequirementPackage.REQUIREMENT__AUTHOR:
-				return AUTHOR_EDEFAULT == null ? author != null : !AUTHOR_EDEFAULT.equals(author);
+				return author != null;
+			case BasicRequirementPackage.REQUIREMENT__EFFORT:
+				return effort != EFFORT_EDEFAULT;
 			case BasicRequirementPackage.REQUIREMENT__LEVEL:
 				return level != null;
 			case BasicRequirementPackage.REQUIREMENT__PRIORITY:
 				return priority != PRIORITY_EDEFAULT;
-			case BasicRequirementPackage.REQUIREMENT__REVIEW_STATUS:
-				return reviewStatus != null;
+			case BasicRequirementPackage.REQUIREMENT__STATUS:
+				return status != null;
 			case BasicRequirementPackage.REQUIREMENT__SOURCE:
 				return source != null && !source.isEmpty();
 			case BasicRequirementPackage.REQUIREMENT__VERSION:
@@ -447,21 +511,27 @@
 				default: return -1;
 			}
 		}
+		if (baseClass == EffortReq.class) {
+			switch (derivedFeatureID) {
+				case BasicRequirementPackage.REQUIREMENT__EFFORT: return BasicRequirementPackage.EFFORT_REQ__EFFORT;
+				default: return -1;
+			}
+		}
 		if (baseClass == LevelReq.class) {
 			switch (derivedFeatureID) {
 				case BasicRequirementPackage.REQUIREMENT__LEVEL: return BasicRequirementPackage.LEVEL_REQ__LEVEL;
 				default: return -1;
 			}
 		}
-		if (baseClass == PriorityReqCharac.class) {
+		if (baseClass == PriorityReq.class) {
 			switch (derivedFeatureID) {
-				case BasicRequirementPackage.REQUIREMENT__PRIORITY: return BasicRequirementPackage.PRIORITY_REQ_CHARAC__PRIORITY;
+				case BasicRequirementPackage.REQUIREMENT__PRIORITY: return BasicRequirementPackage.PRIORITY_REQ__PRIORITY;
 				default: return -1;
 			}
 		}
-		if (baseClass == ReviewStatusReqCharac.class) {
+		if (baseClass == ReviewStatusReq.class) {
 			switch (derivedFeatureID) {
-				case BasicRequirementPackage.REQUIREMENT__REVIEW_STATUS: return BasicRequirementPackage.REVIEW_STATUS_REQ_CHARAC__REVIEW_STATUS;
+				case BasicRequirementPackage.REQUIREMENT__STATUS: return BasicRequirementPackage.REVIEW_STATUS_REQ__STATUS;
 				default: return -1;
 			}
 		}
@@ -493,21 +563,27 @@
 				default: return -1;
 			}
 		}
+		if (baseClass == EffortReq.class) {
+			switch (baseFeatureID) {
+				case BasicRequirementPackage.EFFORT_REQ__EFFORT: return BasicRequirementPackage.REQUIREMENT__EFFORT;
+				default: return -1;
+			}
+		}
 		if (baseClass == LevelReq.class) {
 			switch (baseFeatureID) {
 				case BasicRequirementPackage.LEVEL_REQ__LEVEL: return BasicRequirementPackage.REQUIREMENT__LEVEL;
 				default: return -1;
 			}
 		}
-		if (baseClass == PriorityReqCharac.class) {
+		if (baseClass == PriorityReq.class) {
 			switch (baseFeatureID) {
-				case BasicRequirementPackage.PRIORITY_REQ_CHARAC__PRIORITY: return BasicRequirementPackage.REQUIREMENT__PRIORITY;
+				case BasicRequirementPackage.PRIORITY_REQ__PRIORITY: return BasicRequirementPackage.REQUIREMENT__PRIORITY;
 				default: return -1;
 			}
 		}
-		if (baseClass == ReviewStatusReqCharac.class) {
+		if (baseClass == ReviewStatusReq.class) {
 			switch (baseFeatureID) {
-				case BasicRequirementPackage.REVIEW_STATUS_REQ_CHARAC__REVIEW_STATUS: return BasicRequirementPackage.REQUIREMENT__REVIEW_STATUS;
+				case BasicRequirementPackage.REVIEW_STATUS_REQ__STATUS: return BasicRequirementPackage.REQUIREMENT__STATUS;
 				default: return -1;
 			}
 		}
@@ -536,8 +612,8 @@
 		if (eIsProxy()) return super.toString();
 
 		StringBuilder result = new StringBuilder(super.toString());
-		result.append(" (author: "); //$NON-NLS-1$
-		result.append(author);
+		result.append(" (effort: "); //$NON-NLS-1$
+		result.append(effort);
 		result.append(", priority: "); //$NON-NLS-1$
 		result.append(priority);
 		result.append(", version: "); //$NON-NLS-1$
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/impl/ReviewStatusReqCharacImpl.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/impl/ReviewStatusReqImpl.java
similarity index 62%
rename from plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/impl/ReviewStatusReqCharacImpl.java
rename to plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/impl/ReviewStatusReqImpl.java
index 9e3aaf7..a3512ed 100644
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/impl/ReviewStatusReqCharacImpl.java
+++ b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/impl/ReviewStatusReqImpl.java
@@ -14,40 +14,40 @@
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 
 import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.BasicRequirementPackage;
-import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.ReviewStatusReqCharac;
+import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.ReviewStatusReq;
 
 import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.RequirementKind.StatusKind;
 
 /**
  * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Review Status Req Charac</b></em>'.
+ * An implementation of the model object '<em><b>Review Status Req</b></em>'.
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.impl.ReviewStatusReqCharacImpl#getReviewStatus <em>Review Status</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.impl.ReviewStatusReqImpl#getStatus <em>Status</em>}</li>
  * </ul>
  *
  * @generated
  */
-public class ReviewStatusReqCharacImpl extends MinimalEObjectImpl.Container implements ReviewStatusReqCharac {
+public class ReviewStatusReqImpl extends MinimalEObjectImpl.Container implements ReviewStatusReq {
 	/**
-	 * The cached value of the '{@link #getReviewStatus() <em>Review Status</em>}' reference.
+	 * The cached value of the '{@link #getStatus() <em>Status</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getReviewStatus()
+	 * @see #getStatus()
 	 * @generated
 	 * @ordered
 	 */
-	protected StatusKind reviewStatus;
+	protected StatusKind status;
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected ReviewStatusReqCharacImpl() {
+	protected ReviewStatusReqImpl() {
 		super();
 	}
 
@@ -58,7 +58,7 @@
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return BasicRequirementPackage.Literals.REVIEW_STATUS_REQ_CHARAC;
+		return BasicRequirementPackage.Literals.REVIEW_STATUS_REQ;
 	}
 
 	/**
@@ -67,16 +67,16 @@
 	 * @generated
 	 */
 	@Override
-	public StatusKind getReviewStatus() {
-		if (reviewStatus != null && reviewStatus.eIsProxy()) {
-			InternalEObject oldReviewStatus = (InternalEObject)reviewStatus;
-			reviewStatus = (StatusKind)eResolveProxy(oldReviewStatus);
-			if (reviewStatus != oldReviewStatus) {
+	public StatusKind getStatus() {
+		if (status != null && status.eIsProxy()) {
+			InternalEObject oldStatus = (InternalEObject)status;
+			status = (StatusKind)eResolveProxy(oldStatus);
+			if (status != oldStatus) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BasicRequirementPackage.REVIEW_STATUS_REQ_CHARAC__REVIEW_STATUS, oldReviewStatus, reviewStatus));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BasicRequirementPackage.REVIEW_STATUS_REQ__STATUS, oldStatus, status));
 			}
 		}
-		return reviewStatus;
+		return status;
 	}
 
 	/**
@@ -84,8 +84,8 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public StatusKind basicGetReviewStatus() {
-		return reviewStatus;
+	public StatusKind basicGetStatus() {
+		return status;
 	}
 
 	/**
@@ -94,11 +94,11 @@
 	 * @generated
 	 */
 	@Override
-	public void setReviewStatus(StatusKind newReviewStatus) {
-		StatusKind oldReviewStatus = reviewStatus;
-		reviewStatus = newReviewStatus;
+	public void setStatus(StatusKind newStatus) {
+		StatusKind oldStatus = status;
+		status = newStatus;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BasicRequirementPackage.REVIEW_STATUS_REQ_CHARAC__REVIEW_STATUS, oldReviewStatus, reviewStatus));
+			eNotify(new ENotificationImpl(this, Notification.SET, BasicRequirementPackage.REVIEW_STATUS_REQ__STATUS, oldStatus, status));
 	}
 
 	/**
@@ -109,9 +109,9 @@
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case BasicRequirementPackage.REVIEW_STATUS_REQ_CHARAC__REVIEW_STATUS:
-				if (resolve) return getReviewStatus();
-				return basicGetReviewStatus();
+			case BasicRequirementPackage.REVIEW_STATUS_REQ__STATUS:
+				if (resolve) return getStatus();
+				return basicGetStatus();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -124,8 +124,8 @@
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case BasicRequirementPackage.REVIEW_STATUS_REQ_CHARAC__REVIEW_STATUS:
-				setReviewStatus((StatusKind)newValue);
+			case BasicRequirementPackage.REVIEW_STATUS_REQ__STATUS:
+				setStatus((StatusKind)newValue);
 				return;
 		}
 		super.eSet(featureID, newValue);
@@ -139,8 +139,8 @@
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case BasicRequirementPackage.REVIEW_STATUS_REQ_CHARAC__REVIEW_STATUS:
-				setReviewStatus((StatusKind)null);
+			case BasicRequirementPackage.REVIEW_STATUS_REQ__STATUS:
+				setStatus((StatusKind)null);
 				return;
 		}
 		super.eUnset(featureID);
@@ -154,10 +154,10 @@
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case BasicRequirementPackage.REVIEW_STATUS_REQ_CHARAC__REVIEW_STATUS:
-				return reviewStatus != null;
+			case BasicRequirementPackage.REVIEW_STATUS_REQ__STATUS:
+				return status != null;
 		}
 		return super.eIsSet(featureID);
 	}
 
-} //ReviewStatusReqCharacImpl
+} //ReviewStatusReqImpl
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/util/BasicRequirementAdapterFactory.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/util/BasicRequirementAdapterFactory.java
index 836c3bd..9128d96 100644
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/util/BasicRequirementAdapterFactory.java
+++ b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/util/BasicRequirementAdapterFactory.java
@@ -81,16 +81,16 @@
 				return createAuthorReqAdapter();
 			}
 			@Override
-			public Adapter casePriorityReqCharac(PriorityReqCharac object) {
-				return createPriorityReqCharacAdapter();
+			public Adapter casePriorityReq(PriorityReq object) {
+				return createPriorityReqAdapter();
 			}
 			@Override
 			public Adapter caseSourceReq(SourceReq object) {
 				return createSourceReqAdapter();
 			}
 			@Override
-			public Adapter caseReviewStatusReqCharac(ReviewStatusReqCharac object) {
-				return createReviewStatusReqCharacAdapter();
+			public Adapter caseReviewStatusReq(ReviewStatusReq object) {
+				return createReviewStatusReqAdapter();
 			}
 			@Override
 			public Adapter caseVersionReq(VersionReq object) {
@@ -101,6 +101,10 @@
 				return createLevelReqAdapter();
 			}
 			@Override
+			public Adapter caseEffortReq(EffortReq object) {
+				return createEffortReqAdapter();
+			}
+			@Override
 			public Adapter caseBacklog(Backlog object) {
 				return createBacklogAdapter();
 			}
@@ -161,16 +165,16 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.PriorityReqCharac <em>Priority Req Charac</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.PriorityReq <em>Priority Req</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.PriorityReqCharac
+	 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.PriorityReq
 	 * @generated
 	 */
-	public Adapter createPriorityReqCharacAdapter() {
+	public Adapter createPriorityReqAdapter() {
 		return null;
 	}
 
@@ -189,16 +193,16 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.ReviewStatusReqCharac <em>Review Status Req Charac</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.ReviewStatusReq <em>Review Status Req</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.ReviewStatusReqCharac
+	 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.ReviewStatusReq
 	 * @generated
 	 */
-	public Adapter createReviewStatusReqCharacAdapter() {
+	public Adapter createReviewStatusReqAdapter() {
 		return null;
 	}
 
@@ -231,6 +235,20 @@
 	}
 
 	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.EffortReq <em>Effort Req</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.EffortReq
+	 * @generated
+	 */
+	public Adapter createEffortReqAdapter() {
+		return null;
+	}
+
+	/**
 	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.Backlog <em>Backlog</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/util/BasicRequirementSwitch.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/util/BasicRequirementSwitch.java
index b03dcae..677fa40 100644
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/util/BasicRequirementSwitch.java
+++ b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/BasicRequirement/util/BasicRequirementSwitch.java
@@ -76,9 +76,10 @@
 				T result = caseRequirement(requirement);
 				if (result == null) result = caseRequirements_Requirement(requirement);
 				if (result == null) result = caseAuthorReq(requirement);
+				if (result == null) result = caseEffortReq(requirement);
 				if (result == null) result = caseLevelReq(requirement);
-				if (result == null) result = casePriorityReqCharac(requirement);
-				if (result == null) result = caseReviewStatusReqCharac(requirement);
+				if (result == null) result = casePriorityReq(requirement);
+				if (result == null) result = caseReviewStatusReq(requirement);
 				if (result == null) result = caseSourceReq(requirement);
 				if (result == null) result = caseVersionReq(requirement);
 				if (result == null) result = caseAbstractRequirement(requirement);
@@ -91,9 +92,9 @@
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case BasicRequirementPackage.PRIORITY_REQ_CHARAC: {
-				PriorityReqCharac priorityReqCharac = (PriorityReqCharac)theEObject;
-				T result = casePriorityReqCharac(priorityReqCharac);
+			case BasicRequirementPackage.PRIORITY_REQ: {
+				PriorityReq priorityReq = (PriorityReq)theEObject;
+				T result = casePriorityReq(priorityReq);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
@@ -103,9 +104,9 @@
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case BasicRequirementPackage.REVIEW_STATUS_REQ_CHARAC: {
-				ReviewStatusReqCharac reviewStatusReqCharac = (ReviewStatusReqCharac)theEObject;
-				T result = caseReviewStatusReqCharac(reviewStatusReqCharac);
+			case BasicRequirementPackage.REVIEW_STATUS_REQ: {
+				ReviewStatusReq reviewStatusReq = (ReviewStatusReq)theEObject;
+				T result = caseReviewStatusReq(reviewStatusReq);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
@@ -121,6 +122,12 @@
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
+			case BasicRequirementPackage.EFFORT_REQ: {
+				EffortReq effortReq = (EffortReq)theEObject;
+				T result = caseEffortReq(effortReq);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
 			case BasicRequirementPackage.BACKLOG: {
 				Backlog backlog = (Backlog)theEObject;
 				T result = caseBacklog(backlog);
@@ -163,17 +170,17 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Priority Req Charac</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Priority Req</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Priority Req Charac</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Priority Req</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T casePriorityReqCharac(PriorityReqCharac object) {
+	public T casePriorityReq(PriorityReq object) {
 		return null;
 	}
 
@@ -193,17 +200,17 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Review Status Req Charac</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Review Status Req</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Review Status Req Charac</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Review Status Req</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseReviewStatusReqCharac(ReviewStatusReqCharac object) {
+	public T caseReviewStatusReq(ReviewStatusReq object) {
 		return null;
 	}
 
@@ -238,6 +245,21 @@
 	}
 
 	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Effort Req</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Effort Req</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseEffortReq(EffortReq object) {
+		return null;
+	}
+
+	/**
 	 * Returns the result of interpreting the object as an instance of '<em>Backlog</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementClassification/FunctionalRequirement.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementClassification/FunctionalRequirement.java
index ec2c1f5..95b8892 100644
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementClassification/FunctionalRequirement.java
+++ b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementClassification/FunctionalRequirement.java
@@ -7,49 +7,16 @@
 
 import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.Requirement;
 
-import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.RequirementKind.FunctionalRequirementKind;
-
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Functional Requirement</b></em>'.
  * <!-- end-user-doc -->
  *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.RequirementClassification.FunctionalRequirement#getFunctionalRequirementKind <em>Functional Requirement Kind</em>}</li>
- * </ul>
  *
  * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.RequirementClassification.RequirementClassificationPackage#getFunctionalRequirement()
  * @model
  * @generated
  */
 public interface FunctionalRequirement extends Requirement {
-	/**
-	 * Returns the value of the '<em><b>Functional Requirement Kind</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Functional Requirement Kind</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Functional Requirement Kind</em>' reference.
-	 * @see #setFunctionalRequirementKind(FunctionalRequirementKind)
-	 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.RequirementClassification.RequirementClassificationPackage#getFunctionalRequirement_FunctionalRequirementKind()
-	 * @model ordered="false"
-	 * @generated
-	 */
-	FunctionalRequirementKind getFunctionalRequirementKind();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.RequirementClassification.FunctionalRequirement#getFunctionalRequirementKind <em>Functional Requirement Kind</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Functional Requirement Kind</em>' reference.
-	 * @see #getFunctionalRequirementKind()
-	 * @generated
-	 */
-	void setFunctionalRequirementKind(FunctionalRequirementKind value);
 
 } // FunctionalRequirement
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementClassification/QualityRequirement.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementClassification/QualityRequirement.java
index e66fa30..5beecb4 100644
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementClassification/QualityRequirement.java
+++ b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementClassification/QualityRequirement.java
@@ -6,8 +6,7 @@
 package org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.RequirementClassification;
 
 import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.Requirement;
-
-import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.RequirementKind.ConstraintKind;
+import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.RequirementKind.QualityKind;
 
 /**
  * <!-- begin-user-doc -->
@@ -35,12 +34,12 @@
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Specific Quality Kind</em>' reference.
-	 * @see #setSpecificQualityKind(ConstraintKind)
+	 * @see #setSpecificQualityKind(QualityKind)
 	 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.RequirementClassification.RequirementClassificationPackage#getQualityRequirement_SpecificQualityKind()
 	 * @model required="true" ordered="false"
 	 * @generated
 	 */
-	ConstraintKind getSpecificQualityKind();
+	QualityKind getSpecificQualityKind();
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.RequirementClassification.QualityRequirement#getSpecificQualityKind <em>Specific Quality Kind</em>}' reference.
@@ -50,6 +49,6 @@
 	 * @see #getSpecificQualityKind()
 	 * @generated
 	 */
-	void setSpecificQualityKind(ConstraintKind value);
+	void setSpecificQualityKind(QualityKind value);
 
 } // QualityRequirement
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementClassification/RequirementClassificationPackage.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementClassification/RequirementClassificationPackage.java
index 5438fc0..6d3d9fa 100644
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementClassification/RequirementClassificationPackage.java
+++ b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementClassification/RequirementClassificationPackage.java
@@ -170,7 +170,7 @@
 	int FUNCTIONAL_REQUIREMENT__BASE_CLASS = BasicRequirementPackage.REQUIREMENT__BASE_CLASS;
 
 	/**
-	 * The feature id for the '<em><b>Author</b></em>' attribute.
+	 * The feature id for the '<em><b>Author</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -179,6 +179,15 @@
 	int FUNCTIONAL_REQUIREMENT__AUTHOR = BasicRequirementPackage.REQUIREMENT__AUTHOR;
 
 	/**
+	 * The feature id for the '<em><b>Effort</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FUNCTIONAL_REQUIREMENT__EFFORT = BasicRequirementPackage.REQUIREMENT__EFFORT;
+
+	/**
 	 * The feature id for the '<em><b>Level</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -197,13 +206,13 @@
 	int FUNCTIONAL_REQUIREMENT__PRIORITY = BasicRequirementPackage.REQUIREMENT__PRIORITY;
 
 	/**
-	 * The feature id for the '<em><b>Review Status</b></em>' reference.
+	 * The feature id for the '<em><b>Status</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int FUNCTIONAL_REQUIREMENT__REVIEW_STATUS = BasicRequirementPackage.REQUIREMENT__REVIEW_STATUS;
+	int FUNCTIONAL_REQUIREMENT__STATUS = BasicRequirementPackage.REQUIREMENT__STATUS;
 
 	/**
 	 * The feature id for the '<em><b>Source</b></em>' reference list.
@@ -224,22 +233,13 @@
 	int FUNCTIONAL_REQUIREMENT__VERSION = BasicRequirementPackage.REQUIREMENT__VERSION;
 
 	/**
-	 * The feature id for the '<em><b>Functional Requirement Kind</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FUNCTIONAL_REQUIREMENT__FUNCTIONAL_REQUIREMENT_KIND = BasicRequirementPackage.REQUIREMENT_FEATURE_COUNT + 0;
-
-	/**
 	 * The number of structural features of the '<em>Functional Requirement</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int FUNCTIONAL_REQUIREMENT_FEATURE_COUNT = BasicRequirementPackage.REQUIREMENT_FEATURE_COUNT + 1;
+	int FUNCTIONAL_REQUIREMENT_FEATURE_COUNT = BasicRequirementPackage.REQUIREMENT_FEATURE_COUNT + 0;
 
 	/**
 	 * The operation id for the '<em>Get Satisfied By</em>' operation.
@@ -423,7 +423,7 @@
 	int CONSTRAINT_REQUIREMENT__BASE_CLASS = BasicRequirementPackage.REQUIREMENT__BASE_CLASS;
 
 	/**
-	 * The feature id for the '<em><b>Author</b></em>' attribute.
+	 * The feature id for the '<em><b>Author</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -432,6 +432,15 @@
 	int CONSTRAINT_REQUIREMENT__AUTHOR = BasicRequirementPackage.REQUIREMENT__AUTHOR;
 
 	/**
+	 * The feature id for the '<em><b>Effort</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONSTRAINT_REQUIREMENT__EFFORT = BasicRequirementPackage.REQUIREMENT__EFFORT;
+
+	/**
 	 * The feature id for the '<em><b>Level</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -450,13 +459,13 @@
 	int CONSTRAINT_REQUIREMENT__PRIORITY = BasicRequirementPackage.REQUIREMENT__PRIORITY;
 
 	/**
-	 * The feature id for the '<em><b>Review Status</b></em>' reference.
+	 * The feature id for the '<em><b>Status</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CONSTRAINT_REQUIREMENT__REVIEW_STATUS = BasicRequirementPackage.REQUIREMENT__REVIEW_STATUS;
+	int CONSTRAINT_REQUIREMENT__STATUS = BasicRequirementPackage.REQUIREMENT__STATUS;
 
 	/**
 	 * The feature id for the '<em><b>Source</b></em>' reference list.
@@ -676,7 +685,7 @@
 	int QUALITY_REQUIREMENT__BASE_CLASS = BasicRequirementPackage.REQUIREMENT__BASE_CLASS;
 
 	/**
-	 * The feature id for the '<em><b>Author</b></em>' attribute.
+	 * The feature id for the '<em><b>Author</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -685,6 +694,15 @@
 	int QUALITY_REQUIREMENT__AUTHOR = BasicRequirementPackage.REQUIREMENT__AUTHOR;
 
 	/**
+	 * The feature id for the '<em><b>Effort</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int QUALITY_REQUIREMENT__EFFORT = BasicRequirementPackage.REQUIREMENT__EFFORT;
+
+	/**
 	 * The feature id for the '<em><b>Level</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -703,13 +721,13 @@
 	int QUALITY_REQUIREMENT__PRIORITY = BasicRequirementPackage.REQUIREMENT__PRIORITY;
 
 	/**
-	 * The feature id for the '<em><b>Review Status</b></em>' reference.
+	 * The feature id for the '<em><b>Status</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int QUALITY_REQUIREMENT__REVIEW_STATUS = BasicRequirementPackage.REQUIREMENT__REVIEW_STATUS;
+	int QUALITY_REQUIREMENT__STATUS = BasicRequirementPackage.REQUIREMENT__STATUS;
 
 	/**
 	 * The feature id for the '<em><b>Source</b></em>' reference list.
@@ -831,17 +849,6 @@
 	EClass getFunctionalRequirement();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.RequirementClassification.FunctionalRequirement#getFunctionalRequirementKind <em>Functional Requirement Kind</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Functional Requirement Kind</em>'.
-	 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.RequirementClassification.FunctionalRequirement#getFunctionalRequirementKind()
-	 * @see #getFunctionalRequirement()
-	 * @generated
-	 */
-	EReference getFunctionalRequirement_FunctionalRequirementKind();
-
-	/**
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.RequirementClassification.ConstraintRequirement <em>Constraint Requirement</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -917,14 +924,6 @@
 		EClass FUNCTIONAL_REQUIREMENT = eINSTANCE.getFunctionalRequirement();
 
 		/**
-		 * The meta object literal for the '<em><b>Functional Requirement Kind</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference FUNCTIONAL_REQUIREMENT__FUNCTIONAL_REQUIREMENT_KIND = eINSTANCE.getFunctionalRequirement_FunctionalRequirementKind();
-
-		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.RequirementClassification.impl.ConstraintRequirementImpl <em>Constraint Requirement</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementClassification/impl/FunctionalRequirementImpl.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementClassification/impl/FunctionalRequirementImpl.java
index db570d5..e63fbae 100644
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementClassification/impl/FunctionalRequirementImpl.java
+++ b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementClassification/impl/FunctionalRequirementImpl.java
@@ -5,45 +5,21 @@
  */
 package org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.RequirementClassification.impl;
 
-import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.impl.RequirementImpl;
 
 import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.RequirementClassification.FunctionalRequirement;
 import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.RequirementClassification.RequirementClassificationPackage;
 
-import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.RequirementKind.FunctionalRequirementKind;
-
 /**
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Functional Requirement</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.RequirementClassification.impl.FunctionalRequirementImpl#getFunctionalRequirementKind <em>Functional Requirement Kind</em>}</li>
- * </ul>
  *
  * @generated
  */
 public class FunctionalRequirementImpl extends RequirementImpl implements FunctionalRequirement {
 	/**
-	 * The cached value of the '{@link #getFunctionalRequirementKind() <em>Functional Requirement Kind</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFunctionalRequirementKind()
-	 * @generated
-	 * @ordered
-	 */
-	protected FunctionalRequirementKind functionalRequirementKind;
-
-	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -62,103 +38,4 @@
 		return RequirementClassificationPackage.Literals.FUNCTIONAL_REQUIREMENT;
 	}
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public FunctionalRequirementKind getFunctionalRequirementKind() {
-		if (functionalRequirementKind != null && functionalRequirementKind.eIsProxy()) {
-			InternalEObject oldFunctionalRequirementKind = (InternalEObject)functionalRequirementKind;
-			functionalRequirementKind = (FunctionalRequirementKind)eResolveProxy(oldFunctionalRequirementKind);
-			if (functionalRequirementKind != oldFunctionalRequirementKind) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RequirementClassificationPackage.FUNCTIONAL_REQUIREMENT__FUNCTIONAL_REQUIREMENT_KIND, oldFunctionalRequirementKind, functionalRequirementKind));
-			}
-		}
-		return functionalRequirementKind;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FunctionalRequirementKind basicGetFunctionalRequirementKind() {
-		return functionalRequirementKind;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void setFunctionalRequirementKind(FunctionalRequirementKind newFunctionalRequirementKind) {
-		FunctionalRequirementKind oldFunctionalRequirementKind = functionalRequirementKind;
-		functionalRequirementKind = newFunctionalRequirementKind;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, RequirementClassificationPackage.FUNCTIONAL_REQUIREMENT__FUNCTIONAL_REQUIREMENT_KIND, oldFunctionalRequirementKind, functionalRequirementKind));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case RequirementClassificationPackage.FUNCTIONAL_REQUIREMENT__FUNCTIONAL_REQUIREMENT_KIND:
-				if (resolve) return getFunctionalRequirementKind();
-				return basicGetFunctionalRequirementKind();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case RequirementClassificationPackage.FUNCTIONAL_REQUIREMENT__FUNCTIONAL_REQUIREMENT_KIND:
-				setFunctionalRequirementKind((FunctionalRequirementKind)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case RequirementClassificationPackage.FUNCTIONAL_REQUIREMENT__FUNCTIONAL_REQUIREMENT_KIND:
-				setFunctionalRequirementKind((FunctionalRequirementKind)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case RequirementClassificationPackage.FUNCTIONAL_REQUIREMENT__FUNCTIONAL_REQUIREMENT_KIND:
-				return functionalRequirementKind != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
 } //FunctionalRequirementImpl
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementClassification/impl/QualityRequirementImpl.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementClassification/impl/QualityRequirementImpl.java
index d4376a5..1194475 100644
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementClassification/impl/QualityRequirementImpl.java
+++ b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementClassification/impl/QualityRequirementImpl.java
@@ -16,8 +16,7 @@
 
 import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.RequirementClassification.QualityRequirement;
 import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.RequirementClassification.RequirementClassificationPackage;
-
-import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.RequirementKind.ConstraintKind;
+import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.RequirementKind.QualityKind;
 
 /**
  * <!-- begin-user-doc -->
@@ -41,7 +40,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	protected ConstraintKind specificQualityKind;
+	protected QualityKind specificQualityKind;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -68,10 +67,10 @@
 	 * @generated
 	 */
 	@Override
-	public ConstraintKind getSpecificQualityKind() {
+	public QualityKind getSpecificQualityKind() {
 		if (specificQualityKind != null && specificQualityKind.eIsProxy()) {
 			InternalEObject oldSpecificQualityKind = (InternalEObject)specificQualityKind;
-			specificQualityKind = (ConstraintKind)eResolveProxy(oldSpecificQualityKind);
+			specificQualityKind = (QualityKind)eResolveProxy(oldSpecificQualityKind);
 			if (specificQualityKind != oldSpecificQualityKind) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RequirementClassificationPackage.QUALITY_REQUIREMENT__SPECIFIC_QUALITY_KIND, oldSpecificQualityKind, specificQualityKind));
@@ -85,7 +84,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public ConstraintKind basicGetSpecificQualityKind() {
+	public QualityKind basicGetSpecificQualityKind() {
 		return specificQualityKind;
 	}
 
@@ -95,8 +94,8 @@
 	 * @generated
 	 */
 	@Override
-	public void setSpecificQualityKind(ConstraintKind newSpecificQualityKind) {
-		ConstraintKind oldSpecificQualityKind = specificQualityKind;
+	public void setSpecificQualityKind(QualityKind newSpecificQualityKind) {
+		QualityKind oldSpecificQualityKind = specificQualityKind;
 		specificQualityKind = newSpecificQualityKind;
 		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, RequirementClassificationPackage.QUALITY_REQUIREMENT__SPECIFIC_QUALITY_KIND, oldSpecificQualityKind, specificQualityKind));
@@ -126,7 +125,7 @@
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
 			case RequirementClassificationPackage.QUALITY_REQUIREMENT__SPECIFIC_QUALITY_KIND:
-				setSpecificQualityKind((ConstraintKind)newValue);
+				setSpecificQualityKind((QualityKind)newValue);
 				return;
 		}
 		super.eSet(featureID, newValue);
@@ -141,7 +140,7 @@
 	public void eUnset(int featureID) {
 		switch (featureID) {
 			case RequirementClassificationPackage.QUALITY_REQUIREMENT__SPECIFIC_QUALITY_KIND:
-				setSpecificQualityKind((ConstraintKind)null);
+				setSpecificQualityKind((QualityKind)null);
 				return;
 		}
 		super.eUnset(featureID);
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementClassification/impl/RequirementClassificationPackageImpl.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementClassification/impl/RequirementClassificationPackageImpl.java
index 9b2d3b8..14d93fe 100644
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementClassification/impl/RequirementClassificationPackageImpl.java
+++ b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementClassification/impl/RequirementClassificationPackageImpl.java
@@ -178,16 +178,6 @@
 	 * @generated
 	 */
 	@Override
-	public EReference getFunctionalRequirement_FunctionalRequirementKind() {
-		return (EReference)functionalRequirementEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
 	public EClass getConstraintRequirement() {
 		return constraintRequirementEClass;
 	}
@@ -252,7 +242,6 @@
 
 		// Create classes and their features
 		functionalRequirementEClass = createEClass(FUNCTIONAL_REQUIREMENT);
-		createEReference(functionalRequirementEClass, FUNCTIONAL_REQUIREMENT__FUNCTIONAL_REQUIREMENT_KIND);
 
 		constraintRequirementEClass = createEClass(CONSTRAINT_REQUIREMENT);
 		createEReference(constraintRequirementEClass, CONSTRAINT_REQUIREMENT__CONSTRAINT_KIND);
@@ -299,13 +288,12 @@
 
 		// Initialize classes, features, and operations; add parameters
 		initEClass(functionalRequirementEClass, FunctionalRequirement.class, "FunctionalRequirement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getFunctionalRequirement_FunctionalRequirementKind(), theRequirementKindPackage.getFunctionalRequirementKind(), null, "functionalRequirementKind", null, 0, 1, FunctionalRequirement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 
 		initEClass(constraintRequirementEClass, ConstraintRequirement.class, "ConstraintRequirement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 		initEReference(getConstraintRequirement_ConstraintKind(), theRequirementKindPackage.getConstraintKind(), null, "constraintKind", null, 1, 1, ConstraintRequirement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 
 		initEClass(qualityRequirementEClass, QualityRequirement.class, "QualityRequirement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getQualityRequirement_SpecificQualityKind(), theRequirementKindPackage.getConstraintKind(), null, "specificQualityKind", null, 1, 1, QualityRequirement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getQualityRequirement_SpecificQualityKind(), theRequirementKindPackage.getQualityKind(), null, "specificQualityKind", null, 1, 1, QualityRequirement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 	}
 
 } //RequirementClassificationPackageImpl
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementClassification/util/RequirementClassificationAdapterFactory.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementClassification/util/RequirementClassificationAdapterFactory.java
index 5399945..bdb4fcc 100644
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementClassification/util/RequirementClassificationAdapterFactory.java
+++ b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementClassification/util/RequirementClassificationAdapterFactory.java
@@ -13,9 +13,10 @@
 import org.eclipse.emf.ecore.EObject;
 
 import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.AuthorReq;
+import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.EffortReq;
 import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.LevelReq;
-import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.PriorityReqCharac;
-import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.ReviewStatusReqCharac;
+import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.PriorityReq;
+import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.ReviewStatusReq;
 import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.SourceReq;
 import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.VersionReq;
 
@@ -105,16 +106,20 @@
 				return createAuthorReqAdapter();
 			}
 			@Override
+			public Adapter caseEffortReq(EffortReq object) {
+				return createEffortReqAdapter();
+			}
+			@Override
 			public Adapter caseLevelReq(LevelReq object) {
 				return createLevelReqAdapter();
 			}
 			@Override
-			public Adapter casePriorityReqCharac(PriorityReqCharac object) {
-				return createPriorityReqCharacAdapter();
+			public Adapter casePriorityReq(PriorityReq object) {
+				return createPriorityReqAdapter();
 			}
 			@Override
-			public Adapter caseReviewStatusReqCharac(ReviewStatusReqCharac object) {
-				return createReviewStatusReqCharacAdapter();
+			public Adapter caseReviewStatusReq(ReviewStatusReq object) {
+				return createReviewStatusReqAdapter();
 			}
 			@Override
 			public Adapter caseSourceReq(SourceReq object) {
@@ -233,6 +238,20 @@
 	}
 
 	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.EffortReq <em>Effort Req</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.EffortReq
+	 * @generated
+	 */
+	public Adapter createEffortReqAdapter() {
+		return null;
+	}
+
+	/**
 	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.LevelReq <em>Level Req</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
@@ -247,30 +266,30 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.PriorityReqCharac <em>Priority Req Charac</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.PriorityReq <em>Priority Req</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.PriorityReqCharac
+	 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.PriorityReq
 	 * @generated
 	 */
-	public Adapter createPriorityReqCharacAdapter() {
+	public Adapter createPriorityReqAdapter() {
 		return null;
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.ReviewStatusReqCharac <em>Review Status Req Charac</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.ReviewStatusReq <em>Review Status Req</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.ReviewStatusReqCharac
+	 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.ReviewStatusReq
 	 * @generated
 	 */
-	public Adapter createReviewStatusReqCharacAdapter() {
+	public Adapter createReviewStatusReqAdapter() {
 		return null;
 	}
 
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementClassification/util/RequirementClassificationSwitch.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementClassification/util/RequirementClassificationSwitch.java
index 301b153..5fbc95c 100644
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementClassification/util/RequirementClassificationSwitch.java
+++ b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementClassification/util/RequirementClassificationSwitch.java
@@ -11,9 +11,10 @@
 import org.eclipse.emf.ecore.util.Switch;
 
 import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.AuthorReq;
+import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.EffortReq;
 import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.LevelReq;
-import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.PriorityReqCharac;
-import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.ReviewStatusReqCharac;
+import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.PriorityReq;
+import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.ReviewStatusReq;
 import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.SourceReq;
 import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.BasicRequirement.VersionReq;
 
@@ -85,9 +86,10 @@
 				if (result == null) result = caseBasicRequirement_Requirement(functionalRequirement);
 				if (result == null) result = caseRequirement(functionalRequirement);
 				if (result == null) result = caseAuthorReq(functionalRequirement);
+				if (result == null) result = caseEffortReq(functionalRequirement);
 				if (result == null) result = caseLevelReq(functionalRequirement);
-				if (result == null) result = casePriorityReqCharac(functionalRequirement);
-				if (result == null) result = caseReviewStatusReqCharac(functionalRequirement);
+				if (result == null) result = casePriorityReq(functionalRequirement);
+				if (result == null) result = caseReviewStatusReq(functionalRequirement);
 				if (result == null) result = caseSourceReq(functionalRequirement);
 				if (result == null) result = caseVersionReq(functionalRequirement);
 				if (result == null) result = caseAbstractRequirement(functionalRequirement);
@@ -100,9 +102,10 @@
 				if (result == null) result = caseBasicRequirement_Requirement(constraintRequirement);
 				if (result == null) result = caseRequirement(constraintRequirement);
 				if (result == null) result = caseAuthorReq(constraintRequirement);
+				if (result == null) result = caseEffortReq(constraintRequirement);
 				if (result == null) result = caseLevelReq(constraintRequirement);
-				if (result == null) result = casePriorityReqCharac(constraintRequirement);
-				if (result == null) result = caseReviewStatusReqCharac(constraintRequirement);
+				if (result == null) result = casePriorityReq(constraintRequirement);
+				if (result == null) result = caseReviewStatusReq(constraintRequirement);
 				if (result == null) result = caseSourceReq(constraintRequirement);
 				if (result == null) result = caseVersionReq(constraintRequirement);
 				if (result == null) result = caseAbstractRequirement(constraintRequirement);
@@ -115,9 +118,10 @@
 				if (result == null) result = caseBasicRequirement_Requirement(qualityRequirement);
 				if (result == null) result = caseRequirement(qualityRequirement);
 				if (result == null) result = caseAuthorReq(qualityRequirement);
+				if (result == null) result = caseEffortReq(qualityRequirement);
 				if (result == null) result = caseLevelReq(qualityRequirement);
-				if (result == null) result = casePriorityReqCharac(qualityRequirement);
-				if (result == null) result = caseReviewStatusReqCharac(qualityRequirement);
+				if (result == null) result = casePriorityReq(qualityRequirement);
+				if (result == null) result = caseReviewStatusReq(qualityRequirement);
 				if (result == null) result = caseSourceReq(qualityRequirement);
 				if (result == null) result = caseVersionReq(qualityRequirement);
 				if (result == null) result = caseAbstractRequirement(qualityRequirement);
@@ -219,6 +223,21 @@
 	}
 
 	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Effort Req</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Effort Req</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseEffortReq(EffortReq object) {
+		return null;
+	}
+
+	/**
 	 * Returns the result of interpreting the object as an instance of '<em>Level Req</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
@@ -234,32 +253,32 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Priority Req Charac</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Priority Req</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Priority Req Charac</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Priority Req</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T casePriorityReqCharac(PriorityReqCharac object) {
+	public T casePriorityReq(PriorityReq object) {
 		return null;
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Review Status Req Charac</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Review Status Req</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Review Status Req Charac</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Review Status Req</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseReviewStatusReqCharac(ReviewStatusReqCharac object) {
+	public T caseReviewStatusReq(ReviewStatusReq object) {
 		return null;
 	}
 
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementKind/RequirementKindFactory.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementKind/RequirementKindFactory.java
index 73bb47d..c53f6bd 100644
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementKind/RequirementKindFactory.java
+++ b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementKind/RequirementKindFactory.java
@@ -61,15 +61,6 @@
 	QualityKind createQualityKind();
 
 	/**
-	 * Returns a new object of class '<em>Functional Requirement Kind</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Functional Requirement Kind</em>'.
-	 * @generated
-	 */
-	FunctionalRequirementKind createFunctionalRequirementKind();
-
-	/**
 	 * Returns a new object of class '<em>Requirement Source Kind</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementKind/RequirementKindPackage.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementKind/RequirementKindPackage.java
index 225e4c4..7563167 100644
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementKind/RequirementKindPackage.java
+++ b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementKind/RequirementKindPackage.java
@@ -207,43 +207,6 @@
 	int QUALITY_KIND_OPERATION_COUNT = 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.RequirementKind.impl.FunctionalRequirementKindImpl <em>Functional Requirement Kind</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.RequirementKind.impl.FunctionalRequirementKindImpl
-	 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.RequirementKind.impl.RequirementKindPackageImpl#getFunctionalRequirementKind()
-	 * @generated
-	 */
-	int FUNCTIONAL_REQUIREMENT_KIND = 4;
-
-	/**
-	 * The feature id for the '<em><b>Base Primitive Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FUNCTIONAL_REQUIREMENT_KIND__BASE_PRIMITIVE_TYPE = 0;
-
-	/**
-	 * The number of structural features of the '<em>Functional Requirement Kind</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FUNCTIONAL_REQUIREMENT_KIND_FEATURE_COUNT = 1;
-
-	/**
-	 * The number of operations of the '<em>Functional Requirement Kind</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FUNCTIONAL_REQUIREMENT_KIND_OPERATION_COUNT = 0;
-
-	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.RequirementKind.impl.RequirementSourceKindImpl <em>Requirement Source Kind</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -251,7 +214,7 @@
 	 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.RequirementKind.impl.RequirementKindPackageImpl#getRequirementSourceKind()
 	 * @generated
 	 */
-	int REQUIREMENT_SOURCE_KIND = 5;
+	int REQUIREMENT_SOURCE_KIND = 4;
 
 	/**
 	 * The feature id for the '<em><b>Base Primitive Type</b></em>' reference.
@@ -366,27 +329,6 @@
 	EReference getQualityKind_Base_PrimitiveType();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.RequirementKind.FunctionalRequirementKind <em>Functional Requirement Kind</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Functional Requirement Kind</em>'.
-	 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.RequirementKind.FunctionalRequirementKind
-	 * @generated
-	 */
-	EClass getFunctionalRequirementKind();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.RequirementKind.FunctionalRequirementKind#getBase_PrimitiveType <em>Base Primitive Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Base Primitive Type</em>'.
-	 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.RequirementKind.FunctionalRequirementKind#getBase_PrimitiveType()
-	 * @see #getFunctionalRequirementKind()
-	 * @generated
-	 */
-	EReference getFunctionalRequirementKind_Base_PrimitiveType();
-
-	/**
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.RequirementKind.RequirementSourceKind <em>Requirement Source Kind</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -503,24 +445,6 @@
 		EReference QUALITY_KIND__BASE_PRIMITIVE_TYPE = eINSTANCE.getQualityKind_Base_PrimitiveType();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.RequirementKind.impl.FunctionalRequirementKindImpl <em>Functional Requirement Kind</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.RequirementKind.impl.FunctionalRequirementKindImpl
-		 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.RequirementKind.impl.RequirementKindPackageImpl#getFunctionalRequirementKind()
-		 * @generated
-		 */
-		EClass FUNCTIONAL_REQUIREMENT_KIND = eINSTANCE.getFunctionalRequirementKind();
-
-		/**
-		 * The meta object literal for the '<em><b>Base Primitive Type</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference FUNCTIONAL_REQUIREMENT_KIND__BASE_PRIMITIVE_TYPE = eINSTANCE.getFunctionalRequirementKind_Base_PrimitiveType();
-
-		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.RequirementKind.impl.RequirementSourceKindImpl <em>Requirement Source Kind</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementKind/impl/FunctionalRequirementKindImpl.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementKind/impl/FunctionalRequirementKindImpl.java
deleted file mode 100644
index fbaaf22..0000000
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementKind/impl/FunctionalRequirementKindImpl.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/**
- * Copyright (c) 2017 CEA LIST. All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available a; http://www.eclipse.org/legal/epl-v10.html Contributors:  - Initial API and implementation  Yupanqui Munoz Julho (CEA LIST)  - Initial API and implementation
- */
-package org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.RequirementKind.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
-import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.RequirementKind.FunctionalRequirementKind;
-import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.RequirementKind.RequirementKindPackage;
-
-import org.eclipse.uml2.uml.PrimitiveType;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Functional Requirement Kind</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.RequirementKind.impl.FunctionalRequirementKindImpl#getBase_PrimitiveType <em>Base Primitive Type</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class FunctionalRequirementKindImpl extends MinimalEObjectImpl.Container implements FunctionalRequirementKind {
-	/**
-	 * The cached value of the '{@link #getBase_PrimitiveType() <em>Base Primitive Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBase_PrimitiveType()
-	 * @generated
-	 * @ordered
-	 */
-	protected PrimitiveType base_PrimitiveType;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected FunctionalRequirementKindImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return RequirementKindPackage.Literals.FUNCTIONAL_REQUIREMENT_KIND;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public PrimitiveType getBase_PrimitiveType() {
-		if (base_PrimitiveType != null && base_PrimitiveType.eIsProxy()) {
-			InternalEObject oldBase_PrimitiveType = (InternalEObject)base_PrimitiveType;
-			base_PrimitiveType = (PrimitiveType)eResolveProxy(oldBase_PrimitiveType);
-			if (base_PrimitiveType != oldBase_PrimitiveType) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, RequirementKindPackage.FUNCTIONAL_REQUIREMENT_KIND__BASE_PRIMITIVE_TYPE, oldBase_PrimitiveType, base_PrimitiveType));
-			}
-		}
-		return base_PrimitiveType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PrimitiveType basicGetBase_PrimitiveType() {
-		return base_PrimitiveType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void setBase_PrimitiveType(PrimitiveType newBase_PrimitiveType) {
-		PrimitiveType oldBase_PrimitiveType = base_PrimitiveType;
-		base_PrimitiveType = newBase_PrimitiveType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, RequirementKindPackage.FUNCTIONAL_REQUIREMENT_KIND__BASE_PRIMITIVE_TYPE, oldBase_PrimitiveType, base_PrimitiveType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case RequirementKindPackage.FUNCTIONAL_REQUIREMENT_KIND__BASE_PRIMITIVE_TYPE:
-				if (resolve) return getBase_PrimitiveType();
-				return basicGetBase_PrimitiveType();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case RequirementKindPackage.FUNCTIONAL_REQUIREMENT_KIND__BASE_PRIMITIVE_TYPE:
-				setBase_PrimitiveType((PrimitiveType)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case RequirementKindPackage.FUNCTIONAL_REQUIREMENT_KIND__BASE_PRIMITIVE_TYPE:
-				setBase_PrimitiveType((PrimitiveType)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case RequirementKindPackage.FUNCTIONAL_REQUIREMENT_KIND__BASE_PRIMITIVE_TYPE:
-				return base_PrimitiveType != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //FunctionalRequirementKindImpl
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementKind/impl/RequirementKindFactoryImpl.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementKind/impl/RequirementKindFactoryImpl.java
index a4ab31c..871bcd4 100644
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementKind/impl/RequirementKindFactoryImpl.java
+++ b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementKind/impl/RequirementKindFactoryImpl.java
@@ -63,7 +63,6 @@
 			case RequirementKindPackage.STATUS_KIND: return createStatusKind();
 			case RequirementKindPackage.CONSTRAINT_KIND: return createConstraintKind();
 			case RequirementKindPackage.QUALITY_KIND: return createQualityKind();
-			case RequirementKindPackage.FUNCTIONAL_REQUIREMENT_KIND: return createFunctionalRequirementKind();
 			case RequirementKindPackage.REQUIREMENT_SOURCE_KIND: return createRequirementSourceKind();
 			default:
 				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
@@ -120,17 +119,6 @@
 	 * @generated
 	 */
 	@Override
-	public FunctionalRequirementKind createFunctionalRequirementKind() {
-		FunctionalRequirementKindImpl functionalRequirementKind = new FunctionalRequirementKindImpl();
-		return functionalRequirementKind;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
 	public RequirementSourceKind createRequirementSourceKind() {
 		RequirementSourceKindImpl requirementSourceKind = new RequirementSourceKindImpl();
 		return requirementSourceKind;
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementKind/impl/RequirementKindPackageImpl.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementKind/impl/RequirementKindPackageImpl.java
index c936d95..4546e5d 100644
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementKind/impl/RequirementKindPackageImpl.java
+++ b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementKind/impl/RequirementKindPackageImpl.java
@@ -26,7 +26,6 @@
 import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.RequirementClassification.impl.RequirementClassificationPackageImpl;
 
 import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.RequirementKind.ConstraintKind;
-import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.RequirementKind.FunctionalRequirementKind;
 import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.RequirementKind.LevelKind;
 import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.RequirementKind.QualityKind;
 import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.RequirementKind.RequirementKindFactory;
@@ -87,13 +86,6 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private EClass functionalRequirementKindEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	private EClass requirementSourceKindEClass = null;
 
 	/**
@@ -272,26 +264,6 @@
 	 * @generated
 	 */
 	@Override
-	public EClass getFunctionalRequirementKind() {
-		return functionalRequirementKindEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EReference getFunctionalRequirementKind_Base_PrimitiveType() {
-		return (EReference)functionalRequirementKindEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
 	public EClass getRequirementSourceKind() {
 		return requirementSourceKindEClass;
 	}
@@ -347,9 +319,6 @@
 		qualityKindEClass = createEClass(QUALITY_KIND);
 		createEReference(qualityKindEClass, QUALITY_KIND__BASE_PRIMITIVE_TYPE);
 
-		functionalRequirementKindEClass = createEClass(FUNCTIONAL_REQUIREMENT_KIND);
-		createEReference(functionalRequirementKindEClass, FUNCTIONAL_REQUIREMENT_KIND__BASE_PRIMITIVE_TYPE);
-
 		requirementSourceKindEClass = createEClass(REQUIREMENT_SOURCE_KIND);
 		createEReference(requirementSourceKindEClass, REQUIREMENT_SOURCE_KIND__BASE_PRIMITIVE_TYPE);
 	}
@@ -399,9 +368,6 @@
 		initEClass(qualityKindEClass, QualityKind.class, "QualityKind", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 		initEReference(getQualityKind_Base_PrimitiveType(), theUMLPackage.getPrimitiveType(), null, "base_PrimitiveType", null, 0, 1, QualityKind.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(functionalRequirementKindEClass, FunctionalRequirementKind.class, "FunctionalRequirementKind", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getFunctionalRequirementKind_Base_PrimitiveType(), theUMLPackage.getPrimitiveType(), null, "base_PrimitiveType", null, 0, 1, FunctionalRequirementKind.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-
 		initEClass(requirementSourceKindEClass, RequirementSourceKind.class, "RequirementSourceKind", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 		initEReference(getRequirementSourceKind_Base_PrimitiveType(), theUMLPackage.getPrimitiveType(), null, "base_PrimitiveType", null, 0, 1, RequirementSourceKind.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 	}
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementKind/util/RequirementKindAdapterFactory.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementKind/util/RequirementKindAdapterFactory.java
index fb78dc5..d655ed1 100644
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementKind/util/RequirementKindAdapterFactory.java
+++ b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementKind/util/RequirementKindAdapterFactory.java
@@ -87,10 +87,6 @@
 				return createQualityKindAdapter();
 			}
 			@Override
-			public Adapter caseFunctionalRequirementKind(FunctionalRequirementKind object) {
-				return createFunctionalRequirementKindAdapter();
-			}
-			@Override
 			public Adapter caseRequirementSourceKind(RequirementSourceKind object) {
 				return createRequirementSourceKindAdapter();
 			}
@@ -171,20 +167,6 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.RequirementKind.FunctionalRequirementKind <em>Functional Requirement Kind</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.RequirementKind.FunctionalRequirementKind
-	 * @generated
-	 */
-	public Adapter createFunctionalRequirementKindAdapter() {
-		return null;
-	}
-
-	/**
 	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.RequirementKind.RequirementSourceKind <em>Requirement Source Kind</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementKind/util/RequirementKindSwitch.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementKind/util/RequirementKindSwitch.java
index 575fdf0..6d71454 100644
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementKind/util/RequirementKindSwitch.java
+++ b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/RequirementKind/util/RequirementKindSwitch.java
@@ -93,12 +93,6 @@
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case RequirementKindPackage.FUNCTIONAL_REQUIREMENT_KIND: {
-				FunctionalRequirementKind functionalRequirementKind = (FunctionalRequirementKind)theEObject;
-				T result = caseFunctionalRequirementKind(functionalRequirementKind);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
 			case RequirementKindPackage.REQUIREMENT_SOURCE_KIND: {
 				RequirementSourceKind requirementSourceKind = (RequirementSourceKind)theEObject;
 				T result = caseRequirementSourceKind(requirementSourceKind);
@@ -170,21 +164,6 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Functional Requirement Kind</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Functional Requirement Kind</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseFunctionalRequirementKind(FunctionalRequirementKind object) {
-		return null;
-	}
-
-	/**
 	 * Returns the result of interpreting the object as an instance of '<em>Requirement Source Kind</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/Stakeholder/RequirementEngineer.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/Stakeholder/RequirementEngineer.java
new file mode 100644
index 0000000..181d49c
--- /dev/null
+++ b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/Stakeholder/RequirementEngineer.java
@@ -0,0 +1,20 @@
+/**
+ * Copyright (c) 2017 CEA LIST. All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available a; http://www.eclipse.org/legal/epl-v10.html Contributors:  - Initial API and implementation  Yupanqui Munoz Julho (CEA LIST)  - Initial API and implementation
+ */
+package org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.Stakeholder;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Requirement Engineer</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.Stakeholder.StakeholderPackage#getRequirementEngineer()
+ * @model
+ * @generated
+ */
+public interface RequirementEngineer extends StakeHolder {
+} // RequirementEngineer
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/Stakeholder/RequirementSource.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/Stakeholder/RequirementSource.java
index 569d7ec..8979688 100644
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/Stakeholder/RequirementSource.java
+++ b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/Stakeholder/RequirementSource.java
@@ -22,6 +22,7 @@
  * <ul>
  *   <li>{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.Stakeholder.RequirementSource#getBase_Element <em>Base Element</em>}</li>
  *   <li>{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.Stakeholder.RequirementSource#getKind <em>Kind</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.Stakeholder.RequirementSource#getDescription <em>Description</em>}</li>
  * </ul>
  *
  * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.Stakeholder.StakeholderPackage#getRequirementSource()
@@ -81,4 +82,30 @@
 	 */
 	void setKind(RequirementSourceKind value);
 
+	/**
+	 * Returns the value of the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Description</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Description</em>' attribute.
+	 * @see #setDescription(String)
+	 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.Stakeholder.StakeholderPackage#getRequirementSource_Description()
+	 * @model dataType="org.eclipse.uml2.types.String" ordered="false"
+	 * @generated
+	 */
+	String getDescription();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.Stakeholder.RequirementSource#getDescription <em>Description</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Description</em>' attribute.
+	 * @see #getDescription()
+	 * @generated
+	 */
+	void setDescription(String value);
+
 } // RequirementSource
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/Stakeholder/StakeholderFactory.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/Stakeholder/StakeholderFactory.java
index 1e792a9..9484464 100644
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/Stakeholder/StakeholderFactory.java
+++ b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/Stakeholder/StakeholderFactory.java
@@ -43,6 +43,15 @@
 	User createUser();
 
 	/**
+	 * Returns a new object of class '<em>Requirement Engineer</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Requirement Engineer</em>'.
+	 * @generated
+	 */
+	RequirementEngineer createRequirementEngineer();
+
+	/**
 	 * Returns a new object of class '<em>Requirement Source</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/Stakeholder/StakeholderPackage.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/Stakeholder/StakeholderPackage.java
index e43c6a0..5474305 100644
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/Stakeholder/StakeholderPackage.java
+++ b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/Stakeholder/StakeholderPackage.java
@@ -5,6 +5,7 @@
  */
 package org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.Stakeholder;
 
+import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
@@ -66,7 +67,7 @@
 	 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.Stakeholder.impl.StakeholderPackageImpl#getRequirementSource()
 	 * @generated
 	 */
-	int REQUIREMENT_SOURCE = 2;
+	int REQUIREMENT_SOURCE = 1;
 
 	/**
 	 * The feature id for the '<em><b>Base Element</b></em>' reference.
@@ -87,13 +88,22 @@
 	int REQUIREMENT_SOURCE__KIND = 1;
 
 	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int REQUIREMENT_SOURCE__DESCRIPTION = 2;
+
+	/**
 	 * The number of structural features of the '<em>Requirement Source</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int REQUIREMENT_SOURCE_FEATURE_COUNT = 2;
+	int REQUIREMENT_SOURCE_FEATURE_COUNT = 3;
 
 	/**
 	 * The number of operations of the '<em>Requirement Source</em>' class.
@@ -133,6 +143,15 @@
 	int STAKE_HOLDER__KIND = REQUIREMENT_SOURCE__KIND;
 
 	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STAKE_HOLDER__DESCRIPTION = REQUIREMENT_SOURCE__DESCRIPTION;
+
+	/**
 	 * The feature id for the '<em><b>Base Actor</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -167,7 +186,7 @@
 	 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.Stakeholder.impl.StakeholderPackageImpl#getUser()
 	 * @generated
 	 */
-	int USER = 1;
+	int USER = 2;
 
 	/**
 	 * The feature id for the '<em><b>Base Element</b></em>' reference.
@@ -188,6 +207,15 @@
 	int USER__KIND = STAKE_HOLDER__KIND;
 
 	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int USER__DESCRIPTION = STAKE_HOLDER__DESCRIPTION;
+
+	/**
 	 * The feature id for the '<em><b>Base Actor</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -216,6 +244,71 @@
 
 
 	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.Stakeholder.impl.RequirementEngineerImpl <em>Requirement Engineer</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.Stakeholder.impl.RequirementEngineerImpl
+	 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.Stakeholder.impl.StakeholderPackageImpl#getRequirementEngineer()
+	 * @generated
+	 */
+	int REQUIREMENT_ENGINEER = 3;
+
+	/**
+	 * The feature id for the '<em><b>Base Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int REQUIREMENT_ENGINEER__BASE_ELEMENT = STAKE_HOLDER__BASE_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Kind</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int REQUIREMENT_ENGINEER__KIND = STAKE_HOLDER__KIND;
+
+	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int REQUIREMENT_ENGINEER__DESCRIPTION = STAKE_HOLDER__DESCRIPTION;
+
+	/**
+	 * The feature id for the '<em><b>Base Actor</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int REQUIREMENT_ENGINEER__BASE_ACTOR = STAKE_HOLDER__BASE_ACTOR;
+
+	/**
+	 * The number of structural features of the '<em>Requirement Engineer</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int REQUIREMENT_ENGINEER_FEATURE_COUNT = STAKE_HOLDER_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>Requirement Engineer</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int REQUIREMENT_ENGINEER_OPERATION_COUNT = STAKE_HOLDER_OPERATION_COUNT + 0;
+
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.Stakeholder.StakeHolder <em>Stake Holder</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -247,6 +340,16 @@
 	EClass getUser();
 
 	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.Stakeholder.RequirementEngineer <em>Requirement Engineer</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Requirement Engineer</em>'.
+	 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.Stakeholder.RequirementEngineer
+	 * @generated
+	 */
+	EClass getRequirementEngineer();
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.Stakeholder.RequirementSource <em>Requirement Source</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -279,6 +382,17 @@
 	EReference getRequirementSource_Kind();
 
 	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.Stakeholder.RequirementSource#getDescription <em>Description</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Description</em>'.
+	 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.Stakeholder.RequirementSource#getDescription()
+	 * @see #getRequirementSource()
+	 * @generated
+	 */
+	EAttribute getRequirementSource_Description();
+
+	/**
 	 * Returns the factory that creates the instances of the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -330,6 +444,16 @@
 		EClass USER = eINSTANCE.getUser();
 
 		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.Stakeholder.impl.RequirementEngineerImpl <em>Requirement Engineer</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.Stakeholder.impl.RequirementEngineerImpl
+		 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.Stakeholder.impl.StakeholderPackageImpl#getRequirementEngineer()
+		 * @generated
+		 */
+		EClass REQUIREMENT_ENGINEER = eINSTANCE.getRequirementEngineer();
+
+		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.Stakeholder.impl.RequirementSourceImpl <em>Requirement Source</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
@@ -355,6 +479,14 @@
 		 */
 		EReference REQUIREMENT_SOURCE__KIND = eINSTANCE.getRequirementSource_Kind();
 
+		/**
+		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute REQUIREMENT_SOURCE__DESCRIPTION = eINSTANCE.getRequirementSource_Description();
+
 	}
 
 } //StakeholderPackage
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/Stakeholder/impl/RequirementEngineerImpl.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/Stakeholder/impl/RequirementEngineerImpl.java
new file mode 100644
index 0000000..bda547f
--- /dev/null
+++ b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/Stakeholder/impl/RequirementEngineerImpl.java
@@ -0,0 +1,40 @@
+/**
+ * Copyright (c) 2017 CEA LIST. All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available a; http://www.eclipse.org/legal/epl-v10.html Contributors:  - Initial API and implementation  Yupanqui Munoz Julho (CEA LIST)  - Initial API and implementation
+ */
+package org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.Stakeholder.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.Stakeholder.RequirementEngineer;
+import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.Stakeholder.StakeholderPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Requirement Engineer</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class RequirementEngineerImpl extends StakeHolderImpl implements RequirementEngineer {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected RequirementEngineerImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return StakeholderPackage.Literals.REQUIREMENT_ENGINEER;
+	}
+
+} //RequirementEngineerImpl
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/Stakeholder/impl/RequirementSourceImpl.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/Stakeholder/impl/RequirementSourceImpl.java
index 246ed9c..7124701 100644
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/Stakeholder/impl/RequirementSourceImpl.java
+++ b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/Stakeholder/impl/RequirementSourceImpl.java
@@ -30,6 +30,7 @@
  * <ul>
  *   <li>{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.Stakeholder.impl.RequirementSourceImpl#getBase_Element <em>Base Element</em>}</li>
  *   <li>{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.Stakeholder.impl.RequirementSourceImpl#getKind <em>Kind</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.Stakeholder.impl.RequirementSourceImpl#getDescription <em>Description</em>}</li>
  * </ul>
  *
  * @generated
@@ -56,6 +57,26 @@
 	protected RequirementSourceKind kind;
 
 	/**
+	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDescription()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String DESCRIPTION_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDescription()
+	 * @generated
+	 * @ordered
+	 */
+	protected String description = DESCRIPTION_EDEFAULT;
+
+	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -160,6 +181,29 @@
 	 * @generated
 	 */
 	@Override
+	public String getDescription() {
+		return description;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setDescription(String newDescription) {
+		String oldDescription = description;
+		description = newDescription;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StakeholderPackage.REQUIREMENT_SOURCE__DESCRIPTION, oldDescription, description));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
 			case StakeholderPackage.REQUIREMENT_SOURCE__BASE_ELEMENT:
@@ -168,6 +212,8 @@
 			case StakeholderPackage.REQUIREMENT_SOURCE__KIND:
 				if (resolve) return getKind();
 				return basicGetKind();
+			case StakeholderPackage.REQUIREMENT_SOURCE__DESCRIPTION:
+				return getDescription();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -186,6 +232,9 @@
 			case StakeholderPackage.REQUIREMENT_SOURCE__KIND:
 				setKind((RequirementSourceKind)newValue);
 				return;
+			case StakeholderPackage.REQUIREMENT_SOURCE__DESCRIPTION:
+				setDescription((String)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -204,6 +253,9 @@
 			case StakeholderPackage.REQUIREMENT_SOURCE__KIND:
 				setKind((RequirementSourceKind)null);
 				return;
+			case StakeholderPackage.REQUIREMENT_SOURCE__DESCRIPTION:
+				setDescription(DESCRIPTION_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -220,8 +272,26 @@
 				return base_Element != null;
 			case StakeholderPackage.REQUIREMENT_SOURCE__KIND:
 				return kind != null;
+			case StakeholderPackage.REQUIREMENT_SOURCE__DESCRIPTION:
+				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
 		}
 		return super.eIsSet(featureID);
 	}
 
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuilder result = new StringBuilder(super.toString());
+		result.append(" (description: "); //$NON-NLS-1$
+		result.append(description);
+		result.append(')');
+		return result.toString();
+	}
+
 } //RequirementSourceImpl
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/Stakeholder/impl/StakeholderFactoryImpl.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/Stakeholder/impl/StakeholderFactoryImpl.java
index 255fb4a..fe496c1 100644
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/Stakeholder/impl/StakeholderFactoryImpl.java
+++ b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/Stakeholder/impl/StakeholderFactoryImpl.java
@@ -60,8 +60,9 @@
 	public EObject create(EClass eClass) {
 		switch (eClass.getClassifierID()) {
 			case StakeholderPackage.STAKE_HOLDER: return createStakeHolder();
-			case StakeholderPackage.USER: return createUser();
 			case StakeholderPackage.REQUIREMENT_SOURCE: return createRequirementSource();
+			case StakeholderPackage.USER: return createUser();
+			case StakeholderPackage.REQUIREMENT_ENGINEER: return createRequirementEngineer();
 			default:
 				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
 		}
@@ -95,6 +96,17 @@
 	 * @generated
 	 */
 	@Override
+	public RequirementEngineer createRequirementEngineer() {
+		RequirementEngineerImpl requirementEngineer = new RequirementEngineerImpl();
+		return requirementEngineer;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
 	public RequirementSource createRequirementSource() {
 		RequirementSourceImpl requirementSource = new RequirementSourceImpl();
 		return requirementSource;
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/Stakeholder/impl/StakeholderPackageImpl.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/Stakeholder/impl/StakeholderPackageImpl.java
index e0e2c87..3bf3a4c 100644
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/Stakeholder/impl/StakeholderPackageImpl.java
+++ b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/Stakeholder/impl/StakeholderPackageImpl.java
@@ -5,6 +5,7 @@
  */
 package org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.Stakeholder.impl;
 
+import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
@@ -29,6 +30,7 @@
 
 import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.RequirementKind.impl.RequirementKindPackageImpl;
 
+import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.Stakeholder.RequirementEngineer;
 import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.Stakeholder.RequirementSource;
 import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.Stakeholder.StakeHolder;
 import org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.Stakeholder.StakeholderFactory;
@@ -70,6 +72,13 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	private EClass requirementEngineerEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	private EClass requirementSourceEClass = null;
 
 	/**
@@ -198,6 +207,16 @@
 	 * @generated
 	 */
 	@Override
+	public EClass getRequirementEngineer() {
+		return requirementEngineerEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
 	public EClass getRequirementSource() {
 		return requirementSourceEClass;
 	}
@@ -228,6 +247,16 @@
 	 * @generated
 	 */
 	@Override
+	public EAttribute getRequirementSource_Description() {
+		return (EAttribute)requirementSourceEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
 	public StakeholderFactory getStakeholderFactory() {
 		return (StakeholderFactory)getEFactoryInstance();
 	}
@@ -254,11 +283,14 @@
 		stakeHolderEClass = createEClass(STAKE_HOLDER);
 		createEReference(stakeHolderEClass, STAKE_HOLDER__BASE_ACTOR);
 
-		userEClass = createEClass(USER);
-
 		requirementSourceEClass = createEClass(REQUIREMENT_SOURCE);
 		createEReference(requirementSourceEClass, REQUIREMENT_SOURCE__BASE_ELEMENT);
 		createEReference(requirementSourceEClass, REQUIREMENT_SOURCE__KIND);
+		createEAttribute(requirementSourceEClass, REQUIREMENT_SOURCE__DESCRIPTION);
+
+		userEClass = createEClass(USER);
+
+		requirementEngineerEClass = createEClass(REQUIREMENT_ENGINEER);
 	}
 
 	/**
@@ -287,6 +319,7 @@
 		// Obtain other dependent packages
 		UMLPackage theUMLPackage = (UMLPackage)EPackage.Registry.INSTANCE.getEPackage(UMLPackage.eNS_URI);
 		RequirementKindPackage theRequirementKindPackage = (RequirementKindPackage)EPackage.Registry.INSTANCE.getEPackage(RequirementKindPackage.eNS_URI);
+		TypesPackage theTypesPackage = (TypesPackage)EPackage.Registry.INSTANCE.getEPackage(TypesPackage.eNS_URI);
 
 		// Create type parameters
 
@@ -295,16 +328,20 @@
 		// Add supertypes to classes
 		stakeHolderEClass.getESuperTypes().add(this.getRequirementSource());
 		userEClass.getESuperTypes().add(this.getStakeHolder());
+		requirementEngineerEClass.getESuperTypes().add(this.getStakeHolder());
 
 		// Initialize classes, features, and operations; add parameters
 		initEClass(stakeHolderEClass, StakeHolder.class, "StakeHolder", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 		initEReference(getStakeHolder_Base_Actor(), theUMLPackage.getActor(), null, "base_Actor", null, 0, 1, StakeHolder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(userEClass, User.class, "User", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
 		initEClass(requirementSourceEClass, RequirementSource.class, "RequirementSource", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 		initEReference(getRequirementSource_Base_Element(), theUMLPackage.getElement(), null, "base_Element", null, 0, 1, RequirementSource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 		initEReference(getRequirementSource_Kind(), theRequirementKindPackage.getRequirementSourceKind(), null, "kind", null, 1, 1, RequirementSource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(getRequirementSource_Description(), theTypesPackage.getString(), "description", null, 0, 1, RequirementSource.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(userEClass, User.class, "User", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+		initEClass(requirementEngineerEClass, RequirementEngineer.class, "RequirementEngineer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 	}
 
 } //StakeholderPackageImpl
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/Stakeholder/util/StakeholderAdapterFactory.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/Stakeholder/util/StakeholderAdapterFactory.java
index 1d1e8ba..c6a96d9 100644
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/Stakeholder/util/StakeholderAdapterFactory.java
+++ b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/Stakeholder/util/StakeholderAdapterFactory.java
@@ -75,12 +75,16 @@
 				return createStakeHolderAdapter();
 			}
 			@Override
+			public Adapter caseRequirementSource(RequirementSource object) {
+				return createRequirementSourceAdapter();
+			}
+			@Override
 			public Adapter caseUser(User object) {
 				return createUserAdapter();
 			}
 			@Override
-			public Adapter caseRequirementSource(RequirementSource object) {
-				return createRequirementSourceAdapter();
+			public Adapter caseRequirementEngineer(RequirementEngineer object) {
+				return createRequirementEngineerAdapter();
 			}
 			@Override
 			public Adapter defaultCase(EObject object) {
@@ -131,6 +135,20 @@
 	}
 
 	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.Stakeholder.RequirementEngineer <em>Requirement Engineer</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.Stakeholder.RequirementEngineer
+	 * @generated
+	 */
+	public Adapter createRequirementEngineerAdapter() {
+		return null;
+	}
+
+	/**
 	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.requirements.sysml.papyrusre.papyrusre.Stakeholder.RequirementSource <em>Requirement Source</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
diff --git a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/Stakeholder/util/StakeholderSwitch.java b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/Stakeholder/util/StakeholderSwitch.java
index 0baa9a3..dbbe602 100644
--- a/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/Stakeholder/util/StakeholderSwitch.java
+++ b/plugins/sysml/controler/org.eclipse.papyrus.requirements.sysml.papyrusre/src-gen/org/eclipse/papyrus/requirements/sysml/papyrusre/papyrusre/Stakeholder/util/StakeholderSwitch.java
@@ -76,6 +76,12 @@
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
+			case StakeholderPackage.REQUIREMENT_SOURCE: {
+				RequirementSource requirementSource = (RequirementSource)theEObject;
+				T result = caseRequirementSource(requirementSource);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
 			case StakeholderPackage.USER: {
 				User user = (User)theEObject;
 				T result = caseUser(user);
@@ -84,9 +90,11 @@
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case StakeholderPackage.REQUIREMENT_SOURCE: {
-				RequirementSource requirementSource = (RequirementSource)theEObject;
-				T result = caseRequirementSource(requirementSource);
+			case StakeholderPackage.REQUIREMENT_ENGINEER: {
+				RequirementEngineer requirementEngineer = (RequirementEngineer)theEObject;
+				T result = caseRequirementEngineer(requirementEngineer);
+				if (result == null) result = caseStakeHolder(requirementEngineer);
+				if (result == null) result = caseRequirementSource(requirementEngineer);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
@@ -125,6 +133,21 @@
 	}
 
 	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Requirement Engineer</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Requirement Engineer</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseRequirementEngineer(RequirementEngineer object) {
+		return null;
+	}
+
+	/**
 	 * Returns the result of interpreting the object as an instance of '<em>Requirement Source</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;