diff --git a/datamodels/2.x/itop-bridge-endusers-devices-services/datamodel.itop-bridge-endusers-devices-services.xml b/datamodels/2.x/itop-bridge-endusers-devices-services/datamodel.itop-bridge-endusers-devices-services.xml
index e69de29bb..5e6e500c0 100644
--- a/datamodels/2.x/itop-bridge-endusers-devices-services/datamodel.itop-bridge-endusers-devices-services.xml
+++ b/datamodels/2.x/itop-bridge-endusers-devices-services/datamodel.itop-bridge-endusers-devices-services.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+  <constants/>
+  <classes>
+    <class id="Phone" _delta="must_exist">
+      <presentation>
+        <details>
+          <items>
+            <item id="providercontracts_list" _delta="define">
+              <rank>180</rank>
+            </item>
+            <item id="services_list" _delta="define">
+              <rank>190</rank>
+            </item>
+          </items>
+        </details>
+      </presentation>
+    </class>
+    <class id="MobilePhone" _delta="must_exist">
+      <presentation>
+        <details>
+          <items>
+            <item id="providercontracts_list" _delta="define">
+              <rank>200</rank>
+            </item>
+            <item id="services_list" _delta="define">
+              <rank>210</rank>
+            </item>
+          </items>
+        </details>
+      </presentation>
+    </class>
+    <class id="IPPhone" _delta="must_exist">
+      <presentation>
+        <details>
+          <items>
+            <item id="providercontracts_list" _delta="define">
+              <rank>170</rank>
+            </item>
+            <item id="services_list" _delta="define">
+              <rank>180</rank>
+            </item>
+          </items>
+        </details>
+      </presentation>
+    </class>
+    <class id="Tablet" _delta="must_exist">
+      <presentation>
+        <details>
+          <items>
+            <item id="providercontracts_list" _delta="define">
+              <rank>170</rank>
+            </item>
+            <item id="services_list" _delta="define">
+              <rank>180</rank>
+            </item>
+          </items>
+        </details>
+      </presentation>
+    </class>
+    <class id="PC" _delta="must_exist">
+      <presentation>
+        <details>
+          <items>
+            <item id="providercontracts_list" _delta="define">
+              <rank>60</rank>
+            </item>
+            <item id="services_list" _delta="define">
+              <rank>70</rank>
+            </item>
+          </items>
+        </details>
+      </presentation>
+    </class>
+    <class id="Peripheral" _delta="must_exist">
+      <presentation>
+        <details>
+          <items>
+            <item id="providercontracts_list" _delta="define">
+              <rank>170</rank>
+            </item>
+            <item id="services_list" _delta="define">
+              <rank>180</rank>
+            </item>
+          </items>
+        </details>
+      </presentation>
+    </class>
+  </classes>
+  <menus>
+  </menus>
+  <user_rights>
+    <groups>
+    </groups>
+    <profiles>
+    </profiles>
+  </user_rights>
+</itop_design>
diff --git a/datamodels/2.x/itop-bridge-endusers-devices-services/model.itop-bridge-endusers-devices-services.php b/datamodels/2.x/itop-bridge-endusers-devices-services/model.itop-bridge-endusers-devices-services.php
index e69de29bb..7f28f3258 100644
--- a/datamodels/2.x/itop-bridge-endusers-devices-services/model.itop-bridge-endusers-devices-services.php
+++ b/datamodels/2.x/itop-bridge-endusers-devices-services/model.itop-bridge-endusers-devices-services.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+
+// This file may be amended with XML snippets
+
diff --git a/datamodels/2.x/itop-bridge-endusers-devices-services/module.itop-bridge-endusers-devices-services.php b/datamodels/2.x/itop-bridge-endusers-devices-services/module.itop-bridge-endusers-devices-services.php
index e69de29bb..c594e5b40 100644
--- a/datamodels/2.x/itop-bridge-endusers-devices-services/module.itop-bridge-endusers-devices-services.php
+++ b/datamodels/2.x/itop-bridge-endusers-devices-services/module.itop-bridge-endusers-devices-services.php
@@ -0,0 +1,56 @@
+<?php
+//
+// iTop module definition file
+//
+
+SetupWebPage::AddModule(
+	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
+	'itop-bridge-endusers-devices-services/3.1.0',
+	array(
+		// Identification
+		//
+		'label' => 'Bridge for CMDB endusers objects and Services',
+		'category' => 'business',
+
+		// Setup
+		//
+		'dependencies' => array(
+			'itop-config-mgmt/2.7.1',
+			'itop-service-mgmt/2.7.1 || itop-service-mgmt-provider/2.7.1',
+			'itop-endusers-devices/3.1.0',
+
+		),
+		'mandatory' => false,
+		'visible' => false,
+		'auto_select' => 'SetupInfo::ModuleIsSelected("itop-endusers-devices") && (SetupInfo::ModuleIsSelected("itop-service-mgmt") || SetupInfo::ModuleIsSelected("itop-service-mgmt-provider")) ',
+
+		// Components
+		//
+		'datamodel' => array(
+			'model.itop-bridge-endusers-devices-services.php', // Contains the PHP code generated by the "compilation" of datamodel.itop-cmdb-ticket-bridge.xml
+		),
+		'webservice' => array(
+
+		),
+		'data.struct' => array(
+			// add your 'structure' definition XML files here,
+		),
+		'data.sample' => array(
+			// add your sample data XML files here,
+		),
+
+		// Documentation
+		//
+		'doc.manual_setup' => '', // hyperlink to manual setup documentation, if any
+		'doc.more_information' => '', // hyperlink to more information, if any
+
+		// Default settings
+		//
+		'settings' => array(
+			// Module specific settings go here, if any
+		),
+	)
+);
+
+
+?>
diff --git a/datamodels/2.x/itop-bridge-virtualization-mgmt-services/datamodel.itop-bridge-virtualization-mgmt-services.xml b/datamodels/2.x/itop-bridge-virtualization-mgmt-services/datamodel.itop-bridge-virtualization-mgmt-services.xml
index e69de29bb..69d12634b 100644
--- a/datamodels/2.x/itop-bridge-virtualization-mgmt-services/datamodel.itop-bridge-virtualization-mgmt-services.xml
+++ b/datamodels/2.x/itop-bridge-virtualization-mgmt-services/datamodel.itop-bridge-virtualization-mgmt-services.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
+  <constants/>
+  <classes>
+    <class id="Hypervisor" _delta="must_exist">
+      <presentation>
+        <details>
+          <items>
+            <item id="providercontracts_list" _delta="define">
+              <rank>130</rank>
+            </item>
+            <item id="services_list" _delta="define">
+              <rank>140</rank>
+            </item>
+          </items>
+        </details>
+      </presentation>
+    </class>
+    <class id="Farm" _delta="must_exist">
+      <presentation>
+        <details>
+          <items>
+            <item id="providercontracts_list" _delta="define">
+              <rank>120</rank>
+            </item>
+            <item id="services_list" _delta="define">
+              <rank>130</rank>
+            </item>
+          </items>
+        </details>
+      </presentation>
+    </class>
+    <class id="VirtualMachine" _delta="must_exist">
+      <presentation>
+        <details>
+          <items>
+            <item id="providercontracts_list" _delta="define">
+              <rank>70</rank>
+            </item>
+            <item id="services_list" _delta="define">
+              <rank>80</rank>
+            </item>
+          </items>
+        </details>
+      </presentation>
+    </class>
+  </classes>
+  <menus>
+  </menus>
+  <user_rights>
+    <groups>
+    </groups>
+    <profiles>
+    </profiles>
+  </user_rights>
+</itop_design>
diff --git a/datamodels/2.x/itop-bridge-virtualization-mgmt-services/model.itop-bridge-virtualization-mgmt-services.php b/datamodels/2.x/itop-bridge-virtualization-mgmt-services/model.itop-bridge-virtualization-mgmt-services.php
index e69de29bb..7f28f3258 100644
--- a/datamodels/2.x/itop-bridge-virtualization-mgmt-services/model.itop-bridge-virtualization-mgmt-services.php
+++ b/datamodels/2.x/itop-bridge-virtualization-mgmt-services/model.itop-bridge-virtualization-mgmt-services.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * Copyright (C) 2013-2023 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+
+// This file may be amended with XML snippets
+
diff --git a/datamodels/2.x/itop-bridge-virtualization-mgmt-services/module.itop-bridge-virtualization-mgmt-services.php b/datamodels/2.x/itop-bridge-virtualization-mgmt-services/module.itop-bridge-virtualization-mgmt-services.php
index e69de29bb..1604e2645 100644
--- a/datamodels/2.x/itop-bridge-virtualization-mgmt-services/module.itop-bridge-virtualization-mgmt-services.php
+++ b/datamodels/2.x/itop-bridge-virtualization-mgmt-services/module.itop-bridge-virtualization-mgmt-services.php
@@ -0,0 +1,55 @@
+<?php
+//
+// iTop module definition file
+//
+
+SetupWebPage::AddModule(
+	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
+	'itop-bridge-virtualization-mgmt-services/3.1.0',
+	array(
+		// Identification
+		//
+		'label' => 'Bridge for CMDB Virtualization objects and Services',
+		'category' => 'business',
+
+		// Setup
+		//
+		'dependencies' => array(
+			'itop-config-mgmt/2.7.1',
+			'itop-service-mgmt/2.7.1 || itop-service-mgmt-provider/2.7.1',
+			'itop-virtualization-mgmt/3.1.0',
+		),
+		'mandatory' => false,
+		'visible' => false,
+		'auto_select' => 'SetupInfo::ModuleIsSelected("itop-virtualization-mgmt") &&  (SetupInfo::ModuleIsSelected("itop-service-mgmt") || SetupInfo::ModuleIsSelected("itop-service-mgmt-provider")) ',
+
+		// Components
+		//
+		'datamodel' => array(
+			'model.itop-bridge-virtualization-mgmt-services.php', // Contains the PHP code generated by the "compilation" of datamodel.itop-cmdb-ticket-bridge.xml
+		),
+		'webservice' => array(
+
+		),
+		'data.struct' => array(
+			// add your 'structure' definition XML files here,
+		),
+		'data.sample' => array(
+			// add your sample data XML files here,
+		),
+
+		// Documentation
+		//
+		'doc.manual_setup' => '', // hyperlink to manual setup documentation, if any
+		'doc.more_information' => '', // hyperlink to more information, if any
+
+		// Default settings
+		//
+		'settings' => array(
+			// Module specific settings go here, if any
+		),
+	)
+);
+
+
+?>
diff --git a/datamodels/2.x/itop-endusers-devices/datamodel.itop-enduser-devices.xml b/datamodels/2.x/itop-endusers-devices/datamodel.itop-enduser-devices.xml
index df92ee8da..ea78f05f5 100644
--- a/datamodels/2.x/itop-endusers-devices/datamodel.itop-enduser-devices.xml
+++ b/datamodels/2.x/itop-endusers-devices/datamodel.itop-enduser-devices.xml
@@ -233,12 +233,6 @@
             <item id="documents_list">
               <rank>160</rank>
             </item>
-            <item id="providercontracts_list">
-              <rank>180</rank>
-            </item>
-            <item id="services_list">
-              <rank>190</rank>
-            </item>
           </items>
         </details>
         <search>
@@ -403,12 +397,6 @@
             <item id="documents_list">
               <rank>180</rank>
             </item>
-            <item id="providercontracts_list">
-              <rank>200</rank>
-            </item>
-            <item id="services_list">
-              <rank>210</rank>
-            </item>
           </items>
         </details>
         <search>
@@ -562,12 +550,6 @@
             <item id="documents_list">
               <rank>160</rank>
             </item>
-            <item id="providercontracts_list">
-              <rank>180</rank>
-            </item>
-            <item id="services_list">
-              <rank>190</rank>
-            </item>
           </items>
         </details>
         <search>
@@ -712,12 +694,6 @@
             <item id="documents_list">
               <rank>160</rank>
             </item>
-            <item id="providercontracts_list">
-              <rank>170</rank>
-            </item>
-            <item id="services_list">
-              <rank>180</rank>
-            </item>
           </items>
         </details>
         <search>
@@ -881,12 +857,6 @@
             <item id="networkdevice_list">
               <rank>50</rank>
             </item>
-            <item id="providercontracts_list">
-              <rank>60</rank>
-            </item>
-            <item id="services_list">
-              <rank>70</rank>
-            </item>
             <item id="col:col1">
               <rank>80</rank>
               <items>
@@ -1085,12 +1055,6 @@
             <item id="networkdevice_list">
               <rank>50</rank>
             </item>
-            <item id="providercontracts_list">
-              <rank>60</rank>
-            </item>
-            <item id="services_list">
-              <rank>70</rank>
-            </item>
             <item id="col:col1">
               <rank>80</rank>
               <items>
@@ -1304,12 +1268,6 @@
             <item id="documents_list">
               <rank>150</rank>
             </item>
-            <item id="providercontracts_list">
-              <rank>170</rank>
-            </item>
-            <item id="services_list">
-              <rank>180</rank>
-            </item>
           </items>
         </details>
         <search>
diff --git a/datamodels/2.x/itop-virtualization-mgmt/datamodel.itop-virtualization-mgmt.xml b/datamodels/2.x/itop-virtualization-mgmt/datamodel.itop-virtualization-mgmt.xml
index 8b99ee32d..8a3deba58 100644
--- a/datamodels/2.x/itop-virtualization-mgmt/datamodel.itop-virtualization-mgmt.xml
+++ b/datamodels/2.x/itop-virtualization-mgmt/datamodel.itop-virtualization-mgmt.xml
@@ -356,12 +356,6 @@
             <item id="virtualmachine_list">
               <rank>120</rank>
             </item>
-            <item id="providercontracts_list">
-              <rank>130</rank>
-            </item>
-            <item id="services_list">
-              <rank>140</rank>
-            </item>
           </items>
         </details>
         <search>
@@ -497,12 +491,6 @@
             <item id="virtualmachine_list">
               <rank>110</rank>
             </item>
-            <item id="providercontracts_list">
-              <rank>120</rank>
-            </item>
-            <item id="services_list">
-              <rank>130</rank>
-            </item>
           </items>
         </details>
         <search>
@@ -665,12 +653,6 @@
             <item id="logicalvolumes_list">
               <rank>60</rank>
             </item>
-            <item id="providercontracts_list">
-              <rank>70</rank>
-            </item>
-            <item id="services_list">
-              <rank>80</rank>
-            </item>
             <item id="col:col1">
               <rank>90</rank>
               <items>