diff --git a/application/datamodel.application.xml b/application/datamodel.application.xml
index 166a031ad..0fbc21741 100644
--- a/application/datamodel.application.xml
+++ b/application/datamodel.application.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="AbstractResource" _delta="define">
       <parent>cmdbAbstractObject</parent>
@@ -45,7 +45,7 @@
       <properties>
         <comment>/** Acknowledge welcome popup messages */</comment>
         <abstract>false</abstract>
-        <category></category>
+        <category/>
         <key_type>autoincrement</key_type>
         <db_table>priv_welcome_popup_acknowledge</db_table>
       </properties>
diff --git a/core/datamodel.core.xml b/core/datamodel.core.xml
index 43c4455df..f99367904 100644
--- a/core/datamodel.core.xml
+++ b/core/datamodel.core.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="lnkActionNotificationToContact" _delta="define">
       <parent>cmdbAbstractObject</parent>
@@ -99,7 +99,7 @@
       </presentation>
       <methods/>
     </class>
-    <class id="ActionNewsroom"  _delta="define">
+    <class id="ActionNewsroom" _delta="define">
       <php_parent>
         <name>ActionNotification</name>
       </php_parent>
@@ -148,7 +148,7 @@
           <display_max_height>96</display_max_height>
           <storage_max_width>256</storage_max_width>
           <storage_max_height>256</storage_max_height>
-          <default_image />
+          <default_image/>
         </field>
         <field id="priority" xsi:type="AttributeEnum">
           <sql>priority</sql>
@@ -183,7 +183,7 @@
         </field>
         <field id="url" xsi:type="AttributeString">
           <sql>url</sql>
-          <default_value>$this->url()$</default_value>
+          <default_value>$this-&gt;url()$</default_value>
           <is_null_allowed>false</is_null_allowed>
         </field>
       </fields>
@@ -369,7 +369,7 @@
 ]]></code>
         </method>
         <method id="GetAsynchronousGlobalSetting">
-          <comment></comment>
+          <comment/>
           <static>true</static>
           <access>public</access>
           <code><![CDATA[
@@ -381,7 +381,7 @@
         </method>
       </methods>
     </class>
-    <class id="EventNotificationNewsroom"  _delta="define">
+    <class id="EventNotificationNewsroom" _delta="define">
       <php_parent>
         <name>EventNotification</name>
       </php_parent>
@@ -405,7 +405,7 @@
         </reconciliation>
         <order>
           <columns>
-            <column id="date" ascending="false" />
+            <column id="date" ascending="false"/>
           </columns>
         </order>
       </properties>
@@ -419,7 +419,7 @@
           <sql>icon</sql>
           <default_value/>
           <is_null_allowed>true</is_null_allowed>
-          <default_image />
+          <default_image/>
         </field>
         <field id="priority" xsi:type="AttributeEnum">
           <sql>priority</sql>
@@ -501,14 +501,14 @@
           </items>
         </details>
         <summary>
-        <items>
-          <item id="date">
-            <rank>10</rank>
-          </item>
-          <item id="message">
-            <rank>20</rank>
-          </item>
-        </items>
+          <items>
+            <item id="date">
+              <rank>10</rank>
+            </item>
+            <item id="message">
+              <rank>20</rank>
+            </item>
+          </items>
         </summary>
         <list>
           <items>
diff --git a/datamodels/2.x/authent-cas/datamodel.authent-cas.xml b/datamodels/2.x/authent-cas/datamodel.authent-cas.xml
index 6d15797d3..be801118c 100644
--- a/datamodels/2.x/authent-cas/datamodel.authent-cas.xml
+++ b/datamodels/2.x/authent-cas/datamodel.authent-cas.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <constants>
   </constants>
   <classes>
diff --git a/datamodels/2.x/authent-ldap/datamodel.authent-ldap.xml b/datamodels/2.x/authent-ldap/datamodel.authent-ldap.xml
index f063cde1e..dfaa4ea32 100644
--- a/datamodels/2.x/authent-ldap/datamodel.authent-ldap.xml
+++ b/datamodels/2.x/authent-ldap/datamodel.authent-ldap.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="UserLDAP" _delta="define">
       <parent>cmdbAbstractObject</parent>
diff --git a/datamodels/2.x/authent-local/datamodel.authent-local.xml b/datamodels/2.x/authent-local/datamodel.authent-local.xml
index cd21c19c4..be5c5fb59 100644
--- a/datamodels/2.x/authent-local/datamodel.authent-local.xml
+++ b/datamodels/2.x/authent-local/datamodel.authent-local.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <module_parameters>
     <parameters id="authent-local" _delta="define">
       <password_validation.pattern>^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^\da-zA-Z]).{8,}$</password_validation.pattern>
diff --git a/datamodels/2.x/combodo-backoffice-darkmoon-theme/datamodel.combodo-backoffice-darkmoon-theme.xml b/datamodels/2.x/combodo-backoffice-darkmoon-theme/datamodel.combodo-backoffice-darkmoon-theme.xml
index cbebe5320..aadc6480f 100644
--- a/datamodels/2.x/combodo-backoffice-darkmoon-theme/datamodel.combodo-backoffice-darkmoon-theme.xml
+++ b/datamodels/2.x/combodo-backoffice-darkmoon-theme/datamodel.combodo-backoffice-darkmoon-theme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <branding>
     <themes>
       <theme id="darkmoon" _delta="define">
diff --git a/datamodels/2.x/combodo-backoffice-fullmoon-high-contrast-theme/datamodel.combodo-backoffice-fullmoon-high-contrast-theme.xml b/datamodels/2.x/combodo-backoffice-fullmoon-high-contrast-theme/datamodel.combodo-backoffice-fullmoon-high-contrast-theme.xml
index 09e7ec8a5..157b4cfc6 100644
--- a/datamodels/2.x/combodo-backoffice-fullmoon-high-contrast-theme/datamodel.combodo-backoffice-fullmoon-high-contrast-theme.xml
+++ b/datamodels/2.x/combodo-backoffice-fullmoon-high-contrast-theme/datamodel.combodo-backoffice-fullmoon-high-contrast-theme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <branding>
     <themes>
       <theme id="fullmoon-high-contrast" _delta="define">
diff --git a/datamodels/2.x/combodo-backoffice-fullmoon-protanopia-deuteranopia-theme/datamodel.combodo-backoffice-fullmoon-protanopia-deuteranopia-theme.xml b/datamodels/2.x/combodo-backoffice-fullmoon-protanopia-deuteranopia-theme/datamodel.combodo-backoffice-fullmoon-protanopia-deuteranopia-theme.xml
index bbe3466e1..2469b888c 100644
--- a/datamodels/2.x/combodo-backoffice-fullmoon-protanopia-deuteranopia-theme/datamodel.combodo-backoffice-fullmoon-protanopia-deuteranopia-theme.xml
+++ b/datamodels/2.x/combodo-backoffice-fullmoon-protanopia-deuteranopia-theme/datamodel.combodo-backoffice-fullmoon-protanopia-deuteranopia-theme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <branding>
     <themes>
       <theme id="fullmoon-protanopia-deuteranopia" _delta="define">
diff --git a/datamodels/2.x/combodo-backoffice-fullmoon-tritanopia-theme/datamodel.combodo-backoffice-fullmoon-tritanopia-theme.xml b/datamodels/2.x/combodo-backoffice-fullmoon-tritanopia-theme/datamodel.combodo-backoffice-fullmoon-tritanopia-theme.xml
index 36d8f71dd..05470dada 100644
--- a/datamodels/2.x/combodo-backoffice-fullmoon-tritanopia-theme/datamodel.combodo-backoffice-fullmoon-tritanopia-theme.xml
+++ b/datamodels/2.x/combodo-backoffice-fullmoon-tritanopia-theme/datamodel.combodo-backoffice-fullmoon-tritanopia-theme.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <branding>
     <themes>
       <theme id="fullmoon-tritanopia" _delta="define">
diff --git a/datamodels/2.x/combodo-db-tools/datamodel.combodo-db-tools.xml b/datamodels/2.x/combodo-db-tools/datamodel.combodo-db-tools.xml
index 0761c0566..294d30a88 100644
--- a/datamodels/2.x/combodo-db-tools/datamodel.combodo-db-tools.xml
+++ b/datamodels/2.x/combodo-db-tools/datamodel.combodo-db-tools.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <menus>
     <menu id="DBToolsMenu" xsi:type="WebPageMenuNode" _delta="define">
       <rank>30</rank>
diff --git a/datamodels/2.x/itop-attachments/datamodel.itop-attachments.xml b/datamodels/2.x/itop-attachments/datamodel.itop-attachments.xml
index c661eb97f..6940327b7 100755
--- a/datamodels/2.x/itop-attachments/datamodel.itop-attachments.xml
+++ b/datamodels/2.x/itop-attachments/datamodel.itop-attachments.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="Attachment" _delta="define">
       <parent>DBObject</parent>
diff --git a/datamodels/2.x/itop-backup/datamodel.itop-backup.xml b/datamodels/2.x/itop-backup/datamodel.itop-backup.xml
index 15092356f..bcfeda07b 100644
--- a/datamodels/2.x/itop-backup/datamodel.itop-backup.xml
+++ b/datamodels/2.x/itop-backup/datamodel.itop-backup.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <menus>
     <menu id="BackupStatus" xsi:type="WebPageMenuNode" _delta="define">
       <rank>50</rank>
diff --git a/datamodels/2.x/itop-bridge-cmdb-services/datamodel.itop-bridge-cmdb-services.xml b/datamodels/2.x/itop-bridge-cmdb-services/datamodel.itop-bridge-cmdb-services.xml
index 7ce60a770..294d1d4bb 100644
--- a/datamodels/2.x/itop-bridge-cmdb-services/datamodel.itop-bridge-cmdb-services.xml
+++ b/datamodels/2.x/itop-bridge-cmdb-services/datamodel.itop-bridge-cmdb-services.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <constants/>
   <classes>
     <class id="lnkFunctionalCIToProviderContract" _delta="define">
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/datamodel.itop-bridge-cmdb-ticket.xml b/datamodels/2.x/itop-bridge-cmdb-ticket/datamodel.itop-bridge-cmdb-ticket.xml
index 15cfb10f2..7dce44760 100644
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/datamodel.itop-bridge-cmdb-ticket.xml
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/datamodel.itop-bridge-cmdb-ticket.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <constants/>
   <classes>
     <class id="lnkFunctionalCIToTicket" _delta="define">
diff --git a/datamodels/2.x/itop-bridge-datacenter-mgmt-services/datamodel.itop-bridge-datacenter-mgmt-services.xml b/datamodels/2.x/itop-bridge-datacenter-mgmt-services/datamodel.itop-bridge-datacenter-mgmt-services.xml
index 796d1b85d..c41fad245 100644
--- a/datamodels/2.x/itop-bridge-datacenter-mgmt-services/datamodel.itop-bridge-datacenter-mgmt-services.xml
+++ b/datamodels/2.x/itop-bridge-datacenter-mgmt-services/datamodel.itop-bridge-datacenter-mgmt-services.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <constants/>
   <classes>
     <class id="Rack" _delta="must_exist">
diff --git a/datamodels/2.x/itop-bridge-endusers-devices-services/datamodel.itop-bridge-endusers-devices-services.xml b/datamodels/2.x/itop-bridge-endusers-devices-services/datamodel.itop-bridge-endusers-devices-services.xml
index c0ccc9768..61b0f786c 100644
--- a/datamodels/2.x/itop-bridge-endusers-devices-services/datamodel.itop-bridge-endusers-devices-services.xml
+++ b/datamodels/2.x/itop-bridge-endusers-devices-services/datamodel.itop-bridge-endusers-devices-services.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <constants/>
   <classes>
     <class id="Phone" _delta="must_exist">
diff --git a/datamodels/2.x/itop-bridge-storage-mgmt-services/datamodel.itop-bridge-storage-mgmt-services.xml b/datamodels/2.x/itop-bridge-storage-mgmt-services/datamodel.itop-bridge-storage-mgmt-services.xml
index e965088c7..88dafee3c 100644
--- a/datamodels/2.x/itop-bridge-storage-mgmt-services/datamodel.itop-bridge-storage-mgmt-services.xml
+++ b/datamodels/2.x/itop-bridge-storage-mgmt-services/datamodel.itop-bridge-storage-mgmt-services.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <constants/>
   <classes>
     <class id="SANSwitch" _delta="must_exist">
diff --git a/datamodels/2.x/itop-bridge-virtualization-mgmt-services/datamodel.itop-bridge-virtualization-mgmt-services.xml b/datamodels/2.x/itop-bridge-virtualization-mgmt-services/datamodel.itop-bridge-virtualization-mgmt-services.xml
index dd4eb27ab..08c4bf4f3 100644
--- a/datamodels/2.x/itop-bridge-virtualization-mgmt-services/datamodel.itop-bridge-virtualization-mgmt-services.xml
+++ b/datamodels/2.x/itop-bridge-virtualization-mgmt-services/datamodel.itop-bridge-virtualization-mgmt-services.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <constants/>
   <classes>
     <class id="Hypervisor" _delta="must_exist">
diff --git a/datamodels/2.x/itop-bridge-virtualization-storage/datamodel.itop-bridge-virtualization-storage.xml b/datamodels/2.x/itop-bridge-virtualization-storage/datamodel.itop-bridge-virtualization-storage.xml
index c45d31314..0a72bfa91 100644
--- a/datamodels/2.x/itop-bridge-virtualization-storage/datamodel.itop-bridge-virtualization-storage.xml
+++ b/datamodels/2.x/itop-bridge-virtualization-storage/datamodel.itop-bridge-virtualization-storage.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="lnkVirtualDeviceToVolume" _delta="define">
       <parent>cmdbAbstractObject</parent>
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 e5b6e0b33..53c163056 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
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="Change" _delta="define">
       <parent>Ticket</parent>
diff --git a/datamodels/2.x/itop-change-mgmt/datamodel.itop-change-mgmt.xml b/datamodels/2.x/itop-change-mgmt/datamodel.itop-change-mgmt.xml
index a0546d17a..37720dbae 100755
--- a/datamodels/2.x/itop-change-mgmt/datamodel.itop-change-mgmt.xml
+++ b/datamodels/2.x/itop-change-mgmt/datamodel.itop-change-mgmt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="Change" _delta="define">
       <parent>Ticket</parent>
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 e5f341eb1..392ec9beb 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
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="FunctionalCI" _delta="define">
       <parent>cmdbAbstractObject</parent>
diff --git a/datamodels/2.x/itop-config/datamodel.itop-config.xml b/datamodels/2.x/itop-config/datamodel.itop-config.xml
index 1b8226cb7..bcffad714 100644
--- a/datamodels/2.x/itop-config/datamodel.itop-config.xml
+++ b/datamodels/2.x/itop-config/datamodel.itop-config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <menus>
     <menu id="ConfigEditor" xsi:type="WebPageMenuNode" _delta="define">
       <rank>10</rank>
diff --git a/datamodels/2.x/itop-core-update/datamodel.itop-core-update.xml b/datamodels/2.x/itop-core-update/datamodel.itop-core-update.xml
index 0fe3a38fd..369dd5b71 100644
--- a/datamodels/2.x/itop-core-update/datamodel.itop-core-update.xml
+++ b/datamodels/2.x/itop-core-update/datamodel.itop-core-update.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <menus>
     <menu id="iTopUpdate" xsi:type="WebPageMenuNode" _delta="define">
       <rank>60</rank>
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 53761c606..b5b7a4972 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
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="Rack" _delta="define">
       <parent>PhysicalDevice</parent>
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 ecb279927..14cb1a84b 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
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="TelephonyCI" _delta="define">
       <parent>PhysicalDevice</parent>
diff --git a/datamodels/2.x/itop-faq-light/datamodel.itop-faq-light.xml b/datamodels/2.x/itop-faq-light/datamodel.itop-faq-light.xml
index 415ee1663..594372be5 100755
--- a/datamodels/2.x/itop-faq-light/datamodel.itop-faq-light.xml
+++ b/datamodels/2.x/itop-faq-light/datamodel.itop-faq-light.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="FAQ" _delta="define">
       <parent>cmdbAbstractObject</parent>
diff --git a/datamodels/2.x/itop-files-information/datamodel.itop-files-information.xml b/datamodels/2.x/itop-files-information/datamodel.itop-files-information.xml
index da9755d33..996d6274b 100644
--- a/datamodels/2.x/itop-files-information/datamodel.itop-files-information.xml
+++ b/datamodels/2.x/itop-files-information/datamodel.itop-files-information.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
 </itop_design>
diff --git a/datamodels/2.x/itop-full-itil/datamodel.itop-full-itil.xml b/datamodels/2.x/itop-full-itil/datamodel.itop-full-itil.xml
index 6e21ca1b5..3ec34fbd2 100644
--- a/datamodels/2.x/itop-full-itil/datamodel.itop-full-itil.xml
+++ b/datamodels/2.x/itop-full-itil/datamodel.itop-full-itil.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="Ticket">
       <methods>
diff --git a/datamodels/2.x/itop-hub-connector/datamodel.itop-hub-connector.xml b/datamodels/2.x/itop-hub-connector/datamodel.itop-hub-connector.xml
index 106316dff..1dfabc616 100644
--- a/datamodels/2.x/itop-hub-connector/datamodel.itop-hub-connector.xml
+++ b/datamodels/2.x/itop-hub-connector/datamodel.itop-hub-connector.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <constants>
   </constants>
   <classes>
diff --git a/datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml b/datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml
index 8eb8b994b..72429b043 100755
--- a/datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml
+++ b/datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="Incident" _delta="define">
       <parent>Ticket</parent>
diff --git a/datamodels/2.x/itop-knownerror-mgmt/datamodel.itop-knownerror-mgmt.xml b/datamodels/2.x/itop-knownerror-mgmt/datamodel.itop-knownerror-mgmt.xml
index fb46462a7..ab17dddf9 100755
--- a/datamodels/2.x/itop-knownerror-mgmt/datamodel.itop-knownerror-mgmt.xml
+++ b/datamodels/2.x/itop-knownerror-mgmt/datamodel.itop-knownerror-mgmt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="KnownError" _delta="define">
       <parent>cmdbAbstractObject</parent>
diff --git a/datamodels/2.x/itop-oauth-client/datamodel.itop-oauth-client.xml b/datamodels/2.x/itop-oauth-client/datamodel.itop-oauth-client.xml
index f2321aa2e..486b9e311 100644
--- a/datamodels/2.x/itop-oauth-client/datamodel.itop-oauth-client.xml
+++ b/datamodels/2.x/itop-oauth-client/datamodel.itop-oauth-client.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <constants/>
   <classes>
     <class id="OAuthClient" _delta="define">
diff --git a/datamodels/2.x/itop-portal-base/datamodel.itop-portal-base.xml b/datamodels/2.x/itop-portal-base/datamodel.itop-portal-base.xml
index 2ae4242f1..245055ae4 100644
--- a/datamodels/2.x/itop-portal-base/datamodel.itop-portal-base.xml
+++ b/datamodels/2.x/itop-portal-base/datamodel.itop-portal-base.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design version="3.2">
+<itop_design version="3.3">
   <events>
     <event id="EVENT_DISPLAY_OBJECT_DETAILS" _delta="define">
       <name>Portal object displayed</name>
diff --git a/datamodels/2.x/itop-portal/datamodel.itop-portal.xml b/datamodels/2.x/itop-portal/datamodel.itop-portal.xml
index 1656ffef1..2eeb043f1 100644
--- a/datamodels/2.x/itop-portal/datamodel.itop-portal.xml
+++ b/datamodels/2.x/itop-portal/datamodel.itop-portal.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <portals>
     <portal id="itop-portal" _delta="define">
       <!-- ID must match module_design[id] -->
diff --git a/datamodels/2.x/itop-problem-mgmt/datamodel.itop-problem-mgmt.xml b/datamodels/2.x/itop-problem-mgmt/datamodel.itop-problem-mgmt.xml
index c57abe21c..a11b217a4 100755
--- a/datamodels/2.x/itop-problem-mgmt/datamodel.itop-problem-mgmt.xml
+++ b/datamodels/2.x/itop-problem-mgmt/datamodel.itop-problem-mgmt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="Problem" _delta="define">
       <parent>Ticket</parent>
diff --git a/datamodels/2.x/itop-profiles-itil/datamodel.itop-profiles-itil.xml b/datamodels/2.x/itop-profiles-itil/datamodel.itop-profiles-itil.xml
index 47e7a47bb..2c495639f 100755
--- a/datamodels/2.x/itop-profiles-itil/datamodel.itop-profiles-itil.xml
+++ b/datamodels/2.x/itop-profiles-itil/datamodel.itop-profiles-itil.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes/>
   <user_rights>
     <groups>
diff --git a/datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml b/datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml
index 7d4e8fe2b..fe6627ed9 100755
--- a/datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml
+++ b/datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="UserRequest" _delta="define">
       <parent>Ticket</parent>
diff --git a/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml b/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml
index 8ba670637..92a8cfdec 100755
--- a/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml
+++ b/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="UserRequest" _delta="define">
       <parent>Ticket</parent>
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 63ebfd66a..fdb322545 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
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="Organization">
       <fields>
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 9b969f27e..797850c3e 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
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="Organization">
       <fields>
diff --git a/datamodels/2.x/itop-sla-computation/datamodel.itop-sla-computation.xml b/datamodels/2.x/itop-sla-computation/datamodel.itop-sla-computation.xml
index c6e47cac5..8c7a4acb0 100644
--- a/datamodels/2.x/itop-sla-computation/datamodel.itop-sla-computation.xml
+++ b/datamodels/2.x/itop-sla-computation/datamodel.itop-sla-computation.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <meta>
     <classes>
       <class id="SLAComputation" _delta="define">
@@ -9,4 +9,4 @@
       </class>
     </classes>
   </meta>
-</itop_design>
\ No newline at end of file
+</itop_design>
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 b8c7ee11a..6212eb926 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
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="StorageSystem" _delta="define">
       <parent>DatacenterDevice</parent>
diff --git a/datamodels/2.x/itop-structure/datamodel.itop-structure.xml b/datamodels/2.x/itop-structure/datamodel.itop-structure.xml
index 91e7a445f..3cd365163 100644
--- a/datamodels/2.x/itop-structure/datamodel.itop-structure.xml
+++ b/datamodels/2.x/itop-structure/datamodel.itop-structure.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="Organization" _delta="define">
       <parent>cmdbAbstractObject</parent>
diff --git a/datamodels/2.x/itop-themes-compat/datamodel.itop-themes-compat.xml b/datamodels/2.x/itop-themes-compat/datamodel.itop-themes-compat.xml
index 08103d518..098524f50 100644
--- a/datamodels/2.x/itop-themes-compat/datamodel.itop-themes-compat.xml
+++ b/datamodels/2.x/itop-themes-compat/datamodel.itop-themes-compat.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <branding>
     <themes>
       <theme id="light-grey" _delta="define">
diff --git a/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml b/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
index 1e2bc403b..86372d5e5 100755
--- a/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
+++ b/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <constants>
     <constant id="RESPONSE_TICKET_SLT_QUERY" xsi:type="string" _delta="define"><![CDATA[SELECT SLT AS slt JOIN lnkSLAToSLT AS l1 ON l1.slt_id=slt.id JOIN SLA AS sla ON l1.sla_id=sla.id JOIN lnkCustomerContractToService AS l2 ON l2.sla_id=sla.id JOIN CustomerContract AS sc ON l2.customercontract_id=sc.id WHERE slt.metric = :metric AND l2.service_id = :this->service_id AND sc.org_id = :this->org_id AND slt.request_type = :request_type AND slt.priority = :this->priority]]></constant>
   </constants>
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 bebf2a584..245e508fb 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
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <classes>
     <class id="VirtualDevice" _delta="define">
       <parent>FunctionalCI</parent>
diff --git a/datamodels/2.x/itop-welcome-itil/datamodel.itop-welcome-itil.xml b/datamodels/2.x/itop-welcome-itil/datamodel.itop-welcome-itil.xml
index 7cc056c82..3d09f4751 100644
--- a/datamodels/2.x/itop-welcome-itil/datamodel.itop-welcome-itil.xml
+++ b/datamodels/2.x/itop-welcome-itil/datamodel.itop-welcome-itil.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
   <menus>
     <!-- Dashboard definitions cannot be defined directly in datamodel.application.xml, so they are here -->
     <menu id="WelcomeMenuPage" xsi:type="DashboardMenuNode" _delta="redefine">