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 d4d8bd1ac..e2cd9b9e2 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
@@ -1243,6 +1243,28 @@
             </item>
           </items>
         </list>
+        <summary>
+          <items>
+            <item id="org_id">
+              <rank>10</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>20</rank>
+            </item>
+            <item id="location_id">
+              <rank>30</rank>
+            </item>
+            <item id="rack_id">
+              <rank>40</rank>
+            </item>
+            <item id="networkdevicetype_id">
+              <rank>60</rank>
+            </item>
+            <item id="model_id">
+              <rank>80</rank>
+            </item>
+          </items>
+        </summary>
       </presentation>
       <methods/>
       <relations>
@@ -1564,6 +1586,28 @@
             </item>
           </items>
         </list>
+        <summary>
+          <items>
+            <item id="org_id">
+              <rank>10</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>20</rank>
+            </item>
+            <item id="location_id">
+              <rank>30</rank>
+            </item>
+            <item id="rack_id">
+              <rank>40</rank>
+            </item>
+            <item id="enclosure_id">
+              <rank>50</rank>
+            </item>
+            <item id="model_id">
+              <rank>60</rank>
+            </item>
+          </items>
+        </summary>
       </presentation>
       <methods/>
     </class>
@@ -1720,6 +1764,19 @@
             </item>
           </items>
         </list>
+        <summary>
+          <items>
+            <item id="org_id">
+              <rank>10</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>20</rank>
+            </item>
+            <item id="description">
+              <rank>30</rank>
+            </item>
+          </items>
+        </summary>
       </presentation>
       <methods/>
       <relations>
@@ -1862,6 +1919,19 @@
             </item>
           </items>
         </list>
+        <summary>
+          <items>
+            <item id="org_id">
+              <rank>10</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>20</rank>
+            </item>
+            <item id="description">
+              <rank>30</rank>
+            </item>
+          </items>
+        </summary>
       </presentation>
       <methods/>
     </class>
@@ -2189,6 +2259,28 @@
             </item>
           </items>
         </list>
+        <summary>
+          <items>
+            <item id="org_id">
+              <rank>10</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>20</rank>
+            </item>
+            <item id="system_id">
+              <rank>30</rank>
+            </item>
+            <item id="software_id">
+              <rank>40</rank>
+            </item>
+            <item id="softwarelicence_id">
+              <rank>50</rank>
+            </item>
+            <item id="description">
+              <rank>60</rank>
+            </item>
+          </items>
+        </summary>
       </presentation>
       <methods/>
       <relations>
@@ -2323,6 +2415,28 @@
             </item>
           </items>
         </list>
+        <summary>
+          <items>
+            <item id="org_id">
+              <rank>10</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>20</rank>
+            </item>
+            <item id="system_id">
+              <rank>30</rank>
+            </item>
+            <item id="software_id">
+              <rank>40</rank>
+            </item>
+            <item id="softwarelicence_id">
+              <rank>50</rank>
+            </item>
+            <item id="description">
+              <rank>60</rank>
+            </item>
+          </items>
+        </summary>
       </presentation>
       <methods/>
       <relations>
@@ -2457,6 +2571,28 @@
             </item>
           </items>
         </list>
+        <summary>
+          <items>
+            <item id="org_id">
+              <rank>10</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>20</rank>
+            </item>
+            <item id="system_id">
+              <rank>30</rank>
+            </item>
+            <item id="software_id">
+              <rank>40</rank>
+            </item>
+            <item id="softwarelicence_id">
+              <rank>50</rank>
+            </item>
+            <item id="description">
+              <rank>60</rank>
+            </item>
+          </items>
+        </summary>
       </presentation>
       <methods/>
       <relations>
@@ -2578,6 +2714,28 @@
             </item>
           </items>
         </list>
+        <summary>
+          <items>
+            <item id="org_id">
+              <rank>10</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>20</rank>
+            </item>
+            <item id="system_id">
+              <rank>30</rank>
+            </item>
+            <item id="software_id">
+              <rank>40</rank>
+            </item>
+            <item id="softwarelicence_id">
+              <rank>50</rank>
+            </item>
+            <item id="description">
+              <rank>60</rank>
+            </item>
+          </items>
+        </summary>
       </presentation>
     </class>
     <class id="OtherSoftware" _delta="define">
@@ -2689,6 +2847,28 @@
             </item>
           </items>
         </list>
+        <summary>
+          <items>
+            <item id="org_id">
+              <rank>10</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>20</rank>
+            </item>
+            <item id="system_id">
+              <rank>30</rank>
+            </item>
+            <item id="software_id">
+              <rank>40</rank>
+            </item>
+            <item id="softwarelicence_id">
+              <rank>50</rank>
+            </item>
+            <item id="description">
+              <rank>60</rank>
+            </item>
+          </items>
+        </summary>
       </presentation>
     </class>
     <class id="MiddlewareInstance" _delta="define">
@@ -2811,6 +2991,22 @@
             </item>
           </items>
         </list>
+        <summary>
+          <items>
+            <item id="org_id">
+              <rank>10</rank>
+            </item>
+            <item id="middleware_id">
+              <rank>20</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>30</rank>
+            </item>
+            <item id="description">
+              <rank>40</rank>
+            </item>
+          </items>
+        </summary>
       </presentation>
       <methods/>
     </class>
@@ -2829,6 +3025,7 @@
           </attributes>
           <complementary_attributes>
             <attribute id="organization_name"></attribute>
+            <attribute id="dbserver_name"></attribute>
           </complementary_attributes>
         </naming>
         <style>
@@ -2931,6 +3128,22 @@
             </item>
           </items>
         </list>
+        <summary>
+          <items>
+            <item id="org_id">
+              <rank>10</rank>
+            </item>
+            <item id="dbserver_id">
+              <rank>20</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>30</rank>
+            </item>
+            <item id="description">
+              <rank>40</rank>
+            </item>
+          </items>
+        </summary>
       </presentation>
       <methods/>
     </class>
@@ -3040,12 +3253,15 @@
             <item id="org_id">
               <rank>20</rank>
             </item>
-            <item id="business_criticity">
+            <item id="webserver_id">
               <rank>30</rank>
             </item>
-            <item id="move2production">
+            <item id="business_criticity">
               <rank>40</rank>
             </item>
+            <item id="move2production">
+              <rank>50</rank>
+            </item>
           </items>
         </search>
         <list>
@@ -3053,14 +3269,36 @@
             <item id="org_id">
               <rank>10</rank>
             </item>
-            <item id="business_criticity">
+            <item id="webserver_id">
               <rank>20</rank>
             </item>
-            <item id="move2production">
+            <item id="business_criticity">
               <rank>30</rank>
             </item>
+            <item id="move2production">
+              <rank>40</rank>
+            </item>
           </items>
         </list>
+        <summary>
+          <items>
+            <item id="org_id">
+              <rank>10</rank>
+            </item>
+            <item id="webserver_id">
+              <rank>20</rank>
+            </item>
+            <item id="url">
+              <rank>30</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>40</rank>
+            </item>
+            <item id="description">
+              <rank>50</rank>
+            </item>
+          </items>
+        </summary>
       </presentation>
       <methods/>
     </class>
@@ -3177,16 +3415,16 @@
             <item id="name">
               <rank>10</rank>
             </item>
-            <item id="vendor">
+            <item id="version">
               <rank>20</rank>
             </item>
-            <item id="version">
+            <item id="vendor">
               <rank>30</rank>
             </item>
-            <item id="documents_list">
+            <item id="type">
               <rank>40</rank>
             </item>
-            <item id="type">
+            <item id="documents_list">
               <rank>50</rank>
             </item>
             <item id="softwareinstance_list">
@@ -3234,14 +3472,27 @@
             <item id="vendor">
               <rank>10</rank>
             </item>
+            <item id="type">
+              <rank>20</rank>
+            </item>
+          </items>
+        </list>
+        <summary>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
             <item id="version">
+              <rank>10</rank>
+            </item>
+            <item id="vendor">
               <rank>20</rank>
             </item>
             <item id="type">
               <rank>30</rank>
             </item>
           </items>
-        </list>
+        </summary>
       </presentation>
     </class>
     <class id="Patch" _delta="define">
@@ -3393,10 +3644,10 @@
             <item id="functionalcis_list">
               <rank>30</rank>
             </item>
-            <item id="description">
+            <item id="osversion_id">
               <rank>40</rank>
             </item>
-            <item id="osversion_id">
+            <item id="description">
               <rank>50</rank>
             </item>
           </items>
@@ -3406,10 +3657,10 @@
             <item id="name">
               <rank>10</rank>
             </item>
-            <item id="description">
+            <item id="osversion_id">
               <rank>20</rank>
             </item>
-            <item id="osversion_id">
+            <item id="description">
               <rank>30</rank>
             </item>
           </items>
@@ -3424,6 +3675,16 @@
             </item>
           </items>
         </list>
+        <summary>
+          <items>
+            <item id="osversion_id">
+              <rank>10</rank>
+            </item>
+            <item id="description">
+              <rank>20</rank>
+            </item>
+          </items>
+        </summary>
       </presentation>
     </class>
     <class id="SoftwarePatch" _delta="define">
@@ -3517,6 +3778,16 @@
             </item>
           </items>
         </list>
+        <summary>
+          <items>
+            <item id="software_id">
+              <rank>10</rank>
+            </item>
+            <item id="description">
+              <rank>20</rank>
+            </item>
+          </items>
+        </summary>
       </presentation>
     </class>
     <class id="Licence" _delta="define">
@@ -3853,6 +4124,19 @@
             </item>
           </items>
         </list>
+        <summary>
+          <items>
+            <item id="osversion_id">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="description">
+              <rank>30</rank>
+            </item>
+          </items>
+        </summary>
       </presentation>
     </class>
     <class id="SoftwareLicence" _delta="define">
@@ -3990,6 +4274,23 @@
             </item>
           </items>
         </list>
+        <summary>
+          <items>
+            <item id="software_id">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="description">
+              <rank>40</rank>
+            </item>
+            <item id="licence_key">
+              <rank>70</rank>
+            </item>
+          </items>
+
+        </summary>
       </presentation>
     </class>
     <class id="lnkDocumentToLicence" _delta="define">
@@ -4441,6 +4742,16 @@
             </item>
           </items>
         </list>
+        <summary>
+          <items>
+            <item id="brand_id">
+              <rank>10</rank>
+            </item>
+            <item id="type">
+              <rank>20</rank>
+            </item>
+          </items>
+        </summary>
       </presentation>
     </class>
     <class id="NetworkDeviceType" _delta="define">
@@ -5338,6 +5649,25 @@
             </item>
           </items>
         </list>
+        <summary>
+          <items>
+            <item id="ip">
+              <rank>10</rank>
+            </item>
+            <item id="ip_mask">
+              <rank>20</rank>
+            </item>
+            <item id="subnet_name">
+              <rank>25</rank>
+            </item>
+            <item id="org_id">
+              <rank>30</rank>
+            </item>
+            <item id="description">
+              <rank>40</rank>
+            </item>
+          </items>
+        </summary>
       </presentation>
     </class>
     <class id="VLAN" _delta="define">
@@ -5353,6 +5683,9 @@
           <attributes>
             <attribute id="vlan_tag"/>
           </attributes>
+          <complementary_attributes>
+            <attribute id="org_name"></attribute>
+          </complementary_attributes>
         </naming>
         <style>
           <icon>../../images/icons/icons8-hierarchy.svg</icon>
@@ -5457,6 +5790,16 @@
             </item>
           </items>
         </list>
+        <summary>
+          <items>
+            <item id="org_id">
+              <rank>10</rank>
+            </item>
+            <item id="description">
+              <rank>20</rank>
+            </item>
+          </items>
+        </summary>
       </presentation>
     </class>
     <class id="lnkSubnetToVLAN" _delta="define">
@@ -6664,6 +7007,22 @@
             </item>
           </items>
         </list>
+        <summary>
+          <items>
+            <item id="org_id">
+              <rank>10</rank>
+            </item>
+            <item id="type">
+              <rank>20</rank>
+            </item>
+            <item id="description">
+              <rank>30</rank>
+            </item>
+            <item id="parent_id">
+              <rank>40</rank>
+            </item>
+          </items>
+        </summary>
       </presentation>
     </class>
     <class id="lnkGroupToCI" _delta="define">
diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/en.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/en.dict.itop-config-mgmt.php
index b43bfa1eb..a95555975 100644
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/en.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/en.dict.itop-config-mgmt.php
@@ -460,7 +460,7 @@ Dict::Add('EN US', 'English', 'English', array(
 Dict::Add('EN US', 'English', 'English', array(
 	'Class:PDU' => 'PDU',
 	'Class:PDU+' => '',
-	'Class:PDU/ComplementaryName' => '%1$s - %2$s - %3$s',
+	'Class:PDU/ComplementaryName' => '%1$s - %2$s - %3$s - %4$s',
 	'Class:PDU/Attribute:rack_id' => 'Rack',
 	'Class:PDU/Attribute:rack_id+' => '',
 	'Class:PDU/Attribute:rack_name' => 'Rack name',
@@ -640,6 +640,7 @@ Dict::Add('EN US', 'English', 'English', array(
 Dict::Add('EN US', 'English', 'English', array(
 	'Class:DatabaseSchema' => 'Database Schema',
 	'Class:DatabaseSchema+' => '',
+	'Class:DatabaseSchema/ComplementaryName' => '%1$s - %2$s',
 	'Class:DatabaseSchema/Attribute:dbserver_id' => 'DB server',
 	'Class:DatabaseSchema/Attribute:dbserver_id+' => '',
 	'Class:DatabaseSchema/Attribute:dbserver_name' => 'DB server name',
diff --git a/datamodels/2.x/itop-datacenter-mgmt/datamodel.itop-datacenter-mgmt.xml b/datamodels/2.x/itop-datacenter-mgmt/datamodel.itop-datacenter-mgmt.xml
index e3c95a55a..4c9f66011 100755
--- a/datamodels/2.x/itop-datacenter-mgmt/datamodel.itop-datacenter-mgmt.xml
+++ b/datamodels/2.x/itop-datacenter-mgmt/datamodel.itop-datacenter-mgmt.xml
@@ -185,6 +185,22 @@
             </item>
           </items>
         </list>
+        <summary>
+          <items>
+            <item id="org_id">
+              <rank>10</rank>
+            </item>
+            <item id="location_id">
+              <rank>20</rank>
+            </item>
+            <item id="nb_u">
+              <rank>30</rank>
+            </item>
+            <item id="description">
+              <rank>40</rank>
+            </item>
+          </items>
+        </summary>
       </presentation>
     </class>
     <class id="Enclosure" _delta="define">
@@ -368,6 +384,22 @@
             </item>
           </items>
         </list>
+        <summary>
+          <items>
+            <item id="org_id">
+              <rank>10</rank>
+            </item>
+            <item id="location_id">
+              <rank>20</rank>
+            </item>
+            <item id="rack_id">
+              <rank>30</rank>
+            </item>
+            <item id="nb_u">
+              <rank>40</rank>
+            </item>
+          </items>
+        </summary>
       </presentation>
       <relations>
         <relation id="impacts">
@@ -704,6 +736,16 @@
             </item>
           </items>
         </list>
+        <summary>
+          <items>
+            <item id="org_id">
+              <rank>10</rank>
+            </item>
+            <item id="location_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </summary>
       </presentation>
     </class>
     <class id="PDU" _delta="define">
@@ -723,6 +765,7 @@
             <attribute id="organization_name"></attribute>
             <attribute id="location_name"/>
             <attribute id="rack_name"/>
+            <attribute id="powerstart_name"/>
           </complementary_attributes>
         </naming>
         <style>
@@ -893,6 +936,22 @@
             </item>
           </items>
         </list>
+        <summary>
+          <items>
+            <item id="org_id">
+              <rank>10</rank>
+            </item>
+            <item id="location_id">
+              <rank>20</rank>
+            </item>
+            <item id="rack_id">
+              <rank>30</rank>
+            </item>
+            <item id="powerstart_id">
+              <rank>40</rank>
+            </item>
+          </items>
+        </summary>
       </presentation>
       <methods/>
     </class>
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 37fb93bd9..0ddf68e8b 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
@@ -308,6 +308,25 @@
             </item>
           </items>
         </list>
+        <summary>
+          <items>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="location_id">
+              <rank>50</rank>
+            </item>
+            <item id="model_id">
+              <rank>70</rank>
+            </item>
+            <item id="phonenumber">
+              <rank>80</rank>
+            </item>
+            <item id="description">
+              <rank>140</rank>
+            </item>
+          </items>
+        </summary>
       </presentation>
     </class>
     <class id="MobilePhone" _delta="define">
@@ -482,6 +501,22 @@
             </item>
           </items>
         </list>
+        <summary>
+          <items>
+            <item id="org_id">
+              <rank>10</rank>
+            </item>
+            <item id="model_id">
+              <rank>70</rank>
+            </item>
+            <item id="phonenumber">
+              <rank>80</rank>
+            </item>
+            <item id="description">
+              <rank>140</rank>
+            </item>
+          </items>
+        </summary>
       </presentation>
     </class>
     <class id="IPPhone" _delta="define">
@@ -633,6 +668,25 @@
             </item>
           </items>
         </list>
+        <summary>
+          <items>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="location_id">
+              <rank>50</rank>
+            </item>
+            <item id="model_id">
+              <rank>70</rank>
+            </item>
+            <item id="phonenumber">
+              <rank>80</rank>
+            </item>
+            <item id="description">
+              <rank>140</rank>
+            </item>
+          </items>
+        </summary>
       </presentation>
     </class>
     <class id="Tablet" _delta="define">
@@ -780,6 +834,25 @@
             </item>
           </items>
         </list>
+        <summary>
+          <items>
+            <item id="org_id">
+              <rank>10</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>20</rank>
+            </item>
+            <item id="location_id">
+              <rank>30</rank>
+            </item>
+            <item id="model_id">
+              <rank>40</rank>
+            </item>
+            <item id="description">
+              <rank>50</rank>
+            </item>
+          </items>
+        </summary>
       </presentation>
     </class>
     <class id="PC" _delta="define">
@@ -1034,6 +1107,22 @@
             </item>
           </items>
         </list>
+        <summary>
+          <items>
+            <item id="org_id">
+              <rank>10</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>20</rank>
+            </item>
+            <item id="location_id">
+              <rank>30</rank>
+            </item>
+            <item id="model_id">
+              <rank>40</rank>
+            </item>
+          </items>
+        </summary>
       </presentation>
     </class>
     <class id="Printer" _delta="define">
@@ -1218,6 +1307,22 @@
             </item>
           </items>
         </list>
+        <summary>
+          <items>
+            <item id="org_id">
+              <rank>10</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>20</rank>
+            </item>
+            <item id="location_id">
+              <rank>30</rank>
+            </item>
+            <item id="model_id">
+              <rank>40</rank>
+            </item>
+          </items>
+        </summary>
       </presentation>
     </class>
     <class id="Peripheral" _delta="define">
@@ -1366,6 +1471,22 @@
             </item>
           </items>
         </list>
+        <summary>
+          <items>
+            <item id="org_id">
+              <rank>10</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>20</rank>
+            </item>
+            <item id="location_id">
+              <rank>30</rank>
+            </item>
+            <item id="model_id">
+              <rank>40</rank>
+            </item>
+          </items>
+        </summary>
       </presentation>
     </class>
   </classes>
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 274bacc44..6832673f1 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
@@ -240,6 +240,19 @@
             </item>
           </items>
         </list>
+        <summary>
+          <items>
+            <item id="org_id">
+              <rank>10</rank>
+            </item>
+            <item id="location_id">
+              <rank>20</rank>
+            </item>
+            <item id="model_id">
+              <rank>40</rank>
+            </item>
+          </items>
+        </summary>
       </presentation>
       <methods/>
       <relations>
@@ -487,6 +500,19 @@
             </item>
           </items>
         </list>
+        <summary>
+          <items>
+            <item id="org_id">
+              <rank>10</rank>
+            </item>
+            <item id="location_id">
+              <rank>20</rank>
+            </item>
+            <item id="model_id">
+              <rank>30</rank>
+            </item>
+          </items>
+        </summary>
       </presentation>
       <methods/>
       <relations>
@@ -735,6 +761,19 @@
             </item>
           </items>
         </list>
+        <summary>
+          <items>
+            <item id="org_id">
+              <rank>10</rank>
+            </item>
+            <item id="location_id">
+              <rank>20</rank>
+            </item>
+            <item id="model_id">
+              <rank>40</rank>
+            </item>
+          </items>
+        </summary>
       </presentation>
       <methods/>
       <relations>
@@ -983,6 +1022,19 @@
             </item>
           </items>
         </list>
+        <summary>
+          <items>
+            <item id="org_id">
+              <rank>10</rank>
+            </item>
+            <item id="location_id">
+              <rank>20</rank>
+            </item>
+            <item id="model_id">
+              <rank>30</rank>
+            </item>
+          </items>
+        </summary>
       </presentation>
       <methods/>
       <relations>
@@ -1102,6 +1154,10 @@
           <attributes>
             <attribute id="name"/>
           </attributes>
+          <complementary_attributes>
+            <attribute id="nas_name"></attribute>
+            <attribute id="location_name"/>
+          </complementary_attributes>
         </naming>
         <style>
           <icon>../../images/icons/icons8-map-as-drive.svg</icon>
@@ -1147,6 +1203,10 @@
           <extkey_attcode>nas_id</extkey_attcode>
           <target_attcode>name</target_attcode>
         </field>
+        <field id="location_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>nas_id</extkey_attcode>
+          <target_attcode>location_name</target_attcode>
+        </field>
       </fields>
       <presentation>
         <details>
@@ -1194,6 +1254,22 @@
             </item>
           </items>
         </list>
+        <summary>
+          <items>
+            <item id="description">
+              <rank>20</rank>
+            </item>
+            <item id="nas_id">
+              <rank>30</rank>
+            </item>
+            <item id="raid_level">
+              <rank>40</rank>
+            </item>
+            <item id="size">
+              <rank>50</rank>
+            </item>
+          </items>
+        </summary>
       </presentation>
       <methods/>
     </class>
@@ -1321,6 +1397,9 @@
             <attribute id="storagesystem_name"/>
             <attribute id="name"/>
           </attributes>
+          <complementary_attributes>
+            <attribute id="lun_id"></attribute>
+          </complementary_attributes>
         </naming>
         <style>
           <icon>../../images/icons/icons8-hdd.svg</icon>
@@ -1453,6 +1532,25 @@
             </item>
           </items>
         </list>
+        <summary>
+          <items>
+            <item id="lun_id">
+              <rank>20</rank>
+            </item>
+            <item id="description">
+              <rank>30</rank>
+            </item>
+            <item id="storagesystem_id">
+              <rank>40</rank>
+            </item>
+            <item id="raid_level">
+              <rank>50</rank>
+            </item>
+            <item id="size">
+              <rank>60</rank>
+            </item>
+          </items>
+        </summary>
       </presentation>
       <methods/>
       <relations>
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 b5537138c..95ad1837b 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
@@ -402,6 +402,25 @@
             </item>
           </items>
         </list>
+        <summary>
+          <items>
+            <item id="org_id">
+              <rank>10</rank>
+            </item>
+            <item id="server_id">
+              <rank>20</rank>
+            </item>
+            <item id="farm_id">
+              <rank>30</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>40</rank>
+            </item>
+            <item id="description">
+              <rank>50</rank>
+            </item>
+          </items>
+        </summary>
       </presentation>
       <methods/>
       <relations>
@@ -537,6 +556,19 @@
             </item>
           </items>
         </list>
+        <summary>
+          <items>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>30</rank>
+            </item>
+            <item id="description">
+              <rank>40</rank>
+            </item>
+          </items>
+        </summary>
       </presentation>
       <methods/>
     </class>
@@ -770,6 +802,25 @@
             </item>
           </items>
         </list>
+        <summary>
+          <items>
+            <item id="org_id">
+              <rank>10</rank>
+            </item>
+            <item id="virtualhost_id">
+              <rank>20</rank>
+            </item>
+            <item id="managementip">
+              <rank>30</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>40</rank>
+            </item>
+            <item id="description">
+              <rank>50</rank>
+            </item>
+          </items>
+        </summary>
       </presentation>
       <methods/>
     </class>