diff --git a/datamodels/2.x/itop-flow-map/datamodel.itop-flow-map.xml b/datamodels/2.x/itop-flow-map/datamodel.itop-flow-map.xml
index b16333904..85412b746 100644
--- a/datamodels/2.x/itop-flow-map/datamodel.itop-flow-map.xml
+++ b/datamodels/2.x/itop-flow-map/datamodel.itop-flow-map.xml
@@ -77,7 +77,7 @@
           <on_target_delete>DEL_MANUAL</on_target_delete>
           <tracking_level>all</tracking_level>
         </field>
-        <field id="description" xsi:type="AttributeText">
+        <field id="description" xsi:type="AttributeHTML">
           <sql>description</sql>
           <default_value/>
           <is_null_allowed>true</is_null_allowed>
@@ -215,36 +215,51 @@
           <items>
             <item id="col:col1">
               <items>
-                <item id="name">
+                <item id="fieldset:DataFlow:baseinfo">
+                  <items>
+                    <item id="name">
+                      <rank>10</rank>
+                    </item>
+                    <item id="org_id">
+                      <rank>20</rank>
+                    </item>
+                    <item id="status">
+                      <rank>30</rank>
+                    </item>
+                    <item id="business_criticity">
+                      <rank>40</rank>
+                    </item>
+                  </items>
                   <rank>10</rank>
                 </item>
-                <item id="source_id">
+                <item id="fieldset:DataFlow:moreinfo">
+                  <items>
+                     <item id="source_id">
+                      <rank>10</rank>
+                    </item>
+                    <item id="destination_id">
+                      <rank>20</rank>
+                    </item>
+                    <item id="flowtype_id">
+                      <rank>30</rank>
+                    </item>
+                    <item id="execution_frequency">
+                      <rank>40</rank>
+                    </item>
+                  </items>
                   <rank>20</rank>
                 </item>
-                <item id="destination_id">
-                  <rank>30</rank>
-                </item>
-                <item id="org_id">
-                  <rank>40</rank>
-                </item>
-                <item id="status">
-                  <rank>50</rank>
-                </item>
-                <item id="flowtype_id">
-                  <rank>60</rank>
-                </item>
-                <item id="execution_frequency">
-                  <rank>70</rank>
-                </item>
-                <item id="business_criticity">
-                  <rank>80</rank>
-                </item>
               </items>
               <rank>10</rank>
             </item>
             <item id="col:col2">
               <items>
-                <item id="description">
+                <item id="fieldset:DataFlow:otherinfo">
+                  <items>
+                    <item id="description">
+                      <rank>10</rank>
+                    </item>
+                  </items>
                   <rank>10</rank>
                 </item>
               </items>
diff --git a/datamodels/2.x/itop-flow-map/dictionaries/en.dict.itop-flow-map.php b/datamodels/2.x/itop-flow-map/dictionaries/en.dict.itop-flow-map.php
index e7d0371b8..c61df3beb 100644
--- a/datamodels/2.x/itop-flow-map/dictionaries/en.dict.itop-flow-map.php
+++ b/datamodels/2.x/itop-flow-map/dictionaries/en.dict.itop-flow-map.php
@@ -9,6 +9,10 @@
 
 Dict::Add('EN US', 'English', 'English', [
 
+	'DataFlow:baseinfo' => 'General information',
+	'DataFlow:otherinfo' => 'Other information',
+	'DataFlow:moreinfo' => 'Flow specifics',
+
 	'Relation:flow/Description' => 'Flow maps',
 	'Relation:flow/DownStream' => 'Sent flow...',
 	'Relation:flow/UpStream' => 'Received flow...',
diff --git a/datamodels/2.x/itop-flow-map/dictionaries/fr.dict.itop-flow-map.php b/datamodels/2.x/itop-flow-map/dictionaries/fr.dict.itop-flow-map.php
index 9168b7a48..fe70877d0 100644
--- a/datamodels/2.x/itop-flow-map/dictionaries/fr.dict.itop-flow-map.php
+++ b/datamodels/2.x/itop-flow-map/dictionaries/fr.dict.itop-flow-map.php
@@ -9,6 +9,10 @@
 
 Dict::Add('FR FR', 'French', 'Français', [
 
+	'DataFlow:baseinfo' => 'Informations générales',
+	'DataFlow:otherinfo' => 'Autres informations',
+	'DataFlow:moreinfo' => 'Spécificités du flux',
+
 	'Relation:flow/Description'                              => 'Carte des flux de données',
 	'Relation:flow/DownStream'                               => 'Flux sortants...',
 	'Relation:flow/UpStream'                                 => 'Flux reçus...',
diff --git a/datamodels/2.x/itop-flow-map/model.itop-flow-map.php b/datamodels/2.x/itop-flow-map/model.itop-flow-map.php
deleted file mode 100644
index e8140fa29..000000000
--- a/datamodels/2.x/itop-flow-map/model.itop-flow-map.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-// PHP Data Model definition file
-
-// WARNING - WARNING - WARNING
-// DO NOT EDIT THIS FILE (unless you know what you are doing)
-//
-// If you provide a datamodel.xxxx.xml file with your module,
-// this file WILL BE overwritten by the compilation of the
-// module (during the setup) if the datamodel.xxxx.xml file
-// contains the definition of new classes or menus.
-//
-// The recommended way to define new classes (for iTop 2.0 and later) is via the XML definition.
-// This file remains in the module's template only for the cases where there is:
-// - either no new class or menu defined in the XML file
-// - or no XML file at all supplied by the module
diff --git a/datamodels/2.x/itop-flow-map/module.itop-flow-map.php b/datamodels/2.x/itop-flow-map/module.itop-flow-map.php
index 9792a9886..a89b41d2f 100644
--- a/datamodels/2.x/itop-flow-map/module.itop-flow-map.php
+++ b/datamodels/2.x/itop-flow-map/module.itop-flow-map.php
@@ -24,7 +24,7 @@ SetupWebPage::AddModule(
 		// Components
 		//
 		'datamodel' => [
-			'model.itop-flow-map.php', // Contains the PHP code generated by the "compilation" of datamodel.Combodo-flow-map.xml
+
 		],
 		'webservice' => [