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 6cd79ac2ac..768c4fdf6e 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
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.0">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <constants>
   </constants>
   <classes>
@@ -14,13 +14,14 @@
         </style>
         <naming>
           <attributes>
-            <attribute id="flowtype_id_friendlyname"/>
+            <attribute id="name"/>
             <attribute id="source_name"/>
             <attribute id="destination_name"/>
           </attributes>
         </naming>
         <reconciliation>
           <attributes>
+            <attribute id="name"/>
             <attribute id="destination_id"/>
             <attribute id="org_id"/>
             <attribute id="source_id"/>
@@ -35,6 +36,11 @@
         </fields_semantic>
       </properties>
       <fields>
+        <field id="name" xsi:type="AttributeString">
+          <sql>name</sql>
+          <default_value/>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
         <field id="org_id" xsi:type="AttributeExternalKey">
           <sql>org_id</sql>
           <filter/>
@@ -74,7 +80,7 @@
           <sql>flowtype_id</sql>
           <filter/>
           <dependencies/>
-          <is_null_allowed>false</is_null_allowed>
+          <is_null_allowed>true</is_null_allowed>
           <target_class>FlowType</target_class>
           <on_target_delete>DEL_MANUAL</on_target_delete>
           <tracking_level>all</tracking_level>
@@ -113,23 +119,55 @@
           <display_style>list</display_style>
           <tracking_level>all</tracking_level>
         </field>
+        <field id="business_criticity" xsi:type="AttributeEnum">
+          <sort_type>rank</sort_type>
+          <values>
+            <value id="high">
+              <code>high</code>
+              <rank>10</rank>
+            </value>
+            <value id="medium">
+              <code>medium</code>
+              <rank>20</rank>
+            </value>
+            <value id="low">
+              <code>low</code>
+              <rank>30</rank>
+            </value>
+          </values>
+          <sql>business_criticity</sql>
+          <default_value>low</default_value>
+          <is_null_allowed>false</is_null_allowed>
+          <display_style>list</display_style>
+        </field>
+        <field id="documents_list" xsi:type="AttributeLinkedSetIndirect">
+          <linked_class>lnkDocumentToFunctionalCI</linked_class>
+          <ext_key_to_me>functionalci_id</ext_key_to_me>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <ext_key_to_remote>document_id</ext_key_to_remote>
+          <duplicates/>
+        </field>
       </fields>
       <methods/>
       <presentation>
         <list>
           <items>
-            <item id="source_id">
+            <item id="name">
               <rank>10</rank>
             </item>
-            <item id="destination_id">
+            <item id="source_id">
               <rank>20</rank>
             </item>
-            <item id="flowtype_id">
+            <item id="destination_id">
               <rank>30</rank>
             </item>
-            <item id="description">
+            <item id="flowtype_id">
               <rank>40</rank>
             </item>
+            <item id="business_criticity">
+              <rank>50</rank>
+            </item>
           </items>
         </list>
         <search>
@@ -152,7 +190,7 @@
           <items>
             <item id="col:col1">
               <items>
-                <item id="org_id">
+                <item id="name">
                   <rank>10</rank>
                 </item>
                 <item id="source_id">
@@ -161,18 +199,32 @@
                 <item id="destination_id">
                   <rank>30</rank>
                 </item>
-                <item id="status">
+                <item id="org_id">
                   <rank>40</rank>
                 </item>
-                <item id="flowtype_id">
+                <item id="status">
                   <rank>50</rank>
                 </item>
-                <item id="description">
+                <item id="flowtype_id">
                   <rank>60</rank>
                 </item>
+                <item id="business_criticity">
+                  <rank>70</rank>
+                </item>
               </items>
               <rank>10</rank>
             </item>
+            <item id="col:col2">
+              <items>
+                <item id="description">
+                  <rank>10</rank>
+                </item>
+              </items>
+              <rank>20</rank>
+            </item>
+            <item id="documents_list">
+              <rank>80</rank>
+            </item>
           </items>
         </details>
         <default_search>
@@ -216,6 +268,91 @@
         </relation>
       </relations>
     </class>
+    <class id="lnkDocumentToFlow" _delta="define">
+      <parent>cmdbAbstractObject</parent>
+      <properties>
+        <is_link>1</is_link>
+        <category>bizmodel</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>lnkDocumentToFlow</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="document_id_friendlyname"/>
+            <attribute id="flow_id_friendlyname"/>
+          </attributes>
+        </naming>
+        <style>
+          <icon/>
+        </style>
+        <reconciliation>
+          <attributes>
+            <attribute id="flow_id"/>
+            <attribute id="document_id"/>
+          </attributes>
+        </reconciliation>
+        <uniqueness_rules>
+          <rule id="no_duplicate">
+            <attributes>
+              <attribute id="document_id"/>
+              <attribute id="flow_id"/>
+            </attributes>
+            <filter><![CDATA[]]></filter>
+            <disabled>false</disabled>
+            <is_blocking>true</is_blocking>
+          </rule>
+        </uniqueness_rules>
+      </properties>
+      <fields>
+        <field id="flow_id" xsi:type="AttributeExternalKey">
+          <sql>flow_id</sql>
+          <target_class>Flow</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+        </field>
+        <field id="document_id" xsi:type="AttributeExternalKey">
+          <sql>document_id</sql>
+          <target_class>Document</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+        </field>
+      </fields>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="document_id">
+              <rank>10</rank>
+            </item>
+            <item id="functionalci_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="functionalci_id">
+              <rank>10</rank>
+            </item>
+            <item id="document_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="functionalci_id">
+              <rank>10</rank>
+            </item>
+            <item id="document_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
     <class id="FlowType" _delta="define">
       <parent>Typology</parent>
       <properties>
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 6459a96c27..961f170959 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
@@ -10,12 +10,14 @@
 Dict::Add('EN US', 'English', 'English', [
 
 	'Relation:flow/Description'                               => 'Flow maps',
-	'Relation:flow/DownStream'                                => 'Impacts flow...',
-	'Relation:flow/UpStream'                                  => 'Depends flow...',
+	'Relation:flow/DownStream'                                => 'Sent flow...',
+	'Relation:flow/UpStream'                                  => 'Received flow...',
 
 	'Class:Flow'                                              => 'Flow',
 	'Class:Flow+'                                             => 'For application flow for example',
-	'Class:Flow/Name'                                         => '%1$s %2$s %3$s',
+	'Class:Flow/Name'                                         => '%1$s from %2$s to %3$s',
+	'Class:Flow/Attribute:name'                               => 'Name',
+	'Class:Flow/Attribute:name_id+'                           => 'Data that are transferred',
 	'Class:Flow/Attribute:source_id'                          => 'Source',
 	'Class:Flow/Attribute:source_id+'                         => 'Source Ci of the flow',
 	'Class:Flow/Attribute:source_name'                        => 'Source name',
@@ -25,9 +27,24 @@ Dict::Add('EN US', 'English', 'English', [
 	'Class:Flow/Attribute:destination_name'                   => 'Destination name',
 	'Class:Flow/Attribute:destination_name+'                  => 'Name of the destination CI for the flow',
 	'Class:Flow/Attribute:type_id'                            => 'Flow type',
-	'Class:Flow/Attribute:type_id+'                           => 'Flow type such as : http, https, ftp..., will appear in the friendlyname',
+	'Class:Flow/Attribute:type_id+'                           => 'Typology of Flow.',
 	'Class:Flow/Attribute:description'                        => 'Description',
 	'Class:Flow/Attribute:description+'                       => 'Flow description, will appear in the summary card',
+	'Class:Flow/Attribute:status'                             => 'Status',
+	'Class:Flow/Attribute:status+'                            => '',
+	'Class:Flow/Attribute:status/Value:active'                => 'active',
+	'Class:Flow/Attribute:status/Value:inactive'              => 'inactive',
+	'Class:Flow/Attribute:org_id'                             => 'Organization',
+	'Class:Flow/Attribute:org_id+'                            => '',
+	'Class:Flow/Attribute:business_criticity'                 => 'Business criticality',
+	'Class:Flow/Attribute:business_criticity+'                => '',
+	'Class:Flow/Attribute:business_criticity/Value:high'      => 'high',
+	'Class:Flow/Attribute:business_criticity/Value:high+'     => '',
+	'Class:Flow/Attribute:business_criticity/Value:low'       => 'low',
+	'Class:Flow/Attribute:business_criticity/Value:low+'      => '',
+	'Class:Flow/Attribute:business_criticity/Value:medium'    => 'medium',
+	'Class:Flow/Attribute:business_criticity/Value:medium+'   => '',
+
 	'Class:Flow/Attribute:source_id_friendlyname'             => 'source_id_friendlyname',
 	'Class:Flow/Attribute:source_id_friendlyname+'            => 'Full name',
 	'Class:Flow/Attribute:source_id_finalclass_recall'        => 'source_id->CI sub-class',
@@ -40,10 +57,5 @@ Dict::Add('EN US', 'English', 'English', [
 	'Class:Flow/Attribute:destination_id_finalclass_recall+'  => 'Name of the final class',
 	'Class:Flow/Attribute:destination_id_obsolescence_flag'   => 'destination_id->Obsolete',
 	'Class:Flow/Attribute:destination_id_obsolescence_flag+'  => 'Computed dynamically on other attributes',
-	'Class:Flow/Attribute:status'                             => 'Status',
-	'Class:Flow/Attribute:status+'                            => '',
-	'Class:Flow/Attribute:status/Value:active'                => 'Active',
-	'Class:Flow/Attribute:status/Value:inactive'              => 'Inactive',
-	'Class:Flow/Attribute:org_id'                             => 'Organization',
-	'Class:Flow/Attribute:org_id+'                            => '',
+
 ]);
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 ad6b970c51..d8454d2523 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
@@ -10,24 +10,41 @@
 Dict::Add('FR FR', 'French', 'Français', [
 
 	'Relation:flow/Description'                              => 'Carte des fluxs',
-	'Relation:flow/DownStream'                               => 'Impacte flux...',
-	'Relation:flow/UpStream'                                 => 'Dépend de flux...',
+	'Relation:flow/DownStream'                               => 'Flux émis...',
+	'Relation:flow/UpStream'                                 => 'Flux reçus...',
 
 	'Class:Flow'                                             => 'Flux',
-	'Class:Flow+'                                            => 'Pour les fluxs applicatifs par exemple',
-	'Class:Flow/Name'                                        => '%1$s %2$s %3$s',
+	'Class:Flow+'                                            => 'Modélise les fluxs d\'informations entre applications par exemple, mais aussi n\'importe quel autre type de flux entre CI',
+	'Class:Flow/Name'                                        => '%1$s de %2$s à %3$s',
+	'Class:Flow/Attribute:name'                              => 'Nom',
+	'Class:Flow/Attribute:name_id+'                          => 'Type de données transferées',
 	'Class:Flow/Attribute:source_id'                         => 'Source',
-	'Class:Flow/Attribute:source_id+'                        => 'Ci source du flux',
+	'Class:Flow/Attribute:source_id+'                        => 'Ci source du flux, le plus souvent une instance d\'application',
 	'Class:Flow/Attribute:source_name'                       => 'Nom de la source ',
 	'Class:Flow/Attribute:source_name+'                      => 'Nom du CI à la source du flux',
-	'Class:Flow/Attribute:destination_id'                    => 'Destination',
-	'Class:Flow/Attribute:destination_id+'                   => 'Ci destinataire du flux',
+	'Class:Flow/Attribute:destination_id'                    => 'Destinataire',
+	'Class:Flow/Attribute:destination_id+'                   => 'Ci destinataire du flux, le plus souvent une instance d\'application',
 	'Class:Flow/Attribute:destination_name'                  => 'Nom du destinataire',
 	'Class:Flow/Attribute:destination_name+'                 => 'Nom du Ci destinataire du flux',
 	'Class:Flow/Attribute:type_id'                           => 'Type de flux',
-	'Class:Flow/Attribute:type_id+'                          => 'Type de flux : http, https, ftp..., apparaitra dans le nom commun',
+	'Class:Flow/Attribute:type_id+'                          => 'Typologie du flux',
 	'Class:Flow/Attribute:description'                       => 'Description',
 	'Class:Flow/Attribute:description+'                      => 'Description du flux, apparaitra dans les informations résumées ',
+	'Class:Flow/Attribute:status'                            => 'Etat',
+	'Class:Flow/Attribute:status+'                           => '',
+	'Class:Flow/Attribute:status/Value:active'               => 'actif',
+	'Class:Flow/Attribute:status/Value:inactive'             => 'inactif',
+	'Class:Flow/Attribute:org_id'                            => 'Organisation',
+	'Class:Flow/Attribute:org_id+'                           => '',
+	'Class:Flow/Attribute:business_criticity'                => 'Criticité',
+	'Class:Flow/Attribute:business_criticity+'               => '',
+	'Class:Flow/Attribute:business_criticity/Value:high'     => 'haute',
+	'Class:Flow/Attribute:business_criticity/Value:high+'    => '',
+	'Class:Flow/Attribute:business_criticity/Value:low'      => 'basse',
+	'Class:Flow/Attribute:business_criticity/Value:low+'     => '',
+	'Class:Flow/Attribute:business_criticity/Value:medium'   => 'moyenne',
+	'Class:Flow/Attribute:business_criticity/Value:medium+'  => '',
+
 	'Class:Flow/Attribute:source_id_friendlyname'            => 'source_id_friendlyname',
 	'Class:Flow/Attribute:source_id_friendlyname+'           => 'Nom complet',
 	'Class:Flow/Attribute:source_id_finalclass_recall'       => 'source_id->CI sub-class',
@@ -40,11 +57,4 @@ Dict::Add('FR FR', 'French', 'Français', [
 	'Class:Flow/Attribute:destination_id_finalclass_recall+' => 'Classe finale',
 	'Class:Flow/Attribute:destination_id_obsolescence_flag'  => 'destination_id->Obsolete',
 	'Class:Flow/Attribute:destination_id_obsolescence_flag+' => 'Computed dynamically on other attributes',
-	'Class:Flow/Attribute:status'                            => 'Etat',
-	'Class:Flow/Attribute:status+'                           => '',
-	'Class:Flow/Attribute:status/Value:active'               => 'Actif',
-	'Class:Flow/Attribute:status/Value:inactive'             => 'Inactif',
-	'Class:Flow/Attribute:org_id'                            => 'Organisation',
-	'Class:Flow/Attribute:org_id+'                           => '',
-
 ]);
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 28708982fd..7f2dc89c20 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,6 @@ SetupWebPage::AddModule(
 		// Components
 		//
 		'datamodel' => [
-			'vendor/autoload.php',
 			'model.itop-flow-map.php', // Contains the PHP code generated by the "compilation" of datamodel.Combodo-flow-map.xml
 		],
 		'webservice' => [