diff --git a/datamodels/1.x/itop-config-mgmt-1.0.0/en.dict.itop-config-mgmt.php b/datamodels/1.x/itop-config-mgmt-1.0.0/en.dict.itop-config-mgmt.php
index dac5463f2..30d42baab 100644
--- a/datamodels/1.x/itop-config-mgmt-1.0.0/en.dict.itop-config-mgmt.php
+++ b/datamodels/1.x/itop-config-mgmt-1.0.0/en.dict.itop-config-mgmt.php
@@ -223,8 +223,8 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:Contact/Attribute:ticket_list+' => 'Tickets related to the contact',
 	'Class:Contact/Attribute:team_list' => 'Teams',
 	'Class:Contact/Attribute:team_list+' => 'Teams this contact belongs to',
-	'Class:Contact/Attribute:finalclass' => 'Type',
-	'Class:Contact/Attribute:finalclass+' => '',
+	'Class:Contact/Attribute:finalclass' => 'Contact sub-class',
+	'Class:Contact/Attribute:finalclass+' => 'Name of the final class',
 ));
 
 //
@@ -450,8 +450,8 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:Software/Attribute:description+' => '',
 	'Class:Software/Attribute:instance_list' => 'Installations',
 	'Class:Software/Attribute:instance_list+' => 'Instances of this software',
-	'Class:Software/Attribute:finalclass' => 'Type',
-	'Class:Software/Attribute:finalclass+' => '',
+	'Class:Software/Attribute:finalclass' => 'Software sub-class',
+	'Class:Software/Attribute:finalclass+' => 'Name of the final class',
 ));
 
 //
@@ -538,8 +538,8 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:FunctionalCI/Attribute:contract_list+' => 'Contracts supporting this CI',
 	'Class:FunctionalCI/Attribute:ticket_list' => 'Tickets',
 	'Class:FunctionalCI/Attribute:ticket_list+' => 'Tickets related to the CI',
-	'Class:FunctionalCI/Attribute:finalclass' => 'Type',
-	'Class:FunctionalCI/Attribute:finalclass+' => '',
+	'Class:FunctionalCI/Attribute:finalclass' => 'CI sub-class',
+	'Class:FunctionalCI/Attribute:finalclass+' => 'Name of the final class',
 ));
 
 //
diff --git a/datamodels/1.x/itop-service-mgmt-1.0.0/en.dict.itop-service-mgmt.php b/datamodels/1.x/itop-service-mgmt-1.0.0/en.dict.itop-service-mgmt.php
index 7a0d4e3b4..c406c206e 100644
--- a/datamodels/1.x/itop-service-mgmt-1.0.0/en.dict.itop-service-mgmt.php
+++ b/datamodels/1.x/itop-service-mgmt-1.0.0/en.dict.itop-service-mgmt.php
@@ -105,8 +105,8 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:Contract/Attribute:document_list+' => 'Documents attached to the contract',
 	'Class:Contract/Attribute:ci_list' => 'CIs',
 	'Class:Contract/Attribute:ci_list+' => 'CI supported by the contract',
-	'Class:Contract/Attribute:finalclass' => 'Type',
-	'Class:Contract/Attribute:finalclass+' => '',
+	'Class:Contract/Attribute:finalclass' => 'Contract sub-class',
+	'Class:Contract/Attribute:finalclass+' => 'Name of the final class',
 ));
 
 //
diff --git a/datamodels/1.x/itop-tickets-1.0.0/en.dict.itop-tickets.php b/datamodels/1.x/itop-tickets-1.0.0/en.dict.itop-tickets.php
index 94399cd28..ce02a64f9 100644
--- a/datamodels/1.x/itop-tickets-1.0.0/en.dict.itop-tickets.php
+++ b/datamodels/1.x/itop-tickets-1.0.0/en.dict.itop-tickets.php
@@ -64,8 +64,8 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:Ticket/Attribute:contact_list+' => 'Team and persons involved',
 	'Class:Ticket/Attribute:incident_list' => 'Related Incidents',
 	'Class:Ticket/Attribute:incident_list+' => '',
-	'Class:Ticket/Attribute:finalclass' => 'Type',
-	'Class:Ticket/Attribute:finalclass+' => '',
+	'Class:Ticket/Attribute:finalclass' => 'Ticket sub-class',
+	'Class:Ticket/Attribute:finalclass+' => 'Name of the final class',
 ));
 
 // Fieldset translation
diff --git a/datamodels/2.x/itop-change-mgmt-itil/datamodel.itop-change-mgmt-itil.xml b/datamodels/2.x/itop-change-mgmt-itil/datamodel.itop-change-mgmt-itil.xml
index 7509464ff..99683a996 100755
--- a/datamodels/2.x/itop-change-mgmt-itil/datamodel.itop-change-mgmt-itil.xml
+++ b/datamodels/2.x/itop-change-mgmt-itil/datamodel.itop-change-mgmt-itil.xml
@@ -26,6 +26,7 @@
         <reconciliation>
           <attributes>
             <attribute id="ref"/>
+            <attribute id="finalclass"/>
           </attributes>
         </reconciliation>
         <order>
@@ -2001,6 +2002,7 @@
         <reconciliation>
           <attributes>
             <attribute id="ref"/>
+            <attribute id="finalclass"/>
           </attributes>
         </reconciliation>
         <order>
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 5a5c3520c..cd099a6b0 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
@@ -293,6 +293,7 @@
             <attribute id="org_id"/>
             <attribute id="org_name"/>
             <attribute id="email"/>
+            <attribute id="finalclass"/>
           </attributes>
         </reconciliation>
       </properties>
@@ -880,7 +881,10 @@
         <icon>images/document.png</icon>
         <reconciliation>
           <attributes>
-            <attribute id=""/>
+            <attribute id="name"/>
+            <attribute id="org_id"/>
+            <attribute id="org_name"/>
+            <attribute id="finalclass"/>
           </attributes>
         </reconciliation>
       </properties>
@@ -1866,6 +1870,7 @@
             <attribute id="name"/>
             <attribute id="org_id"/>
             <attribute id="organization_name"/>
+            <attribute id="finalclass"/>
           </attributes>
         </reconciliation>
       </properties>
@@ -2043,6 +2048,7 @@
             <attribute id="name"/>
             <attribute id="org_id"/>
             <attribute id="organization_name"/>
+            <attribute id="finalclass"/>
           </attributes>
         </reconciliation>
       </properties>
@@ -4536,6 +4542,7 @@
         <reconciliation>
           <attributes>
             <attribute id="name"/>
+            <attribute id="finalclass"/>
           </attributes>
         </reconciliation>
       </properties>
@@ -4790,6 +4797,7 @@
             <attribute id="name"/>
             <attribute id="org_id"/>
             <attribute id="organization_name"/>
+            <attribute id="finalclass"/>
           </attributes>
         </reconciliation>
       </properties>
@@ -5300,6 +5308,7 @@
         <reconciliation>
           <attributes>
             <attribute id="name"/>
+            <attribute id="finalclass"/>
           </attributes>
         </reconciliation>
       </properties>
@@ -6733,6 +6742,7 @@
         <reconciliation>
           <attributes>
             <attribute id="name"/>
+            <attribute id="finalclass"/>
           </attributes>
         </reconciliation>
       </properties>
@@ -6787,6 +6797,7 @@
         <reconciliation>
           <attributes>
             <attribute id="name"/>
+            <attribute id="finalclass"/>
           </attributes>
         </reconciliation>
       </properties>
diff --git a/datamodels/2.x/itop-config-mgmt/en.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/en.dict.itop-config-mgmt.php
index d2c1a8e35..d3ffc577a 100755
--- a/datamodels/2.x/itop-config-mgmt/en.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/en.dict.itop-config-mgmt.php
@@ -168,8 +168,8 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:Contact/Attribute:function+' => '',
 	'Class:Contact/Attribute:cis_list' => 'CIs',
 	'Class:Contact/Attribute:cis_list+' => 'All the configuration items linked to this contact',
-	'Class:Contact/Attribute:finalclass' => 'Contact Type',
-	'Class:Contact/Attribute:finalclass+' => '',
+	'Class:Contact/Attribute:finalclass' => 'Contact sub-class',
+	'Class:Contact/Attribute:finalclass+' => 'Name of the final class',
 ));
 
 //
@@ -253,8 +253,8 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:Document/Attribute:contracts_list+' => 'All the contracts linked to this document',
 	'Class:Document/Attribute:services_list' => 'Services',
 	'Class:Document/Attribute:services_list+' => 'All the services linked to this document',
-	'Class:Document/Attribute:finalclass' => 'Document Type',
-	'Class:Document/Attribute:finalclass+' => '',
+	'Class:Document/Attribute:finalclass' => 'Document sub-class',
+	'Class:Document/Attribute:finalclass+' => 'Name of the final class',
 ));
 
 //
@@ -329,8 +329,8 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:FunctionalCI/Attribute:softwares_list+' => 'All the softwares installed on this configuration item',
 	'Class:FunctionalCI/Attribute:tickets_list' => 'Tickets',
 	'Class:FunctionalCI/Attribute:tickets_list+' => 'All the tickets for this configuration item',
-	'Class:FunctionalCI/Attribute:finalclass' => 'CI Type',
-	'Class:FunctionalCI/Attribute:finalclass+' => '',
+	'Class:FunctionalCI/Attribute:finalclass' => 'CI sub-class',
+	'Class:FunctionalCI/Attribute:finalclass+' => 'Name of the final class',
 	'Class:FunctionalCI/Tab:OpenedTickets' => 'Active Tickets',
 ));
 
@@ -1114,8 +1114,8 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:Patch/Attribute:documents_list+' => 'All the documents linked to this patch',
 	'Class:Patch/Attribute:description' => 'Description',
 	'Class:Patch/Attribute:description+' => '',
-	'Class:Patch/Attribute:finalclass' => 'Type',
-	'Class:Patch/Attribute:finalclass+' => '',
+	'Class:Patch/Attribute:finalclass' => 'Patch sub-class',
+	'Class:Patch/Attribute:finalclass+' => 'Name of the final class',
 ));
 
 //
@@ -1179,8 +1179,8 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:Licence/Attribute:perpetual/Value:no+' => 'no',
 	'Class:Licence/Attribute:perpetual/Value:yes' => 'yes',
 	'Class:Licence/Attribute:perpetual/Value:yes+' => 'yes',
-	'Class:Licence/Attribute:finalclass' => 'Type',
-	'Class:Licence/Attribute:finalclass+' => '',
+	'Class:Licence/Attribute:finalclass' => 'Licence sub-class',
+	'Class:Licence/Attribute:finalclass+' => 'Name of the final class',
 ));
 
 //
@@ -1241,8 +1241,8 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:Typology+' => '',
 	'Class:Typology/Attribute:name' => 'Name',
 	'Class:Typology/Attribute:name+' => '',
-	'Class:Typology/Attribute:finalclass' => 'Type',
-	'Class:Typology/Attribute:finalclass+' => '',
+	'Class:Typology/Attribute:finalclass' => 'Typology sub-class',
+	'Class:Typology/Attribute:finalclass+' => 'Name of the final class',
 ));
 
 //
@@ -1547,8 +1547,8 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:NetworkInterface+' => '',
 	'Class:NetworkInterface/Attribute:name' => 'Name',
 	'Class:NetworkInterface/Attribute:name+' => '',
-	'Class:NetworkInterface/Attribute:finalclass' => 'Type',
-	'Class:NetworkInterface/Attribute:finalclass+' => '',
+	'Class:NetworkInterface/Attribute:finalclass' => 'NetworkInterface sub-class',
+	'Class:NetworkInterface/Attribute:finalclass+' => 'Name of the final class',
 ));
 
 //
diff --git a/datamodels/2.x/itop-config-mgmt/fr.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/fr.dict.itop-config-mgmt.php
index a763acfd5..6154b32ca 100755
--- a/datamodels/2.x/itop-config-mgmt/fr.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/fr.dict.itop-config-mgmt.php
@@ -115,8 +115,8 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:Contact/Attribute:function+' => '',
 	'Class:Contact/Attribute:cis_list' => 'CIs',
 	'Class:Contact/Attribute:cis_list+' => '',
-	'Class:Contact/Attribute:finalclass' => 'Type de contact',
-	'Class:Contact/Attribute:finalclass+' => '',
+	'Class:Contact/Attribute:finalclass' => 'Sous-classe de Contact',
+	'Class:Contact/Attribute:finalclass+' => 'Nom de la classe instanciable',
 ));
 
 //
@@ -198,8 +198,8 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:Document/Attribute:contracts_list+' => '',
 	'Class:Document/Attribute:services_list' => 'Services',
 	'Class:Document/Attribute:services_list+' => '',
-	'Class:Document/Attribute:finalclass' => 'Type de document',
-	'Class:Document/Attribute:finalclass+' => '',
+	'Class:Document/Attribute:finalclass' => 'Sous-classe de Document',
+	'Class:Document/Attribute:finalclass+' => 'Nom de la classe instanciable',
 ));
 
 //
@@ -274,8 +274,8 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:FunctionalCI/Attribute:softwares_list+' => '',
 	'Class:FunctionalCI/Attribute:tickets_list' => 'Tickets',
 	'Class:FunctionalCI/Attribute:tickets_list+' => '',
-	'Class:FunctionalCI/Attribute:finalclass' => 'Type de CI',
-	'Class:FunctionalCI/Attribute:finalclass+' => '',
+	'Class:FunctionalCI/Attribute:finalclass' => 'Sous-classe de CI',
+	'Class:FunctionalCI/Attribute:finalclass+' => 'Nom de la classe instanciable',
 	'Class:FunctionalCI/Tab:OpenedTickets' => 'Tickets en cours',
 ));
 
@@ -1058,8 +1058,8 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:Patch/Attribute:documents_list+' => '',
 	'Class:Patch/Attribute:description' => 'Description',
 	'Class:Patch/Attribute:description+' => '',
-	'Class:Patch/Attribute:finalclass' => 'Type',
-	'Class:Patch/Attribute:finalclass+' => '',
+	'Class:Patch/Attribute:finalclass' => 'Sous-classe de Patch',
+	'Class:Patch/Attribute:finalclass+' => 'Nom de la classe instanciable',
 ));
 
 //
@@ -1123,8 +1123,8 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:Licence/Attribute:perpetual/Value:no+' => 'non',
 	'Class:Licence/Attribute:perpetual/Value:yes' => 'oui',
 	'Class:Licence/Attribute:perpetual/Value:yes+' => 'oui',
-	'Class:Licence/Attribute:finalclass' => 'Type',
-	'Class:Licence/Attribute:finalclass+' => '',
+	'Class:Licence/Attribute:finalclass' => 'Sous-classe de License',
+	'Class:Licence/Attribute:finalclass+' => 'Nom de la classe instanciable',
 ));
 
 //
@@ -1185,8 +1185,8 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:Typology+' => '',
 	'Class:Typology/Attribute:name' => 'Nom',
 	'Class:Typology/Attribute:name+' => '',
-	'Class:Typology/Attribute:finalclass' => 'Type',
-	'Class:Typology/Attribute:finalclass+' => '',
+	'Class:Typology/Attribute:finalclass' => 'Sous-classe de Typologie',
+	'Class:Typology/Attribute:finalclass+' => 'Nom de la classe instanciable',
 ));
 
 //
@@ -1486,8 +1486,8 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:NetworkInterface+' => '',
 	'Class:NetworkInterface/Attribute:name' => 'Nom',
 	'Class:NetworkInterface/Attribute:name+' => '',
-	'Class:NetworkInterface/Attribute:finalclass' => 'Type',
-	'Class:NetworkInterface/Attribute:finalclass+' => '',
+	'Class:NetworkInterface/Attribute:finalclass' => 'Sous-classe d\'Interface Réseau',
+	'Class:NetworkInterface/Attribute:finalclass+' => 'Nom de la classe instanciable',
 ));
 
 //
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 b14febcc9..d8e20468a 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
@@ -402,6 +402,7 @@
             <attribute id="name"/>
             <attribute id="org_id"/>
             <attribute id="organization_name"/>
+            <attribute id="finalclass"/>
           </attributes>
         </reconciliation>
       </properties>
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 39b6120f3..0e9143f78 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
@@ -22,6 +22,7 @@
             <attribute id="name"/>
             <attribute id="org_id"/>
             <attribute id="organization_name"/>
+            <attribute id="finalclass"/>
           </attributes>
         </reconciliation>
       </properties>
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 aeaa164ff..3cd1b4499 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
@@ -65,6 +65,7 @@
         <reconciliation>
           <attributes>
             <attribute id="name"/>
+            <attribute id="finalclass"/>
           </attributes>
         </reconciliation>
       </properties>
diff --git a/datamodels/2.x/itop-service-mgmt-provider/en.dict.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/en.dict.itop-service-mgmt-provider.php
index f09880af3..873b1a1ac 100755
--- a/datamodels/2.x/itop-service-mgmt-provider/en.dict.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/en.dict.itop-service-mgmt-provider.php
@@ -147,8 +147,8 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:Contract/Attribute:status/Value:obsolete+' => 'obsolete',
 	'Class:Contract/Attribute:status/Value:production' => 'production',
 	'Class:Contract/Attribute:status/Value:production+' => 'production',
-	'Class:Contract/Attribute:finalclass' => 'Contract type',
-	'Class:Contract/Attribute:finalclass+' => '',
+	'Class:Contract/Attribute:finalclass' => 'Contract sub-class',
+	'Class:Contract/Attribute:finalclass+' => 'Name of the final class',
 ));
 
 //
diff --git a/datamodels/2.x/itop-service-mgmt-provider/fr.dict.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/fr.dict.itop-service-mgmt-provider.php
index 0702564b3..b06ddda23 100755
--- a/datamodels/2.x/itop-service-mgmt-provider/fr.dict.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/fr.dict.itop-service-mgmt-provider.php
@@ -93,8 +93,8 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:Contract/Attribute:status/Value:obsolete+' => 'obsolète',
 	'Class:Contract/Attribute:status/Value:production' => 'production',
 	'Class:Contract/Attribute:status/Value:production+' => 'production',
-	'Class:Contract/Attribute:finalclass' => 'Type',
-	'Class:Contract/Attribute:finalclass+' => '',
+	'Class:Contract/Attribute:finalclass' => 'Sous-classe de Contrat',
+	'Class:Contract/Attribute:finalclass+' => 'Nom de la classe instanciable',
 ));
 
 //
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 a3cd0de36..705cfa622 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
@@ -65,6 +65,11 @@
         <reconciliation>
           <attributes>
             <attribute id="name"/>
+            <attribute id="org_id"/>
+            <attribute id="organization_name"/>
+            <attribute id="provider_id"/>
+            <attribute id="provider_name"/>
+            <attribute id="finalclass"/>
           </attributes>
         </reconciliation>
       </properties>
@@ -354,6 +359,10 @@
         <reconciliation>
           <attributes>
             <attribute id="name"/>
+            <attribute id="org_id"/>
+            <attribute id="organization_name"/>
+            <attribute id="provider_id"/>
+            <attribute id="provider_name"/>
           </attributes>
         </reconciliation>
       </properties>
@@ -498,6 +507,10 @@
         <reconciliation>
           <attributes>
             <attribute id="name"/>
+            <attribute id="org_id"/>
+            <attribute id="organization_name"/>
+            <attribute id="provider_id"/>
+            <attribute id="provider_name"/>
           </attributes>
         </reconciliation>
       </properties>
diff --git a/datamodels/2.x/itop-service-mgmt/en.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/en.dict.itop-service-mgmt.php
index fb16c96ee..c5d05e2e5 100755
--- a/datamodels/2.x/itop-service-mgmt/en.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/en.dict.itop-service-mgmt.php
@@ -141,8 +141,8 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:Contract/Attribute:status/Value:obsolete+' => 'obsolete',
 	'Class:Contract/Attribute:status/Value:production' => 'production',
 	'Class:Contract/Attribute:status/Value:production+' => 'production',
-	'Class:Contract/Attribute:finalclass' => 'Type',
-	'Class:Contract/Attribute:finalclass+' => '',
+	'Class:Contract/Attribute:finalclass' => 'Contract sub-class',
+	'Class:Contract/Attribute:finalclass+' => 'Name of the final class',
 ));
 //
 // Class: CustomerContract
diff --git a/datamodels/2.x/itop-service-mgmt/fr.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/fr.dict.itop-service-mgmt.php
index 270b33f8e..0e92e4f36 100755
--- a/datamodels/2.x/itop-service-mgmt/fr.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/fr.dict.itop-service-mgmt.php
@@ -92,8 +92,8 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:Contract/Attribute:status/Value:obsolete+' => 'obsolète',
 	'Class:Contract/Attribute:status/Value:production' => 'production',
 	'Class:Contract/Attribute:status/Value:production+' => 'production',
-	'Class:Contract/Attribute:finalclass' => 'Type',
-	'Class:Contract/Attribute:finalclass+' => '',
+	'Class:Contract/Attribute:finalclass' => 'Sous-classe de Contrat',
+	'Class:Contract/Attribute:finalclass+' => 'Nom de la classe instanciable',
 ));
 
 //
@@ -122,7 +122,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:ProviderContract/Attribute:coverage+' => '',
 	'Class:ProviderContract/Attribute:contracttype_id' => 'Type de contrat',
 	'Class:ProviderContract/Attribute:contracttype_id+' => '',
-	'Class:ProviderContract/Attribute:contracttype_name' => 'Nom type de contrat',
+	'Class:ProviderContract/Attribute:contracttype_name' => 'Nom Type de contrat',
 	'Class:ProviderContract/Attribute:contracttype_name+' => '',
 ));
 
@@ -442,7 +442,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:DeliveryModel/Attribute:org_id' => 'Organisation',
 	'Class:DeliveryModel/Attribute:org_id+' => '',
 	'Class:DeliveryModel/Attribute:organization_name' => 'Nom organisation',
-	'Class:DeliveryModel/Attribute:organization_name+' => 'Common name',
+	'Class:DeliveryModel/Attribute:organization_name+' => '',
 	'Class:DeliveryModel/Attribute:description' => 'Description',
 	'Class:DeliveryModel/Attribute:description+' => '',
 	'Class:DeliveryModel/Attribute:contacts_list' => 'Contacts',
diff --git a/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml b/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
index 4bc4d3240..0382e2e3b 100755
--- a/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
+++ b/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
@@ -43,6 +43,7 @@
 				<reconciliation>
 					<attributes>
 						<attribute id="ref"/>
+						<attribute id="finalclass"/>
 					</attributes>
 				</reconciliation>
 			</properties>
diff --git a/datamodels/2.x/itop-tickets/en.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/en.dict.itop-tickets.php
index cfea4cef6..fd5233351 100755
--- a/datamodels/2.x/itop-tickets/en.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/en.dict.itop-tickets.php
@@ -80,8 +80,8 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:Ticket/Attribute:functionalcis_list+' => 'All the configuration items impacted by this ticket. Items marked as "Computed" have been automatically marked as impacted. Items marked as "Not impacted" are excluded from the impact.',
 	'Class:Ticket/Attribute:workorders_list' => 'Work orders',
 	'Class:Ticket/Attribute:workorders_list+' => 'All the work orders for this ticket',
-	'Class:Ticket/Attribute:finalclass' => 'Type',
-	'Class:Ticket/Attribute:finalclass+' => '',
+	'Class:Ticket/Attribute:finalclass' => 'Ticket sub-class',
+	'Class:Ticket/Attribute:finalclass+' => 'Name of the final class',
 	'Class:Ticket/Attribute:operational_status' => 'Operational status',
 	'Class:Ticket/Attribute:operational_status+' => 'Computed after the detailed status',
 	'Class:Ticket/Attribute:operational_status/Value:ongoing' => 'Ongoing',
diff --git a/datamodels/2.x/itop-tickets/fr.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/fr.dict.itop-tickets.php
index 0788cf834..81bff73b7 100755
--- a/datamodels/2.x/itop-tickets/fr.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/fr.dict.itop-tickets.php
@@ -67,8 +67,8 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:Ticket/Attribute:functionalcis_list+' => 'Tous les éléments de configuration impactés par ce ticket. Les éléments marqués comme "Calculés" sont le résultat du calcul de l\'analyse d\'impact. Les éléments marqués comme "Non impactés" sont exclus de cette analyse.',
 	'Class:Ticket/Attribute:workorders_list' => 'Tâches',
 	'Class:Ticket/Attribute:workorders_list+' => '',
-	'Class:Ticket/Attribute:finalclass' => 'Type',
-	'Class:Ticket/Attribute:finalclass+' => '',
+	'Class:Ticket/Attribute:finalclass' => 'Sous-classe de Ticket',
+	'Class:Ticket/Attribute:finalclass+' => 'Nom de la classe instanciable',
 	'Class:Ticket/Attribute:operational_status' => 'Statut opérationnel',
 	'Class:Ticket/Attribute:operational_status+' => 'Calculé à partir du statut détaillé',
 	'Class:Ticket/Attribute:operational_status/Value:ongoing' => 'En cours',
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 749437b25..9a6cd14a8 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
@@ -145,6 +145,7 @@
             <attribute id="name"/>
             <attribute id="org_id"/>
             <attribute id="organization_name"/>
+            <attribute id="finalclass"/>
           </attributes>
         </reconciliation>
       </properties>
diff --git a/dictionaries/dictionary.itop.core.php b/dictionaries/dictionary.itop.core.php
index f34f91b31..5fad458dd 100644
--- a/dictionaries/dictionary.itop.core.php
+++ b/dictionaries/dictionary.itop.core.php
@@ -194,8 +194,8 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:CMDBChangeOp/Attribute:objclass+' => 'object class',
 	'Class:CMDBChangeOp/Attribute:objkey' => 'object id',
 	'Class:CMDBChangeOp/Attribute:objkey+' => 'object id',
-	'Class:CMDBChangeOp/Attribute:finalclass' => 'type',
-	'Class:CMDBChangeOp/Attribute:finalclass+' => '',
+	'Class:CMDBChangeOp/Attribute:finalclass' => 'CMDBChangeOp sub-class',
+	'Class:CMDBChangeOp/Attribute:finalclass+' => 'Name of the final class',
 ));
 
 //
@@ -290,8 +290,8 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:Event/Attribute:date+' => 'date and time at which the changes have been recorded',
 	'Class:Event/Attribute:userinfo' => 'User info',
 	'Class:Event/Attribute:userinfo+' => 'identification of the user that was doing the action that triggered this event',
-	'Class:Event/Attribute:finalclass' => 'Type',
-	'Class:Event/Attribute:finalclass+' => '',
+	'Class:Event/Attribute:finalclass' => 'Event sub-class',
+	'Class:Event/Attribute:finalclass+' => 'Name of the final class',
 ));
 
 //
@@ -429,8 +429,8 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:Action/Attribute:status/Value:disabled+' => 'Inactive',
 	'Class:Action/Attribute:trigger_list' => 'Related Triggers',
 	'Class:Action/Attribute:trigger_list+' => 'Triggers linked to this action',
-	'Class:Action/Attribute:finalclass' => 'Type',
-	'Class:Action/Attribute:finalclass+' => '',
+	'Class:Action/Attribute:finalclass' => 'Action sub-class',
+	'Class:Action/Attribute:finalclass+' => 'Name of the final class',
 ));
 
 //
@@ -486,8 +486,8 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:Trigger/Attribute:description+' => 'one line description',
 	'Class:Trigger/Attribute:action_list' => 'Triggered actions',
 	'Class:Trigger/Attribute:action_list+' => 'Actions performed when the trigger is activated',
-	'Class:Trigger/Attribute:finalclass' => 'Type',
-	'Class:Trigger/Attribute:finalclass+' => '',
+	'Class:Trigger/Attribute:finalclass' => 'Trigger sub-class',
+	'Class:Trigger/Attribute:finalclass+' => 'Name of the final class',
 ));
 
 //
diff --git a/dictionaries/dictionary.itop.ui.php b/dictionaries/dictionary.itop.ui.php
index 115fa028b..ee554d55f 100644
--- a/dictionaries/dictionary.itop.ui.php
+++ b/dictionaries/dictionary.itop.ui.php
@@ -110,7 +110,7 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:User' => 'User',
 	'Class:User+' => 'User login',
 	'Class:User/Attribute:finalclass' => 'Type of account',
-	'Class:User/Attribute:finalclass+' => '',
+	'Class:User/Attribute:finalclass+' => 'Name of the final class',
 	'Class:User/Attribute:contactid' => 'Contact (person)',
 	'Class:User/Attribute:contactid+' => 'Personal details from the business data',
 	'Class:User/Attribute:last_name' => 'Last name',
diff --git a/dictionaries/fr.dictionary.itop.core.php b/dictionaries/fr.dictionary.itop.core.php
index dcbc7e78c..eb3a36eff 100644
--- a/dictionaries/fr.dictionary.itop.core.php
+++ b/dictionaries/fr.dictionary.itop.core.php
@@ -102,7 +102,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:CMDBChangeOp/Attribute:objkey' => 'Clé',
 	'Class:CMDBChangeOp/Attribute:objkey+' => '',
 	'Class:CMDBChangeOp/Attribute:finalclass' => 'Type',
-	'Class:CMDBChangeOp/Attribute:finalclass+' => '',
+	'Class:CMDBChangeOp/Attribute:finalclass+' => 'Nom de la classe instanciable',
 	'Class:CMDBChangeOpCreate' => 'Création de l\'objet',
 	'Class:CMDBChangeOpCreate+' => '',
 	'Class:CMDBChangeOpDelete' => 'Effacement de l\'objet',
@@ -137,7 +137,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:CMDBChangeOpSetAttributeCaseLog+' => '',
 	'Class:CMDBChangeOpSetAttributeCaseLog/Attribute:lastentry' => 'Dernière entrée',
 	'Class:CMDBChangeOpSetAttributeCaseLog/Attribute:lastentry+' => '',
-	'Class:Event' => 'Evenement',
+	'Class:Event' => 'Evènement',
 	'Class:Event+' => '',
 	'Class:Event/Attribute:message' => 'Message',
 	'Class:Event/Attribute:message+' => '',
@@ -145,8 +145,8 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:Event/Attribute:date+' => '',
 	'Class:Event/Attribute:userinfo' => 'Utilisateur',
 	'Class:Event/Attribute:userinfo+' => '',
-	'Class:Event/Attribute:finalclass' => 'Type',
-	'Class:Event/Attribute:finalclass+' => '',
+	'Class:Event/Attribute:finalclass' => 'Sous-classe d\'Evènement',
+	'Class:Event/Attribute:finalclass+' => 'Nom de la classe instanciable',
 	'Class:EventNotification' => 'Notification',
 	'Class:EventNotification+' => '',
 	'Class:EventNotification/Attribute:trigger_id' => 'Déclencheur',
@@ -323,7 +323,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:SynchroAttribute/Attribute:update_policy/Value:write_if_empty' => 'Ecrire si le champ est vide',
 	'Class:SynchroAttribute/Attribute:update_policy/Value:write_if_empty+' => '',
 	'Class:SynchroAttribute/Attribute:finalclass' => 'Type',
-	'Class:SynchroAttribute/Attribute:finalclass+' => '',
+	'Class:SynchroAttribute/Attribute:finalclass+' => 'Nom de la classe instanciable',
 	'Class:SynchroAttExtKey' => 'Synchro Clé Externe',
 	'Class:SynchroAttExtKey+' => '',
 	'Class:SynchroAttExtKey/Attribute:reconciliation_attcode' => 'Champ',
@@ -546,8 +546,8 @@ Opérateurs :<br/>
 	'Class:Action/Attribute:status/Value:disabled+' => '',
 	'Class:Action/Attribute:trigger_list' => 'Déclencheurs liés',
 	'Class:Action/Attribute:trigger_list+' => '',
-	'Class:Action/Attribute:finalclass' => 'Type',
-	'Class:Action/Attribute:finalclass+' => '',
+	'Class:Action/Attribute:finalclass' => 'Sous-classe d\'Action',
+	'Class:Action/Attribute:finalclass+' => 'Nom de la classe instanciable',
 	'Class:ActionNotification' => 'notification',
 	'Class:ActionNotification+' => '',
 	'Class:Trigger' => 'Déclencheur',
@@ -556,8 +556,8 @@ Opérateurs :<br/>
 	'Class:Trigger/Attribute:description+' => '',
 	'Class:Trigger/Attribute:action_list' => 'Actions déclenchées',
 	'Class:Trigger/Attribute:action_list+' => '',
-	'Class:Trigger/Attribute:finalclass' => 'Type',
-	'Class:Trigger/Attribute:finalclass+' => '',
+	'Class:Trigger/Attribute:finalclass' => 'Sous-classe de Déclencheur',
+	'Class:Trigger/Attribute:finalclass+' => 'Nom de la classe instanciable',
 	'Class:TriggerOnObject' => 'Déclencheur sur modification de données',
 	'Class:TriggerOnObject+' => '',
 	'Class:TriggerOnObject/Attribute:target_class' => 'Classe cible',
diff --git a/dictionaries/fr.dictionary.itop.ui.php b/dictionaries/fr.dictionary.itop.ui.php
index 9ea9c5d92..03048eaf3 100644
--- a/dictionaries/fr.dictionary.itop.ui.php
+++ b/dictionaries/fr.dictionary.itop.ui.php
@@ -135,7 +135,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:User' => 'Utilisateur',
 	'Class:User+' => 'Compte utilisateur',
 	'Class:User/Attribute:finalclass' => 'Type de compte',
-	'Class:User/Attribute:finalclass+' => '',
+	'Class:User/Attribute:finalclass+' => 'Nom de la classe instanciable',
 	'Class:User/Attribute:contactid' => 'Contact (personne)',
 	'Class:User/Attribute:contactid+' => '',
 	'Class:User/Attribute:last_name' => 'Nom',