diff --git a/datamodels/2.x/itop-flow-map/data/en_us.data.itop-flow-map.xml b/datamodels/2.x/itop-flow-map/data/en_us.data.itop-flow-map.xml
index 32f326d094..5e4e2c0760 100644
--- a/datamodels/2.x/itop-flow-map/data/en_us.data.itop-flow-map.xml
+++ b/datamodels/2.x/itop-flow-map/data/en_us.data.itop-flow-map.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Set>
     <DataFlowType alias="DataFlowType" id="1">
-        <name>http</name>
+        <name>HTTP</name>
     </DataFlowType>
     <DataFlowType alias="DataFlowType" id="2">
-        <name>https</name>
+        <name>HTTPS</name>
     </DataFlowType>
     <DataFlowType alias="DataFlowType" id="3">
-        <name>ftp</name>
+        <name>FTP</name>
     </DataFlowType>
     <DataFlowType alias="DataFlowType" id="4">
-        <name>sftp</name>
+        <name>SFTP</name>
     </DataFlowType>
     <DataFlowType alias="DataFlowType" id="5">
         <name>AS2</name>
@@ -18,4 +18,7 @@
     <DataFlowType alias="DataFlowType" id="6">
         <name>X.400</name>
     </DataFlowType>
+  <DataFlowType alias="DataFlowType" id="7">
+    <name>FTPS</name>
+  </DataFlowType>
 </Set>
\ No newline at end of file
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 1335da7d4b..d64732aecf 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
@@ -486,7 +486,7 @@
         <details>
           <items>
             <item id="dataflows" _delta="define">
-              <rank>25</rank>
+              <rank>125</rank>
             </item>
           </items>
         </details>
@@ -497,7 +497,7 @@
         <details>
           <items>
             <item id="dataflows" _delta="define">
-              <rank>25</rank>
+              <rank>115</rank>
             </item>
           </items>
         </details>
@@ -508,7 +508,7 @@
         <details>
           <items>
             <item id="dataflows" _delta="define">
-              <rank>25</rank>
+              <rank>165</rank>
             </item>
           </items>
         </details>
@@ -519,7 +519,7 @@
         <details>
           <items>
             <item id="dataflows" _delta="define">
-              <rank>25</rank>
+              <rank>165</rank>
             </item>
           </items>
         </details>
@@ -530,7 +530,40 @@
         <details>
           <items>
             <item id="dataflows" _delta="define">
-              <rank>25</rank>
+              <rank>115</rank>
+            </item>
+          </items>
+        </details>
+      </presentation>
+    </class>
+    <class id="Server" _delta="must_exist">
+      <presentation>
+        <details>
+          <items>
+            <item id="dataflows" _delta="define">
+              <rank>105</rank>
+            </item>
+          </items>
+        </details>
+      </presentation>
+    </class>
+    <class id="VirtualMachine" _delta="if_exists">
+      <presentation>
+        <details>
+          <items>
+            <item id="dataflows" _delta="define">
+              <rank>165</rank>
+            </item>
+          </items>
+        </details>
+      </presentation>
+    </class>
+    <class id="ContainerApplication" _delta="if_exists">
+      <presentation>
+        <details>
+          <items>
+            <item id="dataflows" _delta="define">
+              <rank>75</rank>
             </item>
           </items>
         </details>
@@ -541,7 +574,7 @@
         <details>
           <items>
             <item id="dataflows" _delta="define">
-              <rank>25</rank>
+              <rank>125</rank>
             </item>
           </items>
         </details>
@@ -552,7 +585,7 @@
         <details>
           <items>
             <item id="dataflows" _delta="define">
-              <rank>25</rank>
+              <rank>165</rank>
             </item>
           </items>
         </details>
@@ -563,7 +596,7 @@
         <details>
           <items>
             <item id="dataflows" _delta="define">
-              <rank>25</rank>
+              <rank>155</rank>
             </item>
           </items>
         </details>
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 2ff936a417..1b6915b54a 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
@@ -17,6 +17,7 @@ SetupWebPage::AddModule(
 		//
 		'dependencies' => [
 			'itop-config-mgmt/3.2.0',
+			'itop-structure/3.2.0||itop-virtualization/3.2.0||itop-container-mgmt/3.2.0',
 		],
 		'mandatory' => false,
 		'visible' => true,