diff --git a/plugins/contracts/org.polarsys.chess.contracts.profile/model/CHESSContract.profile.genmodel b/plugins/contracts/org.polarsys.chess.contracts.profile/model/CHESSContract.profile.genmodel
index bce6d0005eba8a24c884a75e44c5c9e57b3ec14c..398e27e78e76d00a46154775b158a681bdcd8d9a 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.profile/model/CHESSContract.profile.genmodel
+++ b/plugins/contracts/org.polarsys.chess.contracts.profile/model/CHESSContract.profile.genmodel
@@ -1,179 +1,171 @@
-<?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:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/uml2/2.2.0/GenModel"
-    modelDirectory="/org.polarsys.chess.contracts.profile/src" modelPluginID="org.polarsys.chess.contracts.profile"
-    modelName="CHESSContract" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    importerID="org.eclipse.emf.importer.ecore" complianceLevel="6.0" copyrightFields="false"
-    usedGenPackages="../../org.eclipse.opencert.sam.arg/model/arg.genmodel#//arg ../../org.eclipse.opencert.apm.assuranceassets/model/assuranceasset.genmodel#//assuranceasset ../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.opencert.evm.evidspec/model/evidence.genmodel#//evidence ../../org.eclipse.opencert.infra.general/model/general.genmodel#//general ../../org.eclipse.papyrus.marte.static.profile/resources/MARTE.genmodel#//MARTE ../../org.eclipse.papyrus.marte.static.profile/resources/MARTE.genmodel#//MARTE_Library ../../org.eclipse.opencert.infra.properties/model/property.genmodel#//property ../../org.eclipse.uml2.uml.profile.standard/model/Standard.genmodel#//standard ../../org.eclipse.papyrus.sysml/model/SysML.profile.genmodel#//sysml platform:/plugin/org.eclipse.uml2.types/model/Types.genmodel#//types platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml"
-    operationReflection="true" importOrganizing="true">
-  <genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/importer/org.eclipse.uml2.uml.ecore.importer">
-    <details key="ECORE_TAGGED_VALUES" value="PROCESS"/>
-    <details key="UNION_PROPERTIES" value="REPORT"/>
-    <details key="UNTYPED_PROPERTIES" value="REPORT"/>
-    <details key="DUPLICATE_FEATURES" value="DISCARD"/>
-    <details key="SUBSETTING_PROPERTIES" value="REPORT"/>
-    <details key="VALIDATION_DELEGATES" value="IGNORE"/>
-    <details key="OPPOSITE_ROLE_NAMES" value="IGNORE"/>
-    <details key="COMMENTS" value="PROCESS"/>
-    <details key="DUPLICATE_FEATURE_INHERITANCE" value="DISCARD"/>
-    <details key="DUPLICATE_OPERATIONS" value="DISCARD"/>
-    <details key="PROPERTY_DEFAULT_EXPRESSIONS" value="IGNORE"/>
-    <details key="INVARIANT_CONSTRAINTS" value="PROCESS"/>
-    <details key="REDEFINING_PROPERTIES" value="REPORT"/>
-    <details key="ANNOTATION_DETAILS" value="PROCESS"/>
-    <details key="NON_API_INVARIANTS" value="IGNORE"/>
-    <details key="DUPLICATE_OPERATION_INHERITANCE" value="DISCARD"/>
-    <details key="REDEFINING_OPERATIONS" value="REPORT"/>
-    <details key="INVOCATION_DELEGATES" value="IGNORE"/>
-    <details key="DERIVED_FEATURES" value="PROCESS"/>
-    <details key="OPERATION_BODIES" value="IGNORE"/>
-    <details key="CAMEL_CASE_NAMES" value="IGNORE"/>
-    <details key="SUPER_CLASS_ORDER" value="PROCESS"/>
-  </genAnnotations>
-  <foreignModel>chesscontract.ecore</foreignModel>
-  <foreignModel>../../org.eclipse.opencert.sam.arg/model/arg.ecore</foreignModel>
-  <foreignModel>../../org.eclipse.opencert.evm.evidspec/model/evidence.ecore</foreignModel>
-  <genPackages xsi:type="genmodel:GenPackage" prefix="CHESSContract" basePackage="org.polarsys.chess.contracts.profile"
-      disposableProviderFactory="true" ecorePackage="chesscontract.ecore#/">
-    <genClasses xsi:type="genmodel:GenClass" ecoreClass="chesscontract.ecore#//ComponentInstance">
-      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          propertySortChoices="true" ecoreFeature="ecore:EReference chesscontract.ecore#//ComponentInstance/base_Property"/>
-      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          propertySortChoices="true" ecoreFeature="ecore:EReference chesscontract.ecore#//ComponentInstance/WeakGuarantees"/>
-      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          propertySortChoices="true" ecoreFeature="ecore:EReference chesscontract.ecore#//ComponentInstance/base_InstanceSpecification"/>
-    </genClasses>
-    <genClasses xsi:type="genmodel:GenClass" ecoreClass="chesscontract.ecore#//ContractProperty">
-      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          propertySortChoices="true" ecoreFeature="ecore:EReference chesscontract.ecore#//ContractProperty/RefinedBy"/>
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute chesscontract.ecore#//ContractProperty/ContractType"/>
-      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          propertySortChoices="true" ecoreFeature="ecore:EReference chesscontract.ecore#//ContractProperty/base_Slot"/>
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute chesscontract.ecore#//ContractProperty/status"/>
-    </genClasses>
-    <genClasses xsi:type="genmodel:GenClass" ecoreClass="chesscontract.ecore#//ContractRefinement">
-      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          propertySortChoices="true" ecoreFeature="ecore:EReference chesscontract.ecore#//ContractRefinement/base_DataType"/>
-      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          propertySortChoices="true" ecoreFeature="ecore:EReference chesscontract.ecore#//ContractRefinement/Instance"/>
-      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          propertySortChoices="true" ecoreFeature="ecore:EReference chesscontract.ecore#//ContractRefinement/Contract"/>
-      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          propertySortChoices="true" ecoreFeature="ecore:EReference chesscontract.ecore#//ContractRefinement/instanceSpec"/>
-    </genClasses>
-    <genClasses xsi:type="genmodel:GenClass" ecoreClass="chesscontract.ecore#//FormalProperty">
-      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          propertySortChoices="true" ecoreFeature="ecore:EReference chesscontract.ecore#//FormalProperty/base_Constraint"/>
-      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          propertySortChoices="true" ecoreFeature="ecore:EReference chesscontract.ecore#//FormalProperty/Formalize"/>
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute chesscontract.ecore#//FormalProperty/concern"/>
-      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          propertySortChoices="true" ecoreFeature="ecore:EReference chesscontract.ecore#//FormalProperty/claim"/>
-    </genClasses>
-    <genClasses xsi:type="genmodel:GenClass" ecoreClass="chesscontract.ecore#//ContractRefinementAnalysisContext">
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute chesscontract.ecore#//ContractRefinementAnalysisContext/checkAllWeakContracts"/>
-    </genClasses>
-    <genClasses xsi:type="genmodel:GenClass" ecoreClass="chesscontract.ecore#//System"/>
-    <genClasses xsi:type="genmodel:GenClass" ecoreClass="chesscontract.ecore#//Contract">
-      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          propertySortChoices="true" ecoreFeature="ecore:EReference chesscontract.ecore#//Contract/Assume"/>
-      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          propertySortChoices="true" ecoreFeature="ecore:EReference chesscontract.ecore#//Contract/Guarantee"/>
-      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          propertySortChoices="true" ecoreFeature="ecore:EReference chesscontract.ecore#//Contract/Formalize"/>
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute chesscontract.ecore#//Contract/Language"/>
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute chesscontract.ecore#//Contract/contextStatement"/>
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute chesscontract.ecore#//Contract/artefactStatement"/>
-      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          propertySortChoices="true" ecoreFeature="ecore:EReference chesscontract.ecore#//Contract/claim"/>
-      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          propertySortChoices="true" ecoreFeature="ecore:EReference chesscontract.ecore#//Contract/supportedBy"/>
-    </genClasses>
-    <genClasses xsi:type="genmodel:GenClass" ecoreClass="chesscontract.ecore#//Formalize">
-      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          propertySortChoices="true" ecoreFeature="ecore:EReference chesscontract.ecore#//Formalize/base_Abstraction"/>
-    </genClasses>
-    <genClasses xsi:type="genmodel:GenClass" ecoreClass="chesscontract.ecore#//SubSystem"/>
-    <genClasses xsi:type="genmodel:GenClass" ecoreClass="chesscontract.ecore#//CHESSRequirement">
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute chesscontract.ecore#//CHESSRequirement/Author"/>
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute chesscontract.ecore#//CHESSRequirement/Status"/>
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute chesscontract.ecore#//CHESSRequirement/Type"/>
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute chesscontract.ecore#//CHESSRequirement/Priority"/>
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute chesscontract.ecore#//CHESSRequirement/Performance"/>
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute chesscontract.ecore#//CHESSRequirement/Tolerance"/>
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute chesscontract.ecore#//CHESSRequirement/Severity"/>
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute chesscontract.ecore#//CHESSRequirement/Maturity"/>
-      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute chesscontract.ecore#//CHESSRequirement/Risk"/>
-    </genClasses>
-    <genClasses xsi:type="genmodel:GenClass" ecoreClass="chesscontract.ecore#//DelegationConstraint">
-      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          propertySortChoices="true" ecoreFeature="ecore:EReference chesscontract.ecore#//DelegationConstraint/base_Constraint"/>
-    </genClasses>
-    <genClasses xsi:type="genmodel:GenClass" ecoreClass="chesscontract.ecore#//SRAComponent">
-      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          propertySortChoices="true" ecoreFeature="ecore:EReference chesscontract.ecore#//SRAComponent/base_Class"/>
-    </genClasses>
-    <nestedGenPackages xsi:type="genmodel:GenPackage" prefix="DataTypes" basePackage="org.polarsys.chess.contracts.profile.chesscontract"
-        disposableProviderFactory="true" ecorePackage="chesscontract.ecore#//DataTypes">
-      <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="chesscontract.ecore#//DataTypes/ReqStatuses">
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ReqStatuses/Initial"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ReqStatuses/Derived"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ReqStatuses/Final"/>
-      </genEnums>
-      <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="chesscontract.ecore#//DataTypes/ReqTypes">
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ReqTypes/Functional"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ReqTypes/Mission"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ReqTypes/Interface"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ReqTypes/Environmental"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ReqTypes/Physical"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ReqTypes/Operational"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ReqTypes/HumanFactor"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ReqTypes/LogisticsSupport"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ReqTypes/Configuration"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ReqTypes/Design"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ReqTypes/Verification"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ReqTypes/ProductAssurance"/>
-      </genEnums>
-      <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="chesscontract.ecore#//DataTypes/ReqPriorities">
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ReqPriorities/High"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ReqPriorities/Medium"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ReqPriorities/Low"/>
-      </genEnums>
-      <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="chesscontract.ecore#//DataTypes/ReqMaturities">
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ReqMaturities/TBC"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ReqMaturities/TBD"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ReqMaturities/InAnalysis"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ReqMaturities/Analyzed"/>
-      </genEnums>
-      <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="chesscontract.ecore#//DataTypes/ReqRisks">
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ReqRisks/High"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ReqRisks/Medium"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ReqRisks/Low"/>
-      </genEnums>
-      <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="chesscontract.ecore#//DataTypes/Languages">
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/Languages/OCRA"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/Languages/FPTC"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/Languages/Other"/>
-      </genEnums>
-      <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="chesscontract.ecore#//DataTypes/ContractStatus">
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ContractStatus/notValidated"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ContractStatus/validated"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ContractStatus/needsRuntimeSupport"/>
-      </genEnums>
-      <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="chesscontract.ecore#//DataTypes/Concerns">
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/Concerns/unspecified"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/Concerns/safety"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/Concerns/security"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/Concerns/performance"/>
-      </genEnums>
-      <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="chesscontract.ecore#//DataTypes/ContractTypes">
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ContractTypes/Strong"/>
-        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ContractTypes/Weak"/>
-      </genEnums>
-      <genClasses xsi:type="genmodel:GenClass" ecoreClass="chesscontract.ecore#//DataTypes/OthelloConstraint">
-        <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute chesscontract.ecore#//DataTypes/OthelloConstraint/Expression"/>
-      </genClasses>
-      <genClasses xsi:type="genmodel:GenClass" ecoreClass="chesscontract.ecore#//DataTypes/Continuous"/>
-    </nestedGenPackages>
-  </genPackages>
-</genmodel:GenModel>
+<?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:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/uml2/2.2.0/GenModel"
+    modelDirectory="/org.polarsys.chess.contracts.profile/src" modelPluginID="org.polarsys.chess.contracts.profile"
+    modelName="CHESSContract" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+    importerID="org.eclipse.uml2.uml.ecore.importer" complianceLevel="6.0" copyrightFields="false"
+    usedGenPackages="../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.papyrus.marte.static.profile/resources/MARTE.genmodel#//MARTE ../../org.eclipse.papyrus.marte.static.profile/resources/MARTE.genmodel#//MARTE_Library ../../org.eclipse.uml2.uml.profile.standard/model/Standard.genmodel#//standard ../../org.eclipse.papyrus.sysml/model/SysML.profile.genmodel#//sysml platform:/plugin/org.eclipse.uml2.types/model/Types.genmodel#//types platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml"
+    operationReflection="true" importOrganizing="true">
+  <genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/importer/org.eclipse.uml2.uml.ecore.importer">
+    <details key="ECORE_TAGGED_VALUES" value="PROCESS"/>
+    <details key="UNION_PROPERTIES" value="REPORT"/>
+    <details key="UNTYPED_PROPERTIES" value="REPORT"/>
+    <details key="DUPLICATE_FEATURES" value="DISCARD"/>
+    <details key="SUBSETTING_PROPERTIES" value="REPORT"/>
+    <details key="VALIDATION_DELEGATES" value="IGNORE"/>
+    <details key="OPPOSITE_ROLE_NAMES" value="IGNORE"/>
+    <details key="COMMENTS" value="PROCESS"/>
+    <details key="DUPLICATE_FEATURE_INHERITANCE" value="DISCARD"/>
+    <details key="DUPLICATE_OPERATIONS" value="DISCARD"/>
+    <details key="PROPERTY_DEFAULT_EXPRESSIONS" value="IGNORE"/>
+    <details key="INVARIANT_CONSTRAINTS" value="PROCESS"/>
+    <details key="REDEFINING_PROPERTIES" value="REPORT"/>
+    <details key="ANNOTATION_DETAILS" value="PROCESS"/>
+    <details key="NON_API_INVARIANTS" value="IGNORE"/>
+    <details key="DUPLICATE_OPERATION_INHERITANCE" value="DISCARD"/>
+    <details key="REDEFINING_OPERATIONS" value="REPORT"/>
+    <details key="INVOCATION_DELEGATES" value="IGNORE"/>
+    <details key="DERIVED_FEATURES" value="PROCESS"/>
+    <details key="OPERATION_BODIES" value="IGNORE"/>
+    <details key="CAMEL_CASE_NAMES" value="IGNORE"/>
+    <details key="SUPER_CLASS_ORDER" value="PROCESS"/>
+  </genAnnotations>
+  <foreignModel>CHESSContract.profile.uml</foreignModel>
+  <genPackages xsi:type="genmodel:GenPackage" prefix="CHESSContract" basePackage="org.polarsys.chess.contracts.profile"
+      disposableProviderFactory="true" ecorePackage="chesscontract.ecore#/">
+    <genClasses xsi:type="genmodel:GenClass" ecoreClass="chesscontract.ecore#//ComponentInstance">
+      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+          propertySortChoices="true" ecoreFeature="ecore:EReference chesscontract.ecore#//ComponentInstance/base_Property"/>
+      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+          propertySortChoices="true" ecoreFeature="ecore:EReference chesscontract.ecore#//ComponentInstance/WeakGuarantees"/>
+      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+          propertySortChoices="true" ecoreFeature="ecore:EReference chesscontract.ecore#//ComponentInstance/base_InstanceSpecification"/>
+    </genClasses>
+    <genClasses xsi:type="genmodel:GenClass" ecoreClass="chesscontract.ecore#//ContractProperty">
+      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+          propertySortChoices="true" ecoreFeature="ecore:EReference chesscontract.ecore#//ContractProperty/RefinedBy"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute chesscontract.ecore#//ContractProperty/ContractType"/>
+      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+          propertySortChoices="true" ecoreFeature="ecore:EReference chesscontract.ecore#//ContractProperty/base_Slot"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute chesscontract.ecore#//ContractProperty/status"/>
+    </genClasses>
+    <genClasses xsi:type="genmodel:GenClass" ecoreClass="chesscontract.ecore#//ContractRefinement">
+      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+          propertySortChoices="true" ecoreFeature="ecore:EReference chesscontract.ecore#//ContractRefinement/base_DataType"/>
+      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+          propertySortChoices="true" ecoreFeature="ecore:EReference chesscontract.ecore#//ContractRefinement/Instance"/>
+      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+          propertySortChoices="true" ecoreFeature="ecore:EReference chesscontract.ecore#//ContractRefinement/Contract"/>
+      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+          propertySortChoices="true" ecoreFeature="ecore:EReference chesscontract.ecore#//ContractRefinement/instanceSpec"/>
+    </genClasses>
+    <genClasses xsi:type="genmodel:GenClass" ecoreClass="chesscontract.ecore#//FormalProperty">
+      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+          propertySortChoices="true" ecoreFeature="ecore:EReference chesscontract.ecore#//FormalProperty/base_Constraint"/>
+      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+          propertySortChoices="true" ecoreFeature="ecore:EReference chesscontract.ecore#//FormalProperty/Formalize"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute chesscontract.ecore#//FormalProperty/concern"/>
+    </genClasses>
+    <genClasses xsi:type="genmodel:GenClass" ecoreClass="chesscontract.ecore#//ContractRefinementAnalysisContext">
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute chesscontract.ecore#//ContractRefinementAnalysisContext/checkAllWeakContracts"/>
+    </genClasses>
+    <genClasses xsi:type="genmodel:GenClass" ecoreClass="chesscontract.ecore#//System"/>
+    <genClasses xsi:type="genmodel:GenClass" ecoreClass="chesscontract.ecore#//Contract">
+      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+          propertySortChoices="true" ecoreFeature="ecore:EReference chesscontract.ecore#//Contract/Assume"/>
+      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+          propertySortChoices="true" ecoreFeature="ecore:EReference chesscontract.ecore#//Contract/Guarantee"/>
+      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+          propertySortChoices="true" ecoreFeature="ecore:EReference chesscontract.ecore#//Contract/Formalize"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute chesscontract.ecore#//Contract/Language"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute chesscontract.ecore#//Contract/contextStatement"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute chesscontract.ecore#//Contract/artefactStatement"/>
+    </genClasses>
+    <genClasses xsi:type="genmodel:GenClass" ecoreClass="chesscontract.ecore#//Formalize">
+      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+          propertySortChoices="true" ecoreFeature="ecore:EReference chesscontract.ecore#//Formalize/base_Abstraction"/>
+    </genClasses>
+    <genClasses xsi:type="genmodel:GenClass" ecoreClass="chesscontract.ecore#//SubSystem"/>
+    <genClasses xsi:type="genmodel:GenClass" ecoreClass="chesscontract.ecore#//CHESSRequirement">
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute chesscontract.ecore#//CHESSRequirement/Author"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute chesscontract.ecore#//CHESSRequirement/Status"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute chesscontract.ecore#//CHESSRequirement/Type"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute chesscontract.ecore#//CHESSRequirement/Priority"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute chesscontract.ecore#//CHESSRequirement/Performance"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute chesscontract.ecore#//CHESSRequirement/Tolerance"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute chesscontract.ecore#//CHESSRequirement/Severity"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute chesscontract.ecore#//CHESSRequirement/Maturity"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute chesscontract.ecore#//CHESSRequirement/Risk"/>
+    </genClasses>
+    <genClasses xsi:type="genmodel:GenClass" ecoreClass="chesscontract.ecore#//DelegationConstraint">
+      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+          propertySortChoices="true" ecoreFeature="ecore:EReference chesscontract.ecore#//DelegationConstraint/base_Constraint"/>
+    </genClasses>
+    <genClasses xsi:type="genmodel:GenClass" ecoreClass="chesscontract.ecore#//SRAComponent">
+      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+          propertySortChoices="true" ecoreFeature="ecore:EReference chesscontract.ecore#//SRAComponent/base_Class"/>
+    </genClasses>
+    <nestedGenPackages xsi:type="genmodel:GenPackage" prefix="DataTypes" basePackage="org.polarsys.chess.contracts.profile.chesscontract"
+        disposableProviderFactory="true" ecorePackage="chesscontract.ecore#//DataTypes">
+      <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="chesscontract.ecore#//DataTypes/ReqStatuses">
+        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ReqStatuses/Initial"/>
+        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ReqStatuses/Derived"/>
+        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ReqStatuses/Final"/>
+      </genEnums>
+      <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="chesscontract.ecore#//DataTypes/ReqTypes">
+        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ReqTypes/Functional"/>
+        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ReqTypes/Mission"/>
+        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ReqTypes/Interface"/>
+        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ReqTypes/Environmental"/>
+        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ReqTypes/Physical"/>
+        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ReqTypes/Operational"/>
+        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ReqTypes/HumanFactor"/>
+        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ReqTypes/LogisticsSupport"/>
+        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ReqTypes/Configuration"/>
+        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ReqTypes/Design"/>
+        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ReqTypes/Verification"/>
+        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ReqTypes/ProductAssurance"/>
+      </genEnums>
+      <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="chesscontract.ecore#//DataTypes/ReqPriorities">
+        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ReqPriorities/High"/>
+        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ReqPriorities/Medium"/>
+        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ReqPriorities/Low"/>
+      </genEnums>
+      <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="chesscontract.ecore#//DataTypes/ReqMaturities">
+        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ReqMaturities/TBC"/>
+        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ReqMaturities/TBD"/>
+        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ReqMaturities/InAnalysis"/>
+        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ReqMaturities/Analyzed"/>
+      </genEnums>
+      <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="chesscontract.ecore#//DataTypes/ReqRisks">
+        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ReqRisks/High"/>
+        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ReqRisks/Medium"/>
+        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ReqRisks/Low"/>
+      </genEnums>
+      <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="chesscontract.ecore#//DataTypes/Languages">
+        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/Languages/OCRA"/>
+        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/Languages/FPTC"/>
+        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/Languages/Other"/>
+      </genEnums>
+      <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="chesscontract.ecore#//DataTypes/ContractStatus">
+        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ContractStatus/notValidated"/>
+        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ContractStatus/validated"/>
+        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ContractStatus/needsRuntimeSupport"/>
+      </genEnums>
+      <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="chesscontract.ecore#//DataTypes/Concerns">
+        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/Concerns/unspecified"/>
+        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/Concerns/safety"/>
+        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/Concerns/security"/>
+        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/Concerns/performance"/>
+      </genEnums>
+      <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="chesscontract.ecore#//DataTypes/ContractTypes">
+        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ContractTypes/Strong"/>
+        <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="chesscontract.ecore#//DataTypes/ContractTypes/Weak"/>
+      </genEnums>
+      <genClasses xsi:type="genmodel:GenClass" ecoreClass="chesscontract.ecore#//DataTypes/OthelloConstraint">
+        <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute chesscontract.ecore#//DataTypes/OthelloConstraint/Expression"/>
+      </genClasses>
+      <genClasses xsi:type="genmodel:GenClass" ecoreClass="chesscontract.ecore#//DataTypes/Continuous"/>
+    </nestedGenPackages>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/plugins/contracts/org.polarsys.chess.contracts.profile/model/chesscontract.ecore b/plugins/contracts/org.polarsys.chess.contracts.profile/model/chesscontract.ecore
index 0ea0cc15b6156271f51fc5ea6ca68bc2418c9b73..ae2052928a547b5c69939257f857ecf17cb9ede9 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.profile/model/chesscontract.ecore
+++ b/plugins/contracts/org.polarsys.chess.contracts.profile/model/chesscontract.ecore
@@ -1,187 +1,181 @@
-<?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="chesscontract" nsURI="http:///CHESSContract.ecore" nsPrefix="CHESSContract">
-  <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
-    <details key="originalName" value="CHESSContract"/>
-  </eAnnotations>
-  <eClassifiers xsi:type="ecore:EClass" name="ComponentInstance">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="allows to specify information for a component instance:&#xD;&#xA;-the weak contracts which hold"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="base_Property" ordered="false"
-        lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Property"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="WeakGuarantees" ordered="false"
-        upperBound="-1" eType="#//ContractProperty"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="base_InstanceSpecification"
-        ordered="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//InstanceSpecification"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ContractProperty" eSuperTypes="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//constraints/ConstraintProperty">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="used to instantiate a contract in a given class/component.&#xD;&#xA;Can extend a slot to represent contract instantiation for an InstanceSpecification"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="RefinedBy" ordered="false"
-        upperBound="-1" eType="#//ContractRefinement"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="ContractType" ordered="false"
-        lowerBound="1" eType="#//DataTypes/ContractTypes"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="base_Slot" ordered="false"
-        lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Slot"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="status" ordered="false"
-        lowerBound="1" eType="#//DataTypes/ContractStatus"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ContractRefinement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="to specify contract refinement for a given contract instance. &#xD;&#xA;Instance and instanceSpec attribute are mutually exclusive"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="base_DataType" ordered="false"
-        lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//DataType"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="Instance" ordered="false"
-        eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Property"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="Contract" ordered="false"
-        lowerBound="1" eType="#//ContractProperty"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="instanceSpec" ordered="false"
-        eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//InstanceSpecification"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="FormalProperty">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="a property to be used as assumption or guarantee of a given contract"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="base_Constraint" ordered="false"
-        lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Constraint"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="Formalize" ordered="false"
-        upperBound="-1" eType="ecore:EClass ../../org.eclipse.papyrus.sysml/model/sysml.ecore#//requirements/Requirement"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="concern" ordered="false"
-        lowerBound="1" eType="#//DataTypes/Concerns"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="claim" upperBound="-1"
-        eType="ecore:EClass ../../org.eclipse.opencert.sam.arg/model/arg.ecore#//Claim"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ContractRefinementAnalysisContext" eSuperTypes="../../org.eclipse.papyrus.marte.static.profile/resources/MARTE.ecore#//MARTE_AnalysisModel/GQAM/GaAnalysisContext">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="I am not able to generate the static definition of the profile having this stereotype extending the MARTE GaANalysisContext, I obtaind some errors in the genmodel related to the MARTE URI... for the moment, as temporary solution, I define it as extension of Class."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="checkAllWeakContracts"
-        ordered="false" lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//Boolean"
-        defaultValueLiteral="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="System" eSuperTypes="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//blocks/Block"/>
-  <eClassifiers xsi:type="ecore:EClass" name="Contract" eSuperTypes="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//constraints/ConstraintBlock">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="Assume" ordered="false"
-        lowerBound="1" eType="#//FormalProperty"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="Guarantee" ordered="false"
-        lowerBound="1" eType="#//FormalProperty"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="Formalize" ordered="false"
-        upperBound="-1" eType="ecore:EClass ../../org.eclipse.papyrus.sysml/model/sysml.ecore#//requirements/Requirement"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="Language" ordered="false"
-        lowerBound="1" eType="#//DataTypes/Languages"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="contextStatement" ordered="false"
-        eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="artefactStatement" ordered="false"
-        upperBound="-1" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="claim" upperBound="-1"
-        eType="ecore:EClass ../../org.eclipse.opencert.sam.arg/model/arg.ecore#//Claim"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="supportedBy" upperBound="-1"
-        eType="ecore:EClass ../../org.eclipse.opencert.evm.evidspec/model/evidence.ecore#//Artefact"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Formalize">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="base_Abstraction" ordered="false"
-        lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Abstraction"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SubSystem" eSuperTypes="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//blocks/Block"/>
-  <eClassifiers xsi:type="ecore:EClass" name="CHESSRequirement" eSuperTypes="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//requirements/Requirement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="Author" ordered="false"
-        lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="Status" ordered="false"
-        lowerBound="1" eType="#//DataTypes/ReqStatuses"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="Type" ordered="false" lowerBound="1"
-        eType="#//DataTypes/ReqTypes"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="Priority" ordered="false"
-        lowerBound="1" eType="#//DataTypes/ReqPriorities"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="Performance" ordered="false"
-        lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//String">
-      <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <details key="originalName" value="Performance "/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="Tolerance" ordered="false"
-        lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="Severity" ordered="false"
-        lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//String"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="Maturity" ordered="false"
-        lowerBound="1" eType="#//DataTypes/ReqMaturities"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="Risk" ordered="false" lowerBound="1"
-        eType="#//DataTypes/ReqRisks"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DelegationConstraint">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="base_Constraint" ordered="false"
-        lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Constraint"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SRAComponent">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="base_Class" ordered="false"
-        lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Class"/>
-  </eClassifiers>
-  <eSubpackages name="DataTypes" nsURI="http:///CHESSContract/DataTypes.ecore" nsPrefix="CHESSContract.DataTypes">
-    <eClassifiers xsi:type="ecore:EClass" name="OthelloConstraint">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="Expression" ordered="false"
-          lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//String"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="Continuous"/>
-    <eClassifiers xsi:type="ecore:EEnum" name="ReqStatuses">
-      <eLiterals name="Initial"/>
-      <eLiterals name="Derived" value="1"/>
-      <eLiterals name="Final" value="2"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EEnum" name="ReqTypes">
-      <eLiterals name="Functional">
-        <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
-          <details key="originalName" value="Functional "/>
-        </eAnnotations>
-      </eLiterals>
-      <eLiterals name="Mission" value="1"/>
-      <eLiterals name="Interface" value="2"/>
-      <eLiterals name="Environmental" value="3"/>
-      <eLiterals name="Physical" value="4"/>
-      <eLiterals name="Operational" value="5"/>
-      <eLiterals name="HumanFactor" value="6"/>
-      <eLiterals name="LogisticsSupport" value="7"/>
-      <eLiterals name="Configuration" value="8"/>
-      <eLiterals name="Design" value="9"/>
-      <eLiterals name="Verification" value="10"/>
-      <eLiterals name="ProductAssurance" value="11"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EEnum" name="ReqPriorities">
-      <eLiterals name="High"/>
-      <eLiterals name="Medium" value="1"/>
-      <eLiterals name="Low" value="2"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EEnum" name="ReqMaturities">
-      <eLiterals name="TBC"/>
-      <eLiterals name="TBD" value="1"/>
-      <eLiterals name="InAnalysis" value="2"/>
-      <eLiterals name="Analyzed" value="3"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EEnum" name="ReqRisks">
-      <eLiterals name="High"/>
-      <eLiterals name="Medium" value="1"/>
-      <eLiterals name="Low" value="2"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EEnum" name="Languages">
-      <eLiterals name="OCRA"/>
-      <eLiterals name="FPTC" value="1"/>
-      <eLiterals name="Other" value="2"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EEnum" name="ContractStatus">
-      <eLiterals name="notValidated"/>
-      <eLiterals name="validated" value="1"/>
-      <eLiterals name="needsRuntimeSupport" value="2"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EEnum" name="Concerns">
-      <eLiterals name="unspecified"/>
-      <eLiterals name="safety" value="1"/>
-      <eLiterals name="security" value="2"/>
-      <eLiterals name="performance" value="3"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EEnum" name="ContractTypes">
-      <eLiterals name="Strong"/>
-      <eLiterals name="Weak" value="1"/>
-    </eClassifiers>
-  </eSubpackages>
-</ecore:EPackage>
+<?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="chesscontract" nsURI="http:///CHESSContract.ecore" nsPrefix="CHESSContract">
+  <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
+    <details key="originalName" value="CHESSContract"/>
+  </eAnnotations>
+  <eClassifiers xsi:type="ecore:EClass" name="ComponentInstance">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="allows to specify information for a component instance:&#xD;&#xA;-the weak contracts which hold"/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="base_Property" ordered="false"
+        lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Property"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="WeakGuarantees" ordered="false"
+        upperBound="-1" eType="#//ContractProperty"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="base_InstanceSpecification"
+        ordered="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//InstanceSpecification"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ContractProperty" eSuperTypes="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//constraints/ConstraintProperty">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="used to instantiate a contract in a given class/component.&#xD;&#xA;Can extend a slot to represent contract instantiation for an InstanceSpecification"/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="RefinedBy" ordered="false"
+        upperBound="-1" eType="#//ContractRefinement"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="ContractType" ordered="false"
+        lowerBound="1" eType="#//DataTypes/ContractTypes"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="base_Slot" ordered="false"
+        lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Slot"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="status" ordered="false"
+        lowerBound="1" eType="#//DataTypes/ContractStatus"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ContractRefinement">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="to specify contract refinement for a given contract instance. &#xD;&#xA;Instance and instanceSpec attribute are mutually exclusive"/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="base_DataType" ordered="false"
+        lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//DataType"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="Instance" ordered="false"
+        eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Property"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="Contract" ordered="false"
+        lowerBound="1" eType="#//ContractProperty"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="instanceSpec" ordered="false"
+        eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//InstanceSpecification"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="FormalProperty">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="a property to be used as assumption or guarantee of a given contract"/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="base_Constraint" ordered="false"
+        lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Constraint"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="Formalize" ordered="false"
+        upperBound="-1" eType="ecore:EClass ../../org.eclipse.papyrus.sysml/model/sysml.ecore#//requirements/Requirement"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="concern" ordered="false"
+        lowerBound="1" eType="#//DataTypes/Concerns"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ContractRefinementAnalysisContext" eSuperTypes="../../org.eclipse.papyrus.marte.static.profile/resources/MARTE.ecore#//MARTE_AnalysisModel/GQAM/GaAnalysisContext">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="I am not able to generate the static definition of the profile having this stereotype extending the MARTE GaANalysisContext, I obtaind some errors in the genmodel related to the MARTE URI... for the moment, as temporary solution, I define it as extension of Class."/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="checkAllWeakContracts"
+        ordered="false" lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//Boolean"
+        defaultValueLiteral="false"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="System" eSuperTypes="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//blocks/Block"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Contract" eSuperTypes="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//constraints/ConstraintBlock">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="Assume" ordered="false"
+        lowerBound="1" eType="#//FormalProperty"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="Guarantee" ordered="false"
+        lowerBound="1" eType="#//FormalProperty"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="Formalize" ordered="false"
+        upperBound="-1" eType="ecore:EClass ../../org.eclipse.papyrus.sysml/model/sysml.ecore#//requirements/Requirement"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="Language" ordered="false"
+        lowerBound="1" eType="#//DataTypes/Languages"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="contextStatement" ordered="false"
+        eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//String"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="artefactStatement" ordered="false"
+        upperBound="-1" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//String"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Formalize">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="base_Abstraction" ordered="false"
+        lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Abstraction"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="SubSystem" eSuperTypes="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//blocks/Block"/>
+  <eClassifiers xsi:type="ecore:EClass" name="CHESSRequirement" eSuperTypes="../../org.eclipse.papyrus.sysml/model/sysml.ecore#//requirements/Requirement">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="Author" ordered="false"
+        lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//String"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="Status" ordered="false"
+        lowerBound="1" eType="#//DataTypes/ReqStatuses"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="Type" ordered="false" lowerBound="1"
+        eType="#//DataTypes/ReqTypes"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="Priority" ordered="false"
+        lowerBound="1" eType="#//DataTypes/ReqPriorities"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="Performance" ordered="false"
+        lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//String">
+      <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <details key="originalName" value="Performance "/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="Tolerance" ordered="false"
+        lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//String"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="Severity" ordered="false"
+        lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//String"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="Maturity" ordered="false"
+        lowerBound="1" eType="#//DataTypes/ReqMaturities"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="Risk" ordered="false" lowerBound="1"
+        eType="#//DataTypes/ReqRisks"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="DelegationConstraint">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="base_Constraint" ordered="false"
+        lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Constraint"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="SRAComponent">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="base_Class" ordered="false"
+        lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Class"/>
+  </eClassifiers>
+  <eSubpackages name="DataTypes" nsURI="http:///CHESSContract/DataTypes.ecore" nsPrefix="CHESSContract.DataTypes">
+    <eClassifiers xsi:type="ecore:EClass" name="OthelloConstraint">
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="Expression" ordered="false"
+          lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//String"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="Continuous"/>
+    <eClassifiers xsi:type="ecore:EEnum" name="ReqStatuses">
+      <eLiterals name="Initial"/>
+      <eLiterals name="Derived" value="1"/>
+      <eLiterals name="Final" value="2"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EEnum" name="ReqTypes">
+      <eLiterals name="Functional">
+        <eAnnotations source="http://www.eclipse.org/uml2/2.0.0/UML">
+          <details key="originalName" value="Functional "/>
+        </eAnnotations>
+      </eLiterals>
+      <eLiterals name="Mission" value="1"/>
+      <eLiterals name="Interface" value="2"/>
+      <eLiterals name="Environmental" value="3"/>
+      <eLiterals name="Physical" value="4"/>
+      <eLiterals name="Operational" value="5"/>
+      <eLiterals name="HumanFactor" value="6"/>
+      <eLiterals name="LogisticsSupport" value="7"/>
+      <eLiterals name="Configuration" value="8"/>
+      <eLiterals name="Design" value="9"/>
+      <eLiterals name="Verification" value="10"/>
+      <eLiterals name="ProductAssurance" value="11"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EEnum" name="ReqPriorities">
+      <eLiterals name="High"/>
+      <eLiterals name="Medium" value="1"/>
+      <eLiterals name="Low" value="2"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EEnum" name="ReqMaturities">
+      <eLiterals name="TBC"/>
+      <eLiterals name="TBD" value="1"/>
+      <eLiterals name="InAnalysis" value="2"/>
+      <eLiterals name="Analyzed" value="3"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EEnum" name="ReqRisks">
+      <eLiterals name="High"/>
+      <eLiterals name="Medium" value="1"/>
+      <eLiterals name="Low" value="2"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EEnum" name="Languages">
+      <eLiterals name="OCRA"/>
+      <eLiterals name="FPTC" value="1"/>
+      <eLiterals name="Other" value="2"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EEnum" name="ContractStatus">
+      <eLiterals name="notValidated"/>
+      <eLiterals name="validated" value="1"/>
+      <eLiterals name="needsRuntimeSupport" value="2"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EEnum" name="Concerns">
+      <eLiterals name="unspecified"/>
+      <eLiterals name="safety" value="1"/>
+      <eLiterals name="security" value="2"/>
+      <eLiterals name="performance" value="3"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EEnum" name="ContractTypes">
+      <eLiterals name="Strong"/>
+      <eLiterals name="Weak" value="1"/>
+    </eClassifiers>
+  </eSubpackages>
+</ecore:EPackage>
diff --git a/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/CHESSContractPackage.java b/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/CHESSContractPackage.java
index e0540614752402cecf3fbd442cf7dbf05066a437..a65bfe4479abcfe23c088be7a8c406a7dda7aef3 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/CHESSContractPackage.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/CHESSContractPackage.java
@@ -373,15 +373,6 @@ public interface CHESSContractPackage extends EPackage {
 	 */
 	int FORMAL_PROPERTY__CONCERN = 2;
 
-	/**
-	 * The feature id for the '<em><b>Claim</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FORMAL_PROPERTY__CLAIM = 3;
-
 	/**
 	 * The number of structural features of the '<em>Formal Property</em>' class.
 	 * <!-- begin-user-doc -->
@@ -389,7 +380,7 @@ public interface CHESSContractPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int FORMAL_PROPERTY_FEATURE_COUNT = 4;
+	int FORMAL_PROPERTY_FEATURE_COUNT = 3;
 
 	/**
 	 * The number of operations of the '<em>Formal Property</em>' class.
@@ -590,24 +581,6 @@ public interface CHESSContractPackage extends EPackage {
 	 */
 	int CONTRACT__ARTEFACT_STATEMENT = ConstraintsPackage.CONSTRAINT_BLOCK_FEATURE_COUNT + 5;
 
-	/**
-	 * The feature id for the '<em><b>Claim</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTRACT__CLAIM = ConstraintsPackage.CONSTRAINT_BLOCK_FEATURE_COUNT + 6;
-
-	/**
-	 * The feature id for the '<em><b>Supported By</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTRACT__SUPPORTED_BY = ConstraintsPackage.CONSTRAINT_BLOCK_FEATURE_COUNT + 7;
-
 	/**
 	 * The number of structural features of the '<em>Contract</em>' class.
 	 * <!-- begin-user-doc -->
@@ -615,7 +588,7 @@ public interface CHESSContractPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CONTRACT_FEATURE_COUNT = ConstraintsPackage.CONSTRAINT_BLOCK_FEATURE_COUNT + 8;
+	int CONTRACT_FEATURE_COUNT = ConstraintsPackage.CONSTRAINT_BLOCK_FEATURE_COUNT + 6;
 
 	/**
 	 * The number of operations of the '<em>Contract</em>' class.
@@ -1019,28 +992,6 @@ public interface CHESSContractPackage extends EPackage {
 	 */
 	EAttribute getContract_ArtefactStatement();
 
-	/**
-	 * Returns the meta object for the reference list '{@link org.polarsys.chess.contracts.profile.chesscontract.Contract#getClaim <em>Claim</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Claim</em>'.
-	 * @see org.polarsys.chess.contracts.profile.chesscontract.Contract#getClaim()
-	 * @see #getContract()
-	 * @generated
-	 */
-	EReference getContract_Claim();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.polarsys.chess.contracts.profile.chesscontract.Contract#getSupportedBy <em>Supported By</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Supported By</em>'.
-	 * @see org.polarsys.chess.contracts.profile.chesscontract.Contract#getSupportedBy()
-	 * @see #getContract()
-	 * @generated
-	 */
-	EReference getContract_SupportedBy();
-
 	/**
 	 * Returns the meta object for class '{@link org.polarsys.chess.contracts.profile.chesscontract.FormalProperty <em>Formal Property</em>}'.
 	 * <!-- begin-user-doc -->
@@ -1084,17 +1035,6 @@ public interface CHESSContractPackage extends EPackage {
 	 */
 	EAttribute getFormalProperty_Concern();
 
-	/**
-	 * Returns the meta object for the reference list '{@link org.polarsys.chess.contracts.profile.chesscontract.FormalProperty#getClaim <em>Claim</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Claim</em>'.
-	 * @see org.polarsys.chess.contracts.profile.chesscontract.FormalProperty#getClaim()
-	 * @see #getFormalProperty()
-	 * @generated
-	 */
-	EReference getFormalProperty_Claim();
-
 	/**
 	 * Returns the meta object for class '{@link org.polarsys.chess.contracts.profile.chesscontract.ContractRefinementAnalysisContext <em>Contract Refinement Analysis Context</em>}'.
 	 * <!-- begin-user-doc -->
@@ -1540,22 +1480,6 @@ public interface CHESSContractPackage extends EPackage {
 		 */
 		EAttribute CONTRACT__ARTEFACT_STATEMENT = eINSTANCE.getContract_ArtefactStatement();
 
-		/**
-		 * The meta object literal for the '<em><b>Claim</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CONTRACT__CLAIM = eINSTANCE.getContract_Claim();
-
-		/**
-		 * The meta object literal for the '<em><b>Supported By</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CONTRACT__SUPPORTED_BY = eINSTANCE.getContract_SupportedBy();
-
 		/**
 		 * The meta object literal for the '{@link org.polarsys.chess.contracts.profile.chesscontract.impl.FormalPropertyImpl <em>Formal Property</em>}' class.
 		 * <!-- begin-user-doc -->
@@ -1590,14 +1514,6 @@ public interface CHESSContractPackage extends EPackage {
 		 */
 		EAttribute FORMAL_PROPERTY__CONCERN = eINSTANCE.getFormalProperty_Concern();
 
-		/**
-		 * The meta object literal for the '<em><b>Claim</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference FORMAL_PROPERTY__CLAIM = eINSTANCE.getFormalProperty_Claim();
-
 		/**
 		 * The meta object literal for the '{@link org.polarsys.chess.contracts.profile.chesscontract.impl.ContractRefinementAnalysisContextImpl <em>Contract Refinement Analysis Context</em>}' class.
 		 * <!-- begin-user-doc -->
diff --git a/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/Contract.java b/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/Contract.java
index 5f4bc3ebb1b4df044de5b01506a23386b58c5f76..2859bdb1b5ccdeb4d79c088262798eedf455a72e 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/Contract.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/Contract.java
@@ -3,8 +3,6 @@
 package org.polarsys.chess.contracts.profile.chesscontract;
 
 import org.eclipse.emf.common.util.EList;
-import org.eclipse.opencert.evm.evidspec.evidence.Artefact;
-import org.eclipse.opencert.sam.arg.arg.Claim;
 import org.eclipse.papyrus.sysml.constraints.ConstraintBlock;
 
 import org.eclipse.papyrus.sysml.requirements.Requirement;
@@ -25,8 +23,6 @@ import org.polarsys.chess.contracts.profile.chesscontract.DataTypes.Languages;
  *   <li>{@link org.polarsys.chess.contracts.profile.chesscontract.Contract#getLanguage <em>Language</em>}</li>
  *   <li>{@link org.polarsys.chess.contracts.profile.chesscontract.Contract#getContextStatement <em>Context Statement</em>}</li>
  *   <li>{@link org.polarsys.chess.contracts.profile.chesscontract.Contract#getArtefactStatement <em>Artefact Statement</em>}</li>
- *   <li>{@link org.polarsys.chess.contracts.profile.chesscontract.Contract#getClaim <em>Claim</em>}</li>
- *   <li>{@link org.polarsys.chess.contracts.profile.chesscontract.Contract#getSupportedBy <em>Supported By</em>}</li>
  * </ul>
  *
  * @see org.polarsys.chess.contracts.profile.chesscontract.CHESSContractPackage#getContract()
@@ -173,36 +169,4 @@ public interface Contract extends ConstraintBlock {
 	 */
 	EList<String> getArtefactStatement();
 
-	/**
-	 * Returns the value of the '<em><b>Claim</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.opencert.sam.arg.arg.Claim}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Claim</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Claim</em>' reference list.
-	 * @see org.polarsys.chess.contracts.profile.chesscontract.CHESSContractPackage#getContract_Claim()
-	 * @model
-	 * @generated
-	 */
-	EList<Claim> getClaim();
-
-	/**
-	 * Returns the value of the '<em><b>Supported By</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.opencert.evm.evidspec.evidence.Artefact}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Supported By</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Supported By</em>' reference list.
-	 * @see org.polarsys.chess.contracts.profile.chesscontract.CHESSContractPackage#getContract_SupportedBy()
-	 * @model
-	 * @generated
-	 */
-	EList<Artefact> getSupportedBy();
-
 } // Contract
diff --git a/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/DataTypes/impl/DataTypesPackageImpl.java b/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/DataTypes/impl/DataTypesPackageImpl.java
index 53c605ff429759df65ab8aed3a073b4906629572..3ad9441887d32eed61982cbd87f6dbc1cd437d42 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/DataTypes/impl/DataTypesPackageImpl.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/DataTypes/impl/DataTypesPackageImpl.java
@@ -8,8 +8,6 @@ import org.eclipse.emf.ecore.EEnum;
 import org.eclipse.emf.ecore.EPackage;
 
 import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.eclipse.opencert.sam.arg.arg.ArgPackage;
 import org.eclipse.papyrus.MARTE.MARTEPackage;
 import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.BasicNFP_TypesPackage;
 import org.eclipse.papyrus.MARTE_Library.GRM_BasicTypes.GRM_BasicTypesPackage;
@@ -172,7 +170,6 @@ public class DataTypesPackageImpl extends EPackageImpl implements DataTypesPacka
 		isInited = true;
 
 		// Initialize simple dependencies
-		ArgPackage.eINSTANCE.eClass();
 		MARTEPackage.eINSTANCE.eClass();
 		MeasurementUnitsPackage.eINSTANCE.eClass();
 		GRM_BasicTypesPackage.eINSTANCE.eClass();
diff --git a/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/FormalProperty.java b/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/FormalProperty.java
index 660bbd1d06bffb0fd45927e4c58544cc509fdf7a..3c048d9b82532db22ac3a8c05142bf9bc2a342b9 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/FormalProperty.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/FormalProperty.java
@@ -4,8 +4,6 @@ package org.polarsys.chess.contracts.profile.chesscontract;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.opencert.sam.arg.arg.Claim;
 import org.eclipse.papyrus.sysml.requirements.Requirement;
 import org.eclipse.uml2.uml.Constraint;
 import org.polarsys.chess.contracts.profile.chesscontract.DataTypes.Concerns;
@@ -26,7 +24,6 @@ import org.polarsys.chess.contracts.profile.chesscontract.DataTypes.Concerns;
  *   <li>{@link org.polarsys.chess.contracts.profile.chesscontract.FormalProperty#getBase_Constraint <em>Base Constraint</em>}</li>
  *   <li>{@link org.polarsys.chess.contracts.profile.chesscontract.FormalProperty#getFormalize <em>Formalize</em>}</li>
  *   <li>{@link org.polarsys.chess.contracts.profile.chesscontract.FormalProperty#getConcern <em>Concern</em>}</li>
- *   <li>{@link org.polarsys.chess.contracts.profile.chesscontract.FormalProperty#getClaim <em>Claim</em>}</li>
  * </ul>
  *
  * @see org.polarsys.chess.contracts.profile.chesscontract.CHESSContractPackage#getFormalProperty()
@@ -105,20 +102,4 @@ public interface FormalProperty extends EObject {
 	 */
 	void setConcern(Concerns value);
 
-	/**
-	 * Returns the value of the '<em><b>Claim</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.opencert.sam.arg.arg.Claim}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Claim</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Claim</em>' reference list.
-	 * @see org.polarsys.chess.contracts.profile.chesscontract.CHESSContractPackage#getFormalProperty_Claim()
-	 * @model
-	 * @generated
-	 */
-	EList<Claim> getClaim();
-
 } // FormalProperty
diff --git a/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/impl/CHESSContractPackageImpl.java b/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/impl/CHESSContractPackageImpl.java
index 329a28367dbf7a3e0c1ffa42412dd97d101e9be5..9e44b111c18ff33dc92dfcbe81ae96605593f6e9 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/impl/CHESSContractPackageImpl.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/impl/CHESSContractPackageImpl.java
@@ -7,8 +7,6 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.opencert.evm.evidspec.evidence.EvidencePackage;
-import org.eclipse.opencert.sam.arg.arg.ArgPackage;
 import org.eclipse.papyrus.MARTE.MARTEPackage;
 import org.eclipse.papyrus.MARTE.MARTE_AnalysisModel.GQAM.GQAMPackage;
 import org.eclipse.papyrus.MARTE_Library.BasicNFP_Types.BasicNFP_TypesPackage;
@@ -179,7 +177,6 @@ public class CHESSContractPackageImpl extends EPackageImpl implements CHESSContr
 		isInited = true;
 
 		// Initialize simple dependencies
-		ArgPackage.eINSTANCE.eClass();
 		MARTEPackage.eINSTANCE.eClass();
 		MeasurementUnitsPackage.eINSTANCE.eClass();
 		GRM_BasicTypesPackage.eINSTANCE.eClass();
@@ -283,24 +280,6 @@ public class CHESSContractPackageImpl extends EPackageImpl implements CHESSContr
 		return (EAttribute)contractEClass.getEStructuralFeatures().get(5);
 	}
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getContract_Claim() {
-		return (EReference)contractEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getContract_SupportedBy() {
-		return (EReference)contractEClass.getEStructuralFeatures().get(7);
-	}
-
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -337,15 +316,6 @@ public class CHESSContractPackageImpl extends EPackageImpl implements CHESSContr
 		return (EAttribute)formalPropertyEClass.getEStructuralFeatures().get(2);
 	}
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getFormalProperty_Claim() {
-		return (EReference)formalPropertyEClass.getEStructuralFeatures().get(3);
-	}
-
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -692,7 +662,6 @@ public class CHESSContractPackageImpl extends EPackageImpl implements CHESSContr
 		createEReference(formalPropertyEClass, FORMAL_PROPERTY__BASE_CONSTRAINT);
 		createEReference(formalPropertyEClass, FORMAL_PROPERTY__FORMALIZE);
 		createEAttribute(formalPropertyEClass, FORMAL_PROPERTY__CONCERN);
-		createEReference(formalPropertyEClass, FORMAL_PROPERTY__CLAIM);
 
 		contractRefinementAnalysisContextEClass = createEClass(CONTRACT_REFINEMENT_ANALYSIS_CONTEXT);
 		createEAttribute(contractRefinementAnalysisContextEClass, CONTRACT_REFINEMENT_ANALYSIS_CONTEXT__CHECK_ALL_WEAK_CONTRACTS);
@@ -706,8 +675,6 @@ public class CHESSContractPackageImpl extends EPackageImpl implements CHESSContr
 		createEAttribute(contractEClass, CONTRACT__LANGUAGE);
 		createEAttribute(contractEClass, CONTRACT__CONTEXT_STATEMENT);
 		createEAttribute(contractEClass, CONTRACT__ARTEFACT_STATEMENT);
-		createEReference(contractEClass, CONTRACT__CLAIM);
-		createEReference(contractEClass, CONTRACT__SUPPORTED_BY);
 
 		formalizeEClass = createEClass(FORMALIZE);
 		createEReference(formalizeEClass, FORMALIZE__BASE_ABSTRACTION);
@@ -760,11 +727,9 @@ public class CHESSContractPackageImpl extends EPackageImpl implements CHESSContr
 		UMLPackage theUMLPackage = (UMLPackage)EPackage.Registry.INSTANCE.getEPackage(UMLPackage.eNS_URI);
 		ConstraintsPackage theConstraintsPackage = (ConstraintsPackage)EPackage.Registry.INSTANCE.getEPackage(ConstraintsPackage.eNS_URI);
 		RequirementsPackage theRequirementsPackage = (RequirementsPackage)EPackage.Registry.INSTANCE.getEPackage(RequirementsPackage.eNS_URI);
-		ArgPackage theArgPackage = (ArgPackage)EPackage.Registry.INSTANCE.getEPackage(ArgPackage.eNS_URI);
 		GQAMPackage theGQAMPackage = (GQAMPackage)EPackage.Registry.INSTANCE.getEPackage(GQAMPackage.eNS_URI);
 		TypesPackage theTypesPackage = (TypesPackage)EPackage.Registry.INSTANCE.getEPackage(TypesPackage.eNS_URI);
 		BlocksPackage theBlocksPackage = (BlocksPackage)EPackage.Registry.INSTANCE.getEPackage(BlocksPackage.eNS_URI);
-		EvidencePackage theEvidencePackage = (EvidencePackage)EPackage.Registry.INSTANCE.getEPackage(EvidencePackage.eNS_URI);
 
 		// Add subpackages
 		getESubpackages().add(theDataTypesPackage);
@@ -803,7 +768,6 @@ public class CHESSContractPackageImpl extends EPackageImpl implements CHESSContr
 		initEReference(getFormalProperty_Base_Constraint(), theUMLPackage.getConstraint(), null, "base_Constraint", null, 1, 1, FormalProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEReference(getFormalProperty_Formalize(), theRequirementsPackage.getRequirement(), null, "Formalize", null, 0, -1, FormalProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEAttribute(getFormalProperty_Concern(), theDataTypesPackage.getConcerns(), "concern", null, 1, 1, FormalProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getFormalProperty_Claim(), theArgPackage.getClaim(), null, "claim", null, 0, -1, FormalProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(contractRefinementAnalysisContextEClass, ContractRefinementAnalysisContext.class, "ContractRefinementAnalysisContext", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getContractRefinementAnalysisContext_CheckAllWeakContracts(), theTypesPackage.getBoolean(), "checkAllWeakContracts", "false", 1, 1, ContractRefinementAnalysisContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
@@ -817,8 +781,6 @@ public class CHESSContractPackageImpl extends EPackageImpl implements CHESSContr
 		initEAttribute(getContract_Language(), theDataTypesPackage.getLanguages(), "Language", null, 1, 1, Contract.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEAttribute(getContract_ContextStatement(), theTypesPackage.getString(), "contextStatement", null, 0, 1, Contract.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEAttribute(getContract_ArtefactStatement(), theTypesPackage.getString(), "artefactStatement", null, 0, -1, Contract.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getContract_Claim(), theArgPackage.getClaim(), null, "claim", null, 0, -1, Contract.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getContract_SupportedBy(), theEvidencePackage.getArtefact(), null, "supportedBy", null, 0, -1, Contract.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(formalizeEClass, Formalize.class, "Formalize", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getFormalize_Base_Abstraction(), theUMLPackage.getAbstraction(), null, "base_Abstraction", null, 1, 1, Formalize.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
diff --git a/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/impl/ContractImpl.java b/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/impl/ContractImpl.java
index b6dc14927b39a8e0c894553064e6f75877c38e35..a82bd5b430132fcc899a3a5839263a2033041cd6 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/impl/ContractImpl.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/impl/ContractImpl.java
@@ -10,8 +10,6 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
 import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.opencert.evm.evidspec.evidence.Artefact;
-import org.eclipse.opencert.sam.arg.arg.Claim;
 import org.eclipse.papyrus.sysml.constraints.internal.impl.ConstraintBlockImpl;
 import org.eclipse.papyrus.sysml.requirements.Requirement;
 import org.polarsys.chess.contracts.profile.chesscontract.CHESSContractPackage;
@@ -33,8 +31,6 @@ import org.polarsys.chess.contracts.profile.chesscontract.FormalProperty;
  *   <li>{@link org.polarsys.chess.contracts.profile.chesscontract.impl.ContractImpl#getLanguage <em>Language</em>}</li>
  *   <li>{@link org.polarsys.chess.contracts.profile.chesscontract.impl.ContractImpl#getContextStatement <em>Context Statement</em>}</li>
  *   <li>{@link org.polarsys.chess.contracts.profile.chesscontract.impl.ContractImpl#getArtefactStatement <em>Artefact Statement</em>}</li>
- *   <li>{@link org.polarsys.chess.contracts.profile.chesscontract.impl.ContractImpl#getClaim <em>Claim</em>}</li>
- *   <li>{@link org.polarsys.chess.contracts.profile.chesscontract.impl.ContractImpl#getSupportedBy <em>Supported By</em>}</li>
  * </ul>
  *
  * @generated
@@ -120,26 +116,6 @@ public class ContractImpl extends ConstraintBlockImpl implements Contract {
 	 */
 	protected EList<String> artefactStatement;
 
-	/**
-	 * The cached value of the '{@link #getClaim() <em>Claim</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getClaim()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<Claim> claim;
-
-	/**
-	 * The cached value of the '{@link #getSupportedBy() <em>Supported By</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSupportedBy()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<Artefact> supportedBy;
-
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -301,30 +277,6 @@ public class ContractImpl extends ConstraintBlockImpl implements Contract {
 		return artefactStatement;
 	}
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<Claim> getClaim() {
-		if (claim == null) {
-			claim = new EObjectResolvingEList<Claim>(Claim.class, this, CHESSContractPackage.CONTRACT__CLAIM);
-		}
-		return claim;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<Artefact> getSupportedBy() {
-		if (supportedBy == null) {
-			supportedBy = new EObjectResolvingEList<Artefact>(Artefact.class, this, CHESSContractPackage.CONTRACT__SUPPORTED_BY);
-		}
-		return supportedBy;
-	}
-
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -347,10 +299,6 @@ public class ContractImpl extends ConstraintBlockImpl implements Contract {
 				return getContextStatement();
 			case CHESSContractPackage.CONTRACT__ARTEFACT_STATEMENT:
 				return getArtefactStatement();
-			case CHESSContractPackage.CONTRACT__CLAIM:
-				return getClaim();
-			case CHESSContractPackage.CONTRACT__SUPPORTED_BY:
-				return getSupportedBy();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -384,14 +332,6 @@ public class ContractImpl extends ConstraintBlockImpl implements Contract {
 				getArtefactStatement().clear();
 				getArtefactStatement().addAll((Collection<? extends String>)newValue);
 				return;
-			case CHESSContractPackage.CONTRACT__CLAIM:
-				getClaim().clear();
-				getClaim().addAll((Collection<? extends Claim>)newValue);
-				return;
-			case CHESSContractPackage.CONTRACT__SUPPORTED_BY:
-				getSupportedBy().clear();
-				getSupportedBy().addAll((Collection<? extends Artefact>)newValue);
-				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -422,12 +362,6 @@ public class ContractImpl extends ConstraintBlockImpl implements Contract {
 			case CHESSContractPackage.CONTRACT__ARTEFACT_STATEMENT:
 				getArtefactStatement().clear();
 				return;
-			case CHESSContractPackage.CONTRACT__CLAIM:
-				getClaim().clear();
-				return;
-			case CHESSContractPackage.CONTRACT__SUPPORTED_BY:
-				getSupportedBy().clear();
-				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -452,10 +386,6 @@ public class ContractImpl extends ConstraintBlockImpl implements Contract {
 				return CONTEXT_STATEMENT_EDEFAULT == null ? contextStatement != null : !CONTEXT_STATEMENT_EDEFAULT.equals(contextStatement);
 			case CHESSContractPackage.CONTRACT__ARTEFACT_STATEMENT:
 				return artefactStatement != null && !artefactStatement.isEmpty();
-			case CHESSContractPackage.CONTRACT__CLAIM:
-				return claim != null && !claim.isEmpty();
-			case CHESSContractPackage.CONTRACT__SUPPORTED_BY:
-				return supportedBy != null && !supportedBy.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/impl/FormalPropertyImpl.java b/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/impl/FormalPropertyImpl.java
index ba124334e4722ab7e1f776b7e7266370652c7826..1c0e5f336104424ac254b73c864031e00fbff7fd 100644
--- a/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/impl/FormalPropertyImpl.java
+++ b/plugins/contracts/org.polarsys.chess.contracts.profile/src/org/polarsys/chess/contracts/profile/chesscontract/impl/FormalPropertyImpl.java
@@ -13,7 +13,6 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 
 import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.opencert.sam.arg.arg.Claim;
 import org.eclipse.papyrus.sysml.requirements.Requirement;
 import org.eclipse.uml2.uml.Constraint;
 
@@ -32,7 +31,6 @@ import org.polarsys.chess.contracts.profile.chesscontract.FormalProperty;
  *   <li>{@link org.polarsys.chess.contracts.profile.chesscontract.impl.FormalPropertyImpl#getBase_Constraint <em>Base Constraint</em>}</li>
  *   <li>{@link org.polarsys.chess.contracts.profile.chesscontract.impl.FormalPropertyImpl#getFormalize <em>Formalize</em>}</li>
  *   <li>{@link org.polarsys.chess.contracts.profile.chesscontract.impl.FormalPropertyImpl#getConcern <em>Concern</em>}</li>
- *   <li>{@link org.polarsys.chess.contracts.profile.chesscontract.impl.FormalPropertyImpl#getClaim <em>Claim</em>}</li>
  * </ul>
  *
  * @generated
@@ -78,16 +76,6 @@ public class FormalPropertyImpl extends MinimalEObjectImpl.Container implements
 	 */
 	protected Concerns concern = CONCERN_EDEFAULT;
 
-	/**
-	 * The cached value of the '{@link #getClaim() <em>Claim</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getClaim()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<Claim> claim;
-
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -178,18 +166,6 @@ public class FormalPropertyImpl extends MinimalEObjectImpl.Container implements
 			eNotify(new ENotificationImpl(this, Notification.SET, CHESSContractPackage.FORMAL_PROPERTY__CONCERN, oldConcern, concern));
 	}
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<Claim> getClaim() {
-		if (claim == null) {
-			claim = new EObjectResolvingEList<Claim>(Claim.class, this, CHESSContractPackage.FORMAL_PROPERTY__CLAIM);
-		}
-		return claim;
-	}
-
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -205,8 +181,6 @@ public class FormalPropertyImpl extends MinimalEObjectImpl.Container implements
 				return getFormalize();
 			case CHESSContractPackage.FORMAL_PROPERTY__CONCERN:
 				return getConcern();
-			case CHESSContractPackage.FORMAL_PROPERTY__CLAIM:
-				return getClaim();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -230,10 +204,6 @@ public class FormalPropertyImpl extends MinimalEObjectImpl.Container implements
 			case CHESSContractPackage.FORMAL_PROPERTY__CONCERN:
 				setConcern((Concerns)newValue);
 				return;
-			case CHESSContractPackage.FORMAL_PROPERTY__CLAIM:
-				getClaim().clear();
-				getClaim().addAll((Collection<? extends Claim>)newValue);
-				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -255,9 +225,6 @@ public class FormalPropertyImpl extends MinimalEObjectImpl.Container implements
 			case CHESSContractPackage.FORMAL_PROPERTY__CONCERN:
 				setConcern(CONCERN_EDEFAULT);
 				return;
-			case CHESSContractPackage.FORMAL_PROPERTY__CLAIM:
-				getClaim().clear();
-				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -276,8 +243,6 @@ public class FormalPropertyImpl extends MinimalEObjectImpl.Container implements
 				return formalize != null && !formalize.isEmpty();
 			case CHESSContractPackage.FORMAL_PROPERTY__CONCERN:
 				return concern != CONCERN_EDEFAULT;
-			case CHESSContractPackage.FORMAL_PROPERTY__CLAIM:
-				return claim != null && !claim.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}