diff --git a/workspace/jeuexp/jeuexp.ecore b/workspace/jeuexp/jeuexp.ecore
index a2e0d2a..29031ba 100644
--- a/workspace/jeuexp/jeuexp.ecore
+++ b/workspace/jeuexp/jeuexp.ecore
@@ -34,14 +34,16 @@
         eOpposite="#//Chemin/lieu1"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="chemins2" upperBound="-1"
         eType="#//Chemin" eOpposite="#//Chemin/lieu2"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="explore" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="connaissances" upperBound="-1"
         eType="#//Connaissance" eOpposite="#//Connaissance/lieu"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="objets" upperBound="-1"
-        eType="#//Objet" eOpposite="#//Objet/lieu"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="personnes" upperBound="-1"
         eType="#//Personne" eOpposite="#//Personne/lieu"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="objets" upperBound="-1"
+        eType="#//Objet" eOpposite="#//Objet/lieu"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="explore" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="deposable" lowerBound="1"
+        eType="#//Condition"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Depart" eSuperTypes="#//Lieu"/>
   <eClassifiers xsi:type="ecore:EClass" name="Fin" eSuperTypes="#//Lieu"/>
@@ -52,26 +54,41 @@
         eOpposite="#//Lieu/chemins1"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="lieu2" lowerBound="1" eType="#//Lieu"
         eOpposite="#//Lieu/chemins2"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="objets" upperBound="-1"
+        eType="#//Objet"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="connaissances" upperBound="-1"
+        eType="#//Connaissance" eOpposite="#//Connaissance/chemin"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="objetsConso" upperBound="-1"
+        eType="#//Objet" eOpposite="#//Objet/cheminConso"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="ouvert" lowerBound="1"
         eType="#//Condition"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="visible" lowerBound="1"
         eType="#//Condition"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="obligatoire" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Objet" eSuperTypes="#//ElementJeu">
     <eStructuralFeatures xsi:type="ecore:EReference" name="explorateur" eType="#//Explorateur"
         eOpposite="#//Explorateur/objets"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="lieu" eType="#//Lieu" eOpposite="#//Lieu/objets"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="chemin" eType="#//Chemin"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="cheminConso" eType="#//Chemin"
+        eOpposite="#//Chemin/objetsConso"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="conditionObjet" upperBound="-1"
+        eType="#//ConditionObjet" eOpposite="#//ConditionObjet/objet"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="taille" lowerBound="1"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="lieu" eType="#//Lieu" eOpposite="#//Lieu/objets"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="visible" lowerBound="1"
         eType="#//Condition"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="deposable" lowerBound="1"
-        eType="#//Condition"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Connaissance" eSuperTypes="#//ElementJeu">
     <eStructuralFeatures xsi:type="ecore:EReference" name="explorateur" eType="#//Explorateur"
         eOpposite="#//Explorateur/connaissances"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="lieu" eType="#//Lieu" eOpposite="#//Lieu/connaissances"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="chemin" eType="#//Chemin"
+        eOpposite="#//Chemin/connaissances"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="conditionConnaissance"
+        upperBound="-1" eType="#//ConditionConnaissance" eOpposite="#//ConditionConnaissance/connaissance"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="visible" lowerBound="1"
         eType="#//Condition"/>
   </eClassifiers>
@@ -80,6 +97,43 @@
         eOpposite="#//Lieu/personnes"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="visible" lowerBound="1"
         eType="#//Condition"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="obligatoire" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Condition">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="conditionOu" lowerBound="1"
+        upperBound="-1" eType="#//ConditionOu" eOpposite="#//ConditionOu/condition"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="explorateur" lowerBound="1"
+        eType="#//Explorateur"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ConditionOu">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="conditionEt" lowerBound="1"
+        upperBound="-1" eType="#//ConditionEt" eOpposite="#//ConditionEt/conditionOu"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="condition" lowerBound="1"
+        eType="#//Condition" eOpposite="#//Condition/conditionOu"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ConditionEt">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="conditionTest" lowerBound="1"
+        upperBound="-1" eType="#//ConditionTest" eOpposite="#//ConditionTest/conditionEt"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="conditionOu" lowerBound="1"
+        eType="#//ConditionOu" eOpposite="#//ConditionOu/conditionEt"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ConditionTest">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="conditionEt" lowerBound="1"
+        eType="#//ConditionEt" eOpposite="#//ConditionEt/conditionTest"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ConditionConnaissance" eSuperTypes="#//ConditionTest">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="connaissance" lowerBound="1"
+        eType="#//Connaissance" eOpposite="#//Connaissance/conditionConnaissance"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="negation" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ConditionObjet" eSuperTypes="#//ConditionTest">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="objet" lowerBound="1" eType="#//Objet"
+        eOpposite="#//Objet/conditionObjet"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="nombre" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="superieurEgale" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Condition"/>
 </ecore:EPackage>