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 e2cd9b9e2..cfeebb9d9 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
@@ -6152,6 +6152,14 @@
           <extkey_attcode>connectableci_id</extkey_attcode>
           <target_attcode>name</target_attcode>
         </field>
+        <field id="org_id" xsi:type="AttributeExternalField">
+          <extkey_attcode>connectableci_id</extkey_attcode>
+          <target_attcode>org_id</target_attcode>
+        </field>
+        <field id="location_id" xsi:type="AttributeExternalField">
+          <extkey_attcode>connectableci_id</extkey_attcode>
+          <target_attcode>location_id</target_attcode>
+        </field>
         <field id="vlans_list" xsi:type="AttributeLinkedSetIndirect">
           <linked_class>lnkPhysicalInterfaceToVLAN</linked_class>
           <ext_key_to_me>physicalinterface_id</ext_key_to_me>
@@ -6172,27 +6180,33 @@
             <item id="connectableci_id">
               <rank>20</rank>
             </item>
-            <item id="ipaddress">
+            <item id="location_id">
               <rank>30</rank>
             </item>
-            <item id="macaddress">
+            <item id="org_id">
               <rank>40</rank>
             </item>
-            <item id="comment">
+            <item id="ipaddress">
               <rank>50</rank>
             </item>
-            <item id="ipgateway">
+            <item id="macaddress">
               <rank>60</rank>
             </item>
-            <item id="ipmask">
+            <item id="comment">
               <rank>70</rank>
             </item>
-            <item id="speed">
+            <item id="ipgateway">
               <rank>80</rank>
             </item>
-            <item id="vlans_list">
+            <item id="ipmask">
               <rank>90</rank>
             </item>
+            <item id="speed">
+              <rank>100</rank>
+            </item>
+            <item id="vlans_list">
+              <rank>110</rank>
+            </item>
           </items>
         </details>
         <search>
@@ -6233,6 +6247,22 @@
             </item>
           </items>
         </list>
+        <summary>
+          <items>
+            <item id="ipaddress">
+              <rank>10</rank>
+            </item>
+            <item id="connectableci_id">
+              <rank>20</rank>
+            </item>
+            <item id="location_id">
+              <rank>30</rank>
+            </item>
+            <item id="org_id">
+              <rank>40</rank>
+            </item>
+          </items>
+        </summary>
       </presentation>
     </class>
     <class id="lnkPhysicalInterfaceToVLAN" _delta="define">
diff --git a/datamodels/2.x/itop-storage-mgmt/datamodel.itop-storage-mgmt.xml b/datamodels/2.x/itop-storage-mgmt/datamodel.itop-storage-mgmt.xml
index 6832673f1..1dafa62a1 100644
--- a/datamodels/2.x/itop-storage-mgmt/datamodel.itop-storage-mgmt.xml
+++ b/datamodels/2.x/itop-storage-mgmt/datamodel.itop-storage-mgmt.xml
@@ -1203,6 +1203,14 @@
           <extkey_attcode>nas_id</extkey_attcode>
           <target_attcode>name</target_attcode>
         </field>
+        <field id="org_id" xsi:type="AttributeExternalField">
+          <extkey_attcode>nas_id</extkey_attcode>
+          <target_attcode>org_id</target_attcode>
+        </field>
+        <field id="location_id" xsi:type="AttributeExternalField">
+          <extkey_attcode>nas_id</extkey_attcode>
+          <target_attcode>location_id</target_attcode>
+        </field>
         <field id="location_name" xsi:type="AttributeExternalField">
           <extkey_attcode>nas_id</extkey_attcode>
           <target_attcode>location_name</target_attcode>
@@ -1214,18 +1222,24 @@
             <item id="name">
               <rank>10</rank>
             </item>
-            <item id="description">
+            <item id="nas_id">
               <rank>20</rank>
             </item>
-            <item id="nas_id">
+            <item id="location_id">
               <rank>30</rank>
             </item>
-            <item id="raid_level">
+            <item id="org_id">
               <rank>40</rank>
             </item>
-            <item id="size">
+            <item id="description">
               <rank>50</rank>
             </item>
+            <item id="raid_level">
+              <rank>60</rank>
+            </item>
+            <item id="size">
+              <rank>70</rank>
+            </item>
           </items>
         </details>
         <search>
@@ -1256,18 +1270,18 @@
         </list>
         <summary>
           <items>
-            <item id="description">
+            <item id="nas_id">
+              <rank>10</rank>
+            </item>
+            <item id="location_id">
               <rank>20</rank>
             </item>
-            <item id="nas_id">
+            <item id="org_id">
               <rank>30</rank>
             </item>
             <item id="raid_level">
               <rank>40</rank>
             </item>
-            <item id="size">
-              <rank>50</rank>
-            </item>
           </items>
         </summary>
       </presentation>
@@ -1330,6 +1344,14 @@
           <extkey_attcode>datacenterdevice_id</extkey_attcode>
           <target_attcode>name</target_attcode>
         </field>
+        <field id="org_id" xsi:type="AttributeExternalField">
+          <extkey_attcode>datacenterdevice_id</extkey_attcode>
+          <target_attcode>org_id</target_attcode>
+        </field>
+        <field id="location_id" xsi:type="AttributeExternalField">
+          <extkey_attcode>datacenterdevice_id</extkey_attcode>
+          <target_attcode>location_id</target_attcode>
+        </field>
       </fields>
       <methods/>
       <presentation>
@@ -1341,15 +1363,21 @@
             <item id="datacenterdevice_id">
               <rank>20</rank>
             </item>
-            <item id="speed">
+            <item id="location_id">
               <rank>30</rank>
             </item>
-            <item id="topology">
+            <item id="org_id">
               <rank>40</rank>
             </item>
-            <item id="wwn">
+            <item id="speed">
               <rank>50</rank>
             </item>
+            <item id="topology">
+              <rank>60</rank>
+            </item>
+            <item id="wwn">
+              <rank>70</rank>
+            </item>
           </items>
         </details>
         <search>
@@ -1381,6 +1409,22 @@
             </item>
           </items>
         </list>
+        <summary>
+          <items>
+            <item id="wwn">
+              <rank>10</rank>
+            </item>
+            <item id="datacenterdevice_id">
+              <rank>20</rank>
+            </item>
+            <item id="location_id">
+              <rank>30</rank>
+            </item>
+            <item id="org_id">
+              <rank>40</rank>
+            </item>
+          </items>
+        </summary>
       </presentation>
     </class>
     <class id="LogicalVolume" _delta="define">
@@ -1452,6 +1496,18 @@
           <extkey_attcode>storagesystem_id</extkey_attcode>
           <target_attcode>name</target_attcode>
         </field>
+        <field id="org_id" xsi:type="AttributeExternalField">
+          <extkey_attcode>storagesystem_id</extkey_attcode>
+          <target_attcode>org_id</target_attcode>
+        </field>
+        <field id="location_id" xsi:type="AttributeExternalField">
+          <extkey_attcode>storagesystem_id</extkey_attcode>
+          <target_attcode>location_id</target_attcode>
+        </field>
+        <field id="location_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>storagesystem_id</extkey_attcode>
+          <target_attcode>location_name</target_attcode>
+        </field>
         <field id="servers_list" xsi:type="AttributeLinkedSetIndirect">
           <linked_class>lnkServerToVolume</linked_class>
           <ext_key_to_me>volume_id</ext_key_to_me>
@@ -1480,24 +1536,30 @@
             <item id="lun_id">
               <rank>20</rank>
             </item>
-            <item id="description">
+            <item id="storagesystem_id">
               <rank>30</rank>
             </item>
-            <item id="storagesystem_id">
+            <item id="location_id">
               <rank>40</rank>
             </item>
-            <item id="raid_level">
+            <item id="org_id">
               <rank>50</rank>
             </item>
-            <item id="size">
+            <item id="description">
               <rank>60</rank>
             </item>
-            <item id="servers_list">
+            <item id="raid_level">
               <rank>70</rank>
             </item>
-            <item id="virtualdevices_list">
+            <item id="size">
               <rank>80</rank>
             </item>
+            <item id="servers_list">
+              <rank>90</rank>
+            </item>
+            <item id="virtualdevices_list">
+              <rank>100</rank>
+            </item>
           </items>
         </details>
         <search>
@@ -1508,12 +1570,18 @@
             <item id="lun_id">
               <rank>20</rank>
             </item>
-            <item id="storagesystem_id">
+            <item id="raid_level">
               <rank>30</rank>
             </item>
-            <item id="raid_level">
+            <item id="storagesystem_id">
               <rank>40</rank>
             </item>
+            <item id="location_id">
+              <rank>70</rank>
+            </item>
+            <item id="org_id">
+              <rank>80</rank>
+            </item>
           </items>
         </search>
         <list>
@@ -1530,11 +1598,20 @@
             <item id="size">
               <rank>40</rank>
             </item>
+            <item id="location_id">
+              <rank>50</rank>
+            </item>
+            <item id="org_id">
+              <rank>60</rank>
+            </item>
           </items>
         </list>
         <summary>
           <items>
             <item id="lun_id">
+              <rank>10</rank>
+            </item>
+            <item id="raid_level">
               <rank>20</rank>
             </item>
             <item id="description">
@@ -1543,10 +1620,10 @@
             <item id="storagesystem_id">
               <rank>40</rank>
             </item>
-            <item id="raid_level">
+            <item id="location_id">
               <rank>50</rank>
             </item>
-            <item id="size">
+            <item id="org_id">
               <rank>60</rank>
             </item>
           </items>
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 95ad1837b..d7304cccc 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
@@ -860,6 +860,10 @@
           <is_null_allowed>false</is_null_allowed>
           <on_target_delete>DEL_AUTO</on_target_delete>
         </field>
+        <field id="org_id" xsi:type="AttributeExternalField">
+          <extkey_attcode>virtualmachine_id</extkey_attcode>
+          <target_attcode>org_id</target_attcode>
+        </field>
         <field id="virtualmachine_name" xsi:type="AttributeExternalField">
           <extkey_attcode>virtualmachine_id</extkey_attcode>
           <target_attcode>name</target_attcode>
@@ -870,29 +874,32 @@
         <details>
           <items>
             <item id="name">
-              <rank>5</rank>
-            </item>
-            <item id="ipaddress">
               <rank>10</rank>
             </item>
-            <item id="macaddress">
+            <item id="virtualmachine_id">
               <rank>20</rank>
             </item>
-            <item id="comment">
-              <rank>30</rank>
-            </item>
-            <item id="ipgateway">
+            <item id="org_id">
               <rank>40</rank>
             </item>
-            <item id="ipmask">
+            <item id="ipaddress">
               <rank>50</rank>
             </item>
-            <item id="speed">
+            <item id="macaddress">
               <rank>60</rank>
             </item>
-            <item id="virtualmachine_id">
+            <item id="comment">
               <rank>70</rank>
             </item>
+            <item id="ipgateway">
+              <rank>80</rank>
+            </item>
+            <item id="ipmask">
+              <rank>90</rank>
+            </item>
+            <item id="speed">
+              <rank>100</rank>
+            </item>
           </items>
         </details>
         <search>
@@ -936,6 +943,22 @@
             </item>
           </items>
         </list>
+        <summary>
+          <items>
+            <item id="ipaddress">
+              <rank>10</rank>
+            </item>
+            <item id="macaddress">
+              <rank>20</rank>
+            </item>
+            <item id="virtualmachine_id">
+              <rank>30</rank>
+            </item>
+            <item id="org_id">
+              <rank>40</rank>
+            </item>
+          </items>
+        </summary>
       </presentation>
     </class>
     <class id="Server">