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 b3f381390..a879729f2 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
@@ -109,6 +109,16 @@
           <count_min>0</count_min>
           <count_max>0</count_max>
         </field>
+        <field id="groups_list" xsi:type="AttributeLinkedSetIndirect">
+          <linked_class>lnkGroupToCI</linked_class>
+          <ext_key_to_me>functionalci_id</ext_key_to_me>
+          <ext_key_to_remote>group_id</ext_key_to_remote>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <duplicates>false</duplicates>
+          <filter>SELECT Group WHERE status = 'active'</filter>
+          <display_style>property</display_style>
+        </field>
       </fields>
       <presentation>
         <details>
@@ -907,6 +917,9 @@
             <item id="fiberinterfacelist_list">
               <rank>220</rank>
             </item>
+            <item id="groups_list">
+              <rank>230</rank>
+            </item>
           </items>
         </details>
         <default_search>
@@ -1165,6 +1178,9 @@
                     <item id="description">
                       <rank>10</rank>
                     </item>
+                    <item id="groups_list">
+                      <rank>20</rank>
+                    </item>
                   </items>
                 </item>
               </items>
@@ -1554,6 +1570,9 @@
                     <item id="description">
                       <rank>10</rank>
                     </item>
+                    <item id="groups_list">
+                      <rank>20</rank>
+                    </item>
                   </items>
                 </item>
               </items>
@@ -1794,9 +1813,12 @@
                     <item id="description">
                       <rank>10</rank>
                     </item>
-                    <item id="logo">
+                    <item id="groups_list">
                       <rank>20</rank>
                     </item>
+                    <item id="logo">
+                      <rank>30</rank>
+                    </item>
                   </items>
                   <rank>20</rank>
                 </item>
@@ -1987,9 +2009,12 @@
                     <item id="description">
                       <rank>10</rank>
                     </item>
-                    <item id="logo">
+                    <item id="groups_list">
                       <rank>20</rank>
                     </item>
+                    <item id="logo">
+                      <rank>30</rank>
+                    </item>
                   </items>
                   <rank>20</rank>
                 </item>
@@ -2385,6 +2410,9 @@
                     <item id="description">
                       <rank>10</rank>
                     </item>
+                    <item id="groups_list">
+                      <rank>20</rank>
+                    </item>
                   </items>
                   <rank>20</rank>
                 </item>
@@ -2569,6 +2597,9 @@
                     <item id="description">
                       <rank>10</rank>
                     </item>
+                    <item id="groups_list">
+                      <rank>20</rank>
+                    </item>
                   </items>
                   <rank>20</rank>
                 </item>
@@ -2753,6 +2784,9 @@
                     <item id="description">
                       <rank>10</rank>
                     </item>
+                    <item id="groups_list">
+                      <rank>20</rank>
+                    </item>
                   </items>
                   <rank>20</rank>
                 </item>
@@ -2929,6 +2963,9 @@
                     <item id="description">
                       <rank>10</rank>
                     </item>
+                    <item id="groups_list">
+                      <rank>20</rank>
+                    </item>
                   </items>
                   <rank>20</rank>
                 </item>
@@ -3092,6 +3129,9 @@
                     <item id="description">
                       <rank>10</rank>
                     </item>
+                    <item id="groups_list">
+                      <rank>20</rank>
+                    </item>
                   </items>
                   <rank>20</rank>
                 </item>
@@ -3266,9 +3306,12 @@
                     <item id="description">
                       <rank>10</rank>
                     </item>
-                    <item id="logo">
+                    <item id="groups_list">
                       <rank>20</rank>
                     </item>
+                    <item id="logo">
+                      <rank>30</rank>
+                    </item>
                   </items>
                   <rank>20</rank>
                 </item>
@@ -3436,6 +3479,9 @@
                     <item id="description">
                       <rank>10</rank>
                     </item>
+                    <item id="groups_list">
+                      <rank>20</rank>
+                    </item>
                   </items>
                   <rank>20</rank>
                 </item>
@@ -3622,9 +3668,12 @@
                     <item id="description">
                       <rank>10</rank>
                     </item>
-                    <item id="logo">
+                    <item id="groups_list">
                       <rank>20</rank>
                     </item>
+                    <item id="logo">
+                      <rank>30</rank>
+                    </item>
                   </items>
                   <rank>20</rank>
                 </item>
@@ -3800,6 +3849,16 @@
           <storage_max_height>128</storage_max_height>
           <is_null_allowed>true</is_null_allowed>
         </field>
+        <field id="end_of_support" xsi:type="AttributeDate">
+          <sql>end_of_support</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="end_of_life" xsi:type="AttributeDate">
+          <sql>end_of_life</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
         <field id="softwareinstance_list" xsi:type="AttributeLinkedSet">
           <linked_class>SoftwareInstance</linked_class>
           <ext_key_to_me>software_id</ext_key_to_me>
@@ -3855,13 +3914,21 @@
             </item>
             <item id="col:col2">
               <items>
+                <item id="fieldset:ConfigMgmt:dates">
+                  <items>
+                    <item id="end_of_support">
+                      <rank>10</rank>
+                    </item>
+                  </items>
+                  <rank>10</rank>
+                </item>
                 <item id="fieldset:ConfigMgmt:otherinfo">
                   <items>
                     <item id="logo">
                       <rank>20</rank>
                     </item>
                   </items>
-                  <rank>10</rank>
+                  <rank>20</rank>
                 </item>
               </items>
               <rank>20</rank>
@@ -5320,6 +5387,16 @@
           <storage_max_height>512</storage_max_height>
           <is_null_allowed>true</is_null_allowed>
         </field>
+        <field id="end_of_support" xsi:type="AttributeDate">
+          <sql>end_of_support</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="end_of_life" xsi:type="AttributeDate">
+          <sql>end_of_life</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
         <field id="type" xsi:type="AttributeEnum">
           <sort_type>label</sort_type>
           <values>
@@ -5402,6 +5479,9 @@
             <item id="brand_id">
               <rank>20</rank>
             </item>
+            <item id="end_of_support">
+              <rank>25</rank>
+            </item>
             <item id="picture">
               <rank>30</rank>
             </item>
@@ -5465,6 +5545,9 @@
             <attribute id="name"/>
           </attributes>
         </naming>
+        <fields_semantic>
+          <image_attribute>logo</image_attribute>
+        </fields_semantic>
         <style>
           <icon/>
         </style>
@@ -6985,6 +7068,9 @@
                     <item id="comment">
                       <rank>10</rank>
                     </item>
+                    <item id="groups_list">
+                      <rank>20</rank>
+                    </item>
                   </items>
                   <rank>10</rank>
                 </item>
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 d77c8a9f4..9bb5ca910 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
@@ -103,6 +103,8 @@ Dict::Add('EN US', 'English', 'English', [
 	'Class:FunctionalCI/Attribute:business_criticity/Value:medium+' => 'medium',
 	'Class:FunctionalCI/Attribute:move2production' => 'Move to production date',
 	'Class:FunctionalCI/Attribute:move2production+' => '',
+	'Class:FunctionalCI/Attribute:groups_list' => 'Groups',
+	'Class:FunctionalCI/Attribute:groups_list+' => 'Groups can be used as tags, to document environment, projects (migration, upgrade, security), etc…',
 	'Class:FunctionalCI/Attribute:contacts_list' => 'Contacts',
 	'Class:FunctionalCI/Attribute:contacts_list+' => 'All the contacts for this configuration item',
 	'Class:FunctionalCI/Attribute:documents_list' => 'Documents',
diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/fr.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/fr.dict.itop-config-mgmt.php
index 63ac04e40..e72455c2f 100644
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/fr.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/fr.dict.itop-config-mgmt.php
@@ -87,6 +87,8 @@ Dict::Add('FR FR', 'French', 'Français', [
 	'Class:FunctionalCI/Attribute:business_criticity/Value:medium+' => 'moyenne',
 	'Class:FunctionalCI/Attribute:move2production' => 'Date de mise en production',
 	'Class:FunctionalCI/Attribute:move2production+' => '',
+	'Class:FunctionalCI/Attribute:groups_list' => 'Groupes',
+	'Class:FunctionalCI/Attribute:groups_list+' => 'Les groupes sont des sortes d\étiquettes qui permettent d\identifier des environnements de travail, l\'appartenance à des projets ou les équipements qui doivent être mise à jour, déplacés, remplacés, etc…',
 	'Class:FunctionalCI/Attribute:contacts_list' => 'Contacts',
 	'Class:FunctionalCI/Attribute:contacts_list+' => 'Tous les contacts de cet élément de configuration',
 	'Class:FunctionalCI/Attribute:documents_list' => 'Documents',
diff --git a/datamodels/2.x/itop-container-mgmt/datamodel.itop-container-mgmt.xml b/datamodels/2.x/itop-container-mgmt/datamodel.itop-container-mgmt.xml
index d654e81ec..fec2134fb 100644
--- a/datamodels/2.x/itop-container-mgmt/datamodel.itop-container-mgmt.xml
+++ b/datamodels/2.x/itop-container-mgmt/datamodel.itop-container-mgmt.xml
@@ -438,9 +438,12 @@
                     <item id="description">
                       <rank>10</rank>
                     </item>
-                    <item id="logo">
+                    <item id="groups_list">
                       <rank>20</rank>
                     </item>
+                    <item id="logo">
+                      <rank>30</rank>
+                    </item>
                   </items>
                   <rank>20</rank>
                 </item>
@@ -993,6 +996,9 @@
                     <item id="description">
                       <rank>10</rank>
                     </item>
+                    <item id="groups_list">
+                      <rank>20</rank>
+                    </item>
                   </items>
                   <rank>20</rank>
                 </item>
@@ -1196,6 +1202,9 @@
                     <item id="description">
                       <rank>10</rank>
                     </item>
+                    <item id="groups_list">
+                      <rank>20</rank>
+                    </item>
                   </items>
                   <rank>20</rank>
                 </item>
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 be9652e86..80862859a 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
@@ -109,13 +109,13 @@
                   <rank>10</rank>
                   <items>
                     <item id="move2production">
-                      <rank>110</rank>
+                      <rank>10</rank>
                     </item>
                     <item id="purchase_date">
-                      <rank>120</rank>
+                      <rank>20</rank>
                     </item>
                     <item id="end_of_warranty">
-                      <rank>130</rank>
+                      <rank>30</rank>
                     </item>
                   </items>
                 </item>
@@ -123,7 +123,10 @@
                   <rank>20</rank>
                   <items>
                     <item id="description">
-                      <rank>140</rank>
+                      <rank>10</rank>
+                    </item>
+                    <item id="groups_list">
+                      <rank>20</rank>
                     </item>
                   </items>
                 </item>
@@ -358,6 +361,9 @@
                     <item id="description">
                       <rank>10</rank>
                     </item>
+                    <item id="groups_list">
+                      <rank>20</rank>
+                    </item>
                   </items>
                 </item>
               </items>
@@ -565,6 +571,9 @@
                     <item id="description">
                       <rank>10</rank>
                     </item>
+                    <item id="groups_list">
+                      <rank>20</rank>
+                    </item>
                   </items>
                 </item>
               </items>
@@ -768,6 +777,9 @@
                     <item id="description">
                       <rank>10</rank>
                     </item>
+                    <item id="groups_list">
+                      <rank>20</rank>
+                    </item>
                   </items>
                 </item>
               </items>
@@ -997,6 +1009,9 @@
                     <item id="description">
                       <rank>10</rank>
                     </item>
+                    <item id="groups_list">
+                      <rank>20</rank>
+                    </item>
                   </items>
                 </item>
               </items>
diff --git a/datamodels/2.x/itop-endusers-devices/datamodel.itop-endusers-devices.xml b/datamodels/2.x/itop-endusers-devices/datamodel.itop-endusers-devices.xml
index 5fa8387ba..9e8b233b8 100755
--- a/datamodels/2.x/itop-endusers-devices/datamodel.itop-endusers-devices.xml
+++ b/datamodels/2.x/itop-endusers-devices/datamodel.itop-endusers-devices.xml
@@ -90,6 +90,9 @@
             <item id="documents_list">
               <rank>160</rank>
             </item>
+            <item id="groups_list">
+              <rank>170</rank>
+            </item>
           </items>
         </details>
         <search>
@@ -261,6 +264,9 @@
                     <item id="description">
                       <rank>10</rank>
                     </item>
+                    <item id="groups_list">
+                      <rank>20</rank>
+                    </item>
                   </items>
                 </item>
               </items>
@@ -478,6 +484,9 @@
                     <item id="description">
                       <rank>10</rank>
                     </item>
+                    <item id="groups_list">
+                      <rank>20</rank>
+                    </item>
                   </items>
                 </item>
               </items>
@@ -681,6 +690,9 @@
                     <item id="description">
                       <rank>10</rank>
                     </item>
+                    <item id="groups_list">
+                      <rank>20</rank>
+                    </item>
                   </items>
                 </item>
               </items>
@@ -877,6 +889,9 @@
                     <item id="description">
                       <rank>10</rank>
                     </item>
+                    <item id="groups_list">
+                      <rank>20</rank>
+                    </item>
                   </items>
                 </item>
               </items>
@@ -1138,6 +1153,9 @@
                     <item id="description">
                       <rank>10</rank>
                     </item>
+                    <item id="groups_list">
+                      <rank>20</rank>
+                    </item>
                   </items>
                 </item>
               </items>
@@ -1344,6 +1362,9 @@
                     <item id="description">
                       <rank>10</rank>
                     </item>
+                    <item id="groups_list">
+                      <rank>20</rank>
+                    </item>
                   </items>
                 </item>
               </items>
@@ -1544,6 +1565,9 @@
                     <item id="description">
                       <rank>10</rank>
                     </item>
+                    <item id="groups_list">
+                      <rank>20</rank>
+                    </item>
                   </items>
                 </item>
               </items>
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 538b989bc..229772314 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
@@ -158,6 +158,9 @@
                     <item id="description">
                       <rank>10</rank>
                     </item>
+                    <item id="groups_list">
+                      <rank>20</rank>
+                    </item>
                   </items>
                 </item>
               </items>
@@ -417,6 +420,9 @@
                     <item id="description">
                       <rank>10</rank>
                     </item>
+                    <item id="groups_list">
+                      <rank>20</rank>
+                    </item>
                   </items>
                 </item>
               </items>
@@ -676,6 +682,9 @@
                     <item id="description">
                       <rank>10</rank>
                     </item>
+                    <item id="groups_list">
+                      <rank>20</rank>
+                    </item>
                   </items>
                 </item>
               </items>
@@ -935,6 +944,9 @@
                     <item id="description">
                       <rank>10</rank>
                     </item>
+                    <item id="groups_list">
+                      <rank>20</rank>
+                    </item>
                   </items>
                 </item>
               </items>
@@ -1436,6 +1448,19 @@
                 </item>
               </items>
             </item>
+            <item id="col:col2">
+              <rank>20</rank>
+              <items>
+                <item id="fieldset:ConfigMgmt:otherinfo">
+                  <rank>20</rank>
+                  <items>
+                    <item id="groups_list">
+                      <rank>10</rank>
+                    </item>
+                  </items>
+                </item>
+              </items>
+            </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 2633bee89..2968249ee 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
@@ -421,6 +421,9 @@
                     <item id="description">
                       <rank>10</rank>
                     </item>
+                    <item id="groups_list">
+                      <rank>20</rank>
+                    </item>
                   </items>
                   <rank>20</rank>
                 </item>
@@ -598,6 +601,9 @@
                       <item id="description">
                         <rank>10</rank>
                       </item>
+                      <item id="groups_list">
+                        <rank>20</rank>
+                      </item>
                     </items>
                     <rank>20</rank>
                   </item>
@@ -864,6 +870,9 @@
                     <item id="description">
                       <rank>10</rank>
                     </item>
+                    <item id="groups_list">
+                      <rank>20</rank>
+                    </item>
                   </items>
                 </item>
               </items>
@@ -1022,6 +1031,9 @@
                     <item id="comment">
                       <rank>20</rank>
                     </item>
+                    <item id="groups_list">
+                      <rank>20</rank>
+                    </item>
                   </items>
                   <rank>20</rank>
                 </item>
@@ -1253,9 +1265,12 @@
                     <item id="description">
                       <rank>10</rank>
                     </item>
-                    <item id="logo">
+                    <item id="groups_list">
                       <rank>20</rank>
                     </item>
+                    <item id="logo">
+                      <rank>30</rank>
+                    </item>
                   </items>
                   <rank>20</rank>
                 </item>