diff --git a/creole/annotator.py b/creole/annotator.py
index b88bb1dd..f16db7ed 100644
--- a/creole/annotator.py
+++ b/creole/annotator.py
@@ -484,6 +484,8 @@ class SpaceAnnotator(object):
         self.filter_separators()
         self.absolute_path_for_symlink_in_containers()
         self.convert_helps()
+        #if hasattr(self.space, 'constraints'):
+        #    print(vars(self.space.constraints))
 
     def absolute_path_for_symlink_in_containers(self):
         if not hasattr(self.space, 'containers'):
@@ -758,7 +760,7 @@ class SpaceAnnotator(object):
                                         is_follower = True
                                     else:
                                         is_follower = False
-                                    path = '{}.{}.{}.{}'.format(variables.name, family.name, variable.name, follower.name)
+                                    path = '{}.{}.{}'.format(family.path, variable.name, follower.name)
                                     self._annotate_variable(follower, family_mode, path, is_follower)
                                     if HIGH_COMPATIBILITY:
                                         # leader's variable are right
@@ -781,7 +783,7 @@ class SpaceAnnotator(object):
                                 # auto_freeze's variable is set in 'basic' mode if its mode is 'normal'
                                 if variable.auto_freeze is True and variable.mode != modes_level[-1]:
                                     variable.mode = modes_level[0]
-                                path = '{}.{}.{}'.format(variables.name, family.name, variable.name)
+                                path = '{}.{}'.format(family.path, variable.name)
                                 self._annotate_variable(variable, family_mode, path)
 
     def get_variable(self, name):  # pylint: disable=C0111
@@ -1103,6 +1105,18 @@ class SpaceAnnotator(object):
         del_idx.sort(reverse=True)
         for idx in del_idx:
             space.constraints.fill.pop(idx)
+        for fill in space.constraints.fill:
+            variable = self.paths.get_variable_obj(fill.target)
+            value = self.objectspace.value()
+            value.type = 'calculation'
+            value.name = fill.name
+            if hasattr(fill, 'param'):
+                value.param = fill.param
+            if not hasattr(variable, 'value'):
+                variable.value = []
+            variable.value.append(value)
+            self.force_not_mandatory.append(fill.target)
+        del space.constraints.fill
 
     def filter_targets(self):  # pylint: disable=C0111
         for condition_idx, condition in enumerate(self.space.constraints.condition):
diff --git a/creole/objspace.py b/creole/objspace.py
index 9fee9767..ae39d8de 100644
--- a/creole/objspace.py
+++ b/creole/objspace.py
@@ -506,7 +506,7 @@ class CreoleObjSpace(object):
             if not attr.startswith('_'):
                 yield attr
 
-    def _sub_xml_export(self, name, node, node_name, space):
+    def _sub_xml_export(self, name, node, node_name, space, current_space):
         if isinstance(space, dict):
             space = list(space.values())
         if isinstance(space, list):
@@ -533,13 +533,13 @@ class CreoleObjSpace(object):
                 child_node = SubElement(node, name)
             for subname in self._get_attributes(space):
                 subspace = getattr(space, subname)
-                self._sub_xml_export(subname, child_node, name, subspace)
+                self._sub_xml_export(subname, child_node, name, subspace, space)
         elif isinstance(space, self.Redefinable):
             child_node = SubElement(node, 'family')
             child_node.attrib['name'] = name
             for subname in self._get_attributes(space):
                 subspace = getattr(space, subname)
-                self._sub_xml_export(subname, child_node, name, subspace)
+                self._sub_xml_export(subname, child_node, name, subspace, space)
         else:
             # FIXME plutot dans annotator ...
             if name in PROPERTIES and node.tag in ['variable', 'family', 'leader']:
@@ -548,7 +548,7 @@ class CreoleObjSpace(object):
                         SubElement(node, 'property').text = prop
 
             elif name not in ERASED_ATTRIBUTES:
-                if name == 'name' and node_name in self.forced_text_elts_as_name:
+                if name == 'name' and node_name in self.forced_text_elts_as_name and not hasattr(current_space, 'param'):
                     if isinstance(space, str):
                         node.text = space
                     else:
@@ -571,7 +571,7 @@ class CreoleObjSpace(object):
     def _xml_export(self, node, space, node_name='creole'):
         for name in self._get_attributes(space):
             subspace = getattr(space, name)
-            self._sub_xml_export(name, node, node_name, subspace)
+            self._sub_xml_export(name, node, node_name, subspace, space)
 
 
 class Path(object):
@@ -683,10 +683,9 @@ class Path(object):
     def _get_variable(self, name):
         if name not in self.variables:
             if name.startswith('creole.'):
-                raise CreoleDictConsistencyError(
-                        _("don't set full path variable in creole's namespace "
-                          "(set '{}' not '{}')").format(name.split('.')[-1], name))
-            raise CreoleDictConsistencyError(_('unknown option {}').format(name))
+                name = name.split('.')[-1]
+            if name not in self.variables:
+                raise CreoleDictConsistencyError(_('unknown option {}').format(name))
         return self.variables[name]
 
     def get_leader(self, name):  # pylint: disable=C0111
diff --git a/tests/flattener_dicos/01auto_base/result/00-base.xml b/tests/flattener_dicos/01auto_base/result/00-base.xml
index 8a6bdf38..1fe6c98d 100644
--- a/tests/flattener_dicos/01auto_base/result/00-base.xml
+++ b/tests/flattener_dicos/01auto_base/result/00-base.xml
@@ -1,10 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <creole>
-  <constraints>
-    <fill name="calc_val" target="creole.general.mode_conteneur_actif">
-      <param hidden="True" type="eole">creole.general.mode_conteneur_actif1</param>
-    </fill>
-  </constraints>
+  <constraints/>
   <family doc="" name="creole">
     <family doc="general" name="general">
       <property>normal</property>
@@ -16,6 +12,9 @@
         <property>hidden</property>
         <property>mandatory</property>
         <property>normal</property>
+        <value name="calc_val" type="calculation">
+          <param hidden="True" type="eole">creole.general.mode_conteneur_actif1</param>
+        </value>
       </variable>
       <variable doc="No change" multi="False" name="mode_conteneur_actif1" type="choice">
         <choice type="string">oui</choice>
diff --git a/tests/flattener_dicos/01auto_withoutparam/result/00-base.xml b/tests/flattener_dicos/01auto_withoutparam/result/00-base.xml
index ab2ea9b7..c9777ed9 100644
--- a/tests/flattener_dicos/01auto_withoutparam/result/00-base.xml
+++ b/tests/flattener_dicos/01auto_withoutparam/result/00-base.xml
@@ -1,8 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <creole>
-  <constraints>
-    <fill name="calc_val" target="creole.general.mode_conteneur_actif"/>
-  </constraints>
+  <constraints/>
   <family doc="" name="creole">
     <family doc="general" name="general">
       <property>normal</property>
@@ -14,6 +12,7 @@
         <property>hidden</property>
         <property>mandatory</property>
         <property>normal</property>
+        <value type="calculation">calc_val</value>
       </variable>
       <variable doc="No change" multi="False" name="mode_conteneur_actif1" type="choice">
         <choice type="string">oui</choice>
diff --git a/tests/flattener_dicos/01fill_autofreeze/result/00-base.xml b/tests/flattener_dicos/01fill_autofreeze/result/00-base.xml
index 297e3014..0b2dab27 100644
--- a/tests/flattener_dicos/01fill_autofreeze/result/00-base.xml
+++ b/tests/flattener_dicos/01fill_autofreeze/result/00-base.xml
@@ -1,10 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <creole>
-  <constraints>
-    <fill name="calc_val" target="creole.general.mode_conteneur_actif">
-      <param hidden="True" type="eole">creole.general.mode_conteneur_actif1</param>
-    </fill>
-  </constraints>
+  <constraints/>
   <family doc="" name="creole">
     <family doc="general" name="general">
       <property>basic</property>
@@ -16,6 +12,9 @@
         <property>mandatory</property>
         <property>basic</property>
         <property expected="oui" inverse="True" source="creole.general.module_instancie" type="calculation">auto_frozen</property>
+        <value name="calc_val" type="calculation">
+          <param hidden="True" type="eole">creole.general.mode_conteneur_actif1</param>
+        </value>
       </variable>
       <variable doc="No change" multi="False" name="mode_conteneur_actif1" type="choice">
         <choice type="string">oui</choice>
diff --git a/tests/flattener_dicos/01fill_autosave/result/00-base.xml b/tests/flattener_dicos/01fill_autosave/result/00-base.xml
index d1894352..d23f21b2 100644
--- a/tests/flattener_dicos/01fill_autosave/result/00-base.xml
+++ b/tests/flattener_dicos/01fill_autosave/result/00-base.xml
@@ -1,10 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <creole>
-  <constraints>
-    <fill name="calc_val" target="creole.general.mode_conteneur_actif">
-      <param hidden="True" type="eole">creole.general.mode_conteneur_actif1</param>
-    </fill>
-  </constraints>
+  <constraints/>
   <family doc="" name="creole">
     <family doc="general" name="general">
       <property>basic</property>
@@ -14,6 +10,9 @@
         <choice type="string">non</choice>
         <property>mandatory</property>
         <property>basic</property>
+        <value name="calc_val" type="calculation">
+          <param hidden="True" type="eole">creole.general.mode_conteneur_actif1</param>
+        </value>
       </variable>
       <variable doc="No change" multi="False" name="mode_conteneur_actif1" type="choice">
         <choice type="string">oui</choice>
diff --git a/tests/flattener_dicos/01fill_base/result/00-base.xml b/tests/flattener_dicos/01fill_base/result/00-base.xml
index 8a6bdf38..1fe6c98d 100644
--- a/tests/flattener_dicos/01fill_base/result/00-base.xml
+++ b/tests/flattener_dicos/01fill_base/result/00-base.xml
@@ -1,10 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <creole>
-  <constraints>
-    <fill name="calc_val" target="creole.general.mode_conteneur_actif">
-      <param hidden="True" type="eole">creole.general.mode_conteneur_actif1</param>
-    </fill>
-  </constraints>
+  <constraints/>
   <family doc="" name="creole">
     <family doc="general" name="general">
       <property>normal</property>
@@ -16,6 +12,9 @@
         <property>hidden</property>
         <property>mandatory</property>
         <property>normal</property>
+        <value name="calc_val" type="calculation">
+          <param hidden="True" type="eole">creole.general.mode_conteneur_actif1</param>
+        </value>
       </variable>
       <variable doc="No change" multi="False" name="mode_conteneur_actif1" type="choice">
         <choice type="string">oui</choice>
diff --git a/tests/flattener_dicos/01fill_baseaccent/result/00-base.xml b/tests/flattener_dicos/01fill_baseaccent/result/00-base.xml
index 2451756b..679157e3 100644
--- a/tests/flattener_dicos/01fill_baseaccent/result/00-base.xml
+++ b/tests/flattener_dicos/01fill_baseaccent/result/00-base.xml
@@ -1,10 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <creole>
-  <constraints>
-    <fill name="calc_val" target="creole.general.mode_conteneur_actif">
-      <param hidden="True" type="eole">creole.general.mode_conteneur_actif1</param>
-    </fill>
-  </constraints>
+  <constraints/>
   <family doc="" name="creole">
     <family doc="Général" name="general">
       <property>normal</property>
@@ -16,6 +12,9 @@
         <property>hidden</property>
         <property>mandatory</property>
         <property>normal</property>
+        <value name="calc_val" type="calculation">
+          <param hidden="True" type="eole">creole.general.mode_conteneur_actif1</param>
+        </value>
       </variable>
       <variable doc="No change" multi="False" name="mode_conteneur_actif1" type="choice">
         <choice type="string">oui</choice>
diff --git a/tests/flattener_dicos/01fill_context/result/00-base.xml b/tests/flattener_dicos/01fill_context/result/00-base.xml
index 75a97278..ca5b9d3c 100644
--- a/tests/flattener_dicos/01fill_context/result/00-base.xml
+++ b/tests/flattener_dicos/01fill_context/result/00-base.xml
@@ -1,11 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <creole>
-  <constraints>
-    <fill name="get_zone_name_bridge" target="creole.general.mode_conteneur_actif1">
-      <param hidden="True" name="nom_carte" type="eole">creole.general.mode_conteneur_actif</param>
-      <param hidden="True" name="context" type="context"/>
-    </fill>
-  </constraints>
+  <constraints/>
   <family doc="" name="creole">
     <family doc="general" name="general">
       <property>normal</property>
@@ -24,6 +19,10 @@
         <choice type="string">non</choice>
         <property>mandatory</property>
         <property>normal</property>
+        <value name="get_zone_name_bridge" type="calculation">
+          <param hidden="True" name="nom_carte" type="eole">creole.general.mode_conteneur_actif</param>
+          <param hidden="True" name="context" type="context"/>
+        </value>
       </variable>
     </family>
     <separators/>
diff --git a/tests/flattener_dicos/01fill_mandatory/result/00-base.xml b/tests/flattener_dicos/01fill_mandatory/result/00-base.xml
index a8518a94..2d8390e1 100644
--- a/tests/flattener_dicos/01fill_mandatory/result/00-base.xml
+++ b/tests/flattener_dicos/01fill_mandatory/result/00-base.xml
@@ -1,16 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <creole>
-  <constraints>
-    <fill name="calc_val" target="creole.general.mode_conteneur_actif">
-      <param hidden="True" type="eole">creole.general.mode_conteneur_actif1</param>
-    </fill>
-  </constraints>
+  <constraints/>
   <family doc="" name="creole">
     <family doc="general" name="general">
       <property>normal</property>
       <variable doc="No change" multi="False" name="mode_conteneur_actif" type="domain">
         <property>mandatory</property>
         <property>expert</property>
+        <value name="calc_val" type="calculation">
+          <param hidden="True" type="eole">creole.general.mode_conteneur_actif1</param>
+        </value>
       </variable>
       <variable doc="No change" multi="False" name="mode_conteneur_actif1" type="choice">
         <choice type="string">oui</choice>
diff --git a/tests/flattener_dicos/01fill_number/result/00-base.xml b/tests/flattener_dicos/01fill_number/result/00-base.xml
index 26908e3b..cfc2e968 100644
--- a/tests/flattener_dicos/01fill_number/result/00-base.xml
+++ b/tests/flattener_dicos/01fill_number/result/00-base.xml
@@ -1,10 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <creole>
-  <constraints>
-    <fill name="calc_val" target="creole.general.mode_conteneur_actif">
-      <param hidden="True" type="number">3</param>
-    </fill>
-  </constraints>
+  <constraints/>
   <family doc="" name="creole">
     <family doc="general" name="general">
       <property>normal</property>
@@ -13,6 +9,9 @@
         <property>frozen</property>
         <property>hidden</property>
         <property>normal</property>
+        <value name="calc_val" type="calculation">
+          <param hidden="True" type="number">3</param>
+        </value>
       </variable>
       <variable doc="No change" multi="False" name="mode_conteneur_actif1" type="choice">
         <choice type="string">oui</choice>
diff --git a/tests/flattener_dicos/01fill_optional/result/00-base.xml b/tests/flattener_dicos/01fill_optional/result/00-base.xml
index 8a6bdf38..1fe6c98d 100644
--- a/tests/flattener_dicos/01fill_optional/result/00-base.xml
+++ b/tests/flattener_dicos/01fill_optional/result/00-base.xml
@@ -1,10 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <creole>
-  <constraints>
-    <fill name="calc_val" target="creole.general.mode_conteneur_actif">
-      <param hidden="True" type="eole">creole.general.mode_conteneur_actif1</param>
-    </fill>
-  </constraints>
+  <constraints/>
   <family doc="" name="creole">
     <family doc="general" name="general">
       <property>normal</property>
@@ -16,6 +12,9 @@
         <property>hidden</property>
         <property>mandatory</property>
         <property>normal</property>
+        <value name="calc_val" type="calculation">
+          <param hidden="True" type="eole">creole.general.mode_conteneur_actif1</param>
+        </value>
       </variable>
       <variable doc="No change" multi="False" name="mode_conteneur_actif1" type="choice">
         <choice type="string">oui</choice>
diff --git a/tests/flattener_dicos/10autosave_hidden/result/00-base.xml b/tests/flattener_dicos/10autosave_hidden/result/00-base.xml
index bd05adbd..3e85188e 100644
--- a/tests/flattener_dicos/10autosave_hidden/result/00-base.xml
+++ b/tests/flattener_dicos/10autosave_hidden/result/00-base.xml
@@ -1,10 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <creole>
-  <constraints>
-    <fill name="calc_val" target="creole.general.autosavevar">
-      <param hidden="True" type="string">oui</param>
-    </fill>
-  </constraints>
+  <constraints/>
   <family doc="" name="creole">
     <family doc="général" name="general">
       <property>basic</property>
@@ -23,6 +19,9 @@
         <property>frozen</property>
         <property>hidden</property>
         <property>basic</property>
+        <value name="calc_val" type="calculation">
+          <param hidden="True" type="string">oui</param>
+        </value>
       </variable>
     </family>
     <separators/>
diff --git a/tests/flattener_dicos/10autosave_hidden_frozenifin/result/00-base.xml b/tests/flattener_dicos/10autosave_hidden_frozenifin/result/00-base.xml
index f2c44471..345adf14 100644
--- a/tests/flattener_dicos/10autosave_hidden_frozenifin/result/00-base.xml
+++ b/tests/flattener_dicos/10autosave_hidden_frozenifin/result/00-base.xml
@@ -1,10 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <creole>
-  <constraints>
-    <fill name="calc_val" target="creole.general.autosavevar">
-      <param hidden="True" type="string">oui</param>
-    </fill>
-  </constraints>
+  <constraints/>
   <family doc="" name="creole">
     <family doc="général" name="general">
       <property>basic</property>
@@ -24,6 +20,9 @@
         <property expected="oui" inverse="False" source="creole.general.mode_conteneur_actif" type="calculation">frozen</property>
         <property expected="oui" inverse="False" source="creole.general.mode_conteneur_actif" type="calculation">hidden</property>
         <property expected="oui" inverse="False" source="creole.general.mode_conteneur_actif" type="calculation">force_default_on_freeze</property>
+        <value name="calc_val" type="calculation">
+          <param hidden="True" type="string">oui</param>
+        </value>
       </variable>
     </family>
     <separators/>
diff --git a/tests/flattener_dicos/10load_frozenifin_auto/result/00-base.xml b/tests/flattener_dicos/10load_frozenifin_auto/result/00-base.xml
index 1b11a8a2..db4fae95 100644
--- a/tests/flattener_dicos/10load_frozenifin_auto/result/00-base.xml
+++ b/tests/flattener_dicos/10load_frozenifin_auto/result/00-base.xml
@@ -1,10 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <creole>
-  <constraints>
-    <fill name="calc_val" target="creole.general.mode_conteneur_actif">
-      <param hidden="True" type="string">non</param>
-    </fill>
-  </constraints>
+  <constraints/>
   <family doc="" name="creole">
     <family doc="general" name="general">
       <property>normal</property>
@@ -23,6 +19,9 @@
         <property expected="oui" inverse="False" source="creole.general.condition" type="calculation">frozen</property>
         <property expected="oui" inverse="False" source="creole.general.condition" type="calculation">hidden</property>
         <property expected="oui" inverse="False" source="creole.general.condition" type="calculation">force_default_on_freeze</property>
+        <value name="calc_val" type="calculation">
+          <param hidden="True" type="string">non</param>
+        </value>
       </variable>
       <variable doc="No change" multi="False" name="mode_conteneur_actif2" type="choice">
         <choice type="string">oui</choice>
diff --git a/tests/flattener_dicos/10load_masterslaves/result/00-base.xml b/tests/flattener_dicos/10load_masterslaves/result/00-base.xml
index 08aa929b..c1967d8d 100644
--- a/tests/flattener_dicos/10load_masterslaves/result/00-base.xml
+++ b/tests/flattener_dicos/10load_masterslaves/result/00-base.xml
@@ -1,13 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <creole>
-  <constraints>
-    <fill name="calc_val" target="creole.general1.master.slave1">
-      <param hidden="True" name="valeur" type="string">valfill</param>
-    </fill>
-    <fill name="calc_val" target="creole.general1.master.slave2">
-      <param hidden="True" type="eole">creole.general1.master.slave1</param>
-    </fill>
-  </constraints>
+  <constraints/>
   <family doc="" name="creole">
     <family doc="general" name="general">
       <property>normal</property>
@@ -26,9 +19,15 @@
         <variable doc="master" multi="True" name="master" type="string"/>
         <variable doc="slave1" multi="True" name="slave1" type="string">
           <property>normal</property>
+          <value name="calc_val" type="calculation">
+            <param hidden="True" name="valeur" type="string">valfill</param>
+          </value>
         </variable>
         <variable doc="slave2" multi="True" name="slave2" type="string">
           <property>normal</property>
+          <value name="calc_val" type="calculation">
+            <param hidden="True" type="eole">creole.general1.master.slave1</param>
+          </value>
         </variable>
       </leader>
     </family>
diff --git a/tests/flattener_dicos/10masterslave_autosaveexpert/result/00-base.xml b/tests/flattener_dicos/10masterslave_autosaveexpert/result/00-base.xml
index 08467004..9c3e5855 100644
--- a/tests/flattener_dicos/10masterslave_autosaveexpert/result/00-base.xml
+++ b/tests/flattener_dicos/10masterslave_autosaveexpert/result/00-base.xml
@@ -1,13 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <creole>
-  <constraints>
-    <fill name="calc_val" target="creole.general.master.slave1">
-      <param hidden="True" name="valeur" type="string">valfill</param>
-    </fill>
-    <fill name="calc_val" target="creole.general.master.slave2">
-      <param hidden="True" type="eole">creole.general.master.slave1</param>
-    </fill>
-  </constraints>
+  <constraints/>
   <family doc="" name="creole">
     <family doc="general" name="general">
       <property>normal</property>
@@ -23,9 +16,15 @@
         <variable doc="master" multi="True" name="master" type="string"/>
         <variable doc="slave1" multi="True" name="slave1" type="string">
           <property>normal</property>
+          <value name="calc_val" type="calculation">
+            <param hidden="True" name="valeur" type="string">valfill</param>
+          </value>
         </variable>
         <variable doc="slave2" multi="True" name="slave2" type="string">
           <property>expert</property>
+          <value name="calc_val" type="calculation">
+            <param hidden="True" type="eole">creole.general.master.slave1</param>
+          </value>
         </variable>
       </leader>
     </family>
diff --git a/tests/flattener_dicos/10masterslave_mandatory/result/00-base.xml b/tests/flattener_dicos/10masterslave_mandatory/result/00-base.xml
index 0b255b83..39781ec2 100644
--- a/tests/flattener_dicos/10masterslave_mandatory/result/00-base.xml
+++ b/tests/flattener_dicos/10masterslave_mandatory/result/00-base.xml
@@ -1,13 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <creole>
-  <constraints>
-    <fill name="calc_val" target="creole.general.master.slave1">
-      <param hidden="True" name="valeur" type="string">valfill</param>
-    </fill>
-    <fill name="calc_val" target="creole.general.master.slave2">
-      <param hidden="True" type="eole">creole.general.master.slave1</param>
-    </fill>
-  </constraints>
+  <constraints/>
   <family doc="" name="creole">
     <family doc="general" name="general">
       <property>normal</property>
@@ -24,9 +17,15 @@
         <variable doc="slave1" multi="True" name="slave1" type="string">
           <property>mandatory</property>
           <property>normal</property>
+          <value name="calc_val" type="calculation">
+            <param hidden="True" name="valeur" type="string">valfill</param>
+          </value>
         </variable>
         <variable doc="slave2" multi="True" name="slave2" type="string">
           <property>normal</property>
+          <value name="calc_val" type="calculation">
+            <param hidden="True" type="eole">creole.general.master.slave1</param>
+          </value>
         </variable>
       </leader>
     </family>
diff --git a/tests/flattener_dicos/10masterslave_mastermandatory/result/00-base.xml b/tests/flattener_dicos/10masterslave_mastermandatory/result/00-base.xml
index 1da4e93b..532fb64a 100644
--- a/tests/flattener_dicos/10masterslave_mastermandatory/result/00-base.xml
+++ b/tests/flattener_dicos/10masterslave_mastermandatory/result/00-base.xml
@@ -1,13 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <creole>
-  <constraints>
-    <fill name="calc_val" target="creole.general.master.slave1">
-      <param hidden="True" name="valeur" type="string">valfill</param>
-    </fill>
-    <fill name="calc_val" target="creole.general.master.slave2">
-      <param hidden="True" type="eole">creole.general.master.slave1</param>
-    </fill>
-  </constraints>
+  <constraints/>
   <family doc="" name="creole">
     <family doc="general" name="general">
       <property>basic</property>
@@ -25,9 +18,15 @@
         </variable>
         <variable doc="slave1" multi="True" name="slave1" type="string">
           <property>normal</property>
+          <value name="calc_val" type="calculation">
+            <param hidden="True" name="valeur" type="string">valfill</param>
+          </value>
         </variable>
         <variable doc="slave2" multi="True" name="slave2" type="string">
           <property>normal</property>
+          <value name="calc_val" type="calculation">
+            <param hidden="True" type="eole">creole.general.master.slave1</param>
+          </value>
         </variable>
       </leader>
     </family>
diff --git a/tests/flattener_dicos/10masterslave_multi/result/00-base.xml b/tests/flattener_dicos/10masterslave_multi/result/00-base.xml
index c0450acd..7053a6fb 100644
--- a/tests/flattener_dicos/10masterslave_multi/result/00-base.xml
+++ b/tests/flattener_dicos/10masterslave_multi/result/00-base.xml
@@ -1,13 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <creole>
-  <constraints>
-    <fill name="calc_val" target="creole.general1.master.slave1">
-      <param hidden="True" name="valeur" type="string">valfill</param>
-    </fill>
-    <fill name="calc_val" target="creole.general1.master.slave2">
-      <param hidden="True" type="eole">creole.general1.master.slave1</param>
-    </fill>
-  </constraints>
+  <constraints/>
   <family doc="" name="creole">
     <family doc="general" name="general">
       <property>normal</property>
@@ -26,9 +19,15 @@
         <variable doc="master" multi="True" name="master" type="string"/>
         <variable doc="slave1" multi="True" name="slave1" type="string">
           <property>normal</property>
+          <value name="calc_val" type="calculation">
+            <param hidden="True" name="valeur" type="string">valfill</param>
+          </value>
         </variable>
         <variable doc="slave2" multi="True" name="slave2" type="string">
           <property>normal</property>
+          <value name="calc_val" type="calculation">
+            <param hidden="True" type="eole">creole.general1.master.slave1</param>
+          </value>
         </variable>
       </leader>
       <leader doc="master" name="master1">
diff --git a/tests/flattener_dicos/10masterslaves_append/result/00-base.xml b/tests/flattener_dicos/10masterslaves_append/result/00-base.xml
index 83f3edcd..db3115ca 100644
--- a/tests/flattener_dicos/10masterslaves_append/result/00-base.xml
+++ b/tests/flattener_dicos/10masterslaves_append/result/00-base.xml
@@ -1,13 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <creole>
-  <constraints>
-    <fill name="calc_val" target="creole.general1.master.slave1">
-      <param hidden="True" name="valeur" type="string">valfill</param>
-    </fill>
-    <fill name="calc_val" target="creole.general1.master.slave2">
-      <param hidden="True" type="eole">creole.general1.master.slave1</param>
-    </fill>
-  </constraints>
+  <constraints/>
   <family doc="" name="creole">
     <family doc="general" name="general">
       <property>normal</property>
@@ -26,9 +19,15 @@
         <variable doc="master" multi="True" name="master" type="string"/>
         <variable doc="slave1" multi="True" name="slave1" type="string">
           <property>normal</property>
+          <value name="calc_val" type="calculation">
+            <param hidden="True" name="valeur" type="string">valfill</param>
+          </value>
         </variable>
         <variable doc="slave2" multi="True" name="slave2" type="string">
           <property>normal</property>
+          <value name="calc_val" type="calculation">
+            <param hidden="True" type="eole">creole.general1.master.slave1</param>
+          </value>
         </variable>
         <variable doc="slave3" multi="True" name="slave3" type="string">
           <property>normal</property>
diff --git a/tests/flattener_dicos/10masterslaves_auto/result/00-base.xml b/tests/flattener_dicos/10masterslaves_auto/result/00-base.xml
index 827e0db8..83e72bad 100644
--- a/tests/flattener_dicos/10masterslaves_auto/result/00-base.xml
+++ b/tests/flattener_dicos/10masterslaves_auto/result/00-base.xml
@@ -1,16 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <creole>
-  <constraints>
-    <fill name="calc_val" target="creole.general.master.slave1">
-      <param hidden="True" name="valeur" type="string">valfill</param>
-    </fill>
-    <fill name="calc_val" target="creole.general.master.slave2">
-      <param hidden="True" type="eole">creole.general.master.slave1</param>
-    </fill>
-    <fill name="calc_val" target="creole.general.master.slave3">
-      <param hidden="True" type="eole">creole.general.master.master</param>
-    </fill>
-  </constraints>
+  <constraints/>
   <family doc="" name="creole">
     <family doc="general" name="general">
       <property>normal</property>
@@ -29,18 +19,27 @@
           <property>frozen</property>
           <property>hidden</property>
           <property>normal</property>
+          <value name="calc_val" type="calculation">
+            <param hidden="True" name="valeur" type="string">valfill</param>
+          </value>
         </variable>
         <variable doc="slave2" multi="True" name="slave2" type="string">
           <property>force_default_on_freeze</property>
           <property>frozen</property>
           <property>hidden</property>
           <property>normal</property>
+          <value name="calc_val" type="calculation">
+            <param hidden="True" type="eole">creole.general.master.slave1</param>
+          </value>
         </variable>
         <variable doc="slave3" multi="True" name="slave3" type="string">
           <property>force_default_on_freeze</property>
           <property>frozen</property>
           <property>hidden</property>
           <property>normal</property>
+          <value name="calc_val" type="calculation">
+            <param hidden="True" type="eole">creole.general.master.master</param>
+          </value>
         </variable>
       </leader>
     </family>
diff --git a/tests/flattener_dicos/10masterslaves_automaster/result/00-base.xml b/tests/flattener_dicos/10masterslaves_automaster/result/00-base.xml
index c1d158f0..ac787a61 100644
--- a/tests/flattener_dicos/10masterslaves_automaster/result/00-base.xml
+++ b/tests/flattener_dicos/10masterslaves_automaster/result/00-base.xml
@@ -1,13 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <creole>
-  <constraints>
-    <fill name="calc_val" target="creole.general.master.slave1">
-      <param hidden="True" name="valeur" type="string">valfill</param>
-    </fill>
-    <fill name="calc_val" target="creole.general.master.slave2">
-      <param hidden="True" type="eole">creole.general.master.master</param>
-    </fill>
-  </constraints>
+  <constraints/>
   <family doc="" name="creole">
     <family doc="general" name="general">
       <property>normal</property>
@@ -26,12 +19,18 @@
           <property>frozen</property>
           <property>hidden</property>
           <property>normal</property>
+          <value name="calc_val" type="calculation">
+            <param hidden="True" name="valeur" type="string">valfill</param>
+          </value>
         </variable>
         <variable doc="slave2" multi="True" name="slave2" type="string">
           <property>force_default_on_freeze</property>
           <property>frozen</property>
           <property>hidden</property>
           <property>normal</property>
+          <value name="calc_val" type="calculation">
+            <param hidden="True" type="eole">creole.general.master.master</param>
+          </value>
         </variable>
       </leader>
     </family>
diff --git a/tests/flattener_dicos/10masterslaves_automaster_expert/result/00-base.xml b/tests/flattener_dicos/10masterslaves_automaster_expert/result/00-base.xml
index 360c7da2..4eecad74 100644
--- a/tests/flattener_dicos/10masterslaves_automaster_expert/result/00-base.xml
+++ b/tests/flattener_dicos/10masterslaves_automaster_expert/result/00-base.xml
@@ -1,10 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <creole>
-  <constraints>
-    <fill name="calc_val" target="creole.mastermode.master.master">
-      <param hidden="True" name="valeur" type="string">valfill</param>
-    </fill>
-  </constraints>
+  <constraints/>
   <family doc="" name="creole">
     <family doc="general" name="general">
       <property>expert</property>
@@ -24,6 +20,9 @@
         <variable doc="master" multi="True" name="master" type="string">
           <property>force_default_on_freeze</property>
           <property>frozen</property>
+          <value name="calc_val" type="calculation">
+            <param hidden="True" name="valeur" type="string">valfill</param>
+          </value>
         </variable>
         <variable doc="slave1" multi="True" name="slave1" type="string">
           <property>expert</property>
diff --git a/tests/flattener_dicos/10masterslaves_familyaccent/result/00-base.xml b/tests/flattener_dicos/10masterslaves_familyaccent/result/00-base.xml
index 6e5279ca..1073a8d0 100644
--- a/tests/flattener_dicos/10masterslaves_familyaccent/result/00-base.xml
+++ b/tests/flattener_dicos/10masterslaves_familyaccent/result/00-base.xml
@@ -1,13 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <creole>
-  <constraints>
-    <fill name="calc_val" target="creole.general.master.slave1">
-      <param hidden="True" name="valeur" type="string">valfill</param>
-    </fill>
-    <fill name="calc_val" target="creole.general.master.slave2">
-      <param hidden="True" type="eole">creole.general.master.slave1</param>
-    </fill>
-  </constraints>
+  <constraints/>
   <family doc="" name="creole">
     <family doc="Général" name="general">
       <property>normal</property>
@@ -23,9 +16,15 @@
         <variable doc="master" multi="True" name="master" type="string"/>
         <variable doc="slave1" multi="True" name="slave1" type="string">
           <property>normal</property>
+          <value name="calc_val" type="calculation">
+            <param hidden="True" name="valeur" type="string">valfill</param>
+          </value>
         </variable>
         <variable doc="slave2" multi="True" name="slave2" type="string">
           <property>normal</property>
+          <value name="calc_val" type="calculation">
+            <param hidden="True" type="eole">creole.general.master.slave1</param>
+          </value>
         </variable>
       </leader>
     </family>
diff --git a/tests/flattener_dicos/30mandatory_withoutvaluecalc/result/00-base.xml b/tests/flattener_dicos/30mandatory_withoutvaluecalc/result/00-base.xml
index af6502d9..4d9c0d83 100644
--- a/tests/flattener_dicos/30mandatory_withoutvaluecalc/result/00-base.xml
+++ b/tests/flattener_dicos/30mandatory_withoutvaluecalc/result/00-base.xml
@@ -1,10 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <creole>
-  <constraints>
-    <fill name="calc_val" target="creole.general.mode_conteneur_actif">
-      <param hidden="True" type="string">value</param>
-    </fill>
-  </constraints>
+  <constraints/>
   <family doc="" name="creole">
     <family doc="general" name="general">
       <property>normal</property>
@@ -13,6 +9,9 @@
         <property>frozen</property>
         <property>hidden</property>
         <property>normal</property>
+        <value name="calc_val" type="calculation">
+          <param hidden="True" type="string">value</param>
+        </value>
       </variable>
     </family>
     <separators/>
diff --git a/tests/flattener_dicos/30mandatory_withvaluecalc/result/00-base.xml b/tests/flattener_dicos/30mandatory_withvaluecalc/result/00-base.xml
index 623573f4..05b9531a 100644
--- a/tests/flattener_dicos/30mandatory_withvaluecalc/result/00-base.xml
+++ b/tests/flattener_dicos/30mandatory_withvaluecalc/result/00-base.xml
@@ -1,15 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <creole>
-  <constraints>
-    <fill name="calc_val" target="creole.general.mode_conteneur_actif">
-      <param hidden="True" type="string">value</param>
-    </fill>
-  </constraints>
+  <constraints/>
   <family doc="" name="creole">
     <family doc="general" name="general">
       <property>normal</property>
       <variable doc="No change" multi="False" name="mode_conteneur_actif" type="string">
         <property>normal</property>
+        <value name="calc_val" type="calculation">
+          <param hidden="True" type="string">value</param>
+        </value>
       </variable>
     </family>
     <separators/>
diff --git a/tests/flattener_dicos/40ifin_masterslavesauto/result/00-base.xml b/tests/flattener_dicos/40ifin_masterslavesauto/result/00-base.xml
index 15fee664..70af7e56 100644
--- a/tests/flattener_dicos/40ifin_masterslavesauto/result/00-base.xml
+++ b/tests/flattener_dicos/40ifin_masterslavesauto/result/00-base.xml
@@ -1,10 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <creole>
-  <constraints>
-    <fill name="calc_val" target="creole.general.master.slave1">
-      <param hidden="True" name="valeur" type="string">valfill</param>
-    </fill>
-  </constraints>
+  <constraints/>
   <family doc="" name="creole">
     <family doc="general" name="general">
       <property>normal</property>
@@ -31,6 +27,9 @@
           <property>hidden</property>
           <property>normal</property>
           <property expected="oui" inverse="False" source="creole.general.condition" type="calculation">disabled</property>
+          <value name="calc_val" type="calculation">
+            <param hidden="True" name="valeur" type="string">valfill</param>
+          </value>
         </variable>
         <variable doc="slave2" multi="True" name="slave2" type="string">
           <property>normal</property>
diff --git a/tests/flattener_dicos/51redefine_auto/result/00-base.xml b/tests/flattener_dicos/51redefine_auto/result/00-base.xml
index cce7635e..5a80ad8f 100644
--- a/tests/flattener_dicos/51redefine_auto/result/00-base.xml
+++ b/tests/flattener_dicos/51redefine_auto/result/00-base.xml
@@ -1,10 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <creole>
-  <constraints>
-    <fill name="concat" target="creole.general.mode_conteneur_actif">
-      <param hidden="True" name="valeur" type="string">non</param>
-    </fill>
-  </constraints>
+  <constraints/>
   <family doc="" name="creole">
     <family doc="general" name="general">
       <property>normal</property>
@@ -16,6 +12,9 @@
         <property>hidden</property>
         <property>mandatory</property>
         <property>normal</property>
+        <value name="concat" type="calculation">
+          <param hidden="True" name="valeur" type="string">non</param>
+        </value>
       </variable>
     </family>
     <separators/>
diff --git a/tests/flattener_dicos/51redefine_autofill/result/00-base.xml b/tests/flattener_dicos/51redefine_autofill/result/00-base.xml
index 08216a1c..5b90cbee 100644
--- a/tests/flattener_dicos/51redefine_autofill/result/00-base.xml
+++ b/tests/flattener_dicos/51redefine_autofill/result/00-base.xml
@@ -1,10 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <creole>
-  <constraints>
-    <fill name="concat" target="creole.general.mode_conteneur_actif">
-      <param hidden="True" name="valeur" type="string">non</param>
-    </fill>
-  </constraints>
+  <constraints/>
   <family doc="" name="creole">
     <family doc="general" name="general">
       <property>normal</property>
@@ -13,6 +9,9 @@
         <choice type="string">non</choice>
         <property>mandatory</property>
         <property>normal</property>
+        <value name="concat" type="calculation">
+          <param hidden="True" name="valeur" type="string">non</param>
+        </value>
       </variable>
     </family>
     <separators/>
diff --git a/tests/flattener_dicos/51redefine_fill/result/00-base.xml b/tests/flattener_dicos/51redefine_fill/result/00-base.xml
index cce7635e..5a80ad8f 100644
--- a/tests/flattener_dicos/51redefine_fill/result/00-base.xml
+++ b/tests/flattener_dicos/51redefine_fill/result/00-base.xml
@@ -1,10 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <creole>
-  <constraints>
-    <fill name="concat" target="creole.general.mode_conteneur_actif">
-      <param hidden="True" name="valeur" type="string">non</param>
-    </fill>
-  </constraints>
+  <constraints/>
   <family doc="" name="creole">
     <family doc="general" name="general">
       <property>normal</property>
@@ -16,6 +12,9 @@
         <property>hidden</property>
         <property>mandatory</property>
         <property>normal</property>
+        <value name="concat" type="calculation">
+          <param hidden="True" name="valeur" type="string">non</param>
+        </value>
       </variable>
     </family>
     <separators/>
diff --git a/tests/flattener_dicos/51redefine_fillauto/result/00-base.xml b/tests/flattener_dicos/51redefine_fillauto/result/00-base.xml
index cce7635e..5a80ad8f 100644
--- a/tests/flattener_dicos/51redefine_fillauto/result/00-base.xml
+++ b/tests/flattener_dicos/51redefine_fillauto/result/00-base.xml
@@ -1,10 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <creole>
-  <constraints>
-    <fill name="concat" target="creole.general.mode_conteneur_actif">
-      <param hidden="True" name="valeur" type="string">non</param>
-    </fill>
-  </constraints>
+  <constraints/>
   <family doc="" name="creole">
     <family doc="general" name="general">
       <property>normal</property>
@@ -16,6 +12,9 @@
         <property>hidden</property>
         <property>mandatory</property>
         <property>normal</property>
+        <value name="concat" type="calculation">
+          <param hidden="True" name="valeur" type="string">non</param>
+        </value>
       </variable>
     </family>
     <separators/>
diff --git a/tests/flattener_dicos/60action_external/result/00-base.xml b/tests/flattener_dicos/60action_external/result/00-base.xml
index f98e47ca..ce906790 100644
--- a/tests/flattener_dicos/60action_external/result/00-base.xml
+++ b/tests/flattener_dicos/60action_external/result/00-base.xml
@@ -57,11 +57,7 @@
       </variable>
     </family>
   </family>
-  <constraints>
-    <fill name="calc_val" target="extra.test.calc_url">
-      <param hidden="True" type="string">http://localhost/</param>
-    </fill>
-  </constraints>
+  <constraints/>
   <family doc="" name="creole">
     <family doc="général" name="general">
       <property>normal</property>
@@ -91,6 +87,9 @@
         <property>frozen</property>
         <property>hidden</property>
         <property>normal</property>
+        <value name="calc_val" type="calculation">
+          <param hidden="True" type="string">http://localhost/</param>
+        </value>
       </variable>
     </family>
   </family>
diff --git a/tests/flattener_dicos/60extra_help/result/00-base.xml b/tests/flattener_dicos/60extra_help/result/00-base.xml
index 06e38932..5d3f3cf1 100644
--- a/tests/flattener_dicos/60extra_help/result/00-base.xml
+++ b/tests/flattener_dicos/60extra_help/result/00-base.xml
@@ -1,13 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <creole>
-  <constraints>
-    <fill name="calc_multi_condition" target="extra.ejabberd.day">
-      <param hidden="True" type="string">non</param>
-      <param hidden="False" name="condition_1" type="eole">creole.general.activer_ejabberd</param>
-      <param hidden="True" name="match" type="string">none</param>
-      <param hidden="True" name="mismatch" type="string">daily</param>
-    </fill>
-  </constraints>
+  <constraints/>
   <family doc="" name="creole">
     <family doc="général" name="general">
       <property>normal</property>
@@ -49,6 +42,12 @@
         <choice type="string">monthly</choice>
         <property>mandatory</property>
         <property>normal</property>
+        <value name="calc_multi_condition" type="calculation">
+          <param hidden="True" type="string">non</param>
+          <param hidden="False" name="condition_1" type="eole">creole.general.activer_ejabberd</param>
+          <param hidden="True" name="match" type="string">none</param>
+          <param hidden="True" name="mismatch" type="string">daily</param>
+        </value>
       </variable>
       <variable doc="mode" multi="False" name="mode" type="choice">
         <choice type="string">pre</choice>
diff --git a/tests/flattener_dicos/60extra_load/result/00-base.xml b/tests/flattener_dicos/60extra_load/result/00-base.xml
index 58b181af..109949f1 100644
--- a/tests/flattener_dicos/60extra_load/result/00-base.xml
+++ b/tests/flattener_dicos/60extra_load/result/00-base.xml
@@ -1,13 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <creole>
-  <constraints>
-    <fill name="calc_multi_condition" target="extra.ejabberd.day">
-      <param hidden="True" type="string">non</param>
-      <param hidden="False" name="condition_1" type="eole">creole.general.activer_ejabberd</param>
-      <param hidden="True" name="match" type="string">none</param>
-      <param hidden="True" name="mismatch" type="string">daily</param>
-    </fill>
-  </constraints>
+  <constraints/>
   <family doc="" name="creole">
     <family doc="général" name="general">
       <property>normal</property>
@@ -49,6 +42,12 @@
         <choice type="string">monthly</choice>
         <property>mandatory</property>
         <property>normal</property>
+        <value name="calc_multi_condition" type="calculation">
+          <param hidden="True" type="string">non</param>
+          <param hidden="False" name="condition_1" type="eole">creole.general.activer_ejabberd</param>
+          <param hidden="True" name="match" type="string">none</param>
+          <param hidden="True" name="mismatch" type="string">daily</param>
+        </value>
       </variable>
       <variable doc="mode" multi="False" name="mode" type="choice">
         <choice type="string">pre</choice>
diff --git a/tests/flattener_dicos/60extra_mandatory/result/00-base.xml b/tests/flattener_dicos/60extra_mandatory/result/00-base.xml
index 05b48a21..876b838f 100644
--- a/tests/flattener_dicos/60extra_mandatory/result/00-base.xml
+++ b/tests/flattener_dicos/60extra_mandatory/result/00-base.xml
@@ -1,13 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <creole>
-  <constraints>
-    <fill name="calc_multi_condition" target="extra.ejabberd.day">
-      <param hidden="True" type="string">non</param>
-      <param hidden="False" name="condition_1" type="eole">creole.general.activer_ejabberd</param>
-      <param hidden="True" name="match" type="string">none</param>
-      <param hidden="True" name="mismatch" type="string">daily</param>
-    </fill>
-  </constraints>
+  <constraints/>
   <family doc="" name="creole">
     <family doc="général" name="general">
       <property>normal</property>
@@ -49,6 +42,12 @@
         <choice type="string">monthly</choice>
         <property>mandatory</property>
         <property>normal</property>
+        <value name="calc_multi_condition" type="calculation">
+          <param hidden="True" type="string">non</param>
+          <param hidden="False" name="condition_1" type="eole">creole.general.activer_ejabberd</param>
+          <param hidden="True" name="match" type="string">none</param>
+          <param hidden="True" name="mismatch" type="string">daily</param>
+        </value>
       </variable>
       <variable doc="mode" multi="False" name="mode" type="choice">
         <choice type="string">pre</choice>
diff --git a/tests/flattener_dicos/60extra_redefine/result/00-base.xml b/tests/flattener_dicos/60extra_redefine/result/00-base.xml
index c4b8b1b8..cdc4d3c6 100644
--- a/tests/flattener_dicos/60extra_redefine/result/00-base.xml
+++ b/tests/flattener_dicos/60extra_redefine/result/00-base.xml
@@ -1,13 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <creole>
-  <constraints>
-    <fill name="calc_multi_condition" target="extra.ejabberd.day">
-      <param hidden="True" type="string">non</param>
-      <param hidden="False" name="condition_1" type="eole">creole.general.activer_ejabberd</param>
-      <param hidden="True" name="match" type="string">none</param>
-      <param hidden="True" name="mismatch" type="string">daily</param>
-    </fill>
-  </constraints>
+  <constraints/>
   <family doc="" name="creole">
     <family doc="général" name="general">
       <property>normal</property>
@@ -52,6 +45,12 @@
         <choice type="string">monthly</choice>
         <property>mandatory</property>
         <property>normal</property>
+        <value name="calc_multi_condition" type="calculation">
+          <param hidden="True" type="string">non</param>
+          <param hidden="False" name="condition_1" type="eole">creole.general.activer_ejabberd</param>
+          <param hidden="True" name="match" type="string">none</param>
+          <param hidden="True" name="mismatch" type="string">daily</param>
+        </value>
       </variable>
       <variable doc="mode" multi="False" name="mode" type="choice">
         <choice type="string">pre</choice>
diff --git a/tests/flattener_dicos/70container_disknod/result/00-base.xml b/tests/flattener_dicos/70container_disknod/result/00-base.xml
index dafc9fd3..bd79223d 100644
--- a/tests/flattener_dicos/70container_disknod/result/00-base.xml
+++ b/tests/flattener_dicos/70container_disknod/result/00-base.xml
@@ -1,18 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <creole>
-  <constraints>
-    <fill name="cdrom_minormajor" target="containers.container0.disknods.disknod0.minor">
-      <param hidden="True" type="string">minor</param>
-      <param hidden="True" type="string">/etc/mailname'</param>
-    </fill>
-    <fill name="cdrom_minormajor" target="containers.container0.disknods.disknod0.major">
-      <param hidden="True" type="string">major</param>
-      <param hidden="True" type="string">/etc/mailname'</param>
-    </fill>
-    <fill name="device_type" target="containers.container0.disknods.disknod0.type">
-      <param hidden="True" type="string">/etc/mailname'</param>
-    </fill>
-  </constraints>
+  <constraints/>
   <family name="containers">
     <family name="container0" doc="test">
       <family doc="disknods" name="disknods">
@@ -21,11 +9,19 @@
             <property>force_default_on_freeze</property>
             <property>frozen</property>
             <property>hidden</property>
+            <value name="cdrom_minormajor" type="calculation">
+              <param hidden="True" type="string">major</param>
+              <param hidden="True" type="string">/etc/mailname'</param>
+            </value>
           </variable>
           <variable doc="" multi="False" name="minor" type="number">
             <property>force_default_on_freeze</property>
             <property>frozen</property>
             <property>hidden</property>
+            <value name="cdrom_minormajor" type="calculation">
+              <param hidden="True" type="string">minor</param>
+              <param hidden="True" type="string">/etc/mailname'</param>
+            </value>
           </variable>
           <variable doc="" multi="False" name="mode" type="string">
             <value>rwm</value>
@@ -40,6 +36,9 @@
             <property>force_default_on_freeze</property>
             <property>frozen</property>
             <property>hidden</property>
+            <value name="device_type" type="calculation">
+              <param hidden="True" type="string">/etc/mailname'</param>
+            </value>
           </variable>
         </family>
       </family>
diff --git a/tests/test_flattener.py b/tests/test_flattener.py
index 8277ad78..68fb8abb 100644
--- a/tests/test_flattener.py
+++ b/tests/test_flattener.py
@@ -30,7 +30,7 @@ for test in listdir(dico_dirs):
 excludes = set([])
 test_ok -= excludes
 test_raise -= excludes
-# test_ok = ['70container_serviceaccesslist_servicelist']
+# test_ok = ['10autosave_hidden']
 # test_raise = []
 
 
@@ -85,7 +85,7 @@ def launch_flattener(test_dir):
     eolobj.save(destfile)
     result_file = join(test_dir, 'result/00-base.xml')
     if isfile(result_file):
-    #    eolobj.save(result_file)
+        eolobj.save(result_file)
         compare_xml(destfile, result_file)