diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/datamodel.itop-bridge-cmdb-ticket.xml b/datamodels/2.x/itop-bridge-cmdb-ticket/datamodel.itop-bridge-cmdb-ticket.xml
index f0c379a14..887a3b093 100644
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/datamodel.itop-bridge-cmdb-ticket.xml
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/datamodel.itop-bridge-cmdb-ticket.xml
@@ -465,77 +465,6 @@
         </details>
       </presentation>
     </class>
-    <class id="DocumentFile" _delta="must_exist">
-      <presentation>
-        <details>
-          <items>
-            <item id="cis_list" _delta="define">
-              <rank>70</rank>
-            </item>
-            <item id="contracts_list" _delta="define">
-              <rank>80</rank>
-            </item>
-            <item id="services_list" _delta="define">
-              <rank>90</rank>
-            </item>
-          </items>
-        </details>
-      </presentation>
-    </class>
-    <class id="Location" _delta="must_exist">
-      <fields>
-        <field id="physicaldevice_list" xsi:type="AttributeLinkedSet" _delta="define">
-          <linked_class>PhysicalDevice</linked_class>
-          <ext_key_to_me>location_id</ext_key_to_me>
-          <edit_mode>add_only</edit_mode>
-          <count_min>0</count_min>
-          <count_max>0</count_max>
-        </field>
-      </fields>
-      <presentation>
-        <details>
-          <items>
-            <item id="physicaldevice_list" _delta="define">
-              <rank>90</rank>
-            </item>
-          </items>
-        </details>
-      </presentation>
-    </class>
-    <class id="DocumentWeb" _delta="must_exist">
-      <presentation>
-        <details>
-          <items>
-            <item id="cis_list" _delta="define">
-              <rank>60</rank>
-            </item>
-            <item id="contracts_list" _delta="define">
-              <rank>70</rank>
-            </item>
-            <item id="services_list" _delta="define">
-              <rank>80</rank>
-            </item>
-          </items>
-        </details>
-      </presentation>
-    </class>
-    <class id="DocumentNote" _delta="must_exist">
-      <presentation>
-        <details>
-          <items>
-            <item id="cis_list" _delta="define">
-              <rank>70</rank>
-            </item>
-            <item id="contracts_list" _delta="define">
-              <rank>80</rank>
-            </item>
-            <item id="services_list" _delta="define">
-              <rank>90</rank>
-            </item>
-          </items>
-        </details>
-      </presentation>
-    </class>
   </classes>
   <menus>
   </menus>
diff --git a/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml b/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml
index 9271b0b6c..6b301a68d 100755
--- a/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml
+++ b/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml
@@ -6246,6 +6246,93 @@
 				</details>
 			</presentation>
 		</class>
+    <class id="Location" _delta="must_exist">
+      <fields>
+        <field id="physicaldevice_list" xsi:type="AttributeLinkedSet" _delta="define">
+          <linked_class>PhysicalDevice</linked_class>
+          <ext_key_to_me>location_id</ext_key_to_me>
+          <edit_mode>add_only</edit_mode>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+        </field>
+      </fields>
+      <presentation>
+        <details>
+          <items>
+            <item id="physicaldevice_list" _delta="define">
+              <rank>90</rank>
+            </item>
+          </items>
+        </details>
+      </presentation>
+    </class>
+    <class id="Contact" _delta="must_exist">
+      <fields>
+        <field id="cis_list" xsi:type="AttributeLinkedSetIndirect" _delta="define">
+          <linked_class>lnkContactToFunctionalCI</linked_class>
+          <ext_key_to_me>contact_id</ext_key_to_me>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <ext_key_to_remote>functionalci_id</ext_key_to_remote>
+          <duplicates/>
+        </field>
+      </fields>
+    </class>
+    <class id="Person" _delta="must_exist">
+      <presentation>
+        <details>
+          <items>
+            <item id="cis_list" _delta="define">
+              <rank>30</rank>
+            </item>
+          </items>
+        </details>
+      </presentation>
+    </class>
+    <class id="Team" _delta="must_exist">
+      <presentation>
+        <details>
+          <items>
+            <item id="cis_list" _delta="define">
+              <rank>90</rank>
+            </item>
+          </items>
+        </details>
+      </presentation>
+    </class>
+    <class id="DocumentFile" _delta="must_exist">
+      <presentation>
+        <details>
+          <items>
+            <item id="cis_list" _delta="define">
+              <rank>70</rank>
+            </item>
+          </items>>
+        </details>
+      </presentation>
+    </class>
+    <class id="DocumentWeb" _delta="must_exist">
+      <presentation>
+        <details>
+          <items>
+            <item id="cis_list" _delta="define">
+              <rank>60</rank>
+            </item>
+          </items>
+        </details>
+      </presentation>
+    </class>
+    <class id="DocumentNote" _delta="must_exist">
+      <presentation>
+        <details>
+          <items>
+            <item id="cis_list" _delta="define">
+              <rank>70</rank>
+            </item>
+          </items>
+        </details>
+      </presentation>
+    </class>
 	</classes>
 	<menus>
 		<menu id="WelcomeMenuPage" xsi:type="DashboardMenuNode" _delta="must_exist">
diff --git a/datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml b/datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml
index 5c35e4686..ea8a73ab7 100755
--- a/datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml
+++ b/datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml
@@ -2429,6 +2429,48 @@ public function PrefillSearchForm(&$aContextParam)
         </list>
       </presentation>
     </class>
+    <class id="DocumentFile" _delta="must_exist">
+      <presentation>
+        <details>
+          <items>
+            <item id="contracts_list" _delta="define">
+              <rank>80</rank>
+            </item>
+            <item id="services_list" _delta="define">
+              <rank>90</rank>
+            </item>
+          </items>
+        </details>
+      </presentation>
+    </class>
+    <class id="DocumentNote" _delta="must_exist">
+      <presentation>
+        <details>
+          <items>
+            <item id="contracts_list" _delta="define">
+              <rank>80</rank>
+            </item>
+            <item id="services_list" _delta="define">
+              <rank>90</rank>
+            </item>
+          </items>
+        </details>
+      </presentation>
+    </class>
+    <class id="DocumentWeb" _delta="must_exist">
+      <presentation>
+        <details>
+          <items>
+            <item id="contracts_list" _delta="define">
+              <rank>70</rank>
+            </item>
+            <item id="services_list" _delta="define">
+              <rank>80</rank>
+            </item>
+          </items>
+        </details>
+      </presentation>
+    </class>
   </classes>
   <menus>
     <menu id="ServiceManagement" xsi:type="MenuGroup" _delta="define">
diff --git a/datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml b/datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml
index 43f3854ec..1f79591e1 100755
--- a/datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml
+++ b/datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml
@@ -2262,6 +2262,48 @@ public function PrefillSearchForm(&$aContextParam)
 				</list>
 			</presentation>
 		</class>
+    <class id="DocumentFile" _delta="must_exist">
+      <presentation>
+        <details>
+          <items>
+            <item id="contracts_list" _delta="define">
+              <rank>80</rank>
+            </item>
+            <item id="services_list" _delta="define">
+              <rank>90</rank>
+            </item>
+          </items>
+        </details>
+      </presentation>
+    </class>
+    <class id="DocumentNote" _delta="must_exist">
+      <presentation>
+        <details>
+          <items>
+            <item id="contracts_list" _delta="define">
+              <rank>80</rank>
+            </item>
+            <item id="services_list" _delta="define">
+              <rank>90</rank>
+            </item>
+          </items>
+        </details>
+      </presentation>
+    </class>
+    <class id="DocumentWeb" _delta="must_exist">
+      <presentation>
+        <details>
+          <items>
+            <item id="contracts_list" _delta="define">
+              <rank>70</rank>
+            </item>
+            <item id="services_list" _delta="define">
+              <rank>80</rank>
+            </item>
+          </items>
+        </details>
+      </presentation>
+    </class>
 	</classes>
 	<menus>
 		<menu id="ServiceManagement" xsi:type="MenuGroup" _delta="define">
diff --git a/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml b/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
index 6b183e8de..a60a7dce4 100755
--- a/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
+++ b/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
@@ -722,6 +722,46 @@
 				</details>
 			</presentation>
 		</class>
+    <class id="Person" _delta="must_exist">
+      <fields>
+        <field id="tickets_list" xsi:type="AttributeLinkedSet" _delta="define">
+          <linked_class>Ticket</linked_class>
+          <ext_key_to_me>caller_id</ext_key_to_me>
+          <edit_mode>add_only</edit_mode>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+        </field>
+      </fields>
+      <presentation>
+        <details>
+          <items>
+            <item id="tickets_list" _delta="define">
+              <rank>20</rank>
+            </item>
+          </items>
+        </details>
+      </presentation>
+    </class>
+    <class id="Team" _delta="must_exist">
+      <fields>
+        <field id="tickets_list" xsi:type="AttributeLinkedSet" _delta="define">
+          <linked_class>Ticket</linked_class>
+          <ext_key_to_me>team_id</ext_key_to_me>
+          <edit_mode>none</edit_mode>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+        </field>
+      </fields>
+      <presentation>
+        <details>
+          <items>
+            <item id="tickets_list" _delta="define">
+              <rank>90</rank>
+            </item>
+          </items>
+        </details>
+      </presentation>
+    </class>
 	</classes>
 	<meta>
 		<classes>