From 6258b97b9231d71c69bae11cb8c3bcbd5b741c79 Mon Sep 17 00:00:00 2001
From: Pierre Goiffon <pierre.goiffon@combodo.com>
Date: Fri, 18 Nov 2022 19:00:07 +0100
Subject: [PATCH] =?UTF-8?q?N=C2=B05563=20Convert=20datamodels=20files=20wi?=
 =?UTF-8?q?th=20new=203.1=20conversion=20methods?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .make/release/update-xml.php                  |     2 +
 .make/release/update.classes.inc.php          |     1 +
 .../authent-ldap/datamodel.authent-ldap.xml   |   298 +-
 .../authent-local/datamodel.authent-local.xml |    13 +-
 .../datamodel.itop-attachments.xml            |   122 +-
 .../datamodel.itop-bridge-cmdb-ticket.xml     |     5 +-
 .../datamodel.itop-change-mgmt-itil.xml       |    78 +-
 .../datamodel.itop-change-mgmt.xml            |  1916 ++-
 .../datamodel.itop-config-mgmt.xml            | 12817 ++++++++--------
 .../datamodel.itop-datacenter-mgmt.xml        |    16 +-
 .../datamodel.itop-enduser-devices.xml        |     2 +-
 .../datamodel.itop-faq-light.xml              |    18 +-
 .../datamodel.itop-full-itil.xml              |    96 +-
 .../datamodel.itop-hub-connector.xml          |    16 +-
 .../datamodel.itop-incident-mgmt-itil.xml     |  3314 ++--
 .../datamodel.itop-knownerror-mgmt.xml        |     8 +-
 .../datamodel.itop-oauth-client.xml           |     2 +
 .../datamodel.itop-portal-base.xml            |     2 +-
 .../2.x/itop-portal/datamodel.itop-portal.xml |   273 +-
 .../datamodel.itop-problem-mgmt.xml           |  1516 +-
 .../datamodel.itop-profiles-itil.xml          |     4 +-
 .../datamodel.itop-request-mgmt-itil.xml      |  3602 ++---
 .../datamodel.itop-request-mgmt.xml           |  3821 +++--
 .../datamodel.itop-service-mgmt-provider.xml  |    46 +-
 .../datamodel.itop-service-mgmt.xml           |  4528 +++---
 .../datamodel.itop-storage-mgmt.xml           |    15 +-
 .../datamodel.itop-structure.xml              |    14 +-
 .../itop-tickets/datamodel.itop-tickets.xml   |  2578 ++--
 .../datamodel.itop-virtualization-mgmt.xml    |    17 +-
 .../datamodel.itop-welcome-itil.xml           |    10 +-
 30 files changed, 17641 insertions(+), 17509 deletions(-)

diff --git a/.make/release/update-xml.php b/.make/release/update-xml.php
index 9bb042a36..1d28bedc7 100644
--- a/.make/release/update-xml.php
+++ b/.make/release/update-xml.php
@@ -7,6 +7,8 @@
  *
  * datamodels/2.x/.../datamodel.*.xml
  *
+ * Warning : this will NOT update the XML structure (iTopDesignFormat convert methods)
+ *
  * Usage :
  * `php .make\release\update-xml.php "1.7"`
  *
diff --git a/.make/release/update.classes.inc.php b/.make/release/update.classes.inc.php
index 3f6a7faa1..fa61e99ca 100644
--- a/.make/release/update.classes.inc.php
+++ b/.make/release/update.classes.inc.php
@@ -174,6 +174,7 @@ class DatamodelsXmlFiles extends AbstractGlobFileVersionUpdater
 	 */
 	public function UpdateFileContent($sVersionLabel, $sFileContent, $sFileFullPath)
 	{
+		//TODO should also CONVERT files !
 		return preg_replace(
 			'/(<itop_design .* version=")[^"]+(">)/',
 			'${1}'.$sVersionLabel.'${2}',
diff --git a/datamodels/2.x/authent-ldap/datamodel.authent-ldap.xml b/datamodels/2.x/authent-ldap/datamodel.authent-ldap.xml
index 3ad026654..2a85ade29 100644
--- a/datamodels/2.x/authent-ldap/datamodel.authent-ldap.xml
+++ b/datamodels/2.x/authent-ldap/datamodel.authent-ldap.xml
@@ -1,51 +1,51 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
-    <classes>
-        <class id="UserLDAP" _delta="define">
-            <parent>cmdbAbstractObject</parent>
-            <php_parent>
-                <name>UserInternal</name>
-            </php_parent>
-            <properties>
-                <comment>/**
+  <classes>
+    <class id="UserLDAP" _delta="define">
+      <parent>cmdbAbstractObject</parent>
+      <php_parent>
+        <name>UserInternal</name>
+      </php_parent>
+      <properties>
+        <comment>/**
                     * LDAP Authentication
                     * User authentication Module, no password at all!
                     *
                     * @copyright   Copyright (C) 2010-2020 Combodo SARL
                     * @license     http://opensource.org/licenses/AGPL-3.0
                     */</comment>
-                <category>addon/authentication,grant_by_profile,silo</category>
-                <abstract>false</abstract>
-                <key_type>autoincrement</key_type>
-                <db_table>priv_user_ldap</db_table>
-                <db_key_field>id</db_key_field>
-                <db_final_class_field/>
-                <naming>
-                    <format>%1$s</format>
-                    <attributes>
-                        <attribute id="login"/>
-                    </attributes>
-                </naming>
-                <display_template/>
-                <style>
-                  <icon/>
-                </style>
-                <reconciliation>
-                    <attributes>
-                        <attribute id="login"/>
-                    </attributes>
-                </reconciliation>
-            </properties>
-            <fields>
-                <field id="ldap_server" xsi:type="AttributeString">
-                    <sql>ldap_server</sql>
-                    <default_value/>
-                    <is_null_allowed>true</is_null_allowed>
-                </field>
-            </fields>
-            <methods>
-                <method id="CheckCredentials">
-                    <comment><![CDATA[/**
+        <category>addon/authentication,grant_by_profile,silo</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>priv_user_ldap</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <format>%1$s</format>
+          <attributes>
+            <attribute id="login"/>
+          </attributes>
+        </naming>
+        <display_template/>
+        <style>
+          <icon/>
+        </style>
+        <reconciliation>
+          <attributes>
+            <attribute id="login"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
+        <field id="ldap_server" xsi:type="AttributeString">
+          <sql>ldap_server</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+      </fields>
+      <methods>
+        <method id="CheckCredentials">
+          <comment><![CDATA[/**
 	 * Check the user's password against the LDAP server
 	 * Algorithm:
 	 * 1) Connect to the LDAP server, using a predefined account (or anonymously)
@@ -60,10 +60,10 @@
 	 * @throws \ArchivedObjectException
 	 * @throws \CoreException
 	 */]]></comment>
-                    <static>false</static>
-                    <access>public</access>
-                    <type>OQLMenuNode</type>
-                    <code><![CDATA[	public function CheckCredentials($sPassword)
+          <static>false</static>
+          <access>public</access>
+          <type>OQLMenuNode</type>
+          <code><![CDATA[	public function CheckCredentials($sPassword)
 	{
 		$sServer = $this->Get('ldap_server');
 		if (empty($sServer))
@@ -190,39 +190,39 @@
 			return false;
 		}
 	}]]></code>
-                </method>
-                <method id="TrustWebServerContext">
-                    <static>false</static>
-                    <access>public</access>
-                    <type>OQLMenuNode</type>
-                    <code>	public function TrustWebServerContext()
+        </method>
+        <method id="TrustWebServerContext">
+          <static>false</static>
+          <access>public</access>
+          <type>OQLMenuNode</type>
+          <code>	public function TrustWebServerContext()
 	{
 		return false;
 	}</code>
-                </method>
-                <method id="CanChangePassword">
-                    <static>false</static>
-                    <access>public</access>
-                    <type>OQLMenuNode</type>
-                    <code>	public function CanChangePassword()
+        </method>
+        <method id="CanChangePassword">
+          <static>false</static>
+          <access>public</access>
+          <type>OQLMenuNode</type>
+          <code>	public function CanChangePassword()
 	{
 		return false;
 	}</code>
-                </method>
-                <method id="ChangePassword">
-                    <static>false</static>
-                    <access>public</access>
-                    <type>OQLMenuNode</type>
-                    <code>	public function ChangePassword($sOldPassword, $sNewPassword)
+        </method>
+        <method id="ChangePassword">
+          <static>false</static>
+          <access>public</access>
+          <type>OQLMenuNode</type>
+          <code>	public function ChangePassword($sOldPassword, $sNewPassword)
 	{
 		return false;
 	}</code>
-                </method>
-                <method id="LogIssue">
-                    <static>false</static>
-                    <access>protected</access>
-                    <type>OQLMenuNode</type>
-                    <code><![CDATA[	protected function LogIssue($bDebug, $sMessage, $aData = array())
+        </method>
+        <method id="LogIssue">
+          <static>false</static>
+          <access>protected</access>
+          <type>OQLMenuNode</type>
+          <code><![CDATA[	protected function LogIssue($bDebug, $sMessage, $aData = array())
 	{
 		if ($bDebug)
 		{
@@ -240,91 +240,91 @@
 		}
 		IssueLog::Error($sMessage);
 	}]]></code>
-                </method>
-                <method id="LogInfo">
-                    <static>false</static>
-                    <access>protected</access>
-                    <type>OQLMenuNode</type>
-                    <code><![CDATA[	protected function LogInfo($bDebug, $sMessage)
+        </method>
+        <method id="LogInfo">
+          <static>false</static>
+          <access>protected</access>
+          <type>OQLMenuNode</type>
+          <code><![CDATA[	protected function LogInfo($bDebug, $sMessage)
 	{
 		if ($bDebug)
 		{
 			IssueLog::Info($sMessage);
 		}
 	}]]></code>
-                </method>
-            </methods>
-            <presentation>
-                <details>
-                    <items>
-                        <item id="contactid">
-                            <rank>10</rank>
-                        </item>
-                        <item id="org_id">
-                            <rank>20</rank>
-                        </item>
-                        <item id="email">
-                            <rank>30</rank>
-                        </item>
-                        <item id="login">
-                            <rank>40</rank>
-                        </item>
-                        <item id="language">
-                            <rank>50</rank>
-                        </item>
-                        <item id="status">
-                            <rank>60</rank>
-                        </item>
-                        <item id="profile_list">
-                            <rank>70</rank>
-                        </item>
-                        <item id="allowed_org_list">
-                            <rank>80</rank>
-                        </item>
-                        <item id="ldap_server">
-                            <rank>90</rank>
-                        </item>
-                    </items>
-                </details>
-                <search>
-                    <items>
-                        <item id="login">
-                            <rank>10</rank>
-                        </item>
-                        <item id="contactid">
-                            <rank>20</rank>
-                        </item>
-                        <item id="status">
-                            <rank>30</rank>
-                        </item>
-                        <item id="org_id">
-                            <rank>40</rank>
-                        </item>
-                        <item id="ldap_server">
-                            <rank>50</rank>
-                        </item>
-                    </items>
-                </search>
-                <list>
-                    <items>
-                        <item id="first_name">
-                            <rank>10</rank>
-                        </item>
-                        <item id="last_name">
-                            <rank>20</rank>
-                        </item>
-                        <item id="status">
-                            <rank>30</rank>
-                        </item>
-                        <item id="org_id">
-                            <rank>40</rank>
-                        </item>
-                        <item id="ldap_server">
-                            <rank>50</rank>
-                        </item>
-                    </items>
-                </list>
-            </presentation>
-        </class>
-    </classes>
+        </method>
+      </methods>
+      <presentation>
+        <details>
+          <items>
+            <item id="contactid">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="email">
+              <rank>30</rank>
+            </item>
+            <item id="login">
+              <rank>40</rank>
+            </item>
+            <item id="language">
+              <rank>50</rank>
+            </item>
+            <item id="status">
+              <rank>60</rank>
+            </item>
+            <item id="profile_list">
+              <rank>70</rank>
+            </item>
+            <item id="allowed_org_list">
+              <rank>80</rank>
+            </item>
+            <item id="ldap_server">
+              <rank>90</rank>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="login">
+              <rank>10</rank>
+            </item>
+            <item id="contactid">
+              <rank>20</rank>
+            </item>
+            <item id="status">
+              <rank>30</rank>
+            </item>
+            <item id="org_id">
+              <rank>40</rank>
+            </item>
+            <item id="ldap_server">
+              <rank>50</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="first_name">
+              <rank>10</rank>
+            </item>
+            <item id="last_name">
+              <rank>20</rank>
+            </item>
+            <item id="status">
+              <rank>30</rank>
+            </item>
+            <item id="org_id">
+              <rank>40</rank>
+            </item>
+            <item id="ldap_server">
+              <rank>50</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+  </classes>
 </itop_design>
diff --git a/datamodels/2.x/authent-local/datamodel.authent-local.xml b/datamodels/2.x/authent-local/datamodel.authent-local.xml
index bca7f5f7b..474ae021d 100644
--- a/datamodels/2.x/authent-local/datamodel.authent-local.xml
+++ b/datamodels/2.x/authent-local/datamodel.authent-local.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
-
-    <module_parameters>
-        <parameters id="authent-local" _delta="define">
-            <password_validation.pattern>^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^\da-zA-Z]).{8,}$</password_validation.pattern>
-	          <password_validation.message type="hash"></password_validation.message>
-        </parameters>
-    </module_parameters>
+  <module_parameters>
+    <parameters id="authent-local" _delta="define">
+      <password_validation.pattern>^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^\da-zA-Z]).{8,}$</password_validation.pattern>
+      <password_validation.message type="hash"/>
+    </parameters>
+  </module_parameters>
 </itop_design>
diff --git a/datamodels/2.x/itop-attachments/datamodel.itop-attachments.xml b/datamodels/2.x/itop-attachments/datamodel.itop-attachments.xml
index 50eb1e808..cccbccc46 100755
--- a/datamodels/2.x/itop-attachments/datamodel.itop-attachments.xml
+++ b/datamodels/2.x/itop-attachments/datamodel.itop-attachments.xml
@@ -55,51 +55,51 @@
         </indexes>
       </properties>
       <fields>
-	      <field id="expire" xsi:type="AttributeDateTime">
-		      <sql>expire</sql>
-		      <default_value/>
-		      <is_null_allowed>false</is_null_allowed>
-	      </field>
-	      <field id="temp_id" xsi:type="AttributeString">
-		      <sql>temp_id</sql>
-		      <default_value/>
-		      <is_null_allowed>true</is_null_allowed>
-	      </field>
-	      <field id="item_class" xsi:type="AttributeString">
-		      <sql>item_class</sql>
-		      <default_value/>
-		      <is_null_allowed>false</is_null_allowed>
-	      </field>
-	      <field id="item_id" xsi:type="AttributeObjectKey">
-		      <sql>item_id</sql>
-		      <is_null_allowed>true</is_null_allowed>
-		      <class_attcode>item_class</class_attcode>
-	      </field>
-	      <field id="item_org_id" xsi:type="AttributeInteger">
-		      <sql>item_org_id</sql>
-		      <default_value>0</default_value>
-		      <is_null_allowed>true</is_null_allowed>
-	      </field>
-	      <field id="contents" xsi:type="AttributeBlob"/>
-	      <field id="creation_date" xsi:type="AttributeDateTime">
-		      <sql>creation_date</sql>
-		      <default_value/>
-		      <is_null_allowed>true</is_null_allowed>
-	      </field>
-	      <field id="user_id" xsi:type="AttributeExternalKey">
-		      <sql>user_id</sql>
-		      <is_null_allowed>true</is_null_allowed>
-		      <on_target_delete>DEL_MANUAL</on_target_delete>
-		      <target_class>User</target_class>
-		      <allow_target_creation>false</allow_target_creation>
-	      </field>
-	      <field id="contact_id" xsi:type="AttributeExternalField">
-		      <extkey_attcode>user_id</extkey_attcode>
-		      <target_attcode>contactid</target_attcode>
-		      <dependencies>
-			      <attribute id="user_id"></attribute>
-		      </dependencies>
-	      </field>
+        <field id="expire" xsi:type="AttributeDateTime">
+          <sql>expire</sql>
+          <default_value/>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
+        <field id="temp_id" xsi:type="AttributeString">
+          <sql>temp_id</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="item_class" xsi:type="AttributeString">
+          <sql>item_class</sql>
+          <default_value/>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
+        <field id="item_id" xsi:type="AttributeObjectKey">
+          <sql>item_id</sql>
+          <is_null_allowed>true</is_null_allowed>
+          <class_attcode>item_class</class_attcode>
+        </field>
+        <field id="item_org_id" xsi:type="AttributeInteger">
+          <sql>item_org_id</sql>
+          <default_value>0</default_value>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="contents" xsi:type="AttributeBlob"/>
+        <field id="creation_date" xsi:type="AttributeDateTime">
+          <sql>creation_date</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="user_id" xsi:type="AttributeExternalKey">
+          <sql>user_id</sql>
+          <is_null_allowed>true</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+          <target_class>User</target_class>
+          <allow_target_creation>false</allow_target_creation>
+        </field>
+        <field id="contact_id" xsi:type="AttributeExternalField">
+          <extkey_attcode>user_id</extkey_attcode>
+          <target_attcode>contactid</target_attcode>
+          <dependencies>
+            <attribute id="user_id"/>
+          </dependencies>
+        </field>
       </fields>
       <methods>
         <method id="MapContextParam">
@@ -236,22 +236,22 @@
             </item>
           </items>
         </search>
-	      <list>
-		      <items>
-			      <item id="temp_id">
-				      <rank>10</rank>
-			      </item>
-			      <item id="item_class">
-				      <rank>20</rank>
-			      </item>
-			      <item id="item_id">
-				      <rank>30</rank>
-			      </item>
-			      <item id="creation_date">
-				      <rank>40</rank>
-			      </item>
-		      </items>
-	      </list>
+        <list>
+          <items>
+            <item id="temp_id">
+              <rank>10</rank>
+            </item>
+            <item id="item_class">
+              <rank>20</rank>
+            </item>
+            <item id="item_id">
+              <rank>30</rank>
+            </item>
+            <item id="creation_date">
+              <rank>40</rank>
+            </item>
+          </items>
+        </list>
       </presentation>
     </class>
   </classes>
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 d361f6649..4427a4b3b 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,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
-  <constants></constants>
+  <constants/>
   <classes>
     <class id="lnkFunctionalCIToTicket" _delta="define">
       <parent>cmdbAbstractObject</parent>
@@ -292,6 +292,7 @@
           <count_max>0</count_max>
           <ext_key_to_remote>providercontract_id</ext_key_to_remote>
           <duplicates/>
+          <read_only>false</read_only>
         </field>
         <field id="services_list" xsi:type="AttributeLinkedSetIndirect" _delta="define">
           <linked_class>lnkFunctionalCIToService</linked_class>
@@ -300,6 +301,7 @@
           <count_max>0</count_max>
           <ext_key_to_remote>service_id</ext_key_to_remote>
           <duplicates/>
+          <read_only>false</read_only>
         </field>
         <field id="tickets_list" xsi:type="AttributeLinkedSetIndirect" _delta="define">
           <linked_class>lnkFunctionalCIToTicket</linked_class>
@@ -308,6 +310,7 @@
           <count_max>0</count_max>
           <ext_key_to_remote>ticket_id</ext_key_to_remote>
           <duplicates/>
+          <read_only>false</read_only>
         </field>
       </fields>
       <presentation>
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 ecfb88db0..17766c1a8 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
@@ -44,19 +44,11 @@
           <values>
             <value id="approved">approved
               <code>approved</code>
-              <style>
-                <main_color>$ibo-lifecycle-success-state-primary-color</main_color>
-                <complementary_color>$ibo-lifecycle-success-state-secondary-color</complementary_color>
-                <decoration_classes>fas fa-user-check</decoration_classes>
-              </style>
+              <style><main_color>$ibo-lifecycle-success-state-primary-color</main_color><complementary_color>$ibo-lifecycle-success-state-secondary-color</complementary_color><decoration_classes>fas fa-user-check</decoration_classes></style>
             </value>
             <value id="assigned">assigned
               <code>assigned</code>
-              <style>
-                <main_color>$ibo-lifecycle-neutral-state-primary-color</main_color>
-                <complementary_color>$ibo-lifecycle-neutral-state-secondary-color</complementary_color>
-                <decoration_classes/>
-              </style>
+              <style><main_color>$ibo-lifecycle-neutral-state-primary-color</main_color><complementary_color>$ibo-lifecycle-neutral-state-secondary-color</complementary_color><decoration_classes/></style>
             </value>
             <value id="closed">
               <code>closed</code>
@@ -247,31 +239,39 @@
         <field id="related_request_list" xsi:type="AttributeLinkedSet">
           <linked_class>UserRequest</linked_class>
           <ext_key_to_me>parent_change_id</ext_key_to_me>
-          <edit_mode>add_remove</edit_mode>
+          <legacy_edit_mode>add_remove</legacy_edit_mode>
           <count_min>0</count_min>
           <count_max>0</count_max>
+          <relation_type>link</relation_type>
+          <read_only>false</read_only>
         </field>
         <field id="related_incident_list" xsi:type="AttributeLinkedSet">
           <linked_class>Incident</linked_class>
           <ext_key_to_me>parent_change_id</ext_key_to_me>
-          <edit_mode>add_remove</edit_mode>
+          <legacy_edit_mode>add_remove</legacy_edit_mode>
           <count_min>0</count_min>
           <count_max>0</count_max>
+          <relation_type>link</relation_type>
+          <read_only>false</read_only>
         </field>
         <field id="related_problems_list" xsi:type="AttributeLinkedSet">
           <linked_class>Problem</linked_class>
           <ext_key_to_me>related_change_id</ext_key_to_me>
-          <edit_mode>add_remove</edit_mode>
+          <legacy_edit_mode>add_remove</legacy_edit_mode>
           <count_min>0</count_min>
           <count_max>0</count_max>
+          <relation_type>link</relation_type>
+          <read_only>false</read_only>
         </field>
         <field id="child_changes_list" xsi:type="AttributeLinkedSet">
           <linked_class>Change</linked_class>
           <ext_key_to_me>parent_id</ext_key_to_me>
-          <edit_mode>add_remove</edit_mode>
+          <legacy_edit_mode>add_remove</legacy_edit_mode>
           <filter><![CDATA[SELECT Change WHERE id != :this->id]]></filter>
           <count_min>0</count_min>
           <count_max>0</count_max>
+          <relation_type>link</relation_type>
+          <read_only>false</read_only>
         </field>
       </fields>
       <lifecycle>
@@ -279,17 +279,17 @@
           <item id="approved">
             <rank>1</rank>
             <color>HIGHLIGHT_CLASS_NONE</color>
-              <icon>images/change-approved.svg</icon>
+            <icon>images/change-approved.svg</icon>
           </item>
           <item id="rejected">
             <rank>2</rank>
             <color>HIGHLIGHT_CLASS_NONE</color>
-              <icon>images/change-rejected.svg</icon>
+            <icon>images/change-rejected.svg</icon>
           </item>
           <item id="closed">
             <rank>3</rank>
             <color>HIGHLIGHT_CLASS_NONE</color>
-              <icon>images/change-closed.svg</icon>
+            <icon>images/change-closed.svg</icon>
           </item>
         </highlight_scale>
         <stimuli>
@@ -976,17 +976,17 @@
         </states>
       </lifecycle>
       <methods>
-				<method id="GetTicketRefFormat">
-					<static>true</static>
-					<access>public</access>
-					<type>Overload-DBObject</type>
-					<code><![CDATA[
+        <method id="GetTicketRefFormat">
+          <static>true</static>
+          <access>public</access>
+          <type>Overload-DBObject</type>
+          <code><![CDATA[
         public static function GetTicketRefFormat()
         {
                 return 'C-%06d';
         }
         ]]></code>
-				</method>
+        </method>
         <method id="SetClosureDate">
           <comment><![CDATA[/**
 	 * To be deprecated: use SetCurrentDate() instead
@@ -1026,8 +1026,7 @@
         $this->UpdateImpactedItems();
 		$this->SetIfNull('creation_date', time());
 		$this->SetIfNull('last_update', time());
-	}]]>
-          </code>
+	}]]></code>
         </method>
         <method id="OnUpdate">
           <static>false</static>
@@ -1043,8 +1042,7 @@
             $this->UpdateImpactedItems();
         }
   	    $this->Set('last_update', time());
-  	}]]>
-          </code>
+  	}]]></code>
         </method>
       </methods>
       <presentation>
@@ -4534,9 +4532,9 @@
   <menus>
     <menu id="ChangeManagement" xsi:type="MenuGroup" _delta="define">
       <rank>50</rank>
-	    <style>
-		    <decoration_classes>fas fa-exchange-alt</decoration_classes>
-	    </style>
+      <style>
+        <decoration_classes>fas fa-exchange-alt</decoration_classes>
+      </style>
     </menu>
     <menu id="Change:Overview" xsi:type="DashboardMenuNode" _delta="define">
       <rank>0</rank>
@@ -4659,7 +4657,7 @@
                       AND (C.id != :this->id)
                     ]]></oql>
                   <dict>Tickets:Related:OpenChanges</dict>
-                    <icon>itop-change-mgmt-itil/images/change-ongoing.png</icon>
+                  <icon>itop-change-mgmt-itil/images/change-ongoing.png</icon>
                 </item>
                 <item id="recent_changes" _delta="define">
                   <oql><![CDATA[
@@ -4674,7 +4672,7 @@
                       AND (C.end_date < NOW() AND C.end_date > DATE_SUB(NOW(), INTERVAL 3 DAY ))
                     ]]></oql>
                   <dict>Tickets:Related:RecentChanges</dict>
-                    <icon>itop-change-mgmt-itil/images/change-done.png</icon>
+                  <icon>itop-change-mgmt-itil/images/change-done.png</icon>
                 </item>
               </items>
             </down>
@@ -4696,7 +4694,7 @@
                       AND (C.id != :this->id)
                     ]]></oql>
                   <dict>Tickets:Related:OpenChanges</dict>
-                    <icon>itop-change-mgmt-itil/images/change-ongoing.png</icon>
+                  <icon>itop-change-mgmt-itil/images/change-ongoing.png</icon>
                 </item>
                 <item id="recent_changes" _delta="define">
                   <oql><![CDATA[
@@ -4711,7 +4709,7 @@
                       AND (C.end_date < NOW() AND C.end_date > DATE_SUB(NOW(), INTERVAL 3 DAY ))
                     ]]></oql>
                   <dict>Tickets:Related:RecentChanges</dict>
-                    <icon>itop-change-mgmt-itil/images/change-done.png</icon>
+                  <icon>itop-change-mgmt-itil/images/change-done.png</icon>
                 </item>
               </items>
             </down>
@@ -4733,7 +4731,7 @@
                       AND (C.id != :this->id)
                     ]]></oql>
                   <dict>Tickets:Related:OpenChanges</dict>
-                    <icon>itop-change-mgmt-itil/images/change-ongoing.png</icon>
+                  <icon>itop-change-mgmt-itil/images/change-ongoing.png</icon>
                 </item>
                 <item id="recent_changes" _delta="define">
                   <oql><![CDATA[
@@ -4748,7 +4746,7 @@
                       AND (C.end_date < NOW() AND C.end_date > DATE_SUB(NOW(), INTERVAL 3 DAY ))
                     ]]></oql>
                   <dict>Tickets:Related:RecentChanges</dict>
-                    <icon>itop-change-mgmt-itil/images/change-done.png</icon>
+                  <icon>itop-change-mgmt-itil/images/change-done.png</icon>
                 </item>
               </items>
             </down>
@@ -4773,7 +4771,7 @@
                       AND (L.impact_code != 'not_impacted')
                     ]]></oql>
                   <dict>Tickets:Related:OpenChanges</dict>
-                    <icon>itop-change-mgmt-itil/images/change-ongoing.png</icon>
+                  <icon>itop-change-mgmt-itil/images/change-ongoing.png</icon>
                 </item>
                 <item id="recent_changes" _delta="define">
                   <oql><![CDATA[
@@ -4787,7 +4785,7 @@
                       AND (C.end_date < NOW() AND C.end_date > DATE_SUB(NOW(), INTERVAL 3 DAY ))
                     ]]></oql>
                   <dict>Tickets:Related:RecentChanges</dict>
-                    <icon>itop-change-mgmt-itil/images/change-done.png</icon>
+                  <icon>itop-change-mgmt-itil/images/change-done.png</icon>
                 </item>
               </items>
             </down>
@@ -4804,7 +4802,7 @@
                       AND (L.impact_code != 'not_impacted')
                     ]]></oql>
                   <dict>Tickets:Related:OpenChanges</dict>
-                    <icon>itop-change-mgmt-itil/images/change-ongoing.png</icon>
+                  <icon>itop-change-mgmt-itil/images/change-ongoing.png</icon>
                 </item>
                 <item id="recent_changes" _delta="define">
                   <oql><![CDATA[
@@ -4818,7 +4816,7 @@
                       AND (C.end_date < NOW() AND C.end_date > DATE_SUB(NOW(), INTERVAL 3 DAY ))
                     ]]></oql>
                   <dict>Tickets:Related:RecentChanges</dict>
-                    <icon>itop-change-mgmt-itil/images/change-done.png</icon>
+                  <icon>itop-change-mgmt-itil/images/change-done.png</icon>
                 </item>
               </items>
             </up>
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 29d80c634..595444076 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,576 +1,584 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
-    <classes>
-        <class id="Change" _delta="define">
-            <parent>Ticket</parent>
-            <properties>
-                <comment><![CDATA[/**
+  <classes>
+    <class id="Change" _delta="define">
+      <parent>Ticket</parent>
+      <properties>
+        <comment><![CDATA[/**
  * Persistent classes for a CMDB
  *
  * @copyright   Copyright (C) 2010-2021 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */]]></comment>
-                <category>bizmodel,searchable,changemgmt</category>
-                <abstract>false</abstract>
-                <key_type>autoincrement</key_type>
-                <db_table>ticket_change</db_table>
-                <db_key_field>id</db_key_field>
-                <db_final_class_field/>
-                <naming>
-                    <attributes>
-                        <attribute id="ref"/>
-                    </attributes>
-                </naming>
-                <fields_semantic>
-                    <state_attribute>status</state_attribute>
-                </fields_semantic>
-                <style>
-                    <icon>../../images/icons/icons8-change.svg</icon>
-                </style>
-                <reconciliation>
-                    <attributes>
-                        <attribute id="ref"/>
-                    </attributes>
-                </reconciliation>
-                <order>
-                    <columns>
-                        <column id="ref" ascending="false"/>
-                    </columns>
-                </order>
-            </properties>
-            <fields>
-                <field id="status" xsi:type="AttributeEnum">
-                    <values>
-                        <value id="new">
-                            <code>new</code>
-                            <style>
-                                <main_color>$ibo-lifecycle-new-state-primary-color</main_color>
-                                <complementary_color>$ibo-lifecycle-new-state-secondary-color</complementary_color>
-                                <decoration_classes/>
-                            </style>
-                        </value>
-                        <value id="assigned">
-                            <code>assigned</code>
-                            <style>
-                                <main_color>$ibo-lifecycle-neutral-state-primary-color</main_color>
-                                <complementary_color>$ibo-lifecycle-neutral-state-secondary-color</complementary_color>
-                                <decoration_classes/>
-                            </style>
-                        </value>
-                        <value id="planned">
-                            <code>planned</code>
-                        </value>
-                        <value id="approved">
-                            <code>approved</code>
-                            <style>
-                                <main_color>$ibo-lifecycle-success-state-primary-color</main_color>
-                                <complementary_color>$ibo-lifecycle-success-state-secondary-color</complementary_color>
-                                <decoration_classes>fas fa-user-check</decoration_classes>
-                            </style>
-                        </value>
-                        <value id="closed">
-                            <code>closed</code>
-                            <style>
-                                <main_color>$ibo-lifecycle-frozen-state-primary-color</main_color>
-                                <complementary_color>$ibo-lifecycle-frozen-state-secondary-color</complementary_color>
-                                <decoration_classes/>
-                            </style>
-                        </value>
-                        <value id="rejected">
-                            <code>rejected</code>
-                            <style>
-                                <main_color>$ibo-lifecycle-failure-state-primary-color</main_color>
-                                <complementary_color>$ibo-lifecycle-failure-state-secondary-color</complementary_color>
-                                <decoration_classes>fas fa-user-times</decoration_classes>
-                            </style>
-                        </value>
-                    </values>
-                    <default_style>
-                        <main_color>$ibo-lifecycle-neutral-state-primary-color</main_color>
-                        <complementary_color>$ibo-lifecycle-neutral-state-secondary-color</complementary_color>
-                        <decoration_classes/>
-                    </default_style>
-                    <sql>status</sql>
-                    <default_value>new</default_value>
-                    <is_null_allowed>true</is_null_allowed>
-                </field>
-                <field id="category" xsi:type="AttributeEnum">
-                    <values>
-                        <value id="hardware">
-                            <code>hardware</code>
-                        </value>
-                        <value id="software">
-                            <code>software</code>
-                        </value>
-                        <value id="system">
-                            <code>system</code>
-                        </value>
-                        <value id="network">
-                            <code>network</code>
-                        </value>
-                        <value id="application">
-                            <code>application</code>
-                        </value>
-                        <value id="other">
-                            <code>other</code>
-                        </value>
-                    </values>
-                    <sql>category</sql>
-                    <default_value>hardware</default_value>
-                    <is_null_allowed>true</is_null_allowed>
-                </field>
-                <field id="reject_reason" xsi:type="AttributeText">
-                    <sql>reject_reason</sql>
-                    <default_value/>
-                    <is_null_allowed>true</is_null_allowed>
-                </field>
-                <field id="changemanager_id" xsi:type="AttributeExternalKey">
-                    <sql>changemanager_id</sql>
-                    <target_class>Person</target_class>
-                    <is_null_allowed>true</is_null_allowed>
-                    <on_target_delete>DEL_MANUAL</on_target_delete>
-                </field>
-                <field id="changemanager_email" xsi:type="AttributeExternalField">
-                    <extkey_attcode>changemanager_id</extkey_attcode>
-                    <target_attcode>email</target_attcode>
-                </field>
-                <field id="parent_id" xsi:type="AttributeExternalKey">
-                    <filter><![CDATA[SELECT Change WHERE id != :this->id]]></filter>
-                    <sql>parent_id</sql>
-                    <target_class>Change</target_class>
-                    <is_null_allowed>true</is_null_allowed>
-                    <on_target_delete>DEL_MANUAL</on_target_delete>
-                    <jointype/>
-                </field>
-                <field id="parent_name" xsi:type="AttributeExternalField">
-                    <extkey_attcode>parent_id</extkey_attcode>
-                    <target_attcode>ref</target_attcode>
-                    <is_null_allowed>true</is_null_allowed>
-                </field>
-                <field id="creation_date" xsi:type="AttributeDateTime">
-                    <sql>creation_date</sql>
-                    <default_value/>
-                    <is_null_allowed>true</is_null_allowed>
-                </field>
-                <field id="approval_date" xsi:type="AttributeDateTime">
-                    <sql>approval_date</sql>
-                    <default_value/>
-                    <is_null_allowed>true</is_null_allowed>
-                </field>
-                <field id="fallback_plan" xsi:type="AttributeText">
-                    <sql>fallback_plan</sql>
-                    <default_value/>
-                    <is_null_allowed>true</is_null_allowed>
-                </field>
-                <field id="outage" xsi:type="AttributeEnum">
-                    <values>
-                        <value id="yes">
-                            <code>yes</code>
-                        </value>
-                        <value id="no">
-                            <code>no</code>
-                        </value>
-                    </values>
-                    <sql>outage</sql>
-                    <default_value>no</default_value>
-                    <is_null_allowed>false</is_null_allowed>
-                </field>
-                <field id="related_request_list" xsi:type="AttributeLinkedSet">
-                    <linked_class>UserRequest</linked_class>
-                    <ext_key_to_me>parent_change_id</ext_key_to_me>
-                    <edit_mode>add_remove</edit_mode>
-                    <count_min>0</count_min>
-                    <count_max>0</count_max>
-                </field>
-                <field id="related_incident_list" xsi:type="AttributeLinkedSet">
-                    <linked_class>Incident</linked_class>
-                    <ext_key_to_me>parent_change_id</ext_key_to_me>
-                    <edit_mode>add_remove</edit_mode>
-                    <count_min>0</count_min>
-                    <count_max>0</count_max>
-                </field>
-                <field id="related_problems_list" xsi:type="AttributeLinkedSet">
-                    <linked_class>Problem</linked_class>
-                    <ext_key_to_me>related_change_id</ext_key_to_me>
-                    <edit_mode>add_remove</edit_mode>
-                    <count_min>0</count_min>
-                    <count_max>0</count_max>
-                </field>
-                <field id="child_changes_list" xsi:type="AttributeLinkedSet">
-                    <linked_class>Change</linked_class>
-                    <ext_key_to_me>parent_id</ext_key_to_me>
-                    <edit_mode>add_remove</edit_mode>
-                    <filter><![CDATA[SELECT Change WHERE id != :this->id]]></filter>
-                    <count_min>0</count_min>
-                    <count_max>0</count_max>
-                </field>
-            </fields>
-            <lifecycle>
-                <highlight_scale>
-                    <item id="approved">
-                        <rank>1</rank>
-                        <color>HIGHLIGHT_CLASS_NONE</color>
-                            <icon>images/change-approved.svg</icon>
-                    </item>
-                    <item id="rejected">
-                        <rank>2</rank>
-                        <color>HIGHLIGHT_CLASS_NONE</color>
-                            <icon>images/change-rejected.svg</icon>
-                    </item>
-                    <item id="closed">
-                        <rank>3</rank>
-                        <color>HIGHLIGHT_CLASS_NONE</color>
-                            <icon>images/change-closed.svg</icon>
-                    </item>
-                </highlight_scale>
-                <stimuli>
-                    <stimulus id="ev_assign" xsi:type="StimulusUserAction"/>
-                    <stimulus id="ev_plan" xsi:type="StimulusUserAction"/>
-                    <stimulus id="ev_reject" xsi:type="StimulusUserAction"/>
-                    <stimulus id="ev_reopen" xsi:type="StimulusUserAction"/>
-                    <stimulus id="ev_approve" xsi:type="StimulusUserAction"/>
-                    <stimulus id="ev_finish" xsi:type="StimulusUserAction"/>
-                </stimuli>
-                <states>
-                    <state id="new">
-                        <flags>
-                            <attribute id="ref">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="org_id">
-                                <mandatory/>
-                            </attribute>
-                            <attribute id="title">
-                                <mandatory/>
-                            </attribute>
-                            <attribute id="description">
-                                <mandatory/>
-                            </attribute>
-                            <attribute id="last_update">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="close_date">
-                                <hidden/>
-                            </attribute>
-                            <attribute id="reject_reason">
-                                <hidden/>
-                            </attribute>
-                            <attribute id="creation_date">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="approval_date">
-                                <hidden/>
-                            </attribute>
-                            <attribute id="caller_id">
-                                <mandatory/>
-                            </attribute>
-                            <attribute id="team_id">
-                                <hidden/>
-                            </attribute>
-                            <attribute id="agent_id">
-                                <hidden/>
-                            </attribute>
-                            <attribute id="changemanager_id">
-                                <hidden/>
-                            </attribute>
-                            <attribute id="outage">
-                                <hidden/>
-                            </attribute>
-                        </flags>
-                        <transitions>
-                            <transition id="ev_assign">
-                                <target>assigned</target>
-                                <actions/>
-                            </transition>
-                        </transitions>
-                    </state>
-                    <state id="assigned">
-                        <inherit_flags_from>new</inherit_flags_from>
-                        <flags>
-                            <attribute id="team_id">
-                                <mandatory/>
-                                <must_prompt/>
-                            </attribute>
-                            <attribute id="agent_id">
-                                <mandatory/>
-                                <must_prompt/>
-                            </attribute>
-                            <attribute id="changemanager_id">
-                                <mandatory/>
-                                <must_prompt/>
-                            </attribute>
-                            <attribute id="caller_id"/>
-                        </flags>
-                        <transitions>
-                            <transition id="ev_plan">
-                                <target>planned</target>
-                                <actions/>
-                            </transition>
-                        </transitions>
-                    </state>
-                    <state id="planned">
-                        <inherit_flags_from>assigned</inherit_flags_from>
-                        <flags>
-                            <attribute id="start_date">
-                                <mandatory/>
-                                <must_prompt/>
-                            </attribute>
-                            <attribute id="end_date">
-                                <mandatory/>
-                                <must_prompt/>
-                            </attribute>
-                            <attribute id="fallback_plan">
-                                <mandatory/>
-                                <must_prompt/>
-                            </attribute>
-                            <attribute id="caller_id">
-                                <mandatory/>
-                            </attribute>
-                            <attribute id="outage">
-                                <mandatory/>
-                                <must_prompt/>
-                            </attribute>
-                        </flags>
-                        <transitions>
-                            <transition id="ev_reject">
-                                <target>rejected</target>
-                                <actions/>
-                            </transition>
-                            <transition id="ev_approve">
-                                <target>approved</target>
-                                <actions>
-                                    <action>
-                                        <verb>SetCurrentDate</verb>
-                                        <params>
-                                            <param xsi:type="attcode">approval_date</param>
-                                        </params>
-                                    </action>
-                                    <action>
-                                        <verb>Reset</verb>
-                                        <params>
-                                            <param xsi:type="attcode">reject_reason</param>
-                                        </params>
-                                    </action>
-                                </actions>
-                            </transition>
-                        </transitions>
-                    </state>
-                    <state id="rejected">
-                        <highlight>
-                            <code>rejected</code>
-                        </highlight>
-                        <inherit_flags_from>assigned</inherit_flags_from>
-                        <flags>
-                            <attribute id="start_date">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="end_date">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="private_log">
-                                <read_only/>
-                                <read_only/>
-                            </attribute>
-                            <attribute id="caller_id">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="fallback_plan">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="category">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="parent_id">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="org_id">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="title">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="description">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="reject_reason">
-                                <mandatory/>
-                                <must_prompt/>
-                            </attribute>
-                            <attribute id="approval_date">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="team_id">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="agent_id">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="changemanager_id">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="outage">
-                                <read_only/>
-                            </attribute>
-                        </flags>
-                        <transitions>
-                            <transition id="ev_reopen">
-                                <target>assigned</target>
-                                <actions/>
-                            </transition>
-                        </transitions>
-                    </state>
-                    <state id="approved">
-                        <highlight>
-                            <code>approved</code>
-                        </highlight>
-                        <inherit_flags_from>planned</inherit_flags_from>
-                        <flags>
-                            <attribute id="private_log"/>
-                            <attribute id="category"/>
-                            <attribute id="parent_id"/>
-                            <attribute id="org_id">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="title">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="description">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="start_date">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="end_date">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="reject_reason">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="creation_date">
-                                <hidden/>
-                            </attribute>
-                            <attribute id="approval_date">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="caller_id">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="team_id">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="agent_id">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="changemanager_id">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="fallback_plan"/>
-                            <attribute id="outage">
-                                <read_only/>
-                            </attribute>
-                        </flags>
-                        <transitions>
-                            <transition id="ev_finish">
-                                <target>closed</target>
-                                <actions>
-                                    <action>
-                                        <verb>SetCurrentDate</verb>
-                                        <params>
-                                            <param xsi:type="attcode">close_date</param>
-                                        </params>
-                                    </action>
-                                </actions>
-                            </transition>
-                        </transitions>
-                    </state>
-                    <state id="closed">
-                        <highlight>
-                            <code>closed</code>
-                        </highlight>
-                        <inherit_flags_from>approved</inherit_flags_from>
-                        <flags>
-                            <attribute id="close_date">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="creation_date">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="private_log">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="fallback_plan">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="category">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="parent_id">
-                                <read_only/>
-                            </attribute>
-                        </flags>
-                        <transitions/>
-                    </state>
-                </states>
-            </lifecycle>
-            <methods>
-				<method id="GetTicketRefFormat">
-					<static>true</static>
-					<access>public</access>
-					<type>Overload-DBObject</type>
-					<code><![CDATA[
+        <category>bizmodel,searchable,changemgmt</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>ticket_change</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="ref"/>
+          </attributes>
+        </naming>
+        <fields_semantic>
+          <state_attribute>status</state_attribute>
+        </fields_semantic>
+        <style>
+          <icon>../../images/icons/icons8-change.svg</icon>
+        </style>
+        <reconciliation>
+          <attributes>
+            <attribute id="ref"/>
+          </attributes>
+        </reconciliation>
+        <order>
+          <columns>
+            <column id="ref" ascending="false"/>
+          </columns>
+        </order>
+      </properties>
+      <fields>
+        <field id="status" xsi:type="AttributeEnum">
+          <values>
+            <value id="new">
+              <code>new</code>
+              <style>
+                <main_color>$ibo-lifecycle-new-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-new-state-secondary-color</complementary_color>
+                <decoration_classes/>
+              </style>
+            </value>
+            <value id="assigned">
+              <code>assigned</code>
+              <style>
+                <main_color>$ibo-lifecycle-neutral-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-neutral-state-secondary-color</complementary_color>
+                <decoration_classes/>
+              </style>
+            </value>
+            <value id="planned">
+              <code>planned</code>
+            </value>
+            <value id="approved">
+              <code>approved</code>
+              <style>
+                <main_color>$ibo-lifecycle-success-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-success-state-secondary-color</complementary_color>
+                <decoration_classes>fas fa-user-check</decoration_classes>
+              </style>
+            </value>
+            <value id="closed">
+              <code>closed</code>
+              <style>
+                <main_color>$ibo-lifecycle-frozen-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-frozen-state-secondary-color</complementary_color>
+                <decoration_classes/>
+              </style>
+            </value>
+            <value id="rejected">
+              <code>rejected</code>
+              <style>
+                <main_color>$ibo-lifecycle-failure-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-failure-state-secondary-color</complementary_color>
+                <decoration_classes>fas fa-user-times</decoration_classes>
+              </style>
+            </value>
+          </values>
+          <default_style>
+            <main_color>$ibo-lifecycle-neutral-state-primary-color</main_color>
+            <complementary_color>$ibo-lifecycle-neutral-state-secondary-color</complementary_color>
+            <decoration_classes/>
+          </default_style>
+          <sql>status</sql>
+          <default_value>new</default_value>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="category" xsi:type="AttributeEnum">
+          <values>
+            <value id="hardware">
+              <code>hardware</code>
+            </value>
+            <value id="software">
+              <code>software</code>
+            </value>
+            <value id="system">
+              <code>system</code>
+            </value>
+            <value id="network">
+              <code>network</code>
+            </value>
+            <value id="application">
+              <code>application</code>
+            </value>
+            <value id="other">
+              <code>other</code>
+            </value>
+          </values>
+          <sql>category</sql>
+          <default_value>hardware</default_value>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="reject_reason" xsi:type="AttributeText">
+          <sql>reject_reason</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="changemanager_id" xsi:type="AttributeExternalKey">
+          <sql>changemanager_id</sql>
+          <target_class>Person</target_class>
+          <is_null_allowed>true</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+        </field>
+        <field id="changemanager_email" xsi:type="AttributeExternalField">
+          <extkey_attcode>changemanager_id</extkey_attcode>
+          <target_attcode>email</target_attcode>
+        </field>
+        <field id="parent_id" xsi:type="AttributeExternalKey">
+          <filter><![CDATA[SELECT Change WHERE id != :this->id]]></filter>
+          <sql>parent_id</sql>
+          <target_class>Change</target_class>
+          <is_null_allowed>true</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+          <jointype/>
+        </field>
+        <field id="parent_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>parent_id</extkey_attcode>
+          <target_attcode>ref</target_attcode>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="creation_date" xsi:type="AttributeDateTime">
+          <sql>creation_date</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="approval_date" xsi:type="AttributeDateTime">
+          <sql>approval_date</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="fallback_plan" xsi:type="AttributeText">
+          <sql>fallback_plan</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="outage" xsi:type="AttributeEnum">
+          <values>
+            <value id="yes">
+              <code>yes</code>
+            </value>
+            <value id="no">
+              <code>no</code>
+            </value>
+          </values>
+          <sql>outage</sql>
+          <default_value>no</default_value>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
+        <field id="related_request_list" xsi:type="AttributeLinkedSet">
+          <linked_class>UserRequest</linked_class>
+          <ext_key_to_me>parent_change_id</ext_key_to_me>
+          <legacy_edit_mode>add_remove</legacy_edit_mode>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <relation_type>link</relation_type>
+          <read_only>false</read_only>
+        </field>
+        <field id="related_incident_list" xsi:type="AttributeLinkedSet">
+          <linked_class>Incident</linked_class>
+          <ext_key_to_me>parent_change_id</ext_key_to_me>
+          <legacy_edit_mode>add_remove</legacy_edit_mode>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <relation_type>link</relation_type>
+          <read_only>false</read_only>
+        </field>
+        <field id="related_problems_list" xsi:type="AttributeLinkedSet">
+          <linked_class>Problem</linked_class>
+          <ext_key_to_me>related_change_id</ext_key_to_me>
+          <legacy_edit_mode>add_remove</legacy_edit_mode>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <relation_type>link</relation_type>
+          <read_only>false</read_only>
+        </field>
+        <field id="child_changes_list" xsi:type="AttributeLinkedSet">
+          <linked_class>Change</linked_class>
+          <ext_key_to_me>parent_id</ext_key_to_me>
+          <legacy_edit_mode>add_remove</legacy_edit_mode>
+          <filter><![CDATA[SELECT Change WHERE id != :this->id]]></filter>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <relation_type>link</relation_type>
+          <read_only>false</read_only>
+        </field>
+      </fields>
+      <lifecycle>
+        <highlight_scale>
+          <item id="approved">
+            <rank>1</rank>
+            <color>HIGHLIGHT_CLASS_NONE</color>
+            <icon>images/change-approved.svg</icon>
+          </item>
+          <item id="rejected">
+            <rank>2</rank>
+            <color>HIGHLIGHT_CLASS_NONE</color>
+            <icon>images/change-rejected.svg</icon>
+          </item>
+          <item id="closed">
+            <rank>3</rank>
+            <color>HIGHLIGHT_CLASS_NONE</color>
+            <icon>images/change-closed.svg</icon>
+          </item>
+        </highlight_scale>
+        <stimuli>
+          <stimulus id="ev_assign" xsi:type="StimulusUserAction"/>
+          <stimulus id="ev_plan" xsi:type="StimulusUserAction"/>
+          <stimulus id="ev_reject" xsi:type="StimulusUserAction"/>
+          <stimulus id="ev_reopen" xsi:type="StimulusUserAction"/>
+          <stimulus id="ev_approve" xsi:type="StimulusUserAction"/>
+          <stimulus id="ev_finish" xsi:type="StimulusUserAction"/>
+        </stimuli>
+        <states>
+          <state id="new">
+            <flags>
+              <attribute id="ref">
+                <read_only/>
+              </attribute>
+              <attribute id="org_id">
+                <mandatory/>
+              </attribute>
+              <attribute id="title">
+                <mandatory/>
+              </attribute>
+              <attribute id="description">
+                <mandatory/>
+              </attribute>
+              <attribute id="last_update">
+                <read_only/>
+              </attribute>
+              <attribute id="close_date">
+                <hidden/>
+              </attribute>
+              <attribute id="reject_reason">
+                <hidden/>
+              </attribute>
+              <attribute id="creation_date">
+                <read_only/>
+              </attribute>
+              <attribute id="approval_date">
+                <hidden/>
+              </attribute>
+              <attribute id="caller_id">
+                <mandatory/>
+              </attribute>
+              <attribute id="team_id">
+                <hidden/>
+              </attribute>
+              <attribute id="agent_id">
+                <hidden/>
+              </attribute>
+              <attribute id="changemanager_id">
+                <hidden/>
+              </attribute>
+              <attribute id="outage">
+                <hidden/>
+              </attribute>
+            </flags>
+            <transitions>
+              <transition id="ev_assign">
+                <target>assigned</target>
+                <actions/>
+              </transition>
+            </transitions>
+          </state>
+          <state id="assigned">
+            <inherit_flags_from>new</inherit_flags_from>
+            <flags>
+              <attribute id="team_id">
+                <mandatory/>
+                <must_prompt/>
+              </attribute>
+              <attribute id="agent_id">
+                <mandatory/>
+                <must_prompt/>
+              </attribute>
+              <attribute id="changemanager_id">
+                <mandatory/>
+                <must_prompt/>
+              </attribute>
+              <attribute id="caller_id"/>
+            </flags>
+            <transitions>
+              <transition id="ev_plan">
+                <target>planned</target>
+                <actions/>
+              </transition>
+            </transitions>
+          </state>
+          <state id="planned">
+            <inherit_flags_from>assigned</inherit_flags_from>
+            <flags>
+              <attribute id="start_date">
+                <mandatory/>
+                <must_prompt/>
+              </attribute>
+              <attribute id="end_date">
+                <mandatory/>
+                <must_prompt/>
+              </attribute>
+              <attribute id="fallback_plan">
+                <mandatory/>
+                <must_prompt/>
+              </attribute>
+              <attribute id="caller_id">
+                <mandatory/>
+              </attribute>
+              <attribute id="outage">
+                <mandatory/>
+                <must_prompt/>
+              </attribute>
+            </flags>
+            <transitions>
+              <transition id="ev_reject">
+                <target>rejected</target>
+                <actions/>
+              </transition>
+              <transition id="ev_approve">
+                <target>approved</target>
+                <actions>
+                  <action>
+                    <verb>SetCurrentDate</verb>
+                    <params>
+                      <param xsi:type="attcode">approval_date</param>
+                    </params>
+                  </action>
+                  <action>
+                    <verb>Reset</verb>
+                    <params>
+                      <param xsi:type="attcode">reject_reason</param>
+                    </params>
+                  </action>
+                </actions>
+              </transition>
+            </transitions>
+          </state>
+          <state id="rejected">
+            <highlight>
+              <code>rejected</code>
+            </highlight>
+            <inherit_flags_from>assigned</inherit_flags_from>
+            <flags>
+              <attribute id="start_date">
+                <read_only/>
+              </attribute>
+              <attribute id="end_date">
+                <read_only/>
+              </attribute>
+              <attribute id="private_log">
+                <read_only/>
+                <read_only/>
+              </attribute>
+              <attribute id="caller_id">
+                <read_only/>
+              </attribute>
+              <attribute id="fallback_plan">
+                <read_only/>
+              </attribute>
+              <attribute id="category">
+                <read_only/>
+              </attribute>
+              <attribute id="parent_id">
+                <read_only/>
+              </attribute>
+              <attribute id="org_id">
+                <read_only/>
+              </attribute>
+              <attribute id="title">
+                <read_only/>
+              </attribute>
+              <attribute id="description">
+                <read_only/>
+              </attribute>
+              <attribute id="reject_reason">
+                <mandatory/>
+                <must_prompt/>
+              </attribute>
+              <attribute id="approval_date">
+                <read_only/>
+              </attribute>
+              <attribute id="team_id">
+                <read_only/>
+              </attribute>
+              <attribute id="agent_id">
+                <read_only/>
+              </attribute>
+              <attribute id="changemanager_id">
+                <read_only/>
+              </attribute>
+              <attribute id="outage">
+                <read_only/>
+              </attribute>
+            </flags>
+            <transitions>
+              <transition id="ev_reopen">
+                <target>assigned</target>
+                <actions/>
+              </transition>
+            </transitions>
+          </state>
+          <state id="approved">
+            <highlight>
+              <code>approved</code>
+            </highlight>
+            <inherit_flags_from>planned</inherit_flags_from>
+            <flags>
+              <attribute id="private_log"/>
+              <attribute id="category"/>
+              <attribute id="parent_id"/>
+              <attribute id="org_id">
+                <read_only/>
+              </attribute>
+              <attribute id="title">
+                <read_only/>
+              </attribute>
+              <attribute id="description">
+                <read_only/>
+              </attribute>
+              <attribute id="start_date">
+                <read_only/>
+              </attribute>
+              <attribute id="end_date">
+                <read_only/>
+              </attribute>
+              <attribute id="reject_reason">
+                <read_only/>
+              </attribute>
+              <attribute id="creation_date">
+                <hidden/>
+              </attribute>
+              <attribute id="approval_date">
+                <read_only/>
+              </attribute>
+              <attribute id="caller_id">
+                <read_only/>
+              </attribute>
+              <attribute id="team_id">
+                <read_only/>
+              </attribute>
+              <attribute id="agent_id">
+                <read_only/>
+              </attribute>
+              <attribute id="changemanager_id">
+                <read_only/>
+              </attribute>
+              <attribute id="fallback_plan"/>
+              <attribute id="outage">
+                <read_only/>
+              </attribute>
+            </flags>
+            <transitions>
+              <transition id="ev_finish">
+                <target>closed</target>
+                <actions>
+                  <action>
+                    <verb>SetCurrentDate</verb>
+                    <params>
+                      <param xsi:type="attcode">close_date</param>
+                    </params>
+                  </action>
+                </actions>
+              </transition>
+            </transitions>
+          </state>
+          <state id="closed">
+            <highlight>
+              <code>closed</code>
+            </highlight>
+            <inherit_flags_from>approved</inherit_flags_from>
+            <flags>
+              <attribute id="close_date">
+                <read_only/>
+              </attribute>
+              <attribute id="creation_date">
+                <read_only/>
+              </attribute>
+              <attribute id="private_log">
+                <read_only/>
+              </attribute>
+              <attribute id="fallback_plan">
+                <read_only/>
+              </attribute>
+              <attribute id="category">
+                <read_only/>
+              </attribute>
+              <attribute id="parent_id">
+                <read_only/>
+              </attribute>
+            </flags>
+            <transitions/>
+          </state>
+        </states>
+      </lifecycle>
+      <methods>
+        <method id="GetTicketRefFormat">
+          <static>true</static>
+          <access>public</access>
+          <type>Overload-DBObject</type>
+          <code><![CDATA[
         public static function GetTicketRefFormat()
         {
                 return 'C-%06d';
         }
         ]]></code>
-				</method>
-                <method id="SetApprovalDate">
-                    <comment><![CDATA[/**
+        </method>
+        <method id="SetApprovalDate">
+          <comment><![CDATA[/**
 	 * To be deprecated: use SetCurrentDate() instead
 	 * @return void
 	 */]]></comment>
-                    <static>false</static>
-                    <access>public</access>
-                    <type>LifecycleAction</type>
-                    <code><![CDATA[	public function SetApprovalDate($sStimulusCode)
+          <static>false</static>
+          <access>public</access>
+          <type>LifecycleAction</type>
+          <code><![CDATA[	public function SetApprovalDate($sStimulusCode)
 	{
 		$this->Set('approval_date', time());
 		return true;
 	}]]></code>
-                </method>
-                <method id="ResetRejectReason">
-                    <comment><![CDATA[/**
+        </method>
+        <method id="ResetRejectReason">
+          <comment><![CDATA[/**
 	 * To be deprecated: use SetCurrentDate() instead
 	 * @return void
 	 */]]></comment>
-                    <static>false</static>
-                    <access>public</access>
-                    <type>LifecycleAction</type>
-                    <code><![CDATA[	public function ResetRejectReason($sStimulusCode)
+          <static>false</static>
+          <access>public</access>
+          <type>LifecycleAction</type>
+          <code><![CDATA[	public function ResetRejectReason($sStimulusCode)
 	{
 		$this->Set('reject_reason', '');
 		return true;
 	}]]></code>
-                </method>
-                <method id="SetClosureDate">
-                    <comment><![CDATA[/**
+        </method>
+        <method id="SetClosureDate">
+          <comment><![CDATA[/**
 	 * To be deprecated: use SetCurrentDate() instead
 	 * @return void
 	 */]]></comment>
-                    <static>false</static>
-                    <access>public</access>
-                    <type>LifecycleAction</type>
-                    <code><![CDATA[	public function SetClosureDate($sStimulusCode)
+          <static>false</static>
+          <access>public</access>
+          <type>LifecycleAction</type>
+          <code><![CDATA[	public function SetClosureDate($sStimulusCode)
 	{
 		$this->Set('close_date', time());
 		return true;
 	}]]></code>
-                </method>
-                <method id="OnInsert">
-                    <static>false</static>
-                    <access>protected</access>
-                    <type>Overload-DBObject</type>
-                    <code><![CDATA[
+        </method>
+        <method id="OnInsert">
+          <static>false</static>
+          <access>protected</access>
+          <type>Overload-DBObject</type>
+          <code><![CDATA[
     protected function OnInsert()
 	{
         parent::OnInsert();
@@ -578,12 +586,12 @@
 		$this->SetIfNull('creation_date', time());
 		$this->SetIfNull('last_update', time());
 	}]]></code>
-                </method>
-                <method id="OnUpdate">
-                    <static>false</static>
-                    <access>protected</access>
-                    <type>Overload-DBObject</type>
-                    <code><![CDATA[
+        </method>
+        <method id="OnUpdate">
+          <static>false</static>
+          <access>protected</access>
+          <type>Overload-DBObject</type>
+          <code><![CDATA[
     protected function OnUpdate()
 	{
         parent::OnUpdate();
@@ -594,317 +602,316 @@
         }
 		$this->Set('last_update', time());
 	}]]></code>
-                </method>
-            </methods>
-            <presentation>
-                <details>
-                    <items>
-                        <item id="functionalcis_list">
-                            <rank>10</rank>
-                        </item>
-                        <item id="contacts_list">
-                            <rank>20</rank>
-                        </item>
-                        <item id="workorders_list">
-                            <rank>30</rank>
-                        </item>
-                        <item id="related_request_list">
-                            <rank>40</rank>
-                        </item>
-                        <item id="related_incident_list">
-                            <rank>50</rank>
-                        </item>
-                        <item id="related_problems_list">
-                            <rank>60</rank>
-                        </item>
-                        <item id="child_changes_list">
-                            <rank>70</rank>
-                        </item>
-                        <item id="col:col1">
-                            <rank>80</rank>
-                            <items>
-                                <item id="fieldset:Ticket:baseinfo">
-                                    <rank>10</rank>
-                                    <items>
-                                        <item id="ref">
-                                            <rank>10</rank>
-                                        </item>
-                                        <item id="org_id">
-                                            <rank>20</rank>
-                                        </item>
-                                        <item id="status">
-                                            <rank>30</rank>
-                                        </item>
-                                        <item id="title">
-                                            <rank>40</rank>
-                                        </item>
-                                        <item id="description">
-                                            <rank>50</rank>
-                                        </item>
-                                    </items>
-                                </item>
-                                <item id="fieldset:Ticket:contact">
-                                    <rank>20</rank>
-                                    <items>
-                                        <item id="caller_id">
-                                            <rank>10</rank>
-                                        </item>
-                                        <item id="team_id">
-                                            <rank>20</rank>
-                                        </item>
-                                        <item id="agent_id">
-                                            <rank>30</rank>
-                                        </item>
-                                        <item id="changemanager_id">
-                                            <rank>40</rank>
-                                        </item>
-                                    </items>
-                                </item>
-                            </items>
-                        </item>
-                        <item id="col:col2">
-                            <rank>90</rank>
-                            <items>
-                                <item id="fieldset:Ticket:resolution">
-                                    <rank>10</rank>
-                                    <items>
-                                        <item id="category">
-                                            <rank>10</rank>
-                                        </item>
-                                        <item id="outage">
-                                            <rank>15.1</rank>
-                                        </item>
-                                        <item id="reject_reason">
-                                            <rank>20</rank>
-                                        </item>
-                                        <item id="fallback_plan">
-                                            <rank>30</rank>
-                                        </item>
-                                    </items>
-                                </item>
-                                <item id="fieldset:Ticket:relation">
-                                    <rank>20</rank>
-                                    <items>
-                                        <item id="parent_id">
-                                            <rank>10</rank>
-                                        </item>
-                                    </items>
-                                </item>
-                            </items>
-                        </item>
-                        <item id="col:col3">
-                            <rank>100</rank>
-                            <items>
-                                <item id="fieldset:Ticket:date">
-                                    <rank>10</rank>
-                                    <items>
-                                        <item id="creation_date">
-                                            <rank>10</rank>
-                                        </item>
-                                        <item id="start_date">
-                                            <rank>20</rank>
-                                        </item>
-                                        <item id="end_date">
-                                            <rank>30</rank>
-                                        </item>
-                                        <item id="last_update">
-                                            <rank>40</rank>
-                                        </item>
-                                        <item id="approval_date">
-                                            <rank>50</rank>
-                                        </item>
-                                        <item id="close_date">
-                                            <rank>60</rank>
-                                        </item>
-                                    </items>
-                                </item>
-                            </items>
-                        </item>
-                    </items>
-                </details>
-                <search>
-                    <items>
-                        <item id="ref">
-                            <rank>10</rank>
-                        </item>
-                        <item id="title">
-                            <rank>20</rank>
-                        </item>
-                        <item id="org_id">
-                            <rank>30</rank>
-                        </item>
-                        <item id="status">
-                            <rank>40</rank>
-                        </item>
-                        <item id="operational_status">
-                            <rank>45</rank>
-                        </item>
-                        <item id="start_date">
-                            <rank>50</rank>
-                        </item>
-                        <item id="end_date">
-                            <rank>60</rank>
-                        </item>
-                        <item id="creation_date">
-                            <rank>70</rank>
-                        </item>
-                        <item id="last_update">
-                            <rank>80</rank>
-                        </item>
-                        <item id="close_date">
-                            <rank>90</rank>
-                        </item>
-                        <item id="team_id">
-                            <rank>100</rank>
-                        </item>
-                        <item id="agent_id">
-                            <rank>110</rank>
-                        </item>
-                        <item id="changemanager_id">
-                            <rank>120</rank>
-                        </item>
-                    </items>
-                </search>
-                <list>
-                    <items>
-                        <item id="title">
-                            <rank>10</rank>
-                        </item>
-                        <item id="org_id">
-                            <rank>20</rank>
-                        </item>
-                        <item id="start_date">
-                            <rank>30</rank>
-                        </item>
-                        <item id="end_date">
-                            <rank>40</rank>
-                        </item>
-                        <item id="status">
-                            <rank>50</rank>
-                        </item>
-                        <item id="category">
-                            <rank>60</rank>
-                        </item>
-                        <item id="agent_id">
-                            <rank>70</rank>
-                        </item>
-                    </items>
-                </list>
-            </presentation>
-        </class>
-    </classes>
-    <menus>
-        <menu id="ChangeManagement" xsi:type="MenuGroup" _delta="define">
-            <rank>50</rank>
-				    <style>
-					    <decoration_classes>fas fa-exchange-alt</decoration_classes>
-				    </style>
-        </menu>
-        <menu id="Change:Overview" xsi:type="DashboardMenuNode" _delta="define">
+        </method>
+      </methods>
+      <presentation>
+        <details>
+          <items>
+            <item id="functionalcis_list">
+              <rank>10</rank>
+            </item>
+            <item id="contacts_list">
+              <rank>20</rank>
+            </item>
+            <item id="workorders_list">
+              <rank>30</rank>
+            </item>
+            <item id="related_request_list">
+              <rank>40</rank>
+            </item>
+            <item id="related_incident_list">
+              <rank>50</rank>
+            </item>
+            <item id="related_problems_list">
+              <rank>60</rank>
+            </item>
+            <item id="child_changes_list">
+              <rank>70</rank>
+            </item>
+            <item id="col:col1">
+              <rank>80</rank>
+              <items>
+                <item id="fieldset:Ticket:baseinfo">
+                  <rank>10</rank>
+                  <items>
+                    <item id="ref">
+                      <rank>10</rank>
+                    </item>
+                    <item id="org_id">
+                      <rank>20</rank>
+                    </item>
+                    <item id="status">
+                      <rank>30</rank>
+                    </item>
+                    <item id="title">
+                      <rank>40</rank>
+                    </item>
+                    <item id="description">
+                      <rank>50</rank>
+                    </item>
+                  </items>
+                </item>
+                <item id="fieldset:Ticket:contact">
+                  <rank>20</rank>
+                  <items>
+                    <item id="caller_id">
+                      <rank>10</rank>
+                    </item>
+                    <item id="team_id">
+                      <rank>20</rank>
+                    </item>
+                    <item id="agent_id">
+                      <rank>30</rank>
+                    </item>
+                    <item id="changemanager_id">
+                      <rank>40</rank>
+                    </item>
+                  </items>
+                </item>
+              </items>
+            </item>
+            <item id="col:col2">
+              <rank>90</rank>
+              <items>
+                <item id="fieldset:Ticket:resolution">
+                  <rank>10</rank>
+                  <items>
+                    <item id="category">
+                      <rank>10</rank>
+                    </item>
+                    <item id="outage">
+                      <rank>15.1</rank>
+                    </item>
+                    <item id="reject_reason">
+                      <rank>20</rank>
+                    </item>
+                    <item id="fallback_plan">
+                      <rank>30</rank>
+                    </item>
+                  </items>
+                </item>
+                <item id="fieldset:Ticket:relation">
+                  <rank>20</rank>
+                  <items>
+                    <item id="parent_id">
+                      <rank>10</rank>
+                    </item>
+                  </items>
+                </item>
+              </items>
+            </item>
+            <item id="col:col3">
+              <rank>100</rank>
+              <items>
+                <item id="fieldset:Ticket:date">
+                  <rank>10</rank>
+                  <items>
+                    <item id="creation_date">
+                      <rank>10</rank>
+                    </item>
+                    <item id="start_date">
+                      <rank>20</rank>
+                    </item>
+                    <item id="end_date">
+                      <rank>30</rank>
+                    </item>
+                    <item id="last_update">
+                      <rank>40</rank>
+                    </item>
+                    <item id="approval_date">
+                      <rank>50</rank>
+                    </item>
+                    <item id="close_date">
+                      <rank>60</rank>
+                    </item>
+                  </items>
+                </item>
+              </items>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="ref">
+              <rank>10</rank>
+            </item>
+            <item id="title">
+              <rank>20</rank>
+            </item>
+            <item id="org_id">
+              <rank>30</rank>
+            </item>
+            <item id="status">
+              <rank>40</rank>
+            </item>
+            <item id="operational_status">
+              <rank>45</rank>
+            </item>
+            <item id="start_date">
+              <rank>50</rank>
+            </item>
+            <item id="end_date">
+              <rank>60</rank>
+            </item>
+            <item id="creation_date">
+              <rank>70</rank>
+            </item>
+            <item id="last_update">
+              <rank>80</rank>
+            </item>
+            <item id="close_date">
+              <rank>90</rank>
+            </item>
+            <item id="team_id">
+              <rank>100</rank>
+            </item>
+            <item id="agent_id">
+              <rank>110</rank>
+            </item>
+            <item id="changemanager_id">
+              <rank>120</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="title">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="start_date">
+              <rank>30</rank>
+            </item>
+            <item id="end_date">
+              <rank>40</rank>
+            </item>
+            <item id="status">
+              <rank>50</rank>
+            </item>
+            <item id="category">
+              <rank>60</rank>
+            </item>
+            <item id="agent_id">
+              <rank>70</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+  </classes>
+  <menus>
+    <menu id="ChangeManagement" xsi:type="MenuGroup" _delta="define">
+      <rank>50</rank>
+      <style>
+        <decoration_classes>fas fa-exchange-alt</decoration_classes>
+      </style>
+    </menu>
+    <menu id="Change:Overview" xsi:type="DashboardMenuNode" _delta="define">
+      <rank>0</rank>
+      <parent>ChangeManagement</parent>
+      <definition>
+        <layout>DashboardLayoutTwoCols</layout>
+        <title>UI:ChangeMgmtMenuOverview:Title</title>
+        <cells>
+          <cell id="0">
             <rank>0</rank>
-            <parent>ChangeManagement</parent>
-            <definition>
-                <layout>DashboardLayoutTwoCols</layout>
-                <title>UI:ChangeMgmtMenuOverview:Title</title>
-                <cells>
-                    <cell id="0">
-                        <rank>0</rank>
-                        <dashlets>
-                            <dashlet id="1" xsi:type="DashletGroupByTable">
-                                <rank>0</rank>
-                                <title>UI-ChangeManagementOverview-ChangeByCategory-last-7-days</title>
-                                <query>SELECT Change WHERE creation_date &gt; DATE_SUB(NOW(), INTERVAL 7 DAY)</query>
-                                <group_by>category</group_by>
-                                <style>table</style>
-                            </dashlet>
-                        </dashlets>
-                    </cell>
-                    <cell id="1">
-                        <rank>1</rank>
-                        <dashlets>
-                            <dashlet id="2" xsi:type="DashletGroupByBars">
-                                <rank>0</rank>
-                                <title>UI-ChangeManagementOverview-Last-7-days</title>
-                                <query>SELECT Change WHERE creation_date &gt; DATE_SUB(NOW(), INTERVAL 7 DAY)</query>
-                                <group_by>start_date:day_of_month</group_by>
-                                <style>bars</style>
-                            </dashlet>
-                        </dashlets>
-                    </cell>
-                    <cell id="2">
-                        <rank>2</rank>
-                        <dashlets>
-                            <dashlet id="3" xsi:type="DashletGroupByTable">
-                                <rank>0</rank>
-                                <title>UI-ChangeManagementOverview-ChangeByDomain-last-7-days</title>
-                                <query>SELECT Change WHERE creation_date &gt; DATE_SUB(NOW(), INTERVAL 7 DAY)</query>
-                                <group_by>finalclass</group_by>
-                                <style>table</style>
-                            </dashlet>
-                        </dashlets>
-                    </cell>
-                    <cell id="3">
-                        <rank>3</rank>
-                        <dashlets>
-                            <dashlet id="4" xsi:type="DashletGroupByTable">
-                                <rank>0</rank>
-                                <title>UI-ChangeManagementOverview-ChangeByStatus-last-7-days</title>
-                                <query>SELECT Change WHERE creation_date &gt; DATE_SUB(NOW(), INTERVAL 7 DAY)</query>
-                                <group_by>status</group_by>
-                                <style>table</style>
-                            </dashlet>
-                        </dashlets>
-                    </cell>
-                </cells>
-            </definition>
-        </menu>
-        <menu id="NewChange" xsi:type="NewObjectMenuNode" _delta="define">
+            <dashlets>
+              <dashlet id="1" xsi:type="DashletGroupByTable">
+                <rank>0</rank>
+                <title>UI-ChangeManagementOverview-ChangeByCategory-last-7-days</title>
+                <query>SELECT Change WHERE creation_date &gt; DATE_SUB(NOW(), INTERVAL 7 DAY)</query>
+                <group_by>category</group_by>
+                <style>table</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="1">
             <rank>1</rank>
-            <parent>ChangeManagement</parent>
-            <class>Change</class>
-        </menu>
-        <menu id="SearchChanges" xsi:type="SearchMenuNode" _delta="define">
+            <dashlets>
+              <dashlet id="2" xsi:type="DashletGroupByBars">
+                <rank>0</rank>
+                <title>UI-ChangeManagementOverview-Last-7-days</title>
+                <query>SELECT Change WHERE creation_date &gt; DATE_SUB(NOW(), INTERVAL 7 DAY)</query>
+                <group_by>start_date:day_of_month</group_by>
+                <style>bars</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="2">
             <rank>2</rank>
-            <parent>ChangeManagement</parent>
-            <class>Change</class>
-        </menu>
-        <menu id="Change:Shortcuts" xsi:type="TemplateMenuNode" _delta="define">
+            <dashlets>
+              <dashlet id="3" xsi:type="DashletGroupByTable">
+                <rank>0</rank>
+                <title>UI-ChangeManagementOverview-ChangeByDomain-last-7-days</title>
+                <query>SELECT Change WHERE creation_date &gt; DATE_SUB(NOW(), INTERVAL 7 DAY)</query>
+                <group_by>finalclass</group_by>
+                <style>table</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="3">
             <rank>3</rank>
-            <parent>ChangeManagement</parent>
-            <template_file/>
-        </menu>
-        <menu id="MyChanges" xsi:type="OQLMenuNode" _delta="define">
-            <rank>1</rank>
-            <parent>Change:Shortcuts</parent>
-            <oql><![CDATA[SELECT Change WHERE agent_id = :current_contact_id AND status NOT IN ("closed")]]></oql>
-            <do_search/>
-            <auto_reload>fast</auto_reload>
-        </menu>
-        <menu id="Changes" xsi:type="OQLMenuNode" _delta="define">
-            <rank>2</rank>
-            <parent>Change:Shortcuts</parent>
-            <oql><![CDATA[SELECT Change WHERE status != "closed"]]></oql>
-            <do_search>1</do_search>
-            <auto_reload>fast</auto_reload>
-        </menu>
-        <menu id="WaitingApproval" xsi:type="OQLMenuNode" _delta="define">
-            <rank>3</rank>
-            <parent>Change:Shortcuts</parent>
-            <oql><![CDATA[SELECT Change WHERE status IN ("planned")]]></oql>
-            <do_search/>
-            <auto_reload>fast</auto_reload>
-        </menu>
-    </menus>
-    <module_parameters>
-        <parameters id="itop-tickets">
-            <relation_context>
-                <UserRequest>
-                    <impacts>
-                        <down>
-                            <items type="array">
-                                <item id="open_changes" _delta="define">
-                                    <oql>
-                                        <![CDATA[
+            <dashlets>
+              <dashlet id="4" xsi:type="DashletGroupByTable">
+                <rank>0</rank>
+                <title>UI-ChangeManagementOverview-ChangeByStatus-last-7-days</title>
+                <query>SELECT Change WHERE creation_date &gt; DATE_SUB(NOW(), INTERVAL 7 DAY)</query>
+                <group_by>status</group_by>
+                <style>table</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+        </cells>
+      </definition>
+    </menu>
+    <menu id="NewChange" xsi:type="NewObjectMenuNode" _delta="define">
+      <rank>1</rank>
+      <parent>ChangeManagement</parent>
+      <class>Change</class>
+    </menu>
+    <menu id="SearchChanges" xsi:type="SearchMenuNode" _delta="define">
+      <rank>2</rank>
+      <parent>ChangeManagement</parent>
+      <class>Change</class>
+    </menu>
+    <menu id="Change:Shortcuts" xsi:type="TemplateMenuNode" _delta="define">
+      <rank>3</rank>
+      <parent>ChangeManagement</parent>
+      <template_file/>
+    </menu>
+    <menu id="MyChanges" xsi:type="OQLMenuNode" _delta="define">
+      <rank>1</rank>
+      <parent>Change:Shortcuts</parent>
+      <oql><![CDATA[SELECT Change WHERE agent_id = :current_contact_id AND status NOT IN ("closed")]]></oql>
+      <do_search/>
+      <auto_reload>fast</auto_reload>
+    </menu>
+    <menu id="Changes" xsi:type="OQLMenuNode" _delta="define">
+      <rank>2</rank>
+      <parent>Change:Shortcuts</parent>
+      <oql><![CDATA[SELECT Change WHERE status != "closed"]]></oql>
+      <do_search>1</do_search>
+      <auto_reload>fast</auto_reload>
+    </menu>
+    <menu id="WaitingApproval" xsi:type="OQLMenuNode" _delta="define">
+      <rank>3</rank>
+      <parent>Change:Shortcuts</parent>
+      <oql><![CDATA[SELECT Change WHERE status IN ("planned")]]></oql>
+      <do_search/>
+      <auto_reload>fast</auto_reload>
+    </menu>
+  </menus>
+  <module_parameters>
+    <parameters id="itop-tickets">
+      <relation_context>
+        <UserRequest>
+          <impacts>
+            <down>
+              <items type="array">
+                <item id="open_changes" _delta="define">
+                  <oql><![CDATA[
                                         SELECT FCI, C
                                         FROM FunctionalCI AS FCI
                                                  JOIN lnkFunctionalCIToTicket AS L ON L.functionalci_id = FCI.id
@@ -914,13 +921,12 @@
                                           AND (L.impact_code != 'not_impacted')
                                           AND (C.id != :this->id)
                                         ]]></oql>
-                                    <dict>Tickets:Related:OpenChanges</dict>
-                                        <icon>itop-change-mgmt/images/change-ongoing.png</icon>
-                                    <default>yes</default>
-                                </item>
-                                <item id="recent_changes" _delta="define">
-                                    <oql>
-                                        <![CDATA[
+                  <dict>Tickets:Related:OpenChanges</dict>
+                  <icon>itop-change-mgmt/images/change-ongoing.png</icon>
+                  <default>yes</default>
+                </item>
+                <item id="recent_changes" _delta="define">
+                  <oql><![CDATA[
                                         SELECT FCI, C
                                         FROM FunctionalCI AS FCI
                                                  JOIN lnkFunctionalCIToTicket AS L ON L.functionalci_id = FCI.id
@@ -931,21 +937,20 @@
                                           AND (C.id != :this->id)
                                           AND (C.end_date < NOW() AND C.end_date > DATE_SUB(NOW(), INTERVAL 3 DAY ))
                                         ]]></oql>
-                                    <dict>Tickets:Related:RecentChanges</dict>
-                                        <icon>itop-change-mgmt/images/change-done.png</icon>
-                                    <default>no</default>
-                                </item>
-                            </items>
-                        </down>
-                    </impacts>
-                </UserRequest>
-                <Incident>
-                    <impacts>
-                        <down>
-                            <items type="array">
-                                <item id="open_changes" _delta="define">
-                                    <oql>
-                                        <![CDATA[
+                  <dict>Tickets:Related:RecentChanges</dict>
+                  <icon>itop-change-mgmt/images/change-done.png</icon>
+                  <default>no</default>
+                </item>
+              </items>
+            </down>
+          </impacts>
+        </UserRequest>
+        <Incident>
+          <impacts>
+            <down>
+              <items type="array">
+                <item id="open_changes" _delta="define">
+                  <oql><![CDATA[
                                         SELECT FCI, C
                                         FROM FunctionalCI AS FCI
                                                  JOIN lnkFunctionalCIToTicket AS L ON L.functionalci_id = FCI.id
@@ -955,13 +960,12 @@
                                           AND (L.impact_code != 'not_impacted')
                                           AND (C.id != :this->id)
                                         ]]></oql>
-                                    <dict>Tickets:Related:OpenChanges</dict>
-                                        <icon>itop-change-mgmt/images/change-ongoing.png</icon>
-                                    <default>yes</default>
-                                </item>
-                                <item id="recent_changes" _delta="define">
-                                    <oql>
-                                        <![CDATA[
+                  <dict>Tickets:Related:OpenChanges</dict>
+                  <icon>itop-change-mgmt/images/change-ongoing.png</icon>
+                  <default>yes</default>
+                </item>
+                <item id="recent_changes" _delta="define">
+                  <oql><![CDATA[
                                         SELECT FCI, C
                                         FROM FunctionalCI AS FCI
                                                  JOIN lnkFunctionalCIToTicket AS L ON L.functionalci_id = FCI.id
@@ -972,21 +976,20 @@
                                           AND (C.id != :this->id)
                                           AND (C.end_date < NOW() AND C.end_date > DATE_SUB(NOW(), INTERVAL 3 DAY ))
                                         ]]></oql>
-                                    <dict>Tickets:Related:RecentChanges</dict>
-                                        <icon>itop-change-mgmt/images/change-done.png</icon>
-                                    <default>no</default>
-                                </item>
-                            </items>
-                        </down>
-                    </impacts>
-                </Incident>
-                <Change>
-                    <impacts>
-                        <down>
-                            <items type="array">
-                                <item id="open_changes" _delta="define">
-                                    <oql>
-                                        <![CDATA[
+                  <dict>Tickets:Related:RecentChanges</dict>
+                  <icon>itop-change-mgmt/images/change-done.png</icon>
+                  <default>no</default>
+                </item>
+              </items>
+            </down>
+          </impacts>
+        </Incident>
+        <Change>
+          <impacts>
+            <down>
+              <items type="array">
+                <item id="open_changes" _delta="define">
+                  <oql><![CDATA[
                                         SELECT FCI, C
                                         FROM FunctionalCI AS FCI
                                                  JOIN lnkFunctionalCIToTicket AS L ON L.functionalci_id = FCI.id
@@ -996,13 +999,12 @@
                                           AND (L.impact_code != 'not_impacted')
                                           AND (C.id != :this->id)
                                         ]]></oql>
-                                    <dict>Tickets:Related:OpenChanges</dict>
-                                        <icon>itop-change-mgmt/images/change-ongoing.png</icon>
-                                    <default>yes</default>
-                                </item>
-                                <item id="recent_changes" _delta="define">
-                                    <oql>
-                                        <![CDATA[
+                  <dict>Tickets:Related:OpenChanges</dict>
+                  <icon>itop-change-mgmt/images/change-ongoing.png</icon>
+                  <default>yes</default>
+                </item>
+                <item id="recent_changes" _delta="define">
+                  <oql><![CDATA[
                                         SELECT FCI, C
                                         FROM FunctionalCI AS FCI
                                                  JOIN lnkFunctionalCIToTicket AS L ON L.functionalci_id = FCI.id
@@ -1013,25 +1015,24 @@
                                           AND (C.id != :this->id)
                                           AND (C.end_date < NOW() AND C.end_date > DATE_SUB(NOW(), INTERVAL 3 DAY ))
                                         ]]></oql>
-                                    <dict>Tickets:Related:RecentChanges</dict>
-                                        <icon>itop-change-mgmt/images/change-done.png</icon>
-                                    <default>no</default>
-                                </item>
-                            </items>
-                        </down>
-                    </impacts>
-                </Change>
-            </relation_context>
-        </parameters>
-        <parameters id="itop-config-mgmt">
-            <relation_context>
-                <FunctionalCI>
-                    <impacts>
-                        <down>
-                            <items type="array">
-                                <item id="open_changes" _delta="define">
-                                    <oql>
-                                        <![CDATA[
+                  <dict>Tickets:Related:RecentChanges</dict>
+                  <icon>itop-change-mgmt/images/change-done.png</icon>
+                  <default>no</default>
+                </item>
+              </items>
+            </down>
+          </impacts>
+        </Change>
+      </relation_context>
+    </parameters>
+    <parameters id="itop-config-mgmt">
+      <relation_context>
+        <FunctionalCI>
+          <impacts>
+            <down>
+              <items type="array">
+                <item id="open_changes" _delta="define">
+                  <oql><![CDATA[
                                         SELECT FCI, C
                                         FROM FunctionalCI AS FCI
                                                  JOIN lnkFunctionalCIToTicket AS L ON L.functionalci_id = FCI.id
@@ -1040,13 +1041,12 @@
                                           AND (C.status NOT IN ('closed', 'rejected'))
                                           AND (L.impact_code != 'not_impacted')
                                         ]]></oql>
-                                    <dict>Tickets:Related:OpenChanges</dict>
-                                        <icon>itop-change-mgmt/images/change-ongoing.png</icon>
-                                    <default>yes</default>
-                                </item>
-                                <item id="recent_changes" _delta="define">
-                                    <oql>
-                                        <![CDATA[
+                  <dict>Tickets:Related:OpenChanges</dict>
+                  <icon>itop-change-mgmt/images/change-ongoing.png</icon>
+                  <default>yes</default>
+                </item>
+                <item id="recent_changes" _delta="define">
+                  <oql><![CDATA[
                                         SELECT FCI, C
                                         FROM FunctionalCI AS FCI
                                                  JOIN lnkFunctionalCIToTicket AS L ON L.functionalci_id = FCI.id
@@ -1056,17 +1056,16 @@
                                           AND (L.impact_code != 'not_impacted')
                                           AND (C.end_date < NOW() AND C.end_date > DATE_SUB(NOW(), INTERVAL 3 DAY ))
                                         ]]></oql>
-                                    <dict>Tickets:Related:RecentChanges</dict>
-                                        <icon>itop-change-mgmt/images/change-done.png</icon>
-                                    <default>no</default>
-                                </item>
-                            </items>
-                        </down>
-                        <up>
-                            <items type="array">
-                                <item id="open_changes" _delta="define">
-                                    <oql>
-                                        <![CDATA[
+                  <dict>Tickets:Related:RecentChanges</dict>
+                  <icon>itop-change-mgmt/images/change-done.png</icon>
+                  <default>no</default>
+                </item>
+              </items>
+            </down>
+            <up>
+              <items type="array">
+                <item id="open_changes" _delta="define">
+                  <oql><![CDATA[
                                         SELECT FCI, C
                                         FROM FunctionalCI AS FCI
                                                  JOIN lnkFunctionalCIToTicket AS L ON L.functionalci_id = FCI.id
@@ -1075,13 +1074,12 @@
                                           AND (C.status NOT IN ('closed', 'rejected'))
                                           AND (L.impact_code != 'not_impacted')
                                         ]]></oql>
-                                    <dict>Tickets:Related:OpenChanges</dict>
-                                        <icon>itop-change-mgmt/images/change-ongoing.png</icon>
-                                    <default>yes</default>
-                                </item>
-                                <item id="recent_changes" _delta="define">
-                                    <oql>
-                                        <![CDATA[
+                  <dict>Tickets:Related:OpenChanges</dict>
+                  <icon>itop-change-mgmt/images/change-ongoing.png</icon>
+                  <default>yes</default>
+                </item>
+                <item id="recent_changes" _delta="define">
+                  <oql><![CDATA[
                                         SELECT FCI, C
                                         FROM FunctionalCI AS FCI
                                                  JOIN lnkFunctionalCIToTicket AS L ON L.functionalci_id = FCI.id
@@ -1091,15 +1089,15 @@
                                           AND (L.impact_code != 'not_impacted')
                                           AND (C.end_date < NOW() AND C.end_date > DATE_SUB(NOW(), INTERVAL 3 DAY ))
                                         ]]></oql>
-                                    <dict>Tickets:Related:RecentChanges</dict>
-                                        <icon>itop-change-mgmt/images/change-done.png</icon>
-                                    <default>no</default>
-                                </item>
-                            </items>
-                        </up>
-                    </impacts>
-                </FunctionalCI>
-            </relation_context>
-        </parameters>
-    </module_parameters>
+                  <dict>Tickets:Related:RecentChanges</dict>
+                  <icon>itop-change-mgmt/images/change-done.png</icon>
+                  <default>no</default>
+                </item>
+              </items>
+            </up>
+          </impacts>
+        </FunctionalCI>
+      </relation_context>
+    </parameters>
+  </module_parameters>
 </itop_design>
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 7b78e34ac..01bd8aed0 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,186 +1,191 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
-	<classes>
-		<class id="FunctionalCI" _delta="define">
-			<parent>cmdbAbstractObject</parent>
-			<properties>
-				<category>bizmodel,searchable</category>
-				<abstract>true</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>functionalci</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field>finalclass</db_final_class_field>
-				<naming>
-					<attributes>
-						<attribute id="name"/>
-					</attributes>
-				</naming>
-				<style>
-					<icon>../../images/icons/icons8-server.svg</icon>
-				</style>
-				<reconciliation>
-					<attributes>
-						<attribute id="name"/>
-						<attribute id="org_id"/>
-						<attribute id="organization_name"/>
-						<attribute id="finalclass"/>
-					</attributes>
-				</reconciliation>
-			</properties>
-			<fields>
-				<field id="name" xsi:type="AttributeString">
-					<sql>name</sql>
-					<default_value/>
-					<is_null_allowed>false</is_null_allowed>
-				</field>
-				<field id="description" xsi:type="AttributeText">
-					<sql>description</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="org_id" xsi:type="AttributeExternalKey">
-					<sql>org_id</sql>
-					<target_class>Organization</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_MANUAL</on_target_delete>
-				</field>
-				<field id="organization_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>org_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="business_criticity" xsi:type="AttributeEnum">
-					<values>
-						<value id="high">
-							<code>high</code>
-						</value>
-						<value id="medium">
-							<code>medium</code>
-						</value>
-						<value id="low">
-							<code>low</code>
-						</value>
-					</values>
-					<sql>business_criticity</sql>
-					<default_value>low</default_value>
-					<is_null_allowed>true</is_null_allowed>
-					<display_style>list</display_style>
-				</field>
-				<field id="move2production" xsi:type="AttributeDate">
-					<sql>move2production</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="contacts_list" xsi:type="AttributeLinkedSetIndirect" _delta="define">
-					<linked_class>lnkContactToFunctionalCI</linked_class>
-					<ext_key_to_me>functionalci_id</ext_key_to_me>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-					<ext_key_to_remote>contact_id</ext_key_to_remote>
-					<duplicates/>
-				</field>
-				<field id="documents_list" xsi:type="AttributeLinkedSetIndirect">
-					<linked_class>lnkDocumentToFunctionalCI</linked_class>
-					<ext_key_to_me>functionalci_id</ext_key_to_me>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-					<ext_key_to_remote>document_id</ext_key_to_remote>
-					<duplicates/>
-				</field>
-				<field id="applicationsolution_list" xsi:type="AttributeLinkedSetIndirect">
-					<linked_class>lnkApplicationSolutionToFunctionalCI</linked_class>
-					<ext_key_to_me>functionalci_id</ext_key_to_me>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-					<ext_key_to_remote>applicationsolution_id</ext_key_to_remote>
-					<duplicates/>
-				</field>
-				<field id="softwares_list" xsi:type="AttributeLinkedSet">
-					<linked_class>SoftwareInstance</linked_class>
-					<ext_key_to_me>system_id</ext_key_to_me>
-					<edit_mode>in_place</edit_mode>
-					<tracking_level>all</tracking_level>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-				</field>
-			</fields>
-			<presentation>
-				<details>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="business_criticity">
-							<rank>30</rank>
-						</item>
-						<item id="move2production">
-							<rank>40</rank>
-						</item>
-						<item id="description">
-							<rank>50</rank>
-						</item>
-						<item id="contacts_list">
-							<rank>60</rank>
-						</item>
-						<item id="documents_list">
-							<rank>70</rank>
-						</item>
-						<item id="applicationsolution_list">
-							<rank>90</rank>
-						</item>
-					</items>
-				</details>
-				<default_search>
-					<items>
-						<item id="friendlyname">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>30</rank>
-						</item>
-					</items>
-				</default_search>
-				<search>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="business_criticity">
-							<rank>30</rank>
-						</item>
-						<item id="move2production">
-							<rank>40</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="finalclass">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="business_criticity">
-							<rank>30</rank>
-						</item>
-						<item id="move2production">
-							<rank>40</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-			<methods>
-				<method id="DisplayBareRelations">
-					<static>false</static>
-					<access>public</access>
-					<type>Overload-cmdbAbstractObject</type>
-					<code><![CDATA[	function DisplayBareRelations(WebPage $oPage, $bEditMode = false)
+  <classes>
+    <class id="FunctionalCI" _delta="define">
+      <parent>cmdbAbstractObject</parent>
+      <properties>
+        <category>bizmodel,searchable</category>
+        <abstract>true</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>functionalci</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field>finalclass</db_final_class_field>
+        <naming>
+          <attributes>
+            <attribute id="name"/>
+          </attributes>
+        </naming>
+        <style>
+          <icon>../../images/icons/icons8-server.svg</icon>
+        </style>
+        <reconciliation>
+          <attributes>
+            <attribute id="name"/>
+            <attribute id="org_id"/>
+            <attribute id="organization_name"/>
+            <attribute id="finalclass"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
+        <field id="name" xsi:type="AttributeString">
+          <sql>name</sql>
+          <default_value/>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
+        <field id="description" xsi:type="AttributeText">
+          <sql>description</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="org_id" xsi:type="AttributeExternalKey">
+          <sql>org_id</sql>
+          <target_class>Organization</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+        </field>
+        <field id="organization_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>org_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="business_criticity" xsi:type="AttributeEnum">
+          <values>
+            <value id="high">
+              <code>high</code>
+            </value>
+            <value id="medium">
+              <code>medium</code>
+            </value>
+            <value id="low">
+              <code>low</code>
+            </value>
+          </values>
+          <sql>business_criticity</sql>
+          <default_value>low</default_value>
+          <is_null_allowed>true</is_null_allowed>
+          <display_style>list</display_style>
+        </field>
+        <field id="move2production" xsi:type="AttributeDate">
+          <sql>move2production</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="contacts_list" xsi:type="AttributeLinkedSetIndirect" _delta="define">
+          <linked_class>lnkContactToFunctionalCI</linked_class>
+          <ext_key_to_me>functionalci_id</ext_key_to_me>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <ext_key_to_remote>contact_id</ext_key_to_remote>
+          <duplicates/>
+          <read_only>false</read_only>
+        </field>
+        <field id="documents_list" xsi:type="AttributeLinkedSetIndirect">
+          <linked_class>lnkDocumentToFunctionalCI</linked_class>
+          <ext_key_to_me>functionalci_id</ext_key_to_me>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <ext_key_to_remote>document_id</ext_key_to_remote>
+          <duplicates/>
+          <read_only>false</read_only>
+        </field>
+        <field id="applicationsolution_list" xsi:type="AttributeLinkedSetIndirect">
+          <linked_class>lnkApplicationSolutionToFunctionalCI</linked_class>
+          <ext_key_to_me>functionalci_id</ext_key_to_me>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <ext_key_to_remote>applicationsolution_id</ext_key_to_remote>
+          <duplicates/>
+          <read_only>false</read_only>
+        </field>
+        <field id="softwares_list" xsi:type="AttributeLinkedSet">
+          <linked_class>SoftwareInstance</linked_class>
+          <ext_key_to_me>system_id</ext_key_to_me>
+          <legacy_edit_mode>in_place</legacy_edit_mode>
+          <tracking_level>all</tracking_level>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <relation_type>property</relation_type>
+          <read_only>false</read_only>
+        </field>
+      </fields>
+      <presentation>
+        <details>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>30</rank>
+            </item>
+            <item id="move2production">
+              <rank>40</rank>
+            </item>
+            <item id="description">
+              <rank>50</rank>
+            </item>
+            <item id="contacts_list">
+              <rank>60</rank>
+            </item>
+            <item id="documents_list">
+              <rank>70</rank>
+            </item>
+            <item id="applicationsolution_list">
+              <rank>90</rank>
+            </item>
+          </items>
+        </details>
+        <default_search>
+          <items>
+            <item id="friendlyname">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>30</rank>
+            </item>
+          </items>
+        </default_search>
+        <search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>30</rank>
+            </item>
+            <item id="move2production">
+              <rank>40</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="finalclass">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>30</rank>
+            </item>
+            <item id="move2production">
+              <rank>40</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+      <methods>
+        <method id="DisplayBareRelations">
+          <static>false</static>
+          <access>public</access>
+          <type>Overload-cmdbAbstractObject</type>
+          <code><![CDATA[	function DisplayBareRelations(WebPage $oPage, $bEditMode = false)
 	{
 		parent::DisplayBareRelations($oPage, $bEditMode);
 
@@ -229,4774 +234,4813 @@
 			}
 		}
 	}]]></code>
-				</method>
-			</methods>
-			<relations>
-				<relation id="impacts">
-					<neighbours>
-						<neighbour id="contact">
-							<attribute>contacts_list</attribute>
-							<direction>down</direction>
-						</neighbour>
-						<neighbour id="applicationsolution">
-							<attribute>applicationsolution_list</attribute>
-						</neighbour>
-						<neighbour id="softwareinstance">
-							<attribute>softwares_list</attribute>
-						</neighbour>
-					</neighbours>
-				</relation>
-			</relations>
-		</class>
-		<class id="PhysicalDevice" _delta="define">
-			<parent>FunctionalCI</parent>
-			<properties>
-				<category>bizmodel,searchable</category>
-				<abstract>true</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>physicaldevice</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="name"/>
-					</attributes>
-				</naming>
-				<fields_semantic>
-					<state_attribute>status</state_attribute>
-				</fields_semantic>
-				<style>
-					<icon>../../images/icons/icons8-server.svg</icon>
-				</style>
-				<reconciliation>
-					<attributes>
-						<attribute id="name"/>
-						<attribute id="org_id"/>
-						<attribute id="organization_name"/>
-						<attribute id="location_id"/>
-						<attribute id="location_name"/>
-						<attribute id="finalclass"/>
-					</attributes>
-				</reconciliation>
-				<obsolescence>
-					<condition><![CDATA[status = 'obsolete']]></condition>
-				</obsolescence>
-			</properties>
-			<fields>
-				<field id="serialnumber" xsi:type="AttributeString">
-					<sql>serialnumber</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="location_id" xsi:type="AttributeExternalKey">
-					<filter>
-						<![CDATA[SELECT l FROM Location AS l JOIN Organization AS root ON l.org_id=root.id JOIN Organization AS child ON child.parent_id BELOW root.id WHERE child.id= :this->org_id]]></filter>
-					<dependencies>
-						<attribute id="org_id"/>
-					</dependencies>
-					<sql>location_id</sql>
-					<target_class>Location</target_class>
-					<is_null_allowed>true</is_null_allowed>
-					<on_target_delete>DEL_MANUAL</on_target_delete>
-					<allow_target_creation>false</allow_target_creation>
-				</field>
-				<field id="location_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>location_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="status" xsi:type="AttributeEnum">
-					<values>
-						<value id="production">
-							<code>production</code>
-						</value>
-						<value id="implementation">
-							<code>implementation</code>
-						</value>
-						<value id="stock">
-							<code>stock</code>
-						</value>
-						<value id="obsolete">
-							<code>obsolete</code>
-						</value>
-					</values>
-					<sql>status</sql>
-					<default_value>production</default_value>
-					<is_null_allowed>true</is_null_allowed>
-					<display_style>list</display_style>
-				</field>
-				<field id="brand_id" xsi:type="AttributeExternalKey">
-					<sql>brand_id</sql>
-					<target_class>Brand</target_class>
-					<is_null_allowed>true</is_null_allowed>
-					<on_target_delete>DEL_MANUAL</on_target_delete>
-				</field>
-				<field id="brand_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>brand_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="model_id" xsi:type="AttributeExternalKey">
-					<filter><![CDATA[SELECT Model WHERE brand_id=:this->brand_id AND type=:this->finalclass]]></filter>
-					<dependencies>
-						<attribute id="brand_id"/>
-					</dependencies>
-					<sql>model_id</sql>
-					<target_class>Model</target_class>
-					<is_null_allowed>true</is_null_allowed>
-					<on_target_delete>DEL_MANUAL</on_target_delete>
-				</field>
-				<field id="model_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>model_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="asset_number" xsi:type="AttributeString">
-					<sql>asset_number</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="purchase_date" xsi:type="AttributeDate">
-					<sql>purchase_date</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="end_of_warranty" xsi:type="AttributeDate">
-					<sql>end_of_warranty</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-			</fields>
-			<methods/>
-			<presentation>
-				<details>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="status">
-							<rank>30</rank>
-						</item>
-						<item id="business_criticity">
-							<rank>40</rank>
-						</item>
-						<item id="location_id">
-							<rank>50</rank>
-						</item>
-						<item id="brand_id">
-							<rank>60</rank>
-						</item>
-						<item id="model_id">
-							<rank>70</rank>
-						</item>
-						<item id="serialnumber">
-							<rank>80</rank>
-						</item>
-						<item id="asset_number">
-							<rank>90</rank>
-						</item>
-						<item id="move2production">
-							<rank>100</rank>
-						</item>
-						<item id="purchase_date">
-							<rank>110</rank>
-						</item>
-						<item id="end_of_warranty">
-							<rank>120</rank>
-						</item>
-						<item id="description">
-							<rank>130</rank>
-						</item>
-						<item id="contacts_list">
-							<rank>140</rank>
-						</item>
-						<item id="documents_list">
-							<rank>150</rank>
-						</item>
-					</items>
-				</details>
-				<default_search>
-					<items>
-						<item id="friendlyname">
-							<rank>10</rank>
-						</item>
-						<item id="location_id">
-							<rank>20</rank>
-						</item>
-						<item id="org_id">
-							<rank>30</rank>
-						</item>
-					</items>
-				</default_search>
-				<search>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="status">
-							<rank>30</rank>
-						</item>
-						<item id="business_criticity">
-							<rank>40</rank>
-						</item>
-						<item id="location_id">
-							<rank>50</rank>
-						</item>
-						<item id="brand_id">
-							<rank>60</rank>
-						</item>
-						<item id="model_id">
-							<rank>70</rank>
-						</item>
-						<item id="serialnumber">
-							<rank>80</rank>
-						</item>
-						<item id="asset_number">
-							<rank>90</rank>
-						</item>
-						<item id="move2production">
-							<rank>100</rank>
-						</item>
-						<item id="purchase_date">
-							<rank>110</rank>
-						</item>
-						<item id="end_of_warranty">
-							<rank>120</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="finalclass">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="status">
-							<rank>30</rank>
-						</item>
-						<item id="business_criticity">
-							<rank>40</rank>
-						</item>
-						<item id="location_id">
-							<rank>50</rank>
-						</item>
-						<item id="brand_id">
-							<rank>60</rank>
-						</item>
-						<item id="model_id">
-							<rank>70</rank>
-						</item>
-						<item id="serialnumber">
-							<rank>80</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-		</class>
-		<class id="ConnectableCI" _delta="define">
-			<parent>PhysicalDevice</parent>
-			<properties>
-				<category>bizmodel,searchable</category>
-				<abstract>true</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>connectableci</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="name"/>
-					</attributes>
-				</naming>
-				<style>
-					<icon>../../images/icons/icons8-server.svg</icon>
-				</style>
-				<reconciliation>
-					<attributes>
-						<attribute id="name"/>
-						<attribute id="org_id"/>
-						<attribute id="organization_name"/>
-						<attribute id="finalclass"/>
-					</attributes>
-				</reconciliation>
-			</properties>
-			<fields>
-				<field id="networkdevice_list" xsi:type="AttributeLinkedSetIndirect">
-					<linked_class>lnkConnectableCIToNetworkDevice</linked_class>
-					<ext_key_to_me>connectableci_id</ext_key_to_me>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-					<ext_key_to_remote>networkdevice_id</ext_key_to_remote>
-					<duplicates>true</duplicates>
-				</field>
-				<field id="physicalinterface_list" xsi:type="AttributeLinkedSet">
-					<linked_class>PhysicalInterface</linked_class>
-					<ext_key_to_me>connectableci_id</ext_key_to_me>
-					<edit_mode>in_place</edit_mode>
-					<tracking_level>all</tracking_level>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-				</field>
-			</fields>
-			<presentation>
-				<details>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="status">
-							<rank>30</rank>
-						</item>
-						<item id="business_criticity">
-							<rank>40</rank>
-						</item>
-						<item id="location_id">
-							<rank>50</rank>
-						</item>
-						<item id="brand_id">
-							<rank>60</rank>
-						</item>
-						<item id="model_id">
-							<rank>70</rank>
-						</item>
-						<item id="serialnumber">
-							<rank>80</rank>
-						</item>
-						<item id="asset_number">
-							<rank>90</rank>
-						</item>
-						<item id="move2production">
-							<rank>100</rank>
-						</item>
-						<item id="purchase_date">
-							<rank>110</rank>
-						</item>
-						<item id="end_of_warranty">
-							<rank>120</rank>
-						</item>
-						<item id="description">
-							<rank>130</rank>
-						</item>
-						<item id="contacts_list">
-							<rank>140</rank>
-						</item>
-						<item id="documents_list">
-							<rank>150</rank>
-						</item>
-						<item id="networkdevice_list">
-							<rank>160</rank>
-						</item>
-					</items>
-				</details>
-				<search>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="status">
-							<rank>30</rank>
-						</item>
-						<item id="business_criticity">
-							<rank>40</rank>
-						</item>
-						<item id="location_id">
-							<rank>50</rank>
-						</item>
-						<item id="brand_id">
-							<rank>60</rank>
-						</item>
-						<item id="model_id">
-							<rank>70</rank>
-						</item>
-						<item id="serialnumber">
-							<rank>80</rank>
-						</item>
-						<item id="asset_number">
-							<rank>90</rank>
-						</item>
-						<item id="move2production">
-							<rank>100</rank>
-						</item>
-						<item id="purchase_date">
-							<rank>110</rank>
-						</item>
-						<item id="end_of_warranty">
-							<rank>120</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="finalclass">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="status">
-							<rank>30</rank>
-						</item>
-						<item id="business_criticity">
-							<rank>40</rank>
-						</item>
-						<item id="location_id">
-							<rank>50</rank>
-						</item>
-						<item id="brand_id">
-							<rank>60</rank>
-						</item>
-						<item id="model_id">
-							<rank>70</rank>
-						</item>
-						<item id="serialnumber">
-							<rank>80</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-			<methods/>
-		</class>
-		<class id="DatacenterDevice" _delta="define">
-			<parent>ConnectableCI</parent>
-			<properties>
-				<category>bizmodel,searchable</category>
-				<abstract>true</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>datacenterdevice</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="name"/>
-					</attributes>
-				</naming>
-				<style>
-					<icon>../../images/icons/icons8-server.svg</icon>
-				</style>
-				<reconciliation>
-					<attributes>
-						<attribute id="name"/>
-						<attribute id="org_id"/>
-						<attribute id="organization_name"/>
-						<attribute id="finalclass"/>
-					</attributes>
-				</reconciliation>
-			</properties>
-			<fields>
-				<field id="rack_id" xsi:type="AttributeExternalKey">
-					<filter><![CDATA[SELECT Rack WHERE location_id= :this->location_id]]></filter>
-					<dependencies>
-						<attribute id="location_id"/>
-					</dependencies>
-					<sql>rack_id</sql>
-					<target_class>Rack</target_class>
-					<is_null_allowed>true</is_null_allowed>
-					<on_target_delete>DEL_MANUAL</on_target_delete>
-					<allow_target_creation>false</allow_target_creation>
-				</field>
-				<field id="rack_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>rack_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="enclosure_id" xsi:type="AttributeExternalKey">
-					<filter><![CDATA[SELECT Enclosure WHERE rack_id= :this->rack_id]]></filter>
-					<dependencies>
-						<attribute id="rack_id"/>
-					</dependencies>
-					<sql>enclosure_id</sql>
-					<target_class>Enclosure</target_class>
-					<is_null_allowed>true</is_null_allowed>
-					<on_target_delete>DEL_MANUAL</on_target_delete>
-					<allow_target_creation>false</allow_target_creation>
-				</field>
-				<field id="enclosure_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>enclosure_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="nb_u" xsi:type="AttributeInteger">
-					<sql>nb_u</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="managementip" xsi:type="AttributeIPAddress">
-					<sql>managementip</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="powerA_id" xsi:type="AttributeExternalKey">
-					<filter><![CDATA[SELECT PowerConnection WHERE location_id= :this->location_id]]></filter>
-					<dependencies>
-						<attribute id="location_id"/>
-					</dependencies>
-					<sql>powera_id</sql>
-					<target_class>PowerConnection</target_class>
-					<is_null_allowed>true</is_null_allowed>
-					<on_target_delete>DEL_MANUAL</on_target_delete>
-					<allow_target_creation>false</allow_target_creation>
-				</field>
-				<field id="powerA_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>powerA_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="powerB_id" xsi:type="AttributeExternalKey">
-					<filter><![CDATA[SELECT PowerConnection WHERE location_id= :this->location_id]]></filter>
-					<dependencies>
-						<attribute id="location_id"/>
-					</dependencies>
-					<sql>powerB_id</sql>
-					<target_class>PowerConnection</target_class>
-					<is_null_allowed>true</is_null_allowed>
-					<on_target_delete>DEL_MANUAL</on_target_delete>
-					<allow_target_creation>false</allow_target_creation>
-				</field>
-				<field id="powerB_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>powerB_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="fiberinterfacelist_list" xsi:type="AttributeLinkedSet">
-					<linked_class>FiberChannelInterface</linked_class>
-					<ext_key_to_me>datacenterdevice_id</ext_key_to_me>
-					<edit_mode>in_place</edit_mode>
-					<tracking_level>all</tracking_level>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-				</field>
-				<field id="san_list" xsi:type="AttributeLinkedSetIndirect">
-					<linked_class>lnkSanToDatacenterDevice</linked_class>
-					<ext_key_to_me>datacenterdevice_id</ext_key_to_me>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-					<ext_key_to_remote>san_id</ext_key_to_remote>
-					<duplicates/>
-				</field>
-				<field id="redundancy" xsi:type="AttributeRedundancySettings">
-					<sql>redundancy</sql>
-					<relation_code>impacts</relation_code>
-					<from_class>PowerConnection</from_class>
-					<neighbour_id>datacenterdevice</neighbour_id>
-					<enabled>true</enabled>
-					<enabled_mode>fixed</enabled_mode>
-					<min_up>1</min_up>
-					<min_up_type>count</min_up_type>
-					<min_up_mode>fixed</min_up_mode>
-				</field>
-			</fields>
-			<methods/>
-			<presentation>
-				<details>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="status">
-							<rank>30</rank>
-						</item>
-						<item id="business_criticity">
-							<rank>40</rank>
-						</item>
-						<item id="location_id">
-							<rank>50</rank>
-						</item>
-						<item id="rack_id">
-							<rank>60</rank>
-						</item>
-						<item id="enclosure_id">
-							<rank>70</rank>
-						</item>
-						<item id="brand_id">
-							<rank>80</rank>
-						</item>
-						<item id="model_id">
-							<rank>90</rank>
-						</item>
-						<item id="nb_u">
-							<rank>100</rank>
-						</item>
-						<item id="serialnumber">
-							<rank>110</rank>
-						</item>
-						<item id="asset_number">
-							<rank>120</rank>
-						</item>
-						<item id="powerA_id">
-							<rank>130</rank>
-						</item>
-						<item id="powerB_id">
-							<rank>140</rank>
-						</item>
-						<item id="move2production">
-							<rank>150</rank>
-						</item>
-						<item id="purchase_date">
-							<rank>160</rank>
-						</item>
-						<item id="end_of_warranty">
-							<rank>170</rank>
-						</item>
-						<item id="description">
-							<rank>180</rank>
-						</item>
-						<item id="contacts_list">
-							<rank>190</rank>
-						</item>
-						<item id="documents_list">
-							<rank>200</rank>
-						</item>
-						<item id="networkdevice_list">
-							<rank>210</rank>
-						</item>
-						<item id="fiberinterfacelist_list">
-							<rank>220</rank>
-						</item>
-					</items>
-				</details>
-				<default_search>
-					<items>
-						<item id="friendlyname">
-							<rank>10</rank>
-						</item>
-						<item id="managementip">
-							<rank>20</rank>
-						</item>
-						<item id="org_id">
-							<rank>30</rank>
-						</item>
-					</items>
-				</default_search>
-				<search>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="status">
-							<rank>30</rank>
-						</item>
-						<item id="business_criticity">
-							<rank>40</rank>
-						</item>
-						<item id="location_id">
-							<rank>50</rank>
-						</item>
-						<item id="brand_id">
-							<rank>60</rank>
-						</item>
-						<item id="model_id">
-							<rank>70</rank>
-						</item>
-						<item id="serialnumber">
-							<rank>80</rank>
-						</item>
-						<item id="asset_number">
-							<rank>90</rank>
-						</item>
-						<item id="powerA_id">
-							<rank>100</rank>
-						</item>
-						<item id="powerB_id">
-							<rank>110</rank>
-						</item>
-						<item id="move2production">
-							<rank>120</rank>
-						</item>
-						<item id="purchase_date">
-							<rank>130</rank>
-						</item>
-						<item id="end_of_warranty">
-							<rank>140</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="finalclass">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="status">
-							<rank>30</rank>
-						</item>
-						<item id="business_criticity">
-							<rank>40</rank>
-						</item>
-						<item id="location_id">
-							<rank>50</rank>
-						</item>
-						<item id="brand_id">
-							<rank>60</rank>
-						</item>
-						<item id="model_id">
-							<rank>70</rank>
-						</item>
-						<item id="serialnumber">
-							<rank>80</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-		</class>
-		<class id="NetworkDevice" _delta="define">
-			<parent>DatacenterDevice</parent>
-			<properties>
-				<category>bizmodel,searchable</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>networkdevice</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="name"/>
-					</attributes>
-				</naming>
-				<style>
-					<icon>../../images/icons/icons8-switch.svg</icon>
-				</style>
-				<reconciliation>
-					<attributes>
-						<attribute id="name"/>
-						<attribute id="org_id"/>
-						<attribute id="organization_name"/>
-					</attributes>
-				</reconciliation>
-			</properties>
-			<fields>
-				<field id="networkdevicetype_id" xsi:type="AttributeExternalKey">
-					<sql>networkdevicetype_id</sql>
-					<target_class>NetworkDeviceType</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_MANUAL</on_target_delete>
-				</field>
-				<field id="networkdevicetype_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>networkdevicetype_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="connectablecis_list" xsi:type="AttributeLinkedSetIndirect">
-					<linked_class>lnkConnectableCIToNetworkDevice</linked_class>
-					<ext_key_to_me>networkdevice_id</ext_key_to_me>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-					<ext_key_to_remote>connectableci_id</ext_key_to_remote>
-					<duplicates>true</duplicates>
-				</field>
-				<field id="iosversion_id" xsi:type="AttributeExternalKey">
-					<sql>iosversion_id</sql>
-					<target_class>IOSVersion</target_class>
-					<is_null_allowed>true</is_null_allowed>
-					<on_target_delete>DEL_MANUAL</on_target_delete>
-				</field>
-				<field id="iosversion_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>iosversion_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="ram" xsi:type="AttributeString">
-					<sql>ram</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-			</fields>
-			<presentation>
-				<details>
-					<items>
-						<item id="contacts_list">
-							<rank>10</rank>
-						</item>
-						<item id="documents_list">
-							<rank>20</rank>
-						</item>
-						<item id="applicationsolution_list">
-							<rank>35</rank>
-						</item>
-						<item id="physicalinterface_list">
-							<rank>40</rank>
-						</item>
-						<item id="connectablecis_list">
-							<rank>50</rank>
-						</item>
-						<item id="col:col1">
-							<rank>80</rank>
-							<items>
-								<item id="fieldset:Server:baseinfo">
-									<rank>10</rank>
-									<items>
-										<item id="name">
-											<rank>10</rank>
-										</item>
-										<item id="org_id">
-											<rank>20</rank>
-										</item>
-										<item id="status">
-											<rank>30</rank>
-										</item>
-										<item id="business_criticity">
-											<rank>40</rank>
-										</item>
-										<item id="location_id">
-											<rank>50</rank>
-										</item>
-										<item id="rack_id">
-											<rank>60</rank>
-										</item>
-										<item id="enclosure_id">
-											<rank>70</rank>
-										</item>
-									</items>
-								</item>
-								<item id="fieldset:Server:moreinfo">
-									<rank>20</rank>
-									<items>
-										<item id="networkdevicetype_id">
-											<rank>10</rank>
-										</item>
-										<item id="brand_id">
-											<rank>20</rank>
-										</item>
-										<item id="model_id">
-											<rank>30</rank>
-										</item>
-										<item id="iosversion_id">
-											<rank>40</rank>
-										</item>
-										<item id="managementip">
-											<rank>45</rank>
-										</item>
-										<item id="ram">
-											<rank>50</rank>
-										</item>
-										<item id="nb_u">
-											<rank>60</rank>
-										</item>
-										<item id="serialnumber">
-											<rank>70</rank>
-										</item>
-										<item id="asset_number">
-											<rank>80</rank>
-										</item>
-									</items>
-								</item>
-							</items>
-						</item>
-						<item id="col:col2">
-							<rank>90</rank>
-							<items>
-								<item id="fieldset:Server:Date">
-									<rank>10</rank>
-									<items>
-										<item id="move2production">
-											<rank>10</rank>
-										</item>
-										<item id="purchase_date">
-											<rank>20</rank>
-										</item>
-										<item id="end_of_warranty">
-											<rank>30</rank>
-										</item>
-									</items>
-								</item>
-								<item id="fieldset:Server:power">
-									<rank>20</rank>
-									<items>
-										<item id="powerA_id">
-											<rank>10</rank>
-										</item>
-										<item id="powerB_id">
-											<rank>20</rank>
-										</item>
-										<item id="redundancy">
-											<rank>30</rank>
-										</item>
-									</items>
-								</item>
-								<item id="fieldset:Server:otherinfo">
-									<rank>30</rank>
-									<items>
-										<item id="description">
-											<rank>10</rank>
-										</item>
-									</items>
-								</item>
-							</items>
-						</item>
-					</items>
-				</details>
-				<search>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="status">
-							<rank>30</rank>
-						</item>
-						<item id="business_criticity">
-							<rank>40</rank>
-						</item>
-						<item id="location_id">
-							<rank>50</rank>
-						</item>
-						<item id="managementip">
-							<rank>55</rank>
-						</item>
-						<item id="brand_id">
-							<rank>60</rank>
-						</item>
-						<item id="model_id">
-							<rank>70</rank>
-						</item>
-						<item id="serialnumber">
-							<rank>80</rank>
-						</item>
-						<item id="asset_number">
-							<rank>90</rank>
-						</item>
-						<item id="powerA_id">
-							<rank>100</rank>
-						</item>
-						<item id="powerB_id">
-							<rank>110</rank>
-						</item>
-						<item id="move2production">
-							<rank>120</rank>
-						</item>
-						<item id="purchase_date">
-							<rank>130</rank>
-						</item>
-						<item id="end_of_warranty">
-							<rank>140</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="org_id">
-							<rank>10</rank>
-						</item>
-						<item id="status">
-							<rank>20</rank>
-						</item>
-						<item id="business_criticity">
-							<rank>30</rank>
-						</item>
-						<item id="location_id">
-							<rank>40</rank>
-						</item>
-						<item id="brand_id">
-							<rank>50</rank>
-						</item>
-						<item id="model_id">
-							<rank>60</rank>
-						</item>
-						<item id="serialnumber">
-							<rank>70</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-			<methods/>
-			<relations>
-				<relation id="impacts">
-					<neighbours>
-						<neighbour id="connectableci">
-							<query_down>SELECT ConnectableCI AS d JOIN lnkConnectableCIToNetworkDevice AS l1 ON l1.connectableci_id = d.id WHERE
+        </method>
+      </methods>
+      <relations>
+        <relation id="impacts">
+          <neighbours>
+            <neighbour id="contact">
+              <attribute>contacts_list</attribute>
+              <direction>down</direction>
+            </neighbour>
+            <neighbour id="applicationsolution">
+              <attribute>applicationsolution_list</attribute>
+            </neighbour>
+            <neighbour id="softwareinstance">
+              <attribute>softwares_list</attribute>
+            </neighbour>
+          </neighbours>
+        </relation>
+      </relations>
+    </class>
+    <class id="PhysicalDevice" _delta="define">
+      <parent>FunctionalCI</parent>
+      <properties>
+        <category>bizmodel,searchable</category>
+        <abstract>true</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>physicaldevice</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="name"/>
+          </attributes>
+        </naming>
+        <fields_semantic>
+          <state_attribute>status</state_attribute>
+        </fields_semantic>
+        <style>
+          <icon>../../images/icons/icons8-server.svg</icon>
+        </style>
+        <reconciliation>
+          <attributes>
+            <attribute id="name"/>
+            <attribute id="org_id"/>
+            <attribute id="organization_name"/>
+            <attribute id="location_id"/>
+            <attribute id="location_name"/>
+            <attribute id="finalclass"/>
+          </attributes>
+        </reconciliation>
+        <obsolescence>
+          <condition><![CDATA[status = 'obsolete']]></condition>
+        </obsolescence>
+      </properties>
+      <fields>
+        <field id="serialnumber" xsi:type="AttributeString">
+          <sql>serialnumber</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="location_id" xsi:type="AttributeExternalKey">
+          <filter><![CDATA[SELECT l FROM Location AS l JOIN Organization AS root ON l.org_id=root.id JOIN Organization AS child ON child.parent_id BELOW root.id WHERE child.id= :this->org_id]]></filter>
+          <dependencies>
+            <attribute id="org_id"/>
+          </dependencies>
+          <sql>location_id</sql>
+          <target_class>Location</target_class>
+          <is_null_allowed>true</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+          <allow_target_creation>false</allow_target_creation>
+        </field>
+        <field id="location_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>location_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="status" xsi:type="AttributeEnum">
+          <values>
+            <value id="production">
+              <code>production</code>
+            </value>
+            <value id="implementation">
+              <code>implementation</code>
+            </value>
+            <value id="stock">
+              <code>stock</code>
+            </value>
+            <value id="obsolete">
+              <code>obsolete</code>
+            </value>
+          </values>
+          <sql>status</sql>
+          <default_value>production</default_value>
+          <is_null_allowed>true</is_null_allowed>
+          <display_style>list</display_style>
+        </field>
+        <field id="brand_id" xsi:type="AttributeExternalKey">
+          <sql>brand_id</sql>
+          <target_class>Brand</target_class>
+          <is_null_allowed>true</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+        </field>
+        <field id="brand_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>brand_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="model_id" xsi:type="AttributeExternalKey">
+          <filter><![CDATA[SELECT Model WHERE brand_id=:this->brand_id AND type=:this->finalclass]]></filter>
+          <dependencies>
+            <attribute id="brand_id"/>
+          </dependencies>
+          <sql>model_id</sql>
+          <target_class>Model</target_class>
+          <is_null_allowed>true</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+        </field>
+        <field id="model_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>model_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="asset_number" xsi:type="AttributeString">
+          <sql>asset_number</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="purchase_date" xsi:type="AttributeDate">
+          <sql>purchase_date</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="end_of_warranty" xsi:type="AttributeDate">
+          <sql>end_of_warranty</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+      </fields>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="status">
+              <rank>30</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>40</rank>
+            </item>
+            <item id="location_id">
+              <rank>50</rank>
+            </item>
+            <item id="brand_id">
+              <rank>60</rank>
+            </item>
+            <item id="model_id">
+              <rank>70</rank>
+            </item>
+            <item id="serialnumber">
+              <rank>80</rank>
+            </item>
+            <item id="asset_number">
+              <rank>90</rank>
+            </item>
+            <item id="move2production">
+              <rank>100</rank>
+            </item>
+            <item id="purchase_date">
+              <rank>110</rank>
+            </item>
+            <item id="end_of_warranty">
+              <rank>120</rank>
+            </item>
+            <item id="description">
+              <rank>130</rank>
+            </item>
+            <item id="contacts_list">
+              <rank>140</rank>
+            </item>
+            <item id="documents_list">
+              <rank>150</rank>
+            </item>
+          </items>
+        </details>
+        <default_search>
+          <items>
+            <item id="friendlyname">
+              <rank>10</rank>
+            </item>
+            <item id="location_id">
+              <rank>20</rank>
+            </item>
+            <item id="org_id">
+              <rank>30</rank>
+            </item>
+          </items>
+        </default_search>
+        <search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="status">
+              <rank>30</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>40</rank>
+            </item>
+            <item id="location_id">
+              <rank>50</rank>
+            </item>
+            <item id="brand_id">
+              <rank>60</rank>
+            </item>
+            <item id="model_id">
+              <rank>70</rank>
+            </item>
+            <item id="serialnumber">
+              <rank>80</rank>
+            </item>
+            <item id="asset_number">
+              <rank>90</rank>
+            </item>
+            <item id="move2production">
+              <rank>100</rank>
+            </item>
+            <item id="purchase_date">
+              <rank>110</rank>
+            </item>
+            <item id="end_of_warranty">
+              <rank>120</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="finalclass">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="status">
+              <rank>30</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>40</rank>
+            </item>
+            <item id="location_id">
+              <rank>50</rank>
+            </item>
+            <item id="brand_id">
+              <rank>60</rank>
+            </item>
+            <item id="model_id">
+              <rank>70</rank>
+            </item>
+            <item id="serialnumber">
+              <rank>80</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="ConnectableCI" _delta="define">
+      <parent>PhysicalDevice</parent>
+      <properties>
+        <category>bizmodel,searchable</category>
+        <abstract>true</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>connectableci</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="name"/>
+          </attributes>
+        </naming>
+        <style>
+          <icon>../../images/icons/icons8-server.svg</icon>
+        </style>
+        <reconciliation>
+          <attributes>
+            <attribute id="name"/>
+            <attribute id="org_id"/>
+            <attribute id="organization_name"/>
+            <attribute id="finalclass"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
+        <field id="networkdevice_list" xsi:type="AttributeLinkedSetIndirect">
+          <linked_class>lnkConnectableCIToNetworkDevice</linked_class>
+          <ext_key_to_me>connectableci_id</ext_key_to_me>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <ext_key_to_remote>networkdevice_id</ext_key_to_remote>
+          <duplicates>true</duplicates>
+          <read_only>false</read_only>
+        </field>
+        <field id="physicalinterface_list" xsi:type="AttributeLinkedSet">
+          <linked_class>PhysicalInterface</linked_class>
+          <ext_key_to_me>connectableci_id</ext_key_to_me>
+          <legacy_edit_mode>in_place</legacy_edit_mode>
+          <tracking_level>all</tracking_level>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <relation_type>property</relation_type>
+          <read_only>false</read_only>
+        </field>
+      </fields>
+      <presentation>
+        <details>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="status">
+              <rank>30</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>40</rank>
+            </item>
+            <item id="location_id">
+              <rank>50</rank>
+            </item>
+            <item id="brand_id">
+              <rank>60</rank>
+            </item>
+            <item id="model_id">
+              <rank>70</rank>
+            </item>
+            <item id="serialnumber">
+              <rank>80</rank>
+            </item>
+            <item id="asset_number">
+              <rank>90</rank>
+            </item>
+            <item id="move2production">
+              <rank>100</rank>
+            </item>
+            <item id="purchase_date">
+              <rank>110</rank>
+            </item>
+            <item id="end_of_warranty">
+              <rank>120</rank>
+            </item>
+            <item id="description">
+              <rank>130</rank>
+            </item>
+            <item id="contacts_list">
+              <rank>140</rank>
+            </item>
+            <item id="documents_list">
+              <rank>150</rank>
+            </item>
+            <item id="networkdevice_list">
+              <rank>160</rank>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="status">
+              <rank>30</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>40</rank>
+            </item>
+            <item id="location_id">
+              <rank>50</rank>
+            </item>
+            <item id="brand_id">
+              <rank>60</rank>
+            </item>
+            <item id="model_id">
+              <rank>70</rank>
+            </item>
+            <item id="serialnumber">
+              <rank>80</rank>
+            </item>
+            <item id="asset_number">
+              <rank>90</rank>
+            </item>
+            <item id="move2production">
+              <rank>100</rank>
+            </item>
+            <item id="purchase_date">
+              <rank>110</rank>
+            </item>
+            <item id="end_of_warranty">
+              <rank>120</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="finalclass">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="status">
+              <rank>30</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>40</rank>
+            </item>
+            <item id="location_id">
+              <rank>50</rank>
+            </item>
+            <item id="brand_id">
+              <rank>60</rank>
+            </item>
+            <item id="model_id">
+              <rank>70</rank>
+            </item>
+            <item id="serialnumber">
+              <rank>80</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+      <methods/>
+    </class>
+    <class id="DatacenterDevice" _delta="define">
+      <parent>ConnectableCI</parent>
+      <properties>
+        <category>bizmodel,searchable</category>
+        <abstract>true</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>datacenterdevice</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="name"/>
+          </attributes>
+        </naming>
+        <style>
+          <icon>../../images/icons/icons8-server.svg</icon>
+        </style>
+        <reconciliation>
+          <attributes>
+            <attribute id="name"/>
+            <attribute id="org_id"/>
+            <attribute id="organization_name"/>
+            <attribute id="finalclass"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
+        <field id="rack_id" xsi:type="AttributeExternalKey">
+          <filter><![CDATA[SELECT Rack WHERE location_id= :this->location_id]]></filter>
+          <dependencies>
+            <attribute id="location_id"/>
+          </dependencies>
+          <sql>rack_id</sql>
+          <target_class>Rack</target_class>
+          <is_null_allowed>true</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+          <allow_target_creation>false</allow_target_creation>
+        </field>
+        <field id="rack_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>rack_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="enclosure_id" xsi:type="AttributeExternalKey">
+          <filter><![CDATA[SELECT Enclosure WHERE rack_id= :this->rack_id]]></filter>
+          <dependencies>
+            <attribute id="rack_id"/>
+          </dependencies>
+          <sql>enclosure_id</sql>
+          <target_class>Enclosure</target_class>
+          <is_null_allowed>true</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+          <allow_target_creation>false</allow_target_creation>
+        </field>
+        <field id="enclosure_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>enclosure_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="nb_u" xsi:type="AttributeInteger">
+          <sql>nb_u</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="managementip" xsi:type="AttributeIPAddress">
+          <sql>managementip</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="powerA_id" xsi:type="AttributeExternalKey">
+          <filter><![CDATA[SELECT PowerConnection WHERE location_id= :this->location_id]]></filter>
+          <dependencies>
+            <attribute id="location_id"/>
+          </dependencies>
+          <sql>powera_id</sql>
+          <target_class>PowerConnection</target_class>
+          <is_null_allowed>true</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+          <allow_target_creation>false</allow_target_creation>
+        </field>
+        <field id="powerA_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>powerA_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="powerB_id" xsi:type="AttributeExternalKey">
+          <filter><![CDATA[SELECT PowerConnection WHERE location_id= :this->location_id]]></filter>
+          <dependencies>
+            <attribute id="location_id"/>
+          </dependencies>
+          <sql>powerB_id</sql>
+          <target_class>PowerConnection</target_class>
+          <is_null_allowed>true</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+          <allow_target_creation>false</allow_target_creation>
+        </field>
+        <field id="powerB_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>powerB_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="fiberinterfacelist_list" xsi:type="AttributeLinkedSet">
+          <linked_class>FiberChannelInterface</linked_class>
+          <ext_key_to_me>datacenterdevice_id</ext_key_to_me>
+          <legacy_edit_mode>in_place</legacy_edit_mode>
+          <tracking_level>all</tracking_level>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <relation_type>property</relation_type>
+          <read_only>false</read_only>
+        </field>
+        <field id="san_list" xsi:type="AttributeLinkedSetIndirect">
+          <linked_class>lnkSanToDatacenterDevice</linked_class>
+          <ext_key_to_me>datacenterdevice_id</ext_key_to_me>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <ext_key_to_remote>san_id</ext_key_to_remote>
+          <duplicates/>
+          <read_only>false</read_only>
+        </field>
+        <field id="redundancy" xsi:type="AttributeRedundancySettings">
+          <sql>redundancy</sql>
+          <relation_code>impacts</relation_code>
+          <from_class>PowerConnection</from_class>
+          <neighbour_id>datacenterdevice</neighbour_id>
+          <enabled>true</enabled>
+          <enabled_mode>fixed</enabled_mode>
+          <min_up>1</min_up>
+          <min_up_type>count</min_up_type>
+          <min_up_mode>fixed</min_up_mode>
+        </field>
+      </fields>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="status">
+              <rank>30</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>40</rank>
+            </item>
+            <item id="location_id">
+              <rank>50</rank>
+            </item>
+            <item id="rack_id">
+              <rank>60</rank>
+            </item>
+            <item id="enclosure_id">
+              <rank>70</rank>
+            </item>
+            <item id="brand_id">
+              <rank>80</rank>
+            </item>
+            <item id="model_id">
+              <rank>90</rank>
+            </item>
+            <item id="nb_u">
+              <rank>100</rank>
+            </item>
+            <item id="serialnumber">
+              <rank>110</rank>
+            </item>
+            <item id="asset_number">
+              <rank>120</rank>
+            </item>
+            <item id="powerA_id">
+              <rank>130</rank>
+            </item>
+            <item id="powerB_id">
+              <rank>140</rank>
+            </item>
+            <item id="move2production">
+              <rank>150</rank>
+            </item>
+            <item id="purchase_date">
+              <rank>160</rank>
+            </item>
+            <item id="end_of_warranty">
+              <rank>170</rank>
+            </item>
+            <item id="description">
+              <rank>180</rank>
+            </item>
+            <item id="contacts_list">
+              <rank>190</rank>
+            </item>
+            <item id="documents_list">
+              <rank>200</rank>
+            </item>
+            <item id="networkdevice_list">
+              <rank>210</rank>
+            </item>
+            <item id="fiberinterfacelist_list">
+              <rank>220</rank>
+            </item>
+          </items>
+        </details>
+        <default_search>
+          <items>
+            <item id="friendlyname">
+              <rank>10</rank>
+            </item>
+            <item id="managementip">
+              <rank>20</rank>
+            </item>
+            <item id="org_id">
+              <rank>30</rank>
+            </item>
+          </items>
+        </default_search>
+        <search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="status">
+              <rank>30</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>40</rank>
+            </item>
+            <item id="location_id">
+              <rank>50</rank>
+            </item>
+            <item id="brand_id">
+              <rank>60</rank>
+            </item>
+            <item id="model_id">
+              <rank>70</rank>
+            </item>
+            <item id="serialnumber">
+              <rank>80</rank>
+            </item>
+            <item id="asset_number">
+              <rank>90</rank>
+            </item>
+            <item id="powerA_id">
+              <rank>100</rank>
+            </item>
+            <item id="powerB_id">
+              <rank>110</rank>
+            </item>
+            <item id="move2production">
+              <rank>120</rank>
+            </item>
+            <item id="purchase_date">
+              <rank>130</rank>
+            </item>
+            <item id="end_of_warranty">
+              <rank>140</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="finalclass">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="status">
+              <rank>30</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>40</rank>
+            </item>
+            <item id="location_id">
+              <rank>50</rank>
+            </item>
+            <item id="brand_id">
+              <rank>60</rank>
+            </item>
+            <item id="model_id">
+              <rank>70</rank>
+            </item>
+            <item id="serialnumber">
+              <rank>80</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="NetworkDevice" _delta="define">
+      <parent>DatacenterDevice</parent>
+      <properties>
+        <category>bizmodel,searchable</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>networkdevice</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="name"/>
+          </attributes>
+        </naming>
+        <style>
+          <icon>../../images/icons/icons8-switch.svg</icon>
+        </style>
+        <reconciliation>
+          <attributes>
+            <attribute id="name"/>
+            <attribute id="org_id"/>
+            <attribute id="organization_name"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
+        <field id="networkdevicetype_id" xsi:type="AttributeExternalKey">
+          <sql>networkdevicetype_id</sql>
+          <target_class>NetworkDeviceType</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+        </field>
+        <field id="networkdevicetype_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>networkdevicetype_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="connectablecis_list" xsi:type="AttributeLinkedSetIndirect">
+          <linked_class>lnkConnectableCIToNetworkDevice</linked_class>
+          <ext_key_to_me>networkdevice_id</ext_key_to_me>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <ext_key_to_remote>connectableci_id</ext_key_to_remote>
+          <duplicates>true</duplicates>
+          <read_only>false</read_only>
+        </field>
+        <field id="iosversion_id" xsi:type="AttributeExternalKey">
+          <sql>iosversion_id</sql>
+          <target_class>IOSVersion</target_class>
+          <is_null_allowed>true</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+        </field>
+        <field id="iosversion_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>iosversion_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="ram" xsi:type="AttributeString">
+          <sql>ram</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+      </fields>
+      <presentation>
+        <details>
+          <items>
+            <item id="contacts_list">
+              <rank>10</rank>
+            </item>
+            <item id="documents_list">
+              <rank>20</rank>
+            </item>
+            <item id="applicationsolution_list">
+              <rank>35</rank>
+            </item>
+            <item id="physicalinterface_list">
+              <rank>40</rank>
+            </item>
+            <item id="connectablecis_list">
+              <rank>50</rank>
+            </item>
+            <item id="col:col1">
+              <rank>80</rank>
+              <items>
+                <item id="fieldset:Server:baseinfo">
+                  <rank>10</rank>
+                  <items>
+                    <item id="name">
+                      <rank>10</rank>
+                    </item>
+                    <item id="org_id">
+                      <rank>20</rank>
+                    </item>
+                    <item id="status">
+                      <rank>30</rank>
+                    </item>
+                    <item id="business_criticity">
+                      <rank>40</rank>
+                    </item>
+                    <item id="location_id">
+                      <rank>50</rank>
+                    </item>
+                    <item id="rack_id">
+                      <rank>60</rank>
+                    </item>
+                    <item id="enclosure_id">
+                      <rank>70</rank>
+                    </item>
+                  </items>
+                </item>
+                <item id="fieldset:Server:moreinfo">
+                  <rank>20</rank>
+                  <items>
+                    <item id="networkdevicetype_id">
+                      <rank>10</rank>
+                    </item>
+                    <item id="brand_id">
+                      <rank>20</rank>
+                    </item>
+                    <item id="model_id">
+                      <rank>30</rank>
+                    </item>
+                    <item id="iosversion_id">
+                      <rank>40</rank>
+                    </item>
+                    <item id="managementip">
+                      <rank>45</rank>
+                    </item>
+                    <item id="ram">
+                      <rank>50</rank>
+                    </item>
+                    <item id="nb_u">
+                      <rank>60</rank>
+                    </item>
+                    <item id="serialnumber">
+                      <rank>70</rank>
+                    </item>
+                    <item id="asset_number">
+                      <rank>80</rank>
+                    </item>
+                  </items>
+                </item>
+              </items>
+            </item>
+            <item id="col:col2">
+              <rank>90</rank>
+              <items>
+                <item id="fieldset:Server:Date">
+                  <rank>10</rank>
+                  <items>
+                    <item id="move2production">
+                      <rank>10</rank>
+                    </item>
+                    <item id="purchase_date">
+                      <rank>20</rank>
+                    </item>
+                    <item id="end_of_warranty">
+                      <rank>30</rank>
+                    </item>
+                  </items>
+                </item>
+                <item id="fieldset:Server:power">
+                  <rank>20</rank>
+                  <items>
+                    <item id="powerA_id">
+                      <rank>10</rank>
+                    </item>
+                    <item id="powerB_id">
+                      <rank>20</rank>
+                    </item>
+                    <item id="redundancy">
+                      <rank>30</rank>
+                    </item>
+                  </items>
+                </item>
+                <item id="fieldset:Server:otherinfo">
+                  <rank>30</rank>
+                  <items>
+                    <item id="description">
+                      <rank>10</rank>
+                    </item>
+                  </items>
+                </item>
+              </items>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="status">
+              <rank>30</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>40</rank>
+            </item>
+            <item id="location_id">
+              <rank>50</rank>
+            </item>
+            <item id="managementip">
+              <rank>55</rank>
+            </item>
+            <item id="brand_id">
+              <rank>60</rank>
+            </item>
+            <item id="model_id">
+              <rank>70</rank>
+            </item>
+            <item id="serialnumber">
+              <rank>80</rank>
+            </item>
+            <item id="asset_number">
+              <rank>90</rank>
+            </item>
+            <item id="powerA_id">
+              <rank>100</rank>
+            </item>
+            <item id="powerB_id">
+              <rank>110</rank>
+            </item>
+            <item id="move2production">
+              <rank>120</rank>
+            </item>
+            <item id="purchase_date">
+              <rank>130</rank>
+            </item>
+            <item id="end_of_warranty">
+              <rank>140</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="org_id">
+              <rank>10</rank>
+            </item>
+            <item id="status">
+              <rank>20</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>30</rank>
+            </item>
+            <item id="location_id">
+              <rank>40</rank>
+            </item>
+            <item id="brand_id">
+              <rank>50</rank>
+            </item>
+            <item id="model_id">
+              <rank>60</rank>
+            </item>
+            <item id="serialnumber">
+              <rank>70</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+      <methods/>
+      <relations>
+        <relation id="impacts">
+          <neighbours>
+            <neighbour id="connectableci">
+              <query_down>SELECT ConnectableCI AS d JOIN lnkConnectableCIToNetworkDevice AS l1 ON l1.connectableci_id = d.id WHERE
 								l1.networkdevice_id = :this-&gt;id AND l1.connection_type='downlink'
 							</query_down>
-							<query_up>SELECT NetworkDevice AS nw JOIN lnkConnectableCIToNetworkDevice AS l1 ON l1.networkdevice_id = nw.id WHERE
+              <query_up>SELECT NetworkDevice AS nw JOIN lnkConnectableCIToNetworkDevice AS l1 ON l1.networkdevice_id = nw.id WHERE
 								l1.connectableci_id = :this-&gt;id AND l1.connection_type='downlink'
 							</query_up>
-						</neighbour>
-					</neighbours>
-				</relation>
-			</relations>
-		</class>
-		<class id="Server" _delta="define">
-			<parent>DatacenterDevice</parent>
-			<properties>
-				<category>bizmodel,searchable</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>server</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="name"/>
-					</attributes>
-				</naming>
-				<style>
-					<icon>../../images/icons/icons8-server.svg</icon>
-				</style>
-				<reconciliation>
-					<attributes>
-						<attribute id="name"/>
-						<attribute id="org_id"/>
-						<attribute id="organization_name"/>
-					</attributes>
-				</reconciliation>
-			</properties>
-			<fields>
-				<field id="osfamily_id" xsi:type="AttributeExternalKey">
-					<sql>osfamily_id</sql>
-					<target_class>OSFamily</target_class>
-					<is_null_allowed>true</is_null_allowed>
-					<on_target_delete>DEL_MANUAL</on_target_delete>
-				</field>
-				<field id="osfamily_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>osfamily_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="osversion_id" xsi:type="AttributeExternalKey">
-					<filter><![CDATA[SELECT OSVersion WHERE osfamily_id = :this->osfamily_id]]></filter>
-					<dependencies>
-						<attribute id="osfamily_id"/>
-					</dependencies>
-					<sql>osversion_id</sql>
-					<target_class>OSVersion</target_class>
-					<is_null_allowed>true</is_null_allowed>
-					<on_target_delete>DEL_MANUAL</on_target_delete>
-				</field>
-				<field id="osversion_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>osversion_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="oslicence_id" xsi:type="AttributeExternalKey">
-					<filter><![CDATA[SELECT OSLicence WHERE osversion_id = :this->osversion_id]]></filter>
-					<dependencies>
-						<attribute id="osversion_id"/>
-					</dependencies>
-					<sql>oslicence_id</sql>
-					<target_class>OSLicence</target_class>
-					<is_null_allowed>true</is_null_allowed>
-					<on_target_delete>DEL_MANUAL</on_target_delete>
-				</field>
-				<field id="oslicence_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>oslicence_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="cpu" xsi:type="AttributeString">
-					<sql>cpu</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="ram" xsi:type="AttributeString">
-					<sql>ram</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="logicalvolumes_list" xsi:type="AttributeLinkedSetIndirect">
-					<linked_class>lnkServerToVolume</linked_class>
-					<ext_key_to_me>server_id</ext_key_to_me>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-					<ext_key_to_remote>volume_id</ext_key_to_remote>
-					<duplicates/>
-				</field>
-			</fields>
-			<presentation>
-				<details>
-					<items>
-						<item id="softwares_list">
-							<rank>10</rank>
-						</item>
-						<item id="contacts_list">
-							<rank>20</rank>
-						</item>
-						<item id="documents_list">
-							<rank>30</rank>
-						</item>
-						<item id="applicationsolution_list">
-							<rank>45</rank>
-						</item>
-						<item id="physicalinterface_list">
-							<rank>50</rank>
-						</item>
-						<item id="fiberinterfacelist_list">
-							<rank>60</rank>
-						</item>
-						<item id="networkdevice_list">
-							<rank>70</rank>
-						</item>
-						<item id="san_list">
-							<rank>80</rank>
-						</item>
-						<item id="logicalvolumes_list">
-							<rank>90</rank>
-						</item>
-						<item id="col:col1">
-							<rank>120</rank>
-							<items>
-								<item id="fieldset:Server:baseinfo">
-									<rank>10</rank>
-									<items>
-										<item id="name">
-											<rank>10</rank>
-										</item>
-										<item id="org_id">
-											<rank>20</rank>
-										</item>
-										<item id="status">
-											<rank>30</rank>
-										</item>
-										<item id="business_criticity">
-											<rank>40</rank>
-										</item>
-										<item id="location_id">
-											<rank>50</rank>
-										</item>
-										<item id="rack_id">
-											<rank>60</rank>
-										</item>
-										<item id="enclosure_id">
-											<rank>70</rank>
-										</item>
-									</items>
-								</item>
-								<item id="fieldset:Server:moreinfo">
-									<rank>20</rank>
-									<items>
-										<item id="brand_id">
-											<rank>10</rank>
-										</item>
-										<item id="model_id">
-											<rank>20</rank>
-										</item>
-										<item id="osfamily_id">
-											<rank>30</rank>
-										</item>
-										<item id="osversion_id">
-											<rank>40</rank>
-										</item>
-										<item id="managementip">
-											<rank>45</rank>
-										</item>
-										<item id="oslicence_id">
-											<rank>50</rank>
-										</item>
-										<item id="cpu">
-											<rank>60</rank>
-										</item>
-										<item id="ram">
-											<rank>70</rank>
-										</item>
-										<item id="nb_u">
-											<rank>80</rank>
-										</item>
-										<item id="serialnumber">
-											<rank>90</rank>
-										</item>
-										<item id="asset_number">
-											<rank>100</rank>
-										</item>
-									</items>
-								</item>
-							</items>
-						</item>
-						<item id="col:col2">
-							<rank>130</rank>
-							<items>
-								<item id="fieldset:Server:Date">
-									<rank>10</rank>
-									<items>
-										<item id="move2production">
-											<rank>10</rank>
-										</item>
-										<item id="purchase_date">
-											<rank>20</rank>
-										</item>
-										<item id="end_of_warranty">
-											<rank>30</rank>
-										</item>
-									</items>
-								</item>
-								<item id="fieldset:Server:power">
-									<rank>20</rank>
-									<items>
-										<item id="powerA_id">
-											<rank>10</rank>
-										</item>
-										<item id="powerB_id">
-											<rank>20</rank>
-										</item>
-										<item id="redundancy">
-											<rank>30</rank>
-										</item>
-									</items>
-								</item>
-								<item id="fieldset:Server:otherinfo">
-									<rank>30</rank>
-									<items>
-										<item id="description">
-											<rank>10</rank>
-										</item>
-									</items>
-								</item>
-							</items>
-						</item>
-					</items>
-				</details>
-				<search>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="status">
-							<rank>30</rank>
-						</item>
-						<item id="business_criticity">
-							<rank>40</rank>
-						</item>
-						<item id="location_id">
-							<rank>50</rank>
-						</item>
-						<item id="managementip">
-							<rank>55</rank>
-						</item>
-						<item id="brand_id">
-							<rank>60</rank>
-						</item>
-						<item id="model_id">
-							<rank>70</rank>
-						</item>
-						<item id="serialnumber">
-							<rank>80</rank>
-						</item>
-						<item id="asset_number">
-							<rank>90</rank>
-						</item>
-						<item id="powerA_id">
-							<rank>100</rank>
-						</item>
-						<item id="powerB_id">
-							<rank>110</rank>
-						</item>
-						<item id="move2production">
-							<rank>120</rank>
-						</item>
-						<item id="purchase_date">
-							<rank>130</rank>
-						</item>
-						<item id="end_of_warranty">
-							<rank>140</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="org_id">
-							<rank>10</rank>
-						</item>
-						<item id="status">
-							<rank>20</rank>
-						</item>
-						<item id="business_criticity">
-							<rank>30</rank>
-						</item>
-						<item id="location_id">
-							<rank>40</rank>
-						</item>
-						<item id="brand_id">
-							<rank>50</rank>
-						</item>
-						<item id="model_id">
-							<rank>60</rank>
-						</item>
-						<item id="serialnumber">
-							<rank>70</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-			<methods/>
-		</class>
-		<class id="ApplicationSolution" _delta="define">
-			<parent>FunctionalCI</parent>
-			<properties>
-				<category>bizmodel,searchable</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>applicationsolution</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="name"/>
-					</attributes>
-				</naming>
-				<fields_semantic>
-					<state_attribute>status</state_attribute>
-				</fields_semantic>
-				<style>
-					<icon>../../images/icons/icons8-application-window.svg</icon>
-				</style>
-				<reconciliation>
-					<attributes>
-						<attribute id="name"/>
-						<attribute id="org_id"/>
-						<attribute id="organization_name"/>
-					</attributes>
-				</reconciliation>
-				<obsolescence>
-					<condition><![CDATA[status='inactive']]></condition>
-				</obsolescence>
-			</properties>
-			<fields>
-				<field id="functionalcis_list" xsi:type="AttributeLinkedSetIndirect">
-					<linked_class>lnkApplicationSolutionToFunctionalCI</linked_class>
-					<ext_key_to_me>applicationsolution_id</ext_key_to_me>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-					<ext_key_to_remote>functionalci_id</ext_key_to_remote>
-					<duplicates/>
-				</field>
-				<field id="businessprocess_list" xsi:type="AttributeLinkedSetIndirect">
-					<linked_class>lnkApplicationSolutionToBusinessProcess</linked_class>
-					<ext_key_to_me>applicationsolution_id</ext_key_to_me>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-					<ext_key_to_remote>businessprocess_id</ext_key_to_remote>
-					<duplicates/>
-				</field>
-				<field id="status" xsi:type="AttributeEnum">
-					<values>
-						<value id="active">
-							<code>active</code>
-							<style>
-								<main_color>$ibo-lifecycle-active-state-primary-color</main_color>
-								<complementary_color>$ibo-lifecycle-active-state-secondary-color</complementary_color>
-								<decoration_classes/>
-							</style>
-						</value>
-						<value id="inactive">
-							<code>inactive</code>
-							<style>
-								<main_color>$ibo-lifecycle-frozen-state-primary-color</main_color>
-								<complementary_color>$ibo-lifecycle-frozen-state-secondary-color</complementary_color>
-								<decoration_classes/>
-							</style>
-						</value>
-					</values>
-					<sql>status</sql>
-					<default_value>active</default_value>
-					<is_null_allowed>true</is_null_allowed>
-					<display_style>list</display_style>
-				</field>
-				<field id="redundancy" xsi:type="AttributeRedundancySettings">
-					<sql>redundancy</sql>
-					<relation_code>impacts</relation_code>
-					<from_class>FunctionalCI</from_class>
-					<neighbour_id>applicationsolution</neighbour_id>
-					<enabled>false</enabled>
-					<enabled_mode>user</enabled_mode>
-					<min_up>1</min_up>
-					<min_up_mode>user</min_up_mode>
-					<min_up_type>count</min_up_type>
-				</field>
-			</fields>
-			<presentation>
-				<details>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="status">
-							<rank>30</rank>
-						</item>
-						<item id="business_criticity">
-							<rank>40</rank>
-						</item>
-						<item id="move2production">
-							<rank>50</rank>
-						</item>
-						<item id="description">
-							<rank>60</rank>
-						</item>
-						<item id="contacts_list">
-							<rank>70</rank>
-						</item>
-						<item id="documents_list">
-							<rank>80</rank>
-						</item>
-						<item id="functionalcis_list">
-							<rank>100</rank>
-						</item>
-						<item id="businessprocess_list">
-							<rank>110</rank>
-						</item>
-					</items>
-				</details>
-				<search>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="business_criticity">
-							<rank>30</rank>
-						</item>
-						<item id="move2production">
-							<rank>40</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="org_id">
-							<rank>10</rank>
-						</item>
-						<item id="business_criticity">
-							<rank>20</rank>
-						</item>
-						<item id="move2production">
-							<rank>30</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-			<methods/>
-			<relations>
-				<relation id="impacts">
-					<neighbours>
-						<neighbour id="businessprocess">
-							<attribute>businessprocess_list</attribute>
-						</neighbour>
-					</neighbours>
-				</relation>
-			</relations>
-		</class>
-		<class id="BusinessProcess" _delta="define">
-			<parent>FunctionalCI</parent>
-			<properties>
-				<category>bizmodel,searchable</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>businessprocess</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="name"/>
-					</attributes>
-				</naming>
-				<fields_semantic>
-					<state_attribute>status</state_attribute>
-				</fields_semantic>
-				<style>
-					<icon>../../images/icons/icons8-process-improvement.svg</icon>
-				</style>
-				<reconciliation>
-					<attributes>
-						<attribute id="name"/>
-						<attribute id="org_id"/>
-						<attribute id="organization_name"/>
-					</attributes>
-				</reconciliation>
-				<obsolescence>
-					<condition><![CDATA[status = 'inactive']]></condition>
-				</obsolescence>
-			</properties>
-			<fields>
-				<field id="applicationsolutions_list" xsi:type="AttributeLinkedSetIndirect">
-					<linked_class>lnkApplicationSolutionToBusinessProcess</linked_class>
-					<ext_key_to_me>businessprocess_id</ext_key_to_me>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-					<ext_key_to_remote>applicationsolution_id</ext_key_to_remote>
-					<duplicates/>
-				</field>
-				<field id="status" xsi:type="AttributeEnum">
-					<values>
-						<value id="active">
-							<code>active</code>
-							<style>
-								<main_color>$ibo-lifecycle-active-state-primary-color</main_color>
-								<complementary_color>$ibo-lifecycle-active-state-secondary-color</complementary_color>
-								<decoration_classes/>
-							</style>
-						</value>
-						<value id="inactive">
-							<code>inactive</code>
-							<style>
-								<main_color>$ibo-lifecycle-frozen-state-primary-color</main_color>
-								<complementary_color>$ibo-lifecycle-frozen-state-secondary-color</complementary_color>
-								<decoration_classes/>
-							</style>
-						</value>
-					</values>
-					<sql>status</sql>
-					<default_value>active</default_value>
-					<is_null_allowed>true</is_null_allowed>
-					<display_style>list</display_style>
-				</field>
-			</fields>
-			<presentation>
-				<details>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="status">
-							<rank>30</rank>
-						</item>
-						<item id="business_criticity">
-							<rank>40</rank>
-						</item>
-						<item id="move2production">
-							<rank>50</rank>
-						</item>
-						<item id="description">
-							<rank>60</rank>
-						</item>
-						<item id="contacts_list">
-							<rank>70</rank>
-						</item>
-						<item id="documents_list">
-							<rank>80</rank>
-						</item>
-						<item id="applicationsolutions_list">
-							<rank>100</rank>
-						</item>
-					</items>
-				</details>
-				<search>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="business_criticity">
-							<rank>30</rank>
-						</item>
-						<item id="move2production">
-							<rank>40</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="org_id">
-							<rank>10</rank>
-						</item>
-						<item id="business_criticity">
-							<rank>20</rank>
-						</item>
-						<item id="move2production">
-							<rank>30</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-			<methods/>
-		</class>
-		<class id="SoftwareInstance" _delta="define">
-			<parent>FunctionalCI</parent>
-			<properties>
-				<category>bizmodel,searchable</category>
-				<abstract>true</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>softwareinstance</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="name"/>
-						<attribute id="system_name"/>
-					</attributes>
-				</naming>
-				<fields_semantic>
-					<state_attribute>status</state_attribute>
-				</fields_semantic>
-				<style>
-					<icon>../../images/icons/icons8-software-instance.svg</icon>
-				</style>
-				<reconciliation>
-					<attributes>
-						<attribute id="name"/>
-						<attribute id="org_id"/>
-						<attribute id="organization_name"/>
-						<attribute id="system_id"/>
-						<attribute id="system_name"/>
-						<attribute id="finalclass"/>
-					</attributes>
-				</reconciliation>
-				<obsolescence>
-					<condition><![CDATA[status = 'inactive']]></condition>
-				</obsolescence>
-			</properties>
-			<fields>
-				<field id="system_id" xsi:type="AttributeExternalKey">
-					<filter><![CDATA[SELECT FunctionalCI WHERE finalclass IN ('Server','VirtualMachine','PC')]]></filter>
-					<sql>functionalci_id</sql>
-					<target_class>FunctionalCI</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_AUTO</on_target_delete>
-					<allow_target_creation>false</allow_target_creation>
-				</field>
-				<field id="system_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>system_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="software_id" xsi:type="AttributeExternalKey">
-					<filter><![CDATA[SELECT Software WHERE type = :this->finalclass]]></filter>
-					<sql>software_id</sql>
-					<target_class>Software</target_class>
-					<is_null_allowed>true</is_null_allowed>
-					<on_target_delete>DEL_MANUAL</on_target_delete>
-				</field>
-				<field id="software_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>software_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="softwarelicence_id" xsi:type="AttributeExternalKey">
-					<filter><![CDATA[SELECT SoftwareLicence WHERE software_id= :this->software_id]]></filter>
-					<dependencies>
-						<attribute id="software_id"/>
-					</dependencies>
-					<sql>softwarelicence_id</sql>
-					<target_class>SoftwareLicence</target_class>
-					<is_null_allowed>true</is_null_allowed>
-					<on_target_delete>DEL_MANUAL</on_target_delete>
-					<allow_target_creation>false</allow_target_creation>
-				</field>
-				<field id="softwarelicence_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>softwarelicence_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="path" xsi:type="AttributeString">
-					<sql>path</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="status" xsi:type="AttributeEnum">
-					<values>
-						<value id="active">
-							<code>active</code>
-							<style>
-								<main_color>$ibo-lifecycle-active-state-primary-color</main_color>
-								<complementary_color>$ibo-lifecycle-active-state-secondary-color</complementary_color>
-								<decoration_classes/>
-							</style>
-						</value>
-						<value id="inactive">
-							<code>inactive</code>
-							<style>
-								<main_color>$ibo-lifecycle-frozen-state-primary-color</main_color>
-								<complementary_color>$ibo-lifecycle-frozen-state-secondary-color</complementary_color>
-								<decoration_classes/>
-							</style>
-						</value>
-					</values>
-					<sql>status</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-					<display_style>list</display_style>
-				</field>
-			</fields>
-			<presentation>
-				<details>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="status">
-							<rank>30</rank>
-						</item>
-						<item id="business_criticity">
-							<rank>40</rank>
-						</item>
-						<item id="system_id">
-							<rank>50</rank>
-						</item>
-						<item id="software_id">
-							<rank>60</rank>
-						</item>
-						<item id="softwarelicence_id">
-							<rank>70</rank>
-						</item>
-						<item id="path">
-							<rank>80</rank>
-						</item>
-						<item id="move2production">
-							<rank>90</rank>
-						</item>
-						<item id="description">
-							<rank>100</rank>
-						</item>
-						<item id="contacts_list">
-							<rank>110</rank>
-						</item>
-						<item id="documents_list">
-							<rank>120</rank>
-						</item>
-						<item id="applicationsolution_list">
-							<rank>130</rank>
-						</item>
-					</items>
-				</details>
-				<default_search>
-					<items>
-						<item id="friendlyname">
-							<rank>10</rank>
-						</item>
-						<item id="system_id">
-							<rank>20</rank>
-						</item>
-						<item id="org_id">
-							<rank>30</rank>
-						</item>
-					</items>
-				</default_search>
-				<search>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="business_criticity">
-							<rank>30</rank>
-						</item>
-						<item id="move2production">
-							<rank>40</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="finalclass">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="business_criticity">
-							<rank>30</rank>
-						</item>
-						<item id="system_id">
-							<rank>40</rank>
-						</item>
-						<item id="software_id">
-							<rank>50</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-			<methods/>
-		</class>
-		<class id="Middleware" _delta="define">
-			<parent>SoftwareInstance</parent>
-			<properties>
-				<category>bizmodel,searchable</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>middleware</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="name"/>
-						<attribute id="system_name"/>
-					</attributes>
-				</naming>
-				<style>
-					<icon>../../images/icons/icons8-automatic.svg</icon>
-				</style>
-				<reconciliation>
-					<attributes>
-						<attribute id="name"/>
-						<attribute id="org_id"/>
-						<attribute id="organization_name"/>
-						<attribute id="system_id"/>
-						<attribute id="system_name"/>
-					</attributes>
-				</reconciliation>
-			</properties>
-			<fields>
-				<field id="middlewareinstance_list" xsi:type="AttributeLinkedSet">
-					<linked_class>MiddlewareInstance</linked_class>
-					<ext_key_to_me>middleware_id</ext_key_to_me>
-					<edit_mode>in_place</edit_mode>
-					<tracking_level>all</tracking_level>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-				</field>
-			</fields>
-			<presentation>
-				<details>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="status">
-							<rank>30</rank>
-						</item>
-						<item id="business_criticity">
-							<rank>40</rank>
-						</item>
-						<item id="system_id">
-							<rank>50</rank>
-						</item>
-						<item id="software_id">
-							<rank>60</rank>
-						</item>
-						<item id="softwarelicence_id">
-							<rank>70</rank>
-						</item>
-						<item id="path">
-							<rank>80</rank>
-						</item>
-						<item id="move2production">
-							<rank>90</rank>
-						</item>
-						<item id="description">
-							<rank>100</rank>
-						</item>
-						<item id="contacts_list">
-							<rank>110</rank>
-						</item>
-						<item id="documents_list">
-							<rank>120</rank>
-						</item>
-						<item id="applicationsolution_list">
-							<rank>140</rank>
-						</item>
-						<item id="middlewareinstance_list">
-							<rank>150</rank>
-						</item>
-					</items>
-				</details>
-				<search>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="business_criticity">
-							<rank>30</rank>
-						</item>
-						<item id="move2production">
-							<rank>40</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<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>
-					</items>
-				</list>
-			</presentation>
-			<methods/>
-			<relations>
-				<relation id="impacts">
-					<neighbours>
-						<neighbour id="middlewareinstance">
-							<attribute>middlewareinstance_list</attribute>
-						</neighbour>
-					</neighbours>
-				</relation>
-			</relations>
-		</class>
-		<class id="DBServer" _delta="define">
-			<parent>SoftwareInstance</parent>
-			<properties>
-				<category>bizmodel,searchable</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>dbserver</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="name"/>
-						<attribute id="system_name"/>
-					</attributes>
-				</naming>
-				<style>
-					<icon>../../images/icons/icons8-database.svg</icon>
-				</style>
-				<reconciliation>
-					<attributes>
-						<attribute id="name"/>
-						<attribute id="org_id"/>
-						<attribute id="organization_name"/>
-						<attribute id="system_id"/>
-						<attribute id="system_name"/>
-					</attributes>
-				</reconciliation>
-			</properties>
-			<fields>
-				<field id="dbschema_list" xsi:type="AttributeLinkedSet">
-					<linked_class>DatabaseSchema</linked_class>
-					<ext_key_to_me>dbserver_id</ext_key_to_me>
-					<edit_mode>in_place</edit_mode>
-					<tracking_level>all</tracking_level>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-				</field>
-			</fields>
-			<presentation>
-				<details>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="status">
-							<rank>30</rank>
-						</item>
-						<item id="business_criticity">
-							<rank>40</rank>
-						</item>
-						<item id="system_id">
-							<rank>50</rank>
-						</item>
-						<item id="software_id">
-							<rank>60</rank>
-						</item>
-						<item id="softwarelicence_id">
-							<rank>70</rank>
-						</item>
-						<item id="path">
-							<rank>80</rank>
-						</item>
-						<item id="move2production">
-							<rank>90</rank>
-						</item>
-						<item id="description">
-							<rank>100</rank>
-						</item>
-						<item id="contacts_list">
-							<rank>110</rank>
-						</item>
-						<item id="documents_list">
-							<rank>120</rank>
-						</item>
-						<item id="applicationsolution_list">
-							<rank>140</rank>
-						</item>
-						<item id="dbschema_list">
-							<rank>150</rank>
-						</item>
-					</items>
-				</details>
-				<search>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="business_criticity">
-							<rank>30</rank>
-						</item>
-						<item id="move2production">
-							<rank>40</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<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>
-					</items>
-				</list>
-			</presentation>
-			<methods/>
-			<relations>
-				<relation id="impacts">
-					<neighbours>
-						<neighbour id="databaseschema">
-							<attribute>dbschema_list</attribute>
-						</neighbour>
-					</neighbours>
-				</relation>
-			</relations>
-		</class>
-		<class id="WebServer" _delta="define">
-			<parent>SoftwareInstance</parent>
-			<properties>
-				<category>bizmodel,searchable</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>webserver</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="name"/>
-						<attribute id="system_name"/>
-					</attributes>
-				</naming>
-				<style>
-					<icon>../../images/icons/icons8-server-custom.svg</icon>
-				</style>
-				<reconciliation>
-					<attributes>
-						<attribute id="name"/>
-						<attribute id="org_id"/>
-						<attribute id="organization_name"/>
-						<attribute id="system_id"/>
-						<attribute id="system_name"/>
-					</attributes>
-				</reconciliation>
-			</properties>
-			<fields>
-				<field id="webapp_list" xsi:type="AttributeLinkedSet">
-					<linked_class>WebApplication</linked_class>
-					<ext_key_to_me>webserver_id</ext_key_to_me>
-					<edit_mode>in_place</edit_mode>
-					<tracking_level>all</tracking_level>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-				</field>
-			</fields>
-			<presentation>
-				<details>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="status">
-							<rank>30</rank>
-						</item>
-						<item id="business_criticity">
-							<rank>40</rank>
-						</item>
-						<item id="system_id">
-							<rank>50</rank>
-						</item>
-						<item id="software_id">
-							<rank>60</rank>
-						</item>
-						<item id="softwarelicence_id">
-							<rank>70</rank>
-						</item>
-						<item id="path">
-							<rank>80</rank>
-						</item>
-						<item id="move2production">
-							<rank>90</rank>
-						</item>
-						<item id="description">
-							<rank>100</rank>
-						</item>
-						<item id="contacts_list">
-							<rank>110</rank>
-						</item>
-						<item id="documents_list">
-							<rank>120</rank>
-						</item>
-						<item id="applicationsolution_list">
-							<rank>140</rank>
-						</item>
-						<item id="webapp_list">
-							<rank>150</rank>
-						</item>
-					</items>
-				</details>
-				<search>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="business_criticity">
-							<rank>30</rank>
-						</item>
-						<item id="move2production">
-							<rank>40</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<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>
-					</items>
-				</list>
-			</presentation>
-			<methods/>
-			<relations>
-				<relation id="impacts">
-					<neighbours>
-						<neighbour id="webapplication">
-							<attribute>webapp_list</attribute>
-						</neighbour>
-					</neighbours>
-				</relation>
-			</relations>
-		</class>
-		<class id="PCSoftware" _delta="define">
-			<parent>SoftwareInstance</parent>
-			<properties>
-				<category>bizmodel,searchable</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>pcsoftware</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="name"/>
-						<attribute id="system_name"/>
-					</attributes>
-				</naming>
-				<style>
-					<icon>../../images/icons/icons8-desktop.svg</icon>
-				</style>
-				<reconciliation>
-					<attributes>
-						<attribute id="name"/>
-						<attribute id="org_id"/>
-						<attribute id="organization_name"/>
-						<attribute id="system_id"/>
-						<attribute id="system_name"/>
-					</attributes>
-				</reconciliation>
-			</properties>
-			<fields/>
-			<methods/>
-			<presentation>
-				<details>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="status">
-							<rank>30</rank>
-						</item>
-						<item id="business_criticity">
-							<rank>40</rank>
-						</item>
-						<item id="system_id">
-							<rank>50</rank>
-						</item>
-						<item id="software_id">
-							<rank>60</rank>
-						</item>
-						<item id="softwarelicence_id">
-							<rank>70</rank>
-						</item>
-						<item id="path">
-							<rank>80</rank>
-						</item>
-						<item id="move2production">
-							<rank>90</rank>
-						</item>
-						<item id="description">
-							<rank>100</rank>
-						</item>
-						<item id="contacts_list">
-							<rank>110</rank>
-						</item>
-						<item id="documents_list">
-							<rank>120</rank>
-						</item>
-						<item id="applicationsolution_list">
-							<rank>140</rank>
-						</item>
-					</items>
-				</details>
-				<search>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="business_criticity">
-							<rank>30</rank>
-						</item>
-						<item id="move2production">
-							<rank>40</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<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>
-					</items>
-				</list>
-			</presentation>
-		</class>
-		<class id="OtherSoftware" _delta="define">
-			<parent>SoftwareInstance</parent>
-			<properties>
-				<category>bizmodel,searchable</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>othersoftware</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="name"/>
-						<attribute id="system_name"/>
-					</attributes>
-				</naming>
-				<style>
-					<icon>../../images/icons/icons8-software-other.svg</icon>
-				</style>
-				<reconciliation>
-					<attributes>
-						<attribute id="name"/>
-						<attribute id="org_id"/>
-						<attribute id="organization_name"/>
-						<attribute id="system_id"/>
-						<attribute id="system_name"/>
-					</attributes>
-				</reconciliation>
-			</properties>
-			<fields/>
-			<methods/>
-			<presentation>
-				<details>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="status">
-							<rank>30</rank>
-						</item>
-						<item id="business_criticity">
-							<rank>40</rank>
-						</item>
-						<item id="system_id">
-							<rank>50</rank>
-						</item>
-						<item id="software_id">
-							<rank>60</rank>
-						</item>
-						<item id="softwarelicence_id">
-							<rank>70</rank>
-						</item>
-						<item id="path">
-							<rank>80</rank>
-						</item>
-						<item id="move2production">
-							<rank>90</rank>
-						</item>
-						<item id="description">
-							<rank>100</rank>
-						</item>
-						<item id="contacts_list">
-							<rank>110</rank>
-						</item>
-						<item id="documents_list">
-							<rank>120</rank>
-						</item>
-						<item id="applicationsolution_list">
-							<rank>140</rank>
-						</item>
-					</items>
-				</details>
-				<search>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="business_criticity">
-							<rank>30</rank>
-						</item>
-						<item id="move2production">
-							<rank>40</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<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>
-					</items>
-				</list>
-			</presentation>
-		</class>
-		<class id="MiddlewareInstance" _delta="define">
-			<parent>FunctionalCI</parent>
-			<properties>
-				<category>bizmodel,searchable</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>middlewareinstance</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="name"/>
-					</attributes>
-				</naming>
-				<style>
-					<icon>../../images/icons/icons8-automatic.svg</icon>
-				</style>
-				<reconciliation>
-					<attributes>
-						<attribute id="name"/>
-						<attribute id="org_id"/>
-						<attribute id="organization_name"/>
-						<attribute id="middleware_id"/>
-						<attribute id="middleware_name"/>
-					</attributes>
-				</reconciliation>
-				<obsolescence>
-					<condition>middleware_id_obsolescence_flag</condition>
-				</obsolescence>
-			</properties>
-			<fields>
-				<field id="middleware_id" xsi:type="AttributeExternalKey">
-					<sql>middleware_id</sql>
-					<target_class>Middleware</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_MANUAL</on_target_delete>
-				</field>
-				<field id="middleware_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>middleware_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-			</fields>
-			<presentation>
-				<details>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="middleware_id">
-							<rank>30</rank>
-						</item>
-						<item id="business_criticity">
-							<rank>40</rank>
-						</item>
-						<item id="move2production">
-							<rank>50</rank>
-						</item>
-						<item id="description">
-							<rank>60</rank>
-						</item>
-						<item id="contacts_list">
-							<rank>70</rank>
-						</item>
-						<item id="documents_list">
-							<rank>80</rank>
-						</item>
-						<item id="applicationsolution_list">
-							<rank>100</rank>
-						</item>
-					</items>
-				</details>
-				<default_search>
-					<items>
-						<item id="friendlyname">
-							<rank>10</rank>
-						</item>
-						<item id="middleware_id">
-							<rank>20</rank>
-						</item>
-						<item id="org_id">
-							<rank>30</rank>
-						</item>
-					</items>
-				</default_search>
-				<search>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="business_criticity">
-							<rank>30</rank>
-						</item>
-						<item id="move2production">
-							<rank>40</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="org_id">
-							<rank>10</rank>
-						</item>
-						<item id="business_criticity">
-							<rank>20</rank>
-						</item>
-						<item id="move2production">
-							<rank>30</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-			<methods/>
-		</class>
-		<class id="DatabaseSchema" _delta="define">
-			<parent>FunctionalCI</parent>
-			<properties>
-				<category>bizmodel,searchable</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>databaseschema</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="name"/>
-					</attributes>
-				</naming>
-				<style>
-					<icon>../../images/icons/icons8-database-custom.svg</icon>
-				</style>
-				<reconciliation>
-					<attributes>
-						<attribute id="name"/>
-						<attribute id="org_id"/>
-						<attribute id="organization_name"/>
-					</attributes>
-				</reconciliation>
-				<obsolescence>
-					<condition>dbserver_id_obsolescence_flag</condition>
-				</obsolescence>
-			</properties>
-			<fields>
-				<field id="dbserver_id" xsi:type="AttributeExternalKey">
-					<sql>dbserver_id</sql>
-					<target_class>DBServer</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_MANUAL</on_target_delete>
-				</field>
-				<field id="dbserver_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>dbserver_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-			</fields>
-			<presentation>
-				<details>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="dbserver_id">
-							<rank>30</rank>
-						</item>
-						<item id="business_criticity">
-							<rank>40</rank>
-						</item>
-						<item id="move2production">
-							<rank>50</rank>
-						</item>
-						<item id="description">
-							<rank>60</rank>
-						</item>
-						<item id="contacts_list">
-							<rank>70</rank>
-						</item>
-						<item id="documents_list">
-							<rank>80</rank>
-						</item>
-						<item id="applicationsolution_list">
-							<rank>100</rank>
-						</item>
-					</items>
-				</details>
-				<default_search>
-					<items>
-						<item id="friendlyname">
-							<rank>10</rank>
-						</item>
-						<item id="dbserver_id">
-							<rank>20</rank>
-						</item>
-						<item id="org_id">
-							<rank>30</rank>
-						</item>
-					</items>
-				</default_search>
-				<search>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="business_criticity">
-							<rank>30</rank>
-						</item>
-						<item id="move2production">
-							<rank>40</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="org_id">
-							<rank>10</rank>
-						</item>
-						<item id="business_criticity">
-							<rank>20</rank>
-						</item>
-						<item id="move2production">
-							<rank>30</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-			<methods/>
-		</class>
-		<class id="WebApplication" _delta="define">
-			<parent>FunctionalCI</parent>
-			<properties>
-				<category>bizmodel,searchable</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>webapplication</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="name"/>
-					</attributes>
-				</naming>
-				<style>
-					<icon>../../images/icons/icons8-web.svg</icon>
-				</style>
-				<reconciliation>
-					<attributes>
-						<attribute id="name"/>
-						<attribute id="org_id"/>
-						<attribute id="organization_name"/>
-					</attributes>
-				</reconciliation>
-				<obsolescence>
-					<condition>webserver_id_obsolescence_flag</condition>
-				</obsolescence>
-			</properties>
-			<fields>
-				<field id="webserver_id" xsi:type="AttributeExternalKey">
-					<sql>webserver_id</sql>
-					<target_class>WebServer</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_MANUAL</on_target_delete>
-				</field>
-				<field id="webserver_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>webserver_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="url" xsi:type="AttributeURL">
-					<sql>url</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-					<target>_blank</target>
-				</field>
-			</fields>
-			<presentation>
-				<details>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="webserver_id">
-							<rank>30</rank>
-						</item>
-						<item id="url">
-							<rank>40</rank>
-						</item>
-						<item id="business_criticity">
-							<rank>50</rank>
-						</item>
-						<item id="move2production">
-							<rank>60</rank>
-						</item>
-						<item id="description">
-							<rank>70</rank>
-						</item>
-						<item id="contacts_list">
-							<rank>80</rank>
-						</item>
-						<item id="documents_list">
-							<rank>90</rank>
-						</item>
-						<item id="applicationsolution_list">
-							<rank>110</rank>
-						</item>
-					</items>
-				</details>
-				<default_search>
-					<items>
-						<item id="friendlyname">
-							<rank>10</rank>
-						</item>
-						<item id="webserver_id">
-							<rank>20</rank>
-						</item>
-						<item id="org_id">
-							<rank>30</rank>
-						</item>
-					</items>
-				</default_search>
-				<search>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="business_criticity">
-							<rank>30</rank>
-						</item>
-						<item id="move2production">
-							<rank>40</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="org_id">
-							<rank>10</rank>
-						</item>
-						<item id="business_criticity">
-							<rank>20</rank>
-						</item>
-						<item id="move2production">
-							<rank>30</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-			<methods/>
-		</class>
-		<class id="Software" _delta="define">
-			<parent>cmdbAbstractObject</parent>
-			<properties>
-				<category>bizmodel,searchable</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>software</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="name"/>
-						<attribute id="version"/>
-					</attributes>
-				</naming>
-				<style>
-					<icon>../../images/icons/icons8-software.svg</icon>
-				</style>
-				<reconciliation>
-					<attributes>
-						<attribute id="name"/>
-						<attribute id="version"/>
-						<attribute id="vendor"/>
-					</attributes>
-				</reconciliation>
-			</properties>
-			<fields>
-				<field id="name" xsi:type="AttributeString">
-					<sql>name</sql>
-					<default_value/>
-					<is_null_allowed>false</is_null_allowed>
-				</field>
-				<field id="vendor" xsi:type="AttributeString">
-					<sql>vendor</sql>
-					<default_value/>
-					<is_null_allowed>false</is_null_allowed>
-				</field>
-				<field id="version" xsi:type="AttributeString">
-					<sql>version</sql>
-					<default_value/>
-					<is_null_allowed>false</is_null_allowed>
-				</field>
-				<field id="documents_list" xsi:type="AttributeLinkedSetIndirect">
-					<linked_class>lnkDocumentToSoftware</linked_class>
-					<ext_key_to_me>software_id</ext_key_to_me>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-					<ext_key_to_remote>document_id</ext_key_to_remote>
-					<duplicates/>
-				</field>
-				<field id="type" xsi:type="AttributeEnum">
-					<values>
-						<value id="Middleware">
-							<code>Middleware</code>
-						</value>
-						<value id="DBServer">
-							<code>DBServer</code>
-						</value>
-						<value id="PCSoftware">
-							<code>PCSoftware</code>
-						</value>
-						<value id="OtherSoftware">
-							<code>OtherSoftware</code>
-						</value>
-						<value id="WebServer">
-							<code>WebServer</code>
-						</value>
-					</values>
-					<sql>type</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-					<display_style>list</display_style>
-				</field>
-				<field id="softwareinstance_list" xsi:type="AttributeLinkedSet">
-					<linked_class>SoftwareInstance</linked_class>
-					<ext_key_to_me>software_id</ext_key_to_me>
-					<edit_mode>add_only</edit_mode>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-				</field>
-				<field id="softwarepatch_list" xsi:type="AttributeLinkedSet">
-					<linked_class>SoftwarePatch</linked_class>
-					<ext_key_to_me>software_id</ext_key_to_me>
-					<edit_mode>add_only</edit_mode>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-				</field>
-				<field id="softwarelicence_list" xsi:type="AttributeLinkedSet">
-					<linked_class>SoftwareLicence</linked_class>
-					<ext_key_to_me>software_id</ext_key_to_me>
-					<edit_mode>add_only</edit_mode>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-				</field>
-			</fields>
-			<methods/>
-			<presentation>
-				<details>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="vendor">
-							<rank>20</rank>
-						</item>
-						<item id="version">
-							<rank>30</rank>
-						</item>
-						<item id="documents_list">
-							<rank>40</rank>
-						</item>
-						<item id="type">
-							<rank>50</rank>
-						</item>
-						<item id="softwareinstance_list">
-							<rank>60</rank>
-						</item>
-						<item id="softwarepatch_list">
-							<rank>70</rank>
-						</item>
-						<item id="softwarelicence_list">
-							<rank>80</rank>
-						</item>
-					</items>
-				</details>
-				<default_search>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="vendor">
-							<rank>20</rank>
-						</item>
-						<item id="type">
-							<rank>30</rank>
-						</item>
-					</items>
-				</default_search>
-				<search>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="vendor">
-							<rank>20</rank>
-						</item>
-						<item id="version">
-							<rank>30</rank>
-						</item>
-						<item id="type">
-							<rank>40</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="vendor">
-							<rank>10</rank>
-						</item>
-						<item id="version">
-							<rank>20</rank>
-						</item>
-						<item id="type">
-							<rank>30</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-		</class>
-		<class id="Patch" _delta="define">
-			<parent>cmdbAbstractObject</parent>
-			<properties>
-				<category>bizmodel,searchable</category>
-				<abstract>true</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>patch</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field>finalclass</db_final_class_field>
-				<naming>
-					<attributes>
-						<attribute id="name"/>
-					</attributes>
-				</naming>
-				<style>
-					<icon>../../images/icons/icons8-bandage.svg</icon>
-				</style>
-				<reconciliation>
-					<attributes>
-						<attribute id="name"/>
-						<attribute id="finalclass"/>
-					</attributes>
-				</reconciliation>
-			</properties>
-			<fields>
-				<field id="name" xsi:type="AttributeString">
-					<sql>name</sql>
-					<default_value/>
-					<is_null_allowed>false</is_null_allowed>
-				</field>
-				<field id="documents_list" xsi:type="AttributeLinkedSetIndirect">
-					<linked_class>lnkDocumentToPatch</linked_class>
-					<ext_key_to_me>patch_id</ext_key_to_me>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-					<ext_key_to_remote>document_id</ext_key_to_remote>
-					<duplicates/>
-				</field>
-				<field id="description" xsi:type="AttributeText">
-					<sql>description</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-			</fields>
-			<methods/>
-			<presentation>
-				<details>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="documents_list">
-							<rank>20</rank>
-						</item>
-						<item id="description">
-							<rank>30</rank>
-						</item>
-					</items>
-				</details>
-				<default_search>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="description">
-							<rank>20</rank>
-						</item>
-					</items>
-				</default_search>
-				<search>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="finalclass">
-							<rank>10</rank>
-						</item>
-						<item id="description">
-							<rank>20</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-		</class>
-		<class id="OSPatch" _delta="define">
-			<parent>Patch</parent>
-			<properties>
-				<category>bizmodel,searchable</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>ospatch</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="name"/>
-					</attributes>
-				</naming>
-				<style>
-					<icon>../../images/icons/icons8-bandage.svg</icon>
-				</style>
-				<reconciliation>
-					<attributes>
-						<attribute id="name"/>
-					</attributes>
-				</reconciliation>
-			</properties>
-			<fields>
-				<field id="functionalcis_list" xsi:type="AttributeLinkedSetIndirect">
-					<linked_class>lnkFunctionalCIToOSPatch</linked_class>
-					<ext_key_to_me>ospatch_id</ext_key_to_me>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-					<ext_key_to_remote>functionalci_id</ext_key_to_remote>
-					<duplicates/>
-				</field>
-				<field id="osversion_id" xsi:type="AttributeExternalKey">
-					<sql>osversion_id</sql>
-					<target_class>OSVersion</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_MANUAL</on_target_delete>
-				</field>
-				<field id="osversion_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>osversion_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-			</fields>
-			<methods/>
-			<presentation>
-				<details>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="documents_list">
-							<rank>20</rank>
-						</item>
-						<item id="functionalcis_list">
-							<rank>30</rank>
-						</item>
-						<item id="description">
-							<rank>40</rank>
-						</item>
-						<item id="osversion_id">
-							<rank>50</rank>
-						</item>
-					</items>
-				</details>
-				<search>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="description">
-							<rank>20</rank>
-						</item>
-						<item id="osversion_id">
-							<rank>30</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="description">
-							<rank>10</rank>
-						</item>
-						<item id="osversion_id">
-							<rank>20</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-		</class>
-		<class id="SoftwarePatch" _delta="define">
-			<parent>Patch</parent>
-			<properties>
-				<category>bizmodel,searchable</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>softwarepatch</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="name"/>
-					</attributes>
-				</naming>
-				<style>
-					<icon>../../images/icons/icons8-bandage.svg</icon>
-				</style>
-				<reconciliation>
-					<attributes>
-						<attribute id="name"/>
-					</attributes>
-				</reconciliation>
-			</properties>
-			<fields>
-				<field id="software_id" xsi:type="AttributeExternalKey">
-					<sql>software_id</sql>
-					<target_class>Software</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_MANUAL</on_target_delete>
-				</field>
-				<field id="software_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>software_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="softwareinstances_list" xsi:type="AttributeLinkedSetIndirect">
-					<linked_class>lnkSoftwareInstanceToSoftwarePatch</linked_class>
-					<ext_key_to_me>softwarepatch_id</ext_key_to_me>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-					<ext_key_to_remote>softwareinstance_id</ext_key_to_remote>
-					<duplicates/>
-				</field>
-			</fields>
-			<methods/>
-			<presentation>
-				<details>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="documents_list">
-							<rank>20</rank>
-						</item>
-						<item id="software_id">
-							<rank>30</rank>
-						</item>
-						<item id="description">
-							<rank>40</rank>
-						</item>
-						<item id="softwareinstances_list">
-							<rank>50</rank>
-						</item>
-					</items>
-				</details>
-				<search>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="software_id">
-							<rank>20</rank>
-						</item>
-						<item id="description">
-							<rank>30</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="software_id">
-							<rank>10</rank>
-						</item>
-						<item id="description">
-							<rank>20</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-		</class>
-		<class id="Licence" _delta="define">
-			<parent>cmdbAbstractObject</parent>
-			<properties>
-				<category>bizmodel,searchable</category>
-				<abstract>true</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>licence</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field>finalclass</db_final_class_field>
-				<naming>
-					<attributes>
-						<attribute id="name"/>
-					</attributes>
-				</naming>
-				<style>
-					<icon>../../images/icons/icons8-licence.svg</icon>
-				</style>
-				<reconciliation>
-					<attributes>
-						<attribute id="name"/>
-						<attribute id="org_id"/>
-						<attribute id="organization_name"/>
-						<attribute id="finalclass"/>
-					</attributes>
-				</reconciliation>
-				<obsolescence>
-					<condition>
-						<![CDATA[perpetual='no' AND ISNULL(end_date)=0 AND end_date < DATE_FORMAT(DATE_SUB(NOW(), INTERVAL 15 MONTH),'%Y-%m-%d 00:00:00')]]></condition>
-				</obsolescence>
-			</properties>
-			<fields>
-				<field id="name" xsi:type="AttributeString">
-					<sql>name</sql>
-					<default_value/>
-					<is_null_allowed>false</is_null_allowed>
-				</field>
-				<field id="documents_list" xsi:type="AttributeLinkedSetIndirect">
-					<linked_class>lnkDocumentToLicence</linked_class>
-					<ext_key_to_me>licence_id</ext_key_to_me>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-					<ext_key_to_remote>document_id</ext_key_to_remote>
-					<duplicates/>
-				</field>
-				<field id="org_id" xsi:type="AttributeExternalKey">
-					<sql>org_id</sql>
-					<target_class>Organization</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_MANUAL</on_target_delete>
-				</field>
-				<field id="organization_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>org_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="usage_limit" xsi:type="AttributeString">
-					<sql>usage_limit</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="description" xsi:type="AttributeText">
-					<sql>description</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="start_date" xsi:type="AttributeDate">
-					<sql>start_date</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="end_date" xsi:type="AttributeDate">
-					<sql>end_date</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="licence_key" xsi:type="AttributeString">
-					<sql>licence_key</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="perpetual" xsi:type="AttributeEnum">
-					<values>
-						<value id="yes">
-							<code>yes</code>
-						</value>
-						<value id="no">
-							<code>no</code>
-						</value>
-					</values>
-					<sql>perpetual</sql>
-					<default_value>no</default_value>
-					<is_null_allowed>false</is_null_allowed>
-					<display_style>list</display_style>
-				</field>
-			</fields>
-			<methods/>
-			<presentation>
-				<details>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="usage_limit">
-							<rank>30</rank>
-						</item>
-						<item id="description">
-							<rank>40</rank>
-						</item>
-						<item id="perpetual">
-							<rank>50</rank>
-						</item>
-						<item id="start_date">
-							<rank>60</rank>
-						</item>
-						<item id="end_date">
-							<rank>70</rank>
-						</item>
-						<item id="licence_key">
-							<rank>80</rank>
-						</item>
-						<item id="documents_list">
-							<rank>90</rank>
-						</item>
-					</items>
-				</details>
-				<default_search>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="description">
-							<rank>20</rank>
-						</item>
-						<item id="licence_key">
-							<rank>30</rank>
-						</item>
-					</items>
-				</default_search>
-				<search>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="perpetual">
-							<rank>15</rank>
-						</item>
-						<item id="start_date">
-							<rank>20</rank>
-						</item>
-						<item id="end_date">
-							<rank>30</rank>
-						</item>
-						<item id="licence_key">
-							<rank>40</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="finalclass">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="usage_limit">
-							<rank>30</rank>
-						</item>
-						<item id="description">
-							<rank>40</rank>
-						</item>
-						<item id="start_date">
-							<rank>50</rank>
-						</item>
-						<item id="end_date">
-							<rank>60</rank>
-						</item>
-						<item id="licence_key">
-							<rank>70</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-		</class>
-		<class id="OSLicence" _delta="define">
-			<parent>Licence</parent>
-			<properties>
-				<category>bizmodel,searchable</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>oslicence</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="name"/>
-					</attributes>
-				</naming>
-				<style>
-					<icon>../../images/icons/icons8-licence.svg</icon>
-				</style>
-				<reconciliation>
-					<attributes>
-						<attribute id="name"/>
-						<attribute id="org_id"/>
-						<attribute id="organization_name"/>
-					</attributes>
-				</reconciliation>
-			</properties>
-			<fields>
-				<field id="osversion_id" xsi:type="AttributeExternalKey">
-					<sql>osversion_id</sql>
-					<target_class>OSVersion</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_MANUAL</on_target_delete>
-				</field>
-				<field id="osversion_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>osversion_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="virtualmachines_list" xsi:type="AttributeLinkedSet">
-					<linked_class>VirtualMachine</linked_class>
-					<ext_key_to_me>oslicence_id</ext_key_to_me>
-					<edit_mode>none</edit_mode>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-				</field>
-				<field id="servers_list" xsi:type="AttributeLinkedSet">
-					<linked_class>Server</linked_class>
-					<ext_key_to_me>oslicence_id</ext_key_to_me>
-					<edit_mode>none</edit_mode>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-				</field>
-			</fields>
-			<methods/>
-			<presentation>
-				<details>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="documents_list">
-							<rank>20</rank>
-						</item>
-						<item id="osversion_id">
-							<rank>30</rank>
-						</item>
-						<item id="org_id">
-							<rank>40</rank>
-						</item>
-						<item id="usage_limit">
-							<rank>50</rank>
-						</item>
-						<item id="description">
-							<rank>60</rank>
-						</item>
-						<item id="perpetual">
-							<rank>65</rank>
-						</item>
-						<item id="start_date">
-							<rank>70</rank>
-						</item>
-						<item id="end_date">
-							<rank>80</rank>
-						</item>
-						<item id="licence_key">
-							<rank>90</rank>
-						</item>
-						<item id="servers_list">
-							<rank>100</rank>
-						</item>
-						<item id="virtualmachines_list">
-							<rank>110</rank>
-						</item>
-					</items>
-				</details>
-				<search>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="perpetual">
-							<rank>15</rank>
-						</item>
-						<item id="start_date">
-							<rank>20</rank>
-						</item>
-						<item id="end_date">
-							<rank>30</rank>
-						</item>
-						<item id="licence_key">
-							<rank>40</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="osversion_id">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="usage_limit">
-							<rank>30</rank>
-						</item>
-						<item id="description">
-							<rank>40</rank>
-						</item>
-						<item id="start_date">
-							<rank>50</rank>
-						</item>
-						<item id="end_date">
-							<rank>60</rank>
-						</item>
-						<item id="licence_key">
-							<rank>70</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-		</class>
-		<class id="SoftwareLicence" _delta="define">
-			<parent>Licence</parent>
-			<properties>
-				<category>bizmodel,searchable</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>softwarelicence</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="name"/>
-					</attributes>
-				</naming>
-				<style>
-					<icon>../../images/icons/icons8-software-license.svg</icon>
-				</style>
-				<reconciliation>
-					<attributes>
-						<attribute id="name"/>
-						<attribute id="org_id"/>
-						<attribute id="organization_name"/>
-						<attribute id="software_id"/>
-						<attribute id="software_name"/>
-					</attributes>
-				</reconciliation>
-			</properties>
-			<fields>
-				<field id="software_id" xsi:type="AttributeExternalKey">
-					<sql>software_id</sql>
-					<target_class>Software</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_MANUAL</on_target_delete>
-				</field>
-				<field id="software_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>software_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="softwareinstance_list" xsi:type="AttributeLinkedSet">
-					<linked_class>SoftwareInstance</linked_class>
-					<ext_key_to_me>softwarelicence_id</ext_key_to_me>
-					<edit_mode>none</edit_mode>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-				</field>
-			</fields>
-			<methods/>
-			<presentation>
-				<details>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="documents_list">
-							<rank>20</rank>
-						</item>
-						<item id="software_id">
-							<rank>30</rank>
-						</item>
-						<item id="org_id">
-							<rank>40</rank>
-						</item>
-						<item id="usage_limit">
-							<rank>50</rank>
-						</item>
-						<item id="description">
-							<rank>60</rank>
-						</item>
-						<item id="perpetual">
-							<rank>65</rank>
-						</item>
-						<item id="start_date">
-							<rank>70</rank>
-						</item>
-						<item id="end_date">
-							<rank>80</rank>
-						</item>
-						<item id="licence_key">
-							<rank>90</rank>
-						</item>
-						<item id="softwareinstance_list">
-							<rank>100</rank>
-						</item>
-					</items>
-				</details>
-				<search>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="perpetual">
-							<rank>15</rank>
-						</item>
-						<item id="start_date">
-							<rank>20</rank>
-						</item>
-						<item id="end_date">
-							<rank>30</rank>
-						</item>
-						<item id="licence_key">
-							<rank>40</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="software_id">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="usage_limit">
-							<rank>30</rank>
-						</item>
-						<item id="description">
-							<rank>40</rank>
-						</item>
-						<item id="start_date">
-							<rank>50</rank>
-						</item>
-						<item id="end_date">
-							<rank>60</rank>
-						</item>
-						<item id="licence_key">
-							<rank>70</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-		</class>
-		<class id="lnkDocumentToLicence" _delta="define">
-			<parent>cmdbAbstractObject</parent>
-			<properties>
-				<is_link>1</is_link>
-				<category>bizmodel</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>lnkdocumenttolicence</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="licence_id"/>
-						<attribute id="document_id"/>
-					</attributes>
-				</naming>
+            </neighbour>
+          </neighbours>
+        </relation>
+      </relations>
+    </class>
+    <class id="Server" _delta="define">
+      <parent>DatacenterDevice</parent>
+      <properties>
+        <category>bizmodel,searchable</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>server</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="name"/>
+          </attributes>
+        </naming>
         <style>
-          <icon/>
+          <icon>../../images/icons/icons8-server.svg</icon>
         </style>
-				<reconciliation>
-					<attributes>
-						<attribute id="licence_id"/>
-						<attribute id="document_id"/>
-					</attributes>
-				</reconciliation>
-			</properties>
-			<fields>
-				<field id="licence_id" xsi:type="AttributeExternalKey">
-					<sql>licence_id</sql>
-					<target_class>Licence</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_AUTO</on_target_delete>
-				</field>
-				<field id="licence_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>licence_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="document_id" xsi:type="AttributeExternalKey">
-					<sql>document_id</sql>
-					<target_class>Document</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_AUTO</on_target_delete>
-				</field>
-				<field id="document_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>document_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-			</fields>
-			<methods/>
-			<presentation>
-				<details>
-					<items>
-						<item id="licence_id">
-							<rank>10</rank>
-						</item>
-						<item id="document_id">
-							<rank>20</rank>
-						</item>
-					</items>
-				</details>
-				<search>
-					<items>
-						<item id="licence_id">
-							<rank>10</rank>
-						</item>
-						<item id="document_id">
-							<rank>20</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="licence_id">
-							<rank>10</rank>
-						</item>
-						<item id="document_id">
-							<rank>20</rank>
+        <reconciliation>
+          <attributes>
+            <attribute id="name"/>
+            <attribute id="org_id"/>
+            <attribute id="organization_name"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
+        <field id="osfamily_id" xsi:type="AttributeExternalKey">
+          <sql>osfamily_id</sql>
+          <target_class>OSFamily</target_class>
+          <is_null_allowed>true</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+        </field>
+        <field id="osfamily_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>osfamily_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="osversion_id" xsi:type="AttributeExternalKey">
+          <filter><![CDATA[SELECT OSVersion WHERE osfamily_id = :this->osfamily_id]]></filter>
+          <dependencies>
+            <attribute id="osfamily_id"/>
+          </dependencies>
+          <sql>osversion_id</sql>
+          <target_class>OSVersion</target_class>
+          <is_null_allowed>true</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+        </field>
+        <field id="osversion_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>osversion_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="oslicence_id" xsi:type="AttributeExternalKey">
+          <filter><![CDATA[SELECT OSLicence WHERE osversion_id = :this->osversion_id]]></filter>
+          <dependencies>
+            <attribute id="osversion_id"/>
+          </dependencies>
+          <sql>oslicence_id</sql>
+          <target_class>OSLicence</target_class>
+          <is_null_allowed>true</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+        </field>
+        <field id="oslicence_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>oslicence_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="cpu" xsi:type="AttributeString">
+          <sql>cpu</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="ram" xsi:type="AttributeString">
+          <sql>ram</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="logicalvolumes_list" xsi:type="AttributeLinkedSetIndirect">
+          <linked_class>lnkServerToVolume</linked_class>
+          <ext_key_to_me>server_id</ext_key_to_me>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <ext_key_to_remote>volume_id</ext_key_to_remote>
+          <duplicates/>
+          <read_only>false</read_only>
+        </field>
+      </fields>
+      <presentation>
+        <details>
+          <items>
+            <item id="softwares_list">
+              <rank>10</rank>
+            </item>
+            <item id="contacts_list">
               <rank>20</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-		</class>
-		<class id="OSVersion" _delta="define">
-			<parent>Typology</parent>
-			<properties>
-				<category>bizmodel,searchable</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>osversion</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="name"/>
-					</attributes>
-				</naming>
+            </item>
+            <item id="documents_list">
+              <rank>30</rank>
+            </item>
+            <item id="applicationsolution_list">
+              <rank>45</rank>
+            </item>
+            <item id="physicalinterface_list">
+              <rank>50</rank>
+            </item>
+            <item id="fiberinterfacelist_list">
+              <rank>60</rank>
+            </item>
+            <item id="networkdevice_list">
+              <rank>70</rank>
+            </item>
+            <item id="san_list">
+              <rank>80</rank>
+            </item>
+            <item id="logicalvolumes_list">
+              <rank>90</rank>
+            </item>
+            <item id="col:col1">
+              <rank>120</rank>
+              <items>
+                <item id="fieldset:Server:baseinfo">
+                  <rank>10</rank>
+                  <items>
+                    <item id="name">
+                      <rank>10</rank>
+                    </item>
+                    <item id="org_id">
+                      <rank>20</rank>
+                    </item>
+                    <item id="status">
+                      <rank>30</rank>
+                    </item>
+                    <item id="business_criticity">
+                      <rank>40</rank>
+                    </item>
+                    <item id="location_id">
+                      <rank>50</rank>
+                    </item>
+                    <item id="rack_id">
+                      <rank>60</rank>
+                    </item>
+                    <item id="enclosure_id">
+                      <rank>70</rank>
+                    </item>
+                  </items>
+                </item>
+                <item id="fieldset:Server:moreinfo">
+                  <rank>20</rank>
+                  <items>
+                    <item id="brand_id">
+                      <rank>10</rank>
+                    </item>
+                    <item id="model_id">
+                      <rank>20</rank>
+                    </item>
+                    <item id="osfamily_id">
+                      <rank>30</rank>
+                    </item>
+                    <item id="osversion_id">
+                      <rank>40</rank>
+                    </item>
+                    <item id="managementip">
+                      <rank>45</rank>
+                    </item>
+                    <item id="oslicence_id">
+                      <rank>50</rank>
+                    </item>
+                    <item id="cpu">
+                      <rank>60</rank>
+                    </item>
+                    <item id="ram">
+                      <rank>70</rank>
+                    </item>
+                    <item id="nb_u">
+                      <rank>80</rank>
+                    </item>
+                    <item id="serialnumber">
+                      <rank>90</rank>
+                    </item>
+                    <item id="asset_number">
+                      <rank>100</rank>
+                    </item>
+                  </items>
+                </item>
+              </items>
+            </item>
+            <item id="col:col2">
+              <rank>130</rank>
+              <items>
+                <item id="fieldset:Server:Date">
+                  <rank>10</rank>
+                  <items>
+                    <item id="move2production">
+                      <rank>10</rank>
+                    </item>
+                    <item id="purchase_date">
+                      <rank>20</rank>
+                    </item>
+                    <item id="end_of_warranty">
+                      <rank>30</rank>
+                    </item>
+                  </items>
+                </item>
+                <item id="fieldset:Server:power">
+                  <rank>20</rank>
+                  <items>
+                    <item id="powerA_id">
+                      <rank>10</rank>
+                    </item>
+                    <item id="powerB_id">
+                      <rank>20</rank>
+                    </item>
+                    <item id="redundancy">
+                      <rank>30</rank>
+                    </item>
+                  </items>
+                </item>
+                <item id="fieldset:Server:otherinfo">
+                  <rank>30</rank>
+                  <items>
+                    <item id="description">
+                      <rank>10</rank>
+                    </item>
+                  </items>
+                </item>
+              </items>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="status">
+              <rank>30</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>40</rank>
+            </item>
+            <item id="location_id">
+              <rank>50</rank>
+            </item>
+            <item id="managementip">
+              <rank>55</rank>
+            </item>
+            <item id="brand_id">
+              <rank>60</rank>
+            </item>
+            <item id="model_id">
+              <rank>70</rank>
+            </item>
+            <item id="serialnumber">
+              <rank>80</rank>
+            </item>
+            <item id="asset_number">
+              <rank>90</rank>
+            </item>
+            <item id="powerA_id">
+              <rank>100</rank>
+            </item>
+            <item id="powerB_id">
+              <rank>110</rank>
+            </item>
+            <item id="move2production">
+              <rank>120</rank>
+            </item>
+            <item id="purchase_date">
+              <rank>130</rank>
+            </item>
+            <item id="end_of_warranty">
+              <rank>140</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="org_id">
+              <rank>10</rank>
+            </item>
+            <item id="status">
+              <rank>20</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>30</rank>
+            </item>
+            <item id="location_id">
+              <rank>40</rank>
+            </item>
+            <item id="brand_id">
+              <rank>50</rank>
+            </item>
+            <item id="model_id">
+              <rank>60</rank>
+            </item>
+            <item id="serialnumber">
+              <rank>70</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+      <methods/>
+    </class>
+    <class id="ApplicationSolution" _delta="define">
+      <parent>FunctionalCI</parent>
+      <properties>
+        <category>bizmodel,searchable</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>applicationsolution</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="name"/>
+          </attributes>
+        </naming>
+        <fields_semantic>
+          <state_attribute>status</state_attribute>
+        </fields_semantic>
+        <style>
+          <icon>../../images/icons/icons8-application-window.svg</icon>
+        </style>
+        <reconciliation>
+          <attributes>
+            <attribute id="name"/>
+            <attribute id="org_id"/>
+            <attribute id="organization_name"/>
+          </attributes>
+        </reconciliation>
+        <obsolescence>
+          <condition><![CDATA[status='inactive']]></condition>
+        </obsolescence>
+      </properties>
+      <fields>
+        <field id="functionalcis_list" xsi:type="AttributeLinkedSetIndirect">
+          <linked_class>lnkApplicationSolutionToFunctionalCI</linked_class>
+          <ext_key_to_me>applicationsolution_id</ext_key_to_me>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <ext_key_to_remote>functionalci_id</ext_key_to_remote>
+          <duplicates/>
+          <read_only>false</read_only>
+        </field>
+        <field id="businessprocess_list" xsi:type="AttributeLinkedSetIndirect">
+          <linked_class>lnkApplicationSolutionToBusinessProcess</linked_class>
+          <ext_key_to_me>applicationsolution_id</ext_key_to_me>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <ext_key_to_remote>businessprocess_id</ext_key_to_remote>
+          <duplicates/>
+          <read_only>false</read_only>
+        </field>
+        <field id="status" xsi:type="AttributeEnum">
+          <values>
+            <value id="active">
+              <code>active</code>
+              <style>
+                <main_color>$ibo-lifecycle-active-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-active-state-secondary-color</complementary_color>
+                <decoration_classes/>
+              </style>
+            </value>
+            <value id="inactive">
+              <code>inactive</code>
+              <style>
+                <main_color>$ibo-lifecycle-frozen-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-frozen-state-secondary-color</complementary_color>
+                <decoration_classes/>
+              </style>
+            </value>
+          </values>
+          <sql>status</sql>
+          <default_value>active</default_value>
+          <is_null_allowed>true</is_null_allowed>
+          <display_style>list</display_style>
+        </field>
+        <field id="redundancy" xsi:type="AttributeRedundancySettings">
+          <sql>redundancy</sql>
+          <relation_code>impacts</relation_code>
+          <from_class>FunctionalCI</from_class>
+          <neighbour_id>applicationsolution</neighbour_id>
+          <enabled>false</enabled>
+          <enabled_mode>user</enabled_mode>
+          <min_up>1</min_up>
+          <min_up_mode>user</min_up_mode>
+          <min_up_type>count</min_up_type>
+        </field>
+      </fields>
+      <presentation>
+        <details>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="status">
+              <rank>30</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>40</rank>
+            </item>
+            <item id="move2production">
+              <rank>50</rank>
+            </item>
+            <item id="description">
+              <rank>60</rank>
+            </item>
+            <item id="contacts_list">
+              <rank>70</rank>
+            </item>
+            <item id="documents_list">
+              <rank>80</rank>
+            </item>
+            <item id="functionalcis_list">
+              <rank>100</rank>
+            </item>
+            <item id="businessprocess_list">
+              <rank>110</rank>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>30</rank>
+            </item>
+            <item id="move2production">
+              <rank>40</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="org_id">
+              <rank>10</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>20</rank>
+            </item>
+            <item id="move2production">
+              <rank>30</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+      <methods/>
+      <relations>
+        <relation id="impacts">
+          <neighbours>
+            <neighbour id="businessprocess">
+              <attribute>businessprocess_list</attribute>
+            </neighbour>
+          </neighbours>
+        </relation>
+      </relations>
+    </class>
+    <class id="BusinessProcess" _delta="define">
+      <parent>FunctionalCI</parent>
+      <properties>
+        <category>bizmodel,searchable</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>businessprocess</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="name"/>
+          </attributes>
+        </naming>
+        <fields_semantic>
+          <state_attribute>status</state_attribute>
+        </fields_semantic>
+        <style>
+          <icon>../../images/icons/icons8-process-improvement.svg</icon>
+        </style>
+        <reconciliation>
+          <attributes>
+            <attribute id="name"/>
+            <attribute id="org_id"/>
+            <attribute id="organization_name"/>
+          </attributes>
+        </reconciliation>
+        <obsolescence>
+          <condition><![CDATA[status = 'inactive']]></condition>
+        </obsolescence>
+      </properties>
+      <fields>
+        <field id="applicationsolutions_list" xsi:type="AttributeLinkedSetIndirect">
+          <linked_class>lnkApplicationSolutionToBusinessProcess</linked_class>
+          <ext_key_to_me>businessprocess_id</ext_key_to_me>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <ext_key_to_remote>applicationsolution_id</ext_key_to_remote>
+          <duplicates/>
+          <read_only>false</read_only>
+        </field>
+        <field id="status" xsi:type="AttributeEnum">
+          <values>
+            <value id="active">
+              <code>active</code>
+              <style>
+                <main_color>$ibo-lifecycle-active-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-active-state-secondary-color</complementary_color>
+                <decoration_classes/>
+              </style>
+            </value>
+            <value id="inactive">
+              <code>inactive</code>
+              <style>
+                <main_color>$ibo-lifecycle-frozen-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-frozen-state-secondary-color</complementary_color>
+                <decoration_classes/>
+              </style>
+            </value>
+          </values>
+          <sql>status</sql>
+          <default_value>active</default_value>
+          <is_null_allowed>true</is_null_allowed>
+          <display_style>list</display_style>
+        </field>
+      </fields>
+      <presentation>
+        <details>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="status">
+              <rank>30</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>40</rank>
+            </item>
+            <item id="move2production">
+              <rank>50</rank>
+            </item>
+            <item id="description">
+              <rank>60</rank>
+            </item>
+            <item id="contacts_list">
+              <rank>70</rank>
+            </item>
+            <item id="documents_list">
+              <rank>80</rank>
+            </item>
+            <item id="applicationsolutions_list">
+              <rank>100</rank>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>30</rank>
+            </item>
+            <item id="move2production">
+              <rank>40</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="org_id">
+              <rank>10</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>20</rank>
+            </item>
+            <item id="move2production">
+              <rank>30</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+      <methods/>
+    </class>
+    <class id="SoftwareInstance" _delta="define">
+      <parent>FunctionalCI</parent>
+      <properties>
+        <category>bizmodel,searchable</category>
+        <abstract>true</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>softwareinstance</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="name"/>
+            <attribute id="system_name"/>
+          </attributes>
+        </naming>
+        <fields_semantic>
+          <state_attribute>status</state_attribute>
+        </fields_semantic>
+        <style>
+          <icon>../../images/icons/icons8-software-instance.svg</icon>
+        </style>
+        <reconciliation>
+          <attributes>
+            <attribute id="name"/>
+            <attribute id="org_id"/>
+            <attribute id="organization_name"/>
+            <attribute id="system_id"/>
+            <attribute id="system_name"/>
+            <attribute id="finalclass"/>
+          </attributes>
+        </reconciliation>
+        <obsolescence>
+          <condition><![CDATA[status = 'inactive']]></condition>
+        </obsolescence>
+      </properties>
+      <fields>
+        <field id="system_id" xsi:type="AttributeExternalKey">
+          <filter><![CDATA[SELECT FunctionalCI WHERE finalclass IN ('Server','VirtualMachine','PC')]]></filter>
+          <sql>functionalci_id</sql>
+          <target_class>FunctionalCI</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+          <allow_target_creation>false</allow_target_creation>
+        </field>
+        <field id="system_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>system_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="software_id" xsi:type="AttributeExternalKey">
+          <filter><![CDATA[SELECT Software WHERE type = :this->finalclass]]></filter>
+          <sql>software_id</sql>
+          <target_class>Software</target_class>
+          <is_null_allowed>true</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+        </field>
+        <field id="software_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>software_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="softwarelicence_id" xsi:type="AttributeExternalKey">
+          <filter><![CDATA[SELECT SoftwareLicence WHERE software_id= :this->software_id]]></filter>
+          <dependencies>
+            <attribute id="software_id"/>
+          </dependencies>
+          <sql>softwarelicence_id</sql>
+          <target_class>SoftwareLicence</target_class>
+          <is_null_allowed>true</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+          <allow_target_creation>false</allow_target_creation>
+        </field>
+        <field id="softwarelicence_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>softwarelicence_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="path" xsi:type="AttributeString">
+          <sql>path</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="status" xsi:type="AttributeEnum">
+          <values>
+            <value id="active">
+              <code>active</code>
+              <style>
+                <main_color>$ibo-lifecycle-active-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-active-state-secondary-color</complementary_color>
+                <decoration_classes/>
+              </style>
+            </value>
+            <value id="inactive">
+              <code>inactive</code>
+              <style>
+                <main_color>$ibo-lifecycle-frozen-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-frozen-state-secondary-color</complementary_color>
+                <decoration_classes/>
+              </style>
+            </value>
+          </values>
+          <sql>status</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+          <display_style>list</display_style>
+        </field>
+      </fields>
+      <presentation>
+        <details>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="status">
+              <rank>30</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>40</rank>
+            </item>
+            <item id="system_id">
+              <rank>50</rank>
+            </item>
+            <item id="software_id">
+              <rank>60</rank>
+            </item>
+            <item id="softwarelicence_id">
+              <rank>70</rank>
+            </item>
+            <item id="path">
+              <rank>80</rank>
+            </item>
+            <item id="move2production">
+              <rank>90</rank>
+            </item>
+            <item id="description">
+              <rank>100</rank>
+            </item>
+            <item id="contacts_list">
+              <rank>110</rank>
+            </item>
+            <item id="documents_list">
+              <rank>120</rank>
+            </item>
+            <item id="applicationsolution_list">
+              <rank>130</rank>
+            </item>
+          </items>
+        </details>
+        <default_search>
+          <items>
+            <item id="friendlyname">
+              <rank>10</rank>
+            </item>
+            <item id="system_id">
+              <rank>20</rank>
+            </item>
+            <item id="org_id">
+              <rank>30</rank>
+            </item>
+          </items>
+        </default_search>
+        <search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>30</rank>
+            </item>
+            <item id="move2production">
+              <rank>40</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="finalclass">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>30</rank>
+            </item>
+            <item id="system_id">
+              <rank>40</rank>
+            </item>
+            <item id="software_id">
+              <rank>50</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+      <methods/>
+    </class>
+    <class id="Middleware" _delta="define">
+      <parent>SoftwareInstance</parent>
+      <properties>
+        <category>bizmodel,searchable</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>middleware</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="name"/>
+            <attribute id="system_name"/>
+          </attributes>
+        </naming>
+        <style>
+          <icon>../../images/icons/icons8-automatic.svg</icon>
+        </style>
+        <reconciliation>
+          <attributes>
+            <attribute id="name"/>
+            <attribute id="org_id"/>
+            <attribute id="organization_name"/>
+            <attribute id="system_id"/>
+            <attribute id="system_name"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
+        <field id="middlewareinstance_list" xsi:type="AttributeLinkedSet">
+          <linked_class>MiddlewareInstance</linked_class>
+          <ext_key_to_me>middleware_id</ext_key_to_me>
+          <legacy_edit_mode>in_place</legacy_edit_mode>
+          <tracking_level>all</tracking_level>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <relation_type>property</relation_type>
+          <read_only>false</read_only>
+        </field>
+      </fields>
+      <presentation>
+        <details>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="status">
+              <rank>30</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>40</rank>
+            </item>
+            <item id="system_id">
+              <rank>50</rank>
+            </item>
+            <item id="software_id">
+              <rank>60</rank>
+            </item>
+            <item id="softwarelicence_id">
+              <rank>70</rank>
+            </item>
+            <item id="path">
+              <rank>80</rank>
+            </item>
+            <item id="move2production">
+              <rank>90</rank>
+            </item>
+            <item id="description">
+              <rank>100</rank>
+            </item>
+            <item id="contacts_list">
+              <rank>110</rank>
+            </item>
+            <item id="documents_list">
+              <rank>120</rank>
+            </item>
+            <item id="applicationsolution_list">
+              <rank>140</rank>
+            </item>
+            <item id="middlewareinstance_list">
+              <rank>150</rank>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>30</rank>
+            </item>
+            <item id="move2production">
+              <rank>40</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <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>
+          </items>
+        </list>
+      </presentation>
+      <methods/>
+      <relations>
+        <relation id="impacts">
+          <neighbours>
+            <neighbour id="middlewareinstance">
+              <attribute>middlewareinstance_list</attribute>
+            </neighbour>
+          </neighbours>
+        </relation>
+      </relations>
+    </class>
+    <class id="DBServer" _delta="define">
+      <parent>SoftwareInstance</parent>
+      <properties>
+        <category>bizmodel,searchable</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>dbserver</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="name"/>
+            <attribute id="system_name"/>
+          </attributes>
+        </naming>
+        <style>
+          <icon>../../images/icons/icons8-database.svg</icon>
+        </style>
+        <reconciliation>
+          <attributes>
+            <attribute id="name"/>
+            <attribute id="org_id"/>
+            <attribute id="organization_name"/>
+            <attribute id="system_id"/>
+            <attribute id="system_name"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
+        <field id="dbschema_list" xsi:type="AttributeLinkedSet">
+          <linked_class>DatabaseSchema</linked_class>
+          <ext_key_to_me>dbserver_id</ext_key_to_me>
+          <legacy_edit_mode>in_place</legacy_edit_mode>
+          <tracking_level>all</tracking_level>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <relation_type>property</relation_type>
+          <read_only>false</read_only>
+        </field>
+      </fields>
+      <presentation>
+        <details>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="status">
+              <rank>30</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>40</rank>
+            </item>
+            <item id="system_id">
+              <rank>50</rank>
+            </item>
+            <item id="software_id">
+              <rank>60</rank>
+            </item>
+            <item id="softwarelicence_id">
+              <rank>70</rank>
+            </item>
+            <item id="path">
+              <rank>80</rank>
+            </item>
+            <item id="move2production">
+              <rank>90</rank>
+            </item>
+            <item id="description">
+              <rank>100</rank>
+            </item>
+            <item id="contacts_list">
+              <rank>110</rank>
+            </item>
+            <item id="documents_list">
+              <rank>120</rank>
+            </item>
+            <item id="applicationsolution_list">
+              <rank>140</rank>
+            </item>
+            <item id="dbschema_list">
+              <rank>150</rank>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>30</rank>
+            </item>
+            <item id="move2production">
+              <rank>40</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <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>
+          </items>
+        </list>
+      </presentation>
+      <methods/>
+      <relations>
+        <relation id="impacts">
+          <neighbours>
+            <neighbour id="databaseschema">
+              <attribute>dbschema_list</attribute>
+            </neighbour>
+          </neighbours>
+        </relation>
+      </relations>
+    </class>
+    <class id="WebServer" _delta="define">
+      <parent>SoftwareInstance</parent>
+      <properties>
+        <category>bizmodel,searchable</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>webserver</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="name"/>
+            <attribute id="system_name"/>
+          </attributes>
+        </naming>
+        <style>
+          <icon>../../images/icons/icons8-server-custom.svg</icon>
+        </style>
+        <reconciliation>
+          <attributes>
+            <attribute id="name"/>
+            <attribute id="org_id"/>
+            <attribute id="organization_name"/>
+            <attribute id="system_id"/>
+            <attribute id="system_name"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
+        <field id="webapp_list" xsi:type="AttributeLinkedSet">
+          <linked_class>WebApplication</linked_class>
+          <ext_key_to_me>webserver_id</ext_key_to_me>
+          <legacy_edit_mode>in_place</legacy_edit_mode>
+          <tracking_level>all</tracking_level>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <relation_type>property</relation_type>
+          <read_only>false</read_only>
+        </field>
+      </fields>
+      <presentation>
+        <details>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="status">
+              <rank>30</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>40</rank>
+            </item>
+            <item id="system_id">
+              <rank>50</rank>
+            </item>
+            <item id="software_id">
+              <rank>60</rank>
+            </item>
+            <item id="softwarelicence_id">
+              <rank>70</rank>
+            </item>
+            <item id="path">
+              <rank>80</rank>
+            </item>
+            <item id="move2production">
+              <rank>90</rank>
+            </item>
+            <item id="description">
+              <rank>100</rank>
+            </item>
+            <item id="contacts_list">
+              <rank>110</rank>
+            </item>
+            <item id="documents_list">
+              <rank>120</rank>
+            </item>
+            <item id="applicationsolution_list">
+              <rank>140</rank>
+            </item>
+            <item id="webapp_list">
+              <rank>150</rank>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>30</rank>
+            </item>
+            <item id="move2production">
+              <rank>40</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <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>
+          </items>
+        </list>
+      </presentation>
+      <methods/>
+      <relations>
+        <relation id="impacts">
+          <neighbours>
+            <neighbour id="webapplication">
+              <attribute>webapp_list</attribute>
+            </neighbour>
+          </neighbours>
+        </relation>
+      </relations>
+    </class>
+    <class id="PCSoftware" _delta="define">
+      <parent>SoftwareInstance</parent>
+      <properties>
+        <category>bizmodel,searchable</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>pcsoftware</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="name"/>
+            <attribute id="system_name"/>
+          </attributes>
+        </naming>
+        <style>
+          <icon>../../images/icons/icons8-desktop.svg</icon>
+        </style>
+        <reconciliation>
+          <attributes>
+            <attribute id="name"/>
+            <attribute id="org_id"/>
+            <attribute id="organization_name"/>
+            <attribute id="system_id"/>
+            <attribute id="system_name"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields/>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="status">
+              <rank>30</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>40</rank>
+            </item>
+            <item id="system_id">
+              <rank>50</rank>
+            </item>
+            <item id="software_id">
+              <rank>60</rank>
+            </item>
+            <item id="softwarelicence_id">
+              <rank>70</rank>
+            </item>
+            <item id="path">
+              <rank>80</rank>
+            </item>
+            <item id="move2production">
+              <rank>90</rank>
+            </item>
+            <item id="description">
+              <rank>100</rank>
+            </item>
+            <item id="contacts_list">
+              <rank>110</rank>
+            </item>
+            <item id="documents_list">
+              <rank>120</rank>
+            </item>
+            <item id="applicationsolution_list">
+              <rank>140</rank>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>30</rank>
+            </item>
+            <item id="move2production">
+              <rank>40</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <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>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="OtherSoftware" _delta="define">
+      <parent>SoftwareInstance</parent>
+      <properties>
+        <category>bizmodel,searchable</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>othersoftware</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="name"/>
+            <attribute id="system_name"/>
+          </attributes>
+        </naming>
+        <style>
+          <icon>../../images/icons/icons8-software-other.svg</icon>
+        </style>
+        <reconciliation>
+          <attributes>
+            <attribute id="name"/>
+            <attribute id="org_id"/>
+            <attribute id="organization_name"/>
+            <attribute id="system_id"/>
+            <attribute id="system_name"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields/>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="status">
+              <rank>30</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>40</rank>
+            </item>
+            <item id="system_id">
+              <rank>50</rank>
+            </item>
+            <item id="software_id">
+              <rank>60</rank>
+            </item>
+            <item id="softwarelicence_id">
+              <rank>70</rank>
+            </item>
+            <item id="path">
+              <rank>80</rank>
+            </item>
+            <item id="move2production">
+              <rank>90</rank>
+            </item>
+            <item id="description">
+              <rank>100</rank>
+            </item>
+            <item id="contacts_list">
+              <rank>110</rank>
+            </item>
+            <item id="documents_list">
+              <rank>120</rank>
+            </item>
+            <item id="applicationsolution_list">
+              <rank>140</rank>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>30</rank>
+            </item>
+            <item id="move2production">
+              <rank>40</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <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>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="MiddlewareInstance" _delta="define">
+      <parent>FunctionalCI</parent>
+      <properties>
+        <category>bizmodel,searchable</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>middlewareinstance</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="name"/>
+          </attributes>
+        </naming>
+        <style>
+          <icon>../../images/icons/icons8-automatic.svg</icon>
+        </style>
+        <reconciliation>
+          <attributes>
+            <attribute id="name"/>
+            <attribute id="org_id"/>
+            <attribute id="organization_name"/>
+            <attribute id="middleware_id"/>
+            <attribute id="middleware_name"/>
+          </attributes>
+        </reconciliation>
+        <obsolescence>
+          <condition>middleware_id_obsolescence_flag</condition>
+        </obsolescence>
+      </properties>
+      <fields>
+        <field id="middleware_id" xsi:type="AttributeExternalKey">
+          <sql>middleware_id</sql>
+          <target_class>Middleware</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+        </field>
+        <field id="middleware_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>middleware_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+      </fields>
+      <presentation>
+        <details>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="middleware_id">
+              <rank>30</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>40</rank>
+            </item>
+            <item id="move2production">
+              <rank>50</rank>
+            </item>
+            <item id="description">
+              <rank>60</rank>
+            </item>
+            <item id="contacts_list">
+              <rank>70</rank>
+            </item>
+            <item id="documents_list">
+              <rank>80</rank>
+            </item>
+            <item id="applicationsolution_list">
+              <rank>100</rank>
+            </item>
+          </items>
+        </details>
+        <default_search>
+          <items>
+            <item id="friendlyname">
+              <rank>10</rank>
+            </item>
+            <item id="middleware_id">
+              <rank>20</rank>
+            </item>
+            <item id="org_id">
+              <rank>30</rank>
+            </item>
+          </items>
+        </default_search>
+        <search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>30</rank>
+            </item>
+            <item id="move2production">
+              <rank>40</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="org_id">
+              <rank>10</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>20</rank>
+            </item>
+            <item id="move2production">
+              <rank>30</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+      <methods/>
+    </class>
+    <class id="DatabaseSchema" _delta="define">
+      <parent>FunctionalCI</parent>
+      <properties>
+        <category>bizmodel,searchable</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>databaseschema</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="name"/>
+          </attributes>
+        </naming>
+        <style>
+          <icon>../../images/icons/icons8-database-custom.svg</icon>
+        </style>
+        <reconciliation>
+          <attributes>
+            <attribute id="name"/>
+            <attribute id="org_id"/>
+            <attribute id="organization_name"/>
+          </attributes>
+        </reconciliation>
+        <obsolescence>
+          <condition>dbserver_id_obsolescence_flag</condition>
+        </obsolescence>
+      </properties>
+      <fields>
+        <field id="dbserver_id" xsi:type="AttributeExternalKey">
+          <sql>dbserver_id</sql>
+          <target_class>DBServer</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+        </field>
+        <field id="dbserver_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>dbserver_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+      </fields>
+      <presentation>
+        <details>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="dbserver_id">
+              <rank>30</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>40</rank>
+            </item>
+            <item id="move2production">
+              <rank>50</rank>
+            </item>
+            <item id="description">
+              <rank>60</rank>
+            </item>
+            <item id="contacts_list">
+              <rank>70</rank>
+            </item>
+            <item id="documents_list">
+              <rank>80</rank>
+            </item>
+            <item id="applicationsolution_list">
+              <rank>100</rank>
+            </item>
+          </items>
+        </details>
+        <default_search>
+          <items>
+            <item id="friendlyname">
+              <rank>10</rank>
+            </item>
+            <item id="dbserver_id">
+              <rank>20</rank>
+            </item>
+            <item id="org_id">
+              <rank>30</rank>
+            </item>
+          </items>
+        </default_search>
+        <search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>30</rank>
+            </item>
+            <item id="move2production">
+              <rank>40</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="org_id">
+              <rank>10</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>20</rank>
+            </item>
+            <item id="move2production">
+              <rank>30</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+      <methods/>
+    </class>
+    <class id="WebApplication" _delta="define">
+      <parent>FunctionalCI</parent>
+      <properties>
+        <category>bizmodel,searchable</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>webapplication</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="name"/>
+          </attributes>
+        </naming>
+        <style>
+          <icon>../../images/icons/icons8-web.svg</icon>
+        </style>
+        <reconciliation>
+          <attributes>
+            <attribute id="name"/>
+            <attribute id="org_id"/>
+            <attribute id="organization_name"/>
+          </attributes>
+        </reconciliation>
+        <obsolescence>
+          <condition>webserver_id_obsolescence_flag</condition>
+        </obsolescence>
+      </properties>
+      <fields>
+        <field id="webserver_id" xsi:type="AttributeExternalKey">
+          <sql>webserver_id</sql>
+          <target_class>WebServer</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+        </field>
+        <field id="webserver_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>webserver_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="url" xsi:type="AttributeURL">
+          <sql>url</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+          <target>_blank</target>
+        </field>
+      </fields>
+      <presentation>
+        <details>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="webserver_id">
+              <rank>30</rank>
+            </item>
+            <item id="url">
+              <rank>40</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>50</rank>
+            </item>
+            <item id="move2production">
+              <rank>60</rank>
+            </item>
+            <item id="description">
+              <rank>70</rank>
+            </item>
+            <item id="contacts_list">
+              <rank>80</rank>
+            </item>
+            <item id="documents_list">
+              <rank>90</rank>
+            </item>
+            <item id="applicationsolution_list">
+              <rank>110</rank>
+            </item>
+          </items>
+        </details>
+        <default_search>
+          <items>
+            <item id="friendlyname">
+              <rank>10</rank>
+            </item>
+            <item id="webserver_id">
+              <rank>20</rank>
+            </item>
+            <item id="org_id">
+              <rank>30</rank>
+            </item>
+          </items>
+        </default_search>
+        <search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>30</rank>
+            </item>
+            <item id="move2production">
+              <rank>40</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="org_id">
+              <rank>10</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>20</rank>
+            </item>
+            <item id="move2production">
+              <rank>30</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+      <methods/>
+    </class>
+    <class id="Software" _delta="define">
+      <parent>cmdbAbstractObject</parent>
+      <properties>
+        <category>bizmodel,searchable</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>software</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="name"/>
+            <attribute id="version"/>
+          </attributes>
+        </naming>
+        <style>
+          <icon>../../images/icons/icons8-software.svg</icon>
+        </style>
+        <reconciliation>
+          <attributes>
+            <attribute id="name"/>
+            <attribute id="version"/>
+            <attribute id="vendor"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
+        <field id="name" xsi:type="AttributeString">
+          <sql>name</sql>
+          <default_value/>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
+        <field id="vendor" xsi:type="AttributeString">
+          <sql>vendor</sql>
+          <default_value/>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
+        <field id="version" xsi:type="AttributeString">
+          <sql>version</sql>
+          <default_value/>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
+        <field id="documents_list" xsi:type="AttributeLinkedSetIndirect">
+          <linked_class>lnkDocumentToSoftware</linked_class>
+          <ext_key_to_me>software_id</ext_key_to_me>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <ext_key_to_remote>document_id</ext_key_to_remote>
+          <duplicates/>
+          <read_only>false</read_only>
+        </field>
+        <field id="type" xsi:type="AttributeEnum">
+          <values>
+            <value id="Middleware">
+              <code>Middleware</code>
+            </value>
+            <value id="DBServer">
+              <code>DBServer</code>
+            </value>
+            <value id="PCSoftware">
+              <code>PCSoftware</code>
+            </value>
+            <value id="OtherSoftware">
+              <code>OtherSoftware</code>
+            </value>
+            <value id="WebServer">
+              <code>WebServer</code>
+            </value>
+          </values>
+          <sql>type</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+          <display_style>list</display_style>
+        </field>
+        <field id="softwareinstance_list" xsi:type="AttributeLinkedSet">
+          <linked_class>SoftwareInstance</linked_class>
+          <ext_key_to_me>software_id</ext_key_to_me>
+          <legacy_edit_mode>add_only</legacy_edit_mode>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <relation_type>link</relation_type>
+          <read_only>false</read_only>
+        </field>
+        <field id="softwarepatch_list" xsi:type="AttributeLinkedSet">
+          <linked_class>SoftwarePatch</linked_class>
+          <ext_key_to_me>software_id</ext_key_to_me>
+          <legacy_edit_mode>add_only</legacy_edit_mode>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <relation_type>link</relation_type>
+          <read_only>false</read_only>
+        </field>
+        <field id="softwarelicence_list" xsi:type="AttributeLinkedSet">
+          <linked_class>SoftwareLicence</linked_class>
+          <ext_key_to_me>software_id</ext_key_to_me>
+          <legacy_edit_mode>add_only</legacy_edit_mode>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <relation_type>link</relation_type>
+          <read_only>false</read_only>
+        </field>
+      </fields>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="vendor">
+              <rank>20</rank>
+            </item>
+            <item id="version">
+              <rank>30</rank>
+            </item>
+            <item id="documents_list">
+              <rank>40</rank>
+            </item>
+            <item id="type">
+              <rank>50</rank>
+            </item>
+            <item id="softwareinstance_list">
+              <rank>60</rank>
+            </item>
+            <item id="softwarepatch_list">
+              <rank>70</rank>
+            </item>
+            <item id="softwarelicence_list">
+              <rank>80</rank>
+            </item>
+          </items>
+        </details>
+        <default_search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="vendor">
+              <rank>20</rank>
+            </item>
+            <item id="type">
+              <rank>30</rank>
+            </item>
+          </items>
+        </default_search>
+        <search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="vendor">
+              <rank>20</rank>
+            </item>
+            <item id="version">
+              <rank>30</rank>
+            </item>
+            <item id="type">
+              <rank>40</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="vendor">
+              <rank>10</rank>
+            </item>
+            <item id="version">
+              <rank>20</rank>
+            </item>
+            <item id="type">
+              <rank>30</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="Patch" _delta="define">
+      <parent>cmdbAbstractObject</parent>
+      <properties>
+        <category>bizmodel,searchable</category>
+        <abstract>true</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>patch</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field>finalclass</db_final_class_field>
+        <naming>
+          <attributes>
+            <attribute id="name"/>
+          </attributes>
+        </naming>
+        <style>
+          <icon>../../images/icons/icons8-bandage.svg</icon>
+        </style>
+        <reconciliation>
+          <attributes>
+            <attribute id="name"/>
+            <attribute id="finalclass"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
+        <field id="name" xsi:type="AttributeString">
+          <sql>name</sql>
+          <default_value/>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
+        <field id="documents_list" xsi:type="AttributeLinkedSetIndirect">
+          <linked_class>lnkDocumentToPatch</linked_class>
+          <ext_key_to_me>patch_id</ext_key_to_me>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <ext_key_to_remote>document_id</ext_key_to_remote>
+          <duplicates/>
+          <read_only>false</read_only>
+        </field>
+        <field id="description" xsi:type="AttributeText">
+          <sql>description</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+      </fields>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="documents_list">
+              <rank>20</rank>
+            </item>
+            <item id="description">
+              <rank>30</rank>
+            </item>
+          </items>
+        </details>
+        <default_search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="description">
+              <rank>20</rank>
+            </item>
+          </items>
+        </default_search>
+        <search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="finalclass">
+              <rank>10</rank>
+            </item>
+            <item id="description">
+              <rank>20</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="OSPatch" _delta="define">
+      <parent>Patch</parent>
+      <properties>
+        <category>bizmodel,searchable</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>ospatch</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="name"/>
+          </attributes>
+        </naming>
+        <style>
+          <icon>../../images/icons/icons8-bandage.svg</icon>
+        </style>
+        <reconciliation>
+          <attributes>
+            <attribute id="name"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
+        <field id="functionalcis_list" xsi:type="AttributeLinkedSetIndirect">
+          <linked_class>lnkFunctionalCIToOSPatch</linked_class>
+          <ext_key_to_me>ospatch_id</ext_key_to_me>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <ext_key_to_remote>functionalci_id</ext_key_to_remote>
+          <duplicates/>
+          <read_only>false</read_only>
+        </field>
+        <field id="osversion_id" xsi:type="AttributeExternalKey">
+          <sql>osversion_id</sql>
+          <target_class>OSVersion</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+        </field>
+        <field id="osversion_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>osversion_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+      </fields>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="documents_list">
+              <rank>20</rank>
+            </item>
+            <item id="functionalcis_list">
+              <rank>30</rank>
+            </item>
+            <item id="description">
+              <rank>40</rank>
+            </item>
+            <item id="osversion_id">
+              <rank>50</rank>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="description">
+              <rank>20</rank>
+            </item>
+            <item id="osversion_id">
+              <rank>30</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="description">
+              <rank>10</rank>
+            </item>
+            <item id="osversion_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="SoftwarePatch" _delta="define">
+      <parent>Patch</parent>
+      <properties>
+        <category>bizmodel,searchable</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>softwarepatch</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="name"/>
+          </attributes>
+        </naming>
+        <style>
+          <icon>../../images/icons/icons8-bandage.svg</icon>
+        </style>
+        <reconciliation>
+          <attributes>
+            <attribute id="name"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
+        <field id="software_id" xsi:type="AttributeExternalKey">
+          <sql>software_id</sql>
+          <target_class>Software</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+        </field>
+        <field id="software_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>software_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="softwareinstances_list" xsi:type="AttributeLinkedSetIndirect">
+          <linked_class>lnkSoftwareInstanceToSoftwarePatch</linked_class>
+          <ext_key_to_me>softwarepatch_id</ext_key_to_me>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <ext_key_to_remote>softwareinstance_id</ext_key_to_remote>
+          <duplicates/>
+          <read_only>false</read_only>
+        </field>
+      </fields>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="documents_list">
+              <rank>20</rank>
+            </item>
+            <item id="software_id">
+              <rank>30</rank>
+            </item>
+            <item id="description">
+              <rank>40</rank>
+            </item>
+            <item id="softwareinstances_list">
+              <rank>50</rank>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="software_id">
+              <rank>20</rank>
+            </item>
+            <item id="description">
+              <rank>30</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="software_id">
+              <rank>10</rank>
+            </item>
+            <item id="description">
+              <rank>20</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="Licence" _delta="define">
+      <parent>cmdbAbstractObject</parent>
+      <properties>
+        <category>bizmodel,searchable</category>
+        <abstract>true</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>licence</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field>finalclass</db_final_class_field>
+        <naming>
+          <attributes>
+            <attribute id="name"/>
+          </attributes>
+        </naming>
+        <style>
+          <icon>../../images/icons/icons8-licence.svg</icon>
+        </style>
+        <reconciliation>
+          <attributes>
+            <attribute id="name"/>
+            <attribute id="org_id"/>
+            <attribute id="organization_name"/>
+            <attribute id="finalclass"/>
+          </attributes>
+        </reconciliation>
+        <obsolescence>
+          <condition><![CDATA[perpetual='no' AND ISNULL(end_date)=0 AND end_date < DATE_FORMAT(DATE_SUB(NOW(), INTERVAL 15 MONTH),'%Y-%m-%d 00:00:00')]]></condition>
+        </obsolescence>
+      </properties>
+      <fields>
+        <field id="name" xsi:type="AttributeString">
+          <sql>name</sql>
+          <default_value/>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
+        <field id="documents_list" xsi:type="AttributeLinkedSetIndirect">
+          <linked_class>lnkDocumentToLicence</linked_class>
+          <ext_key_to_me>licence_id</ext_key_to_me>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <ext_key_to_remote>document_id</ext_key_to_remote>
+          <duplicates/>
+          <read_only>false</read_only>
+        </field>
+        <field id="org_id" xsi:type="AttributeExternalKey">
+          <sql>org_id</sql>
+          <target_class>Organization</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+        </field>
+        <field id="organization_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>org_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="usage_limit" xsi:type="AttributeString">
+          <sql>usage_limit</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="description" xsi:type="AttributeText">
+          <sql>description</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="start_date" xsi:type="AttributeDate">
+          <sql>start_date</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="end_date" xsi:type="AttributeDate">
+          <sql>end_date</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="licence_key" xsi:type="AttributeString">
+          <sql>licence_key</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="perpetual" xsi:type="AttributeEnum">
+          <values>
+            <value id="yes">
+              <code>yes</code>
+            </value>
+            <value id="no">
+              <code>no</code>
+            </value>
+          </values>
+          <sql>perpetual</sql>
+          <default_value>no</default_value>
+          <is_null_allowed>false</is_null_allowed>
+          <display_style>list</display_style>
+        </field>
+      </fields>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="usage_limit">
+              <rank>30</rank>
+            </item>
+            <item id="description">
+              <rank>40</rank>
+            </item>
+            <item id="perpetual">
+              <rank>50</rank>
+            </item>
+            <item id="start_date">
+              <rank>60</rank>
+            </item>
+            <item id="end_date">
+              <rank>70</rank>
+            </item>
+            <item id="licence_key">
+              <rank>80</rank>
+            </item>
+            <item id="documents_list">
+              <rank>90</rank>
+            </item>
+          </items>
+        </details>
+        <default_search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="description">
+              <rank>20</rank>
+            </item>
+            <item id="licence_key">
+              <rank>30</rank>
+            </item>
+          </items>
+        </default_search>
+        <search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="perpetual">
+              <rank>15</rank>
+            </item>
+            <item id="start_date">
+              <rank>20</rank>
+            </item>
+            <item id="end_date">
+              <rank>30</rank>
+            </item>
+            <item id="licence_key">
+              <rank>40</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="finalclass">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="usage_limit">
+              <rank>30</rank>
+            </item>
+            <item id="description">
+              <rank>40</rank>
+            </item>
+            <item id="start_date">
+              <rank>50</rank>
+            </item>
+            <item id="end_date">
+              <rank>60</rank>
+            </item>
+            <item id="licence_key">
+              <rank>70</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="OSLicence" _delta="define">
+      <parent>Licence</parent>
+      <properties>
+        <category>bizmodel,searchable</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>oslicence</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="name"/>
+          </attributes>
+        </naming>
+        <style>
+          <icon>../../images/icons/icons8-licence.svg</icon>
+        </style>
+        <reconciliation>
+          <attributes>
+            <attribute id="name"/>
+            <attribute id="org_id"/>
+            <attribute id="organization_name"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
+        <field id="osversion_id" xsi:type="AttributeExternalKey">
+          <sql>osversion_id</sql>
+          <target_class>OSVersion</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+        </field>
+        <field id="osversion_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>osversion_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="virtualmachines_list" xsi:type="AttributeLinkedSet">
+          <linked_class>VirtualMachine</linked_class>
+          <ext_key_to_me>oslicence_id</ext_key_to_me>
+          <legacy_edit_mode>none</legacy_edit_mode>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <relation_type>link</relation_type>
+          <read_only>true</read_only>
+        </field>
+        <field id="servers_list" xsi:type="AttributeLinkedSet">
+          <linked_class>Server</linked_class>
+          <ext_key_to_me>oslicence_id</ext_key_to_me>
+          <legacy_edit_mode>none</legacy_edit_mode>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <relation_type>link</relation_type>
+          <read_only>true</read_only>
+        </field>
+      </fields>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="documents_list">
+              <rank>20</rank>
+            </item>
+            <item id="osversion_id">
+              <rank>30</rank>
+            </item>
+            <item id="org_id">
+              <rank>40</rank>
+            </item>
+            <item id="usage_limit">
+              <rank>50</rank>
+            </item>
+            <item id="description">
+              <rank>60</rank>
+            </item>
+            <item id="perpetual">
+              <rank>65</rank>
+            </item>
+            <item id="start_date">
+              <rank>70</rank>
+            </item>
+            <item id="end_date">
+              <rank>80</rank>
+            </item>
+            <item id="licence_key">
+              <rank>90</rank>
+            </item>
+            <item id="servers_list">
+              <rank>100</rank>
+            </item>
+            <item id="virtualmachines_list">
+              <rank>110</rank>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="perpetual">
+              <rank>15</rank>
+            </item>
+            <item id="start_date">
+              <rank>20</rank>
+            </item>
+            <item id="end_date">
+              <rank>30</rank>
+            </item>
+            <item id="licence_key">
+              <rank>40</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="osversion_id">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="usage_limit">
+              <rank>30</rank>
+            </item>
+            <item id="description">
+              <rank>40</rank>
+            </item>
+            <item id="start_date">
+              <rank>50</rank>
+            </item>
+            <item id="end_date">
+              <rank>60</rank>
+            </item>
+            <item id="licence_key">
+              <rank>70</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="SoftwareLicence" _delta="define">
+      <parent>Licence</parent>
+      <properties>
+        <category>bizmodel,searchable</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>softwarelicence</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="name"/>
+          </attributes>
+        </naming>
+        <style>
+          <icon>../../images/icons/icons8-software-license.svg</icon>
+        </style>
+        <reconciliation>
+          <attributes>
+            <attribute id="name"/>
+            <attribute id="org_id"/>
+            <attribute id="organization_name"/>
+            <attribute id="software_id"/>
+            <attribute id="software_name"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
+        <field id="software_id" xsi:type="AttributeExternalKey">
+          <sql>software_id</sql>
+          <target_class>Software</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+        </field>
+        <field id="software_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>software_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="softwareinstance_list" xsi:type="AttributeLinkedSet">
+          <linked_class>SoftwareInstance</linked_class>
+          <ext_key_to_me>softwarelicence_id</ext_key_to_me>
+          <legacy_edit_mode>none</legacy_edit_mode>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <relation_type>link</relation_type>
+          <read_only>true</read_only>
+        </field>
+      </fields>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="documents_list">
+              <rank>20</rank>
+            </item>
+            <item id="software_id">
+              <rank>30</rank>
+            </item>
+            <item id="org_id">
+              <rank>40</rank>
+            </item>
+            <item id="usage_limit">
+              <rank>50</rank>
+            </item>
+            <item id="description">
+              <rank>60</rank>
+            </item>
+            <item id="perpetual">
+              <rank>65</rank>
+            </item>
+            <item id="start_date">
+              <rank>70</rank>
+            </item>
+            <item id="end_date">
+              <rank>80</rank>
+            </item>
+            <item id="licence_key">
+              <rank>90</rank>
+            </item>
+            <item id="softwareinstance_list">
+              <rank>100</rank>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="perpetual">
+              <rank>15</rank>
+            </item>
+            <item id="start_date">
+              <rank>20</rank>
+            </item>
+            <item id="end_date">
+              <rank>30</rank>
+            </item>
+            <item id="licence_key">
+              <rank>40</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="software_id">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="usage_limit">
+              <rank>30</rank>
+            </item>
+            <item id="description">
+              <rank>40</rank>
+            </item>
+            <item id="start_date">
+              <rank>50</rank>
+            </item>
+            <item id="end_date">
+              <rank>60</rank>
+            </item>
+            <item id="licence_key">
+              <rank>70</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="lnkDocumentToLicence" _delta="define">
+      <parent>cmdbAbstractObject</parent>
+      <properties>
+        <is_link>1</is_link>
+        <category>bizmodel</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>lnkdocumenttolicence</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="licence_id"/>
+            <attribute id="document_id"/>
+          </attributes>
+        </naming>
         <style>
           <icon/>
         </style>
-				<reconciliation>
-					<attributes>
-						<attribute id="name"/>
-						<attribute id="osfamily_id"/>
-						<attribute id="osfamily_name"/>
-					</attributes>
-				</reconciliation>
-			</properties>
-			<fields>
-				<field id="osfamily_id" xsi:type="AttributeExternalKey">
-					<sql>osfamily_id</sql>
-					<target_class>OSFamily</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_MANUAL</on_target_delete>
-				</field>
-				<field id="osfamily_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>osfamily_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-			</fields>
-			<methods/>
-			<presentation>
-				<details>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="osfamily_id">
-							<rank>20</rank>
-						</item>
-					</items>
-				</details>
-				<search>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="osfamily_id">
-							<rank>20</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-		</class>
-		<class id="OSFamily" _delta="define">
-			<parent>Typology</parent>
-			<properties>
-				<category>bizmodel,searchable</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>osfamily</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="name"/>
-					</attributes>
-				</naming>
+        <reconciliation>
+          <attributes>
+            <attribute id="licence_id"/>
+            <attribute id="document_id"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
+        <field id="licence_id" xsi:type="AttributeExternalKey">
+          <sql>licence_id</sql>
+          <target_class>Licence</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+        </field>
+        <field id="licence_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>licence_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="document_id" xsi:type="AttributeExternalKey">
+          <sql>document_id</sql>
+          <target_class>Document</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+        </field>
+        <field id="document_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>document_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+      </fields>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="licence_id">
+              <rank>10</rank>
+            </item>
+            <item id="document_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="licence_id">
+              <rank>10</rank>
+            </item>
+            <item id="document_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="licence_id">
+              <rank>10</rank>
+            </item>
+            <item id="document_id">
+              <rank>20</rank>
+              <rank>20</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="OSVersion" _delta="define">
+      <parent>Typology</parent>
+      <properties>
+        <category>bizmodel,searchable</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>osversion</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="name"/>
+          </attributes>
+        </naming>
         <style>
           <icon/>
         </style>
-				<reconciliation>
-					<attributes>
-						<attribute id="name"/>
-					</attributes>
-				</reconciliation>
-			</properties>
-			<fields/>
-			<methods/>
-			<presentation>
-				<details>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-					</items>
-				</details>
-				<search>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-		</class>
-		<class id="Brand" _delta="define">
-			<parent>Typology</parent>
-			<properties>
-				<category>bizmodel,searchable</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>brand</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="name"/>
-					</attributes>
-				</naming>
+        <reconciliation>
+          <attributes>
+            <attribute id="name"/>
+            <attribute id="osfamily_id"/>
+            <attribute id="osfamily_name"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
+        <field id="osfamily_id" xsi:type="AttributeExternalKey">
+          <sql>osfamily_id</sql>
+          <target_class>OSFamily</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+        </field>
+        <field id="osfamily_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>osfamily_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+      </fields>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="osfamily_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="osfamily_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="OSFamily" _delta="define">
+      <parent>Typology</parent>
+      <properties>
+        <category>bizmodel,searchable</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>osfamily</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="name"/>
+          </attributes>
+        </naming>
         <style>
           <icon/>
         </style>
-				<reconciliation>
-					<attributes>
-						<attribute id="name"/>
-					</attributes>
-				</reconciliation>
-				<uniqueness_rules>
-					<rule id="name">
-						<attributes>
-							<attribute id="name"/>
-						</attributes>
-						<is_blocking>true</is_blocking>
-					</rule>
-				</uniqueness_rules>
-			</properties>
-			<fields>
-				<field id="physicaldevices_list" xsi:type="AttributeLinkedSet">
-					<linked_class>PhysicalDevice</linked_class>
-					<ext_key_to_me>brand_id</ext_key_to_me>
-					<edit_mode>add_only</edit_mode>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-					<duplicates/>
-				</field>
-			</fields>
-			<methods/>
-			<presentation>
-				<details>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="physicaldevices_list">
-							<rank>20</rank>
-						</item>
-					</items>
-				</details>
-				<search>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-		</class>
-		<class id="Model" _delta="define">
-			<parent>Typology</parent>
-			<properties>
-				<category>bizmodel,searchable</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>model</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="name"/>
-					</attributes>
-				</naming>
+        <reconciliation>
+          <attributes>
+            <attribute id="name"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields/>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="Brand" _delta="define">
+      <parent>Typology</parent>
+      <properties>
+        <category>bizmodel,searchable</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>brand</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="name"/>
+          </attributes>
+        </naming>
         <style>
           <icon/>
         </style>
-				<reconciliation>
-					<attributes>
-						<attribute id="name"/>
-						<attribute id="brand_id"/>
-						<attribute id="brand_name"/>
-						<attribute id="type"/>
-					</attributes>
-				</reconciliation>
-				<uniqueness_rules>
-					<rule id="name_brand">
-						<attributes>
-							<attribute id="name"/>
-							<attribute id="brand_id"/>
-						</attributes>
-						<is_blocking>true</is_blocking>
-					</rule>
-				</uniqueness_rules>
-			</properties>
-			<fields>
-				<field id="brand_id" xsi:type="AttributeExternalKey">
-					<sql>brand_id</sql>
-					<target_class>Brand</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_MANUAL</on_target_delete>
-				</field>
-				<field id="brand_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>brand_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="type" xsi:type="AttributeEnum">
-					<values>
-						<value id="NetworkDevice">
-							<code>NetworkDevice</code>
-						</value>
-						<value id="Server">
-							<code>Server</code>
-						</value>
-						<value id="SANSwitch">
-							<code>SANSwitch</code>
-						</value>
-						<value id="StorageSystem">
-							<code>StorageSystem</code>
-						</value>
-						<value id="Rack">
-							<code>Rack</code>
-						</value>
-						<value id="Enclosure">
-							<code>Enclosure</code>
-						</value>
-						<value id="PC">
-							<code>PC</code>
-						</value>
-						<value id="Tablet">
-							<code>Tablet</code>
-						</value>
-						<value id="Phone">
-							<code>Phone</code>
-						</value>
-						<value id="MobilePhone">
-							<code>MobilePhone</code>
-						</value>
-						<value id="Printer">
-							<code>Printer</code>
-						</value>
-						<value id="DiskArray">
-							<code>DiskArray</code>
-						</value>
-						<value id="NAS">
-							<code>NAS</code>
-						</value>
-						<value id="TapeLibrary">
-							<code>TapeLibrary</code>
-						</value>
-						<value id="IPPhone">
-							<code>IPPhone</code>
-						</value>
-						<value id="Peripheral">
-							<code>Peripheral</code>
-						</value>
-						<value id="PowerSource">
-							<code>PowerSource</code>
-						</value>
-						<value id="PDU">
-							<code>PDU</code>
-						</value>
-					</values>
-					<sql>type</sql>
-					<default_value/>
-					<is_null_allowed>false</is_null_allowed>
-					<display_style>list</display_style>
-				</field>
-				<field id="physicaldevices_list" xsi:type="AttributeLinkedSet">
-					<linked_class>PhysicalDevice</linked_class>
-					<ext_key_to_me>model_id</ext_key_to_me>
-					<edit_mode>add_only</edit_mode>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-					<duplicates/>
-				</field>
-			</fields>
-			<methods/>
-			<presentation>
-				<details>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="brand_id">
-							<rank>20</rank>
-						</item>
-						<item id="type">
-							<rank>30</rank>
-						</item>
-						<item id="physicaldevices_list">
-							<rank>40</rank>
-						</item>
-					</items>
-				</details>
-				<search>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="type">
-							<rank>20</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="brand_id">
-							<rank>20</rank>
-						</item>
-						<item id="type">
-							<rank>30</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-		</class>
-		<class id="NetworkDeviceType" _delta="define">
-			<parent>Typology</parent>
-			<properties>
-				<category>bizmodel,searchable</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>networkdevicetype</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="name"/>
-					</attributes>
-				</naming>
+        <reconciliation>
+          <attributes>
+            <attribute id="name"/>
+          </attributes>
+        </reconciliation>
+        <uniqueness_rules>
+          <rule id="name">
+            <attributes>
+              <attribute id="name"/>
+            </attributes>
+            <is_blocking>true</is_blocking>
+          </rule>
+        </uniqueness_rules>
+      </properties>
+      <fields>
+        <field id="physicaldevices_list" xsi:type="AttributeLinkedSet">
+          <linked_class>PhysicalDevice</linked_class>
+          <ext_key_to_me>brand_id</ext_key_to_me>
+          <legacy_edit_mode>add_only</legacy_edit_mode>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <duplicates/>
+          <relation_type>link</relation_type>
+          <read_only>false</read_only>
+        </field>
+      </fields>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="physicaldevices_list">
+              <rank>20</rank>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="Model" _delta="define">
+      <parent>Typology</parent>
+      <properties>
+        <category>bizmodel,searchable</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>model</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="name"/>
+          </attributes>
+        </naming>
         <style>
           <icon/>
         </style>
-				<reconciliation>
-					<attributes>
-						<attribute id="name"/>
-					</attributes>
-				</reconciliation>
-			</properties>
-			<fields>
-				<field id="networkdevicesdevices_list" xsi:type="AttributeLinkedSet">
-					<linked_class>NetworkDevice</linked_class>
-					<ext_key_to_me>networkdevicetype_id</ext_key_to_me>
-					<edit_mode>add_only</edit_mode>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-					<duplicates/>
-				</field>
-			</fields>
-			<methods/>
-			<presentation>
-				<details>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="networkdevicesdevices_list">
-							<rank>20</rank>
-						</item>
-					</items>
-				</details>
-				<search>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-		</class>
-		<class id="IOSVersion" _delta="define">
-			<parent>Typology</parent>
-			<properties>
-				<category>bizmodel,searchable</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>iosversion</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="brand_name"/>
-						<attribute id="name"/>
-					</attributes>
-				</naming>
+        <reconciliation>
+          <attributes>
+            <attribute id="name"/>
+            <attribute id="brand_id"/>
+            <attribute id="brand_name"/>
+            <attribute id="type"/>
+          </attributes>
+        </reconciliation>
+        <uniqueness_rules>
+          <rule id="name_brand">
+            <attributes>
+              <attribute id="name"/>
+              <attribute id="brand_id"/>
+            </attributes>
+            <is_blocking>true</is_blocking>
+          </rule>
+        </uniqueness_rules>
+      </properties>
+      <fields>
+        <field id="brand_id" xsi:type="AttributeExternalKey">
+          <sql>brand_id</sql>
+          <target_class>Brand</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+        </field>
+        <field id="brand_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>brand_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="type" xsi:type="AttributeEnum">
+          <values>
+            <value id="NetworkDevice">
+              <code>NetworkDevice</code>
+            </value>
+            <value id="Server">
+              <code>Server</code>
+            </value>
+            <value id="SANSwitch">
+              <code>SANSwitch</code>
+            </value>
+            <value id="StorageSystem">
+              <code>StorageSystem</code>
+            </value>
+            <value id="Rack">
+              <code>Rack</code>
+            </value>
+            <value id="Enclosure">
+              <code>Enclosure</code>
+            </value>
+            <value id="PC">
+              <code>PC</code>
+            </value>
+            <value id="Tablet">
+              <code>Tablet</code>
+            </value>
+            <value id="Phone">
+              <code>Phone</code>
+            </value>
+            <value id="MobilePhone">
+              <code>MobilePhone</code>
+            </value>
+            <value id="Printer">
+              <code>Printer</code>
+            </value>
+            <value id="DiskArray">
+              <code>DiskArray</code>
+            </value>
+            <value id="NAS">
+              <code>NAS</code>
+            </value>
+            <value id="TapeLibrary">
+              <code>TapeLibrary</code>
+            </value>
+            <value id="IPPhone">
+              <code>IPPhone</code>
+            </value>
+            <value id="Peripheral">
+              <code>Peripheral</code>
+            </value>
+            <value id="PowerSource">
+              <code>PowerSource</code>
+            </value>
+            <value id="PDU">
+              <code>PDU</code>
+            </value>
+          </values>
+          <sql>type</sql>
+          <default_value/>
+          <is_null_allowed>false</is_null_allowed>
+          <display_style>list</display_style>
+        </field>
+        <field id="physicaldevices_list" xsi:type="AttributeLinkedSet">
+          <linked_class>PhysicalDevice</linked_class>
+          <ext_key_to_me>model_id</ext_key_to_me>
+          <legacy_edit_mode>add_only</legacy_edit_mode>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <duplicates/>
+          <relation_type>link</relation_type>
+          <read_only>false</read_only>
+        </field>
+      </fields>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="brand_id">
+              <rank>20</rank>
+            </item>
+            <item id="type">
+              <rank>30</rank>
+            </item>
+            <item id="physicaldevices_list">
+              <rank>40</rank>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="type">
+              <rank>20</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="brand_id">
+              <rank>20</rank>
+            </item>
+            <item id="type">
+              <rank>30</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="NetworkDeviceType" _delta="define">
+      <parent>Typology</parent>
+      <properties>
+        <category>bizmodel,searchable</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>networkdevicetype</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="name"/>
+          </attributes>
+        </naming>
         <style>
           <icon/>
         </style>
-				<reconciliation>
-					<attributes>
-						<attribute id="name"/>
-						<attribute id="brand_id"/>
-						<attribute id="brand_name"/>
-					</attributes>
-				</reconciliation>
-			</properties>
-			<fields>
-				<field id="brand_id" xsi:type="AttributeExternalKey">
-					<sql>brand_id</sql>
-					<target_class>Brand</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_MANUAL</on_target_delete>
-				</field>
-				<field id="brand_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>brand_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-			</fields>
-			<methods/>
-			<presentation>
-				<details>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="brand_id">
-							<rank>20</rank>
-						</item>
-					</items>
-				</details>
-				<search>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="brand_id">
-							<rank>20</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-		</class>
-		<class id="lnkContactToFunctionalCI" _delta="define">
-			<parent>cmdbAbstractObject</parent>
-			<properties>
-				<is_link>1</is_link>
-				<category>bizmodel</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>lnkcontacttofunctionalci</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="functionalci_id"/>
-						<attribute id="contact_id"/>
-					</attributes>
-				</naming>
+        <reconciliation>
+          <attributes>
+            <attribute id="name"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
+        <field id="networkdevicesdevices_list" xsi:type="AttributeLinkedSet">
+          <linked_class>NetworkDevice</linked_class>
+          <ext_key_to_me>networkdevicetype_id</ext_key_to_me>
+          <legacy_edit_mode>add_only</legacy_edit_mode>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <duplicates/>
+          <relation_type>link</relation_type>
+          <read_only>false</read_only>
+        </field>
+      </fields>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="networkdevicesdevices_list">
+              <rank>20</rank>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="IOSVersion" _delta="define">
+      <parent>Typology</parent>
+      <properties>
+        <category>bizmodel,searchable</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>iosversion</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="brand_name"/>
+            <attribute id="name"/>
+          </attributes>
+        </naming>
         <style>
           <icon/>
         </style>
-				<reconciliation>
-					<attributes>
-						<attribute id="functionalci_id"/>
-						<attribute id="contact_id"/>
-					</attributes>
-				</reconciliation>
-			</properties>
-			<fields>
-				<field id="functionalci_id" xsi:type="AttributeExternalKey">
-					<sql>functionalci_id</sql>
-					<target_class>FunctionalCI</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_AUTO</on_target_delete>
-				</field>
-				<field id="functionalci_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>functionalci_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="contact_id" xsi:type="AttributeExternalKey">
-					<sql>contact_id</sql>
-					<target_class>Contact</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_AUTO</on_target_delete>
-				</field>
-				<field id="contact_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>contact_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-			</fields>
-			<methods/>
-			<presentation>
-				<details>
-					<items>
-						<item id="functionalci_id">
-							<rank>10</rank>
-						</item>
-						<item id="contact_id">
-							<rank>20</rank>
-						</item>
-					</items>
-				</details>
-				<search>
-					<items>
-						<item id="functionalci_id">
-							<rank>10</rank>
-						</item>
-						<item id="contact_id">
-							<rank>20</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="functionalci_id">
-							<rank>10</rank>
-						</item>
-						<item id="contact_id">
-							<rank>20</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-		</class>
-		<class id="lnkDocumentToPatch" _delta="define">
-			<parent>cmdbAbstractObject</parent>
-			<properties>
-				<is_link>1</is_link>
-				<category>bizmodel</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>lnkdocumenttopatch</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="patch_id"/>
-						<attribute id="document_id"/>
-					</attributes>
-				</naming>
+        <reconciliation>
+          <attributes>
+            <attribute id="name"/>
+            <attribute id="brand_id"/>
+            <attribute id="brand_name"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
+        <field id="brand_id" xsi:type="AttributeExternalKey">
+          <sql>brand_id</sql>
+          <target_class>Brand</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+        </field>
+        <field id="brand_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>brand_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+      </fields>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="brand_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="brand_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="lnkContactToFunctionalCI" _delta="define">
+      <parent>cmdbAbstractObject</parent>
+      <properties>
+        <is_link>1</is_link>
+        <category>bizmodel</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>lnkcontacttofunctionalci</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="functionalci_id"/>
+            <attribute id="contact_id"/>
+          </attributes>
+        </naming>
         <style>
           <icon/>
         </style>
-				<reconciliation>
-					<attributes>
-						<attribute id="patch_id"/>
-						<attribute id="document_id"/>
-					</attributes>
-				</reconciliation>
-			</properties>
-			<fields>
-				<field id="patch_id" xsi:type="AttributeExternalKey">
-					<sql>patch_id</sql>
-					<target_class>Patch</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_AUTO</on_target_delete>
-				</field>
-				<field id="patch_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>patch_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="document_id" xsi:type="AttributeExternalKey">
-					<sql>document_id</sql>
-					<target_class>Document</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_AUTO</on_target_delete>
-				</field>
-				<field id="document_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>document_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-			</fields>
-			<methods/>
-			<presentation>
-				<details>
-					<items>
-						<item id="patch_id">
-							<rank>10</rank>
-						</item>
-						<item id="document_id">
-							<rank>20</rank>
-						</item>
-					</items>
-				</details>
-				<search>
-					<items>
-						<item id="patch_id">
-							<rank>10</rank>
-						</item>
-						<item id="document_id">
-							<rank>20</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="patch_id">
-							<rank>10</rank>
-						</item>
-						<item id="document_id">
-							<rank>20</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-		</class>
-		<class id="lnkSoftwareInstanceToSoftwarePatch" _delta="define">
-			<parent>cmdbAbstractObject</parent>
-			<properties>
-				<is_link>1</is_link>
-				<category>bizmodel</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>lnksoftwareinstancetosoftwarepatch</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="softwarepatch_id"/>
-						<attribute id="softwareinstance_id"/>
-					</attributes>
-				</naming>
+        <reconciliation>
+          <attributes>
+            <attribute id="functionalci_id"/>
+            <attribute id="contact_id"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
+        <field id="functionalci_id" xsi:type="AttributeExternalKey">
+          <sql>functionalci_id</sql>
+          <target_class>FunctionalCI</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+        </field>
+        <field id="functionalci_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>functionalci_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="contact_id" xsi:type="AttributeExternalKey">
+          <sql>contact_id</sql>
+          <target_class>Contact</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+        </field>
+        <field id="contact_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>contact_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+      </fields>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="functionalci_id">
+              <rank>10</rank>
+            </item>
+            <item id="contact_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="functionalci_id">
+              <rank>10</rank>
+            </item>
+            <item id="contact_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="functionalci_id">
+              <rank>10</rank>
+            </item>
+            <item id="contact_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="lnkDocumentToPatch" _delta="define">
+      <parent>cmdbAbstractObject</parent>
+      <properties>
+        <is_link>1</is_link>
+        <category>bizmodel</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>lnkdocumenttopatch</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="patch_id"/>
+            <attribute id="document_id"/>
+          </attributes>
+        </naming>
         <style>
           <icon/>
         </style>
-				<reconciliation>
-					<attributes>
-						<attribute id="softwarepatch_id"/>
-						<attribute id="softwareinstance_id"/>
-					</attributes>
-				</reconciliation>
-			</properties>
-			<fields>
-				<field id="softwarepatch_id" xsi:type="AttributeExternalKey">
-					<sql>softwarepatch_id</sql>
-					<target_class>SoftwarePatch</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_AUTO</on_target_delete>
-				</field>
-				<field id="softwarepatch_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>softwarepatch_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="softwareinstance_id" xsi:type="AttributeExternalKey">
-					<sql>softwareinstance_id</sql>
-					<target_class>SoftwareInstance</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_AUTO</on_target_delete>
-				</field>
-				<field id="softwareinstance_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>softwareinstance_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-			</fields>
-			<methods/>
-			<presentation>
-				<details>
-					<items>
-						<item id="softwarepatch_id">
-							<rank>10</rank>
-						</item>
-						<item id="softwareinstance_id">
-							<rank>20</rank>
-						</item>
-					</items>
-				</details>
-				<search>
-					<items>
-						<item id="softwarepatch_id">
-							<rank>10</rank>
-						</item>
-						<item id="softwareinstance_id">
-							<rank>20</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="softwarepatch_id">
-							<rank>10</rank>
-						</item>
-						<item id="softwareinstance_id">
-							<rank>20</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-		</class>
-		<class id="lnkFunctionalCIToOSPatch" _delta="define">
-			<parent>cmdbAbstractObject</parent>
-			<properties>
-				<is_link>1</is_link>
-				<category>bizmodel</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>lnkfunctionalcitoospatch</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="ospatch_id"/>
-						<attribute id="functionalci_id"/>
-					</attributes>
-				</naming>
+        <reconciliation>
+          <attributes>
+            <attribute id="patch_id"/>
+            <attribute id="document_id"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
+        <field id="patch_id" xsi:type="AttributeExternalKey">
+          <sql>patch_id</sql>
+          <target_class>Patch</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+        </field>
+        <field id="patch_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>patch_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="document_id" xsi:type="AttributeExternalKey">
+          <sql>document_id</sql>
+          <target_class>Document</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+        </field>
+        <field id="document_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>document_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+      </fields>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="patch_id">
+              <rank>10</rank>
+            </item>
+            <item id="document_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="patch_id">
+              <rank>10</rank>
+            </item>
+            <item id="document_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="patch_id">
+              <rank>10</rank>
+            </item>
+            <item id="document_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="lnkSoftwareInstanceToSoftwarePatch" _delta="define">
+      <parent>cmdbAbstractObject</parent>
+      <properties>
+        <is_link>1</is_link>
+        <category>bizmodel</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>lnksoftwareinstancetosoftwarepatch</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="softwarepatch_id"/>
+            <attribute id="softwareinstance_id"/>
+          </attributes>
+        </naming>
         <style>
           <icon/>
         </style>
-				<reconciliation>
-					<attributes>
-						<attribute id="ospatch_id"/>
-						<attribute id="functionalci_id"/>
-					</attributes>
-				</reconciliation>
-			</properties>
-			<fields>
-				<field id="ospatch_id" xsi:type="AttributeExternalKey">
-					<sql>ospatch_id</sql>
-					<target_class>OSPatch</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_AUTO</on_target_delete>
-				</field>
-				<field id="ospatch_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>ospatch_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="functionalci_id" xsi:type="AttributeExternalKey">
-					<sql>functionalci_id</sql>
-					<target_class>FunctionalCI</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_AUTO</on_target_delete>
-				</field>
-				<field id="functionalci_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>functionalci_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-			</fields>
-			<methods/>
-			<presentation>
-				<details>
-					<items>
-						<item id="ospatch_id">
-							<rank>10</rank>
-						</item>
-						<item id="functionalci_id">
-							<rank>20</rank>
-						</item>
-					</items>
-				</details>
-				<search>
-					<items>
-						<item id="ospatch_id">
-							<rank>10</rank>
-						</item>
-						<item id="functionalci_id">
-							<rank>20</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="ospatch_id">
-							<rank>10</rank>
-						</item>
-						<item id="functionalci_id">
-							<rank>20</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-		</class>
-		<class id="lnkDocumentToSoftware" _delta="define">
-			<parent>cmdbAbstractObject</parent>
-			<properties>
-				<is_link>1</is_link>
-				<category>bizmodel</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>lnkdocumenttosoftware</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="software_id"/>
-						<attribute id="document_id"/>
-					</attributes>
-				</naming>
+        <reconciliation>
+          <attributes>
+            <attribute id="softwarepatch_id"/>
+            <attribute id="softwareinstance_id"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
+        <field id="softwarepatch_id" xsi:type="AttributeExternalKey">
+          <sql>softwarepatch_id</sql>
+          <target_class>SoftwarePatch</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+        </field>
+        <field id="softwarepatch_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>softwarepatch_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="softwareinstance_id" xsi:type="AttributeExternalKey">
+          <sql>softwareinstance_id</sql>
+          <target_class>SoftwareInstance</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+        </field>
+        <field id="softwareinstance_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>softwareinstance_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+      </fields>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="softwarepatch_id">
+              <rank>10</rank>
+            </item>
+            <item id="softwareinstance_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="softwarepatch_id">
+              <rank>10</rank>
+            </item>
+            <item id="softwareinstance_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="softwarepatch_id">
+              <rank>10</rank>
+            </item>
+            <item id="softwareinstance_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="lnkFunctionalCIToOSPatch" _delta="define">
+      <parent>cmdbAbstractObject</parent>
+      <properties>
+        <is_link>1</is_link>
+        <category>bizmodel</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>lnkfunctionalcitoospatch</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="ospatch_id"/>
+            <attribute id="functionalci_id"/>
+          </attributes>
+        </naming>
         <style>
           <icon/>
         </style>
-				<reconciliation>
-					<attributes>
-						<attribute id="software_id"/>
-						<attribute id="document_id"/>
-					</attributes>
-				</reconciliation>
-			</properties>
-			<fields>
-				<field id="software_id" xsi:type="AttributeExternalKey">
-					<sql>software_id</sql>
-					<target_class>Software</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_AUTO</on_target_delete>
-				</field>
-				<field id="software_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>software_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="document_id" xsi:type="AttributeExternalKey">
-					<sql>document_id</sql>
-					<target_class>Document</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_AUTO</on_target_delete>
-				</field>
-				<field id="document_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>document_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-			</fields>
-			<methods/>
-			<presentation>
-				<details>
-					<items>
-						<item id="software_id">
-							<rank>10</rank>
-						</item>
-						<item id="document_id">
-							<rank>20</rank>
-						</item>
-					</items>
-				</details>
-				<search>
-					<items>
-						<item id="software_id">
-							<rank>10</rank>
-						</item>
-						<item id="document_id">
-							<rank>20</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="software_id">
-							<rank>10</rank>
-						</item>
-						<item id="document_id">
-							<rank>20</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-		</class>
-		<class id="lnkDocumentToFunctionalCI" _delta="define">
-			<parent>cmdbAbstractObject</parent>
-			<properties>
-				<is_link>1</is_link>
-				<category>bizmodel</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>lnkdocumenttofunctionalci</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="functionalci_id"/>
-						<attribute id="document_id"/>
-					</attributes>
-				</naming>
+        <reconciliation>
+          <attributes>
+            <attribute id="ospatch_id"/>
+            <attribute id="functionalci_id"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
+        <field id="ospatch_id" xsi:type="AttributeExternalKey">
+          <sql>ospatch_id</sql>
+          <target_class>OSPatch</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+        </field>
+        <field id="ospatch_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>ospatch_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="functionalci_id" xsi:type="AttributeExternalKey">
+          <sql>functionalci_id</sql>
+          <target_class>FunctionalCI</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+        </field>
+        <field id="functionalci_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>functionalci_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+      </fields>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="ospatch_id">
+              <rank>10</rank>
+            </item>
+            <item id="functionalci_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="ospatch_id">
+              <rank>10</rank>
+            </item>
+            <item id="functionalci_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="ospatch_id">
+              <rank>10</rank>
+            </item>
+            <item id="functionalci_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="lnkDocumentToSoftware" _delta="define">
+      <parent>cmdbAbstractObject</parent>
+      <properties>
+        <is_link>1</is_link>
+        <category>bizmodel</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>lnkdocumenttosoftware</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="software_id"/>
+            <attribute id="document_id"/>
+          </attributes>
+        </naming>
         <style>
           <icon/>
         </style>
-				<reconciliation>
-					<attributes>
-						<attribute id="functionalci_id"/>
-						<attribute id="document_id"/>
-					</attributes>
-				</reconciliation>
-			</properties>
-			<fields>
-				<field id="functionalci_id" xsi:type="AttributeExternalKey">
-					<sql>functionalci_id</sql>
-					<target_class>FunctionalCI</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_AUTO</on_target_delete>
-				</field>
-				<field id="functionalci_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>functionalci_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="document_id" xsi:type="AttributeExternalKey">
-					<sql>document_id</sql>
-					<target_class>Document</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_AUTO</on_target_delete>
-				</field>
-				<field id="document_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>document_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-			</fields>
-			<methods/>
-			<presentation>
-				<details>
-					<items>
-						<item id="functionalci_id">
-							<rank>10</rank>
-						</item>
-						<item id="document_id">
-							<rank>20</rank>
-						</item>
-					</items>
-				</details>
-				<search>
-					<items>
-						<item id="functionalci_id">
-							<rank>10</rank>
-						</item>
-						<item id="document_id">
-							<rank>20</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="functionalci_id">
-							<rank>10</rank>
-						</item>
-						<item id="document_id">
-							<rank>20</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-		</class>
-		<class id="Subnet" _delta="define">
-			<parent>cmdbAbstractObject</parent>
-			<properties>
-				<category>bizmodel,searchable,configmgmt</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>subnet</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="ip"/>
-						<attribute id="ip_mask"/>
-					</attributes>
-				</naming>
-				<style>
-					<icon>../../images/icons/icons8-network.svg</icon>
-				</style>
-				<reconciliation>
-					<attributes>
-						<attribute id="ip"/>
-						<attribute id="ip_mask"/>
-						<attribute id="org_id"/>
-						<attribute id="org_name"/>
-					</attributes>
-				</reconciliation>
-			</properties>
-			<fields>
-				<field id="description" xsi:type="AttributeText">
-					<sql>description</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="subnet_name" xsi:type="AttributeString">
-					<sql>subnet_name</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="org_id" xsi:type="AttributeExternalKey">
-					<sql>org_id</sql>
-					<target_class>Organization</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_MANUAL</on_target_delete>
-				</field>
-				<field id="org_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>org_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="ip" xsi:type="AttributeIPAddress">
-					<sql>ip</sql>
-          <default_value></default_value>
-					<is_null_allowed>false</is_null_allowed>
-				</field>
-				<field id="ip_mask" xsi:type="AttributeIPAddress">
-					<sql>ip_mask</sql>
-          <default_value></default_value>
-					<is_null_allowed>false</is_null_allowed>
-				</field>
-				<field id="vlans_list" xsi:type="AttributeLinkedSetIndirect">
-					<linked_class>lnkSubnetToVLAN</linked_class>
-					<ext_key_to_me>subnet_id</ext_key_to_me>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-					<ext_key_to_remote>vlan_id</ext_key_to_remote>
-					<duplicates/>
-				</field>
-			</fields>
-			<methods>
-				<method id="DisplayBareRelations">
-					<static>false</static>
-					<access>public</access>
-					<type>Overload-cmdbAbstractObject</type>
-					<code><![CDATA[	function DisplayBareRelations(WebPage $oPage, $bEditMode = false)
+        <reconciliation>
+          <attributes>
+            <attribute id="software_id"/>
+            <attribute id="document_id"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
+        <field id="software_id" xsi:type="AttributeExternalKey">
+          <sql>software_id</sql>
+          <target_class>Software</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+        </field>
+        <field id="software_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>software_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="document_id" xsi:type="AttributeExternalKey">
+          <sql>document_id</sql>
+          <target_class>Document</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+        </field>
+        <field id="document_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>document_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+      </fields>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="software_id">
+              <rank>10</rank>
+            </item>
+            <item id="document_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="software_id">
+              <rank>10</rank>
+            </item>
+            <item id="document_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="software_id">
+              <rank>10</rank>
+            </item>
+            <item id="document_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="lnkDocumentToFunctionalCI" _delta="define">
+      <parent>cmdbAbstractObject</parent>
+      <properties>
+        <is_link>1</is_link>
+        <category>bizmodel</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>lnkdocumenttofunctionalci</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="functionalci_id"/>
+            <attribute id="document_id"/>
+          </attributes>
+        </naming>
+        <style>
+          <icon/>
+        </style>
+        <reconciliation>
+          <attributes>
+            <attribute id="functionalci_id"/>
+            <attribute id="document_id"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
+        <field id="functionalci_id" xsi:type="AttributeExternalKey">
+          <sql>functionalci_id</sql>
+          <target_class>FunctionalCI</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+        </field>
+        <field id="functionalci_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>functionalci_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="document_id" xsi:type="AttributeExternalKey">
+          <sql>document_id</sql>
+          <target_class>Document</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+        </field>
+        <field id="document_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>document_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+      </fields>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="functionalci_id">
+              <rank>10</rank>
+            </item>
+            <item id="document_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="functionalci_id">
+              <rank>10</rank>
+            </item>
+            <item id="document_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="functionalci_id">
+              <rank>10</rank>
+            </item>
+            <item id="document_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="Subnet" _delta="define">
+      <parent>cmdbAbstractObject</parent>
+      <properties>
+        <category>bizmodel,searchable,configmgmt</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>subnet</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="ip"/>
+            <attribute id="ip_mask"/>
+          </attributes>
+        </naming>
+        <style>
+          <icon>../../images/icons/icons8-network.svg</icon>
+        </style>
+        <reconciliation>
+          <attributes>
+            <attribute id="ip"/>
+            <attribute id="ip_mask"/>
+            <attribute id="org_id"/>
+            <attribute id="org_name"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
+        <field id="description" xsi:type="AttributeText">
+          <sql>description</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="subnet_name" xsi:type="AttributeString">
+          <sql>subnet_name</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="org_id" xsi:type="AttributeExternalKey">
+          <sql>org_id</sql>
+          <target_class>Organization</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+        </field>
+        <field id="org_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>org_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="ip" xsi:type="AttributeIPAddress">
+          <sql>ip</sql>
+          <default_value/>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
+        <field id="ip_mask" xsi:type="AttributeIPAddress">
+          <sql>ip_mask</sql>
+          <default_value/>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
+        <field id="vlans_list" xsi:type="AttributeLinkedSetIndirect">
+          <linked_class>lnkSubnetToVLAN</linked_class>
+          <ext_key_to_me>subnet_id</ext_key_to_me>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <ext_key_to_remote>vlan_id</ext_key_to_remote>
+          <duplicates/>
+          <read_only>false</read_only>
+        </field>
+      </fields>
+      <methods>
+        <method id="DisplayBareRelations">
+          <static>false</static>
+          <access>public</access>
+          <type>Overload-cmdbAbstractObject</type>
+          <code><![CDATA[	function DisplayBareRelations(WebPage $oPage, $bEditMode = false)
 	{
 		parent::DisplayBareRelations($oPage, $bEditMode);
 
@@ -5043,787 +5087,790 @@
         }
 			}
 	}]]></code>
-				</method>
+        </method>
+      </methods>
+      <presentation>
+        <details>
+          <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>
+            <item id="vlans_list">
+              <rank>50</rank>
+            </item>
+          </items>
+        </details>
+        <default_search>
+          <items>
+            <item id="ip">
+              <rank>10</rank>
+            </item>
+            <item id="subnet_name">
+              <rank>20</rank>
+            </item>
+            <item id="org_id">
+              <rank>30</rank>
+            </item>
+          </items>
+        </default_search>
+        <search>
+          <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>
+        </search>
+        <list>
+          <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>
+        </list>
+      </presentation>
+    </class>
+    <class id="VLAN" _delta="define">
+      <parent>cmdbAbstractObject</parent>
+      <properties>
+        <category>bizmodel,searchable,configmgmt</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>vlan</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="vlan_tag"/>
+          </attributes>
+        </naming>
+        <style>
+          <icon>../../images/icons/icons8-hierarchy.svg</icon>
+        </style>
+        <reconciliation>
+          <attributes>
+            <attribute id="vlan_tag"/>
+            <attribute id="org_id"/>
+            <attribute id="org_name"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
+        <field id="vlan_tag" xsi:type="AttributeString">
+          <sql>vlan_tag</sql>
+          <default_value/>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
+        <field id="description" xsi:type="AttributeText">
+          <sql>description</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="org_id" xsi:type="AttributeExternalKey">
+          <sql>org_id</sql>
+          <target_class>Organization</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+        </field>
+        <field id="org_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>org_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="subnets_list" xsi:type="AttributeLinkedSetIndirect">
+          <linked_class>lnkSubnetToVLAN</linked_class>
+          <ext_key_to_me>vlan_id</ext_key_to_me>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <ext_key_to_remote>subnet_id</ext_key_to_remote>
+          <duplicates/>
+          <read_only>false</read_only>
+        </field>
+        <field id="physicalinterfaces_list" xsi:type="AttributeLinkedSetIndirect">
+          <linked_class>lnkPhysicalInterfaceToVLAN</linked_class>
+          <ext_key_to_me>vlan_id</ext_key_to_me>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <ext_key_to_remote>physicalinterface_id</ext_key_to_remote>
+          <duplicates/>
+          <read_only>false</read_only>
+        </field>
+      </fields>
+      <methods>
 			</methods>
-			<presentation>
-				<details>
-					<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>
-						<item id="vlans_list">
-							<rank>50</rank>
-						</item>
-					</items>
-				</details>
-				<default_search>
-					<items>
-						<item id="ip">
-							<rank>10</rank>
-						</item>
-						<item id="subnet_name">
-							<rank>20</rank>
-						</item>
-						<item id="org_id">
-							<rank>30</rank>
-						</item>
-					</items>
-				</default_search>
-				<search>
-					<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>
-				</search>
-				<list>
-					<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>
-				</list>
-			</presentation>
-		</class>
-		<class id="VLAN" _delta="define">
-			<parent>cmdbAbstractObject</parent>
-			<properties>
-				<category>bizmodel,searchable,configmgmt</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>vlan</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="vlan_tag"/>
-					</attributes>
-				</naming>
-				<style>
-					<icon>../../images/icons/icons8-hierarchy.svg</icon>
-				</style>
-				<reconciliation>
-					<attributes>
-						<attribute id="vlan_tag"/>
-						<attribute id="org_id"/>
-						<attribute id="org_name"/>
-					</attributes>
-				</reconciliation>
-			</properties>
-			<fields>
-				<field id="vlan_tag" xsi:type="AttributeString">
-					<sql>vlan_tag</sql>
-					<default_value/>
-					<is_null_allowed>false</is_null_allowed>
-				</field>
-				<field id="description" xsi:type="AttributeText">
-					<sql>description</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="org_id" xsi:type="AttributeExternalKey">
-					<sql>org_id</sql>
-					<target_class>Organization</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_MANUAL</on_target_delete>
-				</field>
-				<field id="org_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>org_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="subnets_list" xsi:type="AttributeLinkedSetIndirect">
-					<linked_class>lnkSubnetToVLAN</linked_class>
-					<ext_key_to_me>vlan_id</ext_key_to_me>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-					<ext_key_to_remote>subnet_id</ext_key_to_remote>
-					<duplicates/>
-				</field>
-				<field id="physicalinterfaces_list" xsi:type="AttributeLinkedSetIndirect">
-					<linked_class>lnkPhysicalInterfaceToVLAN</linked_class>
-					<ext_key_to_me>vlan_id</ext_key_to_me>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-					<ext_key_to_remote>physicalinterface_id</ext_key_to_remote>
-					<duplicates/>
-				</field>
-			</fields>
-			<methods>
-			</methods>
-			<presentation>
-				<details>
-					<items>
-						<item id="vlan_tag">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="description">
-							<rank>30</rank>
-						</item>
-						<item id="subnets_list">
-							<rank>40</rank>
-						</item>
-						<item id="physicalinterfaces_list">
-							<rank>50</rank>
-						</item>
-					</items>
-				</details>
-				<default_search>
-					<items>
-						<item id="vlan_tag">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>30</rank>
-						</item>
-					</items>
-				</default_search>
-				<search>
-					<items>
-						<item id="vlan_tag">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="description">
-							<rank>30</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="org_id">
-							<rank>10</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-		</class>
-		<class id="lnkSubnetToVLAN" _delta="define">
-			<parent>cmdbAbstractObject</parent>
-			<properties>
-				<is_link>1</is_link>
-				<category>bizmodel</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>lnksubnettovlan</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="subnet_id"/>
-						<attribute id="vlan_id"/>
-					</attributes>
-				</naming>
+      <presentation>
+        <details>
+          <items>
+            <item id="vlan_tag">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="description">
+              <rank>30</rank>
+            </item>
+            <item id="subnets_list">
+              <rank>40</rank>
+            </item>
+            <item id="physicalinterfaces_list">
+              <rank>50</rank>
+            </item>
+          </items>
+        </details>
+        <default_search>
+          <items>
+            <item id="vlan_tag">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>30</rank>
+            </item>
+          </items>
+        </default_search>
+        <search>
+          <items>
+            <item id="vlan_tag">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="description">
+              <rank>30</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="org_id">
+              <rank>10</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="lnkSubnetToVLAN" _delta="define">
+      <parent>cmdbAbstractObject</parent>
+      <properties>
+        <is_link>1</is_link>
+        <category>bizmodel</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>lnksubnettovlan</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="subnet_id"/>
+            <attribute id="vlan_id"/>
+          </attributes>
+        </naming>
         <style>
           <icon/>
         </style>
-				<reconciliation>
-					<attributes>
-						<attribute id="subnet_id"/>
-						<attribute id="vlan_id"/>
-					</attributes>
-				</reconciliation>
-			</properties>
-			<fields>
-				<field id="subnet_id" xsi:type="AttributeExternalKey">
-					<sql>subnet_id</sql>
-					<target_class>Subnet</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_AUTO</on_target_delete>
-				</field>
-				<field id="subnet_ip" xsi:type="AttributeExternalField">
-					<extkey_attcode>subnet_id</extkey_attcode>
-					<target_attcode>ip</target_attcode>
-				</field>
-				<field id="subnet_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>subnet_id</extkey_attcode>
-					<target_attcode>subnet_name</target_attcode>
-				</field>
-				<field id="vlan_id" xsi:type="AttributeExternalKey">
-					<sql>vlan_id</sql>
-					<target_class>VLAN</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_AUTO</on_target_delete>
-				</field>
-				<field id="vlan_tag" xsi:type="AttributeExternalField">
-					<extkey_attcode>vlan_id</extkey_attcode>
-					<target_attcode>vlan_tag</target_attcode>
-				</field>
-			</fields>
-			<methods/>
-			<presentation>
-				<details>
-					<items>
-						<item id="subnet_id">
-							<rank>10</rank>
-						</item>
-						<item id="vlan_id">
-							<rank>20</rank>
-						</item>
-					</items>
-				</details>
-				<search>
-					<items>
-						<item id="subnet_id">
-							<rank>10</rank>
-						</item>
-						<item id="vlan_id">
-							<rank>20</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="subnet_id">
-							<rank>10</rank>
-						</item>
-						<item id="subnet_name">
-							<rank>20</rank>
-						</item>
-						<item id="vlan_id">
-							<rank>30</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-		</class>
-		<class id="NetworkInterface" _delta="define">
-			<parent>cmdbAbstractObject</parent>
-			<properties>
-				<category>bizmodel,searchable</category>
-				<abstract>true</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>networkinterface</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field>finalclass</db_final_class_field>
-				<naming>
-					<attributes>
-						<attribute id="name"/>
-					</attributes>
-				</naming>
-				<style>
-					<icon>../../images/icons/icons8-globe-cable.svg</icon>
-				</style>
-				<reconciliation>
-					<attributes>
-						<attribute id="name"/>
-						<attribute id="finalclass"/>
-					</attributes>
-				</reconciliation>
-			</properties>
-			<fields>
-				<field id="name" xsi:type="AttributeString">
-					<sql>name</sql>
-					<default_value/>
-					<is_null_allowed>false</is_null_allowed>
-				</field>
-			</fields>
-			<methods/>
-			<presentation>
-				<details>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-					</items>
-				</details>
-				<default_search>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-					</items>
-				</default_search>
-				<search>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-		</class>
-		<class id="IPInterface" _delta="define">
-			<parent>NetworkInterface</parent>
-			<properties>
-				<category>bizmodel,searchable</category>
-				<abstract>true</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>ipinterface</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="name"/>
-					</attributes>
-				</naming>
-				<style>
-					<icon>../../images/icons/icons8-globe-cable.svg</icon>
-				</style>
-				<reconciliation>
-					<attributes>
-						<attribute id="name"/>
-						<attribute id="finalclass"/>
-					</attributes>
-				</reconciliation>
-			</properties>
-			<fields>
-				<field id="ipaddress" xsi:type="AttributeIPAddress">
-					<sql>ipaddress</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="macaddress" xsi:type="AttributeString">
-					<sql>macaddress</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="comment" xsi:type="AttributeText">
-					<sql>comment</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="ipgateway" xsi:type="AttributeIPAddress">
-					<sql>ipgateway</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="ipmask" xsi:type="AttributeIPAddress">
-					<sql>ipmask</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="speed" xsi:type="AttributeDecimal">
-					<sql>speed</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-					<digits>12</digits>
-					<decimals>2</decimals>
-				</field>
-			</fields>
-			<methods/>
-			<presentation>
-				<details>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="ipaddress">
-							<rank>20</rank>
-						</item>
-						<item id="macaddress">
-							<rank>30</rank>
-						</item>
-						<item id="comment">
-							<rank>40</rank>
-						</item>
-						<item id="ipgateway">
-							<rank>50</rank>
-						</item>
-						<item id="ipmask">
-							<rank>60</rank>
-						</item>
-						<item id="speed">
-							<rank>70</rank>
-						</item>
-					</items>
-				</details>
-				<default_search>
-					<items>
-						<item id="friendlyname">
-							<rank>10</rank>
-						</item>
-						<item id="ipaddress">
-							<rank>20</rank>
-						</item>
-						<item id="macaddress">
-							<rank>30</rank>
-						</item>
-					</items>
-				</default_search>
-				<search>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="ipaddress">
-							<rank>20</rank>
-						</item>
-						<item id="macaddress">
-							<rank>30</rank>
-						</item>
-						<item id="ipgateway">
-							<rank>40</rank>
-						</item>
-						<item id="ipmask">
-							<rank>50</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="ipaddress">
-							<rank>20</rank>
-						</item>
-						<item id="macaddress">
-							<rank>30</rank>
-						</item>
-						<item id="comment">
-							<rank>40</rank>
-						</item>
-						<item id="ipgateway">
-							<rank>50</rank>
-						</item>
-						<item id="ipmask">
-							<rank>60</rank>
-						</item>
-						<item id="speed">
-							<rank>70</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-		</class>
-		<class id="PhysicalInterface" _delta="define">
-			<parent>IPInterface</parent>
-			<properties>
-				<category>bizmodel,searchable</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>physicalinterface</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="name"/>
-						<attribute id="connectableci_name"/>
-					</attributes>
-				</naming>
-				<style>
-					<icon>../../images/icons/icons8-globe-wire.svg</icon>
-				</style>
-				<reconciliation>
-					<attributes>
-						<attribute id="name"/>
-						<attribute id="connectableci_id"/>
-						<attribute id="connectableci_name"/>
-					</attributes>
-				</reconciliation>
-				<obsolescence>
-					<condition>connectableci_id_obsolescence_flag</condition>
-				</obsolescence>
-			</properties>
-			<fields>
-				<field id="connectableci_id" xsi:type="AttributeExternalKey">
-					<sql>connectableci_id</sql>
-					<target_class>ConnectableCI</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_AUTO</on_target_delete>
-				</field>
-				<field id="connectableci_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>connectableci_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="vlans_list" xsi:type="AttributeLinkedSetIndirect">
-					<linked_class>lnkPhysicalInterfaceToVLAN</linked_class>
-					<ext_key_to_me>physicalinterface_id</ext_key_to_me>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-					<ext_key_to_remote>vlan_id</ext_key_to_remote>
-					<duplicates/>
-				</field>
-			</fields>
-			<methods/>
-			<presentation>
-				<details>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="connectableci_id">
-							<rank>20</rank>
-						</item>
-						<item id="ipaddress">
-							<rank>30</rank>
-						</item>
-						<item id="macaddress">
-							<rank>40</rank>
-						</item>
-						<item id="comment">
-							<rank>50</rank>
-						</item>
-						<item id="ipgateway">
-							<rank>60</rank>
-						</item>
-						<item id="ipmask">
-							<rank>70</rank>
-						</item>
-						<item id="speed">
-							<rank>80</rank>
-						</item>
-						<item id="vlans_list">
-							<rank>90</rank>
-						</item>
-					</items>
-				</details>
-				<search>
-					<items>
-						<item id="ipaddress">
-							<rank>10</rank>
-						</item>
-						<item id="macaddress">
-							<rank>20</rank>
-						</item>
-						<item id="ipgateway">
-							<rank>30</rank>
-						</item>
-						<item id="ipmask">
-							<rank>40</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="ipaddress">
-							<rank>10</rank>
-						</item>
-						<item id="macaddress">
-							<rank>20</rank>
-						</item>
-						<item id="comment">
-							<rank>30</rank>
-						</item>
-						<item id="ipgateway">
-							<rank>40</rank>
-						</item>
-						<item id="ipmask">
-							<rank>50</rank>
-						</item>
-						<item id="speed">
-							<rank>60</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-		</class>
-		<class id="lnkPhysicalInterfaceToVLAN" _delta="define">
-			<parent>cmdbAbstractObject</parent>
-			<properties>
-				<is_link>1</is_link>
-				<category>bizmodel</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>lnkphysicalinterfacetovlan</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="physicalinterface_id"/>
-						<attribute id="vlan_id"/>
-					</attributes>
-				</naming>
+        <reconciliation>
+          <attributes>
+            <attribute id="subnet_id"/>
+            <attribute id="vlan_id"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
+        <field id="subnet_id" xsi:type="AttributeExternalKey">
+          <sql>subnet_id</sql>
+          <target_class>Subnet</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+        </field>
+        <field id="subnet_ip" xsi:type="AttributeExternalField">
+          <extkey_attcode>subnet_id</extkey_attcode>
+          <target_attcode>ip</target_attcode>
+        </field>
+        <field id="subnet_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>subnet_id</extkey_attcode>
+          <target_attcode>subnet_name</target_attcode>
+        </field>
+        <field id="vlan_id" xsi:type="AttributeExternalKey">
+          <sql>vlan_id</sql>
+          <target_class>VLAN</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+        </field>
+        <field id="vlan_tag" xsi:type="AttributeExternalField">
+          <extkey_attcode>vlan_id</extkey_attcode>
+          <target_attcode>vlan_tag</target_attcode>
+        </field>
+      </fields>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="subnet_id">
+              <rank>10</rank>
+            </item>
+            <item id="vlan_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="subnet_id">
+              <rank>10</rank>
+            </item>
+            <item id="vlan_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="subnet_id">
+              <rank>10</rank>
+            </item>
+            <item id="subnet_name">
+              <rank>20</rank>
+            </item>
+            <item id="vlan_id">
+              <rank>30</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="NetworkInterface" _delta="define">
+      <parent>cmdbAbstractObject</parent>
+      <properties>
+        <category>bizmodel,searchable</category>
+        <abstract>true</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>networkinterface</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field>finalclass</db_final_class_field>
+        <naming>
+          <attributes>
+            <attribute id="name"/>
+          </attributes>
+        </naming>
+        <style>
+          <icon>../../images/icons/icons8-globe-cable.svg</icon>
+        </style>
+        <reconciliation>
+          <attributes>
+            <attribute id="name"/>
+            <attribute id="finalclass"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
+        <field id="name" xsi:type="AttributeString">
+          <sql>name</sql>
+          <default_value/>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
+      </fields>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+          </items>
+        </details>
+        <default_search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+          </items>
+        </default_search>
+        <search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="IPInterface" _delta="define">
+      <parent>NetworkInterface</parent>
+      <properties>
+        <category>bizmodel,searchable</category>
+        <abstract>true</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>ipinterface</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="name"/>
+          </attributes>
+        </naming>
+        <style>
+          <icon>../../images/icons/icons8-globe-cable.svg</icon>
+        </style>
+        <reconciliation>
+          <attributes>
+            <attribute id="name"/>
+            <attribute id="finalclass"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
+        <field id="ipaddress" xsi:type="AttributeIPAddress">
+          <sql>ipaddress</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="macaddress" xsi:type="AttributeString">
+          <sql>macaddress</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="comment" xsi:type="AttributeText">
+          <sql>comment</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="ipgateway" xsi:type="AttributeIPAddress">
+          <sql>ipgateway</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="ipmask" xsi:type="AttributeIPAddress">
+          <sql>ipmask</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="speed" xsi:type="AttributeDecimal">
+          <sql>speed</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+          <digits>12</digits>
+          <decimals>2</decimals>
+        </field>
+      </fields>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="ipaddress">
+              <rank>20</rank>
+            </item>
+            <item id="macaddress">
+              <rank>30</rank>
+            </item>
+            <item id="comment">
+              <rank>40</rank>
+            </item>
+            <item id="ipgateway">
+              <rank>50</rank>
+            </item>
+            <item id="ipmask">
+              <rank>60</rank>
+            </item>
+            <item id="speed">
+              <rank>70</rank>
+            </item>
+          </items>
+        </details>
+        <default_search>
+          <items>
+            <item id="friendlyname">
+              <rank>10</rank>
+            </item>
+            <item id="ipaddress">
+              <rank>20</rank>
+            </item>
+            <item id="macaddress">
+              <rank>30</rank>
+            </item>
+          </items>
+        </default_search>
+        <search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="ipaddress">
+              <rank>20</rank>
+            </item>
+            <item id="macaddress">
+              <rank>30</rank>
+            </item>
+            <item id="ipgateway">
+              <rank>40</rank>
+            </item>
+            <item id="ipmask">
+              <rank>50</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="ipaddress">
+              <rank>20</rank>
+            </item>
+            <item id="macaddress">
+              <rank>30</rank>
+            </item>
+            <item id="comment">
+              <rank>40</rank>
+            </item>
+            <item id="ipgateway">
+              <rank>50</rank>
+            </item>
+            <item id="ipmask">
+              <rank>60</rank>
+            </item>
+            <item id="speed">
+              <rank>70</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="PhysicalInterface" _delta="define">
+      <parent>IPInterface</parent>
+      <properties>
+        <category>bizmodel,searchable</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>physicalinterface</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="name"/>
+            <attribute id="connectableci_name"/>
+          </attributes>
+        </naming>
+        <style>
+          <icon>../../images/icons/icons8-globe-wire.svg</icon>
+        </style>
+        <reconciliation>
+          <attributes>
+            <attribute id="name"/>
+            <attribute id="connectableci_id"/>
+            <attribute id="connectableci_name"/>
+          </attributes>
+        </reconciliation>
+        <obsolescence>
+          <condition>connectableci_id_obsolescence_flag</condition>
+        </obsolescence>
+      </properties>
+      <fields>
+        <field id="connectableci_id" xsi:type="AttributeExternalKey">
+          <sql>connectableci_id</sql>
+          <target_class>ConnectableCI</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+        </field>
+        <field id="connectableci_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>connectableci_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="vlans_list" xsi:type="AttributeLinkedSetIndirect">
+          <linked_class>lnkPhysicalInterfaceToVLAN</linked_class>
+          <ext_key_to_me>physicalinterface_id</ext_key_to_me>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <ext_key_to_remote>vlan_id</ext_key_to_remote>
+          <duplicates/>
+          <read_only>false</read_only>
+        </field>
+      </fields>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="connectableci_id">
+              <rank>20</rank>
+            </item>
+            <item id="ipaddress">
+              <rank>30</rank>
+            </item>
+            <item id="macaddress">
+              <rank>40</rank>
+            </item>
+            <item id="comment">
+              <rank>50</rank>
+            </item>
+            <item id="ipgateway">
+              <rank>60</rank>
+            </item>
+            <item id="ipmask">
+              <rank>70</rank>
+            </item>
+            <item id="speed">
+              <rank>80</rank>
+            </item>
+            <item id="vlans_list">
+              <rank>90</rank>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="ipaddress">
+              <rank>10</rank>
+            </item>
+            <item id="macaddress">
+              <rank>20</rank>
+            </item>
+            <item id="ipgateway">
+              <rank>30</rank>
+            </item>
+            <item id="ipmask">
+              <rank>40</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="ipaddress">
+              <rank>10</rank>
+            </item>
+            <item id="macaddress">
+              <rank>20</rank>
+            </item>
+            <item id="comment">
+              <rank>30</rank>
+            </item>
+            <item id="ipgateway">
+              <rank>40</rank>
+            </item>
+            <item id="ipmask">
+              <rank>50</rank>
+            </item>
+            <item id="speed">
+              <rank>60</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="lnkPhysicalInterfaceToVLAN" _delta="define">
+      <parent>cmdbAbstractObject</parent>
+      <properties>
+        <is_link>1</is_link>
+        <category>bizmodel</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>lnkphysicalinterfacetovlan</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="physicalinterface_id"/>
+            <attribute id="vlan_id"/>
+          </attributes>
+        </naming>
         <style>
           <icon/>
         </style>
-				<reconciliation>
-					<attributes>
-						<attribute id="physicalinterface_id"/>
-						<attribute id="vlan_id"/>
-					</attributes>
-				</reconciliation>
-			</properties>
-			<fields>
-				<field id="physicalinterface_id" xsi:type="AttributeExternalKey">
-					<sql>physicalinterface_id</sql>
-					<target_class>PhysicalInterface</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_AUTO</on_target_delete>
-				</field>
-				<field id="physicalinterface_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>physicalinterface_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="physicalinterface_device_id" xsi:type="AttributeExternalField">
-					<extkey_attcode>physicalinterface_id</extkey_attcode>
-					<target_attcode>connectableci_id</target_attcode>
-				</field>
-				<field id="physicalinterface_device_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>physicalinterface_id</extkey_attcode>
-					<target_attcode>connectableci_name</target_attcode>
-				</field>
-				<field id="vlan_id" xsi:type="AttributeExternalKey">
-					<sql>vlan_id</sql>
-					<target_class>VLAN</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_AUTO</on_target_delete>
-				</field>
-				<field id="vlan_tag" xsi:type="AttributeExternalField">
-					<extkey_attcode>vlan_id</extkey_attcode>
-					<target_attcode>vlan_tag</target_attcode>
-				</field>
-			</fields>
-			<methods/>
-			<presentation>
-				<details>
-					<items>
-						<item id="physicalinterface_id">
-							<rank>10</rank>
-						</item>
-						<item id="vlan_id">
-							<rank>20</rank>
-						</item>
-					</items>
-				</details>
-				<search>
-					<items>
-						<item id="physicalinterface_id">
-							<rank>10</rank>
-						</item>
-						<item id="vlan_id">
-							<rank>20</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="physicalinterface_id">
-							<rank>10</rank>
-						</item>
-						<item id="vlan_id">
-							<rank>20</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-		</class>
-		<class id="lnkConnectableCIToNetworkDevice" _delta="define">
-			<parent>cmdbAbstractObject</parent>
-			<properties>
-				<is_link>1</is_link>
-				<category>bizmodel</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>lnkconnectablecitonetworkdevice</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="networkdevice_id"/>
-						<attribute id="connectableci_id"/>
-					</attributes>
-				</naming>
+        <reconciliation>
+          <attributes>
+            <attribute id="physicalinterface_id"/>
+            <attribute id="vlan_id"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
+        <field id="physicalinterface_id" xsi:type="AttributeExternalKey">
+          <sql>physicalinterface_id</sql>
+          <target_class>PhysicalInterface</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+        </field>
+        <field id="physicalinterface_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>physicalinterface_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="physicalinterface_device_id" xsi:type="AttributeExternalField">
+          <extkey_attcode>physicalinterface_id</extkey_attcode>
+          <target_attcode>connectableci_id</target_attcode>
+        </field>
+        <field id="physicalinterface_device_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>physicalinterface_id</extkey_attcode>
+          <target_attcode>connectableci_name</target_attcode>
+        </field>
+        <field id="vlan_id" xsi:type="AttributeExternalKey">
+          <sql>vlan_id</sql>
+          <target_class>VLAN</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+        </field>
+        <field id="vlan_tag" xsi:type="AttributeExternalField">
+          <extkey_attcode>vlan_id</extkey_attcode>
+          <target_attcode>vlan_tag</target_attcode>
+        </field>
+      </fields>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="physicalinterface_id">
+              <rank>10</rank>
+            </item>
+            <item id="vlan_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="physicalinterface_id">
+              <rank>10</rank>
+            </item>
+            <item id="vlan_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="physicalinterface_id">
+              <rank>10</rank>
+            </item>
+            <item id="vlan_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="lnkConnectableCIToNetworkDevice" _delta="define">
+      <parent>cmdbAbstractObject</parent>
+      <properties>
+        <is_link>1</is_link>
+        <category>bizmodel</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>lnkconnectablecitonetworkdevice</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="networkdevice_id"/>
+            <attribute id="connectableci_id"/>
+          </attributes>
+        </naming>
         <style>
           <icon/>
         </style>
-				<reconciliation>
-					<attributes>
-						<attribute id="networkdevice_id"/>
-						<attribute id="connectableci_id"/>
-					</attributes>
-				</reconciliation>
-			</properties>
-			<fields>
-				<field id="networkdevice_id" xsi:type="AttributeExternalKey">
-					<sql>networkdevice_id</sql>
-					<target_class>NetworkDevice</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_AUTO</on_target_delete>
-				</field>
-				<field id="networkdevice_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>networkdevice_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="connectableci_id" xsi:type="AttributeExternalKey">
-					<sql>connectableci_id</sql>
-					<target_class>ConnectableCI</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_AUTO</on_target_delete>
-				</field>
-				<field id="connectableci_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>connectableci_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="network_port" xsi:type="AttributeString">
-					<sql>network_port</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="device_port" xsi:type="AttributeString">
-					<sql>device_port</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="connection_type" xsi:type="AttributeEnum">
-					<values>
-						<value id="uplink">
-							<code>uplink</code>
-						</value>
-						<value id="downlink">
-							<code>downlink</code>
-						</value>
-					</values>
-					<sql>type</sql>
-					<default_value>downlink</default_value>
-					<is_null_allowed>false</is_null_allowed>
-					<display_style>list</display_style>
-				</field>
-			</fields>
-			<methods>
-				<method id="AddConnectedNetworkDevice">
-					<static>false</static>
-					<access>protected</access>
-					<type>Overload-cmdbAbstractObject</type>
-					<code><![CDATA[	protected function AddConnectedNetworkDevice()
+        <reconciliation>
+          <attributes>
+            <attribute id="networkdevice_id"/>
+            <attribute id="connectableci_id"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
+        <field id="networkdevice_id" xsi:type="AttributeExternalKey">
+          <sql>networkdevice_id</sql>
+          <target_class>NetworkDevice</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+        </field>
+        <field id="networkdevice_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>networkdevice_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="connectableci_id" xsi:type="AttributeExternalKey">
+          <sql>connectableci_id</sql>
+          <target_class>ConnectableCI</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+        </field>
+        <field id="connectableci_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>connectableci_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="network_port" xsi:type="AttributeString">
+          <sql>network_port</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="device_port" xsi:type="AttributeString">
+          <sql>device_port</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="connection_type" xsi:type="AttributeEnum">
+          <values>
+            <value id="uplink">
+              <code>uplink</code>
+            </value>
+            <value id="downlink">
+              <code>downlink</code>
+            </value>
+          </values>
+          <sql>type</sql>
+          <default_value>downlink</default_value>
+          <is_null_allowed>false</is_null_allowed>
+          <display_style>list</display_style>
+        </field>
+      </fields>
+      <methods>
+        <method id="AddConnectedNetworkDevice">
+          <static>false</static>
+          <access>protected</access>
+          <type>Overload-cmdbAbstractObject</type>
+          <code><![CDATA[	protected function AddConnectedNetworkDevice()
 	{
 		$oDevice = MetaModel::GetObject('ConnectableCI', $this->Get('connectableci_id'));
 		if (is_object($oDevice) && (get_class($oDevice) == 'NetworkDevice'))
@@ -5853,12 +5900,12 @@
 			}
 		}
 	}]]></code>
-				</method>
-				<method id="UpdateConnectedNetworkDevice">
-					<static>false</static>
-					<access>protected</access>
-					<type>Overload-cmdbAbstractObject</type>
-					<code><![CDATA[	protected function UpdateConnectedNetworkDevice()
+        </method>
+        <method id="UpdateConnectedNetworkDevice">
+          <static>false</static>
+          <access>protected</access>
+          <type>Overload-cmdbAbstractObject</type>
+          <code><![CDATA[	protected function UpdateConnectedNetworkDevice()
 	{
 	  $aFields = array('networkdevice_id','connectableci_id','network_port','device_port','connection_type');
     $aChanges = $this->ListPreviousValuesForUpdatedAttributes();
@@ -5926,12 +5973,12 @@
 			}
 		}
 	}]]></code>
-				</method>
-				<method id="DeleteConnectedNetworkDevice">
-					<static>false</static>
-					<access>protected</access>
-					<type>Overload-cmdbAbstractObject</type>
-					<code><![CDATA[	protected function DeleteConnectedNetworkDevice()
+        </method>
+        <method id="DeleteConnectedNetworkDevice">
+          <static>false</static>
+          <access>protected</access>
+          <type>Overload-cmdbAbstractObject</type>
+          <code><![CDATA[	protected function DeleteConnectedNetworkDevice()
 	{
 		// The device might be already deleted (reentrance in the current procedure when both device are NETWORK devices!)
 		$oDevice = MetaModel::GetObject('ConnectableCI', $this->Get('connectableci_id'), false);
@@ -5955,556 +6002,560 @@
 			}
 		}
 	}]]></code>
-				</method>
-				<method id="AfterInsert">
-					<static>false</static>
-					<access>protected</access>
-					<type>Overload-DBObject</type>
-					<code><![CDATA[	protected function AfterInsert()
+        </method>
+        <method id="AfterInsert">
+          <static>false</static>
+          <access>protected</access>
+          <type>Overload-DBObject</type>
+          <code><![CDATA[	protected function AfterInsert()
 	{
 		$this->AddConnectedNetworkDevice();
 		parent::AfterInsert();
 	}]]></code>
-				</method>
-				<method id="AfterUpdate">
-					<static>false</static>
-					<access>protected</access>
-					<type>Overload-DBObject</type>
-					<code><![CDATA[	protected function AfterUpdate()
+        </method>
+        <method id="AfterUpdate">
+          <static>false</static>
+          <access>protected</access>
+          <type>Overload-DBObject</type>
+          <code><![CDATA[	protected function AfterUpdate()
 	{
 		$this->UpdateConnectedNetworkDevice();
 		parent::AfterUpdate();
 	}]]></code>
-				</method>
-				<method id="AfterDelete">
-					<static>false</static>
-					<access>protected</access>
-					<type>Overload-DBObject</type>
-					<code><![CDATA[	protected function AfterDelete()
+        </method>
+        <method id="AfterDelete">
+          <static>false</static>
+          <access>protected</access>
+          <type>Overload-DBObject</type>
+          <code><![CDATA[	protected function AfterDelete()
 	{
 		$this->DeleteConnectedNetworkDevice();
 		parent::AfterDelete();
 	}]]></code>
-				</method>
-			</methods>
-			<presentation>
-				<details>
-					<items>
-						<item id="networkdevice_id">
-							<rank>10</rank>
-						</item>
-						<item id="connectableci_id">
-							<rank>20</rank>
-						</item>
-						<item id="network_port">
-							<rank>30</rank>
-						</item>
-						<item id="device_port">
-							<rank>40</rank>
-						</item>
-						<item id="connection_type">
-							<rank>50</rank>
-						</item>
-					</items>
-				</details>
-				<search>
-					<items>
-						<item id="networkdevice_id">
-							<rank>10</rank>
-						</item>
-						<item id="connectableci_id">
-							<rank>20</rank>
-						</item>
-						<item id="network_port">
-							<rank>30</rank>
-						</item>
-						<item id="device_port">
-							<rank>40</rank>
-						</item>
-						<item id="connection_type">
-							<rank>50</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="networkdevice_id">
-							<rank>10</rank>
-						</item>
-						<item id="connectableci_id">
-							<rank>20</rank>
-						</item>
-						<item id="network_port">
-							<rank>30</rank>
-						</item>
-						<item id="device_port">
-							<rank>40</rank>
-						</item>
-						<item id="connection_type">
-							<rank>50</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-		</class>
-		<class id="lnkApplicationSolutionToFunctionalCI" _delta="define">
-			<parent>cmdbAbstractObject</parent>
-			<properties>
-				<is_link>1</is_link>
-				<category>bizmodel</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>lnkapplicationsolutiontofunctionalci</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="applicationsolution_id"/>
-						<attribute id="functionalci_id"/>
-					</attributes>
-				</naming>
+        </method>
+      </methods>
+      <presentation>
+        <details>
+          <items>
+            <item id="networkdevice_id">
+              <rank>10</rank>
+            </item>
+            <item id="connectableci_id">
+              <rank>20</rank>
+            </item>
+            <item id="network_port">
+              <rank>30</rank>
+            </item>
+            <item id="device_port">
+              <rank>40</rank>
+            </item>
+            <item id="connection_type">
+              <rank>50</rank>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="networkdevice_id">
+              <rank>10</rank>
+            </item>
+            <item id="connectableci_id">
+              <rank>20</rank>
+            </item>
+            <item id="network_port">
+              <rank>30</rank>
+            </item>
+            <item id="device_port">
+              <rank>40</rank>
+            </item>
+            <item id="connection_type">
+              <rank>50</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="networkdevice_id">
+              <rank>10</rank>
+            </item>
+            <item id="connectableci_id">
+              <rank>20</rank>
+            </item>
+            <item id="network_port">
+              <rank>30</rank>
+            </item>
+            <item id="device_port">
+              <rank>40</rank>
+            </item>
+            <item id="connection_type">
+              <rank>50</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="lnkApplicationSolutionToFunctionalCI" _delta="define">
+      <parent>cmdbAbstractObject</parent>
+      <properties>
+        <is_link>1</is_link>
+        <category>bizmodel</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>lnkapplicationsolutiontofunctionalci</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="applicationsolution_id"/>
+            <attribute id="functionalci_id"/>
+          </attributes>
+        </naming>
         <style>
           <icon/>
         </style>
-				<reconciliation>
-					<attributes>
-						<attribute id="applicationsolution_id"/>
-						<attribute id="functionalci_id"/>
-					</attributes>
-				</reconciliation>
-			</properties>
-			<fields>
-				<field id="applicationsolution_id" xsi:type="AttributeExternalKey">
-					<sql>applicationsolution_id</sql>
-					<target_class>ApplicationSolution</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_AUTO</on_target_delete>
-				</field>
-				<field id="applicationsolution_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>applicationsolution_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="functionalci_id" xsi:type="AttributeExternalKey">
-					<sql>functionalci_id</sql>
-					<target_class>FunctionalCI</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_AUTO</on_target_delete>
-				</field>
-				<field id="functionalci_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>functionalci_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-			</fields>
-			<methods/>
-			<presentation>
-				<details>
-					<items>
-						<item id="applicationsolution_id">
-							<rank>10</rank>
-						</item>
-						<item id="functionalci_id">
-							<rank>20</rank>
-						</item>
-					</items>
-				</details>
-				<search>
-					<items>
-						<item id="applicationsolution_id">
-							<rank>10</rank>
-						</item>
-						<item id="functionalci_id">
-							<rank>20</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="applicationsolution_id">
-							<rank>10</rank>
-						</item>
-						<item id="functionalci_id">
-							<rank>20</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-		</class>
-		<class id="lnkApplicationSolutionToBusinessProcess" _delta="define">
-			<parent>cmdbAbstractObject</parent>
-			<properties>
-				<is_link>1</is_link>
-				<category>bizmodel</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>lnkapplicationsolutiontobusinessprocess</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="businessprocess_id"/>
-						<attribute id="applicationsolution_id"/>
-					</attributes>
-				</naming>
+        <reconciliation>
+          <attributes>
+            <attribute id="applicationsolution_id"/>
+            <attribute id="functionalci_id"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
+        <field id="applicationsolution_id" xsi:type="AttributeExternalKey">
+          <sql>applicationsolution_id</sql>
+          <target_class>ApplicationSolution</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+        </field>
+        <field id="applicationsolution_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>applicationsolution_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="functionalci_id" xsi:type="AttributeExternalKey">
+          <sql>functionalci_id</sql>
+          <target_class>FunctionalCI</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+        </field>
+        <field id="functionalci_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>functionalci_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+      </fields>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="applicationsolution_id">
+              <rank>10</rank>
+            </item>
+            <item id="functionalci_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="applicationsolution_id">
+              <rank>10</rank>
+            </item>
+            <item id="functionalci_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="applicationsolution_id">
+              <rank>10</rank>
+            </item>
+            <item id="functionalci_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="lnkApplicationSolutionToBusinessProcess" _delta="define">
+      <parent>cmdbAbstractObject</parent>
+      <properties>
+        <is_link>1</is_link>
+        <category>bizmodel</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>lnkapplicationsolutiontobusinessprocess</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="businessprocess_id"/>
+            <attribute id="applicationsolution_id"/>
+          </attributes>
+        </naming>
         <style>
           <icon/>
         </style>
-				<reconciliation>
-					<attributes>
-						<attribute id="businessprocess_id"/>
-						<attribute id="applicationsolution_id"/>
-					</attributes>
-				</reconciliation>
-			</properties>
-			<fields>
-				<field id="businessprocess_id" xsi:type="AttributeExternalKey">
-					<sql>businessprocess_id</sql>
-					<target_class>BusinessProcess</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_AUTO</on_target_delete>
-				</field>
-				<field id="businessprocess_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>businessprocess_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="applicationsolution_id" xsi:type="AttributeExternalKey">
-					<sql>applicationsolution_id</sql>
-					<target_class>ApplicationSolution</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_AUTO</on_target_delete>
-				</field>
-				<field id="applicationsolution_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>applicationsolution_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-			</fields>
-			<methods/>
-			<presentation>
-				<details>
-					<items>
-						<item id="businessprocess_id">
-							<rank>10</rank>
-						</item>
-						<item id="applicationsolution_id">
-							<rank>20</rank>
-						</item>
-					</items>
-				</details>
-				<search>
-					<items>
-						<item id="businessprocess_id">
-							<rank>10</rank>
-						</item>
-						<item id="applicationsolution_id">
-							<rank>20</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="businessprocess_id">
-							<rank>10</rank>
-						</item>
-						<item id="applicationsolution_id">
-							<rank>20</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-		</class>
-		<class id="Group" _delta="define">
-			<parent>cmdbAbstractObject</parent>
-			<properties>
-				<category>bizmodel,searchable,configmgmt</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>group</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="name"/>
-					</attributes>
-				</naming>
-				<fields_semantic>
-					<state_attribute>status</state_attribute>
-				</fields_semantic>
-				<style>
-					<icon>../../images/icons/icons8-department.svg</icon>
-				</style>
-				<reconciliation>
-					<attributes>
-						<attribute id="name"/>
-						<attribute id="org_id"/>
-						<attribute id="owner_name"/>
-					</attributes>
-				</reconciliation>
-				<obsolescence>
-					<condition>status='obsolete'</condition>
-				</obsolescence>
-			</properties>
-			<fields>
-				<field id="name" xsi:type="AttributeString">
-					<sql>name</sql>
-					<default_value/>
-					<is_null_allowed>false</is_null_allowed>
-				</field>
-				<field id="status" xsi:type="AttributeEnum">
-					<values>
-						<value id="production">
-							<code>production</code>
-						</value>
-						<value id="implementation">
-							<code>implementation</code>
-						</value>
-						<value id="obsolete">
-							<code>obsolete</code>
-						</value>
-					</values>
-					<sql>status</sql>
-					<default_value>implementation</default_value>
-					<is_null_allowed>false</is_null_allowed>
-					<display_style>list</display_style>
-				</field>
-				<field id="org_id" xsi:type="AttributeExternalKey">
-					<sql>org_id</sql>
-					<target_class>Organization</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_MANUAL</on_target_delete>
-				</field>
-				<field id="owner_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>org_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="description" xsi:type="AttributeText">
-					<sql>description</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="type" xsi:type="AttributeString">
-					<sql>type</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="parent_id" xsi:type="AttributeHierarchicalKey">
-					<dependencies>
-						<attribute id="org_id"/>
-					</dependencies>
-					<sql>parent_id</sql>
-					<is_null_allowed>true</is_null_allowed>
-					<on_target_delete>DEL_MANUAL</on_target_delete>
-				</field>
-				<field id="parent_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>parent_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="ci_list" xsi:type="AttributeLinkedSetIndirect">
-					<linked_class>lnkGroupToCI</linked_class>
-					<ext_key_to_me>group_id</ext_key_to_me>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-					<ext_key_to_remote>ci_id</ext_key_to_remote>
-					<duplicates/>
-				</field>
-			</fields>
-			<methods/>
-			<presentation>
-				<details>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="status">
-							<rank>20</rank>
-						</item>
-						<item id="org_id">
-							<rank>30</rank>
-						</item>
-						<item id="type">
-							<rank>40</rank>
-						</item>
-						<item id="description">
-							<rank>50</rank>
-						</item>
-						<item id="parent_id">
-							<rank>60</rank>
-						</item>
-						<item id="ci_list">
-							<rank>70</rank>
-						</item>
-					</items>
-				</details>
-				<default_search>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="type">
-							<rank>20</rank>
-						</item>
-						<item id="org_id">
-							<rank>30</rank>
-						</item>
-					</items>
-				</default_search>
-				<search>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="status">
-							<rank>20</rank>
-						</item>
-						<item id="org_id">
-							<rank>30</rank>
-						</item>
-						<item id="type">
-							<rank>40</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="status">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="type">
-							<rank>30</rank>
-						</item>
-						<item id="parent_id">
-							<rank>40</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-		</class>
-		<class id="lnkGroupToCI" _delta="define">
-			<parent>cmdbAbstractObject</parent>
-			<properties>
-				<is_link>1</is_link>
-				<category>bizmodel,configmgmt</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>lnkgrouptoci</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="group_id"/>
-					</attributes>
-				</naming>
+        <reconciliation>
+          <attributes>
+            <attribute id="businessprocess_id"/>
+            <attribute id="applicationsolution_id"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
+        <field id="businessprocess_id" xsi:type="AttributeExternalKey">
+          <sql>businessprocess_id</sql>
+          <target_class>BusinessProcess</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+        </field>
+        <field id="businessprocess_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>businessprocess_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="applicationsolution_id" xsi:type="AttributeExternalKey">
+          <sql>applicationsolution_id</sql>
+          <target_class>ApplicationSolution</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+        </field>
+        <field id="applicationsolution_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>applicationsolution_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+      </fields>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="businessprocess_id">
+              <rank>10</rank>
+            </item>
+            <item id="applicationsolution_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="businessprocess_id">
+              <rank>10</rank>
+            </item>
+            <item id="applicationsolution_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="businessprocess_id">
+              <rank>10</rank>
+            </item>
+            <item id="applicationsolution_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="Group" _delta="define">
+      <parent>cmdbAbstractObject</parent>
+      <properties>
+        <category>bizmodel,searchable,configmgmt</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>group</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="name"/>
+          </attributes>
+        </naming>
+        <fields_semantic>
+          <state_attribute>status</state_attribute>
+        </fields_semantic>
+        <style>
+          <icon>../../images/icons/icons8-department.svg</icon>
+        </style>
+        <reconciliation>
+          <attributes>
+            <attribute id="name"/>
+            <attribute id="org_id"/>
+            <attribute id="owner_name"/>
+          </attributes>
+        </reconciliation>
+        <obsolescence>
+          <condition>status='obsolete'</condition>
+        </obsolescence>
+      </properties>
+      <fields>
+        <field id="name" xsi:type="AttributeString">
+          <sql>name</sql>
+          <default_value/>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
+        <field id="status" xsi:type="AttributeEnum">
+          <values>
+            <value id="production">
+              <code>production</code>
+            </value>
+            <value id="implementation">
+              <code>implementation</code>
+            </value>
+            <value id="obsolete">
+              <code>obsolete</code>
+            </value>
+          </values>
+          <sql>status</sql>
+          <default_value>implementation</default_value>
+          <is_null_allowed>false</is_null_allowed>
+          <display_style>list</display_style>
+        </field>
+        <field id="org_id" xsi:type="AttributeExternalKey">
+          <sql>org_id</sql>
+          <target_class>Organization</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+        </field>
+        <field id="owner_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>org_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="description" xsi:type="AttributeText">
+          <sql>description</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="type" xsi:type="AttributeString">
+          <sql>type</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="parent_id" xsi:type="AttributeHierarchicalKey">
+          <dependencies>
+            <attribute id="org_id"/>
+          </dependencies>
+          <sql>parent_id</sql>
+          <is_null_allowed>true</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+        </field>
+        <field id="parent_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>parent_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="ci_list" xsi:type="AttributeLinkedSetIndirect">
+          <linked_class>lnkGroupToCI</linked_class>
+          <ext_key_to_me>group_id</ext_key_to_me>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <ext_key_to_remote>ci_id</ext_key_to_remote>
+          <duplicates/>
+          <read_only>false</read_only>
+        </field>
+      </fields>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="status">
+              <rank>20</rank>
+            </item>
+            <item id="org_id">
+              <rank>30</rank>
+            </item>
+            <item id="type">
+              <rank>40</rank>
+            </item>
+            <item id="description">
+              <rank>50</rank>
+            </item>
+            <item id="parent_id">
+              <rank>60</rank>
+            </item>
+            <item id="ci_list">
+              <rank>70</rank>
+            </item>
+          </items>
+        </details>
+        <default_search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="type">
+              <rank>20</rank>
+            </item>
+            <item id="org_id">
+              <rank>30</rank>
+            </item>
+          </items>
+        </default_search>
+        <search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="status">
+              <rank>20</rank>
+            </item>
+            <item id="org_id">
+              <rank>30</rank>
+            </item>
+            <item id="type">
+              <rank>40</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="status">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="type">
+              <rank>30</rank>
+            </item>
+            <item id="parent_id">
+              <rank>40</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="lnkGroupToCI" _delta="define">
+      <parent>cmdbAbstractObject</parent>
+      <properties>
+        <is_link>1</is_link>
+        <category>bizmodel,configmgmt</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>lnkgrouptoci</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="group_id"/>
+          </attributes>
+        </naming>
         <style>
           <icon/>
         </style>
-				<reconciliation>
-					<attributes>
-						<attribute id="group_id"/>
-						<attribute id="ci_id"/>
-					</attributes>
-				</reconciliation>
-			</properties>
-			<fields>
-				<field id="group_id" xsi:type="AttributeExternalKey">
-					<sql>group_id</sql>
-					<target_class>Group</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_AUTO</on_target_delete>
-				</field>
-				<field id="group_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>group_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="ci_id" xsi:type="AttributeExternalKey">
-					<sql>ci_id</sql>
-					<target_class>FunctionalCI</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_AUTO</on_target_delete>
-				</field>
-				<field id="ci_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>ci_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="reason" xsi:type="AttributeString">
-					<sql>reason</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-			</fields>
-			<methods/>
-			<presentation>
-				<details>
-					<items>
-						<item id="group_id">
-							<rank>10</rank>
-						</item>
-						<item id="ci_id">
-							<rank>20</rank>
-						</item>
-						<item id="reason">
-							<rank>30</rank>
-						</item>
-					</items>
-				</details>
-				<search>
-					<items>
-						<item id="group_id">
-							<rank>10</rank>
-						</item>
-						<item id="ci_id">
-							<rank>20</rank>
-						</item>
-						<item id="reason">
-							<rank>30</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="group_id">
-							<rank>10</rank>
-						</item>
-						<item id="ci_id">
-							<rank>20</rank>
-						</item>
-						<item id="reason">
-							<rank>30</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-		</class>
-		<class id="Document" _delta="must_exist">
-			<fields>
-				<field id="cis_list" xsi:type="AttributeLinkedSetIndirect" _delta="define">
-					<linked_class>lnkDocumentToFunctionalCI</linked_class>
-					<ext_key_to_me>document_id</ext_key_to_me>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-					<ext_key_to_remote>functionalci_id</ext_key_to_remote>
-					<duplicates/>
-				</field>
-			</fields>
-			<methods/>
-			<presentation>
-				<details>
-					<items>
-						<item id="cis_list" _delta="define">
-							<rank>60</rank>
-						</item>
-					</items>
-				</details>
-			</presentation>
-		</class>
+        <reconciliation>
+          <attributes>
+            <attribute id="group_id"/>
+            <attribute id="ci_id"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
+        <field id="group_id" xsi:type="AttributeExternalKey">
+          <sql>group_id</sql>
+          <target_class>Group</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+        </field>
+        <field id="group_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>group_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="ci_id" xsi:type="AttributeExternalKey">
+          <sql>ci_id</sql>
+          <target_class>FunctionalCI</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+        </field>
+        <field id="ci_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>ci_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="reason" xsi:type="AttributeString">
+          <sql>reason</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+      </fields>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="group_id">
+              <rank>10</rank>
+            </item>
+            <item id="ci_id">
+              <rank>20</rank>
+            </item>
+            <item id="reason">
+              <rank>30</rank>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="group_id">
+              <rank>10</rank>
+            </item>
+            <item id="ci_id">
+              <rank>20</rank>
+            </item>
+            <item id="reason">
+              <rank>30</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="group_id">
+              <rank>10</rank>
+            </item>
+            <item id="ci_id">
+              <rank>20</rank>
+            </item>
+            <item id="reason">
+              <rank>30</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="Document" _delta="must_exist">
+      <fields>
+        <field id="cis_list" xsi:type="AttributeLinkedSetIndirect" _delta="define">
+          <linked_class>lnkDocumentToFunctionalCI</linked_class>
+          <ext_key_to_me>document_id</ext_key_to_me>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <ext_key_to_remote>functionalci_id</ext_key_to_remote>
+          <duplicates/>
+          <read_only>false</read_only>
+        </field>
+      </fields>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="cis_list" _delta="define">
+              <rank>60</rank>
+            </item>
+          </items>
+        </details>
+      </presentation>
+    </class>
     <class id="Location" _delta="must_exist">
       <fields>
         <field id="physicaldevice_list" xsi:type="AttributeLinkedSet" _delta="define">
           <linked_class>PhysicalDevice</linked_class>
           <ext_key_to_me>location_id</ext_key_to_me>
-          <edit_mode>add_only</edit_mode>
+          <legacy_edit_mode>add_only</legacy_edit_mode>
           <count_min>0</count_min>
           <count_max>0</count_max>
+          <relation_type>link</relation_type>
+          <read_only>false</read_only>
         </field>
       </fields>
       <presentation>
@@ -6526,6 +6577,7 @@
           <count_max>0</count_max>
           <ext_key_to_remote>functionalci_id</ext_key_to_remote>
           <duplicates/>
+          <read_only>false</read_only>
         </field>
       </fields>
     </class>
@@ -6553,12 +6605,7 @@
     </class>
     <class id="DocumentFile" _delta="must_exist">
       <presentation>
-        <details>
-          <items>
-            <item id="cis_list" _delta="define">
-              <rank>70</rank>
-            </item>
-          </items>>
+        <details><items><item id="cis_list" _delta="define"><rank>70</rank></item></items>&gt;
         </details>
       </presentation>
     </class>
@@ -6584,152 +6631,152 @@
         </details>
       </presentation>
     </class>
-	</classes>
-	<menus>
-		<menu id="WelcomeMenuPage" xsi:type="DashboardMenuNode" _delta="must_exist">
-			<rank>10</rank>
-			<parent>WelcomeMenu</parent>
-			<definition>
-				<layout>DashboardLayoutOneCol</layout>
-				<title/>
-				<cells>
-					<cell id="0">
-						<rank>0</rank>
-						<dashlets>
-							<dashlet id="2" xsi:type="DashletBadge" _delta="define">
-								<rank>1</rank>
-								<class>BusinessProcess</class>
-							</dashlet>
-							<dashlet id="3" xsi:type="DashletBadge" _delta="define">
-								<rank>2</rank>
-								<class>ApplicationSolution</class>
-							</dashlet>
-							<dashlet id="7" xsi:type="DashletBadge" _delta="define">
-								<rank>6</rank>
-								<class>Server</class>
-							</dashlet>
-							<dashlet id="8" xsi:type="DashletBadge" _delta="define">
-								<rank>7</rank>
-								<class>NetworkDevice</class>
-							</dashlet>
-						</dashlets>
-					</cell>
-				</cells>
-			</definition>
-		</menu>
-		<menu id="ConfigManagementOverview" xsi:type="DashboardMenuNode" _delta="define">
-			<rank>1</rank>
-			<parent>ConfigManagement</parent>
-			<definition>
-				<layout>DashboardLayoutOneCol</layout>
+  </classes>
+  <menus>
+    <menu id="WelcomeMenuPage" xsi:type="DashboardMenuNode" _delta="must_exist">
+      <rank>10</rank>
+      <parent>WelcomeMenu</parent>
+      <definition>
+        <layout>DashboardLayoutOneCol</layout>
+        <title/>
+        <cells>
+          <cell id="0">
+            <rank>0</rank>
+            <dashlets>
+              <dashlet id="2" xsi:type="DashletBadge" _delta="define">
+                <rank>1</rank>
+                <class>BusinessProcess</class>
+              </dashlet>
+              <dashlet id="3" xsi:type="DashletBadge" _delta="define">
+                <rank>2</rank>
+                <class>ApplicationSolution</class>
+              </dashlet>
+              <dashlet id="7" xsi:type="DashletBadge" _delta="define">
+                <rank>6</rank>
+                <class>Server</class>
+              </dashlet>
+              <dashlet id="8" xsi:type="DashletBadge" _delta="define">
+                <rank>7</rank>
+                <class>NetworkDevice</class>
+              </dashlet>
+            </dashlets>
+          </cell>
+        </cells>
+      </definition>
+    </menu>
+    <menu id="ConfigManagementOverview" xsi:type="DashboardMenuNode" _delta="define">
+      <rank>1</rank>
+      <parent>ConfigManagement</parent>
+      <definition>
+        <layout>DashboardLayoutOneCol</layout>
         <title>Menu:ConfigManagementOverview</title>
-				<cells>
-					<cell id="0">
-						<rank>0</rank>
-						<dashlets>
-							<dashlet id="1" xsi:type="DashletHeaderStatic">
-								<rank>0</rank>
-								<title>Menu:ConfigManagement:AllDevices</title>
-									<icon>../images/icons/icons8-server.svg</icon>
-								<subtitle>Menu_ConfigManagement_AllDevices</subtitle>
-							</dashlet>
-							<dashlet id="2" xsi:type="DashletBadge">
-								<rank>3</rank>
-								<class>Server</class>
-							</dashlet>
-							<dashlet id="3" xsi:type="DashletBadge">
-								<rank>4</rank>
-								<class>NetworkDevice</class>
-							</dashlet>
-						</dashlets>
-					</cell>
-					<cell id="3">
-						<rank>3</rank>
-						<dashlets>
-							<dashlet id="4" xsi:type="DashletHeaderStatic">
-								<rank>0</rank>
-								<title>Menu:ConfigManagement:SWAndApps</title>
-									<icon>../images/icons/icons8-software.svg</icon>
-							</dashlet>
-							<dashlet id="5" xsi:type="DashletBadge">
-								<rank>1</rank>
-								<class>Middleware</class>
-							</dashlet>
-							<dashlet id="6" xsi:type="DashletBadge">
-								<rank>2</rank>
-								<class>DBServer</class>
-							</dashlet>
-							<dashlet id="7" xsi:type="DashletBadge">
-								<rank>3</rank>
-								<class>WebServer</class>
-							</dashlet>
-							<dashlet id="8" xsi:type="DashletBadge">
-								<rank>4</rank>
-								<class>PCSoftware</class>
-							</dashlet>
-							<dashlet id="9" xsi:type="DashletBadge">
-								<rank>5</rank>
-								<class>OtherSoftware</class>
-							</dashlet>
-							<dashlet id="10" xsi:type="DashletBadge">
-								<rank>6</rank>
-								<class>MiddlewareInstance</class>
-							</dashlet>
-							<dashlet id="11" xsi:type="DashletBadge">
-								<rank>7</rank>
-								<class>DatabaseSchema</class>
-							</dashlet>
-							<dashlet id="12" xsi:type="DashletBadge">
-								<rank>8</rank>
-								<class>WebApplication</class>
-							</dashlet>
-							<dashlet id="13" xsi:type="DashletBadge">
-								<rank>9</rank>
-								<class>Patch</class>
-							</dashlet>
-							<dashlet id="14" xsi:type="DashletBadge">
-								<rank>10</rank>
-								<class>Licence</class>
-							</dashlet>
-						</dashlets>
-					</cell>
-					<cell id="4">
-						<rank>4</rank>
-						<dashlets>
-							<dashlet id="15" xsi:type="DashletHeaderStatic">
-								<rank>0</rank>
-								<title>Menu:ConfigManagement:Misc</title>
-									<icon>../images/icons/icons8-network.svg</icon>
-							</dashlet>
-							<dashlet id="16" xsi:type="DashletBadge">
-								<rank>1</rank>
-								<class>NetworkInterface</class>
-							</dashlet>
-							<dashlet id="17" xsi:type="DashletBadge">
-								<rank>2</rank>
-								<class>Subnet</class>
-							</dashlet>
-							<dashlet id="vlan" xsi:type="DashletBadge">
-								<rank>2.1</rank>
-								<class>VLAN</class>
-							</dashlet>
-							<dashlet id="18" xsi:type="DashletBadge">
-								<rank>4</rank>
-								<class>BusinessProcess</class>
-							</dashlet>
-							<dashlet id="19" xsi:type="DashletBadge">
-								<rank>5</rank>
-								<class>ApplicationSolution</class>
-							</dashlet>
-							<dashlet id="20" xsi:type="DashletBadge">
-								<rank>6</rank>
-								<class>Group</class>
-							</dashlet>
-						</dashlets>
-					</cell>
-				</cells>
-			</definition>
-		</menu>
+        <cells>
+          <cell id="0">
+            <rank>0</rank>
+            <dashlets>
+              <dashlet id="1" xsi:type="DashletHeaderStatic">
+                <rank>0</rank>
+                <title>Menu:ConfigManagement:AllDevices</title>
+                <icon>../images/icons/icons8-server.svg</icon>
+                <subtitle>Menu_ConfigManagement_AllDevices</subtitle>
+              </dashlet>
+              <dashlet id="2" xsi:type="DashletBadge">
+                <rank>3</rank>
+                <class>Server</class>
+              </dashlet>
+              <dashlet id="3" xsi:type="DashletBadge">
+                <rank>4</rank>
+                <class>NetworkDevice</class>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="3">
+            <rank>3</rank>
+            <dashlets>
+              <dashlet id="4" xsi:type="DashletHeaderStatic">
+                <rank>0</rank>
+                <title>Menu:ConfigManagement:SWAndApps</title>
+                <icon>../images/icons/icons8-software.svg</icon>
+              </dashlet>
+              <dashlet id="5" xsi:type="DashletBadge">
+                <rank>1</rank>
+                <class>Middleware</class>
+              </dashlet>
+              <dashlet id="6" xsi:type="DashletBadge">
+                <rank>2</rank>
+                <class>DBServer</class>
+              </dashlet>
+              <dashlet id="7" xsi:type="DashletBadge">
+                <rank>3</rank>
+                <class>WebServer</class>
+              </dashlet>
+              <dashlet id="8" xsi:type="DashletBadge">
+                <rank>4</rank>
+                <class>PCSoftware</class>
+              </dashlet>
+              <dashlet id="9" xsi:type="DashletBadge">
+                <rank>5</rank>
+                <class>OtherSoftware</class>
+              </dashlet>
+              <dashlet id="10" xsi:type="DashletBadge">
+                <rank>6</rank>
+                <class>MiddlewareInstance</class>
+              </dashlet>
+              <dashlet id="11" xsi:type="DashletBadge">
+                <rank>7</rank>
+                <class>DatabaseSchema</class>
+              </dashlet>
+              <dashlet id="12" xsi:type="DashletBadge">
+                <rank>8</rank>
+                <class>WebApplication</class>
+              </dashlet>
+              <dashlet id="13" xsi:type="DashletBadge">
+                <rank>9</rank>
+                <class>Patch</class>
+              </dashlet>
+              <dashlet id="14" xsi:type="DashletBadge">
+                <rank>10</rank>
+                <class>Licence</class>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="4">
+            <rank>4</rank>
+            <dashlets>
+              <dashlet id="15" xsi:type="DashletHeaderStatic">
+                <rank>0</rank>
+                <title>Menu:ConfigManagement:Misc</title>
+                <icon>../images/icons/icons8-network.svg</icon>
+              </dashlet>
+              <dashlet id="16" xsi:type="DashletBadge">
+                <rank>1</rank>
+                <class>NetworkInterface</class>
+              </dashlet>
+              <dashlet id="17" xsi:type="DashletBadge">
+                <rank>2</rank>
+                <class>Subnet</class>
+              </dashlet>
+              <dashlet id="vlan" xsi:type="DashletBadge">
+                <rank>2.1</rank>
+                <class>VLAN</class>
+              </dashlet>
+              <dashlet id="18" xsi:type="DashletBadge">
+                <rank>4</rank>
+                <class>BusinessProcess</class>
+              </dashlet>
+              <dashlet id="19" xsi:type="DashletBadge">
+                <rank>5</rank>
+                <class>ApplicationSolution</class>
+              </dashlet>
+              <dashlet id="20" xsi:type="DashletBadge">
+                <rank>6</rank>
+                <class>Group</class>
+              </dashlet>
+            </dashlets>
+          </cell>
+        </cells>
+      </definition>
+    </menu>
     <menu id="Typology" xsi:type="DashboardMenuNode" _delta="if_exists">
       <rank>80</rank>
       <parent>Catalogs</parent>
@@ -6769,27 +6816,27 @@
         </cells>
       </definition>
     </menu>
-		<menu id="NewCI" xsi:type="NewObjectMenuNode" _delta="define">
-			<rank>4</rank>
-			<parent>ConfigManagement</parent>
-			<class>FunctionalCI</class>
-		</menu>
-		<menu id="SearchCIs" xsi:type="SearchMenuNode" _delta="define">
-			<rank>5</rank>
-			<parent>ConfigManagement</parent>
-			<class>FunctionalCI</class>
-		</menu>
-		<menu id="Software" xsi:type="OQLMenuNode" _delta="define">
-			<rank>7</rank>
-			<parent>ConfigManagement</parent>
-			<oql>SELECT Software</oql>
-			<do_search>1</do_search>
-		</menu>
-		<menu id="Group" xsi:type="OQLMenuNode" _delta="define">
-			<rank>8</rank>
-			<parent>ConfigManagement</parent>
-			<oql>SELECT Group</oql>
-			<do_search>1</do_search>
-		</menu>
-	</menus>
+    <menu id="NewCI" xsi:type="NewObjectMenuNode" _delta="define">
+      <rank>4</rank>
+      <parent>ConfigManagement</parent>
+      <class>FunctionalCI</class>
+    </menu>
+    <menu id="SearchCIs" xsi:type="SearchMenuNode" _delta="define">
+      <rank>5</rank>
+      <parent>ConfigManagement</parent>
+      <class>FunctionalCI</class>
+    </menu>
+    <menu id="Software" xsi:type="OQLMenuNode" _delta="define">
+      <rank>7</rank>
+      <parent>ConfigManagement</parent>
+      <oql>SELECT Software</oql>
+      <do_search>1</do_search>
+    </menu>
+    <menu id="Group" xsi:type="OQLMenuNode" _delta="define">
+      <rank>8</rank>
+      <parent>ConfigManagement</parent>
+      <oql>SELECT Group</oql>
+      <do_search>1</do_search>
+    </menu>
+  </menus>
 </itop_design>
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 d81dfba5a..27d300740 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
@@ -37,16 +37,20 @@
         <field id="device_list" xsi:type="AttributeLinkedSet">
           <linked_class>DatacenterDevice</linked_class>
           <ext_key_to_me>rack_id</ext_key_to_me>
-          <edit_mode>add_only</edit_mode>
+          <legacy_edit_mode>add_only</legacy_edit_mode>
           <count_min>0</count_min>
           <count_max>0</count_max>
+          <relation_type>link</relation_type>
+          <read_only>false</read_only>
         </field>
         <field id="enclosure_list" xsi:type="AttributeLinkedSet">
           <linked_class>Enclosure</linked_class>
           <ext_key_to_me>rack_id</ext_key_to_me>
-          <edit_mode>add_only</edit_mode>
+          <legacy_edit_mode>add_only</legacy_edit_mode>
           <count_min>0</count_min>
           <count_max>0</count_max>
+          <relation_type>link</relation_type>
+          <read_only>false</read_only>
         </field>
       </fields>
       <methods/>
@@ -229,9 +233,11 @@
         <field id="device_list" xsi:type="AttributeLinkedSet">
           <linked_class>DatacenterDevice</linked_class>
           <ext_key_to_me>enclosure_id</ext_key_to_me>
-          <edit_mode>add_only</edit_mode>
+          <legacy_edit_mode>add_only</legacy_edit_mode>
           <count_min>0</count_min>
           <count_max>0</count_max>
+          <relation_type>link</relation_type>
+          <read_only>false</read_only>
         </field>
       </fields>
       <methods/>
@@ -573,9 +579,11 @@
         <field id="pdus_list" xsi:type="AttributeLinkedSet">
           <linked_class>PDU</linked_class>
           <ext_key_to_me>powerstart_id</ext_key_to_me>
-          <edit_mode>add_only</edit_mode>
+          <legacy_edit_mode>add_only</legacy_edit_mode>
           <count_min>0</count_min>
           <count_max>0</count_max>
+          <relation_type>link</relation_type>
+          <read_only>false</read_only>
         </field>
       </fields>
       <methods/>
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 391a4d05f..df92ee8da 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
@@ -1390,7 +1390,7 @@
               <dashlet id="25" xsi:type="DashletHeaderStatic">
                 <rank>0</rank>
                 <title>Menu:ConfigManagement:EndUsers</title>
-                  <icon>../images/icons/icons8-team.svg</icon>
+                <icon>../images/icons/icons8-team.svg</icon>
               </dashlet>
               <dashlet id="26" xsi:type="DashletBadge">
                 <rank>1</rank>
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 ffe79e69d..50d6c8dae 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
@@ -173,9 +173,11 @@
         <field id="faq_list" xsi:type="AttributeLinkedSet">
           <linked_class>FAQ</linked_class>
           <ext_key_to_me>category_id</ext_key_to_me>
-          <edit_mode>add_only</edit_mode>
+          <legacy_edit_mode>add_only</legacy_edit_mode>
           <count_min>0</count_min>
           <count_max>0</count_max>
+          <relation_type>link</relation_type>
+          <read_only>false</read_only>
         </field>
       </fields>
       <methods/>
@@ -305,15 +307,15 @@
           <twig>
             <div class="row">
               <div class="col-sm-4">
-                <div class="form_field" data-field-id="category_name"></div>
-                <div class="form_field" data-field-id="title"></div>
-                <div class="form_field" data-field-id="error_code"></div>
-                <div class="form_field" data-field-id="key_words"></div>
-                <div class="form_field" data-field-id="domains"></div>
-                <div class="form_field" data-field-id="summary"></div>
+                <div class="form_field" data-field-id="category_name"/>
+                <div class="form_field" data-field-id="title"/>
+                <div class="form_field" data-field-id="error_code"/>
+                <div class="form_field" data-field-id="key_words"/>
+                <div class="form_field" data-field-id="domains"/>
+                <div class="form_field" data-field-id="summary"/>
               </div>
               <div class="col-sm-8">
-                <div class="form_field" data-field-id="description"></div>
+                <div class="form_field" data-field-id="description"/>
               </div>
             </div>
           </twig>
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 5ff7a02a0..c371d9649 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,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
-	<classes>
-		<class id="Ticket">
-			<methods>
-				<method id="CreateFromServiceSubcategory" _delta="define">
-					<comment>/**
+  <classes>
+    <class id="Ticket">
+      <methods>
+        <method id="CreateFromServiceSubcategory" _delta="define">
+          <comment>/**
 						* Instanciate an object of the relevant class, depending on the request type
 						* @return DBObject
 						*/</comment>
-					<static>true</static>
-					<access>public</access>
-					<type>Factory</type>
-					<code><![CDATA[	static public function CreateFromServiceSubcategory($oServiceSubcategory)
+          <static>true</static>
+          <access>public</access>
+          <type>Factory</type>
+          <code><![CDATA[	static public function CreateFromServiceSubcategory($oServiceSubcategory)
 	{
         $sType = $oServiceSubcategory->Get('request_type');
         if ($sType == 'incident')
@@ -32,43 +32,43 @@
         }
         return $oRet;
 	}]]></code>
-				</method>
-			</methods>
-		</class>
-	</classes>
-	<module_designs>
-		<module_design id="itop-portal">
-			<bricks>
-				<brick id="services">
-					<levels>
-						<level id="1">
-							<levels>
-								<level id="1">
-									<levels>
-										<level id="1">
-											<actions>
-												<action id="create_from_this">
-													<class _delta="delete" />
-													<factory_method _delta="define"><![CDATA[\Ticket::CreateFromServiceSubcategory]]></factory_method>
-												</action>
-											</actions>
-										</level>
-									</levels>
-								</level>
-							</levels>
-						</level>
-					</levels>
-				</brick>
-			</bricks>
-			<classes>
-				<class id="ServiceSubcategory">
-					<scopes>
-						<scope id="all">
-							<oql_view _delta="redefine"><![CDATA[SELECT ServiceSubcategory WHERE status != 'obsolete']]></oql_view>
-						</scope>
-					</scopes>
-				</class>
-			</classes>
-		</module_design>
-	</module_designs>
+        </method>
+      </methods>
+    </class>
+  </classes>
+  <module_designs>
+    <module_design id="itop-portal">
+      <bricks>
+        <brick id="services">
+          <levels>
+            <level id="1">
+              <levels>
+                <level id="1">
+                  <levels>
+                    <level id="1">
+                      <actions>
+                        <action id="create_from_this">
+                          <class _delta="delete"/>
+                          <factory_method _delta="define"><![CDATA[\Ticket::CreateFromServiceSubcategory]]></factory_method>
+                        </action>
+                      </actions>
+                    </level>
+                  </levels>
+                </level>
+              </levels>
+            </level>
+          </levels>
+        </brick>
+      </bricks>
+      <classes>
+        <class id="ServiceSubcategory">
+          <scopes>
+            <scope id="all">
+              <oql_view _delta="redefine"><![CDATA[SELECT ServiceSubcategory WHERE status != 'obsolete']]></oql_view>
+            </scope>
+          </scopes>
+        </class>
+      </classes>
+    </module_design>
+  </module_designs>
 </itop_design>
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 65b2cbb12..d978ab0b1 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
@@ -13,15 +13,15 @@
     </profiles>
   </user_rights>
   <module_parameters>
-  	<parameters id="itop-hub-connector" _delta="define">
-  		<url>https://www.itophub.io</url>
+    <parameters id="itop-hub-connector" _delta="define">
+      <url>https://www.itophub.io</url>
       <route_landing>/my-instances/landing-from-remote</route_landing>
- 		  <route_landing_stateless>/stateless-remote-itop/landing-from-remote-stateless</route_landing_stateless>
- 		  <route_fetch_unread_messages>/api/messages</route_fetch_unread_messages>
-		  <route_mark_all_messages_as_read>/api/messages/mark-all-as-read</route_mark_all_messages_as_read>
-		  <route_view_all_messages>/messages</route_view_all_messages>
-   		<setup_url>../pages/exec.php?exec_module=itop-hub-connector&amp;exec_page=launch.php&amp;target=inform_after_setup</setup_url>
+      <route_landing_stateless>/stateless-remote-itop/landing-from-remote-stateless</route_landing_stateless>
+      <route_fetch_unread_messages>/api/messages</route_fetch_unread_messages>
+      <route_mark_all_messages_as_read>/api/messages/mark-all-as-read</route_mark_all_messages_as_read>
+      <route_view_all_messages>/messages</route_view_all_messages>
+      <setup_url>../pages/exec.php?exec_module=itop-hub-connector&amp;exec_page=launch.php&amp;target=inform_after_setup</setup_url>
       <rgpd_url>https://www.itophub.io/page/data-privacy</rgpd_url>
-  	</parameters>
+    </parameters>
   </module_parameters>
 </itop_design>
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 2bc8bb897..3d372c107 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,1138 +1,1142 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
-	<classes>
-		<class id="Incident" _delta="define">
-			<parent>Ticket</parent>
-			<properties>
-				<comment><![CDATA[/**
+  <classes>
+    <class id="Incident" _delta="define">
+      <parent>Ticket</parent>
+      <properties>
+        <comment><![CDATA[/**
  * Persistent classes for a CMDB
  *
  * @copyright   Copyright (C) 2010-2021 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */]]></comment>
-				<category>bizmodel,searchable,requestmgmt</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>ticket_incident</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="ref"/>
-					</attributes>
-				</naming>
-				<fields_semantic>
-					<state_attribute>status</state_attribute>
-				</fields_semantic>
-				<style>
-					<icon>images/incident.svg</icon>
+        <category>bizmodel,searchable,requestmgmt</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>ticket_incident</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="ref"/>
+          </attributes>
+        </naming>
+        <fields_semantic>
+          <state_attribute>status</state_attribute>
+        </fields_semantic>
+        <style>
+          <icon>images/incident.svg</icon>
           <main_color>$ibo-color-red-600</main_color>
-				</style>
-				<reconciliation>
-					<attributes>
-						<attribute id="ref"/>
-					</attributes>
-				</reconciliation>
-				<order>
-					<columns>
-						<column id="ref" ascending="false"/>
-					</columns>
-				</order>
-			</properties>
-			<fields>
-				<field id="status" xsi:type="AttributeEnum">
-					<always_load_in_tables>true</always_load_in_tables>
-					<values>
-						<value id="new">
-							<code>new</code>
-							<style>
-								<main_color>$ibo-lifecycle-new-state-primary-color</main_color>
-								<complementary_color>$ibo-lifecycle-new-state-secondary-color</complementary_color>
-								<decoration_classes/>
-							</style>
-						</value>
-						<value id="assigned">
-							<code>assigned</code>
-							<style>
-								<main_color>$ibo-lifecycle-neutral-state-primary-color</main_color>
-								<complementary_color>$ibo-lifecycle-neutral-state-secondary-color</complementary_color>
-								<decoration_classes/>
-							</style>
-						</value>
-						<value id="pending">
-							<code>pending</code>
-							<style>
-								<main_color>$ibo-lifecycle-waiting-state-primary-color</main_color>
-								<complementary_color>$ibo-lifecycle-waiting-state-secondary-color</complementary_color>
-								<decoration_classes>fas fa-hourglass-half</decoration_classes>
-							</style>
-						</value>
-						<value id="escalated_tto">
-							<code>escalated_tto</code>
-							<style>
-								<main_color>$ibo-lifecycle-failure-state-primary-color</main_color>
+        </style>
+        <reconciliation>
+          <attributes>
+            <attribute id="ref"/>
+          </attributes>
+        </reconciliation>
+        <order>
+          <columns>
+            <column id="ref" ascending="false"/>
+          </columns>
+        </order>
+      </properties>
+      <fields>
+        <field id="status" xsi:type="AttributeEnum">
+          <always_load_in_tables>true</always_load_in_tables>
+          <values>
+            <value id="new">
+              <code>new</code>
+              <style>
+                <main_color>$ibo-lifecycle-new-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-new-state-secondary-color</complementary_color>
+                <decoration_classes/>
+              </style>
+            </value>
+            <value id="assigned">
+              <code>assigned</code>
+              <style>
+                <main_color>$ibo-lifecycle-neutral-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-neutral-state-secondary-color</complementary_color>
+                <decoration_classes/>
+              </style>
+            </value>
+            <value id="pending">
+              <code>pending</code>
+              <style>
+                <main_color>$ibo-lifecycle-waiting-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-waiting-state-secondary-color</complementary_color>
+                <decoration_classes>fas fa-hourglass-half</decoration_classes>
+              </style>
+            </value>
+            <value id="escalated_tto">
+              <code>escalated_tto</code>
+              <style>
+                <main_color>$ibo-lifecycle-failure-state-primary-color</main_color>
                 <complementary_color>$ibo-lifecycle-failure-state-secondary-color</complementary_color>
-								<decoration_classes>fas fa-fire</decoration_classes>
-							</style>
-						</value>
-						<value id="escalated_ttr">
-							<code>escalated_ttr</code>
-							<style>
-								<main_color>$ibo-lifecycle-failure-state-primary-color</main_color>
+                <decoration_classes>fas fa-fire</decoration_classes>
+              </style>
+            </value>
+            <value id="escalated_ttr">
+              <code>escalated_ttr</code>
+              <style>
+                <main_color>$ibo-lifecycle-failure-state-primary-color</main_color>
                 <complementary_color>$ibo-lifecycle-failure-state-secondary-color</complementary_color>
-								<decoration_classes>fas fa-fire</decoration_classes>
-							</style>
-						</value>
-						<value id="resolved">
-							<code>resolved</code>
-							<style>
-								<main_color>$ibo-lifecycle-success-state-primary-color</main_color>
-								<complementary_color>$ibo-lifecycle-success-state-secondary-color</complementary_color>
-								<decoration_classes>fas fa-check</decoration_classes>
-							</style>
-						</value>
-						<value id="closed">
-							<code>closed</code>
-							<style>
-								<main_color>$ibo-lifecycle-frozen-state-primary-color</main_color>
-								<complementary_color>$ibo-lifecycle-frozen-state-secondary-color</complementary_color>
-								<decoration_classes/>
-							</style>
-						</value>
-					</values>
-					<default_style>
-						<main_color>$ibo-lifecycle-neutral-state-primary-color</main_color>
-						<complementary_color>$ibo-lifecycle-neutral-state-secondary-color</complementary_color>
-						<decoration_classes/>
-					</default_style>
-					<sql>status</sql>
-					<default_value>new</default_value>
-					<is_null_allowed>false</is_null_allowed>
-					<display_style>list</display_style>
-				</field>
-				<field id="impact" xsi:type="AttributeEnum">
-					<values>
-						<value id="1">
-							<code>1</code>
-						</value>
-						<value id="2">
-							<code>2</code>
-						</value>
-						<value id="3">
-							<code>3</code>
-						</value>
-					</values>
-					<sql>impact</sql>
-					<default_value>1</default_value>
-					<is_null_allowed>false</is_null_allowed>
-					<display_style>list</display_style>
-				</field>
-				<field id="priority" xsi:type="AttributeEnum">
-					<values>
-						<value id="1">
-							<code>1</code>
-						</value>
-						<value id="2">
-							<code>2</code>
-						</value>
-						<value id="3">
-							<code>3</code>
-						</value>
-						<value id="4">
-							<code>4</code>
-						</value>
-					</values>
-					<dependencies>
-						<attribute id="impact"/>
-						<attribute id="urgency"/>
-					</dependencies>
-					<sql>priority</sql>
-					<default_value>4</default_value>
-					<is_null_allowed>false</is_null_allowed>
-				</field>
-				<field id="urgency" xsi:type="AttributeEnum">
-					<values>
-						<value id="1">
-							<code>1</code>
-						</value>
-						<value id="2">
-							<code>2</code>
-						</value>
-						<value id="3">
-							<code>3</code>
-						</value>
-						<value id="4">
-							<code>4</code>
-						</value>
-					</values>
-					<sql>urgency</sql>
-					<default_value>4</default_value>
-					<is_null_allowed>false</is_null_allowed>
-				</field>
-				<field id="origin" xsi:type="AttributeEnum">
-					<values>
+                <decoration_classes>fas fa-fire</decoration_classes>
+              </style>
+            </value>
+            <value id="resolved">
+              <code>resolved</code>
+              <style>
+                <main_color>$ibo-lifecycle-success-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-success-state-secondary-color</complementary_color>
+                <decoration_classes>fas fa-check</decoration_classes>
+              </style>
+            </value>
+            <value id="closed">
+              <code>closed</code>
+              <style>
+                <main_color>$ibo-lifecycle-frozen-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-frozen-state-secondary-color</complementary_color>
+                <decoration_classes/>
+              </style>
+            </value>
+          </values>
+          <default_style>
+            <main_color>$ibo-lifecycle-neutral-state-primary-color</main_color>
+            <complementary_color>$ibo-lifecycle-neutral-state-secondary-color</complementary_color>
+            <decoration_classes/>
+          </default_style>
+          <sql>status</sql>
+          <default_value>new</default_value>
+          <is_null_allowed>false</is_null_allowed>
+          <display_style>list</display_style>
+        </field>
+        <field id="impact" xsi:type="AttributeEnum">
+          <values>
+            <value id="1">
+              <code>1</code>
+            </value>
+            <value id="2">
+              <code>2</code>
+            </value>
+            <value id="3">
+              <code>3</code>
+            </value>
+          </values>
+          <sql>impact</sql>
+          <default_value>1</default_value>
+          <is_null_allowed>false</is_null_allowed>
+          <display_style>list</display_style>
+        </field>
+        <field id="priority" xsi:type="AttributeEnum">
+          <values>
+            <value id="1">
+              <code>1</code>
+            </value>
+            <value id="2">
+              <code>2</code>
+            </value>
+            <value id="3">
+              <code>3</code>
+            </value>
+            <value id="4">
+              <code>4</code>
+            </value>
+          </values>
+          <dependencies>
+            <attribute id="impact"/>
+            <attribute id="urgency"/>
+          </dependencies>
+          <sql>priority</sql>
+          <default_value>4</default_value>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
+        <field id="urgency" xsi:type="AttributeEnum">
+          <values>
+            <value id="1">
+              <code>1</code>
+            </value>
+            <value id="2">
+              <code>2</code>
+            </value>
+            <value id="3">
+              <code>3</code>
+            </value>
+            <value id="4">
+              <code>4</code>
+            </value>
+          </values>
+          <sql>urgency</sql>
+          <default_value>4</default_value>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
+        <field id="origin" xsi:type="AttributeEnum">
+          <values>
             <value id="in_person">
               <code>in_person</code>
             </value>
             <value id="chat">
               <code>chat</code>
             </value>
-						<value id="mail">
-							<code>mail</code>
-						</value>
-						<value id="phone">
-							<code>phone</code>
-						</value>
-						<value id="portal">
-							<code>portal</code>
-						</value>
-						<value id="monitoring">
-							<code>monitoring</code>
-						</value>
-					</values>
-					<sql>origin</sql>
-					<default_value>phone</default_value>
-					<is_null_allowed>true</is_null_allowed>
-					<display_style>list</display_style>
-				</field>
-				<field id="service_id" xsi:type="AttributeExternalKey">
-					<filter><![CDATA[
+            <value id="mail">
+              <code>mail</code>
+            </value>
+            <value id="phone">
+              <code>phone</code>
+            </value>
+            <value id="portal">
+              <code>portal</code>
+            </value>
+            <value id="monitoring">
+              <code>monitoring</code>
+            </value>
+          </values>
+          <sql>origin</sql>
+          <default_value>phone</default_value>
+          <is_null_allowed>true</is_null_allowed>
+          <display_style>list</display_style>
+        </field>
+        <field id="service_id" xsi:type="AttributeExternalKey">
+          <filter><![CDATA[
 						SELECT Service AS s JOIN lnkCustomerContractToService AS l1
 						ON l1.service_id=s.id JOIN CustomerContract AS cc ON l1.customercontract_id=cc.id
 						WHERE cc.org_id = :this->org_id AND s.status != 'obsolete'
 						]]></filter>
-					<dependencies>
-						<attribute id="org_id"/>
-					</dependencies>
-					<sql>service_id</sql>
-					<target_class>Service</target_class>
-					<is_null_allowed>true</is_null_allowed>
-					<on_target_delete>DEL_MANUAL</on_target_delete>
-					<allow_target_creation>false</allow_target_creation>
-				</field>
-				<field id="service_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>service_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="servicesubcategory_id" xsi:type="AttributeExternalKey">
-					<filter><![CDATA[SELECT ServiceSubcategory WHERE service_id = :this->service_id AND request_type = 'incident' AND status != 'obsolete']]></filter>
-					<dependencies>
-						<attribute id="service_id"/>
-					</dependencies>
-					<sql>servicesubcategory_id</sql>
-					<target_class>ServiceSubcategory</target_class>
-					<is_null_allowed>true</is_null_allowed>
-					<on_target_delete>DEL_MANUAL</on_target_delete>
-					<allow_target_creation>false</allow_target_creation>
-				</field>
-				<field id="servicesubcategory_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>servicesubcategory_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="escalation_flag" xsi:type="AttributeEnum">
-					<values>
-						<value id="yes">
-							<code>yes</code>
-						</value>
-						<value id="no">
-							<code>no</code>
-						</value>
-					</values>
-					<sql>escalation_flag</sql>
-					<default_value>no</default_value>
-					<is_null_allowed>true</is_null_allowed>
-					<display_style>list</display_style>
-				</field>
-				<field id="escalation_reason" xsi:type="AttributeString">
-					<sql>escalation_reason</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="assignment_date" xsi:type="AttributeDateTime">
-					<sql>assignment_date</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="resolution_date" xsi:type="AttributeDateTime">
-					<sql>resolution_date</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="last_pending_date" xsi:type="AttributeDateTime">
-					<sql>last_pending_date</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="cumulatedpending" xsi:type="AttributeStopWatch">
-					<states>
-						<state id="pending"/>
-					</states>
-					<working_time/>
-					<thresholds/>
-					<goal/>
-				</field>
-				<field id="tto" xsi:type="AttributeStopWatch">
-					<always_load_in_tables>true</always_load_in_tables>
-					<states>
-						<state id="new"/>
-						<state id="escalated_tto"/>
-					</states>
-					<working_time/>
-					<goal>ResponseTicketTTO</goal>
-					<thresholds>
-						<threshold id="75">
-							<highlight>
-								<code>warning</code>
-								<persistent>false</persistent>
-							</highlight>
-							<actions>
+          <dependencies>
+            <attribute id="org_id"/>
+          </dependencies>
+          <sql>service_id</sql>
+          <target_class>Service</target_class>
+          <is_null_allowed>true</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+          <allow_target_creation>false</allow_target_creation>
+        </field>
+        <field id="service_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>service_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="servicesubcategory_id" xsi:type="AttributeExternalKey">
+          <filter><![CDATA[SELECT ServiceSubcategory WHERE service_id = :this->service_id AND request_type = 'incident' AND status != 'obsolete']]></filter>
+          <dependencies>
+            <attribute id="service_id"/>
+          </dependencies>
+          <sql>servicesubcategory_id</sql>
+          <target_class>ServiceSubcategory</target_class>
+          <is_null_allowed>true</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+          <allow_target_creation>false</allow_target_creation>
+        </field>
+        <field id="servicesubcategory_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>servicesubcategory_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="escalation_flag" xsi:type="AttributeEnum">
+          <values>
+            <value id="yes">
+              <code>yes</code>
+            </value>
+            <value id="no">
+              <code>no</code>
+            </value>
+          </values>
+          <sql>escalation_flag</sql>
+          <default_value>no</default_value>
+          <is_null_allowed>true</is_null_allowed>
+          <display_style>list</display_style>
+        </field>
+        <field id="escalation_reason" xsi:type="AttributeString">
+          <sql>escalation_reason</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="assignment_date" xsi:type="AttributeDateTime">
+          <sql>assignment_date</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="resolution_date" xsi:type="AttributeDateTime">
+          <sql>resolution_date</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="last_pending_date" xsi:type="AttributeDateTime">
+          <sql>last_pending_date</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="cumulatedpending" xsi:type="AttributeStopWatch">
+          <states>
+            <state id="pending"/>
+          </states>
+          <working_time/>
+          <thresholds/>
+          <goal/>
+        </field>
+        <field id="tto" xsi:type="AttributeStopWatch">
+          <always_load_in_tables>true</always_load_in_tables>
+          <states>
+            <state id="new"/>
+            <state id="escalated_tto"/>
+          </states>
+          <working_time/>
+          <goal>ResponseTicketTTO</goal>
+          <thresholds>
+            <threshold id="75">
+              <highlight>
+                <code>warning</code>
+                <persistent>false</persistent>
+              </highlight>
+              <actions>
 							</actions>
-						</threshold>
-						<threshold id="100">
-							<highlight>
-								<code>critical</code>
-								<persistent>false</persistent>
-							</highlight>
-							<actions>
-								<action>
-									<verb>ApplyStimulus</verb>
-									<params>
-										<param>ev_timeout</param>
-									</params>
-								</action>
+            </threshold>
+            <threshold id="100">
+              <highlight>
+                <code>critical</code>
+                <persistent>false</persistent>
+              </highlight>
+              <actions>
+                <action>
+                  <verb>ApplyStimulus</verb>
+                  <params>
+                    <param>ev_timeout</param>
+                  </params>
+                </action>
+              </actions>
+            </threshold>
+          </thresholds>
+        </field>
+        <field id="ttr" xsi:type="AttributeStopWatch">
+          <always_load_in_tables>true</always_load_in_tables>
+          <states>
+            <state id="new"/>
+            <state id="escalated_tto"/>
+            <state id="assigned"/>
+            <state id="escalated_ttr"/>
+          </states>
+          <working_time/>
+          <goal>ResponseTicketTTR</goal>
+          <thresholds>
+            <threshold id="75">
+              <highlight>
+                <code>warning</code>
+                <persistent>false</persistent>
+              </highlight>
+              <actions>
 							</actions>
-						</threshold>
-					</thresholds>
-				</field>
-				<field id="ttr" xsi:type="AttributeStopWatch">
-					<always_load_in_tables>true</always_load_in_tables>
-					<states>
-						<state id="new"/>
-						<state id="escalated_tto"/>
-						<state id="assigned"/>
-						<state id="escalated_ttr"/>
-					</states>
-					<working_time/>
-					<goal>ResponseTicketTTR</goal>
-					<thresholds>
-						<threshold id="75">
-							<highlight>
-								<code>warning</code>
-								<persistent>false</persistent>
-							</highlight>
-							<actions>
-							</actions>
-						</threshold>
-						<threshold id="100">
-							<highlight>
-								<code>critical</code>
-								<persistent>false</persistent>
-							</highlight>
-							<actions>
-								<action>
-									<verb>ApplyStimulus</verb>
-									<params>
-										<param>ev_timeout</param>
-									</params>
-								</action>
-							</actions>
-						</threshold>
-					</thresholds>
-				</field>
-				<field id="tto_escalation_deadline" xsi:type="AttributeSubItem">
-					<target_attcode>tto</target_attcode>
-					<item_code>100_deadline</item_code>
-				</field>
-				<field id="sla_tto_passed" xsi:type="AttributeSubItem">
-					<target_attcode>tto</target_attcode>
-					<item_code>100_passed</item_code>
-				</field>
-				<field id="sla_tto_over" xsi:type="AttributeSubItem">
-					<target_attcode>tto</target_attcode>
-					<item_code>100_overrun</item_code>
-				</field>
-				<field id="ttr_escalation_deadline" xsi:type="AttributeSubItem">
-					<target_attcode>ttr</target_attcode>
-					<item_code>100_deadline</item_code>
-				</field>
-				<field id="sla_ttr_passed" xsi:type="AttributeSubItem">
-					<target_attcode>ttr</target_attcode>
-					<item_code>100_passed</item_code>
-				</field>
-				<field id="sla_ttr_over" xsi:type="AttributeSubItem">
-					<target_attcode>ttr</target_attcode>
-					<item_code>100_overrun</item_code>
-				</field>
-				<field id="time_spent" xsi:type="AttributeDuration">
-					<sql>time_spent</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="resolution_code" xsi:type="AttributeEnum">
-					<values>
-						<value id="assistance">
-							<code>assistance</code>
-						</value>
-						<value id="other">
-							<code>other</code>
-						</value>
-						<value id="software patch">
-							<code>software patch</code>
-						</value>
-						<value id="training">
-							<code>training</code>
-						</value>
-						<value id="hardware repair">
-							<code>hardware repair</code>
-						</value>
-						<value id="system update">
-							<code>system update</code>
-						</value>
-						<value id="bug fixed">
-							<code>bug fixed</code>
-						</value>
-					</values>
-					<sql>resolution_code</sql>
-					<default_value>assistance</default_value>
-					<is_null_allowed>true</is_null_allowed>
-					<display_style>list</display_style>
-				</field>
-				<field id="solution" xsi:type="AttributeText">
-					<sql>solution</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="pending_reason" xsi:type="AttributeText">
-					<sql>pending_reason</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="parent_incident_id" xsi:type="AttributeExternalKey">
-					<filter><![CDATA[SELECT Incident WHERE id != :this->id AND status NOT IN ('resolved','closed')]]></filter>
-					<sql>parent_incident_id</sql>
-					<target_class>Incident</target_class>
-					<is_null_allowed>true</is_null_allowed>
-					<on_target_delete>DEL_MANUAL</on_target_delete>
-				</field>
-				<field id="parent_incident_ref" xsi:type="AttributeExternalField">
-					<extkey_attcode>parent_incident_id</extkey_attcode>
-					<target_attcode>ref</target_attcode>
-				</field>
-				<field id="parent_problem_id" xsi:type="AttributeExternalKey">
-					<sql>parent_problem_id</sql>
-					<target_class>Problem</target_class>
-					<is_null_allowed>true</is_null_allowed>
-					<on_target_delete>DEL_MANUAL</on_target_delete>
-				</field>
-				<field id="parent_problem_ref" xsi:type="AttributeExternalField">
-					<extkey_attcode>parent_problem_id</extkey_attcode>
-					<target_attcode>ref</target_attcode>
-				</field>
-				<field id="parent_change_id" xsi:type="AttributeExternalKey">
-					<filter><![CDATA[SELECT Change WHERE status != "closed"]]></filter>
-					<sql>parent_change_id</sql>
-					<target_class>Change</target_class>
-					<is_null_allowed>true</is_null_allowed>
-					<on_target_delete>DEL_MANUAL</on_target_delete>
-				</field>
-				<field id="parent_change_ref" xsi:type="AttributeExternalField">
-					<extkey_attcode>parent_change_id</extkey_attcode>
-					<target_attcode>ref</target_attcode>
-				</field>
-				<field id="related_request_list" xsi:type="AttributeLinkedSet">
-					<linked_class>UserRequest</linked_class>
-					<ext_key_to_me>parent_incident_id</ext_key_to_me>
-					<edit_mode>add_remove</edit_mode>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-				</field>
-				<field id="child_incidents_list" xsi:type="AttributeLinkedSet">
-					<linked_class>Incident</linked_class>
-					<ext_key_to_me>parent_incident_id</ext_key_to_me>
-					<edit_mode>add_remove</edit_mode>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-				</field>
-				<field id="public_log" xsi:type="AttributeCaseLog">
-					<sql>public_log</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="user_satisfaction" xsi:type="AttributeEnum">
-					<values>
-						<value id="1">
-							<code>1</code>
-						</value>
-						<value id="2">
-							<code>2</code>
-						</value>
-						<value id="3">
-							<code>3</code>
-						</value>
-						<value id="4">
-							<code>4</code>
-						</value>
-					</values>
-					<sql>user_satisfaction</sql>
-					<default_value>1</default_value>
-					<is_null_allowed>true</is_null_allowed>
-					<display_style>list</display_style>
-				</field>
-				<field id="user_comment" xsi:type="AttributeText">
-					<sql>user_commment</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-			</fields>
-			<lifecycle>
-				<highlight_scale>
-					<item id="warning">
-						<rank>1</rank>
-						<color>HIGHLIGHT_CLASS_WARNING</color>
-							<icon>images/incident-deadline.svg</icon>
-					</item>
-					<item id="critical">
-						<rank>2</rank>
-						<color>HIGHLIGHT_CLASS_CRITICAL</color>
-							<icon>images/incident-escalated.svg</icon>
-					</item>
-					<item id="closed">
-						<rank>3</rank>
-						<color>HIGHLIGHT_CLASS_NONE</color>
-							<icon>images/incident-closed.svg</icon>
-					</item>
-				</highlight_scale>
-				<stimuli>
-					<stimulus id="ev_assign" xsi:type="StimulusUserAction"/>
-					<stimulus id="ev_reassign" xsi:type="StimulusUserAction"/>
-					<stimulus id="ev_pending" xsi:type="StimulusUserAction"/>
-					<stimulus id="ev_timeout" xsi:type="StimulusInternal"/>
-					<stimulus id="ev_autoresolve" xsi:type="StimulusInternal"/>
-					<stimulus id="ev_autoclose" xsi:type="StimulusInternal"/>
-					<stimulus id="ev_resolve" xsi:type="StimulusUserAction"/>
-					<stimulus id="ev_close" xsi:type="StimulusUserAction"/>
-					<stimulus id="ev_reopen" xsi:type="StimulusUserAction"/>
-				</stimuli>
-				<states>
-					<state id="new">
-						<flags>
-							<attribute id="ref">
-								<read_only/>
-							</attribute>
-							<attribute id="org_id">
-								<mandatory/>
-							</attribute>
-							<attribute id="caller_id">
-								<mandatory/>
-							</attribute>
-							<attribute id="team_id">
-								<hidden/>
-							</attribute>
-							<attribute id="agent_id">
-								<hidden/>
-							</attribute>
-							<attribute id="priority">
-								<read_only/>
-							</attribute>
-							<attribute id="start_date">
-								<read_only/>
-							</attribute>
-							<attribute id="last_update">
-								<read_only/>
-							</attribute>
-							<attribute id="close_date">
-								<hidden/>
-							</attribute>
-							<attribute id="escalation_flag">
-								<hidden/>
-							</attribute>
-							<attribute id="escalation_reason">
-								<hidden/>
-							</attribute>
-							<attribute id="assignment_date">
-								<hidden/>
-							</attribute>
-							<attribute id="resolution_date">
-								<hidden/>
-							</attribute>
-							<attribute id="last_pending_date">
-								<hidden/>
-							</attribute>
-							<attribute id="time_spent">
-								<hidden/>
-							</attribute>
-							<attribute id="resolution_code">
-								<hidden/>
-							</attribute>
-							<attribute id="solution">
-								<hidden/>
-							</attribute>
-							<attribute id="pending_reason">
-								<hidden/>
-							</attribute>
-							<attribute id="user_satisfaction">
-								<hidden/>
-							</attribute>
-							<attribute id="user_comment">
-								<hidden/>
-							</attribute>
-							<attribute id="tto_escalation_deadline">
-								<read_only/>
-							</attribute>
-							<attribute id="sla_tto_passed">
-								<hidden/>
-							</attribute>
-							<attribute id="sla_tto_over">
-								<hidden/>
-							</attribute>
-							<attribute id="sla_ttr_passed">
-								<hidden/>
-							</attribute>
-							<attribute id="ttr_escalation_deadline">
-								<hidden/>
-							</attribute>
-							<attribute id="sla_ttr_over">
-								<hidden/>
-							</attribute>
-						</flags>
-						<transitions>
-							<transition id="ev_assign">
-								<target>assigned</target>
-								<actions>
-									<action>
-										<verb>SetCurrentDate</verb>
-										<params>
-											<param xsi:type="attcode">assignment_date</param>
-										</params>
-									</action>
+            </threshold>
+            <threshold id="100">
+              <highlight>
+                <code>critical</code>
+                <persistent>false</persistent>
+              </highlight>
+              <actions>
+                <action>
+                  <verb>ApplyStimulus</verb>
+                  <params>
+                    <param>ev_timeout</param>
+                  </params>
+                </action>
+              </actions>
+            </threshold>
+          </thresholds>
+        </field>
+        <field id="tto_escalation_deadline" xsi:type="AttributeSubItem">
+          <target_attcode>tto</target_attcode>
+          <item_code>100_deadline</item_code>
+        </field>
+        <field id="sla_tto_passed" xsi:type="AttributeSubItem">
+          <target_attcode>tto</target_attcode>
+          <item_code>100_passed</item_code>
+        </field>
+        <field id="sla_tto_over" xsi:type="AttributeSubItem">
+          <target_attcode>tto</target_attcode>
+          <item_code>100_overrun</item_code>
+        </field>
+        <field id="ttr_escalation_deadline" xsi:type="AttributeSubItem">
+          <target_attcode>ttr</target_attcode>
+          <item_code>100_deadline</item_code>
+        </field>
+        <field id="sla_ttr_passed" xsi:type="AttributeSubItem">
+          <target_attcode>ttr</target_attcode>
+          <item_code>100_passed</item_code>
+        </field>
+        <field id="sla_ttr_over" xsi:type="AttributeSubItem">
+          <target_attcode>ttr</target_attcode>
+          <item_code>100_overrun</item_code>
+        </field>
+        <field id="time_spent" xsi:type="AttributeDuration">
+          <sql>time_spent</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="resolution_code" xsi:type="AttributeEnum">
+          <values>
+            <value id="assistance">
+              <code>assistance</code>
+            </value>
+            <value id="other">
+              <code>other</code>
+            </value>
+            <value id="software patch">
+              <code>software patch</code>
+            </value>
+            <value id="training">
+              <code>training</code>
+            </value>
+            <value id="hardware repair">
+              <code>hardware repair</code>
+            </value>
+            <value id="system update">
+              <code>system update</code>
+            </value>
+            <value id="bug fixed">
+              <code>bug fixed</code>
+            </value>
+          </values>
+          <sql>resolution_code</sql>
+          <default_value>assistance</default_value>
+          <is_null_allowed>true</is_null_allowed>
+          <display_style>list</display_style>
+        </field>
+        <field id="solution" xsi:type="AttributeText">
+          <sql>solution</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="pending_reason" xsi:type="AttributeText">
+          <sql>pending_reason</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="parent_incident_id" xsi:type="AttributeExternalKey">
+          <filter><![CDATA[SELECT Incident WHERE id != :this->id AND status NOT IN ('resolved','closed')]]></filter>
+          <sql>parent_incident_id</sql>
+          <target_class>Incident</target_class>
+          <is_null_allowed>true</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+        </field>
+        <field id="parent_incident_ref" xsi:type="AttributeExternalField">
+          <extkey_attcode>parent_incident_id</extkey_attcode>
+          <target_attcode>ref</target_attcode>
+        </field>
+        <field id="parent_problem_id" xsi:type="AttributeExternalKey">
+          <sql>parent_problem_id</sql>
+          <target_class>Problem</target_class>
+          <is_null_allowed>true</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+        </field>
+        <field id="parent_problem_ref" xsi:type="AttributeExternalField">
+          <extkey_attcode>parent_problem_id</extkey_attcode>
+          <target_attcode>ref</target_attcode>
+        </field>
+        <field id="parent_change_id" xsi:type="AttributeExternalKey">
+          <filter><![CDATA[SELECT Change WHERE status != "closed"]]></filter>
+          <sql>parent_change_id</sql>
+          <target_class>Change</target_class>
+          <is_null_allowed>true</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+        </field>
+        <field id="parent_change_ref" xsi:type="AttributeExternalField">
+          <extkey_attcode>parent_change_id</extkey_attcode>
+          <target_attcode>ref</target_attcode>
+        </field>
+        <field id="related_request_list" xsi:type="AttributeLinkedSet">
+          <linked_class>UserRequest</linked_class>
+          <ext_key_to_me>parent_incident_id</ext_key_to_me>
+          <legacy_edit_mode>add_remove</legacy_edit_mode>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <relation_type>link</relation_type>
+          <read_only>false</read_only>
+        </field>
+        <field id="child_incidents_list" xsi:type="AttributeLinkedSet">
+          <linked_class>Incident</linked_class>
+          <ext_key_to_me>parent_incident_id</ext_key_to_me>
+          <legacy_edit_mode>add_remove</legacy_edit_mode>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <relation_type>link</relation_type>
+          <read_only>false</read_only>
+        </field>
+        <field id="public_log" xsi:type="AttributeCaseLog">
+          <sql>public_log</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="user_satisfaction" xsi:type="AttributeEnum">
+          <values>
+            <value id="1">
+              <code>1</code>
+            </value>
+            <value id="2">
+              <code>2</code>
+            </value>
+            <value id="3">
+              <code>3</code>
+            </value>
+            <value id="4">
+              <code>4</code>
+            </value>
+          </values>
+          <sql>user_satisfaction</sql>
+          <default_value>1</default_value>
+          <is_null_allowed>true</is_null_allowed>
+          <display_style>list</display_style>
+        </field>
+        <field id="user_comment" xsi:type="AttributeText">
+          <sql>user_commment</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+      </fields>
+      <lifecycle>
+        <highlight_scale>
+          <item id="warning">
+            <rank>1</rank>
+            <color>HIGHLIGHT_CLASS_WARNING</color>
+            <icon>images/incident-deadline.svg</icon>
+          </item>
+          <item id="critical">
+            <rank>2</rank>
+            <color>HIGHLIGHT_CLASS_CRITICAL</color>
+            <icon>images/incident-escalated.svg</icon>
+          </item>
+          <item id="closed">
+            <rank>3</rank>
+            <color>HIGHLIGHT_CLASS_NONE</color>
+            <icon>images/incident-closed.svg</icon>
+          </item>
+        </highlight_scale>
+        <stimuli>
+          <stimulus id="ev_assign" xsi:type="StimulusUserAction"/>
+          <stimulus id="ev_reassign" xsi:type="StimulusUserAction"/>
+          <stimulus id="ev_pending" xsi:type="StimulusUserAction"/>
+          <stimulus id="ev_timeout" xsi:type="StimulusInternal"/>
+          <stimulus id="ev_autoresolve" xsi:type="StimulusInternal"/>
+          <stimulus id="ev_autoclose" xsi:type="StimulusInternal"/>
+          <stimulus id="ev_resolve" xsi:type="StimulusUserAction"/>
+          <stimulus id="ev_close" xsi:type="StimulusUserAction"/>
+          <stimulus id="ev_reopen" xsi:type="StimulusUserAction"/>
+        </stimuli>
+        <states>
+          <state id="new">
+            <flags>
+              <attribute id="ref">
+                <read_only/>
+              </attribute>
+              <attribute id="org_id">
+                <mandatory/>
+              </attribute>
+              <attribute id="caller_id">
+                <mandatory/>
+              </attribute>
+              <attribute id="team_id">
+                <hidden/>
+              </attribute>
+              <attribute id="agent_id">
+                <hidden/>
+              </attribute>
+              <attribute id="priority">
+                <read_only/>
+              </attribute>
+              <attribute id="start_date">
+                <read_only/>
+              </attribute>
+              <attribute id="last_update">
+                <read_only/>
+              </attribute>
+              <attribute id="close_date">
+                <hidden/>
+              </attribute>
+              <attribute id="escalation_flag">
+                <hidden/>
+              </attribute>
+              <attribute id="escalation_reason">
+                <hidden/>
+              </attribute>
+              <attribute id="assignment_date">
+                <hidden/>
+              </attribute>
+              <attribute id="resolution_date">
+                <hidden/>
+              </attribute>
+              <attribute id="last_pending_date">
+                <hidden/>
+              </attribute>
+              <attribute id="time_spent">
+                <hidden/>
+              </attribute>
+              <attribute id="resolution_code">
+                <hidden/>
+              </attribute>
+              <attribute id="solution">
+                <hidden/>
+              </attribute>
+              <attribute id="pending_reason">
+                <hidden/>
+              </attribute>
+              <attribute id="user_satisfaction">
+                <hidden/>
+              </attribute>
+              <attribute id="user_comment">
+                <hidden/>
+              </attribute>
+              <attribute id="tto_escalation_deadline">
+                <read_only/>
+              </attribute>
+              <attribute id="sla_tto_passed">
+                <hidden/>
+              </attribute>
+              <attribute id="sla_tto_over">
+                <hidden/>
+              </attribute>
+              <attribute id="sla_ttr_passed">
+                <hidden/>
+              </attribute>
+              <attribute id="ttr_escalation_deadline">
+                <hidden/>
+              </attribute>
+              <attribute id="sla_ttr_over">
+                <hidden/>
+              </attribute>
+            </flags>
+            <transitions>
+              <transition id="ev_assign">
+                <target>assigned</target>
+                <actions>
+                  <action>
+                    <verb>SetCurrentDate</verb>
+                    <params>
+                      <param xsi:type="attcode">assignment_date</param>
+                    </params>
+                  </action>
+                </actions>
+              </transition>
+              <transition id="ev_timeout">
+                <target>escalated_tto</target>
+                <actions/>
+              </transition>
+              <transition id="ev_autoresolve">
+                <target>resolved</target>
+                <actions>
+                  <action>
+                    <verb>SetCurrentDate</verb>
+                    <params>
+                      <param xsi:type="attcode">resolution_date</param>
+                    </params>
+                  </action>
+                  <action>
+                    <verb>SetElapsedTime</verb>
+                    <params>
+                      <param xsi:type="attcode">time_spent</param>
+                      <param xsi:type="attcode">start_date</param>
+                      <param xsi:type="string">DefaultWorkingTimeComputer</param>
+                    </params>
+                  </action>
+                  <action>
+                    <verb>ResolveChildTickets</verb>
+                    <params/>
+                  </action>
+                </actions>
+              </transition>
+            </transitions>
+          </state>
+          <state id="escalated_tto">
+            <highlight>
+              <code>critical</code>
+            </highlight>
+            <inherit_flags_from>new</inherit_flags_from>
+            <flags>
+              <attribute id="team_id"/>
+            </flags>
+            <transitions>
+              <transition id="ev_assign">
+                <target>assigned</target>
+                <actions>
+                  <action>
+                    <verb>SetAssignedDate</verb>
+                  </action>
+                </actions>
+              </transition>
+            </transitions>
+          </state>
+          <state id="assigned">
+            <inherit_flags_from>new</inherit_flags_from>
+            <flags>
+              <attribute id="team_id">
+                <mandatory/>
+                <must_prompt/>
+                <read_only/>
+              </attribute>
+              <attribute id="agent_id">
+                <mandatory/>
+                <must_prompt/>
+                <read_only/>
+              </attribute>
+              <attribute id="assignment_date">
+                <read_only/>
+              </attribute>
+              <attribute id="tto_escalation_deadline">
+                <hidden/>
+              </attribute>
+              <attribute id="sla_tto_passed">
+                <read_only/>
+              </attribute>
+              <attribute id="sla_tto_over">
+                <read_only/>
+              </attribute>
+              <attribute id="ttr_escalation_deadline">
+                <read_only/>
+              </attribute>
+              <attribute id="caller_id"/>
+              <attribute id="escalation_flag"/>
+              <attribute id="escalation_reason"/>
+            </flags>
+            <transitions>
+              <transition id="ev_pending">
+                <target>pending</target>
+                <actions>
+                  <action>
+                    <verb>SetCurrentDate</verb>
+                    <params>
+                      <param xsi:type="attcode">last_pending_date</param>
+                    </params>
+                  </action>
+                </actions>
+              </transition>
+              <transition id="ev_resolve">
+                <target>resolved</target>
+                <actions>
+                  <action>
+                    <verb>SetCurrentDate</verb>
+                    <params>
+                      <param xsi:type="attcode">resolution_date</param>
+                    </params>
+                  </action>
+                  <action>
+                    <verb>SetElapsedTime</verb>
+                    <params>
+                      <param xsi:type="attcode">time_spent</param>
+                      <param xsi:type="attcode">start_date</param>
+                      <param xsi:type="string">DefaultWorkingTimeComputer</param>
+                    </params>
+                  </action>
+                  <action>
+                    <verb>ResolveChildTickets</verb>
+                    <params/>
+                  </action>
+                </actions>
+              </transition>
+              <transition id="ev_reassign">
+                <target>assigned</target>
+                <actions/>
+                <flags>
+                  <attribute id="agent_id">
+                    <must_change/>
+                  </attribute>
+                  <attribute id="team_id">
+                    <must_prompt/>
+                  </attribute>
+                </flags>
+              </transition>
+              <transition id="ev_timeout">
+                <target>escalated_ttr</target>
+                <actions/>
+              </transition>
+              <transition id="ev_autoresolve">
+                <target>resolved</target>
+                <actions>
+                  <action>
+                    <verb>SetCurrentDate</verb>
+                    <params>
+                      <param xsi:type="attcode">resolution_date</param>
+                    </params>
+                  </action>
+                  <action>
+                    <verb>SetElapsedTime</verb>
+                    <params>
+                      <param xsi:type="attcode">time_spent</param>
+                      <param xsi:type="attcode">start_date</param>
+                      <param xsi:type="string">DefaultWorkingTimeComputer</param>
+                    </params>
+                  </action>
+                  <action>
+                    <verb>ResolveChildTickets</verb>
+                    <params/>
+                  </action>
+                </actions>
+              </transition>
+            </transitions>
+          </state>
+          <state id="escalated_ttr">
+            <highlight>
+              <code>critical</code>
+            </highlight>
+            <inherit_flags_from>assigned</inherit_flags_from>
+            <flags/>
+            <transitions>
+              <transition id="ev_pending">
+                <target>pending</target>
+                <actions>
+                  <action>
+                    <verb>SetCurrentDate</verb>
+                    <params>
+                      <param xsi:type="attcode">last_pending_date</param>
+                    </params>
+                  </action>
+                </actions>
+              </transition>
+              <transition id="ev_resolve">
+                <target>resolved</target>
+                <actions>
+                  <action>
+                    <verb>SetCurrentDate</verb>
+                    <params>
+                      <param xsi:type="attcode">resolution_date</param>
+                    </params>
+                  </action>
+                  <action>
+                    <verb>SetElapsedTime</verb>
+                    <params>
+                      <param xsi:type="attcode">time_spent</param>
+                      <param xsi:type="attcode">start_date</param>
+                      <param xsi:type="string">DefaultWorkingTimeComputer</param>
+                    </params>
+                  </action>
+                  <action>
+                    <verb>ResolveChildTickets</verb>
+                    <params/>
+                  </action>
+                </actions>
+              </transition>
+              <transition id="ev_reassign">
+                <target>assigned</target>
+                <actions/>
+              </transition>
+              <transition id="ev_autoresolve">
+                <target>resolved</target>
+                <actions>
+                  <action>
+                    <verb>SetCurrentDate</verb>
+                    <params>
+                      <param xsi:type="attcode">resolution_date</param>
+                    </params>
+                  </action>
+                  <action>
+                    <verb>SetElapsedTime</verb>
+                    <params>
+                      <param xsi:type="attcode">time_spent</param>
+                      <param xsi:type="attcode">start_date</param>
+                      <param xsi:type="string">DefaultWorkingTimeComputer</param>
+                    </params>
+                  </action>
+                  <action>
+                    <verb>ResolveChildTickets</verb>
+                    <params/>
+                  </action>
+                </actions>
+              </transition>
+            </transitions>
+          </state>
+          <state id="pending">
+            <inherit_flags_from>assigned</inherit_flags_from>
+            <flags>
+              <attribute id="last_pending_date">
+                <read_only/>
+              </attribute>
+              <attribute id="ttr_escalation_deadline">
+                <hidden/>
+              </attribute>
+              <attribute id="sla_tto_passed">
+                <hidden/>
+              </attribute>
+              <attribute id="sla_tto_over">
+                <hidden/>
+              </attribute>
+              <attribute id="pending_reason">
+                <mandatory/>
+                <must_prompt/>
+              </attribute>
+            </flags>
+            <transitions>
+              <transition id="ev_assign">
+                <target>assigned</target>
+                <actions>
 								</actions>
-							</transition>
-							<transition id="ev_timeout">
-								<target>escalated_tto</target>
-								<actions/>
-							</transition>
-							<transition id="ev_autoresolve">
-								<target>resolved</target>
-								<actions>
-									<action>
-										<verb>SetCurrentDate</verb>
-										<params>
-											<param xsi:type="attcode">resolution_date</param>
-										</params>
-									</action>
-									<action>
-										<verb>SetElapsedTime</verb>
-										<params>
-											<param xsi:type="attcode">time_spent</param>
-											<param xsi:type="attcode">start_date</param>
-											<param xsi:type="string">DefaultWorkingTimeComputer</param>
-										</params>
-									</action>
-									<action>
-										<verb>ResolveChildTickets</verb>
-										<params/>
-									</action>
+              </transition>
+              <transition id="ev_autoresolve">
+                <target>resolved</target>
+                <actions>
+                  <action>
+                    <verb>SetCurrentDate</verb>
+                    <params>
+                      <param xsi:type="attcode">resolution_date</param>
+                    </params>
+                  </action>
+                  <action>
+                    <verb>SetElapsedTime</verb>
+                    <params>
+                      <param xsi:type="attcode">time_spent</param>
+                      <param xsi:type="attcode">start_date</param>
+                      <param xsi:type="string">DefaultWorkingTimeComputer</param>
+                    </params>
+                  </action>
+                  <action>
+                    <verb>ResolveChildTickets</verb>
+                    <params/>
+                  </action>
+                </actions>
+              </transition>
+            </transitions>
+          </state>
+          <state id="resolved">
+            <highlight>
+              <code>closed</code>
+            </highlight>
+            <inherit_flags_from>assigned</inherit_flags_from>
+            <flags>
+              <attribute id="caller_id">
+                <read_only/>
+              </attribute>
+              <attribute id="origin">
+                <read_only/>
+              </attribute>
+              <attribute id="private_log"/>
+              <attribute id="impact">
+                <read_only/>
+              </attribute>
+              <attribute id="urgency">
+                <read_only/>
+              </attribute>
+              <attribute id="service_id">
+                <mandatory/>
+                <must_prompt/>
+              </attribute>
+              <attribute id="servicesubcategory_id">
+                <must_prompt/>
+              </attribute>
+              <attribute id="escalation_flag">
+                <read_only/>
+              </attribute>
+              <attribute id="escalation_reason">
+                <read_only/>
+              </attribute>
+              <attribute id="parent_incident_id">
+                <read_only/>
+              </attribute>
+              <attribute id="parent_change_id">
+                <read_only/>
+              </attribute>
+              <attribute id="parent_problem_id">
+                <read_only/>
+              </attribute>
+              <attribute id="title">
+                <read_only/>
+              </attribute>
+              <attribute id="description">
+                <read_only/>
+              </attribute>
+              <attribute id="org_id">
+                <read_only/>
+              </attribute>
+              <attribute id="team_id">
+                <read_only/>
+              </attribute>
+              <attribute id="agent_id">
+                <read_only/>
+              </attribute>
+              <attribute id="resolution_date">
+                <read_only/>
+              </attribute>
+              <attribute id="time_spent">
+                <read_only/>
+              </attribute>
+              <attribute id="resolution_code">
+                <mandatory/>
+                <must_prompt/>
+              </attribute>
+              <attribute id="solution">
+                <mandatory/>
+                <must_prompt/>
+              </attribute>
+              <attribute id="pending_reason">
+                <read_only/>
+              </attribute>
+              <attribute id="sla_ttr_passed">
+                <read_only/>
+              </attribute>
+              <attribute id="ttr_escalation_deadline">
+                <hidden/>
+              </attribute>
+              <attribute id="sla_ttr_over">
+                <read_only/>
+              </attribute>
+            </flags>
+            <transitions>
+              <transition id="ev_close">
+                <target>closed</target>
+                <actions>
+                  <action>
+                    <verb>SetCurrentDate</verb>
+                    <params>
+                      <param xsi:type="attcode">close_date</param>
+                    </params>
+                  </action>
+                </actions>
+              </transition>
+              <transition id="ev_reopen">
+                <target>assigned</target>
+                <actions>
 								</actions>
-							</transition>
-						</transitions>
-					</state>
-					<state id="escalated_tto">
-						<highlight>
-							<code>critical</code>
-						</highlight>
-						<inherit_flags_from>new</inherit_flags_from>
-						<flags>
-							<attribute id="team_id"/>
-						</flags>
-						<transitions>
-							<transition id="ev_assign">
-								<target>assigned</target>
-								<actions>
-									<action>
-										<verb>SetAssignedDate</verb>
-									</action>
-								</actions>
-							</transition>
-						</transitions>
-					</state>
-					<state id="assigned">
-						<inherit_flags_from>new</inherit_flags_from>
-						<flags>
-							<attribute id="team_id">
-								<mandatory/>
-								<must_prompt/>
-								<read_only/>
-							</attribute>
-							<attribute id="agent_id">
-								<mandatory/>
-								<must_prompt/>
-								<read_only/>
-							</attribute>
-							<attribute id="assignment_date">
-								<read_only/>
-							</attribute>
-							<attribute id="tto_escalation_deadline">
-								<hidden/>
-							</attribute>
-							<attribute id="sla_tto_passed">
-								<read_only/>
-							</attribute>
-							<attribute id="sla_tto_over">
-								<read_only/>
-							</attribute>
-							<attribute id="ttr_escalation_deadline">
-								<read_only/>
-							</attribute>
-							<attribute id="caller_id"/>
-							<attribute id="escalation_flag"/>
-							<attribute id="escalation_reason"/>
-						</flags>
-						<transitions>
-							<transition id="ev_pending">
-								<target>pending</target>
-								<actions>
-									<action>
-										<verb>SetCurrentDate</verb>
-										<params>
-											<param xsi:type="attcode">last_pending_date</param>
-										</params>
-									</action>
-								</actions>
-							</transition>
-							<transition id="ev_resolve">
-								<target>resolved</target>
-								<actions>
-									<action>
-										<verb>SetCurrentDate</verb>
-										<params>
-											<param xsi:type="attcode">resolution_date</param>
-										</params>
-									</action>
-									<action>
-										<verb>SetElapsedTime</verb>
-										<params>
-											<param xsi:type="attcode">time_spent</param>
-											<param xsi:type="attcode">start_date</param>
-											<param xsi:type="string">DefaultWorkingTimeComputer</param>
-										</params>
-									</action>
-									<action>
-										<verb>ResolveChildTickets</verb>
-										<params/>
-									</action>
-								</actions>
-							</transition>
-							<transition id="ev_reassign">
-								<target>assigned</target>
-								<actions/>
-								<flags>
-									<attribute id="agent_id">
-										<must_change/>
-									</attribute>
-									<attribute id="team_id">
-										<must_prompt/>
-									</attribute>
-								</flags>
-							</transition>
-							<transition id="ev_timeout">
-								<target>escalated_ttr</target>
-								<actions/>
-							</transition>
-							<transition id="ev_autoresolve">
-								<target>resolved</target>
-								<actions>
-									<action>
-										<verb>SetCurrentDate</verb>
-										<params>
-											<param xsi:type="attcode">resolution_date</param>
-										</params>
-									</action>
-									<action>
-										<verb>SetElapsedTime</verb>
-										<params>
-											<param xsi:type="attcode">time_spent</param>
-											<param xsi:type="attcode">start_date</param>
-											<param xsi:type="string">DefaultWorkingTimeComputer</param>
-										</params>
-									</action>
-									<action>
-										<verb>ResolveChildTickets</verb>
-										<params/>
-									</action>
-								</actions>
-							</transition>
-						</transitions>
-					</state>
-					<state id="escalated_ttr">
-						<highlight>
-							<code>critical</code>
-						</highlight>
-						<inherit_flags_from>assigned</inherit_flags_from>
-						<flags/>
-						<transitions>
-							<transition id="ev_pending">
-								<target>pending</target>
-								<actions>
-									<action>
-										<verb>SetCurrentDate</verb>
-										<params>
-											<param xsi:type="attcode">last_pending_date</param>
-										</params>
-									</action>
-								</actions>
-							</transition>
-							<transition id="ev_resolve">
-								<target>resolved</target>
-								<actions>
-									<action>
-										<verb>SetCurrentDate</verb>
-										<params>
-											<param xsi:type="attcode">resolution_date</param>
-										</params>
-									</action>
-									<action>
-										<verb>SetElapsedTime</verb>
-										<params>
-											<param xsi:type="attcode">time_spent</param>
-											<param xsi:type="attcode">start_date</param>
-											<param xsi:type="string">DefaultWorkingTimeComputer</param>
-										</params>
-									</action>
-									<action>
-										<verb>ResolveChildTickets</verb>
-										<params/>
-									</action>
-								</actions>
-							</transition>
-							<transition id="ev_reassign">
-								<target>assigned</target>
-								<actions/>
-							</transition>
-							<transition id="ev_autoresolve">
-								<target>resolved</target>
-								<actions>
-									<action>
-										<verb>SetCurrentDate</verb>
-										<params>
-											<param xsi:type="attcode">resolution_date</param>
-										</params>
-									</action>
-									<action>
-										<verb>SetElapsedTime</verb>
-										<params>
-											<param xsi:type="attcode">time_spent</param>
-											<param xsi:type="attcode">start_date</param>
-											<param xsi:type="string">DefaultWorkingTimeComputer</param>
-										</params>
-									</action>
-									<action>
-										<verb>ResolveChildTickets</verb>
-										<params/>
-									</action>
-								</actions>
-							</transition>
-						</transitions>
-					</state>
-					<state id="pending">
-						<inherit_flags_from>assigned</inherit_flags_from>
-						<flags>
-							<attribute id="last_pending_date">
-								<read_only/>
-							</attribute>
-							<attribute id="ttr_escalation_deadline">
-								<hidden/>
-							</attribute>
-							<attribute id="sla_tto_passed">
-								<hidden/>
-							</attribute>
-							<attribute id="sla_tto_over">
-								<hidden/>
-							</attribute>
-							<attribute id="pending_reason">
-								<mandatory/>
-								<must_prompt/>
-							</attribute>
-						</flags>
-						<transitions>
-							<transition id="ev_assign">
-								<target>assigned</target>
-								<actions>
-								</actions>
-							</transition>
-							<transition id="ev_autoresolve">
-								<target>resolved</target>
-								<actions>
-									<action>
-										<verb>SetCurrentDate</verb>
-										<params>
-											<param xsi:type="attcode">resolution_date</param>
-										</params>
-									</action>
-									<action>
-										<verb>SetElapsedTime</verb>
-										<params>
-											<param xsi:type="attcode">time_spent</param>
-											<param xsi:type="attcode">start_date</param>
-											<param xsi:type="string">DefaultWorkingTimeComputer</param>
-										</params>
-									</action>
-									<action>
-										<verb>ResolveChildTickets</verb>
-										<params/>
-									</action>
-								</actions>
-							</transition>
-						</transitions>
-					</state>
-					<state id="resolved">
-						<highlight>
-							<code>closed</code>
-						</highlight>
-						<inherit_flags_from>assigned</inherit_flags_from>
-						<flags>
-							<attribute id="caller_id">
-								<read_only/>
-							</attribute>
-							<attribute id="origin">
-								<read_only/>
-							</attribute>
-							<attribute id="private_log"/>
-							<attribute id="impact">
-								<read_only/>
-							</attribute>
-							<attribute id="urgency">
-								<read_only/>
-							</attribute>
-							<attribute id="service_id">
-								<mandatory/>
-								<must_prompt/>
-							</attribute>
-							<attribute id="servicesubcategory_id">
-								<must_prompt/>
-							</attribute>
-							<attribute id="escalation_flag">
-								<read_only/>
-							</attribute>
-							<attribute id="escalation_reason">
-								<read_only/>
-							</attribute>
-							<attribute id="parent_incident_id">
-								<read_only/>
-							</attribute>
-							<attribute id="parent_change_id">
-								<read_only/>
-							</attribute>
-							<attribute id="parent_problem_id">
-								<read_only/>
-							</attribute>
-							<attribute id="title">
-								<read_only/>
-							</attribute>
-							<attribute id="description">
-								<read_only/>
-							</attribute>
-							<attribute id="org_id">
-								<read_only/>
-							</attribute>
-							<attribute id="team_id">
-								<read_only/>
-							</attribute>
-							<attribute id="agent_id">
-								<read_only/>
-							</attribute>
-							<attribute id="resolution_date">
-								<read_only/>
-							</attribute>
-							<attribute id="time_spent">
-								<read_only/>
-							</attribute>
-							<attribute id="resolution_code">
-								<mandatory/>
-								<must_prompt/>
-							</attribute>
-							<attribute id="solution">
-								<mandatory/>
-								<must_prompt/>
-							</attribute>
-							<attribute id="pending_reason">
-								<read_only/>
-							</attribute>
-							<attribute id="sla_ttr_passed">
-								<read_only/>
-							</attribute>
-							<attribute id="ttr_escalation_deadline">
-								<hidden/>
-							</attribute>
-							<attribute id="sla_ttr_over">
-								<read_only/>
-							</attribute>
-						</flags>
-						<transitions>
-							<transition id="ev_close">
-								<target>closed</target>
-								<actions>
-									<action>
-										<verb>SetCurrentDate</verb>
-										<params>
-											<param xsi:type="attcode">close_date</param>
-										</params>
-									</action>
-								</actions>
-							</transition>
-							<transition id="ev_reopen">
-								<target>assigned</target>
-								<actions>
-								</actions>
-							</transition>
-							<transition id="ev_autoresolve">
-								<target>resolved</target>
-								<actions>
-									<action>
-										<verb>SetCurrentDate</verb>
-										<params>
-											<param xsi:type="attcode">resolution_date</param>
-										</params>
-									</action>
-									<action>
-										<verb>SetElapsedTime</verb>
-										<params>
-											<param xsi:type="attcode">time_spent</param>
-											<param xsi:type="attcode">start_date</param>
-											<param xsi:type="string">DefaultWorkingTimeComputer</param>
-										</params>
-									</action>
-									<action>
-										<verb>ResolveChildTickets</verb>
-										<params/>
-									</action>
-								</actions>
-							</transition>
-						</transitions>
-					</state>
-					<state id="closed">
-						<highlight>
-							<code>closed</code>
-						</highlight>
-						<inherit_flags_from>resolved</inherit_flags_from>
-						<flags>
-							<attribute id="public_log">
-								<read_only/>
-							</attribute>
-							<attribute id="functionalcis_list">
-								<read_only/>
-							</attribute>
-							<attribute id="contacts_list">
-								<read_only/>
-							</attribute>
-							<attribute id="private_log">
-								<read_only/>
-							</attribute>
-							<attribute id="service_id">
-								<read_only/>
-							</attribute>
-							<attribute id="servicesubcategory_id">
-								<read_only/>
-							</attribute>
-							<attribute id="close_date">
-								<read_only/>
-							</attribute>
-							<attribute id="resolution_code">
-								<read_only/>
-							</attribute>
-							<attribute id="solution">
-								<read_only/>
-							</attribute>
-							<attribute id="pending_reason">
-								<read_only/>
-							</attribute>
-							<attribute id="user_satisfaction">
-								<read_only/>              
-                				<must_prompt/>
-							</attribute>
-							<attribute id="user_comment">
-								<read_only/>              
-								<must_prompt/>
-							</attribute>
-						</flags>
-						<transitions/>
-					</state>
-				</states>
-			</lifecycle>
-			<methods>
-				<method id="GetTicketRefFormat">
-					<static>true</static>
-					<access>public</access>
-					<type>Overload-DBObject</type>
-					<code><![CDATA[
+              </transition>
+              <transition id="ev_autoresolve">
+                <target>resolved</target>
+                <actions>
+                  <action>
+                    <verb>SetCurrentDate</verb>
+                    <params>
+                      <param xsi:type="attcode">resolution_date</param>
+                    </params>
+                  </action>
+                  <action>
+                    <verb>SetElapsedTime</verb>
+                    <params>
+                      <param xsi:type="attcode">time_spent</param>
+                      <param xsi:type="attcode">start_date</param>
+                      <param xsi:type="string">DefaultWorkingTimeComputer</param>
+                    </params>
+                  </action>
+                  <action>
+                    <verb>ResolveChildTickets</verb>
+                    <params/>
+                  </action>
+                </actions>
+              </transition>
+            </transitions>
+          </state>
+          <state id="closed">
+            <highlight>
+              <code>closed</code>
+            </highlight>
+            <inherit_flags_from>resolved</inherit_flags_from>
+            <flags>
+              <attribute id="public_log">
+                <read_only/>
+              </attribute>
+              <attribute id="functionalcis_list">
+                <read_only/>
+              </attribute>
+              <attribute id="contacts_list">
+                <read_only/>
+              </attribute>
+              <attribute id="private_log">
+                <read_only/>
+              </attribute>
+              <attribute id="service_id">
+                <read_only/>
+              </attribute>
+              <attribute id="servicesubcategory_id">
+                <read_only/>
+              </attribute>
+              <attribute id="close_date">
+                <read_only/>
+              </attribute>
+              <attribute id="resolution_code">
+                <read_only/>
+              </attribute>
+              <attribute id="solution">
+                <read_only/>
+              </attribute>
+              <attribute id="pending_reason">
+                <read_only/>
+              </attribute>
+              <attribute id="user_satisfaction">
+                <read_only/>
+                <must_prompt/>
+              </attribute>
+              <attribute id="user_comment">
+                <read_only/>
+                <must_prompt/>
+              </attribute>
+            </flags>
+            <transitions/>
+          </state>
+        </states>
+      </lifecycle>
+      <methods>
+        <method id="GetTicketRefFormat">
+          <static>true</static>
+          <access>public</access>
+          <type>Overload-DBObject</type>
+          <code><![CDATA[
         public static function GetTicketRefFormat()
         {
                 return 'I-%06d';
         }
         ]]></code>
-				</method>
-				<method id="SetAssignedDate">
-					<comment><![CDATA[/**
+        </method>
+        <method id="SetAssignedDate">
+          <comment><![CDATA[/**
 	 * To be deprecated: use SetCurrentDate() instead
 	 * @return void
 	 */]]></comment>
-					<static>false</static>
-					<access>public</access>
-					<type>LifecycleAction</type>
-					<code><![CDATA[	public function SetAssignedDate($sStimulusCode)
+          <static>false</static>
+          <access>public</access>
+          <type>LifecycleAction</type>
+          <code><![CDATA[	public function SetAssignedDate($sStimulusCode)
 	{
 		$this->Set('assignment_date', time());
 		return true;
 	}]]></code>
-				</method>
-				<method id="SetLastPendingDate">
-					<comment><![CDATA[/**
+        </method>
+        <method id="SetLastPendingDate">
+          <comment><![CDATA[/**
 	 * To be deprecated: use SetCurrentDate() instead
 	 * @return void
 	 */]]></comment>
-					<static>false</static>
-					<access>public</access>
-					<type>LifecycleAction</type>
-					<code><![CDATA[	public function SetLastPendingDate($sStimulusCode)
+          <static>false</static>
+          <access>public</access>
+          <type>LifecycleAction</type>
+          <code><![CDATA[	public function SetLastPendingDate($sStimulusCode)
 	{
 		$this->Set('last_pending_date', time());
 		return true;
 	}]]></code>
-				</method>
-				<method id="SetResolveDate">
-					<comment><![CDATA[/**
+        </method>
+        <method id="SetResolveDate">
+          <comment><![CDATA[/**
 	 * To be deprecated: use SetCurrentDate() and SetElapsedTime() instead
 	 * @return void
 	 */]]></comment>
-					<static>false</static>
-					<access>public</access>
-					<type>LifecycleAction</type>
-					<code><![CDATA[	public function SetResolveDate($sStimulusCode)
+          <static>false</static>
+          <access>public</access>
+          <type>LifecycleAction</type>
+          <code><![CDATA[	public function SetResolveDate($sStimulusCode)
 	{
 		$this->Set('resolution_date', time());
                 $iTimeSpent = time() - AttributeDateTime::GetAsUnixSeconds($this->Get('start_date'));
 		$this->Set('time_spent', $iTimeSpent);
 		return true;
 	}]]></code>
-				</method>
-				<method id="SetClosureDate">
-					<comment><![CDATA[/**
+        </method>
+        <method id="SetClosureDate">
+          <comment><![CDATA[/**
 	 * To be deprecated: use SetCurrentDate() instead
 	 * @return void
 	 */]]></comment>
-					<static>false</static>
-					<access>public</access>
-					<type>LifecycleAction</type>
-					<code><![CDATA[	public function SetClosureDate($sStimulusCode)
+          <static>false</static>
+          <access>public</access>
+          <type>LifecycleAction</type>
+          <code><![CDATA[	public function SetClosureDate($sStimulusCode)
 	{
 		$this->Set('close_date', time());
 		return true;
 	}]]></code>
-				</method>
-				<method id="DoCheckToWrite">
-					<static>false</static>
-					<access>public</access>
-					<type>Overload-DBObject</type>
-					<code><![CDATA[public function DoCheckToWrite()
+        </method>
+        <method id="DoCheckToWrite">
+          <static>false</static>
+          <access>public</access>
+          <type>Overload-DBObject</type>
+          <code><![CDATA[public function DoCheckToWrite()
   {
     parent::DoCheckToWrite();
     if (!$this->IsNew() && ($this->Get('parent_incident_id') == $this->GetKey()))
@@ -1140,15 +1144,15 @@
       $this->m_aCheckIssues[] = Dict::Format('Class:Incident/Error:CannotAssignParentIncidentIdToSelf');
     }
   }]]></code>
-				</method>
-				<method id="ComputePriority">
-					<comment>/** Compute the priority of the ticket based on its impact and urgency&#13;
+        </method>
+        <method id="ComputePriority">
+          <comment>/** Compute the priority of the ticket based on its impact and urgency&#13;
 						* @return integer The priority of the ticket 1(high) .. 3(low)&#13;
 						*/</comment>
-					<static>false</static>
-					<access>public</access>
-					<type>LifecycleAction</type>
-					<code><![CDATA[public function ComputePriority()
+          <static>false</static>
+          <access>public</access>
+          <type>LifecycleAction</type>
+          <code><![CDATA[public function ComputePriority()
 	{
 		// priority[impact][urgency]
 		$aPriorities = array(
@@ -1182,12 +1186,12 @@
 		}
 		return $iPriority;
 	}]]></code>
-				</method>
-				<method id="ComputeValues">
-					<static>false</static>
-					<access>public</access>
-					<type>Overload-DBObject</type>
-					<code><![CDATA[	public function ComputeValues()
+        </method>
+        <method id="ComputeValues">
+          <static>false</static>
+          <access>public</access>
+          <type>Overload-DBObject</type>
+          <code><![CDATA[	public function ComputeValues()
 	{
 
 		// Compute the priority of the ticket
@@ -1195,12 +1199,12 @@
 
 		return parent::ComputeValues();
 	}]]></code>
-				</method>
-				<method id="DisplayBareRelations">
-					<static>false</static>
-					<access>public</access>
-					<type>Overload-cmdbAbstractObject</type>
-					<code><![CDATA[	function DisplayBareRelations(WebPage $oPage, $bEditMode = false)
+        </method>
+        <method id="DisplayBareRelations">
+          <static>false</static>
+          <access>public</access>
+          <type>Overload-cmdbAbstractObject</type>
+          <code><![CDATA[	function DisplayBareRelations(WebPage $oPage, $bEditMode = false)
 	{
 		parent::DisplayBareRelations($oPage, $bEditMode);
 
@@ -1222,15 +1226,15 @@
 			self::DisplaySet($oPage, $oKnownErrorSet, array ('menu' => false));
 		}
 	}]]></code>
-				</method>
-				<method id="resolveChilds">
-					<comment><![CDATA[/**
+        </method>
+        <method id="resolveChilds">
+          <comment><![CDATA[/**
 	 * To be deprecated: use ResolveChildTickets() instead
 	 */]]></comment>
-					<static>false</static>
-					<access>public</access>
-					<type>LifecycleAction</type>
-					<code><![CDATA[	public function resolveChilds($sStimulusCode)
+          <static>false</static>
+          <access>public</access>
+          <type>LifecycleAction</type>
+          <code><![CDATA[	public function resolveChilds($sStimulusCode)
 	{
         if (MetaModel::IsValidClass('UserRequest'))
         {
@@ -1283,18 +1287,18 @@
 		return true;
 
 	}]]></code>
-				</method>
-				<method id="ResolveChildTickets">
-					<comment><![CDATA[/**
+        </method>
+        <method id="ResolveChildTickets">
+          <comment><![CDATA[/**
 	 * Cascade the resolution to child User Request and Incidents
 	 * @return true (returning false would stop the ongoing transition)
 	 */]]></comment>
-					<static>false</static>
-					<access>public</access>
-					<type>LifecycleAction</type>
-					<arguments>
+          <static>false</static>
+          <access>public</access>
+          <type>LifecycleAction</type>
+          <arguments>
 					</arguments>
-					<code><![CDATA[	public function ResolveChildTickets()
+          <code><![CDATA[	public function ResolveChildTickets()
 	{
         static $aRequests = array(); // prevent infinite recursion
         static $Incidents = array(); // prevent infinite recursion
@@ -1327,16 +1331,16 @@
 		}
 		return true;
 	}]]></code>
-				</method>
-				<method id="ResolveFrom">
-					<comment><![CDATA[/**
+        </method>
+        <method id="ResolveFrom">
+          <comment><![CDATA[/**
 	 * Resolve the ticket from another resolved ticket
 	 * @return void
 	 */]]></comment>
-					<static>false</static>
-					<access>public</access>
-					<type>Internal</type>
-                    <code><![CDATA[	public function ResolveFrom($oParentTicket)
+          <static>false</static>
+          <access>public</access>
+          <type>Internal</type>
+          <code><![CDATA[	public function ResolveFrom($oParentTicket)
 	{
 		if ($this->Get('status') != 'resolved' && $this->Get('status') != 'closed' )
 		{
@@ -1365,13 +1369,13 @@
 			$this->ApplyStimulus('ev_autoresolve');
 			$this->DBUpdate();
 		}
-	}]]></code>				
-				</method>
-				<method id="UpdateChildRequestLog">
-					<static>false</static>
-					<access>public</access>
-					<type>LifecycleAction</type>
-					<code><![CDATA[	public function UpdateChildRequestLog()
+	}]]></code>
+        </method>
+        <method id="UpdateChildRequestLog">
+          <static>false</static>
+          <access>public</access>
+          <type>LifecycleAction</type>
+          <code><![CDATA[	public function UpdateChildRequestLog()
 	{
         if (!MetaModel::IsValidClass('UserRequest')) return true; // Do nothing
   
@@ -1413,12 +1417,12 @@
 		return true;
 
 	}]]></code>
-				</method>
-				<method id="UpdateChildIncidentLog">
-					<static>false</static>
-					<access>public</access>
-					<type>LifecycleAction</type>
-					<code><![CDATA[	public function UpdateChildIncidentLog()
+        </method>
+        <method id="UpdateChildIncidentLog">
+          <static>false</static>
+          <access>public</access>
+          <type>LifecycleAction</type>
+          <code><![CDATA[	public function UpdateChildIncidentLog()
 	{
 		$oLog = $this->Get('public_log');
 		$sLogPublic = $oLog->GetModifiedEntry('html');
@@ -1458,24 +1462,24 @@
 		return true;
 
 	}]]></code>
-				</method>
-				<method id="ComputeImpactedItems">
-					<static>false</static>
-					<access>public</access>
-					<type>LifecycleAction</type>
-					<code><![CDATA[	public function ComputeImpactedItems()
+        </method>
+        <method id="ComputeImpactedItems">
+          <static>false</static>
+          <access>public</access>
+          <type>LifecycleAction</type>
+          <code><![CDATA[	public function ComputeImpactedItems()
 	{
         // This method is kept for backward compatibility
         // in case a delta redefines it, but you may call
         // UpdateImpactedItems directly
 		$this->UpdateImpactedItems();
 	}]]></code>
-				</method>
-				<method id="OnInsert">
-					<static>false</static>
-					<access>protected</access>
-					<type>Overload-DBObject</type>
-					<code><![CDATA[	protected function OnInsert()
+        </method>
+        <method id="OnInsert">
+          <static>false</static>
+          <access>protected</access>
+          <type>Overload-DBObject</type>
+          <code><![CDATA[	protected function OnInsert()
 
 	{
         parent::OnInsert();
@@ -1483,12 +1487,12 @@
 		$this->SetIfNull('last_update', time());
 		$this->SetIfNull('start_date', time());
 	}]]></code>
-				</method>
-				<method id="OnUpdate">
-					<static>false</static>
-					<access>protected</access>
-					<type>Overload-DBObject</type>
-					<code><![CDATA[	protected function OnUpdate()
+        </method>
+        <method id="OnUpdate">
+          <static>false</static>
+          <access>protected</access>
+          <type>Overload-DBObject</type>
+          <code><![CDATA[	protected function OnUpdate()
 	{
         parent::OnUpdate();
         $aChanges = $this->ListChanges();
@@ -1500,179 +1504,179 @@
 		$this->UpdateChildRequestLog();
 		$this->UpdateChildIncidentLog();
 	}]]></code>
-				</method>
-			</methods>
-			<presentation>
-				<details>
-					<items>
-						<item id="functionalcis_list">
-							<rank>10</rank>
-						</item>
-						<item id="contacts_list">
-							<rank>20</rank>
-						</item>
-						<item id="child_incidents_list">
-							<rank>30</rank>
-						</item>
-						<item id="related_request_list">
-							<rank>40</rank>
-						</item>
-						<item id="workorders_list">
-							<rank>50</rank>
-						</item>
-						<item id="col:col1">
-							<rank>60</rank>
-							<items>
-								<item id="fieldset:Ticket:baseinfo">
-									<rank>10</rank>
-									<items>
-										<item id="org_id">
-											<rank>10</rank>
-										</item>
-										<item id="caller_id">
-											<rank>20</rank>
-										</item>
-										<item id="status">
-											<rank>30</rank>
-										</item>
-										<item id="origin">
-											<rank>40</rank>
-										</item>
-										<item id="title">
-											<rank>50</rank>
-										</item>
-										<item id="description">
-											<rank>60</rank>
-										</item>
-									</items>
-								</item>
-								<item id="fieldset:Ticket:moreinfo">
-									<rank>20</rank>
-									<items>
-										<item id="service_id">
-											<rank>10</rank>
-										</item>
-										<item id="servicesubcategory_id">
-											<rank>20</rank>
-										</item>
-										<item id="escalation_flag">
-											<rank>30</rank>
-										</item>
-										<item id="escalation_reason">
-											<rank>40</rank>
-										</item>
-										<item id="pending_reason">
-											<rank>50</rank>
-										</item>
-									</items>
-								</item>
-							</items>
-						</item>
-						<item id="col:col2">
-							<rank>70</rank>
-							<items>
-								<item id="fieldset:Ticket:Type">
-									<rank>10</rank>
-									<items>
-										<item id="impact">
-											<rank>10</rank>
-										</item>
-										<item id="urgency">
-											<rank>20</rank>
-										</item>
-										<item id="priority">
-											<rank>30</rank>
-										</item>
-									</items>
-								</item>
-								<item id="fieldset:Ticket:contact">
-									<rank>20</rank>
-									<items>
-										<item id="team_id">
-											<rank>10</rank>
-										</item>
-										<item id="agent_id">
-											<rank>20</rank>
-										</item>
-									</items>
-								</item>
-								<item id="fieldset:Ticket:date">
-									<rank>30</rank>
-									<items>
-										<item id="start_date">
-											<rank>10</rank>
-										</item>
-										<item id="last_update">
-											<rank>20</rank>
-										</item>
-										<item id="assignment_date">
-											<rank>30</rank>
-										</item>
-										<item id="tto_escalation_deadline">
-											<rank>40</rank>
-										</item>
-										<item id="ttr_escalation_deadline">
-											<rank>50</rank>
-										</item>
-										<item id="last_pending_date">
-											<rank>60</rank>
-										</item>
-										<item id="resolution_date">
-											<rank>70</rank>
-										</item>
-										<item id="close_date">
-											<rank>80</rank>
-										</item>
-									</items>
-								</item>
-							</items>
-						</item>
-						<item id="col:col3">
-							<rank>80</rank>
-							<items>
-								<item id="fieldset:Ticket:relation">
-									<rank>10</rank>
-									<items>
-										<item id="parent_incident_id">
-											<rank>10</rank>
-										</item>
-										<item id="parent_problem_id">
-											<rank>20</rank>
-										</item>
-										<item id="parent_change_id">
-											<rank>30</rank>
-										</item>
-									</items>
-								</item>
-								<item id="fieldset:Ticket:resolution">
-									<rank>20</rank>
-									<items>
-										<item id="resolution_code">
-											<rank>10</rank>
-										</item>
-										<item id="solution">
-											<rank>20</rank>
-										</item>
-										<item id="time_spent">
-											<rank>30</rank>
-										</item>
-										<item id="user_satisfaction">
-											<rank>40</rank>
-										</item>
-										<item id="user_comment">
-											<rank>50</rank>
-										</item>
-									</items>
-								</item>
-								<item id="fieldset:Ticket:SLA">
-									<rank>30</rank>
-									<items>
-										<item id="sla_tto_passed">
-											<rank>10</rank>
-										</item>
-										<item id="sla_tto_over">
-											<rank>20</rank>
-										</item>
+        </method>
+      </methods>
+      <presentation>
+        <details>
+          <items>
+            <item id="functionalcis_list">
+              <rank>10</rank>
+            </item>
+            <item id="contacts_list">
+              <rank>20</rank>
+            </item>
+            <item id="child_incidents_list">
+              <rank>30</rank>
+            </item>
+            <item id="related_request_list">
+              <rank>40</rank>
+            </item>
+            <item id="workorders_list">
+              <rank>50</rank>
+            </item>
+            <item id="col:col1">
+              <rank>60</rank>
+              <items>
+                <item id="fieldset:Ticket:baseinfo">
+                  <rank>10</rank>
+                  <items>
+                    <item id="org_id">
+                      <rank>10</rank>
+                    </item>
+                    <item id="caller_id">
+                      <rank>20</rank>
+                    </item>
+                    <item id="status">
+                      <rank>30</rank>
+                    </item>
+                    <item id="origin">
+                      <rank>40</rank>
+                    </item>
+                    <item id="title">
+                      <rank>50</rank>
+                    </item>
+                    <item id="description">
+                      <rank>60</rank>
+                    </item>
+                  </items>
+                </item>
+                <item id="fieldset:Ticket:moreinfo">
+                  <rank>20</rank>
+                  <items>
+                    <item id="service_id">
+                      <rank>10</rank>
+                    </item>
+                    <item id="servicesubcategory_id">
+                      <rank>20</rank>
+                    </item>
+                    <item id="escalation_flag">
+                      <rank>30</rank>
+                    </item>
+                    <item id="escalation_reason">
+                      <rank>40</rank>
+                    </item>
+                    <item id="pending_reason">
+                      <rank>50</rank>
+                    </item>
+                  </items>
+                </item>
+              </items>
+            </item>
+            <item id="col:col2">
+              <rank>70</rank>
+              <items>
+                <item id="fieldset:Ticket:Type">
+                  <rank>10</rank>
+                  <items>
+                    <item id="impact">
+                      <rank>10</rank>
+                    </item>
+                    <item id="urgency">
+                      <rank>20</rank>
+                    </item>
+                    <item id="priority">
+                      <rank>30</rank>
+                    </item>
+                  </items>
+                </item>
+                <item id="fieldset:Ticket:contact">
+                  <rank>20</rank>
+                  <items>
+                    <item id="team_id">
+                      <rank>10</rank>
+                    </item>
+                    <item id="agent_id">
+                      <rank>20</rank>
+                    </item>
+                  </items>
+                </item>
+                <item id="fieldset:Ticket:date">
+                  <rank>30</rank>
+                  <items>
+                    <item id="start_date">
+                      <rank>10</rank>
+                    </item>
+                    <item id="last_update">
+                      <rank>20</rank>
+                    </item>
+                    <item id="assignment_date">
+                      <rank>30</rank>
+                    </item>
+                    <item id="tto_escalation_deadline">
+                      <rank>40</rank>
+                    </item>
+                    <item id="ttr_escalation_deadline">
+                      <rank>50</rank>
+                    </item>
+                    <item id="last_pending_date">
+                      <rank>60</rank>
+                    </item>
+                    <item id="resolution_date">
+                      <rank>70</rank>
+                    </item>
+                    <item id="close_date">
+                      <rank>80</rank>
+                    </item>
+                  </items>
+                </item>
+              </items>
+            </item>
+            <item id="col:col3">
+              <rank>80</rank>
+              <items>
+                <item id="fieldset:Ticket:relation">
+                  <rank>10</rank>
+                  <items>
+                    <item id="parent_incident_id">
+                      <rank>10</rank>
+                    </item>
+                    <item id="parent_problem_id">
+                      <rank>20</rank>
+                    </item>
+                    <item id="parent_change_id">
+                      <rank>30</rank>
+                    </item>
+                  </items>
+                </item>
+                <item id="fieldset:Ticket:resolution">
+                  <rank>20</rank>
+                  <items>
+                    <item id="resolution_code">
+                      <rank>10</rank>
+                    </item>
+                    <item id="solution">
+                      <rank>20</rank>
+                    </item>
+                    <item id="time_spent">
+                      <rank>30</rank>
+                    </item>
+                    <item id="user_satisfaction">
+                      <rank>40</rank>
+                    </item>
+                    <item id="user_comment">
+                      <rank>50</rank>
+                    </item>
+                  </items>
+                </item>
+                <item id="fieldset:Ticket:SLA">
+                  <rank>30</rank>
+                  <items>
+                    <item id="sla_tto_passed">
+                      <rank>10</rank>
+                    </item>
+                    <item id="sla_tto_over">
+                      <rank>20</rank>
+                    </item>
                     <item id="sla_ttr_passed">
                       <rank>30</rank>
                     </item>
@@ -1690,273 +1694,273 @@
               <rank>110</rank>
             </item>
           </items>
-				</details>
-				<search>
-					<items>
-						<item id="ref">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="title">
-							<rank>30</rank>
-						</item>
-						<item id="description">
-							<rank>40</rank>
-						</item>
-						<item id="start_date">
-							<rank>50</rank>
-						</item>
-						<item id="resolution_date">
-							<rank>70</rank>
-						</item>
-						<item id="close_date">
-							<rank>80</rank>
-						</item>
-						<item id="status">
-							<rank>90</rank>
-						</item>
-						<item id="operational_status">
-							<rank>95</rank>
-						</item>
-						<item id="caller_id">
-							<rank>100</rank>
-						</item>
-						<item id="origin">
-							<rank>110</rank>
-						</item>
-						<item id="impact">
-							<rank>120</rank>
-						</item>
-						<item id="urgency">
-							<rank>130</rank>
-						</item>
-						<item id="priority">
-							<rank>140</rank>
-						</item>
-						<item id="service_id">
-							<rank>150</rank>
-						</item>
-						<item id="servicesubcategory_id">
-							<rank>160</rank>
-						</item>
-						<item id="team_id">
-							<rank>170</rank>
-						</item>
-						<item id="agent_id">
-							<rank>180</rank>
-						</item>
-						<item id="escalation_flag">
-							<rank>190</rank>
-						</item>
-						<item id="resolution_code">
-							<rank>200</rank>
-						</item>
-						<item id="user_satisfaction">
-							<rank>210</rank>
-						</item>
-						<item id="sla_tto_passed">
-							<rank>220</rank>
-						</item>
-						<item id="sla_ttr_passed">
-							<rank>230</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="title">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="caller_id">
-							<rank>30</rank>
-						</item>
-						<item id="start_date">
-							<rank>40</rank>
-						</item>
-						<item id="status">
-							<rank>50</rank>
-						</item>
-						<item id="agent_id">
-							<rank>60</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-		</class>
-	</classes>
-	<menus>
-		<menu id="IncidentManagement" xsi:type="MenuGroup" _delta="define">
-			<rank>35</rank>
-			<enable_stimulus/>
-	    <style>
-		    <decoration_classes>fas fa-exclamation</decoration_classes>
-	    </style>
-		</menu>
-		<menu id="Incident:Overview" xsi:type="DashboardMenuNode" _delta="define">
-			<rank>0</rank>
-			<parent>IncidentManagement</parent>
-			<definition>
-				<layout>DashboardLayoutTwoCols</layout>
-				<title>UI:IncidentMgmtMenuOverview:Title</title>
-				<cells>
-					<cell id="0">
-						<rank>0</rank>
-						<dashlets>
-							<dashlet id="1" xsi:type="DashletGroupByPie">
-								<title>UI-IncidentManagementOverview-IncidentByPriority-last-14-days</title>
-								<query>SELECT Incident WHERE DATE_SUB(NOW(), INTERVAL 14 DAY) &lt; start_date</query>
-								<group_by>priority</group_by>
-								<style>pie</style>
-							</dashlet>
-						</dashlets>
-					</cell>
-					<cell id="1">
-						<rank>1</rank>
-						<dashlets>
-							<dashlet id="2" xsi:type="DashletGroupByBars">
-								<title>UI-IncidentManagementOverview-Last-14-days</title>
-								<query>SELECT Incident WHERE DATE_SUB(NOW(), INTERVAL 14 DAY) &lt; start_date</query>
-								<group_by>start_date:day_of_month</group_by>
-								<style>bars</style>
-							</dashlet>
-						</dashlets>
-					</cell>
-					<cell id="2">
-						<rank>2</rank>
-						<dashlets>
-							<dashlet id="3" xsi:type="DashletGroupByTable">
-								<title>UI-IncidentManagementOverview-OpenIncidentByStatus</title>
-								<query>SELECT Incident WHERE status NOT IN ('closed','rejected')</query>
-								<group_by>status</group_by>
-								<style>table</style>
-							</dashlet>
-						</dashlets>
-					</cell>
-					<cell id="3">
-						<rank>3</rank>
-						<dashlets>
-							<dashlet id="4" xsi:type="DashletGroupByTable">
-								<title>UI-IncidentManagementOverview-OpenIncidentByAgent</title>
-								<query>SELECT Incident WHERE status NOT IN ('closed','rejected')</query>
-								<group_by>agent_id</group_by>
-								<style>table</style>
-							</dashlet>
-						</dashlets>
-					</cell>
-					<cell id="4">
-						<rank>4</rank>
-						<dashlets>
-							<dashlet id="5" xsi:type="DashletGroupByTable">
-								<title>UI-IncidentManagementOverview-OpenIncidentByCustomer</title>
-								<query>SELECT Incident WHERE status NOT IN ('closed','rejected')</query>
-								<group_by>org_id</group_by>
-								<style>table</style>
-							</dashlet>
-						</dashlets>
-					</cell>
-				</cells>
-			</definition>
-		</menu>
-		<menu id="NewIncident" xsi:type="NewObjectMenuNode" _delta="define">
-			<rank>1</rank>
-			<parent>IncidentManagement</parent>
-			<class>Incident</class>
-		</menu>
-		<menu id="SearchIncidents" xsi:type="SearchMenuNode" _delta="define">
-			<rank>2</rank>
-			<parent>IncidentManagement</parent>
-			<class>Incident</class>
-		</menu>
-		<menu id="Incident:Shortcuts" xsi:type="TemplateMenuNode" _delta="define">
-			<rank>3</rank>
-			<parent>IncidentManagement</parent>
-			<template_file/>
-		</menu>
-		<menu id="Incident:MyIncidents" xsi:type="OQLMenuNode" _delta="define">
-			<rank>0</rank>
-			<parent>Incident:Shortcuts</parent>
-			<oql><![CDATA[SELECT Incident WHERE agent_id = :current_contact_id AND status NOT IN ("closed","resolved")]]></oql>
-			<do_search/>
-			<auto_reload>fast</auto_reload>
-		</menu>
-		<menu id="Incident:EscalatedIncidents" xsi:type="OQLMenuNode" _delta="define">
-			<rank>1</rank>
-			<parent>Incident:Shortcuts</parent>
-			<oql><![CDATA[SELECT Incident WHERE status IN ("escalated_tto", "escalated_ttr") OR escalation_flag="yes"]]></oql>
-			<do_search/>
-			<auto_reload>fast</auto_reload>
-		</menu>
-		<menu id="Incident:OpenIncidents" xsi:type="OQLMenuNode" _delta="define">
-			<rank>2</rank>
-			<parent>Incident:Shortcuts</parent>
-			<oql><![CDATA[SELECT Incident WHERE status NOT IN ("closed")]]></oql>
-			<do_search>1</do_search>
-			<auto_reload>fast</auto_reload>
-		</menu>
-	</menus>
-	<user_rights>
-		<profiles>
-			<profile id="2">
-				<groups>
-					<group id="Incident" _delta="define">
-						<actions>
-							<action id="action:write">allow</action>
-							<action id="stimulus:ev_close">allow</action>
-							<action id="stimulus:ev_reopen">allow</action>
-						</actions>
-					</group>
-				</groups>
-			</profile>
-		</profiles>
-	</user_rights>
-	<module_designs>
-		<module_design id="itop-portal">
-			<bricks>
-				<brick id="services">
-					<levels>
-						<level id="1">
-							<levels>
-								<level id="1">
-									<levels>
-										<level id="1">
-											<actions>
-												<action id="create_from_this">
-													<class _delta="redefine">Incident</class>
-												</action>
-											</actions>
-										</level>
-									</levels>
-								</level>
-							</levels>
-						</level>
-					</levels>
-				</brick>
-			</bricks>
-			<classes>
-				<class id="ServiceSubcategory">
-					<scopes>
-						<scope id="all">
-							<oql_view _delta="redefine"><![CDATA[SELECT ServiceSubcategory WHERE status != 'obsolete' AND request_type = 'incident']]></oql_view>
-						</scope>
-					</scopes>
-				</class>
-			</classes>
-		</module_design>
-	</module_designs>
-	<module_parameters>
-		<parameters id="itop-tickets">
-			<relation_context>
-				<UserRequest>
-					<impacts>
-						<down>
-							<items type="array">
-								<item id="open_incidents" _delta="define">
-									<oql><![CDATA[
+        </details>
+        <search>
+          <items>
+            <item id="ref">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="title">
+              <rank>30</rank>
+            </item>
+            <item id="description">
+              <rank>40</rank>
+            </item>
+            <item id="start_date">
+              <rank>50</rank>
+            </item>
+            <item id="resolution_date">
+              <rank>70</rank>
+            </item>
+            <item id="close_date">
+              <rank>80</rank>
+            </item>
+            <item id="status">
+              <rank>90</rank>
+            </item>
+            <item id="operational_status">
+              <rank>95</rank>
+            </item>
+            <item id="caller_id">
+              <rank>100</rank>
+            </item>
+            <item id="origin">
+              <rank>110</rank>
+            </item>
+            <item id="impact">
+              <rank>120</rank>
+            </item>
+            <item id="urgency">
+              <rank>130</rank>
+            </item>
+            <item id="priority">
+              <rank>140</rank>
+            </item>
+            <item id="service_id">
+              <rank>150</rank>
+            </item>
+            <item id="servicesubcategory_id">
+              <rank>160</rank>
+            </item>
+            <item id="team_id">
+              <rank>170</rank>
+            </item>
+            <item id="agent_id">
+              <rank>180</rank>
+            </item>
+            <item id="escalation_flag">
+              <rank>190</rank>
+            </item>
+            <item id="resolution_code">
+              <rank>200</rank>
+            </item>
+            <item id="user_satisfaction">
+              <rank>210</rank>
+            </item>
+            <item id="sla_tto_passed">
+              <rank>220</rank>
+            </item>
+            <item id="sla_ttr_passed">
+              <rank>230</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="title">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="caller_id">
+              <rank>30</rank>
+            </item>
+            <item id="start_date">
+              <rank>40</rank>
+            </item>
+            <item id="status">
+              <rank>50</rank>
+            </item>
+            <item id="agent_id">
+              <rank>60</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+  </classes>
+  <menus>
+    <menu id="IncidentManagement" xsi:type="MenuGroup" _delta="define">
+      <rank>35</rank>
+      <enable_stimulus/>
+      <style>
+        <decoration_classes>fas fa-exclamation</decoration_classes>
+      </style>
+    </menu>
+    <menu id="Incident:Overview" xsi:type="DashboardMenuNode" _delta="define">
+      <rank>0</rank>
+      <parent>IncidentManagement</parent>
+      <definition>
+        <layout>DashboardLayoutTwoCols</layout>
+        <title>UI:IncidentMgmtMenuOverview:Title</title>
+        <cells>
+          <cell id="0">
+            <rank>0</rank>
+            <dashlets>
+              <dashlet id="1" xsi:type="DashletGroupByPie">
+                <title>UI-IncidentManagementOverview-IncidentByPriority-last-14-days</title>
+                <query>SELECT Incident WHERE DATE_SUB(NOW(), INTERVAL 14 DAY) &lt; start_date</query>
+                <group_by>priority</group_by>
+                <style>pie</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="1">
+            <rank>1</rank>
+            <dashlets>
+              <dashlet id="2" xsi:type="DashletGroupByBars">
+                <title>UI-IncidentManagementOverview-Last-14-days</title>
+                <query>SELECT Incident WHERE DATE_SUB(NOW(), INTERVAL 14 DAY) &lt; start_date</query>
+                <group_by>start_date:day_of_month</group_by>
+                <style>bars</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="2">
+            <rank>2</rank>
+            <dashlets>
+              <dashlet id="3" xsi:type="DashletGroupByTable">
+                <title>UI-IncidentManagementOverview-OpenIncidentByStatus</title>
+                <query>SELECT Incident WHERE status NOT IN ('closed','rejected')</query>
+                <group_by>status</group_by>
+                <style>table</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="3">
+            <rank>3</rank>
+            <dashlets>
+              <dashlet id="4" xsi:type="DashletGroupByTable">
+                <title>UI-IncidentManagementOverview-OpenIncidentByAgent</title>
+                <query>SELECT Incident WHERE status NOT IN ('closed','rejected')</query>
+                <group_by>agent_id</group_by>
+                <style>table</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="4">
+            <rank>4</rank>
+            <dashlets>
+              <dashlet id="5" xsi:type="DashletGroupByTable">
+                <title>UI-IncidentManagementOverview-OpenIncidentByCustomer</title>
+                <query>SELECT Incident WHERE status NOT IN ('closed','rejected')</query>
+                <group_by>org_id</group_by>
+                <style>table</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+        </cells>
+      </definition>
+    </menu>
+    <menu id="NewIncident" xsi:type="NewObjectMenuNode" _delta="define">
+      <rank>1</rank>
+      <parent>IncidentManagement</parent>
+      <class>Incident</class>
+    </menu>
+    <menu id="SearchIncidents" xsi:type="SearchMenuNode" _delta="define">
+      <rank>2</rank>
+      <parent>IncidentManagement</parent>
+      <class>Incident</class>
+    </menu>
+    <menu id="Incident:Shortcuts" xsi:type="TemplateMenuNode" _delta="define">
+      <rank>3</rank>
+      <parent>IncidentManagement</parent>
+      <template_file/>
+    </menu>
+    <menu id="Incident:MyIncidents" xsi:type="OQLMenuNode" _delta="define">
+      <rank>0</rank>
+      <parent>Incident:Shortcuts</parent>
+      <oql><![CDATA[SELECT Incident WHERE agent_id = :current_contact_id AND status NOT IN ("closed","resolved")]]></oql>
+      <do_search/>
+      <auto_reload>fast</auto_reload>
+    </menu>
+    <menu id="Incident:EscalatedIncidents" xsi:type="OQLMenuNode" _delta="define">
+      <rank>1</rank>
+      <parent>Incident:Shortcuts</parent>
+      <oql><![CDATA[SELECT Incident WHERE status IN ("escalated_tto", "escalated_ttr") OR escalation_flag="yes"]]></oql>
+      <do_search/>
+      <auto_reload>fast</auto_reload>
+    </menu>
+    <menu id="Incident:OpenIncidents" xsi:type="OQLMenuNode" _delta="define">
+      <rank>2</rank>
+      <parent>Incident:Shortcuts</parent>
+      <oql><![CDATA[SELECT Incident WHERE status NOT IN ("closed")]]></oql>
+      <do_search>1</do_search>
+      <auto_reload>fast</auto_reload>
+    </menu>
+  </menus>
+  <user_rights>
+    <profiles>
+      <profile id="2">
+        <groups>
+          <group id="Incident" _delta="define">
+            <actions>
+              <action id="action:write">allow</action>
+              <action id="stimulus:ev_close">allow</action>
+              <action id="stimulus:ev_reopen">allow</action>
+            </actions>
+          </group>
+        </groups>
+      </profile>
+    </profiles>
+  </user_rights>
+  <module_designs>
+    <module_design id="itop-portal">
+      <bricks>
+        <brick id="services">
+          <levels>
+            <level id="1">
+              <levels>
+                <level id="1">
+                  <levels>
+                    <level id="1">
+                      <actions>
+                        <action id="create_from_this">
+                          <class _delta="redefine">Incident</class>
+                        </action>
+                      </actions>
+                    </level>
+                  </levels>
+                </level>
+              </levels>
+            </level>
+          </levels>
+        </brick>
+      </bricks>
+      <classes>
+        <class id="ServiceSubcategory">
+          <scopes>
+            <scope id="all">
+              <oql_view _delta="redefine"><![CDATA[SELECT ServiceSubcategory WHERE status != 'obsolete' AND request_type = 'incident']]></oql_view>
+            </scope>
+          </scopes>
+        </class>
+      </classes>
+    </module_design>
+  </module_designs>
+  <module_parameters>
+    <parameters id="itop-tickets">
+      <relation_context>
+        <UserRequest>
+          <impacts>
+            <down>
+              <items type="array">
+                <item id="open_incidents" _delta="define">
+                  <oql><![CDATA[
 										SELECT FCI, I
 										FROM FunctionalCI AS FCI
 												 JOIN lnkFunctionalCIToTicket AS L ON L.functionalci_id = FCI.id
@@ -1965,20 +1969,20 @@
 										  AND (L.impact_code != 'not_impacted')
 										  AND (I.id != :this->id)
 										]]></oql>
-									<dict>Tickets:Related:OpenIncidents</dict>
-										<icon>itop-incident-mgmt-itil/images/incident-red.png</icon>
-									<default>yes</default>
-								</item>
-							</items>
-						</down>
-					</impacts>
-				</UserRequest>
-				<Incident>
-					<impacts>
-						<down>
-							<items type="array">
-								<item id="open_incidents" _delta="define">
-									<oql><![CDATA[
+                  <dict>Tickets:Related:OpenIncidents</dict>
+                  <icon>itop-incident-mgmt-itil/images/incident-red.png</icon>
+                  <default>yes</default>
+                </item>
+              </items>
+            </down>
+          </impacts>
+        </UserRequest>
+        <Incident>
+          <impacts>
+            <down>
+              <items type="array">
+                <item id="open_incidents" _delta="define">
+                  <oql><![CDATA[
 										SELECT FCI, I
 										FROM FunctionalCI AS FCI
 												 JOIN lnkFunctionalCIToTicket AS L ON L.functionalci_id = FCI.id
@@ -1987,20 +1991,20 @@
 										  AND (L.impact_code != 'not_impacted')
 										  AND (I.id != :this->id)
 										]]></oql>
-									<dict>Tickets:Related:OpenIncidents</dict>
-										<icon>itop-incident-mgmt-itil/images/incident-red.png</icon>
-									<default>yes</default>
-								</item>
-							</items>
-						</down>
-					</impacts>
-				</Incident>
-				<Change>
-					<impacts>
-						<down>
-							<items type="array">
-								<item id="open_incidents" _delta="define">
-									<oql><![CDATA[
+                  <dict>Tickets:Related:OpenIncidents</dict>
+                  <icon>itop-incident-mgmt-itil/images/incident-red.png</icon>
+                  <default>yes</default>
+                </item>
+              </items>
+            </down>
+          </impacts>
+        </Incident>
+        <Change>
+          <impacts>
+            <down>
+              <items type="array">
+                <item id="open_incidents" _delta="define">
+                  <oql><![CDATA[
 										SELECT FCI, I
 										FROM FunctionalCI AS FCI
 												 JOIN lnkFunctionalCIToTicket AS L ON L.functionalci_id = FCI.id
@@ -2009,24 +2013,24 @@
 										  AND (L.impact_code != 'not_impacted')
 										  AND (I.id != :this->id)
 										]]></oql>
-									<dict>Tickets:Related:OpenIncidents</dict>
-										<icon>itop-incident-mgmt-itil/images/incident-red.png</icon>
-									<default>yes</default>
-								</item>
-							</items>
-						</down>
-					</impacts>
-				</Change>
-			</relation_context>
-		</parameters>
-		<parameters id="itop-config-mgmt">
-			<relation_context>
-				<FunctionalCI>
-					<impacts>
-						<down>
-							<items type="array">
-								<item id="open_incidents" _delta="define">
-									<oql><![CDATA[
+                  <dict>Tickets:Related:OpenIncidents</dict>
+                  <icon>itop-incident-mgmt-itil/images/incident-red.png</icon>
+                  <default>yes</default>
+                </item>
+              </items>
+            </down>
+          </impacts>
+        </Change>
+      </relation_context>
+    </parameters>
+    <parameters id="itop-config-mgmt">
+      <relation_context>
+        <FunctionalCI>
+          <impacts>
+            <down>
+              <items type="array">
+                <item id="open_incidents" _delta="define">
+                  <oql><![CDATA[
 										SELECT FCI, I
 										FROM FunctionalCI AS FCI
 												 JOIN lnkFunctionalCIToTicket AS L ON L.functionalci_id = FCI.id
@@ -2034,16 +2038,16 @@
 										WHERE (I.status NOT IN ('closed', 'resolved'))
 										  AND (L.impact_code != 'not_impacted')
 										]]></oql>
-									<dict>Tickets:Related:OpenIncidents</dict>
-										<icon>itop-incident-mgmt-itil/images/incident-red.png</icon>
-									<default>yes</default>
-								</item>
-							</items>
-						</down>
-						<up>
-							<items type="array">
-								<item id="open_incidents" _delta="define">
-									<oql><![CDATA[
+                  <dict>Tickets:Related:OpenIncidents</dict>
+                  <icon>itop-incident-mgmt-itil/images/incident-red.png</icon>
+                  <default>yes</default>
+                </item>
+              </items>
+            </down>
+            <up>
+              <items type="array">
+                <item id="open_incidents" _delta="define">
+                  <oql><![CDATA[
 										SELECT FCI, I
 										FROM FunctionalCI AS FCI
 												 JOIN lnkFunctionalCIToTicket AS L ON L.functionalci_id = FCI.id
@@ -2051,15 +2055,15 @@
 										WHERE (I.status NOT IN ('closed', 'resolved'))
 										  AND (L.impact_code != 'not_impacted')
 										]]></oql>
-									<dict>Tickets:Related:OpenIncidents</dict>
-										<icon>itop-incident-mgmt-itil/images/incident-red.png</icon>
-									<default>yes</default>
-								</item>
-							</items>
-						</up>
-					</impacts>
-				</FunctionalCI>
-			</relation_context>
-		</parameters>
-	</module_parameters>
+                  <dict>Tickets:Related:OpenIncidents</dict>
+                  <icon>itop-incident-mgmt-itil/images/incident-red.png</icon>
+                  <default>yes</default>
+                </item>
+              </items>
+            </up>
+          </impacts>
+        </FunctionalCI>
+      </relation_context>
+    </parameters>
+  </module_parameters>
 </itop_design>
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 9cde62059..bfd75af9f 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
@@ -121,6 +121,7 @@
           <count_max>0</count_max>
           <ext_key_to_remote>functionalci_id</ext_key_to_remote>
           <duplicates/>
+          <read_only>false</read_only>
         </field>
         <field id="document_list" xsi:type="AttributeLinkedSetIndirect">
           <linked_class>lnkDocumentToError</linked_class>
@@ -129,6 +130,7 @@
           <count_max>0</count_max>
           <ext_key_to_remote>document_id</ext_key_to_remote>
           <duplicates/>
+          <read_only>false</read_only>
         </field>
       </fields>
       <methods/>
@@ -414,9 +416,9 @@
   <menus>
     <menu id="ProblemManagement" xsi:type="MenuGroup" _delta="define_if_not_exists">
       <rank>42</rank>
-	    <style>
-		    <decoration_classes>fas fa-question</decoration_classes>
-	    </style>
+      <style>
+        <decoration_classes>fas fa-question</decoration_classes>
+      </style>
     </menu>
     <menu id="Problem:Shortcuts" xsi:type="TemplateMenuNode" _delta="define_if_not_exists">
       <rank>5</rank>
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 b774720b8..fb01d1d82 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
@@ -112,6 +112,8 @@
           <ext_key_to_me>oauth_client_id</ext_key_to_me>
           <count_min>0</count_min>
           <count_max>0</count_max>
+          <relation_type>link</relation_type>
+          <read_only>false</read_only>
         </field>
       </fields>
       <methods>
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 101553db3..bb5de993a 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
@@ -18,4 +18,4 @@
       </arguments>
     </event>
   </events>
-</itop_design>
\ No newline at end of file
+</itop_design>
diff --git a/datamodels/2.x/itop-portal/datamodel.itop-portal.xml b/datamodels/2.x/itop-portal/datamodel.itop-portal.xml
index 54449d82e..2fe7d8a3c 100644
--- a/datamodels/2.x/itop-portal/datamodel.itop-portal.xml
+++ b/datamodels/2.x/itop-portal/datamodel.itop-portal.xml
@@ -1,157 +1,160 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
-	<portals>
-		<portal id="itop-portal" _delta="define"><!-- ID must match module_design[id] -->
-			<url>pages/exec.php?exec_module=itop-portal-base&amp;exec_page=index.php&amp;portal_id=itop-portal</url><!-- portal_id must match module_design[id] -->
-			<rank>1.0</rank>
-			<handler />
-			<allow>
+  <portals>
+    <portal id="itop-portal" _delta="define">
+      <!-- ID must match module_design[id] -->
+      <url>pages/exec.php?exec_module=itop-portal-base&amp;exec_page=index.php&amp;portal_id=itop-portal</url>
+      <!-- portal_id must match module_design[id] -->
+      <rank>1.0</rank>
+      <handler/>
+      <allow>
 			</allow>
-			<deny />
-		</portal>
-	</portals>
-	<module_designs>
-		<module_design id="itop-portal" xsi:type="portal" _delta="define">
-			<properties>
-		<name>portal:itop-portal</name>
-		<!-- Can be either a fileref or a relative path to the file (To be tested). Takes over env-xxx/branding/portal-logo.png -->
-		<!-- Priority order is <logo> from xml > env-xxx/branding/portal-logo.png > /images/logo-itop-dark-bg.svg -->
-		<!--<fileref ref="brt_6a2be154b2a62659d3332c513bdad715"  />-->
-		<!--<logo>../images/itop-logo.png</logo>-->
-		<!-- Can be either a fileref or a relative path to the file from /env-xxx (eg. itop-portal-base/mystyle.css) -->
-		<!-- Available themes must have a unique id. Some ids are loaded in a specific order : bootstrap/portal/custom. Other ids are loaded after them, but their order cannot be predicted -->
-		<themes/>
-		<!-- Can be either a fileref or a relative path to the file from /env-xxx (eg. itop-portal-base/mytemplate.html.twig) -->
-		<!-- Available templates are id="layout|home" -->
-		<templates/>
-		<!-- Class used for generating objects view/edit urls (eg. in linked sets). -->
-		<!-- Note: Notification placeholders are NOT using this but the "DBObject::RegisterURLMakerClass(<PORTAL_ID>, <CLASS_NAME>)" declarations. -->
-		<urlmaker_class>iTopPortalViewUrlMaker</urlmaker_class>
-		<!-- An OQL query to determine which TriggerOnPortalUpdate to use within THIS instance of the portal. This is mostly needed to enable different triggers on several portal instances -->
-		<!-- Note : ":parent_classes" parameter is a reserved name that will be used for the current object class name (and its ancestors) -->
-		<triggers_query><![CDATA[SELECT TriggerOnPortalUpdate AS t WHERE t.target_class IN (:parent_classes)]]></triggers_query>
-		<attachments>
-			<allow_delete>true</allow_delete>
-		</attachments>
-		<allowed_portals>
-			<!-- Defines how other portals -allowed for the current user- will be opened. "tab" for a new tab, "self" for the current window -->
-			<opening_mode>tab</opening_mode>
-		</allowed_portals>
-	</properties>
-			<classes>
-				<class id="User" _delta="define">
-					<!-- Allow <allowed_profile>s to apply the <transition>s below. Flags on <field>s will be merged with those from datamodel -->
-					<!-- See example in UserRequest class -->
-					<!--<lifecycle/>-->
-					<scopes>
-						<!-- Note : Silos apply to those scope queries -->
-						<scope id="all">
-							<oql_view><![CDATA[SELECT User AS U JOIN Person AS P ON U.contactid=P.id WHERE P.id = :current_contact_id]]></oql_view>
-							<!-- No object of this class can be edited -->
-							<!--<oql_edit />-->
-							<!-- Everybody -->
-							<!--<allowed_profiles />-->
-						</scope>
-					</scopes>
-				</class>
-				<class id="Organization" _delta="define">
-					<scopes>
-						<scope id="all">
-							<oql_view><![CDATA[SELECT Organization WHERE id = :current_contact->org_id]]></oql_view>
-						</scope>
-					</scopes>
-				</class>
-				<class id="Location" _delta="define">
-					<scopes>
-						<scope id="all">
-							<oql_view><![CDATA[SELECT Location WHERE org_id = :current_contact->org_id]]></oql_view>
-						</scope>
-					</scopes>
-				</class>
-				<class id="Contact" _delta="define">
-					<scopes>
-						<scope id="all">
-							<oql_view><![CDATA[SELECT Contact WHERE org_id = :current_contact->org_id]]></oql_view>
-						</scope>
-						<scope id="admin">
-							<oql_view><![CDATA[SELECT Contact]]></oql_view>
-							<allowed_profiles>
-								<allowed_profile id="Administrator"/>
-							</allowed_profiles>
-						</scope>
-					</scopes>
-					<lists>
-						<list id="default">
-							<items>
-								<item id="status">
-									<rank>10</rank>
-								</item>
-								<item id="org_id">
-									<rank>20</rank>
-								</item>
-								<item id="function">
-									<rank>50</rank>
-								</item>
-							</items>
-						</list>
-					</lists>
-				</class>
-			</classes>
-			<bricks>
-				<brick id="user-profile" xsi:type="Combodo\iTop\Portal\Brick\UserProfileBrick">
-				<rank>
-				<!-- Can be either a <default> tag for both home page and navigation menu or distinct <home> or/and <navigation_menu> tags-->
-				<default>1</default>
-				</rank>
-			<title>
-				<!-- Can be either a <default> tag for both home page and navigation menu or distinct <home> or/and <navigation_menu> tags-->
-				<default>Brick:Portal:UserProfile:Navigation:Dropdown:MyProfil</default>
-			</title>
-			<decoration_class>
-				<default>fas fa-user fa-2x</default>
-			</decoration_class>
-			<!-- Show / hide some of the user profile forms by setting the tag value to true|false -->
-			<!--<show_picture_form>true</show_picture_form>-->
-			<!--<show_preferences_form>true</show_preferences_form>-->
-			<!--<show_password_form>true</show_password_form>-->
-			<form>
-				<!-- Optional tag to list the fields. If empty only fields from <twig> tag will be displayed, if omitted fields from zlist details will. -->
-				<fields />
-				<!-- Optional tag to specify the form layout. Fields that are not positioned in the layout will be placed at the end of the form -->
-				<twig>
-					<!-- data-field-id attribute must be an attribute code of the class -->
-					<!-- data-field-flags attribute contains flags among read_only/hidden/mandatory/must_prompt/must_change -->
-					<div class="form_field" data-field-id="first_name" data-field-flags="read_only">
+      <deny/>
+    </portal>
+  </portals>
+  <module_designs>
+    <module_design id="itop-portal" xsi:type="portal" _delta="define">
+      <properties>
+        <name>portal:itop-portal</name>
+        <!-- Can be either a fileref or a relative path to the file (To be tested). Takes over env-xxx/branding/portal-logo.png -->
+        <!-- Priority order is <logo> from xml > env-xxx/branding/portal-logo.png > /images/logo-itop-dark-bg.svg -->
+        <!--<fileref ref="brt_6a2be154b2a62659d3332c513bdad715"  />-->
+        <!--<logo>../images/itop-logo.png</logo>-->
+        <!-- Can be either a fileref or a relative path to the file from /env-xxx (eg. itop-portal-base/mystyle.css) -->
+        <!-- Available themes must have a unique id. Some ids are loaded in a specific order : bootstrap/portal/custom. Other ids are loaded after them, but their order cannot be predicted -->
+        <themes/>
+        <!-- Can be either a fileref or a relative path to the file from /env-xxx (eg. itop-portal-base/mytemplate.html.twig) -->
+        <!-- Available templates are id="layout|home" -->
+        <templates/>
+        <!-- Class used for generating objects view/edit urls (eg. in linked sets). -->
+        <!-- Note: Notification placeholders are NOT using this but the "DBObject::RegisterURLMakerClass(<PORTAL_ID>, <CLASS_NAME>)" declarations. -->
+        <urlmaker_class>iTopPortalViewUrlMaker</urlmaker_class>
+        <!-- An OQL query to determine which TriggerOnPortalUpdate to use within THIS instance of the portal. This is mostly needed to enable different triggers on several portal instances -->
+        <!-- Note : ":parent_classes" parameter is a reserved name that will be used for the current object class name (and its ancestors) -->
+        <triggers_query><![CDATA[SELECT TriggerOnPortalUpdate AS t WHERE t.target_class IN (:parent_classes)]]></triggers_query>
+        <attachments>
+          <allow_delete>true</allow_delete>
+        </attachments>
+        <allowed_portals>
+          <!-- Defines how other portals -allowed for the current user- will be opened. "tab" for a new tab, "self" for the current window -->
+          <opening_mode>tab</opening_mode>
+        </allowed_portals>
+      </properties>
+      <classes>
+        <class id="User" _delta="define">
+          <!-- Allow <allowed_profile>s to apply the <transition>s below. Flags on <field>s will be merged with those from datamodel -->
+          <!-- See example in UserRequest class -->
+          <!--<lifecycle/>-->
+          <scopes>
+            <!-- Note : Silos apply to those scope queries -->
+            <scope id="all">
+              <oql_view><![CDATA[SELECT User AS U JOIN Person AS P ON U.contactid=P.id WHERE P.id = :current_contact_id]]></oql_view>
+              <!-- No object of this class can be edited -->
+              <!--<oql_edit />-->
+              <!-- Everybody -->
+              <!--<allowed_profiles />-->
+            </scope>
+          </scopes>
+        </class>
+        <class id="Organization" _delta="define">
+          <scopes>
+            <scope id="all">
+              <oql_view><![CDATA[SELECT Organization WHERE id = :current_contact->org_id]]></oql_view>
+            </scope>
+          </scopes>
+        </class>
+        <class id="Location" _delta="define">
+          <scopes>
+            <scope id="all">
+              <oql_view><![CDATA[SELECT Location WHERE org_id = :current_contact->org_id]]></oql_view>
+            </scope>
+          </scopes>
+        </class>
+        <class id="Contact" _delta="define">
+          <scopes>
+            <scope id="all">
+              <oql_view><![CDATA[SELECT Contact WHERE org_id = :current_contact->org_id]]></oql_view>
+            </scope>
+            <scope id="admin">
+              <oql_view><![CDATA[SELECT Contact]]></oql_view>
+              <allowed_profiles>
+                <allowed_profile id="Administrator"/>
+              </allowed_profiles>
+            </scope>
+          </scopes>
+          <lists>
+            <list id="default">
+              <items>
+                <item id="status">
+                  <rank>10</rank>
+                </item>
+                <item id="org_id">
+                  <rank>20</rank>
+                </item>
+                <item id="function">
+                  <rank>50</rank>
+                </item>
+              </items>
+            </list>
+          </lists>
+        </class>
+      </classes>
+      <bricks>
+        <brick id="user-profile" xsi:type="Combodo\iTop\Portal\Brick\UserProfileBrick">
+          <rank>
+            <!-- Can be either a <default> tag for both home page and navigation menu or distinct <home> or/and <navigation_menu> tags-->
+            <default>1</default>
+          </rank>
+          <title>
+            <!-- Can be either a <default> tag for both home page and navigation menu or distinct <home> or/and <navigation_menu> tags-->
+            <default>Brick:Portal:UserProfile:Navigation:Dropdown:MyProfil</default>
+          </title>
+          <decoration_class>
+            <default>fas fa-user fa-2x</default>
+          </decoration_class>
+          <!-- Show / hide some of the user profile forms by setting the tag value to true|false -->
+          <!--<show_picture_form>true</show_picture_form>-->
+          <!--<show_preferences_form>true</show_preferences_form>-->
+          <!--<show_password_form>true</show_password_form>-->
+          <form>
+            <!-- Optional tag to list the fields. If empty only fields from <twig> tag will be displayed, if omitted fields from zlist details will. -->
+            <fields/>
+            <!-- Optional tag to specify the form layout. Fields that are not positioned in the layout will be placed at the end of the form -->
+            <twig>
+              <!-- data-field-id attribute must be an attribute code of the class -->
+              <!-- data-field-flags attribute contains flags among read_only/hidden/mandatory/must_prompt/must_change -->
+              <div class="form_field" data-field-id="first_name" data-field-flags="read_only">
 					</div>
-					<div class="form_field" data-field-id="name" data-field-flags="read_only">
+              <div class="form_field" data-field-id="name" data-field-flags="read_only">
 					</div>
-					<div class="form_field" data-field-id="org_id" data-field-flags="read_only">
+              <div class="form_field" data-field-id="org_id" data-field-flags="read_only">
 					</div>
-					<div class="form_field" data-field-id="email" data-field-flags="read_only">
+              <div class="form_field" data-field-id="email" data-field-flags="read_only">
 					</div>
-					<div class="form_field" data-field-id="phone">
+              <div class="form_field" data-field-id="phone">
 					</div>
-					<div class="form_field" data-field-id="location_id">
+              <div class="form_field" data-field-id="location_id">
 					</div>
-					<div class="form_field" data-field-id="function">
+              <div class="form_field" data-field-id="function">
 					</div>
-					<div class="form_field" data-field-id="manager_id" data-field-flags="read_only">
+              <div class="form_field" data-field-id="manager_id" data-field-flags="read_only">
 					</div>
-				</twig>
-			</form>
-		</brick>
-			</bricks>
+            </twig>
+          </form>
+        </brick>
+      </bricks>
       <navigation_rules>
         <!-- Close form (either the modal or the whole page) -->
         <navigation_rule id="close-form" xsi:type="close" _delta="define"/>
         <!-- Go to the homepage -->
         <navigation_rule id="go-to-homepage" xsi:type="go-to-homepage" _delta="define"/>
       </navigation_rules>
-		</module_design>
-	</module_designs>
+    </module_design>
+  </module_designs>
   <module_parameters>
     <parameters id="itop-portal" _delta="define">
-      <lazy_loading_threshold>500</lazy_loading_threshold><!-- Will be placed in the conf/<env>/config-itop.php file under the itop-portal module's settings -->
+      <lazy_loading_threshold>500</lazy_loading_threshold>
+      <!-- Will be placed in the conf/<env>/config-itop.php file under the itop-portal module's settings -->
     </parameters>
   </module_parameters>
 </itop_design>
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 7ee74c6f8..de27cd48f 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,491 +1,497 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
-    <classes>
-        <class id="Problem" _delta="define">
-            <parent>Ticket</parent>
-            <properties>
-                <comment><![CDATA[/**
+  <classes>
+    <class id="Problem" _delta="define">
+      <parent>Ticket</parent>
+      <properties>
+        <comment><![CDATA[/**
  * Persistent classes for a CMDB
  *
  * @copyright   Copyright (C) 2010-2021 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */]]></comment>
-                <category>bizmodel,searchable,problemmgmt</category>
-                <abstract>false</abstract>
-                <key_type>autoincrement</key_type>
-                <db_table>ticket_problem</db_table>
-                <db_key_field>id</db_key_field>
-                <db_final_class_field/>
-                <naming>
-                    <attributes>
-                        <attribute id="ref"/>
-                    </attributes>
-                </naming>
-                <fields_semantic>
-                    <state_attribute>status</state_attribute>
-                </fields_semantic>
-                <style>
-                    <icon>../../images/icons/icons8-solve.svg</icon>
-                </style>
-                <reconciliation>
-                    <attributes>
-                        <attribute id="ref"/>
-                    </attributes>
-                </reconciliation>
-                <order>
-                    <columns>
-                        <column id="ref" ascending="false"/>
-                    </columns>
-                </order>
-            </properties>
-            <fields>
-                <field id="status" xsi:type="AttributeEnum">
-                    <values>
-                        <value id="new">
-                            <code>new</code>
-                            <style>
-                                <main_color>$ibo-lifecycle-new-state-primary-color</main_color>
-                                <complementary_color>$ibo-lifecycle-new-state-secondary-color</complementary_color>
-                                <decoration_classes/>
-                            </style>
-                        </value>
-                        <value id="assigned">
-                            <code>assigned</code>
-                            <style>
-                                <main_color>$ibo-lifecycle-neutral-state-primary-color</main_color>
-                                <complementary_color>$ibo-lifecycle-neutral-state-secondary-color</complementary_color>
-                                <decoration_classes/>
-                            </style>
-                        </value>
-                        <value id="resolved">
-                            <code>resolved</code>
-                            <style>
-                                <main_color>$ibo-lifecycle-success-state-primary-color</main_color>
-                                <complementary_color>$ibo-lifecycle-success-state-secondary-color</complementary_color>
-                                <decoration_classes>fas fa-check</decoration_classes>
-                            </style>
-                        </value>
-                        <value id="closed">
-                            <code>closed</code>
-                            <style>
-                                <main_color>$ibo-lifecycle-frozen-state-primary-color</main_color>
-                                <complementary_color>$ibo-lifecycle-frozen-state-secondary-color</complementary_color>
-                                <decoration_classes/>
-                            </style>
-                        </value>
-                    </values>
-                    <default_style>
-                        <main_color>$ibo-lifecycle-neutral-state-primary-color</main_color>
-                        <complementary_color>$ibo-lifecycle-neutral-state-secondary-color</complementary_color>
-                        <decoration_classes/>
-                    </default_style>
-                    <sql>status</sql>
-                    <default_value>new</default_value>
-                    <is_null_allowed>false</is_null_allowed>
-                    <display_style>list</display_style>
-                </field>
-                <field id="service_id" xsi:type="AttributeExternalKey">
-                    <filter>SELECT Service</filter>
-                    <dependencies>
-                        <attribute id="org_id"/>
-                    </dependencies>
-                    <sql>service_id</sql>
-                    <target_class>Service</target_class>
-                    <is_null_allowed>true</is_null_allowed>
-                    <on_target_delete>DEL_MANUAL</on_target_delete>
-                    <allow_target_creation>false</allow_target_creation>
-                </field>
-                <field id="service_name" xsi:type="AttributeExternalField">
-                    <extkey_attcode>service_id</extkey_attcode>
-                    <target_attcode>name</target_attcode>
-                </field>
-                <field id="servicesubcategory_id" xsi:type="AttributeExternalKey">
-                    <filter><![CDATA[SELECT ServiceSubcategory WHERE service_id = :this->service_id]]></filter>
-                    <dependencies>
-                        <attribute id="service_id"/>
-                    </dependencies>
-                    <sql>servicesubcategory_id</sql>
-                    <target_class>ServiceSubcategory</target_class>
-                    <is_null_allowed>true</is_null_allowed>
-                    <on_target_delete>DEL_MANUAL</on_target_delete>
-                    <allow_target_creation>false</allow_target_creation>
-                </field>
-                <field id="servicesubcategory_name" xsi:type="AttributeExternalField">
-                    <extkey_attcode>servicesubcategory_id</extkey_attcode>
-                    <target_attcode>name</target_attcode>
-                </field>
-                <field id="product" xsi:type="AttributeString">
-                    <sql>product</sql>
-                    <default_value/>
-                    <is_null_allowed>true</is_null_allowed>
-                </field>
-                <field id="impact" xsi:type="AttributeEnum">
-                    <values>
-                        <value id="1">
-                            <code>1</code>
-                        </value>
-                        <value id="2">
-                            <code>2</code>
-                        </value>
-                        <value id="3">
-                            <code>3</code>
-                        </value>
-                    </values>
-                    <sql>impact</sql>
-                    <default_value>1</default_value>
-                    <is_null_allowed>false</is_null_allowed>
-                    <display_style>list</display_style>
-                </field>
-                <field id="urgency" xsi:type="AttributeEnum">
-                    <values>
-                        <value id="1">
-                            <code>1</code>
-                        </value>
-                        <value id="2">
-                            <code>2</code>
-                        </value>
-                        <value id="3">
-                            <code>3</code>
-                        </value>
-                        <value id="4">
-                            <code>4</code>
-                        </value>
-                    </values>
-                    <sql>urgency</sql>
-                    <default_value>1</default_value>
-                    <is_null_allowed>false</is_null_allowed>
-                    <display_style>list</display_style>
-                </field>
-                <field id="priority" xsi:type="AttributeEnum">
-                    <values>
-                        <value id="1">
-                            <code>1</code>
-                        </value>
-                        <value id="2">
-                            <code>2</code>
-                        </value>
-                        <value id="3">
-                            <code>3</code>
-                        </value>
-                        <value id="4">
-                            <code>4</code>
-                        </value>
-                    </values>
-                    <sql>priority</sql>
-                    <default_value>4</default_value>
-                    <is_null_allowed>false</is_null_allowed>
-                    <display_style>list</display_style>
-                    <dependencies>
-                        <attribute id="impact"/>
-                        <attribute id="urgency"/>
-                    </dependencies>
-                </field>
-                <field id="related_change_id" xsi:type="AttributeExternalKey">
-                    <filter><![CDATA[SELECT Change WHERE status != "closed"]]></filter>
-                    <sql>related_change_id</sql>
-                    <target_class>Change</target_class>
-                    <is_null_allowed>true</is_null_allowed>
-                    <on_target_delete>DEL_MANUAL</on_target_delete>
-                </field>
-                <field id="related_change_ref" xsi:type="AttributeExternalField">
-                    <extkey_attcode>related_change_id</extkey_attcode>
-                    <target_attcode>ref</target_attcode>
-                </field>
-                <field id="assignment_date" xsi:type="AttributeDateTime">
-                    <sql>assignment_date</sql>
-                    <default_value/>
-                    <is_null_allowed>true</is_null_allowed>
-                </field>
-                <field id="resolution_date" xsi:type="AttributeDateTime">
-                    <sql>resolution_date</sql>
-                    <default_value/>
-                    <is_null_allowed>true</is_null_allowed>
-                </field>
-                <field id="knownerrors_list" xsi:type="AttributeLinkedSet">
-                    <linked_class>KnownError</linked_class>
-                    <ext_key_to_me>problem_id</ext_key_to_me>
-                    <edit_mode>add_only</edit_mode>
-                    <count_min>0</count_min>
-                    <count_max>0</count_max>
-                </field>
-                <field id="related_request_list" xsi:type="AttributeLinkedSet">
-                    <linked_class>UserRequest</linked_class>
-                    <ext_key_to_me>parent_problem_id</ext_key_to_me>
-                    <edit_mode>add_remove</edit_mode>
-                    <count_min>0</count_min>
-                    <count_max>0</count_max>
-                </field>
-                <field id="related_incident_list" xsi:type="AttributeLinkedSet">
-                    <linked_class>Incident</linked_class>
-                    <ext_key_to_me>parent_problem_id</ext_key_to_me>
-                    <edit_mode>add_remove</edit_mode>
-                    <count_min>0</count_min>
-                    <count_max>0</count_max>
-                </field>
-            </fields>
-            <lifecycle>
-                <stimuli>
-                    <stimulus id="ev_assign" xsi:type="StimulusUserAction"/>
-                    <stimulus id="ev_reassign" xsi:type="StimulusUserAction"/>
-                    <stimulus id="ev_resolve" xsi:type="StimulusUserAction"/>
-                    <stimulus id="ev_close" xsi:type="StimulusUserAction"/>
-                </stimuli>
-                <states>
-                    <state id="new">
-                        <flags>
-                            <attribute id="ref">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="org_id">
-                                <must_prompt/>
-                            </attribute>
-                            <attribute id="team_id">
-                                <hidden/>
-                            </attribute>
-                            <attribute id="agent_id">
-                                <hidden/>
-                            </attribute>
-                            <attribute id="description">
-                                <must_prompt/>
-                            </attribute>
-                            <attribute id="start_date">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="last_update">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="close_date">
-                                <hidden/>
-                            </attribute>
-                            <attribute id="service_id">
-                                <normal/>
-                            </attribute>
-                            <attribute id="servicesubcategory_id">
-                                <normal/>
-                            </attribute>
-                            <attribute id="product">
-                                <normal/>
-                            </attribute>
-                            <attribute id="impact">
-                                <must_prompt/>
-                            </attribute>
-                            <attribute id="urgency">
-                                <must_prompt/>
-                            </attribute>
-                            <attribute id="priority">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="related_change_id">
-                                <normal/>
-                            </attribute>
-                            <attribute id="assignment_date">
-                                <hidden/>
-                            </attribute>
-                            <attribute id="resolution_date">
-                                <hidden/>
-                            </attribute>
-                        </flags>
-                        <transitions>
-                            <transition id="ev_assign">
-                                <target>assigned</target>
-                                <actions>
-                                    <action>
-                                        <verb>SetCurrentDate</verb>
-                                        <params>
-                                            <param xsi:type="attcode">assignment_date</param>
-                                        </params>
-                                    </action>
-                                </actions>
-                            </transition>
-                        </transitions>
-                    </state>
-                    <state id="assigned">
-                        <inherit_flags_from>new</inherit_flags_from>
-                        <flags>
-                            <attribute id="title"/>
-                            <attribute id="team_id">
-                                <mandatory/>
-                                <must_prompt/>
-                            </attribute>
-                            <attribute id="agent_id">
-                                <mandatory/>
-                                <must_prompt/>
-                            </attribute>
-                            <attribute id="assignment_date">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="service_id"/>
-                            <attribute id="servicesubcategory_id"/>
-                            <attribute id="product"/>
-                            <attribute id="impact"/>
-                            <attribute id="urgency"/>
-                            <attribute id="related_change_id"/>
-                        </flags>
-                        <transitions>
-                            <transition id="ev_reassign">
-                                <target>assigned</target>
-                                <actions/>
-                            </transition>
-                            <transition id="ev_resolve">
-                                <target>resolved</target>
-                                <actions>
-                                    <action>
-                                        <verb>SetCurrentDate</verb>
-                                        <params>
-                                            <param xsi:type="attcode">resolution_date</param>
-                                        </params>
-                                    </action>
-                                </actions>
-                            </transition>
-                        </transitions>
-                    </state>
-                    <state id="resolved">
-                        <inherit_flags_from>assigned</inherit_flags_from>
-                        <flags>
-                            <attribute id="caller_id">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="service_id">
-                                <mandatory/>
-                            </attribute>
-                            <attribute id="servicesubcategory_id">
-                                <must_prompt/>
-                            </attribute>
-                            <attribute id="product">
-                                <must_prompt/>
-                            </attribute>
-                            <attribute id="impact">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="urgency">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="org_id">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="team_id">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="agent_id">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="title">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="description">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="resolution_date">
-                                <read_only/>
-                            </attribute>
-                        </flags>
-                        <transitions>
-                            <transition id="ev_reassign">
-                                <target>assigned</target>
-                                <actions/>
-                            </transition>
-                            <transition id="ev_close">
-                                <target>closed</target>
-                                <actions>
-                                    <action>
-                                        <verb>SetCurrentDate</verb>
-                                        <params>
-                                            <param xsi:type="attcode">close_date</param>
-                                        </params>
-                                    </action>
-                                </actions>
-                            </transition>
-                        </transitions>
-                    </state>
-                    <state id="closed">
-                        <inherit_flags_from>resolved</inherit_flags_from>
-                        <flags>
-                            <attribute id="private_log">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="related_change_id">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="close_date">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="service_id">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="servicesubcategory_id">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="product">
-                                <read_only/>
-                            </attribute>
-                        </flags>
-                        <transitions/>
-                    </state>
-                </states>
-            </lifecycle>
-            <methods>
-				<method id="GetTicketRefFormat">
-					<static>true</static>
-					<access>public</access>
-					<type>Overload-DBObject</type>
-					<code><![CDATA[
+        <category>bizmodel,searchable,problemmgmt</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>ticket_problem</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="ref"/>
+          </attributes>
+        </naming>
+        <fields_semantic>
+          <state_attribute>status</state_attribute>
+        </fields_semantic>
+        <style>
+          <icon>../../images/icons/icons8-solve.svg</icon>
+        </style>
+        <reconciliation>
+          <attributes>
+            <attribute id="ref"/>
+          </attributes>
+        </reconciliation>
+        <order>
+          <columns>
+            <column id="ref" ascending="false"/>
+          </columns>
+        </order>
+      </properties>
+      <fields>
+        <field id="status" xsi:type="AttributeEnum">
+          <values>
+            <value id="new">
+              <code>new</code>
+              <style>
+                <main_color>$ibo-lifecycle-new-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-new-state-secondary-color</complementary_color>
+                <decoration_classes/>
+              </style>
+            </value>
+            <value id="assigned">
+              <code>assigned</code>
+              <style>
+                <main_color>$ibo-lifecycle-neutral-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-neutral-state-secondary-color</complementary_color>
+                <decoration_classes/>
+              </style>
+            </value>
+            <value id="resolved">
+              <code>resolved</code>
+              <style>
+                <main_color>$ibo-lifecycle-success-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-success-state-secondary-color</complementary_color>
+                <decoration_classes>fas fa-check</decoration_classes>
+              </style>
+            </value>
+            <value id="closed">
+              <code>closed</code>
+              <style>
+                <main_color>$ibo-lifecycle-frozen-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-frozen-state-secondary-color</complementary_color>
+                <decoration_classes/>
+              </style>
+            </value>
+          </values>
+          <default_style>
+            <main_color>$ibo-lifecycle-neutral-state-primary-color</main_color>
+            <complementary_color>$ibo-lifecycle-neutral-state-secondary-color</complementary_color>
+            <decoration_classes/>
+          </default_style>
+          <sql>status</sql>
+          <default_value>new</default_value>
+          <is_null_allowed>false</is_null_allowed>
+          <display_style>list</display_style>
+        </field>
+        <field id="service_id" xsi:type="AttributeExternalKey">
+          <filter>SELECT Service</filter>
+          <dependencies>
+            <attribute id="org_id"/>
+          </dependencies>
+          <sql>service_id</sql>
+          <target_class>Service</target_class>
+          <is_null_allowed>true</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+          <allow_target_creation>false</allow_target_creation>
+        </field>
+        <field id="service_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>service_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="servicesubcategory_id" xsi:type="AttributeExternalKey">
+          <filter><![CDATA[SELECT ServiceSubcategory WHERE service_id = :this->service_id]]></filter>
+          <dependencies>
+            <attribute id="service_id"/>
+          </dependencies>
+          <sql>servicesubcategory_id</sql>
+          <target_class>ServiceSubcategory</target_class>
+          <is_null_allowed>true</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+          <allow_target_creation>false</allow_target_creation>
+        </field>
+        <field id="servicesubcategory_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>servicesubcategory_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="product" xsi:type="AttributeString">
+          <sql>product</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="impact" xsi:type="AttributeEnum">
+          <values>
+            <value id="1">
+              <code>1</code>
+            </value>
+            <value id="2">
+              <code>2</code>
+            </value>
+            <value id="3">
+              <code>3</code>
+            </value>
+          </values>
+          <sql>impact</sql>
+          <default_value>1</default_value>
+          <is_null_allowed>false</is_null_allowed>
+          <display_style>list</display_style>
+        </field>
+        <field id="urgency" xsi:type="AttributeEnum">
+          <values>
+            <value id="1">
+              <code>1</code>
+            </value>
+            <value id="2">
+              <code>2</code>
+            </value>
+            <value id="3">
+              <code>3</code>
+            </value>
+            <value id="4">
+              <code>4</code>
+            </value>
+          </values>
+          <sql>urgency</sql>
+          <default_value>1</default_value>
+          <is_null_allowed>false</is_null_allowed>
+          <display_style>list</display_style>
+        </field>
+        <field id="priority" xsi:type="AttributeEnum">
+          <values>
+            <value id="1">
+              <code>1</code>
+            </value>
+            <value id="2">
+              <code>2</code>
+            </value>
+            <value id="3">
+              <code>3</code>
+            </value>
+            <value id="4">
+              <code>4</code>
+            </value>
+          </values>
+          <sql>priority</sql>
+          <default_value>4</default_value>
+          <is_null_allowed>false</is_null_allowed>
+          <display_style>list</display_style>
+          <dependencies>
+            <attribute id="impact"/>
+            <attribute id="urgency"/>
+          </dependencies>
+        </field>
+        <field id="related_change_id" xsi:type="AttributeExternalKey">
+          <filter><![CDATA[SELECT Change WHERE status != "closed"]]></filter>
+          <sql>related_change_id</sql>
+          <target_class>Change</target_class>
+          <is_null_allowed>true</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+        </field>
+        <field id="related_change_ref" xsi:type="AttributeExternalField">
+          <extkey_attcode>related_change_id</extkey_attcode>
+          <target_attcode>ref</target_attcode>
+        </field>
+        <field id="assignment_date" xsi:type="AttributeDateTime">
+          <sql>assignment_date</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="resolution_date" xsi:type="AttributeDateTime">
+          <sql>resolution_date</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="knownerrors_list" xsi:type="AttributeLinkedSet">
+          <linked_class>KnownError</linked_class>
+          <ext_key_to_me>problem_id</ext_key_to_me>
+          <legacy_edit_mode>add_only</legacy_edit_mode>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <relation_type>link</relation_type>
+          <read_only>false</read_only>
+        </field>
+        <field id="related_request_list" xsi:type="AttributeLinkedSet">
+          <linked_class>UserRequest</linked_class>
+          <ext_key_to_me>parent_problem_id</ext_key_to_me>
+          <legacy_edit_mode>add_remove</legacy_edit_mode>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <relation_type>link</relation_type>
+          <read_only>false</read_only>
+        </field>
+        <field id="related_incident_list" xsi:type="AttributeLinkedSet">
+          <linked_class>Incident</linked_class>
+          <ext_key_to_me>parent_problem_id</ext_key_to_me>
+          <legacy_edit_mode>add_remove</legacy_edit_mode>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <relation_type>link</relation_type>
+          <read_only>false</read_only>
+        </field>
+      </fields>
+      <lifecycle>
+        <stimuli>
+          <stimulus id="ev_assign" xsi:type="StimulusUserAction"/>
+          <stimulus id="ev_reassign" xsi:type="StimulusUserAction"/>
+          <stimulus id="ev_resolve" xsi:type="StimulusUserAction"/>
+          <stimulus id="ev_close" xsi:type="StimulusUserAction"/>
+        </stimuli>
+        <states>
+          <state id="new">
+            <flags>
+              <attribute id="ref">
+                <read_only/>
+              </attribute>
+              <attribute id="org_id">
+                <must_prompt/>
+              </attribute>
+              <attribute id="team_id">
+                <hidden/>
+              </attribute>
+              <attribute id="agent_id">
+                <hidden/>
+              </attribute>
+              <attribute id="description">
+                <must_prompt/>
+              </attribute>
+              <attribute id="start_date">
+                <read_only/>
+              </attribute>
+              <attribute id="last_update">
+                <read_only/>
+              </attribute>
+              <attribute id="close_date">
+                <hidden/>
+              </attribute>
+              <attribute id="service_id">
+                <normal/>
+              </attribute>
+              <attribute id="servicesubcategory_id">
+                <normal/>
+              </attribute>
+              <attribute id="product">
+                <normal/>
+              </attribute>
+              <attribute id="impact">
+                <must_prompt/>
+              </attribute>
+              <attribute id="urgency">
+                <must_prompt/>
+              </attribute>
+              <attribute id="priority">
+                <read_only/>
+              </attribute>
+              <attribute id="related_change_id">
+                <normal/>
+              </attribute>
+              <attribute id="assignment_date">
+                <hidden/>
+              </attribute>
+              <attribute id="resolution_date">
+                <hidden/>
+              </attribute>
+            </flags>
+            <transitions>
+              <transition id="ev_assign">
+                <target>assigned</target>
+                <actions>
+                  <action>
+                    <verb>SetCurrentDate</verb>
+                    <params>
+                      <param xsi:type="attcode">assignment_date</param>
+                    </params>
+                  </action>
+                </actions>
+              </transition>
+            </transitions>
+          </state>
+          <state id="assigned">
+            <inherit_flags_from>new</inherit_flags_from>
+            <flags>
+              <attribute id="title"/>
+              <attribute id="team_id">
+                <mandatory/>
+                <must_prompt/>
+              </attribute>
+              <attribute id="agent_id">
+                <mandatory/>
+                <must_prompt/>
+              </attribute>
+              <attribute id="assignment_date">
+                <read_only/>
+              </attribute>
+              <attribute id="service_id"/>
+              <attribute id="servicesubcategory_id"/>
+              <attribute id="product"/>
+              <attribute id="impact"/>
+              <attribute id="urgency"/>
+              <attribute id="related_change_id"/>
+            </flags>
+            <transitions>
+              <transition id="ev_reassign">
+                <target>assigned</target>
+                <actions/>
+              </transition>
+              <transition id="ev_resolve">
+                <target>resolved</target>
+                <actions>
+                  <action>
+                    <verb>SetCurrentDate</verb>
+                    <params>
+                      <param xsi:type="attcode">resolution_date</param>
+                    </params>
+                  </action>
+                </actions>
+              </transition>
+            </transitions>
+          </state>
+          <state id="resolved">
+            <inherit_flags_from>assigned</inherit_flags_from>
+            <flags>
+              <attribute id="caller_id">
+                <read_only/>
+              </attribute>
+              <attribute id="service_id">
+                <mandatory/>
+              </attribute>
+              <attribute id="servicesubcategory_id">
+                <must_prompt/>
+              </attribute>
+              <attribute id="product">
+                <must_prompt/>
+              </attribute>
+              <attribute id="impact">
+                <read_only/>
+              </attribute>
+              <attribute id="urgency">
+                <read_only/>
+              </attribute>
+              <attribute id="org_id">
+                <read_only/>
+              </attribute>
+              <attribute id="team_id">
+                <read_only/>
+              </attribute>
+              <attribute id="agent_id">
+                <read_only/>
+              </attribute>
+              <attribute id="title">
+                <read_only/>
+              </attribute>
+              <attribute id="description">
+                <read_only/>
+              </attribute>
+              <attribute id="resolution_date">
+                <read_only/>
+              </attribute>
+            </flags>
+            <transitions>
+              <transition id="ev_reassign">
+                <target>assigned</target>
+                <actions/>
+              </transition>
+              <transition id="ev_close">
+                <target>closed</target>
+                <actions>
+                  <action>
+                    <verb>SetCurrentDate</verb>
+                    <params>
+                      <param xsi:type="attcode">close_date</param>
+                    </params>
+                  </action>
+                </actions>
+              </transition>
+            </transitions>
+          </state>
+          <state id="closed">
+            <inherit_flags_from>resolved</inherit_flags_from>
+            <flags>
+              <attribute id="private_log">
+                <read_only/>
+              </attribute>
+              <attribute id="related_change_id">
+                <read_only/>
+              </attribute>
+              <attribute id="close_date">
+                <read_only/>
+              </attribute>
+              <attribute id="service_id">
+                <read_only/>
+              </attribute>
+              <attribute id="servicesubcategory_id">
+                <read_only/>
+              </attribute>
+              <attribute id="product">
+                <read_only/>
+              </attribute>
+            </flags>
+            <transitions/>
+          </state>
+        </states>
+      </lifecycle>
+      <methods>
+        <method id="GetTicketRefFormat">
+          <static>true</static>
+          <access>public</access>
+          <type>Overload-DBObject</type>
+          <code><![CDATA[
         public static function GetTicketRefFormat()
         {
                 return 'P-%06d';
         }
         ]]></code>
-				</method>
-                <method id="SetAssignedDate">
-                    <comment><![CDATA[/**
+        </method>
+        <method id="SetAssignedDate">
+          <comment><![CDATA[/**
 	 * To be deprecated: use SetCurrentDate() instead
 	 * @return void
 	 */]]></comment>
-                    <static>false</static>
-                    <access>public</access>
-                    <type>LifecycleAction</type>
-                    <code><![CDATA[        public function SetAssignedDate($sStimulusCode)
+          <static>false</static>
+          <access>public</access>
+          <type>LifecycleAction</type>
+          <code><![CDATA[        public function SetAssignedDate($sStimulusCode)
         {
                 $this->Set('assignment_date', time());
                 return true;
         }]]></code>
-                </method>
-                <method id="SetResolveDate">
-                    <comment><![CDATA[/**
+        </method>
+        <method id="SetResolveDate">
+          <comment><![CDATA[/**
 	 * To be deprecated: use SetCurrentDate() instead
 	 * @return void
 	 */]]></comment>
-                    <static>false</static>
-                    <access>public</access>
-                    <type>LifecycleAction</type>
-                    <code><![CDATA[        public function SetResolveDate($sStimulusCode)
+          <static>false</static>
+          <access>public</access>
+          <type>LifecycleAction</type>
+          <code><![CDATA[        public function SetResolveDate($sStimulusCode)
         {
                 $this->Set('resolution_date', time());
                 return true;
         }]]></code>
-                </method>
-                <method id="SetClosureDate">
-                    <comment><![CDATA[/**
+        </method>
+        <method id="SetClosureDate">
+          <comment><![CDATA[/**
 	 * To be deprecated: use SetCurrentDate() instead
 	 * @return void
 	 */]]></comment>
-                    <static>false</static>
-                    <access>public</access>
-                    <type>LifecycleAction</type>
-                    <code><![CDATA[        public function SetClosureDate($sStimulusCode)
+          <static>false</static>
+          <access>public</access>
+          <type>LifecycleAction</type>
+          <code><![CDATA[        public function SetClosureDate($sStimulusCode)
         {
                 $this->Set('close_date', time());
                 return true;
         }]]></code>
-                </method>
-                <method id="ComputePriority">
-                    <comment>/** Compute the priority of the ticket based on its impact and urgency&#13;
+        </method>
+        <method id="ComputePriority">
+          <comment>/** Compute the priority of the ticket based on its impact and urgency&#13;
                         * @return integer The priority of the ticket 1(high) .. 3(low)&#13;
                         */
                     </comment>
-                    <static>false</static>
-                    <access>public</access>
-                    <type>LifecycleAction</type>
-                    <code><![CDATA[public function ComputePriority()
+          <static>false</static>
+          <access>public</access>
+          <type>LifecycleAction</type>
+          <code><![CDATA[public function ComputePriority()
 	{
 		// priority[impact][urgency]
 		$aPriorities = array(
@@ -519,322 +525,320 @@
 		}
 		return $iPriority;
 	}]]></code>
-                </method>
-                <method id="ComputeValues">
-                    <static>false</static>
-                    <access>public</access>
-                    <type>Overload-DBObject</type>
-                    <code><![CDATA[	public function ComputeValues()
+        </method>
+        <method id="ComputeValues">
+          <static>false</static>
+          <access>public</access>
+          <type>Overload-DBObject</type>
+          <code><![CDATA[	public function ComputeValues()
 	{
 		// Compute the priority of the ticket
 		$this->Set('priority', $this->ComputePriority());
 	}]]></code>
-                </method>
-                <method id="OnInsert">
-                    <static>false</static>
-                    <access>protected</access>
-                    <type>Overload-DBObject</type>
-                    <code><![CDATA[	protected function OnInsert()
+        </method>
+        <method id="OnInsert">
+          <static>false</static>
+          <access>protected</access>
+          <type>Overload-DBObject</type>
+          <code><![CDATA[	protected function OnInsert()
 	{
 		$this->SetIfNull('start_date', time());
 		$this->SetIfNull('last_update', time());
 	}]]></code>
-                </method>
-                <method id="OnUpdate">
-                    <static>false</static>
-                    <access>protected</access>
-                    <type>Overload-DBObject</type>
-                    <code><![CDATA[	protected function OnUpdate()
+        </method>
+        <method id="OnUpdate">
+          <static>false</static>
+          <access>protected</access>
+          <type>Overload-DBObject</type>
+          <code><![CDATA[	protected function OnUpdate()
 	{
 		$this->Set('last_update', time());
 	}]]></code>
-                </method>
-            </methods>
-            <presentation>
-                <details>
-                    <items>
-                        <item id="functionalcis_list">
-                            <rank>10</rank>
-                        </item>
-                        <item id="contacts_list">
-                            <rank>20</rank>
-                        </item>
-                        <item id="knownerrors_list">
-                            <rank>30</rank>
-                        </item>
-                        <item id="workorders_list">
-                            <rank>40</rank>
-                        </item>
-                        <item id="related_request_list">
-                            <rank>50</rank>
-                        </item>
-                        <item id="related_incident_list">
-                            <rank>60</rank>
-                        </item>
-                        <item id="col:col1">
-                            <rank>70</rank>
-                            <items>
-                                <item id="fieldset:Ticket:baseinfo">
-                                    <rank>10</rank>
-                                    <items>
-                                        <item id="ref">
-                                            <rank>10</rank>
-                                        </item>
-                                        <item id="org_id">
-                                            <rank>20</rank>
-                                        </item>
-                                        <item id="caller_id">
-                                            <rank>30</rank>
-                                        </item>
-                                        <item id="status">
-                                            <rank>40</rank>
-                                        </item>
-                                        <item id="product">
-                                            <rank>50</rank>
-                                        </item>
-                                        <item id="title">
-                                            <rank>60</rank>
-                                        </item>
-                                        <item id="description">
-                                            <rank>70</rank>
-                                        </item>
-                                    </items>
-                                </item>
-                                <item id="fieldset:Ticket:moreinfo">
-                                    <rank>20</rank>
-                                    <items>
-                                        <item id="service_id">
-                                            <rank>10</rank>
-                                        </item>
-                                        <item id="servicesubcategory_id">
-                                            <rank>20</rank>
-                                        </item>
-                                    </items>
-                                </item>
-                            </items>
-                        </item>
-                        <item id="col:col2">
-                            <rank>80</rank>
-                            <items>
-                                <item id="fieldset:Ticket:Type">
-                                    <rank>10</rank>
-                                    <items>
-                                        <item id="impact">
-                                            <rank>10</rank>
-                                        </item>
-                                        <item id="urgency">
-                                            <rank>20</rank>
-                                        </item>
-                                        <item id="priority">
-                                            <rank>30</rank>
-                                        </item>
-                                    </items>
-                                </item>
-                                <item id="fieldset:Ticket:date">
-                                    <rank>20</rank>
-                                    <items>
-                                        <item id="start_date">
-                                            <rank>10</rank>
-                                        </item>
-                                        <item id="last_update">
-                                            <rank>20</rank>
-                                        </item>
-                                        <item id="assignment_date">
-                                            <rank>30</rank>
-                                        </item>
-                                        <item id="resolution_date">
-                                            <rank>40</rank>
-                                        </item>
-                                        <item id="close_date">
-                                            <rank>50</rank>
-                                        </item>
-                                    </items>
-                                </item>
-                            </items>
-                        </item>
-                        <item id="col:col3">
-                            <rank>90</rank>
-                            <items>
-                                <item id="fieldset:Ticket:contact">
-                                    <rank>10</rank>
-                                    <items>
-                                        
-                                        <item id="team_id">
-                                            <rank>10</rank>
-                                        </item>
-                                        <item id="agent_id">
-                                            <rank>20</rank>
-                                        </item>
-                                    </items>
-                                </item>
-                                <item id="fieldset:Ticket:relation">
-                                    <rank>20</rank>
-                                    <items>
-                                        <item id="related_change_id">
-                                            <rank>10</rank>
-                                        </item>
-                                    </items>
-                                </item>
-                            </items>
-                        </item>
-                    </items>
-                </details>
-                <search>
-                    <items>
-                        <item id="ref">
-                            <rank>10</rank>
-                        </item>
-                        <item id="title">
-                            <rank>20</rank>
-                        </item>
-                        <item id="org_id">
-                            <rank>30</rank>
-                        </item>
-                        <item id="start_date">
-                            <rank>40</rank>
-                        </item>
-                        <item id="status">
-                            <rank>50</rank>
-                        </item>
-                        <item id="operational_status">
-                            <rank>55</rank>
-                        </item>
-                        <item id="service_id">
-                            <rank>60</rank>
-                        </item>
-                        <item id="servicesubcategory_id">
-                            <rank>70</rank>
-                        </item>
-                        <item id="product">
-                            <rank>80</rank>
-                        </item>
-                        <item id="impact">
-                            <rank>90</rank>
-                        </item>
-                        <item id="urgency">
-                            <rank>100</rank>
-                        </item>
-                        <item id="priority">
-                            <rank>110</rank>
-                        </item>
-                        <item id="caller_id">
-                            <rank>120</rank>
-                        </item>
-                        <item id="team_id">
-                            <rank>130</rank>
-                        </item>
-                        <item id="agent_id">
-                            <rank>140</rank>
-                        </item>
-                        <item id="close_date">
-                            <rank>150</rank>
-                        </item>
-                    </items>
-                </search>
-                <list>
-                    <items>
-                        <item id="title">
-                            <rank>10</rank>
-                        </item>
-                        <item id="org_id">
-                            <rank>20</rank>
-                        </item>
-                        <item id="start_date">
-                            <rank>30</rank>
-                        </item>
-                        <item id="status">
-                            <rank>40</rank>
-                        </item>
-                        <item id="service_id">
-                            <rank>50</rank>
-                        </item>
-                        <item id="priority">
-                            <rank>60</rank>
-                        </item>
-                    </items>
-                </list>
-            </presentation>
-        </class>
-    </classes>
-    <menus>
-        <menu id="ProblemManagement" xsi:type="MenuGroup" _delta="define_if_not_exists">
-            <rank>42</rank>
-                <style>
-                    <decoration_classes>fas fa-question</decoration_classes>
-                </style>
-        </menu>
-        <menu id="Problem:Shortcuts" xsi:type="TemplateMenuNode" _delta="define_if_not_exists">
-            <rank>5</rank>
-            <parent>ProblemManagement</parent>
-            <template_file/>
-        </menu>
-        <menu id="Problem:Overview" xsi:type="DashboardMenuNode" _delta="define">
+        </method>
+      </methods>
+      <presentation>
+        <details>
+          <items>
+            <item id="functionalcis_list">
+              <rank>10</rank>
+            </item>
+            <item id="contacts_list">
+              <rank>20</rank>
+            </item>
+            <item id="knownerrors_list">
+              <rank>30</rank>
+            </item>
+            <item id="workorders_list">
+              <rank>40</rank>
+            </item>
+            <item id="related_request_list">
+              <rank>50</rank>
+            </item>
+            <item id="related_incident_list">
+              <rank>60</rank>
+            </item>
+            <item id="col:col1">
+              <rank>70</rank>
+              <items>
+                <item id="fieldset:Ticket:baseinfo">
+                  <rank>10</rank>
+                  <items>
+                    <item id="ref">
+                      <rank>10</rank>
+                    </item>
+                    <item id="org_id">
+                      <rank>20</rank>
+                    </item>
+                    <item id="caller_id">
+                      <rank>30</rank>
+                    </item>
+                    <item id="status">
+                      <rank>40</rank>
+                    </item>
+                    <item id="product">
+                      <rank>50</rank>
+                    </item>
+                    <item id="title">
+                      <rank>60</rank>
+                    </item>
+                    <item id="description">
+                      <rank>70</rank>
+                    </item>
+                  </items>
+                </item>
+                <item id="fieldset:Ticket:moreinfo">
+                  <rank>20</rank>
+                  <items>
+                    <item id="service_id">
+                      <rank>10</rank>
+                    </item>
+                    <item id="servicesubcategory_id">
+                      <rank>20</rank>
+                    </item>
+                  </items>
+                </item>
+              </items>
+            </item>
+            <item id="col:col2">
+              <rank>80</rank>
+              <items>
+                <item id="fieldset:Ticket:Type">
+                  <rank>10</rank>
+                  <items>
+                    <item id="impact">
+                      <rank>10</rank>
+                    </item>
+                    <item id="urgency">
+                      <rank>20</rank>
+                    </item>
+                    <item id="priority">
+                      <rank>30</rank>
+                    </item>
+                  </items>
+                </item>
+                <item id="fieldset:Ticket:date">
+                  <rank>20</rank>
+                  <items>
+                    <item id="start_date">
+                      <rank>10</rank>
+                    </item>
+                    <item id="last_update">
+                      <rank>20</rank>
+                    </item>
+                    <item id="assignment_date">
+                      <rank>30</rank>
+                    </item>
+                    <item id="resolution_date">
+                      <rank>40</rank>
+                    </item>
+                    <item id="close_date">
+                      <rank>50</rank>
+                    </item>
+                  </items>
+                </item>
+              </items>
+            </item>
+            <item id="col:col3">
+              <rank>90</rank>
+              <items>
+                <item id="fieldset:Ticket:contact">
+                  <rank>10</rank>
+                  <items>
+                    <item id="team_id">
+                      <rank>10</rank>
+                    </item>
+                    <item id="agent_id">
+                      <rank>20</rank>
+                    </item>
+                  </items>
+                </item>
+                <item id="fieldset:Ticket:relation">
+                  <rank>20</rank>
+                  <items>
+                    <item id="related_change_id">
+                      <rank>10</rank>
+                    </item>
+                  </items>
+                </item>
+              </items>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="ref">
+              <rank>10</rank>
+            </item>
+            <item id="title">
+              <rank>20</rank>
+            </item>
+            <item id="org_id">
+              <rank>30</rank>
+            </item>
+            <item id="start_date">
+              <rank>40</rank>
+            </item>
+            <item id="status">
+              <rank>50</rank>
+            </item>
+            <item id="operational_status">
+              <rank>55</rank>
+            </item>
+            <item id="service_id">
+              <rank>60</rank>
+            </item>
+            <item id="servicesubcategory_id">
+              <rank>70</rank>
+            </item>
+            <item id="product">
+              <rank>80</rank>
+            </item>
+            <item id="impact">
+              <rank>90</rank>
+            </item>
+            <item id="urgency">
+              <rank>100</rank>
+            </item>
+            <item id="priority">
+              <rank>110</rank>
+            </item>
+            <item id="caller_id">
+              <rank>120</rank>
+            </item>
+            <item id="team_id">
+              <rank>130</rank>
+            </item>
+            <item id="agent_id">
+              <rank>140</rank>
+            </item>
+            <item id="close_date">
+              <rank>150</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="title">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="start_date">
+              <rank>30</rank>
+            </item>
+            <item id="status">
+              <rank>40</rank>
+            </item>
+            <item id="service_id">
+              <rank>50</rank>
+            </item>
+            <item id="priority">
+              <rank>60</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+  </classes>
+  <menus>
+    <menu id="ProblemManagement" xsi:type="MenuGroup" _delta="define_if_not_exists">
+      <rank>42</rank>
+      <style>
+        <decoration_classes>fas fa-question</decoration_classes>
+      </style>
+    </menu>
+    <menu id="Problem:Shortcuts" xsi:type="TemplateMenuNode" _delta="define_if_not_exists">
+      <rank>5</rank>
+      <parent>ProblemManagement</parent>
+      <template_file/>
+    </menu>
+    <menu id="Problem:Overview" xsi:type="DashboardMenuNode" _delta="define">
+      <rank>0</rank>
+      <parent>ProblemManagement</parent>
+      <definition>
+        <layout>DashboardLayoutTwoCols</layout>
+        <title>UI:ProblemMgmtMenuOverview:Title</title>
+        <cells>
+          <cell id="0">
             <rank>0</rank>
-            <parent>ProblemManagement</parent>
-            <definition>
-                <layout>DashboardLayoutTwoCols</layout>
-                <title>UI:ProblemMgmtMenuOverview:Title</title>
-                <cells>
-                    <cell id="0">
-                        <rank>0</rank>
-                        <dashlets>
-                            <dashlet id="1" xsi:type="DashletGroupByBars">
-                                <rank>0</rank>
-                                <title>UI-ProblemManagementOverview-ProblemByService</title>
-                                <query>SELECT Problem</query>
-                                <group_by>service_id</group_by>
-                                <style>bars</style>
-                            </dashlet>
-                        </dashlets>
-                    </cell>
-                    <cell id="1">
-                        <rank>1</rank>
-                        <dashlets>
-                            <dashlet id="2" xsi:type="DashletGroupByPie">
-                                <rank>0</rank>
-                                <title>UI-ProblemManagementOverview-ProblemByPriority</title>
-                                <query>SELECT Problem</query>
-                                <group_by>priority</group_by>
-                                <style>pie</style>
-                            </dashlet>
-                        </dashlets>
-                    </cell>
-                    <cell id="2">
-                        <rank>2</rank>
-                        <dashlets>
-                            <dashlet id="3" xsi:type="DashletObjectList">
-                                <rank>0</rank>
-                                <title>UI-ProblemManagementOverview-ProblemUnassigned</title>
-                                <query>SELECT Problem WHERE status IN ("new")</query>
-                                <menu>false</menu>
-                            </dashlet>
-                        </dashlets>
-                    </cell>
-                </cells>
-            </definition>
-        </menu>
-        <menu id="NewProblem" xsi:type="NewObjectMenuNode" _delta="define">
+            <dashlets>
+              <dashlet id="1" xsi:type="DashletGroupByBars">
+                <rank>0</rank>
+                <title>UI-ProblemManagementOverview-ProblemByService</title>
+                <query>SELECT Problem</query>
+                <group_by>service_id</group_by>
+                <style>bars</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="1">
             <rank>1</rank>
-            <parent>ProblemManagement</parent>
-            <class>Problem</class>
-        </menu>
-        <menu id="SearchProblems" xsi:type="SearchMenuNode" _delta="define">
+            <dashlets>
+              <dashlet id="2" xsi:type="DashletGroupByPie">
+                <rank>0</rank>
+                <title>UI-ProblemManagementOverview-ProblemByPriority</title>
+                <query>SELECT Problem</query>
+                <group_by>priority</group_by>
+                <style>pie</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="2">
             <rank>2</rank>
-            <parent>ProblemManagement</parent>
-            <class>Problem</class>
-        </menu>
-        <menu id="Problem:MyProblems" xsi:type="OQLMenuNode" _delta="define">
-            <rank>1</rank>
-            <parent>Problem:Shortcuts</parent>
-            <oql>
-                <![CDATA[SELECT Problem WHERE agent_id = :current_contact_id AND status NOT IN ("closed", "resolved")]]></oql>
-            <do_search/>
-        </menu>
-        <menu id="Problem:OpenProblems" xsi:type="OQLMenuNode" _delta="define">
-            <rank>2</rank>
-            <parent>Problem:Shortcuts</parent>
-            <oql><![CDATA[SELECT Problem WHERE status IN ("new", "assigned", "resolved")]]></oql>
-            <do_search>1</do_search>
-        </menu>
-    </menus>
+            <dashlets>
+              <dashlet id="3" xsi:type="DashletObjectList">
+                <rank>0</rank>
+                <title>UI-ProblemManagementOverview-ProblemUnassigned</title>
+                <query>SELECT Problem WHERE status IN ("new")</query>
+                <menu>false</menu>
+              </dashlet>
+            </dashlets>
+          </cell>
+        </cells>
+      </definition>
+    </menu>
+    <menu id="NewProblem" xsi:type="NewObjectMenuNode" _delta="define">
+      <rank>1</rank>
+      <parent>ProblemManagement</parent>
+      <class>Problem</class>
+    </menu>
+    <menu id="SearchProblems" xsi:type="SearchMenuNode" _delta="define">
+      <rank>2</rank>
+      <parent>ProblemManagement</parent>
+      <class>Problem</class>
+    </menu>
+    <menu id="Problem:MyProblems" xsi:type="OQLMenuNode" _delta="define">
+      <rank>1</rank>
+      <parent>Problem:Shortcuts</parent>
+      <oql><![CDATA[SELECT Problem WHERE agent_id = :current_contact_id AND status NOT IN ("closed", "resolved")]]></oql>
+      <do_search/>
+    </menu>
+    <menu id="Problem:OpenProblems" xsi:type="OQLMenuNode" _delta="define">
+      <rank>2</rank>
+      <parent>Problem:Shortcuts</parent>
+      <oql><![CDATA[SELECT Problem WHERE status IN ("new", "assigned", "resolved")]]></oql>
+      <do_search>1</do_search>
+    </menu>
+  </menus>
 </itop_design>
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 3c6d5fd28..7b3b31e42 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
@@ -167,8 +167,8 @@
           <class id="QueryOQL"/>
           <!-- SynchroData group -->
           <class id="SynchroDataSource"/>
-					<class id="SynchroAttribute"/>
-					<class id="SynchroReplica"/>
+          <class id="SynchroAttribute"/>
+          <class id="SynchroReplica"/>
         </classes>
       </group>
     </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 7c7d132bb..3e4ac19cc 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,1298 +1,1300 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
-	<classes>
-		<class id="UserRequest" _delta="define">
-			<parent>Ticket</parent>
-			<properties>
-				<comment><![CDATA[/**
+  <classes>
+    <class id="UserRequest" _delta="define">
+      <parent>Ticket</parent>
+      <properties>
+        <comment><![CDATA[/**
  * Persistent classes for a CMDB
  *
  * @copyright   Copyright (C) 2010-2021 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */]]></comment>
-				<category>bizmodel,searchable,requestmgmt</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>ticket_request</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="ref"/>
-					</attributes>
-				</naming>
-				<fields_semantic>
-					<state_attribute>status</state_attribute>
-				</fields_semantic>
-				<style>
+        <category>bizmodel,searchable,requestmgmt</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>ticket_request</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="ref"/>
+          </attributes>
+        </naming>
+        <fields_semantic>
+          <state_attribute>status</state_attribute>
+        </fields_semantic>
+        <style>
           <icon>images/user-request.svg</icon>
           <main_color>$ibo-color-blue-800</main_color>
         </style>
-				<reconciliation>
-					<attributes>
-						<attribute id="ref"/>
-					</attributes>
-				</reconciliation>
-				<order>
-					<columns>
-						<column id="ref" ascending="false"/>
-					</columns>
-				</order>
-			</properties>
-			<fields>
-				<field id="status" xsi:type="AttributeEnum">
-					<always_load_in_tables>true</always_load_in_tables>
-					<values>
-						<value id="new">
-							<code>new</code>
-							<style>
-								<main_color>$ibo-lifecycle-new-state-primary-color</main_color>
-								<complementary_color>$ibo-lifecycle-new-state-secondary-color</complementary_color>
-								<decoration_classes/>
-							</style>
-						</value>
-						<value id="waiting_for_approval">
-							<code>waiting_for_approval</code>
-							<style>
-								<main_color>$ibo-lifecycle-waiting-state-primary-color</main_color>
-								<complementary_color>$ibo-lifecycle-waiting-state-secondary-color</complementary_color>
-								<decoration_classes>fas fa-hourglass-half</decoration_classes>
-							</style>
-						</value>
-						<value id="approved">
-							<code>approved</code>
-							<style>
-								<main_color>$ibo-lifecycle-success-state-primary-color</main_color>
-								<complementary_color>$ibo-lifecycle-success-state-secondary-color</complementary_color>
-								<decoration_classes>fas fa-user-check</decoration_classes>
-							</style>
-						</value>
-						<value id="rejected">
-							<code>rejected</code>
-							<style>
-								<main_color>$ibo-lifecycle-failure-state-primary-color</main_color>
+        <reconciliation>
+          <attributes>
+            <attribute id="ref"/>
+          </attributes>
+        </reconciliation>
+        <order>
+          <columns>
+            <column id="ref" ascending="false"/>
+          </columns>
+        </order>
+      </properties>
+      <fields>
+        <field id="status" xsi:type="AttributeEnum">
+          <always_load_in_tables>true</always_load_in_tables>
+          <values>
+            <value id="new">
+              <code>new</code>
+              <style>
+                <main_color>$ibo-lifecycle-new-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-new-state-secondary-color</complementary_color>
+                <decoration_classes/>
+              </style>
+            </value>
+            <value id="waiting_for_approval">
+              <code>waiting_for_approval</code>
+              <style>
+                <main_color>$ibo-lifecycle-waiting-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-waiting-state-secondary-color</complementary_color>
+                <decoration_classes>fas fa-hourglass-half</decoration_classes>
+              </style>
+            </value>
+            <value id="approved">
+              <code>approved</code>
+              <style>
+                <main_color>$ibo-lifecycle-success-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-success-state-secondary-color</complementary_color>
+                <decoration_classes>fas fa-user-check</decoration_classes>
+              </style>
+            </value>
+            <value id="rejected">
+              <code>rejected</code>
+              <style>
+                <main_color>$ibo-lifecycle-failure-state-primary-color</main_color>
                 <complementary_color>$ibo-lifecycle-failure-state-secondary-color</complementary_color>
-								<decoration_classes>fas fa-user-times</decoration_classes>
-							</style>
-						</value>
-						<value id="assigned">
-							<code>assigned</code>
-							<style>
-								<main_color>$ibo-lifecycle-neutral-state-primary-color</main_color>
-								<complementary_color>$ibo-lifecycle-neutral-state-secondary-color</complementary_color>
-								<decoration_classes/>
-							</style>
-						</value>
-						<value id="pending">
-							<code>pending</code>
-							<style>
-								<main_color>$ibo-lifecycle-waiting-state-primary-color</main_color>
-								<complementary_color>$ibo-lifecycle-waiting-state-secondary-color</complementary_color>
-								<decoration_classes>fas fa-hourglass-half</decoration_classes>
-							</style>
-						</value>
-						<value id="escalated_tto">
-							<code>escalated_tto</code>
-							<style>
-								<main_color>$ibo-lifecycle-failure-state-primary-color</main_color>
+                <decoration_classes>fas fa-user-times</decoration_classes>
+              </style>
+            </value>
+            <value id="assigned">
+              <code>assigned</code>
+              <style>
+                <main_color>$ibo-lifecycle-neutral-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-neutral-state-secondary-color</complementary_color>
+                <decoration_classes/>
+              </style>
+            </value>
+            <value id="pending">
+              <code>pending</code>
+              <style>
+                <main_color>$ibo-lifecycle-waiting-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-waiting-state-secondary-color</complementary_color>
+                <decoration_classes>fas fa-hourglass-half</decoration_classes>
+              </style>
+            </value>
+            <value id="escalated_tto">
+              <code>escalated_tto</code>
+              <style>
+                <main_color>$ibo-lifecycle-failure-state-primary-color</main_color>
                 <complementary_color>$ibo-lifecycle-failure-state-secondary-color</complementary_color>
-								<decoration_classes>fas fa-fire</decoration_classes>
-							</style>
-						</value>
-						<value id="escalated_ttr">
-							<code>escalated_ttr</code>
-							<style>
-								<main_color>$ibo-lifecycle-failure-state-primary-color</main_color>
+                <decoration_classes>fas fa-fire</decoration_classes>
+              </style>
+            </value>
+            <value id="escalated_ttr">
+              <code>escalated_ttr</code>
+              <style>
+                <main_color>$ibo-lifecycle-failure-state-primary-color</main_color>
                 <complementary_color>$ibo-lifecycle-failure-state-secondary-color</complementary_color>
-								<decoration_classes>fas fa-fire</decoration_classes>
-							</style>
-						</value>
-						<value id="resolved">
-							<code>resolved</code>
-							<style>
-								<main_color>$ibo-lifecycle-success-state-primary-color</main_color>
-								<complementary_color>$ibo-lifecycle-success-state-secondary-color</complementary_color>
-								<decoration_classes>fas fa-check</decoration_classes>
-							</style>
-						</value>
-						<value id="closed">
-							<code>closed</code>
-							<style>
-								<main_color>$ibo-lifecycle-frozen-state-primary-color</main_color>
-								<complementary_color>$ibo-lifecycle-frozen-state-secondary-color</complementary_color>
-								<decoration_classes/>
-							</style>
-						</value>
-					</values>
-					<default_style>
-						<main_color>$ibo-lifecycle-neutral-state-primary-color</main_color>
-						<complementary_color>$ibo-lifecycle-neutral-state-secondary-color</complementary_color>
-						<decoration_classes/>
-					</default_style>
-					<sql>status</sql>
-					<default_value>new</default_value>
-					<is_null_allowed>false</is_null_allowed>
-				</field>
-				<field id="request_type" xsi:type="AttributeEnum">
-					<values>
-						<value id="service_request">
-							<code>service_request</code>
-						</value>
-					</values>
-					<sql>request_type</sql>
-					<default_value>service_request</default_value>
-					<is_null_allowed>true</is_null_allowed>
-					<display_style>list</display_style>
-				</field>
-				<field id="impact" xsi:type="AttributeEnum">
-					<values>
-						<value id="1">
-							<code>1</code>
-						</value>
-						<value id="2">
-							<code>2</code>
-						</value>
-						<value id="3">
-							<code>3</code>
-						</value>
-					</values>
-					<sql>impact</sql>
-					<default_value>1</default_value>
-					<is_null_allowed>false</is_null_allowed>
-					<display_style>list</display_style>
-				</field>
-				<field id="priority" xsi:type="AttributeEnum">
-					<values>
-						<value id="1">
-							<code>1</code>
-						</value>
-						<value id="2">
-							<code>2</code>
-						</value>
-						<value id="3">
-							<code>3</code>
-						</value>
-						<value id="4">
-							<code>4</code>
-						</value>
-					</values>
-					<dependencies>
-						<attribute id="impact"/>
-						<attribute id="urgency"/>
-					</dependencies>
-					<sql>priority</sql>
-					<default_value>4</default_value>
-					<is_null_allowed>false</is_null_allowed>
-				</field>
-				<field id="urgency" xsi:type="AttributeEnum">
-					<values>
-						<value id="1">
-							<code>1</code>
-						</value>
-						<value id="2">
-							<code>2</code>
-						</value>
-						<value id="3">
-							<code>3</code>
-						</value>
-						<value id="4">
-							<code>4</code>
-						</value>
-					</values>
-					<sql>urgency</sql>
-					<default_value>4</default_value>
-					<is_null_allowed>false</is_null_allowed>
-				</field>
-				<field id="origin" xsi:type="AttributeEnum">
-					<values>
+                <decoration_classes>fas fa-fire</decoration_classes>
+              </style>
+            </value>
+            <value id="resolved">
+              <code>resolved</code>
+              <style>
+                <main_color>$ibo-lifecycle-success-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-success-state-secondary-color</complementary_color>
+                <decoration_classes>fas fa-check</decoration_classes>
+              </style>
+            </value>
+            <value id="closed">
+              <code>closed</code>
+              <style>
+                <main_color>$ibo-lifecycle-frozen-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-frozen-state-secondary-color</complementary_color>
+                <decoration_classes/>
+              </style>
+            </value>
+          </values>
+          <default_style>
+            <main_color>$ibo-lifecycle-neutral-state-primary-color</main_color>
+            <complementary_color>$ibo-lifecycle-neutral-state-secondary-color</complementary_color>
+            <decoration_classes/>
+          </default_style>
+          <sql>status</sql>
+          <default_value>new</default_value>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
+        <field id="request_type" xsi:type="AttributeEnum">
+          <values>
+            <value id="service_request">
+              <code>service_request</code>
+            </value>
+          </values>
+          <sql>request_type</sql>
+          <default_value>service_request</default_value>
+          <is_null_allowed>true</is_null_allowed>
+          <display_style>list</display_style>
+        </field>
+        <field id="impact" xsi:type="AttributeEnum">
+          <values>
+            <value id="1">
+              <code>1</code>
+            </value>
+            <value id="2">
+              <code>2</code>
+            </value>
+            <value id="3">
+              <code>3</code>
+            </value>
+          </values>
+          <sql>impact</sql>
+          <default_value>1</default_value>
+          <is_null_allowed>false</is_null_allowed>
+          <display_style>list</display_style>
+        </field>
+        <field id="priority" xsi:type="AttributeEnum">
+          <values>
+            <value id="1">
+              <code>1</code>
+            </value>
+            <value id="2">
+              <code>2</code>
+            </value>
+            <value id="3">
+              <code>3</code>
+            </value>
+            <value id="4">
+              <code>4</code>
+            </value>
+          </values>
+          <dependencies>
+            <attribute id="impact"/>
+            <attribute id="urgency"/>
+          </dependencies>
+          <sql>priority</sql>
+          <default_value>4</default_value>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
+        <field id="urgency" xsi:type="AttributeEnum">
+          <values>
+            <value id="1">
+              <code>1</code>
+            </value>
+            <value id="2">
+              <code>2</code>
+            </value>
+            <value id="3">
+              <code>3</code>
+            </value>
+            <value id="4">
+              <code>4</code>
+            </value>
+          </values>
+          <sql>urgency</sql>
+          <default_value>4</default_value>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
+        <field id="origin" xsi:type="AttributeEnum">
+          <values>
             <value id="in_person">
               <code>in_person</code>
             </value>
             <value id="chat">
               <code>chat</code>
             </value>
-						<value id="mail">
-							<code>mail</code>
-						</value>
-						<value id="phone">
-							<code>phone</code>
-						</value>
-						<value id="portal">
-							<code>portal</code>
-						</value>
-					</values>
-					<sql>origin</sql>
-					<default_value>phone</default_value>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="approver_id" xsi:type="AttributeExternalKey">
-					<filter><![CDATA[
+            <value id="mail">
+              <code>mail</code>
+            </value>
+            <value id="phone">
+              <code>phone</code>
+            </value>
+            <value id="portal">
+              <code>portal</code>
+            </value>
+          </values>
+          <sql>origin</sql>
+          <default_value>phone</default_value>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="approver_id" xsi:type="AttributeExternalKey">
+          <filter><![CDATA[
 						SELECT Person WHERE org_id= :this->org_id
 						]]></filter>
-					<dependencies>
-						<attribute id="org_id"/>
-					</dependencies>
-					<sql>approver_id</sql>
-					<target_class>Person</target_class>
-					<is_null_allowed>true</is_null_allowed>
-					<on_target_delete>DEL_MANUAL</on_target_delete>
-					<allow_target_creation>false</allow_target_creation>
-				</field>
-				<field id="approver_email" xsi:type="AttributeExternalField">
-					<extkey_attcode>approver_id</extkey_attcode>
-					<target_attcode>email</target_attcode>
-				</field>
-				<field id="service_id" xsi:type="AttributeExternalKey">
-					<filter><![CDATA[SELECT Service AS s JOIN lnkCustomerContractToService AS l1 ON l1.service_id=s.id JOIN CustomerContract AS cc ON l1.customercontract_id=cc.id WHERE cc.org_id = :this->org_id AND s.status != 'obsolete']]></filter>
-					<dependencies>
-						<attribute id="org_id"/>
-					</dependencies>
-					<sql>service_id</sql>
-					<target_class>Service</target_class>
-					<is_null_allowed>true</is_null_allowed>
-					<on_target_delete>DEL_MANUAL</on_target_delete>
-					<allow_target_creation>false</allow_target_creation>
-				</field>
-				<field id="service_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>service_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="servicesubcategory_id" xsi:type="AttributeExternalKey">
-					<filter><![CDATA[SELECT ServiceSubcategory WHERE service_id = :this->service_id AND request_type = :this->request_type AND status != 'obsolete']]></filter>
-					<dependencies>
-						<attribute id="service_id"/>
-						<attribute id="request_type"/>
-					</dependencies>
-					<sql>servicesubcategory_id</sql>
-					<target_class>ServiceSubcategory</target_class>
-					<is_null_allowed>true</is_null_allowed>
-					<on_target_delete>DEL_MANUAL</on_target_delete>
-					<allow_target_creation>false</allow_target_creation>
-					<jointype/>
-				</field>
-				<field id="servicesubcategory_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>servicesubcategory_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="escalation_flag" xsi:type="AttributeEnum">
-					<values>
-						<value id="yes">
-							<code>yes</code>
-						</value>
-						<value id="no">
-							<code>no</code>
-						</value>
-					</values>
-					<sql>escalation_flag</sql>
-					<default_value>no</default_value>
-					<is_null_allowed>true</is_null_allowed>
-					<display_style>list</display_style>
-				</field>
-				<field id="escalation_reason" xsi:type="AttributeString">
-					<sql>escalation_reason</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="assignment_date" xsi:type="AttributeDateTime">
-					<sql>assignment_date</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="resolution_date" xsi:type="AttributeDateTime">
-					<sql>resolution_date</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="last_pending_date" xsi:type="AttributeDateTime">
-					<sql>last_pending_date</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="cumulatedpending" xsi:type="AttributeStopWatch">
-					<states>
-						<state id="pending"/>
-					</states>
-					<working_time/>
-					<thresholds/>
-					<goal/>
-				</field>
-				<field id="tto" xsi:type="AttributeStopWatch">
-					<always_load_in_tables>true</always_load_in_tables>
-					<states>
-						<state id="new"/>
-						<state id="escalated_tto"/>
-						<state id="approved"/>
-					</states>
-					<working_time/>
-					<goal>ResponseTicketTTO</goal>
-					<thresholds>
-						<threshold id="75">
-							<highlight>
-								<code>warning</code>
-								<persistent>false</persistent>
-							</highlight>
-							<actions>
+          <dependencies>
+            <attribute id="org_id"/>
+          </dependencies>
+          <sql>approver_id</sql>
+          <target_class>Person</target_class>
+          <is_null_allowed>true</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+          <allow_target_creation>false</allow_target_creation>
+        </field>
+        <field id="approver_email" xsi:type="AttributeExternalField">
+          <extkey_attcode>approver_id</extkey_attcode>
+          <target_attcode>email</target_attcode>
+        </field>
+        <field id="service_id" xsi:type="AttributeExternalKey">
+          <filter><![CDATA[SELECT Service AS s JOIN lnkCustomerContractToService AS l1 ON l1.service_id=s.id JOIN CustomerContract AS cc ON l1.customercontract_id=cc.id WHERE cc.org_id = :this->org_id AND s.status != 'obsolete']]></filter>
+          <dependencies>
+            <attribute id="org_id"/>
+          </dependencies>
+          <sql>service_id</sql>
+          <target_class>Service</target_class>
+          <is_null_allowed>true</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+          <allow_target_creation>false</allow_target_creation>
+        </field>
+        <field id="service_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>service_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="servicesubcategory_id" xsi:type="AttributeExternalKey">
+          <filter><![CDATA[SELECT ServiceSubcategory WHERE service_id = :this->service_id AND request_type = :this->request_type AND status != 'obsolete']]></filter>
+          <dependencies>
+            <attribute id="service_id"/>
+            <attribute id="request_type"/>
+          </dependencies>
+          <sql>servicesubcategory_id</sql>
+          <target_class>ServiceSubcategory</target_class>
+          <is_null_allowed>true</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+          <allow_target_creation>false</allow_target_creation>
+          <jointype/>
+        </field>
+        <field id="servicesubcategory_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>servicesubcategory_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="escalation_flag" xsi:type="AttributeEnum">
+          <values>
+            <value id="yes">
+              <code>yes</code>
+            </value>
+            <value id="no">
+              <code>no</code>
+            </value>
+          </values>
+          <sql>escalation_flag</sql>
+          <default_value>no</default_value>
+          <is_null_allowed>true</is_null_allowed>
+          <display_style>list</display_style>
+        </field>
+        <field id="escalation_reason" xsi:type="AttributeString">
+          <sql>escalation_reason</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="assignment_date" xsi:type="AttributeDateTime">
+          <sql>assignment_date</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="resolution_date" xsi:type="AttributeDateTime">
+          <sql>resolution_date</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="last_pending_date" xsi:type="AttributeDateTime">
+          <sql>last_pending_date</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="cumulatedpending" xsi:type="AttributeStopWatch">
+          <states>
+            <state id="pending"/>
+          </states>
+          <working_time/>
+          <thresholds/>
+          <goal/>
+        </field>
+        <field id="tto" xsi:type="AttributeStopWatch">
+          <always_load_in_tables>true</always_load_in_tables>
+          <states>
+            <state id="new"/>
+            <state id="escalated_tto"/>
+            <state id="approved"/>
+          </states>
+          <working_time/>
+          <goal>ResponseTicketTTO</goal>
+          <thresholds>
+            <threshold id="75">
+              <highlight>
+                <code>warning</code>
+                <persistent>false</persistent>
+              </highlight>
+              <actions>
 							</actions>
-						</threshold>
-						<threshold id="100">
-							<highlight>
-								<code>critical</code>
-								<persistent>false</persistent>
-							</highlight>
-							<actions>
-								<action>
-									<verb>ApplyStimulus</verb>
-									<params>
-										<param>ev_timeout</param>
-									</params>
-								</action>
+            </threshold>
+            <threshold id="100">
+              <highlight>
+                <code>critical</code>
+                <persistent>false</persistent>
+              </highlight>
+              <actions>
+                <action>
+                  <verb>ApplyStimulus</verb>
+                  <params>
+                    <param>ev_timeout</param>
+                  </params>
+                </action>
+              </actions>
+            </threshold>
+          </thresholds>
+        </field>
+        <field id="ttr" xsi:type="AttributeStopWatch">
+          <always_load_in_tables>true</always_load_in_tables>
+          <states>
+            <state id="new"/>
+            <state id="escalated_tto"/>
+            <state id="assigned"/>
+            <state id="approved"/>
+            <state id="escalated_ttr"/>
+          </states>
+          <working_time/>
+          <goal>ResponseTicketTTR</goal>
+          <thresholds>
+            <threshold id="75">
+              <highlight>
+                <code>warning</code>
+                <persistent>false</persistent>
+              </highlight>
+              <actions>
 							</actions>
-						</threshold>
-					</thresholds>
-				</field>
-				<field id="ttr" xsi:type="AttributeStopWatch">
-					<always_load_in_tables>true</always_load_in_tables>
-					<states>
-						<state id="new"/>
-						<state id="escalated_tto"/>
-						<state id="assigned"/>
-						<state id="approved"/>
-						<state id="escalated_ttr"/>
-					</states>
-					<working_time/>
-					<goal>ResponseTicketTTR</goal>
-					<thresholds>
-						<threshold id="75">
-							<highlight>
-								<code>warning</code>
-								<persistent>false</persistent>
-							</highlight>
-							<actions>
-							</actions>
-						</threshold>
-						<threshold id="100">
-							<highlight>
-								<code>critical</code>
-								<persistent>false</persistent>
-							</highlight>
-							<actions>
-								<action>
-									<verb>ApplyStimulus</verb>
-									<params>
-										<param>ev_timeout</param>
-									</params>
-								</action>
-							</actions>
-						</threshold>
-					</thresholds>
-				</field>
-				<field id="tto_escalation_deadline" xsi:type="AttributeSubItem">
-					<target_attcode>tto</target_attcode>
-					<item_code>100_deadline</item_code>
-				</field>
-				<field id="sla_tto_passed" xsi:type="AttributeSubItem">
-					<target_attcode>tto</target_attcode>
-					<item_code>100_passed</item_code>
-				</field>
-				<field id="sla_tto_over" xsi:type="AttributeSubItem">
-					<target_attcode>tto</target_attcode>
-					<item_code>100_overrun</item_code>
-				</field>
-				<field id="ttr_escalation_deadline" xsi:type="AttributeSubItem">
-					<target_attcode>ttr</target_attcode>
-					<item_code>100_deadline</item_code>
-				</field>
-				<field id="sla_ttr_passed" xsi:type="AttributeSubItem">
-					<target_attcode>ttr</target_attcode>
-					<item_code>100_passed</item_code>
-				</field>
-				<field id="sla_ttr_over" xsi:type="AttributeSubItem">
-					<target_attcode>ttr</target_attcode>
-					<item_code>100_overrun</item_code>
-				</field>
-				<field id="time_spent" xsi:type="AttributeDuration">
-					<sql>time_spent</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="resolution_code" xsi:type="AttributeEnum">
-					<values>
-						<value id="assistance">
-							<code>assistance</code>
-						</value>
-						<value id="other">
-							<code>other</code>
-						</value>
-						<value id="software patch">
-							<code>software patch</code>
-						</value>
-						<value id="training">
-							<code>training</code>
-						</value>
-						<value id="hardware repair">
-							<code>hardware repair</code>
-						</value>
-						<value id="system update">
-							<code>system update</code>
-						</value>
-						<value id="bug fixed">
-							<code>bug fixed</code>
-						</value>
-					</values>
-					<sql>resolution_code</sql>
-					<default_value>assistance</default_value>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="solution" xsi:type="AttributeText">
-					<sql>solution</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="pending_reason" xsi:type="AttributeText">
-					<sql>pending_reason</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="parent_request_id" xsi:type="AttributeExternalKey">
-					<filter><![CDATA[SELECT UserRequest WHERE id != :this->id AND status NOT IN ('rejected','resolved','closed')]]></filter>
-					<dependencies>
+            </threshold>
+            <threshold id="100">
+              <highlight>
+                <code>critical</code>
+                <persistent>false</persistent>
+              </highlight>
+              <actions>
+                <action>
+                  <verb>ApplyStimulus</verb>
+                  <params>
+                    <param>ev_timeout</param>
+                  </params>
+                </action>
+              </actions>
+            </threshold>
+          </thresholds>
+        </field>
+        <field id="tto_escalation_deadline" xsi:type="AttributeSubItem">
+          <target_attcode>tto</target_attcode>
+          <item_code>100_deadline</item_code>
+        </field>
+        <field id="sla_tto_passed" xsi:type="AttributeSubItem">
+          <target_attcode>tto</target_attcode>
+          <item_code>100_passed</item_code>
+        </field>
+        <field id="sla_tto_over" xsi:type="AttributeSubItem">
+          <target_attcode>tto</target_attcode>
+          <item_code>100_overrun</item_code>
+        </field>
+        <field id="ttr_escalation_deadline" xsi:type="AttributeSubItem">
+          <target_attcode>ttr</target_attcode>
+          <item_code>100_deadline</item_code>
+        </field>
+        <field id="sla_ttr_passed" xsi:type="AttributeSubItem">
+          <target_attcode>ttr</target_attcode>
+          <item_code>100_passed</item_code>
+        </field>
+        <field id="sla_ttr_over" xsi:type="AttributeSubItem">
+          <target_attcode>ttr</target_attcode>
+          <item_code>100_overrun</item_code>
+        </field>
+        <field id="time_spent" xsi:type="AttributeDuration">
+          <sql>time_spent</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="resolution_code" xsi:type="AttributeEnum">
+          <values>
+            <value id="assistance">
+              <code>assistance</code>
+            </value>
+            <value id="other">
+              <code>other</code>
+            </value>
+            <value id="software patch">
+              <code>software patch</code>
+            </value>
+            <value id="training">
+              <code>training</code>
+            </value>
+            <value id="hardware repair">
+              <code>hardware repair</code>
+            </value>
+            <value id="system update">
+              <code>system update</code>
+            </value>
+            <value id="bug fixed">
+              <code>bug fixed</code>
+            </value>
+          </values>
+          <sql>resolution_code</sql>
+          <default_value>assistance</default_value>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="solution" xsi:type="AttributeText">
+          <sql>solution</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="pending_reason" xsi:type="AttributeText">
+          <sql>pending_reason</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="parent_request_id" xsi:type="AttributeExternalKey">
+          <filter><![CDATA[SELECT UserRequest WHERE id != :this->id AND status NOT IN ('rejected','resolved','closed')]]></filter>
+          <dependencies>
 					</dependencies>
-					<sql>parent_request_id</sql>
-					<target_class>UserRequest</target_class>
-					<is_null_allowed>true</is_null_allowed>
-					<on_target_delete>DEL_MANUAL</on_target_delete>
-				</field>
-				<field id="parent_request_ref" xsi:type="AttributeExternalField">
-					<extkey_attcode>parent_request_id</extkey_attcode>
-					<target_attcode>ref</target_attcode>
-				</field>
-				<field id="parent_incident_id" xsi:type="AttributeExternalKey">
-					<filter><![CDATA[SELECT Incident WHERE status != "closed"]]></filter>
-					<sql>parent_incident_id</sql>
-					<target_class>Incident</target_class>
-					<is_null_allowed>true</is_null_allowed>
-					<on_target_delete>DEL_MANUAL</on_target_delete>
-				</field>
-				<field id="parent_incident_ref" xsi:type="AttributeExternalField">
-					<extkey_attcode>parent_incident_id</extkey_attcode>
-					<target_attcode>ref</target_attcode>
-				</field>
-				<field id="parent_problem_id" xsi:type="AttributeExternalKey">
-					<sql>parent_problem_id</sql>
-					<target_class>Problem</target_class>
-					<is_null_allowed>true</is_null_allowed>
-					<on_target_delete>DEL_MANUAL</on_target_delete>
-				</field>
-				<field id="parent_problem_ref" xsi:type="AttributeExternalField">
-					<extkey_attcode>parent_problem_id</extkey_attcode>
-					<target_attcode>ref</target_attcode>
-				</field>
-				<field id="parent_change_id" xsi:type="AttributeExternalKey">
-					<filter><![CDATA[SELECT Change WHERE status != "closed"]]></filter>
-					<sql>parent_change_id</sql>
-					<target_class>Change</target_class>
-					<is_null_allowed>true</is_null_allowed>
-					<on_target_delete>DEL_MANUAL</on_target_delete>
-				</field>
-				<field id="parent_change_ref" xsi:type="AttributeExternalField">
-					<extkey_attcode>parent_change_id</extkey_attcode>
-					<target_attcode>ref</target_attcode>
-				</field>
-				<field id="related_request_list" xsi:type="AttributeLinkedSet">
-					<linked_class>UserRequest</linked_class>
-					<ext_key_to_me>parent_request_id</ext_key_to_me>
-					<edit_mode>add_remove</edit_mode>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-				</field>
-				<field id="public_log" xsi:type="AttributeCaseLog">
-					<sql>public_log</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="user_satisfaction" xsi:type="AttributeEnum">
-					<values>
-						<value id="1">
-							<code>1</code>
-						</value>
-						<value id="2">
-							<code>2</code>
-						</value>
-						<value id="3">
-							<code>3</code>
-						</value>
-						<value id="4">
-							<code>4</code>
-						</value>
-					</values>
-					<sql>user_satisfaction</sql>
-					<default_value>1</default_value>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="user_comment" xsi:type="AttributeText">
-					<sql>user_commment</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-			</fields>
-			<lifecycle>
-				<highlight_scale>
-					<item id="warning">
-						<rank>1</rank>
-						<color>HIGHLIGHT_CLASS_WARNING</color>
-							<icon>images/user-request-deadline.svg</icon>
-					</item>
-					<item id="critical">
-						<rank>2</rank>
-						<color>HIGHLIGHT_CLASS_CRITICAL</color>
-							<icon>images/user-request-escalated.svg</icon>
-					</item>
-					<item id="closed">
-						<rank>3</rank>
-						<color>HIGHLIGHT_CLASS_NONE</color>
-							<icon>images/user-request-closed.svg</icon>
-					</item>
-				</highlight_scale>
-				<stimuli>
-					<stimulus id="ev_assign" xsi:type="StimulusUserAction"/>
-					<stimulus id="ev_reassign" xsi:type="StimulusUserAction"/>
-					<stimulus id="ev_approve" xsi:type="StimulusUserAction"/>
-					<stimulus id="ev_reject" xsi:type="StimulusUserAction"/>
-					<stimulus id="ev_pending" xsi:type="StimulusUserAction"/>
-					<stimulus id="ev_timeout" xsi:type="StimulusInternal"/>
-					<stimulus id="ev_autoresolve" xsi:type="StimulusInternal"/>
-					<stimulus id="ev_autoclose" xsi:type="StimulusInternal"/>
-					<stimulus id="ev_resolve" xsi:type="StimulusUserAction"/>
-					<stimulus id="ev_close" xsi:type="StimulusUserAction"/>
-					<stimulus id="ev_reopen" xsi:type="StimulusUserAction"/>
-					<stimulus id="ev_wait_for_approval" xsi:type="StimulusUserAction"/>
-				</stimuli>
-				<states>
-					<state id="new">
-						<flags>
-							<attribute id="ref">
-								<read_only/>
-							</attribute>
-							<attribute id="org_id">
-								<mandatory/>
-							</attribute>
-							<attribute id="caller_id">
-								<mandatory/>
-							</attribute>
-							<attribute id="team_id">
-								<hidden/>
-							</attribute>
-							<attribute id="agent_id">
-								<hidden/>
-							</attribute>
-							<attribute id="priority">
-								<read_only/>
-							</attribute>
-							<attribute id="start_date">
-								<read_only/>
-							</attribute>
-							<attribute id="last_update">
-								<read_only/>
-							</attribute>
-							<attribute id="close_date">
-								<hidden/>
-							</attribute>
-							<attribute id="approver_id">
-								<hidden/>
-							</attribute>
-							<attribute id="request_type">
-								<read_only/>
-							</attribute>
-							<attribute id="escalation_flag">
-								<hidden/>
-							</attribute>
-							<attribute id="escalation_reason">
-								<hidden/>
-							</attribute>
-							<attribute id="assignment_date">
-								<hidden/>
-							</attribute>
-							<attribute id="resolution_date">
-								<hidden/>
-							</attribute>
-							<attribute id="last_pending_date">
-								<hidden/>
-							</attribute>
-							<attribute id="time_spent">
-								<hidden/>
-							</attribute>
-							<attribute id="resolution_code">
-								<hidden/>
-							</attribute>
-							<attribute id="solution">
-								<hidden/>
-							</attribute>
-							<attribute id="pending_reason">
-								<hidden/>
-							</attribute>
-							<attribute id="user_satisfaction">
-								<hidden/>
-							</attribute>
-							<attribute id="user_comment">
-								<hidden/>
-							</attribute>
-							<attribute id="tto_escalation_deadline">
-								<read_only/>
-							</attribute>
-							<attribute id="sla_tto_passed">
-								<hidden/>
-							</attribute>
-							<attribute id="sla_tto_over">
-								<hidden/>
-							</attribute>
-							<attribute id="sla_ttr_passed">
-								<hidden/>
-							</attribute>
-							<attribute id="ttr_escalation_deadline">
-								<hidden/>
-							</attribute>
-							<attribute id="sla_ttr_over">
-								<hidden/>
-							</attribute>
-						</flags>
-						<transitions>
-							<transition id="ev_assign">
-								<target>assigned</target>
-								<actions>
-									<action>
-										<verb>SetCurrentDate</verb>
-										<params>
-											<param xsi:type="attcode">assignment_date</param>
-										</params>
-									</action>
+          <sql>parent_request_id</sql>
+          <target_class>UserRequest</target_class>
+          <is_null_allowed>true</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+        </field>
+        <field id="parent_request_ref" xsi:type="AttributeExternalField">
+          <extkey_attcode>parent_request_id</extkey_attcode>
+          <target_attcode>ref</target_attcode>
+        </field>
+        <field id="parent_incident_id" xsi:type="AttributeExternalKey">
+          <filter><![CDATA[SELECT Incident WHERE status != "closed"]]></filter>
+          <sql>parent_incident_id</sql>
+          <target_class>Incident</target_class>
+          <is_null_allowed>true</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+        </field>
+        <field id="parent_incident_ref" xsi:type="AttributeExternalField">
+          <extkey_attcode>parent_incident_id</extkey_attcode>
+          <target_attcode>ref</target_attcode>
+        </field>
+        <field id="parent_problem_id" xsi:type="AttributeExternalKey">
+          <sql>parent_problem_id</sql>
+          <target_class>Problem</target_class>
+          <is_null_allowed>true</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+        </field>
+        <field id="parent_problem_ref" xsi:type="AttributeExternalField">
+          <extkey_attcode>parent_problem_id</extkey_attcode>
+          <target_attcode>ref</target_attcode>
+        </field>
+        <field id="parent_change_id" xsi:type="AttributeExternalKey">
+          <filter><![CDATA[SELECT Change WHERE status != "closed"]]></filter>
+          <sql>parent_change_id</sql>
+          <target_class>Change</target_class>
+          <is_null_allowed>true</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+        </field>
+        <field id="parent_change_ref" xsi:type="AttributeExternalField">
+          <extkey_attcode>parent_change_id</extkey_attcode>
+          <target_attcode>ref</target_attcode>
+        </field>
+        <field id="related_request_list" xsi:type="AttributeLinkedSet">
+          <linked_class>UserRequest</linked_class>
+          <ext_key_to_me>parent_request_id</ext_key_to_me>
+          <legacy_edit_mode>add_remove</legacy_edit_mode>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <relation_type>link</relation_type>
+          <read_only>false</read_only>
+        </field>
+        <field id="public_log" xsi:type="AttributeCaseLog">
+          <sql>public_log</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="user_satisfaction" xsi:type="AttributeEnum">
+          <values>
+            <value id="1">
+              <code>1</code>
+            </value>
+            <value id="2">
+              <code>2</code>
+            </value>
+            <value id="3">
+              <code>3</code>
+            </value>
+            <value id="4">
+              <code>4</code>
+            </value>
+          </values>
+          <sql>user_satisfaction</sql>
+          <default_value>1</default_value>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="user_comment" xsi:type="AttributeText">
+          <sql>user_commment</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+      </fields>
+      <lifecycle>
+        <highlight_scale>
+          <item id="warning">
+            <rank>1</rank>
+            <color>HIGHLIGHT_CLASS_WARNING</color>
+            <icon>images/user-request-deadline.svg</icon>
+          </item>
+          <item id="critical">
+            <rank>2</rank>
+            <color>HIGHLIGHT_CLASS_CRITICAL</color>
+            <icon>images/user-request-escalated.svg</icon>
+          </item>
+          <item id="closed">
+            <rank>3</rank>
+            <color>HIGHLIGHT_CLASS_NONE</color>
+            <icon>images/user-request-closed.svg</icon>
+          </item>
+        </highlight_scale>
+        <stimuli>
+          <stimulus id="ev_assign" xsi:type="StimulusUserAction"/>
+          <stimulus id="ev_reassign" xsi:type="StimulusUserAction"/>
+          <stimulus id="ev_approve" xsi:type="StimulusUserAction"/>
+          <stimulus id="ev_reject" xsi:type="StimulusUserAction"/>
+          <stimulus id="ev_pending" xsi:type="StimulusUserAction"/>
+          <stimulus id="ev_timeout" xsi:type="StimulusInternal"/>
+          <stimulus id="ev_autoresolve" xsi:type="StimulusInternal"/>
+          <stimulus id="ev_autoclose" xsi:type="StimulusInternal"/>
+          <stimulus id="ev_resolve" xsi:type="StimulusUserAction"/>
+          <stimulus id="ev_close" xsi:type="StimulusUserAction"/>
+          <stimulus id="ev_reopen" xsi:type="StimulusUserAction"/>
+          <stimulus id="ev_wait_for_approval" xsi:type="StimulusUserAction"/>
+        </stimuli>
+        <states>
+          <state id="new">
+            <flags>
+              <attribute id="ref">
+                <read_only/>
+              </attribute>
+              <attribute id="org_id">
+                <mandatory/>
+              </attribute>
+              <attribute id="caller_id">
+                <mandatory/>
+              </attribute>
+              <attribute id="team_id">
+                <hidden/>
+              </attribute>
+              <attribute id="agent_id">
+                <hidden/>
+              </attribute>
+              <attribute id="priority">
+                <read_only/>
+              </attribute>
+              <attribute id="start_date">
+                <read_only/>
+              </attribute>
+              <attribute id="last_update">
+                <read_only/>
+              </attribute>
+              <attribute id="close_date">
+                <hidden/>
+              </attribute>
+              <attribute id="approver_id">
+                <hidden/>
+              </attribute>
+              <attribute id="request_type">
+                <read_only/>
+              </attribute>
+              <attribute id="escalation_flag">
+                <hidden/>
+              </attribute>
+              <attribute id="escalation_reason">
+                <hidden/>
+              </attribute>
+              <attribute id="assignment_date">
+                <hidden/>
+              </attribute>
+              <attribute id="resolution_date">
+                <hidden/>
+              </attribute>
+              <attribute id="last_pending_date">
+                <hidden/>
+              </attribute>
+              <attribute id="time_spent">
+                <hidden/>
+              </attribute>
+              <attribute id="resolution_code">
+                <hidden/>
+              </attribute>
+              <attribute id="solution">
+                <hidden/>
+              </attribute>
+              <attribute id="pending_reason">
+                <hidden/>
+              </attribute>
+              <attribute id="user_satisfaction">
+                <hidden/>
+              </attribute>
+              <attribute id="user_comment">
+                <hidden/>
+              </attribute>
+              <attribute id="tto_escalation_deadline">
+                <read_only/>
+              </attribute>
+              <attribute id="sla_tto_passed">
+                <hidden/>
+              </attribute>
+              <attribute id="sla_tto_over">
+                <hidden/>
+              </attribute>
+              <attribute id="sla_ttr_passed">
+                <hidden/>
+              </attribute>
+              <attribute id="ttr_escalation_deadline">
+                <hidden/>
+              </attribute>
+              <attribute id="sla_ttr_over">
+                <hidden/>
+              </attribute>
+            </flags>
+            <transitions>
+              <transition id="ev_assign">
+                <target>assigned</target>
+                <actions>
+                  <action>
+                    <verb>SetCurrentDate</verb>
+                    <params>
+                      <param xsi:type="attcode">assignment_date</param>
+                    </params>
+                  </action>
+                </actions>
+              </transition>
+              <transition id="ev_timeout">
+                <target>escalated_tto</target>
+                <actions/>
+              </transition>
+              <transition id="ev_wait_for_approval">
+                <target>waiting_for_approval</target>
+                <actions/>
+              </transition>
+              <transition id="ev_autoresolve">
+                <target>resolved</target>
+                <actions>
+                  <action>
+                    <verb>SetCurrentDate</verb>
+                    <params>
+                      <param xsi:type="attcode">resolution_date</param>
+                    </params>
+                  </action>
+                  <action>
+                    <verb>SetElapsedTime</verb>
+                    <params>
+                      <param xsi:type="attcode">time_spent</param>
+                      <param xsi:type="attcode">start_date</param>
+                      <param xsi:type="string">DefaultWorkingTimeComputer</param>
+                    </params>
+                  </action>
+                  <action>
+                    <verb>ResolveChildTickets</verb>
+                    <params/>
+                  </action>
+                </actions>
+              </transition>
+            </transitions>
+          </state>
+          <state id="escalated_tto">
+            <highlight>
+              <code>critical</code>
+            </highlight>
+            <inherit_flags_from>new</inherit_flags_from>
+            <flags>
+              <attribute id="team_id"/>
+            </flags>
+            <transitions>
+              <transition id="ev_assign">
+                <target>assigned</target>
+                <actions>
+                  <action>
+                    <verb>SetCurrentDate</verb>
+                    <params>
+                      <param xsi:type="attcode">assignment_date</param>
+                    </params>
+                  </action>
+                </actions>
+              </transition>
+            </transitions>
+          </state>
+          <state id="assigned">
+            <inherit_flags_from>new</inherit_flags_from>
+            <flags>
+              <attribute id="team_id">
+                <mandatory/>
+                <must_prompt/>
+                <read_only/>
+              </attribute>
+              <attribute id="agent_id">
+                <mandatory/>
+                <must_prompt/>
+                <read_only/>
+              </attribute>
+              <attribute id="approver_id">
+                <read_only/>
+              </attribute>
+              <attribute id="assignment_date">
+                <read_only/>
+              </attribute>
+              <attribute id="tto_escalation_deadline">
+                <hidden/>
+              </attribute>
+              <attribute id="sla_tto_passed">
+                <read_only/>
+              </attribute>
+              <attribute id="sla_tto_over">
+                <read_only/>
+              </attribute>
+              <attribute id="ttr_escalation_deadline">
+                <read_only/>
+              </attribute>
+              <attribute id="caller_id"/>
+              <attribute id="escalation_flag"/>
+              <attribute id="escalation_reason"/>
+            </flags>
+            <transitions>
+              <transition id="ev_pending">
+                <target>pending</target>
+                <actions>
+                  <action>
+                    <verb>SetCurrentDate</verb>
+                    <params>
+                      <param xsi:type="attcode">last_pending_date</param>
+                    </params>
+                  </action>
+                </actions>
+              </transition>
+              <transition id="ev_resolve">
+                <target>resolved</target>
+                <actions>
+                  <action>
+                    <verb>SetCurrentDate</verb>
+                    <params>
+                      <param xsi:type="attcode">resolution_date</param>
+                    </params>
+                  </action>
+                  <action>
+                    <verb>SetElapsedTime</verb>
+                    <params>
+                      <param xsi:type="attcode">time_spent</param>
+                      <param xsi:type="attcode">start_date</param>
+                      <param xsi:type="string">DefaultWorkingTimeComputer</param>
+                    </params>
+                  </action>
+                  <action>
+                    <verb>ResolveChildTickets</verb>
+                    <params/>
+                  </action>
+                </actions>
+              </transition>
+              <transition id="ev_reassign">
+                <target>assigned</target>
+                <flags>
+                  <attribute id="agent_id">
+                    <must_change/>
+                  </attribute>
+                  <attribute id="team_id">
+                    <must_prompt/>
+                  </attribute>
+                </flags>
+                <actions/>
+              </transition>
+              <transition id="ev_timeout">
+                <target>escalated_ttr</target>
+                <actions/>
+              </transition>
+              <transition id="ev_autoresolve">
+                <target>resolved</target>
+                <actions>
+                  <action>
+                    <verb>SetCurrentDate</verb>
+                    <params>
+                      <param xsi:type="attcode">resolution_date</param>
+                    </params>
+                  </action>
+                  <action>
+                    <verb>SetElapsedTime</verb>
+                    <params>
+                      <param xsi:type="attcode">time_spent</param>
+                      <param xsi:type="attcode">start_date</param>
+                      <param xsi:type="string">DefaultWorkingTimeComputer</param>
+                    </params>
+                  </action>
+                  <action>
+                    <verb>ResolveChildTickets</verb>
+                    <params/>
+                  </action>
+                </actions>
+              </transition>
+            </transitions>
+          </state>
+          <state id="escalated_ttr">
+            <highlight>
+              <code>critical</code>
+            </highlight>
+            <inherit_flags_from>assigned</inherit_flags_from>
+            <flags/>
+            <transitions>
+              <transition id="ev_pending">
+                <target>pending</target>
+                <actions>
+                  <action>
+                    <verb>SetCurrentDate</verb>
+                    <params>
+                      <param xsi:type="attcode">last_pending_date</param>
+                    </params>
+                  </action>
+                </actions>
+              </transition>
+              <transition id="ev_resolve">
+                <target>resolved</target>
+                <actions>
+                  <action>
+                    <verb>SetCurrentDate</verb>
+                    <params>
+                      <param xsi:type="attcode">resolution_date</param>
+                    </params>
+                  </action>
+                  <action>
+                    <verb>SetElapsedTime</verb>
+                    <params>
+                      <param xsi:type="attcode">time_spent</param>
+                      <param xsi:type="attcode">start_date</param>
+                      <param xsi:type="string">DefaultWorkingTimeComputer</param>
+                    </params>
+                  </action>
+                  <action>
+                    <verb>ResolveChildTickets</verb>
+                    <params/>
+                  </action>
+                </actions>
+              </transition>
+              <transition id="ev_reassign">
+                <target>assigned</target>
+                <actions/>
+              </transition>
+              <transition id="ev_autoresolve">
+                <target>resolved</target>
+                <actions>
+                  <action>
+                    <verb>SetCurrentDate</verb>
+                    <params>
+                      <param xsi:type="attcode">resolution_date</param>
+                    </params>
+                  </action>
+                  <action>
+                    <verb>SetElapsedTime</verb>
+                    <params>
+                      <param xsi:type="attcode">time_spent</param>
+                      <param xsi:type="attcode">start_date</param>
+                      <param xsi:type="string">DefaultWorkingTimeComputer</param>
+                    </params>
+                  </action>
+                  <action>
+                    <verb>ResolveChildTickets</verb>
+                    <params/>
+                  </action>
+                </actions>
+              </transition>
+            </transitions>
+          </state>
+          <state id="waiting_for_approval">
+            <inherit_flags_from>new</inherit_flags_from>
+            <flags>
+              <attribute id="approver_id">
+                <must_prompt/>
+              </attribute>
+              <attribute id="team_id"/>
+            </flags>
+            <transitions>
+              <transition id="ev_approve">
+                <target>approved</target>
+                <actions/>
+              </transition>
+              <transition id="ev_reject">
+                <target>rejected</target>
+                <actions/>
+              </transition>
+            </transitions>
+          </state>
+          <state id="approved">
+            <inherit_flags_from>waiting_for_approval</inherit_flags_from>
+            <flags>
+              <attribute id="approver_id">
+                <read_only/>
+              </attribute>
+            </flags>
+            <transitions>
+              <transition id="ev_timeout">
+                <target>escalated_tto</target>
+                <actions/>
+              </transition>
+              <transition id="ev_assign">
+                <target>assigned</target>
+                <actions>
+                  <action>
+                    <verb>SetCurrentDate</verb>
+                    <params>
+                      <param xsi:type="attcode">assignment_date</param>
+                    </params>
+                  </action>
+                </actions>
+              </transition>
+              <transition id="ev_autoresolve">
+                <target>resolved</target>
+                <actions>
+                  <action>
+                    <verb>SetCurrentDate</verb>
+                    <params>
+                      <param xsi:type="attcode">resolution_date</param>
+                    </params>
+                  </action>
+                  <action>
+                    <verb>SetElapsedTime</verb>
+                    <params>
+                      <param xsi:type="attcode">time_spent</param>
+                      <param xsi:type="attcode">start_date</param>
+                      <param xsi:type="string">DefaultWorkingTimeComputer</param>
+                    </params>
+                  </action>
+                  <action>
+                    <verb>ResolveChildTickets</verb>
+                    <params/>
+                  </action>
+                </actions>
+              </transition>
+            </transitions>
+          </state>
+          <state id="rejected">
+            <inherit_flags_from>new</inherit_flags_from>
+            <flags>
+              <attribute id="tto_escalation_deadline">
+                <hidden/>
+              </attribute>
+              <attribute id="team_id"/>
+            </flags>
+            <transitions>
+              <transition id="ev_reopen">
+                <target>new</target>
+                <actions/>
+              </transition>
+            </transitions>
+          </state>
+          <state id="pending">
+            <inherit_flags_from>assigned</inherit_flags_from>
+            <flags>
+              <attribute id="last_pending_date">
+                <read_only/>
+              </attribute>
+              <attribute id="pending_reason">
+                <mandatory/>
+                <must_prompt/>
+              </attribute>
+              <attribute id="ttr_escalation_deadline">
+                <hidden/>
+              </attribute>
+            </flags>
+            <transitions>
+              <transition id="ev_assign">
+                <target>assigned</target>
+                <actions>
 								</actions>
-							</transition>
-							<transition id="ev_timeout">
-								<target>escalated_tto</target>
-								<actions/>
-							</transition>
-							<transition id="ev_wait_for_approval">
-								<target>waiting_for_approval</target>
-								<actions/>
-							</transition>
-							<transition id="ev_autoresolve">
-								<target>resolved</target>
-								<actions>
-									<action>
-										<verb>SetCurrentDate</verb>
-										<params>
-											<param xsi:type="attcode">resolution_date</param>
-										</params>
-									</action>
-									<action>
-										<verb>SetElapsedTime</verb>
-										<params>
-											<param xsi:type="attcode">time_spent</param>
-											<param xsi:type="attcode">start_date</param>
-											<param xsi:type="string">DefaultWorkingTimeComputer</param>
-										</params>
-									</action>
-									<action>
-										<verb>ResolveChildTickets</verb>
-										<params/>
-									</action>
+              </transition>
+              <transition id="ev_autoresolve">
+                <target>resolved</target>
+                <actions>
+                  <action>
+                    <verb>SetCurrentDate</verb>
+                    <params>
+                      <param xsi:type="attcode">resolution_date</param>
+                    </params>
+                  </action>
+                  <action>
+                    <verb>SetElapsedTime</verb>
+                    <params>
+                      <param xsi:type="attcode">time_spent</param>
+                      <param xsi:type="attcode">start_date</param>
+                      <param xsi:type="string">DefaultWorkingTimeComputer</param>
+                    </params>
+                  </action>
+                  <action>
+                    <verb>ResolveChildTickets</verb>
+                    <params/>
+                  </action>
+                </actions>
+              </transition>
+            </transitions>
+          </state>
+          <state id="resolved">
+            <highlight>
+              <code>closed</code>
+            </highlight>
+            <inherit_flags_from>assigned</inherit_flags_from>
+            <flags>
+              <attribute id="caller_id">
+                <read_only/>
+              </attribute>
+              <attribute id="origin">
+                <read_only/>
+              </attribute>
+              <attribute id="impact">
+                <read_only/>
+              </attribute>
+              <attribute id="urgency">
+                <read_only/>
+              </attribute>
+              <attribute id="service_id">
+                <mandatory/>
+                <must_prompt/>
+              </attribute>
+              <attribute id="servicesubcategory_id">
+                <must_prompt/>
+              </attribute>
+              <attribute id="escalation_flag">
+                <read_only/>
+              </attribute>
+              <attribute id="escalation_reason">
+                <read_only/>
+              </attribute>
+              <attribute id="parent_request_id">
+                <read_only/>
+              </attribute>
+              <attribute id="parent_change_id">
+                <read_only/>
+              </attribute>
+              <attribute id="parent_problem_id">
+                <read_only/>
+              </attribute>
+              <attribute id="title">
+                <read_only/>
+              </attribute>
+              <attribute id="description">
+                <read_only/>
+              </attribute>
+              <attribute id="org_id">
+                <read_only/>
+              </attribute>
+              <attribute id="team_id">
+                <read_only/>
+              </attribute>
+              <attribute id="agent_id">
+                <read_only/>
+              </attribute>
+              <attribute id="resolution_date">
+                <read_only/>
+              </attribute>
+              <attribute id="time_spent">
+                <read_only/>
+              </attribute>
+              <attribute id="resolution_code">
+                <mandatory/>
+                <must_prompt/>
+              </attribute>
+              <attribute id="solution">
+                <mandatory/>
+                <must_prompt/>
+              </attribute>
+              <attribute id="pending_reason">
+                <read_only/>
+              </attribute>
+              <attribute id="sla_ttr_passed">
+                <read_only/>
+              </attribute>
+              <attribute id="ttr_escalation_deadline">
+                <hidden/>
+              </attribute>
+              <attribute id="sla_ttr_over">
+                <read_only/>
+              </attribute>
+            </flags>
+            <transitions>
+              <transition id="ev_close">
+                <target>closed</target>
+                <actions>
+                  <action>
+                    <verb>SetCurrentDate</verb>
+                    <params>
+                      <param xsi:type="attcode">close_date</param>
+                    </params>
+                  </action>
+                </actions>
+              </transition>
+              <transition id="ev_reopen">
+                <target>assigned</target>
+                <actions>
 								</actions>
-							</transition>
-						</transitions>
-					</state>
-					<state id="escalated_tto">
-						<highlight>
-							<code>critical</code>
-						</highlight>
-						<inherit_flags_from>new</inherit_flags_from>
-						<flags>
-							<attribute id="team_id"/>
-						</flags>
-						<transitions>
-							<transition id="ev_assign">
-								<target>assigned</target>
-								<actions>
-									<action>
-										<verb>SetCurrentDate</verb>
-										<params>
-											<param xsi:type="attcode">assignment_date</param>
-										</params>
-									</action>
-								</actions>
-							</transition>
-						</transitions>
-					</state>
-					<state id="assigned">
-						<inherit_flags_from>new</inherit_flags_from>
-						<flags>
-							<attribute id="team_id">
-								<mandatory/>
-								<must_prompt/>
-								<read_only/>
-							</attribute>
-							<attribute id="agent_id">
-								<mandatory/>
-								<must_prompt/>
-								<read_only/>
-							</attribute>
-							<attribute id="approver_id">
-								<read_only/>
-							</attribute>
-							<attribute id="assignment_date">
-								<read_only/>
-							</attribute>
-							<attribute id="tto_escalation_deadline">
-								<hidden/>
-							</attribute>
-							<attribute id="sla_tto_passed">
-								<read_only/>
-							</attribute>
-							<attribute id="sla_tto_over">
-								<read_only/>
-							</attribute>
-							<attribute id="ttr_escalation_deadline">
-								<read_only/>
-							</attribute>
-							<attribute id="caller_id"/>
-							<attribute id="escalation_flag"/>
-							<attribute id="escalation_reason"/>
-						</flags>
-						<transitions>
-							<transition id="ev_pending">
-								<target>pending</target>
-								<actions>
-									<action>
-										<verb>SetCurrentDate</verb>
-										<params>
-											<param xsi:type="attcode">last_pending_date</param>
-										</params>
-									</action>
-								</actions>
-							</transition>
-							<transition id="ev_resolve">
-								<target>resolved</target>
-								<actions>
-									<action>
-										<verb>SetCurrentDate</verb>
-										<params>
-											<param xsi:type="attcode">resolution_date</param>
-										</params>
-									</action>
-									<action>
-										<verb>SetElapsedTime</verb>
-										<params>
-											<param xsi:type="attcode">time_spent</param>
-											<param xsi:type="attcode">start_date</param>
-											<param xsi:type="string">DefaultWorkingTimeComputer</param>
-										</params>
-									</action>
-									<action>
-										<verb>ResolveChildTickets</verb>
-										<params/>
-									</action>
-								</actions>
-							</transition>
-							<transition id="ev_reassign">
-								<target>assigned</target>
-								<flags>
-									<attribute id="agent_id">
-										<must_change/>
-									</attribute>
-									<attribute id="team_id">
-										<must_prompt/>
-									</attribute>
-								</flags>
-								<actions/>
-							</transition>
-							<transition id="ev_timeout">
-								<target>escalated_ttr</target>
-								<actions/>
-							</transition>
-							<transition id="ev_autoresolve">
-								<target>resolved</target>
-								<actions>
-									<action>
-										<verb>SetCurrentDate</verb>
-										<params>
-											<param xsi:type="attcode">resolution_date</param>
-										</params>
-									</action>
-									<action>
-										<verb>SetElapsedTime</verb>
-										<params>
-											<param xsi:type="attcode">time_spent</param>
-											<param xsi:type="attcode">start_date</param>
-											<param xsi:type="string">DefaultWorkingTimeComputer</param>
-										</params>
-									</action>
-									<action>
-										<verb>ResolveChildTickets</verb>
-										<params/>
-									</action>
-								</actions>
-							</transition>
-						</transitions>
-					</state>
-					<state id="escalated_ttr">
-						<highlight>
-							<code>critical</code>
-						</highlight>
-						<inherit_flags_from>assigned</inherit_flags_from>
-						<flags/>
-						<transitions>
-							<transition id="ev_pending">
-								<target>pending</target>
-								<actions>
-									<action>
-										<verb>SetCurrentDate</verb>
-										<params>
-											<param xsi:type="attcode">last_pending_date</param>
-										</params>
-									</action>
-								</actions>
-							</transition>
-							<transition id="ev_resolve">
-								<target>resolved</target>
-								<actions>
-									<action>
-										<verb>SetCurrentDate</verb>
-										<params>
-											<param xsi:type="attcode">resolution_date</param>
-										</params>
-									</action>
-									<action>
-										<verb>SetElapsedTime</verb>
-										<params>
-											<param xsi:type="attcode">time_spent</param>
-											<param xsi:type="attcode">start_date</param>
-											<param xsi:type="string">DefaultWorkingTimeComputer</param>
-										</params>
-									</action>
-									<action>
-										<verb>ResolveChildTickets</verb>
-										<params/>
-									</action>
-								</actions>
-							</transition>
-							<transition id="ev_reassign">
-								<target>assigned</target>
-								<actions/>
-							</transition>
-							<transition id="ev_autoresolve">
-								<target>resolved</target>
-								<actions>
-									<action>
-										<verb>SetCurrentDate</verb>
-										<params>
-											<param xsi:type="attcode">resolution_date</param>
-										</params>
-									</action>
-									<action>
-										<verb>SetElapsedTime</verb>
-										<params>
-											<param xsi:type="attcode">time_spent</param>
-											<param xsi:type="attcode">start_date</param>
-											<param xsi:type="string">DefaultWorkingTimeComputer</param>
-										</params>
-									</action>
-									<action>
-										<verb>ResolveChildTickets</verb>
-										<params/>
-									</action>
-								</actions>
-							</transition>
-						</transitions>
-					</state>
-					<state id="waiting_for_approval">
-						<inherit_flags_from>new</inherit_flags_from>
-						<flags>
-							<attribute id="approver_id">
-								<must_prompt/>
-							</attribute>
-							<attribute id="team_id"/>
-						</flags>
-						<transitions>
-							<transition id="ev_approve">
-								<target>approved</target>
-								<actions/>
-							</transition>
-							<transition id="ev_reject">
-								<target>rejected</target>
-								<actions/>
-							</transition>
-						</transitions>
-					</state>
-					<state id="approved">
-						<inherit_flags_from>waiting_for_approval</inherit_flags_from>
-						<flags>
-							<attribute id="approver_id">
-								<read_only/>
-							</attribute>
-						</flags>
-						<transitions>
-							<transition id="ev_timeout">
-								<target>escalated_tto</target>
-								<actions/>
-							</transition>
-							<transition id="ev_assign">
-								<target>assigned</target>
-								<actions>
-									<action>
-										<verb>SetCurrentDate</verb>
-										<params>
-											<param xsi:type="attcode">assignment_date</param>
-										</params>
-									</action>
-								</actions>
-							</transition>
-							<transition id="ev_autoresolve">
-								<target>resolved</target>
-								<actions>
-									<action>
-										<verb>SetCurrentDate</verb>
-										<params>
-											<param xsi:type="attcode">resolution_date</param>
-										</params>
-									</action>
-									<action>
-										<verb>SetElapsedTime</verb>
-										<params>
-											<param xsi:type="attcode">time_spent</param>
-											<param xsi:type="attcode">start_date</param>
-											<param xsi:type="string">DefaultWorkingTimeComputer</param>
-										</params>
-									</action>
-									<action>
-										<verb>ResolveChildTickets</verb>
-										<params/>
-									</action>
-								</actions>
-							</transition>
-						</transitions>
-					</state>
-					<state id="rejected">
-						<inherit_flags_from>new</inherit_flags_from>
-						<flags>
-							<attribute id="tto_escalation_deadline">
-								<hidden/>
-							</attribute>
-							<attribute id="team_id"/>
-						</flags>
-						<transitions>
-							<transition id="ev_reopen">
-								<target>new</target>
-								<actions/>
-							</transition>
-						</transitions>
-					</state>
-					<state id="pending">
-						<inherit_flags_from>assigned</inherit_flags_from>
-						<flags>
-							<attribute id="last_pending_date">
-								<read_only/>
-							</attribute>
-							<attribute id="pending_reason">
-								<mandatory/>
-								<must_prompt/>
-							</attribute>
-							<attribute id="ttr_escalation_deadline">
-								<hidden/>
-							</attribute>
-						</flags>
-						<transitions>
-							<transition id="ev_assign">
-								<target>assigned</target>
-								<actions>
-								</actions>
-							</transition>
-							<transition id="ev_autoresolve">
-								<target>resolved</target>
-								<actions>
-									<action>
-										<verb>SetCurrentDate</verb>
-										<params>
-											<param xsi:type="attcode">resolution_date</param>
-										</params>
-									</action>
-									<action>
-										<verb>SetElapsedTime</verb>
-										<params>
-											<param xsi:type="attcode">time_spent</param>
-											<param xsi:type="attcode">start_date</param>
-											<param xsi:type="string">DefaultWorkingTimeComputer</param>
-										</params>
-									</action>
-									<action>
-										<verb>ResolveChildTickets</verb>
-										<params/>
-									</action>
-								</actions>
-							</transition>
-						</transitions>
-					</state>
-					<state id="resolved">
-						<highlight>
-							<code>closed</code>
-						</highlight>
-						<inherit_flags_from>assigned</inherit_flags_from>
-						<flags>
-							<attribute id="caller_id">
-								<read_only/>
-							</attribute>
-							<attribute id="origin">
-								<read_only/>
-							</attribute>
-							<attribute id="impact">
-								<read_only/>
-							</attribute>
-							<attribute id="urgency">
-								<read_only/>
-							</attribute>
-							<attribute id="service_id">
-								<mandatory/>
-								<must_prompt/>
-							</attribute>
-							<attribute id="servicesubcategory_id">
-								<must_prompt/>
-							</attribute>
-							<attribute id="escalation_flag">
-								<read_only/>
-							</attribute>
-							<attribute id="escalation_reason">
-								<read_only/>
-							</attribute>
-							<attribute id="parent_request_id">
-								<read_only/>
-							</attribute>
-							<attribute id="parent_change_id">
-								<read_only/>
-							</attribute>
-							<attribute id="parent_problem_id">
-								<read_only/>
-							</attribute>
-							<attribute id="title">
-								<read_only/>
-							</attribute>
-							<attribute id="description">
-								<read_only/>
-							</attribute>
-							<attribute id="org_id">
-								<read_only/>
-							</attribute>
-							<attribute id="team_id">
-								<read_only/>
-							</attribute>
-							<attribute id="agent_id">
-								<read_only/>
-							</attribute>
-							<attribute id="resolution_date">
-								<read_only/>
-							</attribute>
-							<attribute id="time_spent">
-								<read_only/>
-							</attribute>
-							<attribute id="resolution_code">
-								<mandatory/>
-								<must_prompt/>
-							</attribute>
-							<attribute id="solution">
-								<mandatory/>
-								<must_prompt/>
-							</attribute>
-							<attribute id="pending_reason">
-								<read_only/>
-							</attribute>
-							<attribute id="sla_ttr_passed">
-								<read_only/>
-							</attribute>
-							<attribute id="ttr_escalation_deadline">
-								<hidden/>
-							</attribute>
-							<attribute id="sla_ttr_over">
-								<read_only/>
-							</attribute>
-						</flags>
-						<transitions>
-							<transition id="ev_close">
-								<target>closed</target>
-								<actions>
-									<action>
-										<verb>SetCurrentDate</verb>
-										<params>
-											<param xsi:type="attcode">close_date</param>
-										</params>
-									</action>
-								</actions>
-							</transition>
-							<transition id="ev_reopen">
-								<target>assigned</target>
-								<actions>
-								</actions>
-							</transition>
-							<transition id="ev_autoresolve">
-								<target>resolved</target>
-								<actions>
-									<action>
-										<verb>SetCurrentDate</verb>
-										<params>
-											<param xsi:type="attcode">resolution_date</param>
-										</params>
-									</action>
-									<action>
-										<verb>SetElapsedTime</verb>
-										<params>
-											<param xsi:type="attcode">time_spent</param>
-											<param xsi:type="attcode">start_date</param>
-											<param xsi:type="string">DefaultWorkingTimeComputer</param>
-										</params>
-									</action>
-									<action>
-										<verb>ResolveChildTickets</verb>
-										<params/>
-									</action>
-								</actions>
-							</transition>
-						</transitions>
-					</state>
-					<state id="closed">
-						<highlight>
-							<code>closed</code>
-						</highlight>
-						<inherit_flags_from>resolved</inherit_flags_from>
-						<flags>
-							<attribute id="private_log">
-								<read_only/>
-							</attribute>
-							<attribute id="public_log">
-								<read_only/>
-							</attribute>
-							<attribute id="functionalcis_list">
-								<read_only/>
-							</attribute>
-							<attribute id="contacts_list">
-								<read_only/>
-							</attribute>
-							<attribute id="service_id">
-								<read_only/>
-							</attribute>
-							<attribute id="servicesubcategory_id">
-								<read_only/>
-							</attribute>
-							<attribute id="close_date">
-								<read_only/>
-							</attribute>
-							<attribute id="resolution_code">
-								<read_only/>
-							</attribute>
-							<attribute id="solution">
-								<read_only/>
-							</attribute>
-							<attribute id="pending_reason">
-								<read_only/>
-								<read_only/>
-							</attribute>
-							<attribute id="user_satisfaction">
-								<read_only/>
-								<must_prompt/>
-							</attribute>
-							<attribute id="user_comment">
-								<read_only/>
-								<must_prompt/>
-							</attribute>
-						</flags>
-						<transitions/>
-					</state>
-				</states>
-			</lifecycle>
+              </transition>
+              <transition id="ev_autoresolve">
+                <target>resolved</target>
+                <actions>
+                  <action>
+                    <verb>SetCurrentDate</verb>
+                    <params>
+                      <param xsi:type="attcode">resolution_date</param>
+                    </params>
+                  </action>
+                  <action>
+                    <verb>SetElapsedTime</verb>
+                    <params>
+                      <param xsi:type="attcode">time_spent</param>
+                      <param xsi:type="attcode">start_date</param>
+                      <param xsi:type="string">DefaultWorkingTimeComputer</param>
+                    </params>
+                  </action>
+                  <action>
+                    <verb>ResolveChildTickets</verb>
+                    <params/>
+                  </action>
+                </actions>
+              </transition>
+            </transitions>
+          </state>
+          <state id="closed">
+            <highlight>
+              <code>closed</code>
+            </highlight>
+            <inherit_flags_from>resolved</inherit_flags_from>
+            <flags>
+              <attribute id="private_log">
+                <read_only/>
+              </attribute>
+              <attribute id="public_log">
+                <read_only/>
+              </attribute>
+              <attribute id="functionalcis_list">
+                <read_only/>
+              </attribute>
+              <attribute id="contacts_list">
+                <read_only/>
+              </attribute>
+              <attribute id="service_id">
+                <read_only/>
+              </attribute>
+              <attribute id="servicesubcategory_id">
+                <read_only/>
+              </attribute>
+              <attribute id="close_date">
+                <read_only/>
+              </attribute>
+              <attribute id="resolution_code">
+                <read_only/>
+              </attribute>
+              <attribute id="solution">
+                <read_only/>
+              </attribute>
+              <attribute id="pending_reason">
+                <read_only/>
+                <read_only/>
+              </attribute>
+              <attribute id="user_satisfaction">
+                <read_only/>
+                <must_prompt/>
+              </attribute>
+              <attribute id="user_comment">
+                <read_only/>
+                <must_prompt/>
+              </attribute>
+            </flags>
+            <transitions/>
+          </state>
+        </states>
+      </lifecycle>
       <methods>
-				<method id="GetTicketRefFormat">
-					<static>true</static>
-					<access>public</access>
-					<type>Overload-DBObject</type>
-					<code><![CDATA[
+        <method id="GetTicketRefFormat">
+          <static>true</static>
+          <access>public</access>
+          <type>Overload-DBObject</type>
+          <code><![CDATA[
         public static function GetTicketRefFormat()
         {
                 return 'R-%06d';
         }
         ]]></code>
-				</method>
-				<method id="SetAssignedDate">
-					<comment><![CDATA[/**
+        </method>
+        <method id="SetAssignedDate">
+          <comment><![CDATA[/**
 	 * To be deprecated: use SetCurrentDate() instead
 	 * @return void
 	 */]]></comment>
-					<static>false</static>
-					<access>public</access>
-					<type>LifecycleAction</type>
-					<code><![CDATA[	public function SetAssignedDate($sStimulusCode)
+          <static>false</static>
+          <access>public</access>
+          <type>LifecycleAction</type>
+          <code><![CDATA[	public function SetAssignedDate($sStimulusCode)
 	{
 		$this->Set('assignment_date', time());
 		return true;
 	}]]></code>
-				</method>
-				<method id="SetLastPendingDate">
-					<comment><![CDATA[/**
+        </method>
+        <method id="SetLastPendingDate">
+          <comment><![CDATA[/**
 	 * To be deprecated: use SetCurrentDate() instead
 	 * @return void
 	 */]]></comment>
-					<static>false</static>
-					<access>public</access>
-					<type>LifecycleAction</type>
-					<code><![CDATA[	public function SetLastPendingDate($sStimulusCode)
+          <static>false</static>
+          <access>public</access>
+          <type>LifecycleAction</type>
+          <code><![CDATA[	public function SetLastPendingDate($sStimulusCode)
 	{
 		$this->Set('last_pending_date', time());
 		return true;
 	}]]></code>
-				</method>
-				<method id="SetResolveDate">
-					<comment><![CDATA[/**
+        </method>
+        <method id="SetResolveDate">
+          <comment><![CDATA[/**
 	 * To be deprecated: use SetCurrentDate() and SetElapsedTime() instead
 	 * @return void
 	 */]]></comment>
-					<static>false</static>
-					<access>public</access>
-					<type>LifecycleAction</type>
-					<code><![CDATA[	public function SetResolveDate($sStimulusCode)
+          <static>false</static>
+          <access>public</access>
+          <type>LifecycleAction</type>
+          <code><![CDATA[	public function SetResolveDate($sStimulusCode)
 	{
 		$this->Set('resolution_date', time());
                 $iTimeSpent = time() - AttributeDateTime::GetAsUnixSeconds($this->Get('start_date'));
 		$this->Set('time_spent', $iTimeSpent);
 		return true;
 	}]]></code>
-				</method>
-				<method id="SetClosureDate">
-					<comment><![CDATA[/**
+        </method>
+        <method id="SetClosureDate">
+          <comment><![CDATA[/**
 	 * To be deprecated: use SetCurrentDate() instead
 	 * @return void
 	 */]]></comment>
-					<static>false</static>
-					<access>public</access>
-					<type>LifecycleAction</type>
-					<code><![CDATA[	public function SetClosureDate($sStimulusCode)
+          <static>false</static>
+          <access>public</access>
+          <type>LifecycleAction</type>
+          <code><![CDATA[	public function SetClosureDate($sStimulusCode)
 	{
 		$this->Set('close_date', time());
 		return true;
 	}]]></code>
-				</method>
-				<method id="SetApprover">
-					<comment><![CDATA[/**
+        </method>
+        <method id="SetApprover">
+          <comment><![CDATA[/**
 	 * To be deprecated: use SetCurrentUser() instead
 	 * @return void
 	 */]]></comment>
-					<static>false</static>
-					<access>public</access>
-					<type>LifecycleAction</type>
-					<code><![CDATA[	public function SetApprover($sStimulusCode)
+          <static>false</static>
+          <access>public</access>
+          <type>LifecycleAction</type>
+          <code><![CDATA[	public function SetApprover($sStimulusCode)
 	{
 		$this->Set('approver_id', UserRights::GetUserId());
 		return true;
 	}]]></code>
-				</method>
-				<method id="DoCheckToWrite">
-					<static>false</static>
-					<access>public</access>
-					<type>Overload-DBObject</type>
-					<code><![CDATA[public function DoCheckToWrite()
+        </method>
+        <method id="DoCheckToWrite">
+          <static>false</static>
+          <access>public</access>
+          <type>Overload-DBObject</type>
+          <code><![CDATA[public function DoCheckToWrite()
   {
     parent::DoCheckToWrite();
     if (!$this->IsNew() && ($this->Get('parent_request_id') == $this->GetKey()))
@@ -1300,15 +1302,15 @@
       $this->m_aCheckIssues[] = Dict::Format('Class:UserRequest/Error:CannotAssignParentRequestIdToSelf');
     }
   }]]></code>
-				</method>
-				<method id="ComputePriority">
-					<comment>/** Compute the priority of the ticket based on its impact and urgency&#13;
+        </method>
+        <method id="ComputePriority">
+          <comment>/** Compute the priority of the ticket based on its impact and urgency&#13;
 						* @return integer The priority of the ticket 1(high) .. 3(low)&#13;
 						*/</comment>
-					<static>false</static>
-					<access>public</access>
-					<type>LifecycleAction</type>
-					<code><![CDATA[public function ComputePriority()
+          <static>false</static>
+          <access>public</access>
+          <type>LifecycleAction</type>
+          <code><![CDATA[public function ComputePriority()
 	{
 		// priority[impact][urgency]
 		$aPriorities = array(
@@ -1342,24 +1344,24 @@
 		}
 		return $iPriority;
 	}]]></code>
-				</method>
-				<method id="ComputeValues">
-					<static>false</static>
-					<access>public</access>
-					<type>Overload-DBObject</type>
-					<code><![CDATA[	public function ComputeValues()
+        </method>
+        <method id="ComputeValues">
+          <static>false</static>
+          <access>public</access>
+          <type>Overload-DBObject</type>
+          <code><![CDATA[	public function ComputeValues()
 	{
 		// Compute the priority of the ticket
 		$this->Set('priority', $this->ComputePriority());
 
 		return parent::ComputeValues();
 	}]]></code>
-				</method>
-				<method id="DisplayBareRelations">
-					<static>false</static>
-					<access>public</access>
-					<type>Overload-cmdbAbstractObject</type>
-					<code><![CDATA[	function DisplayBareRelations(WebPage $oPage, $bEditMode = false)
+        </method>
+        <method id="DisplayBareRelations">
+          <static>false</static>
+          <access>public</access>
+          <type>Overload-cmdbAbstractObject</type>
+          <code><![CDATA[	function DisplayBareRelations(WebPage $oPage, $bEditMode = false)
 	{
 		parent::DisplayBareRelations($oPage, $bEditMode);
 
@@ -1381,15 +1383,15 @@
 			self::DisplaySet($oPage, $oKnownErrorSet, array ('menu' => false));
 		}
 	}]]></code>
-				</method>
-				<method id="resolveChilds">
-					<comment><![CDATA[/**
+        </method>
+        <method id="resolveChilds">
+          <comment><![CDATA[/**
 	 * To be deprecated: use ResolveChildTickets() instead
 	 */]]></comment>
-					<static>false</static>
-					<access>public</access>
-					<type>LifecycleAction</type>
-					<code><![CDATA[	public function resolveChilds($sStimulusCode)
+          <static>false</static>
+          <access>public</access>
+          <type>LifecycleAction</type>
+          <code><![CDATA[	public function resolveChilds($sStimulusCode)
 	{
 				
 		$sOQL = "SELECT UserRequest WHERE parent_request_id=:ticket";
@@ -1416,18 +1418,18 @@
 		return true;
 
 	}]]></code>
-				</method>
-				<method id="ResolveChildTickets">
-					<comment><![CDATA[/**
+        </method>
+        <method id="ResolveChildTickets">
+          <comment><![CDATA[/**
 	 * Cascade the resolution to child User Request
 	 * @return true (returning false would stop the ongoing transition)
 	 */]]></comment>
-					<static>false</static>
-					<access>public</access>
-					<type>LifecycleAction</type>
-					<arguments>
+          <static>false</static>
+          <access>public</access>
+          <type>LifecycleAction</type>
+          <arguments>
 					</arguments>
-					<code><![CDATA[	public function ResolveChildTickets()
+          <code><![CDATA[	public function ResolveChildTickets()
 	{
         static $aTickets = array(); // prevent infinite recursion
     
@@ -1444,16 +1446,16 @@
 		}
 		return true;
 	}]]></code>
-				</method>
-				<method id="ResolveFrom">
-					<comment><![CDATA[/**
+        </method>
+        <method id="ResolveFrom">
+          <comment><![CDATA[/**
 	 * Resolve the ticket from another resolved ticket
 	 * @return void
 	 */]]></comment>
-					<static>false</static>
-					<access>public</access>
-					<type>Internal</type>
-                    <code><![CDATA[	public function ResolveFrom($oParentTicket)
+          <static>false</static>
+          <access>public</access>
+          <type>Internal</type>
+          <code><![CDATA[	public function ResolveFrom($oParentTicket)
 	{
 		if ($this->Get('status') != 'resolved' && $this->Get('status') != 'closed' )
 		{
@@ -1482,13 +1484,13 @@
 			$this->ApplyStimulus('ev_autoresolve');
 			$this->DBUpdate();
 		}
-	}]]></code>	
-				</method>
-				<method id="UpdateChildRequestLog">
-					<static>false</static>
-					<access>public</access>
-					<type>LifecycleAction</type>
-					<code><![CDATA[	public function UpdateChildRequestLog()
+	}]]></code>
+        </method>
+        <method id="UpdateChildRequestLog">
+          <static>false</static>
+          <access>public</access>
+          <type>LifecycleAction</type>
+          <code><![CDATA[	public function UpdateChildRequestLog()
 	{
 		$oLog = $this->Get('public_log');
 		$sLogPublic = $oLog->GetModifiedEntry('html');
@@ -1528,12 +1530,12 @@
 		return true;
 
 	}]]></code>
-				</method>
-				<method id="ComputeImpactedItems">
-					<static>false</static>
-					<access>public</access>
-					<type>LifecycleAction</type>
-					<code><![CDATA[
+        </method>
+        <method id="ComputeImpactedItems">
+          <static>false</static>
+          <access>public</access>
+          <type>LifecycleAction</type>
+          <code><![CDATA[
     public function ComputeImpactedItems()
 	{
         // This method is kept for backward compatibility
@@ -1541,12 +1543,12 @@
         // UpdateImpactedItems directly
 		$this->UpdateImpactedItems();
 	}]]></code>
-				</method>
-				<method id="OnInsert">
-					<static>false</static>
-					<access>protected</access>
-					<type>Overload-DBObject</type>
-					<code><![CDATA[
+        </method>
+        <method id="OnInsert">
+          <static>false</static>
+          <access>protected</access>
+          <type>Overload-DBObject</type>
+          <code><![CDATA[
     protected function OnInsert()
 	{
 	  parent::OnInsert();
@@ -1554,12 +1556,12 @@
 		$this->SetIfNull('last_update', time());
 		$this->SetIfNull('start_date', time());
 	}]]></code>
-				</method>
-				<method id="OnUpdate">
-					<static>false</static>
-					<access>protected</access>
-					<type>Overload-DBObject</type>
-					<code><![CDATA[
+        </method>
+        <method id="OnUpdate">
+          <static>false</static>
+          <access>protected</access>
+          <type>Overload-DBObject</type>
+          <code><![CDATA[
     protected function OnUpdate()
 	{
         parent::OnUpdate();
@@ -1571,185 +1573,185 @@
 		$this->Set('last_update', time());
 		$this->UpdateChildRequestLog();
 	}]]></code>
-				</method>
-			</methods>
-			<presentation>
-				<details>
-					<items>
-						<item id="functionalcis_list">
-							<rank>10</rank>
-						</item>
-						<item id="contacts_list">
-							<rank>20</rank>
-						</item>
-						<item id="related_request_list">
-							<rank>30</rank>
-						</item>
-						<item id="workorders_list">
-							<rank>40</rank>
-						</item>
-						<item id="col:col1">
-							<rank>50</rank>
-							<items>
-								<item id="fieldset:Ticket:baseinfo">
-									<rank>10</rank>
-									<items>
-										<item id="org_id">
-											<rank>10</rank>
-										</item>
-										<item id="caller_id">
-											<rank>20</rank>
-										</item>
-										<item id="status">
-											<rank>30</rank>
-										</item>
-										<item id="origin">
-											<rank>40</rank>
-										</item>
-										<item id="title">
-											<rank>50</rank>
-										</item>
-										<item id="description">
-											<rank>60</rank>
-										</item>
-									</items>
-								</item>
-								<item id="fieldset:Ticket:moreinfo">
-									<rank>20</rank>
-									<items>
-										<item id="service_id">
-											<rank>10</rank>
-										</item>
-										<item id="servicesubcategory_id">
-											<rank>20</rank>
-										</item>
-										<item id="escalation_flag">
-											<rank>30</rank>
-										</item>
-										<item id="escalation_reason">
-											<rank>40</rank>
-										</item>
-										<item id="pending_reason">
-											<rank>50</rank>
-										</item>
-									</items>
-								</item>
-							</items>
-						</item>
-						<item id="col:col2">
-							<rank>60</rank>
-							<items>
-								<item id="fieldset:Ticket:Type">
-									<rank>10</rank>
-									<items>
-										<item id="request_type">
-											<rank>10</rank>
-										</item>
-										<item id="impact">
-											<rank>20</rank>
-										</item>
-										<item id="urgency">
-											<rank>30</rank>
-										</item>
-										<item id="priority">
-											<rank>40</rank>
-										</item>
-									</items>
-								</item>
-								<item id="fieldset:Ticket:contact">
-									<rank>20</rank>
-									<items>
-										<item id="team_id">
-											<rank>10</rank>
-										</item>
-										<item id="agent_id">
-											<rank>20</rank>
-										</item>
-										<item id="approver_id">
-											<rank>30</rank>
-										</item>
-									</items>
-								</item>
-								<item id="fieldset:Ticket:date">
-									<rank>30</rank>
-									<items>
-										<item id="start_date">
-											<rank>10</rank>
-										</item>
-										<item id="last_update">
-											<rank>20</rank>
-										</item>
-										<item id="assignment_date">
-											<rank>30</rank>
-										</item>
-										<item id="tto_escalation_deadline">
-											<rank>40</rank>
-										</item>
-										<item id="ttr_escalation_deadline">
-											<rank>50</rank>
-										</item>
-										<item id="last_pending_date">
-											<rank>60</rank>
-										</item>
-										<item id="resolution_date">
-											<rank>70</rank>
-										</item>
-										<item id="close_date">
-											<rank>80</rank>
-										</item>
-									</items>
-								</item>
-							</items>
-						</item>
-						<item id="col:col3">
-							<rank>70</rank>
-							<items>
-								<item id="fieldset:Ticket:relation">
-									<rank>10</rank>
-									<items>
-										<item id="parent_request_id">
-											<rank>10</rank>
-										</item>
-										<item id="parent_incident_id">
-											<rank>20</rank>
-										</item>
-										<item id="parent_problem_id">
-											<rank>30</rank>
-										</item>
-										<item id="parent_change_id">
-											<rank>40</rank>
-										</item>
-									</items>
-								</item>
-								<item id="fieldset:Ticket:resolution">
-									<rank>20</rank>
-									<items>
-										<item id="resolution_code">
-											<rank>10</rank>
-										</item>
-										<item id="solution">
-											<rank>20</rank>
-										</item>
-										<item id="time_spent">
-											<rank>30</rank>
-										</item>
-										<item id="user_satisfaction">
-											<rank>40</rank>
-										</item>
-										<item id="user_comment">
-											<rank>50</rank>
-										</item>
-									</items>
-								</item>
-								<item id="fieldset:Ticket:SLA">
-									<rank>30</rank>
-									<items>
-										<item id="sla_tto_passed">
-											<rank>10</rank>
-										</item>
-										<item id="sla_tto_over">
-											<rank>20</rank>
-										</item>
+        </method>
+      </methods>
+      <presentation>
+        <details>
+          <items>
+            <item id="functionalcis_list">
+              <rank>10</rank>
+            </item>
+            <item id="contacts_list">
+              <rank>20</rank>
+            </item>
+            <item id="related_request_list">
+              <rank>30</rank>
+            </item>
+            <item id="workorders_list">
+              <rank>40</rank>
+            </item>
+            <item id="col:col1">
+              <rank>50</rank>
+              <items>
+                <item id="fieldset:Ticket:baseinfo">
+                  <rank>10</rank>
+                  <items>
+                    <item id="org_id">
+                      <rank>10</rank>
+                    </item>
+                    <item id="caller_id">
+                      <rank>20</rank>
+                    </item>
+                    <item id="status">
+                      <rank>30</rank>
+                    </item>
+                    <item id="origin">
+                      <rank>40</rank>
+                    </item>
+                    <item id="title">
+                      <rank>50</rank>
+                    </item>
+                    <item id="description">
+                      <rank>60</rank>
+                    </item>
+                  </items>
+                </item>
+                <item id="fieldset:Ticket:moreinfo">
+                  <rank>20</rank>
+                  <items>
+                    <item id="service_id">
+                      <rank>10</rank>
+                    </item>
+                    <item id="servicesubcategory_id">
+                      <rank>20</rank>
+                    </item>
+                    <item id="escalation_flag">
+                      <rank>30</rank>
+                    </item>
+                    <item id="escalation_reason">
+                      <rank>40</rank>
+                    </item>
+                    <item id="pending_reason">
+                      <rank>50</rank>
+                    </item>
+                  </items>
+                </item>
+              </items>
+            </item>
+            <item id="col:col2">
+              <rank>60</rank>
+              <items>
+                <item id="fieldset:Ticket:Type">
+                  <rank>10</rank>
+                  <items>
+                    <item id="request_type">
+                      <rank>10</rank>
+                    </item>
+                    <item id="impact">
+                      <rank>20</rank>
+                    </item>
+                    <item id="urgency">
+                      <rank>30</rank>
+                    </item>
+                    <item id="priority">
+                      <rank>40</rank>
+                    </item>
+                  </items>
+                </item>
+                <item id="fieldset:Ticket:contact">
+                  <rank>20</rank>
+                  <items>
+                    <item id="team_id">
+                      <rank>10</rank>
+                    </item>
+                    <item id="agent_id">
+                      <rank>20</rank>
+                    </item>
+                    <item id="approver_id">
+                      <rank>30</rank>
+                    </item>
+                  </items>
+                </item>
+                <item id="fieldset:Ticket:date">
+                  <rank>30</rank>
+                  <items>
+                    <item id="start_date">
+                      <rank>10</rank>
+                    </item>
+                    <item id="last_update">
+                      <rank>20</rank>
+                    </item>
+                    <item id="assignment_date">
+                      <rank>30</rank>
+                    </item>
+                    <item id="tto_escalation_deadline">
+                      <rank>40</rank>
+                    </item>
+                    <item id="ttr_escalation_deadline">
+                      <rank>50</rank>
+                    </item>
+                    <item id="last_pending_date">
+                      <rank>60</rank>
+                    </item>
+                    <item id="resolution_date">
+                      <rank>70</rank>
+                    </item>
+                    <item id="close_date">
+                      <rank>80</rank>
+                    </item>
+                  </items>
+                </item>
+              </items>
+            </item>
+            <item id="col:col3">
+              <rank>70</rank>
+              <items>
+                <item id="fieldset:Ticket:relation">
+                  <rank>10</rank>
+                  <items>
+                    <item id="parent_request_id">
+                      <rank>10</rank>
+                    </item>
+                    <item id="parent_incident_id">
+                      <rank>20</rank>
+                    </item>
+                    <item id="parent_problem_id">
+                      <rank>30</rank>
+                    </item>
+                    <item id="parent_change_id">
+                      <rank>40</rank>
+                    </item>
+                  </items>
+                </item>
+                <item id="fieldset:Ticket:resolution">
+                  <rank>20</rank>
+                  <items>
+                    <item id="resolution_code">
+                      <rank>10</rank>
+                    </item>
+                    <item id="solution">
+                      <rank>20</rank>
+                    </item>
+                    <item id="time_spent">
+                      <rank>30</rank>
+                    </item>
+                    <item id="user_satisfaction">
+                      <rank>40</rank>
+                    </item>
+                    <item id="user_comment">
+                      <rank>50</rank>
+                    </item>
+                  </items>
+                </item>
+                <item id="fieldset:Ticket:SLA">
+                  <rank>30</rank>
+                  <items>
+                    <item id="sla_tto_passed">
+                      <rank>10</rank>
+                    </item>
+                    <item id="sla_tto_over">
+                      <rank>20</rank>
+                    </item>
                     <item id="sla_ttr_passed">
                       <rank>30</rank>
                     </item>
@@ -1767,334 +1769,334 @@
               <rank>110</rank>
             </item>
           </items>
-				</details>
-				<search>
-					<items>
-						<item id="ref">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="title">
-							<rank>30</rank>
-						</item>
-						<item id="description">
-							<rank>40</rank>
-						</item>
-						<item id="start_date">
-							<rank>50</rank>
-						</item>
-						<item id="resolution_date">
-							<rank>70</rank>
-						</item>
-						<item id="close_date">
-							<rank>80</rank>
-						</item>
-						<item id="status">
-							<rank>90</rank>
-						</item>
-						<item id="operational_status">
-							<rank>95</rank>
-						</item>
-						<item id="caller_id">
-							<rank>100</rank>
-						</item>
-						<item id="origin">
-							<rank>110</rank>
-						</item>
-						<item id="request_type">
-							<rank>120</rank>
-						</item>
-						<item id="impact">
-							<rank>130</rank>
-						</item>
-						<item id="urgency">
-							<rank>140</rank>
-						</item>
-						<item id="priority">
-							<rank>150</rank>
-						</item>
-						<item id="service_id">
-							<rank>160</rank>
-						</item>
-						<item id="servicesubcategory_id">
-							<rank>170</rank>
-						</item>
-						<item id="team_id">
-							<rank>180</rank>
-						</item>
-						<item id="agent_id">
-							<rank>190</rank>
-						</item>
-						<item id="escalation_flag">
-							<rank>200</rank>
-						</item>
-						<item id="resolution_code">
-							<rank>210</rank>
-						</item>
-						<item id="user_satisfaction">
-							<rank>220</rank>
-						</item>
-						<item id="sla_tto_passed">
-							<rank>230</rank>
-						</item>
-						<item id="sla_ttr_passed">
-							<rank>240</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="title">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="caller_id">
-							<rank>30</rank>
-						</item>
-						<item id="start_date">
-							<rank>40</rank>
-						</item>
-						<item id="status">
-							<rank>50</rank>
-						</item>
-						<item id="agent_id">
-							<rank>60</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-		</class>
-        <class id="Organization">
-            <fields>
-                <field id="overview" xsi:type="AttributeDashboard" _delta="if_exists">
-                    <definition>
-                        <cells>
-                            <cell id="9000" _delta="delete">
-                              <rank>5</rank>
-                              <dashlets>
-                                <dashlet id="0" xsi:type="DashletEmptyCell">
-                                  <rank>0</rank>
-                                </dashlet>
-                              </dashlets>
-                            </cell>
-							<cell id="1" _delta="define">
-								<rank>10</rank>
-								<dashlets>
-									<dashlet id="9" xsi:type="DashletHeaderDynamic">
-										<rank>0</rank>
-										<title>Organization:Overview:UserRequests</title>
-											<icon>itop-welcome-itil/images/user-request-deadline.svg</icon>
-										<subtitle>Menu:UserRequest:OpenRequests</subtitle>
-										<query>SELECT UserRequest WHERE status != "closed" AND org_id=:this-&gt;id</query>
-										<group_by>status</group_by>
-										<values>new,assigned,escalated_tto,escalated_ttr,resolved</values>
-									</dashlet>
-								</dashlets>
-							</cell>
-							<cell id="3" _delta="define">
-                              <rank>30</rank>
-                              <dashlets>
-                                <dashlet id="10" xsi:type="DashletObjectList">
-                                  <rank>0</rank>
-                                  <title>Organization:Overview:MyUserRequests</title>
-                                  <query>SELECT UserRequest AS i WHERE i.agent_id = :current_contact_id AND status NOT IN ("closed", "resolved")  AND org_id=:this-&gt;id</query>
-                                  <menu>true</menu>
-                                </dashlet>
-                                <dashlet id="13" xsi:type="DashletGroupByPie">
-                                  <rank>1</rank>
-                                  <title>Organization:Overview:Tickets</title>
-                                  <query>SELECT Ticket WHERE org_id = :this-&gt;id</query>
-                                  <group_by>finalclass</group_by>
-                                  <style>pie</style>
-                                  <aggregation_function>count</aggregation_function>
-                                  <aggregation_attribute/>
-                                  <limit/>
-                                  <order_by>attribute</order_by>
-                                  <order_direction>desc</order_direction>
-                                </dashlet>
-                              </dashlets>
-                            </cell>
-                        </cells>
-                    </definition>
-                </field>
-            </fields>
+        </details>
+        <search>
+          <items>
+            <item id="ref">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="title">
+              <rank>30</rank>
+            </item>
+            <item id="description">
+              <rank>40</rank>
+            </item>
+            <item id="start_date">
+              <rank>50</rank>
+            </item>
+            <item id="resolution_date">
+              <rank>70</rank>
+            </item>
+            <item id="close_date">
+              <rank>80</rank>
+            </item>
+            <item id="status">
+              <rank>90</rank>
+            </item>
+            <item id="operational_status">
+              <rank>95</rank>
+            </item>
+            <item id="caller_id">
+              <rank>100</rank>
+            </item>
+            <item id="origin">
+              <rank>110</rank>
+            </item>
+            <item id="request_type">
+              <rank>120</rank>
+            </item>
+            <item id="impact">
+              <rank>130</rank>
+            </item>
+            <item id="urgency">
+              <rank>140</rank>
+            </item>
+            <item id="priority">
+              <rank>150</rank>
+            </item>
+            <item id="service_id">
+              <rank>160</rank>
+            </item>
+            <item id="servicesubcategory_id">
+              <rank>170</rank>
+            </item>
+            <item id="team_id">
+              <rank>180</rank>
+            </item>
+            <item id="agent_id">
+              <rank>190</rank>
+            </item>
+            <item id="escalation_flag">
+              <rank>200</rank>
+            </item>
+            <item id="resolution_code">
+              <rank>210</rank>
+            </item>
+            <item id="user_satisfaction">
+              <rank>220</rank>
+            </item>
+            <item id="sla_tto_passed">
+              <rank>230</rank>
+            </item>
+            <item id="sla_ttr_passed">
+              <rank>240</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="title">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="caller_id">
+              <rank>30</rank>
+            </item>
+            <item id="start_date">
+              <rank>40</rank>
+            </item>
+            <item id="status">
+              <rank>50</rank>
+            </item>
+            <item id="agent_id">
+              <rank>60</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="Organization">
+      <fields>
+        <field id="overview" xsi:type="AttributeDashboard" _delta="if_exists">
+          <definition>
+            <cells>
+              <cell id="9000" _delta="delete">
+                <rank>5</rank>
+                <dashlets>
+                  <dashlet id="0" xsi:type="DashletEmptyCell">
+                    <rank>0</rank>
+                  </dashlet>
+                </dashlets>
+              </cell>
+              <cell id="1" _delta="define">
+                <rank>10</rank>
+                <dashlets>
+                  <dashlet id="9" xsi:type="DashletHeaderDynamic">
+                    <rank>0</rank>
+                    <title>Organization:Overview:UserRequests</title>
+                    <icon>itop-welcome-itil/images/user-request-deadline.svg</icon>
+                    <subtitle>Menu:UserRequest:OpenRequests</subtitle>
+                    <query>SELECT UserRequest WHERE status != "closed" AND org_id=:this-&gt;id</query>
+                    <group_by>status</group_by>
+                    <values>new,assigned,escalated_tto,escalated_ttr,resolved</values>
+                  </dashlet>
+                </dashlets>
+              </cell>
+              <cell id="3" _delta="define">
+                <rank>30</rank>
+                <dashlets>
+                  <dashlet id="10" xsi:type="DashletObjectList">
+                    <rank>0</rank>
+                    <title>Organization:Overview:MyUserRequests</title>
+                    <query>SELECT UserRequest AS i WHERE i.agent_id = :current_contact_id AND status NOT IN ("closed", "resolved")  AND org_id=:this-&gt;id</query>
+                    <menu>true</menu>
+                  </dashlet>
+                  <dashlet id="13" xsi:type="DashletGroupByPie">
+                    <rank>1</rank>
+                    <title>Organization:Overview:Tickets</title>
+                    <query>SELECT Ticket WHERE org_id = :this-&gt;id</query>
+                    <group_by>finalclass</group_by>
+                    <style>pie</style>
+                    <aggregation_function>count</aggregation_function>
+                    <aggregation_attribute/>
+                    <limit/>
+                    <order_by>attribute</order_by>
+                    <order_direction>desc</order_direction>
+                  </dashlet>
+                </dashlets>
+              </cell>
+            </cells>
+          </definition>
+        </field>
+      </fields>
+    </class>
+  </classes>
+  <menus>
+    <menu id="WelcomeMenuPage" xsi:type="DashboardMenuNode" _delta="must_exist">
+      <definition>
+        <cells>
+          <cell id="1" _delta="define">
+            <rank>1</rank>
+            <dashlets>
+              <dashlet id="11" xsi:type="DashletHeaderDynamic">
+                <rank>0</rank>
+                <title>Menu:RequestManagement</title>
+                <icon>itop-welcome-itil/images/user-request-deadline.svg</icon>
+                <subtitle>Menu:UserRequest:OpenRequests</subtitle>
+                <query>SELECT UserRequest WHERE status != "closed"</query>
+                <group_by>status</group_by>
+                <values>new,assigned,escalated_tto,escalated_ttr,resolved</values>
+              </dashlet>
+              <dashlet id="12" xsi:type="DashletObjectList">
+                <rank>1</rank>
+                <title>UI:WelcomeMenu:MyCalls</title>
+                <query>SELECT UserRequest AS i WHERE i.agent_id = :current_contact_id AND status NOT IN ("closed", "resolved")</query>
+                <menu>true</menu>
+              </dashlet>
+            </dashlets>
+          </cell>
+        </cells>
+      </definition>
+    </menu>
+    <menu id="RequestManagement" xsi:type="MenuGroup" _delta="define">
+      <rank>30</rank>
+      <enable_stimulus/>
+      <style>
+        <decoration_classes>fas fa-comment-alt</decoration_classes>
+      </style>
+    </menu>
+    <menu id="UserRequest:Overview" xsi:type="DashboardMenuNode" _delta="define">
+      <rank>0</rank>
+      <parent>RequestManagement</parent>
+      <definition>
+        <layout>DashboardLayoutTwoCols</layout>
+        <title>UI:RequestMgmtMenuOverview:Title</title>
+        <cells>
+          <cell id="0">
+            <rank>0</rank>
+            <dashlets>
+              <dashlet id="1" xsi:type="DashletGroupByPie">
+                <rank>0</rank>
+                <title>UI-RequestManagementOverview-RequestByType-last-14-days</title>
+                <query>SELECT UserRequest WHERE DATE_SUB(NOW(), INTERVAL 14 DAY) &lt; start_date</query>
+                <group_by>request_type</group_by>
+                <style>pie</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="1">
+            <rank>1</rank>
+            <dashlets>
+              <dashlet id="2" xsi:type="DashletGroupByBars">
+                <rank>0</rank>
+                <title>UI-RequestManagementOverview-Last-14-days</title>
+                <query>SELECT UserRequest WHERE DATE_SUB(NOW(), INTERVAL 14 DAY) &lt; start_date</query>
+                <group_by>start_date:day_of_month</group_by>
+                <style>bars</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="2">
+            <rank>2</rank>
+            <dashlets>
+              <dashlet id="3" xsi:type="DashletGroupByTable">
+                <rank>0</rank>
+                <title>UI-RequestManagementOverview-OpenRequestByStatus</title>
+                <query>SELECT UserRequest WHERE status NOT IN ('closed','rejected')</query>
+                <group_by>status</group_by>
+                <style>table</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="3">
+            <rank>3</rank>
+            <dashlets>
+              <dashlet id="4" xsi:type="DashletGroupByTable">
+                <rank>0</rank>
+                <title>UI-RequestManagementOverview-OpenRequestByAgent</title>
+                <query>SELECT UserRequest WHERE status NOT IN ('closed','rejected')</query>
+                <group_by>agent_id</group_by>
+                <style>table</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="4">
+            <rank>4</rank>
+            <dashlets>
+              <dashlet id="5" xsi:type="DashletGroupByTable">
+                <rank>0</rank>
+                <title>UI-RequestManagementOverview-OpenRequestByType</title>
+                <query>SELECT UserRequest WHERE status NOT IN ('closed','rejected')</query>
+                <group_by>finalclass</group_by>
+                <style>table</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="5">
+            <rank>5</rank>
+            <dashlets>
+              <dashlet id="6" xsi:type="DashletGroupByTable">
+                <rank>0</rank>
+                <title>UI-RequestManagementOverview-OpenRequestByCustomer</title>
+                <query>SELECT UserRequest WHERE status NOT IN ('closed','rejected')</query>
+                <group_by>org_id</group_by>
+                <style>table</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+        </cells>
+      </definition>
+    </menu>
+    <menu id="NewUserRequest" xsi:type="NewObjectMenuNode" _delta="define">
+      <rank>1</rank>
+      <parent>RequestManagement</parent>
+      <class>UserRequest</class>
+    </menu>
+    <menu id="SearchUserRequests" xsi:type="SearchMenuNode" _delta="define">
+      <rank>2</rank>
+      <parent>RequestManagement</parent>
+      <class>UserRequest</class>
+    </menu>
+    <menu id="UserRequest:Shortcuts" xsi:type="TemplateMenuNode" _delta="define">
+      <rank>3</rank>
+      <parent>RequestManagement</parent>
+      <template_file/>
+    </menu>
+    <menu id="UserRequest:MyRequests" xsi:type="OQLMenuNode" _delta="define">
+      <rank>0</rank>
+      <parent>UserRequest:Shortcuts</parent>
+      <oql><![CDATA[SELECT UserRequest WHERE agent_id = :current_contact_id AND status NOT IN ("closed","resolved")]]></oql>
+      <do_search/>
+      <auto_reload>fast</auto_reload>
+    </menu>
+    <menu id="UserRequest:EscalatedRequests" xsi:type="OQLMenuNode" _delta="define">
+      <rank>1</rank>
+      <parent>UserRequest:Shortcuts</parent>
+      <oql><![CDATA[SELECT UserRequest WHERE status IN ("escalated_tto", "escalated_ttr") OR escalation_flag="yes"]]></oql>
+      <do_search/>
+      <auto_reload>fast</auto_reload>
+    </menu>
+    <menu id="UserRequest:OpenRequests" xsi:type="OQLMenuNode" _delta="define">
+      <rank>2</rank>
+      <parent>UserRequest:Shortcuts</parent>
+      <oql><![CDATA[SELECT UserRequest WHERE status NOT IN ("closed")]]></oql>
+      <do_search>1</do_search>
+      <auto_reload>fast</auto_reload>
+    </menu>
+    <menu id="UserRequest:MySupportRequests" xsi:type="OQLMenuNode" _delta="define">
+      <rank>3</rank>
+      <parent>UserRequest:Shortcuts</parent>
+      <oql><![CDATA[SELECT UserRequest WHERE caller_id = :current_contact_id AND status NOT IN ("closed")]]></oql>
+      <do_search/>
+      <auto_reload>fast</auto_reload>
+    </menu>
+  </menus>
+  <module_designs>
+    <module_design id="itop-portal">
+      <classes>
+        <class id="ServiceSubcategory">
+          <scopes>
+            <scope id="all">
+              <oql_view _delta="redefine"><![CDATA[SELECT ServiceSubcategory WHERE status != 'obsolete' AND request_type = 'service_request']]></oql_view>
+            </scope>
+          </scopes>
         </class>
-	</classes>
-	<menus>
-		<menu id="WelcomeMenuPage" xsi:type="DashboardMenuNode" _delta="must_exist">
-			<definition>
-				<cells>
-					<cell id="1" _delta="define">
-						<rank>1</rank>
-						<dashlets>
-							<dashlet id="11" xsi:type="DashletHeaderDynamic">
-								<rank>0</rank>
-								<title>Menu:RequestManagement</title>
-									<icon>itop-welcome-itil/images/user-request-deadline.svg</icon>
-								<subtitle>Menu:UserRequest:OpenRequests</subtitle>
-								<query>SELECT UserRequest WHERE status != "closed"</query>
-								<group_by>status</group_by>
-								<values>new,assigned,escalated_tto,escalated_ttr,resolved</values>
-							</dashlet>
-							<dashlet id="12" xsi:type="DashletObjectList">
-								<rank>1</rank>
-								<title>UI:WelcomeMenu:MyCalls</title>
-								<query>SELECT UserRequest AS i WHERE i.agent_id = :current_contact_id AND status NOT IN ("closed", "resolved")</query>
-								<menu>true</menu>
-							</dashlet>
-						</dashlets>
-					</cell>
-				</cells>
-			</definition>
-		</menu>
-		<menu id="RequestManagement" xsi:type="MenuGroup" _delta="define">
-			<rank>30</rank>
-			<enable_stimulus/>
-	    <style>
-		    <decoration_classes>fas fa-comment-alt</decoration_classes>
-	    </style>
-		</menu>
-		<menu id="UserRequest:Overview" xsi:type="DashboardMenuNode" _delta="define">
-			<rank>0</rank>
-			<parent>RequestManagement</parent>
-			<definition>
-				<layout>DashboardLayoutTwoCols</layout>
-				<title>UI:RequestMgmtMenuOverview:Title</title>
-				<cells>
-					<cell id="0">
-						<rank>0</rank>
-						<dashlets>
-							<dashlet id="1" xsi:type="DashletGroupByPie">
-								<rank>0</rank>
-								<title>UI-RequestManagementOverview-RequestByType-last-14-days</title>
-								<query>SELECT UserRequest WHERE DATE_SUB(NOW(), INTERVAL 14 DAY) &lt; start_date</query>
-								<group_by>request_type</group_by>
-								<style>pie</style>
-							</dashlet>
-						</dashlets>
-					</cell>
-					<cell id="1">
-						<rank>1</rank>
-						<dashlets>
-							<dashlet id="2" xsi:type="DashletGroupByBars">
-								<rank>0</rank>
-								<title>UI-RequestManagementOverview-Last-14-days</title>
-								<query>SELECT UserRequest WHERE DATE_SUB(NOW(), INTERVAL 14 DAY) &lt; start_date</query>
-								<group_by>start_date:day_of_month</group_by>
-								<style>bars</style>
-							</dashlet>
-						</dashlets>
-					</cell>
-					<cell id="2">
-						<rank>2</rank>
-						<dashlets>
-							<dashlet id="3" xsi:type="DashletGroupByTable">
-								<rank>0</rank>
-								<title>UI-RequestManagementOverview-OpenRequestByStatus</title>
-								<query>SELECT UserRequest WHERE status NOT IN ('closed','rejected')</query>
-								<group_by>status</group_by>
-								<style>table</style>
-							</dashlet>
-						</dashlets>
-					</cell>
-					<cell id="3">
-						<rank>3</rank>
-						<dashlets>
-							<dashlet id="4" xsi:type="DashletGroupByTable">
-								<rank>0</rank>
-								<title>UI-RequestManagementOverview-OpenRequestByAgent</title>
-								<query>SELECT UserRequest WHERE status NOT IN ('closed','rejected')</query>
-								<group_by>agent_id</group_by>
-								<style>table</style>
-							</dashlet>
-						</dashlets>
-					</cell>
-					<cell id="4">
-						<rank>4</rank>
-						<dashlets>
-							<dashlet id="5" xsi:type="DashletGroupByTable">
-								<rank>0</rank>
-								<title>UI-RequestManagementOverview-OpenRequestByType</title>
-								<query>SELECT UserRequest WHERE status NOT IN ('closed','rejected')</query>
-								<group_by>finalclass</group_by>
-								<style>table</style>
-							</dashlet>
-						</dashlets>
-					</cell>
-					<cell id="5">
-						<rank>5</rank>
-						<dashlets>
-							<dashlet id="6" xsi:type="DashletGroupByTable">
-								<rank>0</rank>
-								<title>UI-RequestManagementOverview-OpenRequestByCustomer</title>
-								<query>SELECT UserRequest WHERE status NOT IN ('closed','rejected')</query>
-								<group_by>org_id</group_by>
-								<style>table</style>
-							</dashlet>
-						</dashlets>
-					</cell>
-				</cells>
-			</definition>
-		</menu>
-		<menu id="NewUserRequest" xsi:type="NewObjectMenuNode" _delta="define">
-			<rank>1</rank>
-			<parent>RequestManagement</parent>
-			<class>UserRequest</class>
-		</menu>
-		<menu id="SearchUserRequests" xsi:type="SearchMenuNode" _delta="define">
-			<rank>2</rank>
-			<parent>RequestManagement</parent>
-			<class>UserRequest</class>
-		</menu>
-		<menu id="UserRequest:Shortcuts" xsi:type="TemplateMenuNode" _delta="define">
-			<rank>3</rank>
-			<parent>RequestManagement</parent>
-			<template_file/>
-		</menu>
-		<menu id="UserRequest:MyRequests" xsi:type="OQLMenuNode" _delta="define">
-			<rank>0</rank>
-			<parent>UserRequest:Shortcuts</parent>
-			<oql><![CDATA[SELECT UserRequest WHERE agent_id = :current_contact_id AND status NOT IN ("closed","resolved")]]></oql>
-			<do_search/>
-			<auto_reload>fast</auto_reload>
-		</menu>
-		<menu id="UserRequest:EscalatedRequests" xsi:type="OQLMenuNode" _delta="define">
-			<rank>1</rank>
-			<parent>UserRequest:Shortcuts</parent>
-			<oql><![CDATA[SELECT UserRequest WHERE status IN ("escalated_tto", "escalated_ttr") OR escalation_flag="yes"]]></oql>
-			<do_search/>
-			<auto_reload>fast</auto_reload>
-		</menu>
-		<menu id="UserRequest:OpenRequests" xsi:type="OQLMenuNode" _delta="define">
-			<rank>2</rank>
-			<parent>UserRequest:Shortcuts</parent>
-			<oql><![CDATA[SELECT UserRequest WHERE status NOT IN ("closed")]]></oql>
-			<do_search>1</do_search>
-			<auto_reload>fast</auto_reload>
-		</menu>
-		<menu id="UserRequest:MySupportRequests" xsi:type="OQLMenuNode" _delta="define">
-			<rank>3</rank>
-			<parent>UserRequest:Shortcuts</parent>
-			<oql><![CDATA[SELECT UserRequest WHERE caller_id = :current_contact_id AND status NOT IN ("closed")]]></oql>
-			<do_search/>
-			<auto_reload>fast</auto_reload>
-		</menu>
-	</menus>
-	<module_designs>
-		<module_design id="itop-portal">
-			<classes>
-				<class id="ServiceSubcategory">
-					<scopes>
-						<scope id="all">
-							<oql_view _delta="redefine"><![CDATA[SELECT ServiceSubcategory WHERE status != 'obsolete' AND request_type = 'service_request']]></oql_view>
-						</scope>
-					</scopes>
-				</class>
-			</classes>
-		</module_design>
-	</module_designs>
+      </classes>
+    </module_design>
+  </module_designs>
 </itop_design>
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 7e5f1bbb2..576a5a2cc 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,1331 +1,1330 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
-    <classes>
-        <class id="UserRequest" _delta="define">
-            <parent>Ticket</parent>
-            <properties>
-                <comment><![CDATA[/**
+  <classes>
+    <class id="UserRequest" _delta="define">
+      <parent>Ticket</parent>
+      <properties>
+        <comment><![CDATA[/**
  * Persistent classes for a CMDB
  *
  * @copyright   Copyright (C) 2010-2021 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */]]></comment>
-                <category>bizmodel,searchable,requestmgmt</category>
-                <abstract>false</abstract>
-                <key_type>autoincrement</key_type>
-                <db_table>ticket_request</db_table>
-                <db_key_field>id</db_key_field>
-                <db_final_class_field/>
-                <naming>
-                    <attributes>
-                        <attribute id="ref"/>
-                    </attributes>
-                </naming>
-                <fields_semantic>
-                    <state_attribute>status</state_attribute>
-                </fields_semantic>
-                <style>
-                    <icon>images/user-request.svg</icon>
-                    <main_color>$ibo-color-blue-800</main_color>
-                </style>
-                <reconciliation>
-                    <attributes>
-                        <attribute id="ref"/>
-                    </attributes>
-                </reconciliation>
-                <order>
-                    <columns>
-                        <column id="ref" ascending="false"/>
-                    </columns>
-                </order>
-            </properties>
-            <fields>
-                <field id="status" xsi:type="AttributeEnum">
-                    <always_load_in_tables>true</always_load_in_tables>
-                    <values>
-                        <value id="new">
-                            <code>new</code>
-                            <style>
-                                <main_color>$ibo-lifecycle-new-state-primary-color</main_color>
-                                <complementary_color>$ibo-lifecycle-new-state-secondary-color</complementary_color>
-                                <decoration_classes/>
-                            </style>
-                        </value>
-                        <value id="waiting_for_approval">
-                            <code>waiting_for_approval</code>
-                            <style>
-                                <main_color>$ibo-lifecycle-waiting-state-primary-color</main_color>
-                                <complementary_color>$ibo-lifecycle-waiting-state-secondary-color</complementary_color>
-                                <decoration_classes>fas fa-hourglass-half</decoration_classes>
-                            </style>
-                        </value>
-                        <value id="approved">
-                            <code>approved</code>
-                            <style>
-                                <main_color>$ibo-lifecycle-success-state-primary-color</main_color>
-                                <complementary_color>$ibo-lifecycle-success-state-secondary-color</complementary_color>
-                                <decoration_classes>fas fa-user-check</decoration_classes>
-                            </style>
-                        </value>
-                        <value id="rejected">
-                            <code>rejected</code>
-                            <style>
-                                <main_color>$ibo-lifecycle-failure-state-primary-color</main_color>
-                              <complementary_color>$ibo-lifecycle-failure-state-secondary-color</complementary_color>
-                                <decoration_classes>fas fa-user-times</decoration_classes>
-                            </style>
-                        </value>
-                        <value id="assigned">
-                            <code>assigned</code>
-                            <style>
-                                <main_color>$ibo-lifecycle-neutral-state-primary-color</main_color>
-                                <complementary_color>$ibo-lifecycle-neutral-state-secondary-color</complementary_color>
-                                <decoration_classes/>
-                            </style>
-                        </value>
-                        <value id="pending">
-                            <code>pending</code>
-                            <style>
-                                <main_color>$ibo-lifecycle-waiting-state-primary-color</main_color>
-                                <complementary_color>$ibo-lifecycle-waiting-state-secondary-color</complementary_color>
-                                <decoration_classes>fas fa-hourglass-half</decoration_classes>
-                            </style>
-                        </value>
-                        <value id="escalated_tto">
-                            <code>escalated_tto</code>
-                            <style>
-                                <main_color>$ibo-lifecycle-failure-state-primary-color</main_color>
-                              <complementary_color>$ibo-lifecycle-failure-state-secondary-color</complementary_color>
-                                <decoration_classes>fas fa-fire</decoration_classes>
-                            </style>
-                        </value>
-                        <value id="escalated_ttr">
-                            <code>escalated_ttr</code>
-                            <style>
-                                <main_color>$ibo-lifecycle-failure-state-primary-color</main_color>
-                                <complementary_color>$ibo-lifecycle-failure-state-secondary-color</complementary_color>
-                                <decoration_classes>fas fa-fire</decoration_classes>
-                            </style>
-                        </value>
-                        <value id="resolved">
-                            <code>resolved</code>
-                            <style>
-                                <main_color>$ibo-lifecycle-success-state-primary-color</main_color>
-                                <complementary_color>$ibo-lifecycle-success-state-secondary-color</complementary_color>
-                                <decoration_classes>fas fa-check</decoration_classes>
-                            </style>
-                        </value>
-                        <value id="closed">
-                            <code>closed</code>
-                            <style>
-                                <main_color>$ibo-lifecycle-frozen-state-primary-color</main_color>
-                                <complementary_color>$ibo-lifecycle-frozen-state-secondary-color</complementary_color>
-                                <decoration_classes/>
-                            </style>
-                        </value>
-                    </values>
-                    <default_style>
-                        <main_color>$ibo-lifecycle-neutral-state-primary-color</main_color>
-                        <complementary_color>$ibo-lifecycle-neutral-state-secondary-color</complementary_color>
-                        <decoration_classes/>
-                    </default_style>
-                    <sql>status</sql>
-                    <default_value>new</default_value>
-                    <is_null_allowed>false</is_null_allowed>
-                </field>
-                <field id="request_type" xsi:type="AttributeEnum">
-                    <values>
-                        <value id="incident">
-                            <code>incident</code>
-                        </value>
-                        <value id="service_request">
-                            <code>service_request</code>
-                        </value>
-                    </values>
-                    <sql>request_type</sql>
-                    <default_value></default_value>
-                    <is_null_allowed>true</is_null_allowed>
-                    <display_style>list</display_style>
-                </field>
-                <field id="impact" xsi:type="AttributeEnum">
-                    <values>
-                        <value id="1">
-                            <code>1</code>
-                        </value>
-                        <value id="2">
-                            <code>2</code>
-                        </value>
-                        <value id="3">
-                            <code>3</code>
-                        </value>
-                    </values>
-                    <sql>impact</sql>
-                    <default_value>1</default_value>
-                    <is_null_allowed>false</is_null_allowed>
-                    <display_style>list</display_style>
-                </field>
-                <field id="priority" xsi:type="AttributeEnum">
-                    <values>
-                        <value id="1">
-                            <code>1</code>
-                            <style>
-                                <main_color>$ibo-color-danger-700</main_color>
-                                <complementary_color>$ibo-color-white-100</complementary_color>
-                                <decoration_classes>fas fa-fire</decoration_classes>
-                            </style>
-                        </value>
-                        <value id="2">
-                            <code>2</code>
-                            <style>
-                                <main_color>$ibo-color-warning-700</main_color>
-                                <complementary_color>$ibo-color-white-100</complementary_color>
-                                <decoration_classes/>
-                            </style>
-                        </value>
-                        <value id="3">
-                            <code>3</code>
-                            <style>
-                                <main_color>$ibo-color-information-700</main_color>
-                                <complementary_color>$ibo-color-white-100</complementary_color>
-                                <decoration_classes/>
-                            </style>
-                        </value>
-                        <value id="4">
-                            <code>4</code>
-                            <style>
-                                <main_color>$ibo-color-grey-700</main_color>
-                                <complementary_color>$ibo-color-white-100</complementary_color>
-                                <decoration_classes/>
-                            </style>
-                        </value>
-                    </values>
-                    <default_style>
-                        <main_color>$ibo-color-information-700</main_color>
-                        <complementary_color>$ibo-color-white-100</complementary_color>
-                        <decoration_classes/>
-                    </default_style>
-                    <dependencies>
-                        <attribute id="impact"/>
-                        <attribute id="urgency"/>
-                    </dependencies>
-                    <sql>priority</sql>
-                    <default_value>4</default_value>
-                    <is_null_allowed>false</is_null_allowed>
-                </field>
-                <field id="urgency" xsi:type="AttributeEnum">
-                    <values>
-                        <value id="1">
-                            <code>1</code>
-                        </value>
-                        <value id="2">
-                            <code>2</code>
-                        </value>
-                        <value id="3">
-                            <code>3</code>
-                        </value>
-                        <value id="4">
-                            <code>4</code>
-                        </value>
-                    </values>
-                    <sql>urgency</sql>
-                    <default_value>4</default_value>
-                    <is_null_allowed>false</is_null_allowed>
-                </field>
-                <field id="origin" xsi:type="AttributeEnum">
-                    <values>
-                        <value id="in_person">
-                            <code>in_person</code>
-                        </value>
-                        <value id="chat">
-                            <code>chat</code>
-                        </value>
-                        <value id="mail">
-                            <code>mail</code>
-                        </value>
-                        <value id="phone">
-                            <code>phone</code>
-                        </value>
-                        <value id="portal">
-                            <code>portal</code>
-                        </value>
-                        <value id="monitoring">
-                            <code>monitoring</code>
-                        </value>
-                    </values>
-                    <sql>origin</sql>
-                    <default_value>phone</default_value>
-                    <is_null_allowed>true</is_null_allowed>
-                </field>
-                <field id="approver_id" xsi:type="AttributeExternalKey">
-                    <filter><![CDATA[SELECT Person WHERE org_id= :this->org_id]]></filter>
-                    <dependencies>
-                        <attribute id="org_id"/>
-                    </dependencies>
-                    <sql>approver_id</sql>
-                    <target_class>Person</target_class>
-                    <is_null_allowed>true</is_null_allowed>
-                    <on_target_delete>DEL_MANUAL</on_target_delete>
-                    <allow_target_creation>false</allow_target_creation>
-                    <jointype/>
-                </field>
-                <field id="approver_email" xsi:type="AttributeExternalField">
-                    <extkey_attcode>approver_id</extkey_attcode>
-                    <target_attcode>email</target_attcode>
-                    <is_null_allowed>true</is_null_allowed>
-                </field>
-                <field id="service_id" xsi:type="AttributeExternalKey">
-                    <filter>
-                        <![CDATA[SELECT Service AS s JOIN lnkCustomerContractToService AS l1 ON l1.service_id=s.id JOIN CustomerContract AS cc ON l1.customercontract_id=cc.id WHERE cc.org_id = :this->org_id AND s.status != 'obsolete']]></filter>
-                    <dependencies>
-                        <attribute id="org_id"/>
-                    </dependencies>
-                    <sql>service_id</sql>
-                    <target_class>Service</target_class>
-                    <is_null_allowed>true</is_null_allowed>
-                    <on_target_delete>DEL_MANUAL</on_target_delete>
-                    <allow_target_creation>false</allow_target_creation>
-                    <jointype/>
-                </field>
-                <field id="service_name" xsi:type="AttributeExternalField">
-                    <extkey_attcode>service_id</extkey_attcode>
-                    <target_attcode>name</target_attcode>
-                    <is_null_allowed>true</is_null_allowed>
-                </field>
-                <field id="servicesubcategory_id" xsi:type="AttributeExternalKey">
-                    <filter>
-                        <![CDATA[SELECT ServiceSubcategory WHERE service_id = :this->service_id AND (ISNULL(:this->request_type) OR request_type = :this->request_type) AND status != 'obsolete']]></filter>
-                    <dependencies>
-                        <attribute id="service_id"/>
-                        <attribute id="request_type"/>
-                    </dependencies>
-                    <sql>servicesubcategory_id</sql>
-                    <target_class>ServiceSubcategory</target_class>
-                    <is_null_allowed>true</is_null_allowed>
-                    <on_target_delete>DEL_MANUAL</on_target_delete>
-                    <allow_target_creation>false</allow_target_creation>
-                    <jointype/>
-                </field>
-                <field id="servicesubcategory_name" xsi:type="AttributeExternalField">
-                    <extkey_attcode>servicesubcategory_id</extkey_attcode>
-                    <target_attcode>name</target_attcode>
-                    <is_null_allowed>true</is_null_allowed>
-                </field>
-                <field id="escalation_flag" xsi:type="AttributeEnum">
-                    <values>
-                        <value id="yes">
-                            <code>yes</code>
-                        </value>
-                        <value id="no">
-                            <code>no</code>
-                        </value>
-                    </values>
-                    <sql>escalation_flag</sql>
-                    <default_value>no</default_value>
-                    <is_null_allowed>true</is_null_allowed>
-                </field>
-                <field id="escalation_reason" xsi:type="AttributeString">
-                    <sql>escalation_reason</sql>
-                    <default_value/>
-                    <is_null_allowed>true</is_null_allowed>
-                </field>
-                <field id="assignment_date" xsi:type="AttributeDateTime">
-                    <sql>assignment_date</sql>
-                    <default_value/>
-                    <is_null_allowed>true</is_null_allowed>
-                </field>
-                <field id="resolution_date" xsi:type="AttributeDateTime">
-                    <sql>resolution_date</sql>
-                    <default_value/>
-                    <is_null_allowed>true</is_null_allowed>
-                </field>
-                <field id="last_pending_date" xsi:type="AttributeDateTime">
-                    <sql>last_pending_date</sql>
-                    <default_value/>
-                    <is_null_allowed>true</is_null_allowed>
-                </field>
-                <field id="cumulatedpending" xsi:type="AttributeStopWatch">
-                    <states>
-                        <state id="pending"/>
-                    </states>
-                    <working_time/>
-                    <thresholds/>
-                    <goal/>
-                </field>
-                <field id="tto" xsi:type="AttributeStopWatch">
-                    <always_load_in_tables>true</always_load_in_tables>
-                    <states>
-                        <state id="new"/>
-                        <state id="escalated_tto"/>
-                        <state id="approved"/>
-                    </states>
-                    <working_time/>
-                    <goal>ResponseTicketTTO</goal>
-                    <thresholds>
-                        <threshold id="75">
-                            <highlight>
-                                <code>warning</code>
-                                <persistent>false</persistent>
-                            </highlight>
-                            <actions>
+        <category>bizmodel,searchable,requestmgmt</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>ticket_request</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="ref"/>
+          </attributes>
+        </naming>
+        <fields_semantic>
+          <state_attribute>status</state_attribute>
+        </fields_semantic>
+        <style>
+          <icon>images/user-request.svg</icon>
+          <main_color>$ibo-color-blue-800</main_color>
+        </style>
+        <reconciliation>
+          <attributes>
+            <attribute id="ref"/>
+          </attributes>
+        </reconciliation>
+        <order>
+          <columns>
+            <column id="ref" ascending="false"/>
+          </columns>
+        </order>
+      </properties>
+      <fields>
+        <field id="status" xsi:type="AttributeEnum">
+          <always_load_in_tables>true</always_load_in_tables>
+          <values>
+            <value id="new">
+              <code>new</code>
+              <style>
+                <main_color>$ibo-lifecycle-new-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-new-state-secondary-color</complementary_color>
+                <decoration_classes/>
+              </style>
+            </value>
+            <value id="waiting_for_approval">
+              <code>waiting_for_approval</code>
+              <style>
+                <main_color>$ibo-lifecycle-waiting-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-waiting-state-secondary-color</complementary_color>
+                <decoration_classes>fas fa-hourglass-half</decoration_classes>
+              </style>
+            </value>
+            <value id="approved">
+              <code>approved</code>
+              <style>
+                <main_color>$ibo-lifecycle-success-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-success-state-secondary-color</complementary_color>
+                <decoration_classes>fas fa-user-check</decoration_classes>
+              </style>
+            </value>
+            <value id="rejected">
+              <code>rejected</code>
+              <style>
+                <main_color>$ibo-lifecycle-failure-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-failure-state-secondary-color</complementary_color>
+                <decoration_classes>fas fa-user-times</decoration_classes>
+              </style>
+            </value>
+            <value id="assigned">
+              <code>assigned</code>
+              <style>
+                <main_color>$ibo-lifecycle-neutral-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-neutral-state-secondary-color</complementary_color>
+                <decoration_classes/>
+              </style>
+            </value>
+            <value id="pending">
+              <code>pending</code>
+              <style>
+                <main_color>$ibo-lifecycle-waiting-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-waiting-state-secondary-color</complementary_color>
+                <decoration_classes>fas fa-hourglass-half</decoration_classes>
+              </style>
+            </value>
+            <value id="escalated_tto">
+              <code>escalated_tto</code>
+              <style>
+                <main_color>$ibo-lifecycle-failure-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-failure-state-secondary-color</complementary_color>
+                <decoration_classes>fas fa-fire</decoration_classes>
+              </style>
+            </value>
+            <value id="escalated_ttr">
+              <code>escalated_ttr</code>
+              <style>
+                <main_color>$ibo-lifecycle-failure-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-failure-state-secondary-color</complementary_color>
+                <decoration_classes>fas fa-fire</decoration_classes>
+              </style>
+            </value>
+            <value id="resolved">
+              <code>resolved</code>
+              <style>
+                <main_color>$ibo-lifecycle-success-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-success-state-secondary-color</complementary_color>
+                <decoration_classes>fas fa-check</decoration_classes>
+              </style>
+            </value>
+            <value id="closed">
+              <code>closed</code>
+              <style>
+                <main_color>$ibo-lifecycle-frozen-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-frozen-state-secondary-color</complementary_color>
+                <decoration_classes/>
+              </style>
+            </value>
+          </values>
+          <default_style>
+            <main_color>$ibo-lifecycle-neutral-state-primary-color</main_color>
+            <complementary_color>$ibo-lifecycle-neutral-state-secondary-color</complementary_color>
+            <decoration_classes/>
+          </default_style>
+          <sql>status</sql>
+          <default_value>new</default_value>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
+        <field id="request_type" xsi:type="AttributeEnum">
+          <values>
+            <value id="incident">
+              <code>incident</code>
+            </value>
+            <value id="service_request">
+              <code>service_request</code>
+            </value>
+          </values>
+          <sql>request_type</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+          <display_style>list</display_style>
+        </field>
+        <field id="impact" xsi:type="AttributeEnum">
+          <values>
+            <value id="1">
+              <code>1</code>
+            </value>
+            <value id="2">
+              <code>2</code>
+            </value>
+            <value id="3">
+              <code>3</code>
+            </value>
+          </values>
+          <sql>impact</sql>
+          <default_value>1</default_value>
+          <is_null_allowed>false</is_null_allowed>
+          <display_style>list</display_style>
+        </field>
+        <field id="priority" xsi:type="AttributeEnum">
+          <values>
+            <value id="1">
+              <code>1</code>
+              <style>
+                <main_color>$ibo-color-danger-700</main_color>
+                <complementary_color>$ibo-color-white-100</complementary_color>
+                <decoration_classes>fas fa-fire</decoration_classes>
+              </style>
+            </value>
+            <value id="2">
+              <code>2</code>
+              <style>
+                <main_color>$ibo-color-warning-700</main_color>
+                <complementary_color>$ibo-color-white-100</complementary_color>
+                <decoration_classes/>
+              </style>
+            </value>
+            <value id="3">
+              <code>3</code>
+              <style>
+                <main_color>$ibo-color-information-700</main_color>
+                <complementary_color>$ibo-color-white-100</complementary_color>
+                <decoration_classes/>
+              </style>
+            </value>
+            <value id="4">
+              <code>4</code>
+              <style>
+                <main_color>$ibo-color-grey-700</main_color>
+                <complementary_color>$ibo-color-white-100</complementary_color>
+                <decoration_classes/>
+              </style>
+            </value>
+          </values>
+          <default_style>
+            <main_color>$ibo-color-information-700</main_color>
+            <complementary_color>$ibo-color-white-100</complementary_color>
+            <decoration_classes/>
+          </default_style>
+          <dependencies>
+            <attribute id="impact"/>
+            <attribute id="urgency"/>
+          </dependencies>
+          <sql>priority</sql>
+          <default_value>4</default_value>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
+        <field id="urgency" xsi:type="AttributeEnum">
+          <values>
+            <value id="1">
+              <code>1</code>
+            </value>
+            <value id="2">
+              <code>2</code>
+            </value>
+            <value id="3">
+              <code>3</code>
+            </value>
+            <value id="4">
+              <code>4</code>
+            </value>
+          </values>
+          <sql>urgency</sql>
+          <default_value>4</default_value>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
+        <field id="origin" xsi:type="AttributeEnum">
+          <values>
+            <value id="in_person">
+              <code>in_person</code>
+            </value>
+            <value id="chat">
+              <code>chat</code>
+            </value>
+            <value id="mail">
+              <code>mail</code>
+            </value>
+            <value id="phone">
+              <code>phone</code>
+            </value>
+            <value id="portal">
+              <code>portal</code>
+            </value>
+            <value id="monitoring">
+              <code>monitoring</code>
+            </value>
+          </values>
+          <sql>origin</sql>
+          <default_value>phone</default_value>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="approver_id" xsi:type="AttributeExternalKey">
+          <filter><![CDATA[SELECT Person WHERE org_id= :this->org_id]]></filter>
+          <dependencies>
+            <attribute id="org_id"/>
+          </dependencies>
+          <sql>approver_id</sql>
+          <target_class>Person</target_class>
+          <is_null_allowed>true</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+          <allow_target_creation>false</allow_target_creation>
+          <jointype/>
+        </field>
+        <field id="approver_email" xsi:type="AttributeExternalField">
+          <extkey_attcode>approver_id</extkey_attcode>
+          <target_attcode>email</target_attcode>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="service_id" xsi:type="AttributeExternalKey">
+          <filter><![CDATA[SELECT Service AS s JOIN lnkCustomerContractToService AS l1 ON l1.service_id=s.id JOIN CustomerContract AS cc ON l1.customercontract_id=cc.id WHERE cc.org_id = :this->org_id AND s.status != 'obsolete']]></filter>
+          <dependencies>
+            <attribute id="org_id"/>
+          </dependencies>
+          <sql>service_id</sql>
+          <target_class>Service</target_class>
+          <is_null_allowed>true</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+          <allow_target_creation>false</allow_target_creation>
+          <jointype/>
+        </field>
+        <field id="service_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>service_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="servicesubcategory_id" xsi:type="AttributeExternalKey">
+          <filter><![CDATA[SELECT ServiceSubcategory WHERE service_id = :this->service_id AND (ISNULL(:this->request_type) OR request_type = :this->request_type) AND status != 'obsolete']]></filter>
+          <dependencies>
+            <attribute id="service_id"/>
+            <attribute id="request_type"/>
+          </dependencies>
+          <sql>servicesubcategory_id</sql>
+          <target_class>ServiceSubcategory</target_class>
+          <is_null_allowed>true</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+          <allow_target_creation>false</allow_target_creation>
+          <jointype/>
+        </field>
+        <field id="servicesubcategory_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>servicesubcategory_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="escalation_flag" xsi:type="AttributeEnum">
+          <values>
+            <value id="yes">
+              <code>yes</code>
+            </value>
+            <value id="no">
+              <code>no</code>
+            </value>
+          </values>
+          <sql>escalation_flag</sql>
+          <default_value>no</default_value>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="escalation_reason" xsi:type="AttributeString">
+          <sql>escalation_reason</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="assignment_date" xsi:type="AttributeDateTime">
+          <sql>assignment_date</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="resolution_date" xsi:type="AttributeDateTime">
+          <sql>resolution_date</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="last_pending_date" xsi:type="AttributeDateTime">
+          <sql>last_pending_date</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="cumulatedpending" xsi:type="AttributeStopWatch">
+          <states>
+            <state id="pending"/>
+          </states>
+          <working_time/>
+          <thresholds/>
+          <goal/>
+        </field>
+        <field id="tto" xsi:type="AttributeStopWatch">
+          <always_load_in_tables>true</always_load_in_tables>
+          <states>
+            <state id="new"/>
+            <state id="escalated_tto"/>
+            <state id="approved"/>
+          </states>
+          <working_time/>
+          <goal>ResponseTicketTTO</goal>
+          <thresholds>
+            <threshold id="75">
+              <highlight>
+                <code>warning</code>
+                <persistent>false</persistent>
+              </highlight>
+              <actions>
                             </actions>
-                        </threshold>
-                        <threshold id="100">
-                            <highlight>
-                                <code>critical</code>
-                                <persistent>false</persistent>
-                            </highlight>
-                            <actions>
-                                <action>
-                                    <verb>ApplyStimulus</verb>
-                                    <params>
-                                        <param>ev_timeout</param>
-                                    </params>
-                                </action>
+            </threshold>
+            <threshold id="100">
+              <highlight>
+                <code>critical</code>
+                <persistent>false</persistent>
+              </highlight>
+              <actions>
+                <action>
+                  <verb>ApplyStimulus</verb>
+                  <params>
+                    <param>ev_timeout</param>
+                  </params>
+                </action>
+              </actions>
+            </threshold>
+          </thresholds>
+        </field>
+        <field id="ttr" xsi:type="AttributeStopWatch">
+          <always_load_in_tables>true</always_load_in_tables>
+          <states>
+            <state id="new"/>
+            <state id="escalated_tto"/>
+            <state id="assigned"/>
+            <state id="approved"/>
+            <state id="escalated_ttr"/>
+          </states>
+          <working_time/>
+          <goal>ResponseTicketTTR</goal>
+          <thresholds>
+            <threshold id="75">
+              <highlight>
+                <code>warning</code>
+                <persistent>false</persistent>
+              </highlight>
+              <actions>
                             </actions>
-                        </threshold>
-                    </thresholds>
-                </field>
-                <field id="ttr" xsi:type="AttributeStopWatch">
-                    <always_load_in_tables>true</always_load_in_tables>
-                    <states>
-                        <state id="new"/>
-                        <state id="escalated_tto"/>
-                        <state id="assigned"/>
-                        <state id="approved"/>
-                        <state id="escalated_ttr"/>
-                    </states>
-                    <working_time/>
-                    <goal>ResponseTicketTTR</goal>
-                    <thresholds>
-                        <threshold id="75">
-                            <highlight>
-                                <code>warning</code>
-                                <persistent>false</persistent>
-                            </highlight>
-                            <actions>
-                            </actions>
-                        </threshold>
-                        <threshold id="100">
-                            <highlight>
-                                <code>critical</code>
-                                <persistent>false</persistent>
-                            </highlight>
-                            <actions>
-                                <action>
-                                    <verb>ApplyStimulus</verb>
-                                    <params>
-                                        <param>ev_timeout</param>
-                                    </params>
-                                </action>
-                            </actions>
-                        </threshold>
-                    </thresholds>
-                </field>
-                <field id="tto_escalation_deadline" xsi:type="AttributeSubItem">
-                    <target_attcode>tto</target_attcode>
-                    <item_code>100_deadline</item_code>
-                </field>
-                <field id="sla_tto_passed" xsi:type="AttributeSubItem">
-                    <target_attcode>tto</target_attcode>
-                    <item_code>100_passed</item_code>
-                </field>
-                <field id="sla_tto_over" xsi:type="AttributeSubItem">
-                    <target_attcode>tto</target_attcode>
-                    <item_code>100_overrun</item_code>
-                </field>
-                <field id="ttr_escalation_deadline" xsi:type="AttributeSubItem">
-                    <target_attcode>ttr</target_attcode>
-                    <item_code>100_deadline</item_code>
-                </field>
-                <field id="sla_ttr_passed" xsi:type="AttributeSubItem">
-                    <target_attcode>ttr</target_attcode>
-                    <item_code>100_passed</item_code>
-                </field>
-                <field id="sla_ttr_over" xsi:type="AttributeSubItem">
-                    <target_attcode>ttr</target_attcode>
-                    <item_code>100_overrun</item_code>
-                </field>
-                <field id="time_spent" xsi:type="AttributeDuration">
-                    <sql>time_spent</sql>
-                    <default_value/>
-                    <is_null_allowed>true</is_null_allowed>
-                </field>
-                <field id="resolution_code" xsi:type="AttributeEnum">
-                    <values>
-                        <value id="assistance">
-                            <code>assistance</code>
-                        </value>
-                        <value id="other">
-                            <code>other</code>
-                        </value>
-                        <value id="software patch">
-                            <code>software patch</code>
-                        </value>
-                        <value id="training">
-                            <code>training</code>
-                        </value>
-                        <value id="hardware repair">
-                            <code>hardware repair</code>
-                        </value>
-                        <value id="system update">
-                            <code>system update</code>
-                        </value>
-                        <value id="bug fixed">
-                            <code>bug fixed</code>
-                        </value>
-                    </values>
-                    <sql>resolution_code</sql>
-                    <default_value>assistance</default_value>
-                    <is_null_allowed>true</is_null_allowed>
-                </field>
-                <field id="solution" xsi:type="AttributeText">
-                    <sql>solution</sql>
-                    <default_value/>
-                    <is_null_allowed>true</is_null_allowed>
-                </field>
-                <field id="pending_reason" xsi:type="AttributeText">
-                    <sql>pending_reason</sql>
-                    <default_value/>
-                    <is_null_allowed>true</is_null_allowed>
-                </field>
-                <field id="parent_request_id" xsi:type="AttributeExternalKey">
-                    <filter>
-                        <![CDATA[SELECT UserRequest WHERE id != :this->id AND status NOT IN ('rejected','resolved','closed')]]></filter>
-                    <dependencies>
+            </threshold>
+            <threshold id="100">
+              <highlight>
+                <code>critical</code>
+                <persistent>false</persistent>
+              </highlight>
+              <actions>
+                <action>
+                  <verb>ApplyStimulus</verb>
+                  <params>
+                    <param>ev_timeout</param>
+                  </params>
+                </action>
+              </actions>
+            </threshold>
+          </thresholds>
+        </field>
+        <field id="tto_escalation_deadline" xsi:type="AttributeSubItem">
+          <target_attcode>tto</target_attcode>
+          <item_code>100_deadline</item_code>
+        </field>
+        <field id="sla_tto_passed" xsi:type="AttributeSubItem">
+          <target_attcode>tto</target_attcode>
+          <item_code>100_passed</item_code>
+        </field>
+        <field id="sla_tto_over" xsi:type="AttributeSubItem">
+          <target_attcode>tto</target_attcode>
+          <item_code>100_overrun</item_code>
+        </field>
+        <field id="ttr_escalation_deadline" xsi:type="AttributeSubItem">
+          <target_attcode>ttr</target_attcode>
+          <item_code>100_deadline</item_code>
+        </field>
+        <field id="sla_ttr_passed" xsi:type="AttributeSubItem">
+          <target_attcode>ttr</target_attcode>
+          <item_code>100_passed</item_code>
+        </field>
+        <field id="sla_ttr_over" xsi:type="AttributeSubItem">
+          <target_attcode>ttr</target_attcode>
+          <item_code>100_overrun</item_code>
+        </field>
+        <field id="time_spent" xsi:type="AttributeDuration">
+          <sql>time_spent</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="resolution_code" xsi:type="AttributeEnum">
+          <values>
+            <value id="assistance">
+              <code>assistance</code>
+            </value>
+            <value id="other">
+              <code>other</code>
+            </value>
+            <value id="software patch">
+              <code>software patch</code>
+            </value>
+            <value id="training">
+              <code>training</code>
+            </value>
+            <value id="hardware repair">
+              <code>hardware repair</code>
+            </value>
+            <value id="system update">
+              <code>system update</code>
+            </value>
+            <value id="bug fixed">
+              <code>bug fixed</code>
+            </value>
+          </values>
+          <sql>resolution_code</sql>
+          <default_value>assistance</default_value>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="solution" xsi:type="AttributeText">
+          <sql>solution</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="pending_reason" xsi:type="AttributeText">
+          <sql>pending_reason</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="parent_request_id" xsi:type="AttributeExternalKey">
+          <filter><![CDATA[SELECT UserRequest WHERE id != :this->id AND status NOT IN ('rejected','resolved','closed')]]></filter>
+          <dependencies>
                     </dependencies>
-                    <sql>parent_request_id</sql>
-                    <target_class>UserRequest</target_class>
-                    <is_null_allowed>true</is_null_allowed>
-                    <on_target_delete>DEL_MANUAL</on_target_delete>
-                    <jointype/>
-                </field>
-                <field id="parent_request_ref" xsi:type="AttributeExternalField">
-                    <extkey_attcode>parent_request_id</extkey_attcode>
-                    <target_attcode>ref</target_attcode>
-                    <is_null_allowed>true</is_null_allowed>
-                </field>
-                <field id="parent_problem_id" xsi:type="AttributeExternalKey">
-                    <sql>parent_problem_id</sql>
-                    <target_class>Problem</target_class>
-                    <is_null_allowed>true</is_null_allowed>
-                    <on_target_delete>DEL_MANUAL</on_target_delete>
-                    <jointype/>
-                </field>
-                <field id="parent_problem_ref" xsi:type="AttributeExternalField">
-                    <extkey_attcode>parent_problem_id</extkey_attcode>
-                    <target_attcode>ref</target_attcode>
-                    <is_null_allowed>true</is_null_allowed>
-                </field>
-                <field id="parent_change_id" xsi:type="AttributeExternalKey">
-                    <filter><![CDATA[SELECT Change WHERE status != "closed"]]></filter>
-                    <sql>parent_change_id</sql>
-                    <target_class>Change</target_class>
-                    <is_null_allowed>true</is_null_allowed>
-                    <on_target_delete>DEL_MANUAL</on_target_delete>
-                    <jointype/>
-                </field>
-                <field id="parent_change_ref" xsi:type="AttributeExternalField">
-                    <extkey_attcode>parent_change_id</extkey_attcode>
-                    <target_attcode>ref</target_attcode>
-                    <is_null_allowed>true</is_null_allowed>
-                </field>
-                <field id="related_request_list" xsi:type="AttributeLinkedSet">
-                    <linked_class>UserRequest</linked_class>
-                    <ext_key_to_me>parent_request_id</ext_key_to_me>
-                    <edit_mode>add_remove</edit_mode>
-                    <count_min>0</count_min>
-                    <count_max>0</count_max>
-                </field>
-                <field id="public_log" xsi:type="AttributeCaseLog">
-                    <sql>public_log</sql>
-                    <default_value/>
-                    <is_null_allowed>true</is_null_allowed>
-                </field>
-                <field id="user_satisfaction" xsi:type="AttributeEnum">
-                    <values>
-                        <value id="1">
-                            <code>1</code>
-                        </value>
-                        <value id="2">
-                            <code>2</code>
-                        </value>
-                        <value id="3">
-                            <code>3</code>
-                        </value>
-                        <value id="4">
-                            <code>4</code>
-                        </value>
-                    </values>
-                    <sql>user_satisfaction</sql>
-                    <default_value>1</default_value>
-                    <is_null_allowed>true</is_null_allowed>
-                </field>
-                <field id="user_comment" xsi:type="AttributeText">
-                    <sql>user_commment</sql>
-                    <default_value/>
-                    <is_null_allowed>true</is_null_allowed>
-                </field>
-            </fields>
-            <lifecycle>
-                <highlight_scale>
-                    <item id="warning">
-                        <rank>1</rank>
-                        <color>HIGHLIGHT_CLASS_WARNING</color>
-                            <icon>images/user-request-deadline.svg</icon>
-                    </item>
-                    <item id="critical">
-                        <rank>2</rank>
-                        <color>HIGHLIGHT_CLASS_CRITICAL</color>
-                            <icon>images/user-request-escalated.svg</icon>
-                    </item>
-                    <item id="closed">
-                        <rank>3</rank>
-                        <color>HIGHLIGHT_CLASS_NONE</color>
-                            <icon>images/user-request-closed.svg</icon>
-                    </item>
-                </highlight_scale>
-                <stimuli>
-                    <stimulus id="ev_assign" xsi:type="StimulusUserAction"/>
-                    <stimulus id="ev_reassign" xsi:type="StimulusUserAction"/>
-                    <stimulus id="ev_approve" xsi:type="StimulusUserAction"/>
-                    <stimulus id="ev_reject" xsi:type="StimulusUserAction"/>
-                    <stimulus id="ev_pending" xsi:type="StimulusUserAction"/>
-                    <stimulus id="ev_timeout" xsi:type="StimulusInternal"/>
-                    <stimulus id="ev_autoresolve" xsi:type="StimulusInternal"/>
-                    <stimulus id="ev_autoclose" xsi:type="StimulusInternal"/>
-                    <stimulus id="ev_resolve" xsi:type="StimulusUserAction"/>
-                    <stimulus id="ev_close" xsi:type="StimulusUserAction"/>
-                    <stimulus id="ev_reopen" xsi:type="StimulusUserAction"/>
-                    <stimulus id="ev_wait_for_approval" xsi:type="StimulusUserAction"/>
-                </stimuli>
-                <states>
-                    <state id="new">
-                        <flags>
-                            <attribute id="ref">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="org_id">
-                                <mandatory/>
-                            </attribute>
-                            <attribute id="caller_id">
-                                <mandatory/>
-                            </attribute>
-                            <attribute id="team_id">
-                                <hidden/>
-                            </attribute>
-                            <attribute id="priority">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="agent_id">
-                                <hidden/>
-                            </attribute>
-                            <attribute id="start_date">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="last_update">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="close_date">
-                                <hidden/>
-                            </attribute>
-                            <attribute id="approver_id">
-                                <hidden/>
-                            </attribute>
-                            <attribute id="escalation_flag">
-                                <hidden/>
-                            </attribute>
-                            <attribute id="escalation_reason">
-                                <hidden/>
-                            </attribute>
-                            <attribute id="assignment_date">
-                                <hidden/>
-                            </attribute>
-                            <attribute id="resolution_date">
-                                <hidden/>
-                            </attribute>
-                            <attribute id="last_pending_date">
-                                <hidden/>
-                            </attribute>
-                            <attribute id="time_spent">
-                                <hidden/>
-                            </attribute>
-                            <attribute id="resolution_code">
-                                <hidden/>
-                            </attribute>
-                            <attribute id="solution">
-                                <hidden/>
-                            </attribute>
-                            <attribute id="pending_reason">
-                                <hidden/>
-                            </attribute>
-                            <attribute id="user_satisfaction">
-                                <hidden/>
-                            </attribute>
-                            <attribute id="user_comment">
-                                <hidden/>
-                            </attribute>
-                            <attribute id="tto_escalation_deadline">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="sla_tto_passed">
-                                <hidden/>
-                            </attribute>
-                            <attribute id="sla_tto_over">
-                                <hidden/>
-                            </attribute>
-                            <attribute id="sla_ttr_passed">
-                                <hidden/>
-                            </attribute>
-                            <attribute id="ttr_escalation_deadline">
-                                <hidden/>
-                            </attribute>
-                            <attribute id="sla_ttr_over">
-                                <hidden/>
-                            </attribute>
-                        </flags>
-                        <transitions>
-                            <transition id="ev_assign">
-                                <target>assigned</target>
-                                <actions>
-                                    <action>
-                                        <verb>SetCurrentDate</verb>
-                                        <params>
-                                            <param xsi:type="attcode">assignment_date</param>
-                                        </params>
-                                    </action>
+          <sql>parent_request_id</sql>
+          <target_class>UserRequest</target_class>
+          <is_null_allowed>true</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+          <jointype/>
+        </field>
+        <field id="parent_request_ref" xsi:type="AttributeExternalField">
+          <extkey_attcode>parent_request_id</extkey_attcode>
+          <target_attcode>ref</target_attcode>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="parent_problem_id" xsi:type="AttributeExternalKey">
+          <sql>parent_problem_id</sql>
+          <target_class>Problem</target_class>
+          <is_null_allowed>true</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+          <jointype/>
+        </field>
+        <field id="parent_problem_ref" xsi:type="AttributeExternalField">
+          <extkey_attcode>parent_problem_id</extkey_attcode>
+          <target_attcode>ref</target_attcode>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="parent_change_id" xsi:type="AttributeExternalKey">
+          <filter><![CDATA[SELECT Change WHERE status != "closed"]]></filter>
+          <sql>parent_change_id</sql>
+          <target_class>Change</target_class>
+          <is_null_allowed>true</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+          <jointype/>
+        </field>
+        <field id="parent_change_ref" xsi:type="AttributeExternalField">
+          <extkey_attcode>parent_change_id</extkey_attcode>
+          <target_attcode>ref</target_attcode>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="related_request_list" xsi:type="AttributeLinkedSet">
+          <linked_class>UserRequest</linked_class>
+          <ext_key_to_me>parent_request_id</ext_key_to_me>
+          <legacy_edit_mode>add_remove</legacy_edit_mode>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <relation_type>link</relation_type>
+          <read_only>false</read_only>
+        </field>
+        <field id="public_log" xsi:type="AttributeCaseLog">
+          <sql>public_log</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="user_satisfaction" xsi:type="AttributeEnum">
+          <values>
+            <value id="1">
+              <code>1</code>
+            </value>
+            <value id="2">
+              <code>2</code>
+            </value>
+            <value id="3">
+              <code>3</code>
+            </value>
+            <value id="4">
+              <code>4</code>
+            </value>
+          </values>
+          <sql>user_satisfaction</sql>
+          <default_value>1</default_value>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="user_comment" xsi:type="AttributeText">
+          <sql>user_commment</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+      </fields>
+      <lifecycle>
+        <highlight_scale>
+          <item id="warning">
+            <rank>1</rank>
+            <color>HIGHLIGHT_CLASS_WARNING</color>
+            <icon>images/user-request-deadline.svg</icon>
+          </item>
+          <item id="critical">
+            <rank>2</rank>
+            <color>HIGHLIGHT_CLASS_CRITICAL</color>
+            <icon>images/user-request-escalated.svg</icon>
+          </item>
+          <item id="closed">
+            <rank>3</rank>
+            <color>HIGHLIGHT_CLASS_NONE</color>
+            <icon>images/user-request-closed.svg</icon>
+          </item>
+        </highlight_scale>
+        <stimuli>
+          <stimulus id="ev_assign" xsi:type="StimulusUserAction"/>
+          <stimulus id="ev_reassign" xsi:type="StimulusUserAction"/>
+          <stimulus id="ev_approve" xsi:type="StimulusUserAction"/>
+          <stimulus id="ev_reject" xsi:type="StimulusUserAction"/>
+          <stimulus id="ev_pending" xsi:type="StimulusUserAction"/>
+          <stimulus id="ev_timeout" xsi:type="StimulusInternal"/>
+          <stimulus id="ev_autoresolve" xsi:type="StimulusInternal"/>
+          <stimulus id="ev_autoclose" xsi:type="StimulusInternal"/>
+          <stimulus id="ev_resolve" xsi:type="StimulusUserAction"/>
+          <stimulus id="ev_close" xsi:type="StimulusUserAction"/>
+          <stimulus id="ev_reopen" xsi:type="StimulusUserAction"/>
+          <stimulus id="ev_wait_for_approval" xsi:type="StimulusUserAction"/>
+        </stimuli>
+        <states>
+          <state id="new">
+            <flags>
+              <attribute id="ref">
+                <read_only/>
+              </attribute>
+              <attribute id="org_id">
+                <mandatory/>
+              </attribute>
+              <attribute id="caller_id">
+                <mandatory/>
+              </attribute>
+              <attribute id="team_id">
+                <hidden/>
+              </attribute>
+              <attribute id="priority">
+                <read_only/>
+              </attribute>
+              <attribute id="agent_id">
+                <hidden/>
+              </attribute>
+              <attribute id="start_date">
+                <read_only/>
+              </attribute>
+              <attribute id="last_update">
+                <read_only/>
+              </attribute>
+              <attribute id="close_date">
+                <hidden/>
+              </attribute>
+              <attribute id="approver_id">
+                <hidden/>
+              </attribute>
+              <attribute id="escalation_flag">
+                <hidden/>
+              </attribute>
+              <attribute id="escalation_reason">
+                <hidden/>
+              </attribute>
+              <attribute id="assignment_date">
+                <hidden/>
+              </attribute>
+              <attribute id="resolution_date">
+                <hidden/>
+              </attribute>
+              <attribute id="last_pending_date">
+                <hidden/>
+              </attribute>
+              <attribute id="time_spent">
+                <hidden/>
+              </attribute>
+              <attribute id="resolution_code">
+                <hidden/>
+              </attribute>
+              <attribute id="solution">
+                <hidden/>
+              </attribute>
+              <attribute id="pending_reason">
+                <hidden/>
+              </attribute>
+              <attribute id="user_satisfaction">
+                <hidden/>
+              </attribute>
+              <attribute id="user_comment">
+                <hidden/>
+              </attribute>
+              <attribute id="tto_escalation_deadline">
+                <read_only/>
+              </attribute>
+              <attribute id="sla_tto_passed">
+                <hidden/>
+              </attribute>
+              <attribute id="sla_tto_over">
+                <hidden/>
+              </attribute>
+              <attribute id="sla_ttr_passed">
+                <hidden/>
+              </attribute>
+              <attribute id="ttr_escalation_deadline">
+                <hidden/>
+              </attribute>
+              <attribute id="sla_ttr_over">
+                <hidden/>
+              </attribute>
+            </flags>
+            <transitions>
+              <transition id="ev_assign">
+                <target>assigned</target>
+                <actions>
+                  <action>
+                    <verb>SetCurrentDate</verb>
+                    <params>
+                      <param xsi:type="attcode">assignment_date</param>
+                    </params>
+                  </action>
+                </actions>
+              </transition>
+              <transition id="ev_timeout">
+                <target>escalated_tto</target>
+                <actions/>
+              </transition>
+              <transition id="ev_wait_for_approval">
+                <target>waiting_for_approval</target>
+                <actions/>
+              </transition>
+              <transition id="ev_autoresolve">
+                <target>resolved</target>
+                <actions>
+                  <action>
+                    <verb>SetCurrentDate</verb>
+                    <params>
+                      <param xsi:type="attcode">resolution_date</param>
+                    </params>
+                  </action>
+                  <action>
+                    <verb>SetElapsedTime</verb>
+                    <params>
+                      <param xsi:type="attcode">time_spent</param>
+                      <param xsi:type="attcode">start_date</param>
+                      <param xsi:type="string">DefaultWorkingTimeComputer</param>
+                    </params>
+                  </action>
+                  <action>
+                    <verb>ResolveChildTickets</verb>
+                    <params/>
+                  </action>
+                </actions>
+              </transition>
+            </transitions>
+          </state>
+          <state id="escalated_tto">
+            <highlight>
+              <code>critical</code>
+            </highlight>
+            <inherit_flags_from>new</inherit_flags_from>
+            <flags>
+              <attribute id="team_id"/>
+            </flags>
+            <transitions>
+              <transition id="ev_assign">
+                <target>assigned</target>
+                <actions>
+                  <action>
+                    <verb>SetCurrentDate</verb>
+                    <params>
+                      <param xsi:type="attcode">assignment_date</param>
+                    </params>
+                  </action>
+                </actions>
+              </transition>
+            </transitions>
+          </state>
+          <state id="assigned">
+            <inherit_flags_from>new</inherit_flags_from>
+            <flags>
+              <attribute id="request_type">
+                <mandatory/>
+              </attribute>
+              <attribute id="team_id">
+                <mandatory/>
+                <must_prompt/>
+                <read_only/>
+              </attribute>
+              <attribute id="agent_id">
+                <mandatory/>
+                <must_prompt/>
+                <read_only/>
+              </attribute>
+              <attribute id="approver_id">
+                <read_only/>
+              </attribute>
+              <attribute id="assignment_date">
+                <read_only/>
+              </attribute>
+              <attribute id="tto_escalation_deadline">
+                <hidden/>
+              </attribute>
+              <attribute id="sla_tto_passed">
+                <read_only/>
+              </attribute>
+              <attribute id="sla_tto_over">
+                <read_only/>
+              </attribute>
+              <attribute id="ttr_escalation_deadline">
+                <read_only/>
+              </attribute>
+              <attribute id="caller_id"/>
+              <attribute id="escalation_flag"/>
+              <attribute id="escalation_reason"/>
+            </flags>
+            <transitions>
+              <transition id="ev_pending">
+                <target>pending</target>
+                <actions>
+                  <action>
+                    <verb>SetCurrentDate</verb>
+                    <params>
+                      <param xsi:type="attcode">last_pending_date</param>
+                    </params>
+                  </action>
+                </actions>
+              </transition>
+              <transition id="ev_resolve">
+                <target>resolved</target>
+                <actions>
+                  <action>
+                    <verb>SetCurrentDate</verb>
+                    <params>
+                      <param xsi:type="attcode">resolution_date</param>
+                    </params>
+                  </action>
+                  <action>
+                    <verb>SetElapsedTime</verb>
+                    <params>
+                      <param xsi:type="attcode">time_spent</param>
+                      <param xsi:type="attcode">start_date</param>
+                      <param xsi:type="string">DefaultWorkingTimeComputer</param>
+                    </params>
+                  </action>
+                  <action>
+                    <verb>ResolveChildTickets</verb>
+                    <params/>
+                  </action>
+                </actions>
+              </transition>
+              <transition id="ev_reassign">
+                <target>assigned</target>
+                <actions/>
+                <flags>
+                  <attribute id="agent_id">
+                    <must_change/>
+                  </attribute>
+                  <attribute id="team_id">
+                    <must_prompt/>
+                  </attribute>
+                </flags>
+              </transition>
+              <transition id="ev_timeout">
+                <target>escalated_ttr</target>
+                <actions/>
+              </transition>
+              <transition id="ev_autoresolve">
+                <target>resolved</target>
+                <actions>
+                  <action>
+                    <verb>SetCurrentDate</verb>
+                    <params>
+                      <param xsi:type="attcode">resolution_date</param>
+                    </params>
+                  </action>
+                  <action>
+                    <verb>SetElapsedTime</verb>
+                    <params>
+                      <param xsi:type="attcode">time_spent</param>
+                      <param xsi:type="attcode">start_date</param>
+                      <param xsi:type="string">DefaultWorkingTimeComputer</param>
+                    </params>
+                  </action>
+                  <action>
+                    <verb>ResolveChildTickets</verb>
+                    <params/>
+                  </action>
+                </actions>
+              </transition>
+            </transitions>
+          </state>
+          <state id="escalated_ttr">
+            <highlight>
+              <code>critical</code>
+            </highlight>
+            <inherit_flags_from>assigned</inherit_flags_from>
+            <flags/>
+            <transitions>
+              <transition id="ev_pending">
+                <target>pending</target>
+                <actions>
+                  <action>
+                    <verb>SetCurrentDate</verb>
+                    <params>
+                      <param xsi:type="attcode">last_pending_date</param>
+                    </params>
+                  </action>
+                </actions>
+              </transition>
+              <transition id="ev_resolve">
+                <target>resolved</target>
+                <actions>
+                  <action>
+                    <verb>SetCurrentDate</verb>
+                    <params>
+                      <param xsi:type="attcode">resolution_date</param>
+                    </params>
+                  </action>
+                  <action>
+                    <verb>SetElapsedTime</verb>
+                    <params>
+                      <param xsi:type="attcode">time_spent</param>
+                      <param xsi:type="attcode">start_date</param>
+                      <param xsi:type="string">DefaultWorkingTimeComputer</param>
+                    </params>
+                  </action>
+                  <action>
+                    <verb>ResolveChildTickets</verb>
+                    <params/>
+                  </action>
+                </actions>
+              </transition>
+              <transition id="ev_reassign">
+                <target>assigned</target>
+                <actions/>
+              </transition>
+              <transition id="ev_autoresolve">
+                <target>resolved</target>
+                <actions>
+                  <action>
+                    <verb>SetCurrentDate</verb>
+                    <params>
+                      <param xsi:type="attcode">resolution_date</param>
+                    </params>
+                  </action>
+                  <action>
+                    <verb>SetElapsedTime</verb>
+                    <params>
+                      <param xsi:type="attcode">time_spent</param>
+                      <param xsi:type="attcode">start_date</param>
+                      <param xsi:type="string">DefaultWorkingTimeComputer</param>
+                    </params>
+                  </action>
+                  <action>
+                    <verb>ResolveChildTickets</verb>
+                    <params/>
+                  </action>
+                </actions>
+              </transition>
+            </transitions>
+          </state>
+          <state id="waiting_for_approval">
+            <inherit_flags_from>new</inherit_flags_from>
+            <flags>
+              <attribute id="approver_id">
+                <must_prompt/>
+              </attribute>
+              <attribute id="team_id"/>
+            </flags>
+            <transitions>
+              <transition id="ev_approve">
+                <target>approved</target>
+                <actions/>
+              </transition>
+              <transition id="ev_reject">
+                <target>rejected</target>
+                <actions/>
+              </transition>
+            </transitions>
+          </state>
+          <state id="approved">
+            <inherit_flags_from>waiting_for_approval</inherit_flags_from>
+            <flags>
+              <attribute id="approver_id">
+                <read_only/>
+              </attribute>
+            </flags>
+            <transitions>
+              <transition id="ev_timeout">
+                <target>escalated_tto</target>
+                <actions/>
+              </transition>
+              <transition id="ev_assign">
+                <target>assigned</target>
+                <actions>
+                  <action>
+                    <verb>SetCurrentDate</verb>
+                    <params>
+                      <param xsi:type="attcode">assignment_date</param>
+                    </params>
+                  </action>
+                </actions>
+              </transition>
+              <transition id="ev_autoresolve">
+                <target>resolved</target>
+                <actions>
+                  <action>
+                    <verb>SetCurrentDate</verb>
+                    <params>
+                      <param xsi:type="attcode">resolution_date</param>
+                    </params>
+                  </action>
+                  <action>
+                    <verb>SetElapsedTime</verb>
+                    <params>
+                      <param xsi:type="attcode">time_spent</param>
+                      <param xsi:type="attcode">start_date</param>
+                      <param xsi:type="string">DefaultWorkingTimeComputer</param>
+                    </params>
+                  </action>
+                  <action>
+                    <verb>ResolveChildTickets</verb>
+                    <params/>
+                  </action>
+                </actions>
+              </transition>
+            </transitions>
+          </state>
+          <state id="rejected">
+            <inherit_flags_from>new</inherit_flags_from>
+            <flags>
+              <attribute id="tto_escalation_deadline">
+                <hidden/>
+              </attribute>
+              <attribute id="team_id"/>
+            </flags>
+            <transitions>
+              <transition id="ev_reopen">
+                <target>new</target>
+                <actions/>
+              </transition>
+            </transitions>
+          </state>
+          <state id="pending">
+            <inherit_flags_from>assigned</inherit_flags_from>
+            <flags>
+              <attribute id="last_pending_date">
+                <read_only/>
+              </attribute>
+              <attribute id="pending_reason">
+                <mandatory/>
+                <must_prompt/>
+              </attribute>
+              <attribute id="ttr_escalation_deadline">
+                <hidden/>
+              </attribute>
+            </flags>
+            <transitions>
+              <transition id="ev_assign">
+                <target>assigned</target>
+                <actions>
                                 </actions>
-                            </transition>
-                            <transition id="ev_timeout">
-                                <target>escalated_tto</target>
-                                <actions/>
-                            </transition>
-                            <transition id="ev_wait_for_approval">
-                                <target>waiting_for_approval</target>
-                                <actions/>
-                            </transition>
-                            <transition id="ev_autoresolve">
-                                <target>resolved</target>
-                                <actions>
-                                    <action>
-                                        <verb>SetCurrentDate</verb>
-                                        <params>
-                                            <param xsi:type="attcode">resolution_date</param>
-                                        </params>
-                                    </action>
-                                    <action>
-                                        <verb>SetElapsedTime</verb>
-                                        <params>
-                                            <param xsi:type="attcode">time_spent</param>
-                                            <param xsi:type="attcode">start_date</param>
-                                            <param xsi:type="string">DefaultWorkingTimeComputer</param>
-                                        </params>
-                                    </action>
-                                    <action>
-                                        <verb>ResolveChildTickets</verb>
-                                        <params/>
-                                    </action>
+              </transition>
+              <transition id="ev_autoresolve">
+                <target>resolved</target>
+                <actions>
+                  <action>
+                    <verb>SetCurrentDate</verb>
+                    <params>
+                      <param xsi:type="attcode">resolution_date</param>
+                    </params>
+                  </action>
+                  <action>
+                    <verb>SetElapsedTime</verb>
+                    <params>
+                      <param xsi:type="attcode">time_spent</param>
+                      <param xsi:type="attcode">start_date</param>
+                      <param xsi:type="string">DefaultWorkingTimeComputer</param>
+                    </params>
+                  </action>
+                  <action>
+                    <verb>ResolveChildTickets</verb>
+                    <params/>
+                  </action>
+                </actions>
+              </transition>
+            </transitions>
+          </state>
+          <state id="resolved">
+            <highlight>
+              <code>closed</code>
+            </highlight>
+            <inherit_flags_from>assigned</inherit_flags_from>
+            <flags>
+              <attribute id="caller_id">
+                <read_only/>
+              </attribute>
+              <attribute id="origin">
+                <read_only/>
+              </attribute>
+              <attribute id="impact">
+                <read_only/>
+              </attribute>
+              <attribute id="urgency">
+                <read_only/>
+              </attribute>
+              <attribute id="service_id">
+                <mandatory/>
+                <must_prompt/>
+              </attribute>
+              <attribute id="servicesubcategory_id">
+                <must_prompt/>
+              </attribute>
+              <attribute id="escalation_flag">
+                <read_only/>
+              </attribute>
+              <attribute id="escalation_reason">
+                <read_only/>
+              </attribute>
+              <attribute id="parent_request_id">
+                <read_only/>
+              </attribute>
+              <attribute id="parent_change_id">
+                <read_only/>
+              </attribute>
+              <attribute id="parent_problem_id">
+                <read_only/>
+              </attribute>
+              <attribute id="title">
+                <read_only/>
+              </attribute>
+              <attribute id="description">
+                <read_only/>
+              </attribute>
+              <attribute id="org_id">
+                <read_only/>
+              </attribute>
+              <attribute id="team_id">
+                <read_only/>
+              </attribute>
+              <attribute id="agent_id">
+                <read_only/>
+              </attribute>
+              <attribute id="request_type">
+                <read_only/>
+              </attribute>
+              <attribute id="resolution_date">
+                <read_only/>
+              </attribute>
+              <attribute id="time_spent">
+                <read_only/>
+              </attribute>
+              <attribute id="resolution_code">
+                <mandatory/>
+                <must_prompt/>
+              </attribute>
+              <attribute id="solution">
+                <mandatory/>
+                <must_prompt/>
+              </attribute>
+              <attribute id="pending_reason">
+                <read_only/>
+              </attribute>
+              <attribute id="sla_ttr_passed">
+                <read_only/>
+              </attribute>
+              <attribute id="ttr_escalation_deadline">
+                <hidden/>
+              </attribute>
+              <attribute id="sla_ttr_over">
+                <read_only/>
+              </attribute>
+            </flags>
+            <transitions>
+              <transition id="ev_close">
+                <target>closed</target>
+                <actions>
+                  <action>
+                    <verb>SetCurrentDate</verb>
+                    <params>
+                      <param xsi:type="attcode">close_date</param>
+                    </params>
+                  </action>
+                </actions>
+              </transition>
+              <transition id="ev_reopen">
+                <target>assigned</target>
+                <actions>
                                 </actions>
-                            </transition>
-                        </transitions>
-                    </state>
-                    <state id="escalated_tto">
-                        <highlight>
-                            <code>critical</code>
-                        </highlight>
-                        <inherit_flags_from>new</inherit_flags_from>
-                        <flags>
-                            <attribute id="team_id"/>
-                        </flags>
-                        <transitions>
-                            <transition id="ev_assign">
-                                <target>assigned</target>
-                                <actions>
-                                    <action>
-                                        <verb>SetCurrentDate</verb>
-                                        <params>
-                                            <param xsi:type="attcode">assignment_date</param>
-                                        </params>
-                                    </action>
-                                </actions>
-                            </transition>
-                        </transitions>
-                    </state>
-                    <state id="assigned">
-                        <inherit_flags_from>new</inherit_flags_from>
-                        <flags>
-                            <attribute id="request_type">
-                                <mandatory/>
-                            </attribute>
-                            <attribute id="team_id">
-                                <mandatory/>
-                                <must_prompt/>
-                                <read_only/>
-                            </attribute>
-                            <attribute id="agent_id">
-                                <mandatory/>
-                                <must_prompt/>
-                                <read_only/>
-                            </attribute>
-                            <attribute id="approver_id">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="assignment_date">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="tto_escalation_deadline">
-                                <hidden/>
-                            </attribute>
-                            <attribute id="sla_tto_passed">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="sla_tto_over">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="ttr_escalation_deadline">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="caller_id"/>
-                            <attribute id="escalation_flag"/>
-                            <attribute id="escalation_reason"/>
-                        </flags>
-                        <transitions>
-                            <transition id="ev_pending">
-                                <target>pending</target>
-                                <actions>
-                                    <action>
-                                        <verb>SetCurrentDate</verb>
-                                        <params>
-                                            <param xsi:type="attcode">last_pending_date</param>
-                                        </params>
-                                    </action>
-                                </actions>
-                            </transition>
-                            <transition id="ev_resolve">
-                                <target>resolved</target>
-                                <actions>
-                                    <action>
-                                        <verb>SetCurrentDate</verb>
-                                        <params>
-                                            <param xsi:type="attcode">resolution_date</param>
-                                        </params>
-                                    </action>
-                                    <action>
-                                        <verb>SetElapsedTime</verb>
-                                        <params>
-                                            <param xsi:type="attcode">time_spent</param>
-                                            <param xsi:type="attcode">start_date</param>
-                                            <param xsi:type="string">DefaultWorkingTimeComputer</param>
-                                        </params>
-                                    </action>
-                                    <action>
-                                        <verb>ResolveChildTickets</verb>
-                                        <params/>
-                                    </action>
-                                </actions>
-                            </transition>
-                            <transition id="ev_reassign">
-                                <target>assigned</target>
-                                <actions/>
-                                <flags>
-                                    <attribute id="agent_id">
-                                        <must_change/>
-                                    </attribute>
-                                    <attribute id="team_id">
-                                        <must_prompt/>
-                                    </attribute>
-                                </flags>
-                            </transition>
-                            <transition id="ev_timeout">
-                                <target>escalated_ttr</target>
-                                <actions/>
-                            </transition>
-                            <transition id="ev_autoresolve">
-                                <target>resolved</target>
-                                <actions>
-                                    <action>
-                                        <verb>SetCurrentDate</verb>
-                                        <params>
-                                            <param xsi:type="attcode">resolution_date</param>
-                                        </params>
-                                    </action>
-                                    <action>
-                                        <verb>SetElapsedTime</verb>
-                                        <params>
-                                            <param xsi:type="attcode">time_spent</param>
-                                            <param xsi:type="attcode">start_date</param>
-                                            <param xsi:type="string">DefaultWorkingTimeComputer</param>
-                                        </params>
-                                    </action>
-                                    <action>
-                                        <verb>ResolveChildTickets</verb>
-                                        <params/>
-                                    </action>
-                                </actions>
-                            </transition>
-                        </transitions>
-                    </state>
-                    <state id="escalated_ttr">
-                        <highlight>
-                            <code>critical</code>
-                        </highlight>
-                        <inherit_flags_from>assigned</inherit_flags_from>
-                        <flags/>
-                        <transitions>
-                            <transition id="ev_pending">
-                                <target>pending</target>
-                                <actions>
-                                    <action>
-                                        <verb>SetCurrentDate</verb>
-                                        <params>
-                                            <param xsi:type="attcode">last_pending_date</param>
-                                        </params>
-                                    </action>
-                                </actions>
-                            </transition>
-                            <transition id="ev_resolve">
-                                <target>resolved</target>
-                                <actions>
-                                    <action>
-                                        <verb>SetCurrentDate</verb>
-                                        <params>
-                                            <param xsi:type="attcode">resolution_date</param>
-                                        </params>
-                                    </action>
-                                    <action>
-                                        <verb>SetElapsedTime</verb>
-                                        <params>
-                                            <param xsi:type="attcode">time_spent</param>
-                                            <param xsi:type="attcode">start_date</param>
-                                            <param xsi:type="string">DefaultWorkingTimeComputer</param>
-                                        </params>
-                                    </action>
-                                    <action>
-                                        <verb>ResolveChildTickets</verb>
-                                        <params/>
-                                    </action>
-                                </actions>
-                            </transition>
-                            <transition id="ev_reassign">
-                                <target>assigned</target>
-                                <actions/>
-                            </transition>
-                            <transition id="ev_autoresolve">
-                                <target>resolved</target>
-                                <actions>
-                                    <action>
-                                        <verb>SetCurrentDate</verb>
-                                        <params>
-                                            <param xsi:type="attcode">resolution_date</param>
-                                        </params>
-                                    </action>
-                                    <action>
-                                        <verb>SetElapsedTime</verb>
-                                        <params>
-                                            <param xsi:type="attcode">time_spent</param>
-                                            <param xsi:type="attcode">start_date</param>
-                                            <param xsi:type="string">DefaultWorkingTimeComputer</param>
-                                        </params>
-                                    </action>
-                                    <action>
-                                        <verb>ResolveChildTickets</verb>
-                                        <params/>
-                                    </action>
-                                </actions>
-                            </transition>
-                        </transitions>
-                    </state>
-                    <state id="waiting_for_approval">
-                        <inherit_flags_from>new</inherit_flags_from>
-                        <flags>
-                            <attribute id="approver_id">
-                                <must_prompt/>
-                            </attribute>
-                            <attribute id="team_id"/>
-                        </flags>
-                        <transitions>
-                            <transition id="ev_approve">
-                                <target>approved</target>
-                                <actions/>
-                            </transition>
-                            <transition id="ev_reject">
-                                <target>rejected</target>
-                                <actions/>
-                            </transition>
-                        </transitions>
-                    </state>
-                    <state id="approved">
-                        <inherit_flags_from>waiting_for_approval</inherit_flags_from>
-                        <flags>
-                            <attribute id="approver_id">
-                                <read_only/>
-                            </attribute>
-                        </flags>
-                        <transitions>
-                            <transition id="ev_timeout">
-                                <target>escalated_tto</target>
-                                <actions/>
-                            </transition>
-                            <transition id="ev_assign">
-                                <target>assigned</target>
-                                <actions>
-                                    <action>
-                                        <verb>SetCurrentDate</verb>
-                                        <params>
-                                            <param xsi:type="attcode">assignment_date</param>
-                                        </params>
-                                    </action>
-                                </actions>
-                            </transition>
-                            <transition id="ev_autoresolve">
-                                <target>resolved</target>
-                                <actions>
-                                    <action>
-                                        <verb>SetCurrentDate</verb>
-                                        <params>
-                                            <param xsi:type="attcode">resolution_date</param>
-                                        </params>
-                                    </action>
-                                    <action>
-                                        <verb>SetElapsedTime</verb>
-                                        <params>
-                                            <param xsi:type="attcode">time_spent</param>
-                                            <param xsi:type="attcode">start_date</param>
-                                            <param xsi:type="string">DefaultWorkingTimeComputer</param>
-                                        </params>
-                                    </action>
-                                    <action>
-                                        <verb>ResolveChildTickets</verb>
-                                        <params/>
-                                    </action>
-                                </actions>
-                            </transition>
-                        </transitions>
-                    </state>
-                    <state id="rejected">
-                        <inherit_flags_from>new</inherit_flags_from>
-                        <flags>
-                            <attribute id="tto_escalation_deadline">
-                                <hidden/>
-                            </attribute>
-                            <attribute id="team_id"/>
-                        </flags>
-                        <transitions>
-                            <transition id="ev_reopen">
-                                <target>new</target>
-                                <actions/>
-                            </transition>
-                        </transitions>
-                    </state>
-                    <state id="pending">
-                        <inherit_flags_from>assigned</inherit_flags_from>
-                        <flags>
-                            <attribute id="last_pending_date">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="pending_reason">
-                                <mandatory/>
-                                <must_prompt/>
-                            </attribute>
-                            <attribute id="ttr_escalation_deadline">
-                                <hidden/>
-                            </attribute>
-                        </flags>
-                        <transitions>
-                            <transition id="ev_assign">
-                                <target>assigned</target>
-                                <actions>
-                                </actions>
-                            </transition>
-                            <transition id="ev_autoresolve">
-                                <target>resolved</target>
-                                <actions>
-                                    <action>
-                                        <verb>SetCurrentDate</verb>
-                                        <params>
-                                            <param xsi:type="attcode">resolution_date</param>
-                                        </params>
-                                    </action>
-                                    <action>
-                                        <verb>SetElapsedTime</verb>
-                                        <params>
-                                            <param xsi:type="attcode">time_spent</param>
-                                            <param xsi:type="attcode">start_date</param>
-                                            <param xsi:type="string">DefaultWorkingTimeComputer</param>
-                                        </params>
-                                    </action>
-                                    <action>
-                                        <verb>ResolveChildTickets</verb>
-                                        <params/>
-                                    </action>
-                                </actions>
-                            </transition>
-                        </transitions>
-                    </state>
-                    <state id="resolved">
-                        <highlight>
-                            <code>closed</code>
-                        </highlight>
-                        <inherit_flags_from>assigned</inherit_flags_from>
-                        <flags>
-                            <attribute id="caller_id">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="origin">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="impact">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="urgency">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="service_id">
-                                <mandatory/>
-                                <must_prompt/>
-                            </attribute>
-                            <attribute id="servicesubcategory_id">
-                                <must_prompt/>
-                            </attribute>
-                            <attribute id="escalation_flag">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="escalation_reason">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="parent_request_id">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="parent_change_id">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="parent_problem_id">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="title">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="description">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="org_id">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="team_id">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="agent_id">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="request_type">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="resolution_date">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="time_spent">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="resolution_code">
-                                <mandatory/>
-                                <must_prompt/>
-                            </attribute>
-                            <attribute id="solution">
-                                <mandatory/>
-                                <must_prompt/>
-                            </attribute>
-                            <attribute id="pending_reason">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="sla_ttr_passed">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="ttr_escalation_deadline">
-                                <hidden/>
-                            </attribute>
-                            <attribute id="sla_ttr_over">
-                                <read_only/>
-                            </attribute>
-                        </flags>
-                        <transitions>
-                            <transition id="ev_close">
-                                <target>closed</target>
-                                <actions>
-                                    <action>
-                                        <verb>SetCurrentDate</verb>
-                                        <params>
-                                            <param xsi:type="attcode">close_date</param>
-                                        </params>
-                                    </action>
-                                </actions>
-                            </transition>
-                            <transition id="ev_reopen">
-                                <target>assigned</target>
-                                <actions>
-                                </actions>
-                            </transition>
-                            <transition id="ev_autoresolve">
-                                <target>resolved</target>
-                                <actions>
-                                    <action>
-                                        <verb>SetCurrentDate</verb>
-                                        <params>
-                                            <param xsi:type="attcode">resolution_date</param>
-                                        </params>
-                                    </action>
-                                    <action>
-                                        <verb>SetElapsedTime</verb>
-                                        <params>
-                                            <param xsi:type="attcode">time_spent</param>
-                                            <param xsi:type="attcode">start_date</param>
-                                            <param xsi:type="string">DefaultWorkingTimeComputer</param>
-                                        </params>
-                                    </action>
-                                    <action>
-                                        <verb>ResolveChildTickets</verb>
-                                        <params/>
-                                    </action>
-                                </actions>
-                            </transition>
-                        </transitions>
-                    </state>
-                    <state id="closed">
-                        <highlight>
-                            <code>closed</code>
-                        </highlight>
-                        <inherit_flags_from>resolved</inherit_flags_from>
-                        <flags>
-                            <attribute id="private_log">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="public_log">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="functionalcis_list">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="contacts_list">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="service_id">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="servicesubcategory_id">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="close_date">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="resolution_code">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="solution">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="pending_reason">
-                                <read_only/>
-                            </attribute>
-                            <attribute id="user_satisfaction">
-                                <read_only/>
-                                <must_prompt/>
-                            </attribute>
-                            <attribute id="user_comment">
-                                <read_only/>
-                                <must_prompt/>
-                            </attribute>
-                        </flags>
-                        <transitions/>
-                    </state>
-                </states>
-            </lifecycle>
-            <methods>
-				<method id="GetTicketRefFormat">
-					<static>true</static>
-					<access>public</access>
-					<type>Overload-DBObject</type>
-					<code><![CDATA[
+              </transition>
+              <transition id="ev_autoresolve">
+                <target>resolved</target>
+                <actions>
+                  <action>
+                    <verb>SetCurrentDate</verb>
+                    <params>
+                      <param xsi:type="attcode">resolution_date</param>
+                    </params>
+                  </action>
+                  <action>
+                    <verb>SetElapsedTime</verb>
+                    <params>
+                      <param xsi:type="attcode">time_spent</param>
+                      <param xsi:type="attcode">start_date</param>
+                      <param xsi:type="string">DefaultWorkingTimeComputer</param>
+                    </params>
+                  </action>
+                  <action>
+                    <verb>ResolveChildTickets</verb>
+                    <params/>
+                  </action>
+                </actions>
+              </transition>
+            </transitions>
+          </state>
+          <state id="closed">
+            <highlight>
+              <code>closed</code>
+            </highlight>
+            <inherit_flags_from>resolved</inherit_flags_from>
+            <flags>
+              <attribute id="private_log">
+                <read_only/>
+              </attribute>
+              <attribute id="public_log">
+                <read_only/>
+              </attribute>
+              <attribute id="functionalcis_list">
+                <read_only/>
+              </attribute>
+              <attribute id="contacts_list">
+                <read_only/>
+              </attribute>
+              <attribute id="service_id">
+                <read_only/>
+              </attribute>
+              <attribute id="servicesubcategory_id">
+                <read_only/>
+              </attribute>
+              <attribute id="close_date">
+                <read_only/>
+              </attribute>
+              <attribute id="resolution_code">
+                <read_only/>
+              </attribute>
+              <attribute id="solution">
+                <read_only/>
+              </attribute>
+              <attribute id="pending_reason">
+                <read_only/>
+              </attribute>
+              <attribute id="user_satisfaction">
+                <read_only/>
+                <must_prompt/>
+              </attribute>
+              <attribute id="user_comment">
+                <read_only/>
+                <must_prompt/>
+              </attribute>
+            </flags>
+            <transitions/>
+          </state>
+        </states>
+      </lifecycle>
+      <methods>
+        <method id="GetTicketRefFormat">
+          <static>true</static>
+          <access>public</access>
+          <type>Overload-DBObject</type>
+          <code><![CDATA[
         public static function GetTicketRefFormat()
         {
                 return 'R-%06d';
         }
         ]]></code>
-				</method>
-                <method id="SetAssignedDate">
-                    <comment><![CDATA[/**
+        </method>
+        <method id="SetAssignedDate">
+          <comment><![CDATA[/**
 	 * To be deprecated: use SetCurrentDate() instead
 	 * @return void
 	 */]]></comment>
-                    <static>false</static>
-                    <access>public</access>
-                    <type>LifecycleAction</type>
-                    <code><![CDATA[	public function SetAssignedDate($sStimulusCode)
+          <static>false</static>
+          <access>public</access>
+          <type>LifecycleAction</type>
+          <code><![CDATA[	public function SetAssignedDate($sStimulusCode)
 	{
 		$this->Set('assignment_date', time());
 		return true;
 	}]]></code>
-                </method>
-                <method id="SetLastPendingDate">
-                    <comment><![CDATA[/**
+        </method>
+        <method id="SetLastPendingDate">
+          <comment><![CDATA[/**
 	 * To be deprecated: use SetCurrentDate() instead
 	 * @return void
 	 */]]></comment>
-                    <static>false</static>
-                    <access>public</access>
-                    <type>LifecycleAction</type>
-                    <code><![CDATA[	public function SetLastPendingDate($sStimulusCode)
+          <static>false</static>
+          <access>public</access>
+          <type>LifecycleAction</type>
+          <code><![CDATA[	public function SetLastPendingDate($sStimulusCode)
 	{
 		$this->Set('last_pending_date', time());
 		return true;
 	}]]></code>
-                </method>
-                <method id="SetResolveDate">
-                    <comment><![CDATA[/**
+        </method>
+        <method id="SetResolveDate">
+          <comment><![CDATA[/**
 	 * To be deprecated: use SetCurrentDate() and SetElapsedTime() instead
 	 * @return void
 	 */]]></comment>
-                    <static>false</static>
-                    <access>public</access>
-                    <type>LifecycleAction</type>
-                    <code><![CDATA[	public function SetResolveDate($sStimulusCode)
+          <static>false</static>
+          <access>public</access>
+          <type>LifecycleAction</type>
+          <code><![CDATA[	public function SetResolveDate($sStimulusCode)
 	{
 		$this->Set('resolution_date', time());
                 $iTimeSpent = time() - AttributeDateTime::GetAsUnixSeconds($this->Get('start_date'));
 		$this->Set('time_spent', $iTimeSpent);
 		return true;
 	}]]></code>
-                </method>
-                <method id="SetClosureDate">
-                    <comment><![CDATA[/**
+        </method>
+        <method id="SetClosureDate">
+          <comment><![CDATA[/**
 	 * To be deprecated: use SetCurrentDate() instead
 	 * @return void
 	 */]]></comment>
-                    <static>false</static>
-                    <access>public</access>
-                    <type>LifecycleAction</type>
-                    <code><![CDATA[	public function SetClosureDate($sStimulusCode)
+          <static>false</static>
+          <access>public</access>
+          <type>LifecycleAction</type>
+          <code><![CDATA[	public function SetClosureDate($sStimulusCode)
 	{
 		$this->Set('close_date', time());
 		return true;
 	}]]></code>
-                </method>
-                <method id="SetApprover">
-                    <comment><![CDATA[/**
+        </method>
+        <method id="SetApprover">
+          <comment><![CDATA[/**
 	 * To be deprecated: use SetCurrentUser() instead
 	 * @return void
 	 */]]></comment>
-                    <static>false</static>
-                    <access>public</access>
-                    <type>LifecycleAction</type>
-                    <code><![CDATA[	public function SetApprover($sStimulusCode)
+          <static>false</static>
+          <access>public</access>
+          <type>LifecycleAction</type>
+          <code><![CDATA[	public function SetApprover($sStimulusCode)
 	{
 		$this->Set('approver_id', UserRights::GetUserId());
 		return true;
 	}]]></code>
-                </method>
-                <method id="DoCheckToWrite">
-                    <static>false</static>
-                    <access>public</access>
-                    <type>Overload-DBObject</type>
-                    <code><![CDATA[public function DoCheckToWrite()
+        </method>
+        <method id="DoCheckToWrite">
+          <static>false</static>
+          <access>public</access>
+          <type>Overload-DBObject</type>
+          <code><![CDATA[public function DoCheckToWrite()
   {
     parent::DoCheckToWrite();
     if (!$this->IsNew() && ($this->Get('parent_request_id') == $this->GetKey()))
@@ -1333,16 +1332,16 @@
       $this->m_aCheckIssues[] = Dict::Format('Class:UserRequest/Error:CannotAssignParentRequestIdToSelf');
     }
   }]]></code>
-                </method>
-                <method id="ComputePriority">
-                    <comment>/** Compute the priority of the ticket based on its impact and urgency&#13;
+        </method>
+        <method id="ComputePriority">
+          <comment>/** Compute the priority of the ticket based on its impact and urgency&#13;
                         * @return integer The priority of the ticket 1(high) .. 3(low)&#13;
                         */
                     </comment>
-                    <static>false</static>
-                    <access>public</access>
-                    <type>LifecycleAction</type>
-                    <code><![CDATA[public function ComputePriority()
+          <static>false</static>
+          <access>public</access>
+          <type>LifecycleAction</type>
+          <code><![CDATA[public function ComputePriority()
 	{
 		// priority[impact][urgency]
 		$aPriorities = array(
@@ -1376,12 +1375,12 @@
 		}
 		return $iPriority;
 	}]]></code>
-                </method>
-                <method id="ComputeValues">
-                    <static>false</static>
-                    <access>public</access>
-                    <type>Overload-DBObject</type>
-                    <code><![CDATA[	public function ComputeValues()
+        </method>
+        <method id="ComputeValues">
+          <static>false</static>
+          <access>public</access>
+          <type>Overload-DBObject</type>
+          <code><![CDATA[	public function ComputeValues()
 	{
 		// Compute the priority of the ticket
 		$this->Set('priority', $this->ComputePriority());
@@ -1400,12 +1399,12 @@
 
 		return parent::ComputeValues();
 	}]]></code>
-                </method>
-                <method id="DisplayBareRelations">
-                    <static>false</static>
-                    <access>public</access>
-                    <type>Overload-cmdbAbstractObject</type>
-                    <code><![CDATA[	function DisplayBareRelations(WebPage $oPage, $bEditMode = false)
+        </method>
+        <method id="DisplayBareRelations">
+          <static>false</static>
+          <access>public</access>
+          <type>Overload-cmdbAbstractObject</type>
+          <code><![CDATA[	function DisplayBareRelations(WebPage $oPage, $bEditMode = false)
 	{
 		parent::DisplayBareRelations($oPage, $bEditMode);
 
@@ -1427,15 +1426,15 @@
             self::DisplaySet($oPage, $oKnownErrorSet, array ('menu' => false));
         }
 	}]]></code>
-                </method>
-                <method id="resolveChilds">
-                    <comment><![CDATA[/**
+        </method>
+        <method id="resolveChilds">
+          <comment><![CDATA[/**
 	 * To be deprecated: use ResolveChildTickets() instead
 	 */]]></comment>
-                    <static>false</static>
-                    <access>public</access>
-                    <type>LifecycleAction</type>
-                    <code><![CDATA[	public function resolveChilds($sStimulusCode)
+          <static>false</static>
+          <access>public</access>
+          <type>LifecycleAction</type>
+          <code><![CDATA[	public function resolveChilds($sStimulusCode)
 	{
 				
 		$sOQL = "SELECT UserRequest WHERE parent_request_id=:ticket";
@@ -1462,18 +1461,18 @@
 		return true;
 
 	}]]></code>
-                </method>
-                <method id="ResolveChildTickets">
-                    <comment><![CDATA[/**
+        </method>
+        <method id="ResolveChildTickets">
+          <comment><![CDATA[/**
 	 * Cascade the resolution to child User Request
 	 * @return true (returning false would stop the ongoing transition)
 	 */]]></comment>
-                    <static>false</static>
-                    <access>public</access>
-                    <type>LifecycleAction</type>
-                    <arguments>
+          <static>false</static>
+          <access>public</access>
+          <type>LifecycleAction</type>
+          <arguments>
                     </arguments>
-                    <code><![CDATA[	public function ResolveChildTickets()
+          <code><![CDATA[	public function ResolveChildTickets()
 	{
 		static $aTickets = array(); // prevent infinite recursion
 		
@@ -1490,16 +1489,16 @@
 		}
 		return true;
 	}]]></code>
-                </method>
-                <method id="ResolveFrom">
-                    <comment><![CDATA[/**
+        </method>
+        <method id="ResolveFrom">
+          <comment><![CDATA[/**
 	 * Resolve the ticket from another resolved ticket
 	 * @return void
 	 */]]></comment>
-                    <static>false</static>
-                    <access>public</access>
-                    <type>Internal</type>
-                    <code><![CDATA[	public function ResolveFrom($oParentTicket)
+          <static>false</static>
+          <access>public</access>
+          <type>Internal</type>
+          <code><![CDATA[	public function ResolveFrom($oParentTicket)
 	{
 		if ($this->Get('status') != 'resolved' && $this->Get('status') != 'closed' )
 		{
@@ -1528,13 +1527,13 @@
 			$this->ApplyStimulus('ev_autoresolve');
 			$this->DBUpdate();
 		}
-	}]]></code>	
-                </method>
-                <method id="UpdateChildRequestLog">
-                    <static>false</static>
-                    <access>public</access>
-                    <type>LifecycleAction</type>
-                    <code><![CDATA[	public function UpdateChildRequestLog()
+	}]]></code>
+        </method>
+        <method id="UpdateChildRequestLog">
+          <static>false</static>
+          <access>public</access>
+          <type>LifecycleAction</type>
+          <code><![CDATA[	public function UpdateChildRequestLog()
 	{
 		$oLog = $this->Get('public_log');
 		$sLogPublic = $oLog->GetModifiedEntry('html');
@@ -1574,12 +1573,12 @@
 		return true;
 
 	}]]></code>
-                </method>
-                <method id="ComputeImpactedItems">
-                    <static>false</static>
-                    <access>public</access>
-                    <type>LifecycleAction</type>
-                    <code><![CDATA[
+        </method>
+        <method id="ComputeImpactedItems">
+          <static>false</static>
+          <access>public</access>
+          <type>LifecycleAction</type>
+          <code><![CDATA[
     public function ComputeImpactedItems()
 	{
         // This method is kept for backward compatibility
@@ -1587,12 +1586,12 @@
         // UpdateImpactedItems directly
 		$this->UpdateImpactedItems();
 	}]]></code>
-                </method>
-                <method id="OnInsert">
-                    <static>false</static>
-                    <access>protected</access>
-                    <type>Overload-DBObject</type>
-                    <code><![CDATA[
+        </method>
+        <method id="OnInsert">
+          <static>false</static>
+          <access>protected</access>
+          <type>Overload-DBObject</type>
+          <code><![CDATA[
     protected function OnInsert()
 	{
         parent::OnInsert();
@@ -1601,12 +1600,12 @@
 		$this->SetIfNull('last_update', time());
 		$this->SetIfNull('start_date', time());
 	}]]></code>
-                </method>
-                <method id="OnUpdate">
-                    <static>false</static>
-                    <access>protected</access>
-                    <type>Overload-DBObject</type>
-                    <code><![CDATA[
+        </method>
+        <method id="OnUpdate">
+          <static>false</static>
+          <access>protected</access>
+          <type>Overload-DBObject</type>
+          <code><![CDATA[
    	protected function OnUpdate()
 	{
         parent::OnUpdate();
@@ -1618,530 +1617,527 @@
 		$this->Set('last_update', time());
 		$this->UpdateChildRequestLog();
 	}]]></code>
-                </method>
-            </methods>
-            <presentation>
-                <details>
-                    <items>
-                        <item id="functionalcis_list">
-                            <rank>10</rank>
-                        </item>
-                        <item id="contacts_list">
-                            <rank>20</rank>
-                        </item>
-                        <item id="related_request_list">
-                            <rank>30</rank>
-                        </item>
-                        <item id="workorders_list">
-                            <rank>40</rank>
-                        </item>
-                        <item id="col:col1">
-                            <rank>50</rank>
-                            <items>
-                                <item id="fieldset:Ticket:baseinfo">
-                                    <rank>10</rank>
-                                    <items>
-                                        <item id="org_id">
-                                            <rank>10</rank>
-                                        </item>
-                                        <item id="caller_id">
-                                            <rank>20</rank>
-                                        </item>
-                                        <item id="status">
-                                            <rank>30</rank>
-                                        </item>
-                                        <item id="origin">
-                                            <rank>40</rank>
-                                        </item>
-                                        <item id="title">
-                                            <rank>50</rank>
-                                        </item>
-                                        <item id="description">
-                                            <rank>60</rank>
-                                        </item>
-                                    </items>
-                                </item>
-                                <item id="fieldset:Ticket:moreinfo">
-                                    <rank>20</rank>
-                                    <items>
-                                        <item id="service_id">
-                                            <rank>10</rank>
-                                        </item>
-                                        <item id="servicesubcategory_id">
-                                            <rank>20</rank>
-                                        </item>
-                                        <item id="escalation_flag">
-                                            <rank>30</rank>
-                                        </item>
-                                        <item id="escalation_reason">
-                                            <rank>40</rank>
-                                        </item>
-                                        <item id="pending_reason">
-                                            <rank>50</rank>
-                                        </item>
-                                    </items>
-                                </item>
-                            </items>
-                        </item>
-                        <item id="col:col2">
-                            <rank>60</rank>
-                            <items>
-                                <item id="fieldset:Ticket:Type">
-                                    <rank>10</rank>
-                                    <items>
-                                        <item id="request_type">
-                                            <rank>10</rank>
-                                        </item>
-                                        <item id="impact">
-                                            <rank>20</rank>
-                                        </item>
-                                        <item id="urgency">
-                                            <rank>30</rank>
-                                        </item>
-                                        <item id="priority">
-                                            <rank>40</rank>
-                                        </item>
-                                    </items>
-                                </item>
-                                <item id="fieldset:Ticket:contact">
-                                    <rank>20</rank>
-                                    <items>
-                                        <item id="team_id">
-                                            <rank>10</rank>
-                                        </item>
-                                        <item id="agent_id">
-                                            <rank>20</rank>
-                                        </item>
-                                        <item id="approver_id">
-                                            <rank>30</rank>
-                                        </item>
-                                    </items>
-                                </item>
-                                <item id="fieldset:Ticket:date">
-                                    <rank>30</rank>
-                                    <items>
-                                        <item id="start_date">
-                                            <rank>10</rank>
-                                        </item>
-                                        <item id="last_update">
-                                            <rank>20</rank>
-                                        </item>
-                                        <item id="assignment_date">
-                                            <rank>30</rank>
-                                        </item>
-                                        <item id="tto_escalation_deadline">
-                                            <rank>40</rank>
-                                        </item>
-                                        <item id="ttr_escalation_deadline">
-                                            <rank>50</rank>
-                                        </item>
-                                        <item id="last_pending_date">
-                                            <rank>60</rank>
-                                        </item>
-                                        <item id="resolution_date">
-                                            <rank>70</rank>
-                                        </item>
-                                        <item id="close_date">
-                                            <rank>80</rank>
-                                        </item>
-                                    </items>
-                                </item>
-                            </items>
-                        </item>
-                        <item id="col:col3">
-                            <rank>70</rank>
-                            <items>
-                                <item id="fieldset:Ticket:relation">
-                                    <rank>10</rank>
-                                    <items>
-                                        <item id="parent_request_id">
-                                            <rank>10</rank>
-                                        </item>
-                                        <item id="parent_problem_id">
-                                            <rank>20</rank>
-                                        </item>
-                                        <item id="parent_change_id">
-                                            <rank>30</rank>
-                                        </item>
-                                    </items>
-                                </item>
-                                <item id="fieldset:Ticket:resolution">
-                                    <rank>20</rank>
-                                    <items>
-                                        <item id="resolution_code">
-                                            <rank>10</rank>
-                                        </item>
-                                        <item id="solution">
-                                            <rank>20</rank>
-                                        </item>
-                                        <item id="time_spent">
-                                            <rank>30</rank>
-                                        </item>
-                                        <item id="user_satisfaction">
-                                            <rank>40</rank>
-                                        </item>
-                                        <item id="user_comment">
-                                            <rank>50</rank>
-                                        </item>
-                                    </items>
-                                </item>
-                                <item id="fieldset:Ticket:SLA">
-                                    <rank>30</rank>
-                                    <items>
-                                        <item id="sla_tto_passed">
-                                            <rank>10</rank>
-                                        </item>
-                                        <item id="sla_tto_over">
-                                            <rank>20</rank>
-                                        </item>
-                                      <item id="sla_ttr_passed">
-                                        <rank>30</rank>
-                                      </item>
-                                      <item id="sla_ttr_over">
-                                        <rank>40</rank>
-                                      </item>
-                                    </items>
-                                </item>
-                            </items>
-                        </item>
-                      <item id="public_log">
-                        <rank>100</rank>
-                      </item>
-                      <item id="private_log">
-                        <rank>110</rank>
-                      </item>
-                    </items>
-                </details>
-                <search>
-                    <items>
-                        <item id="ref">
-                            <rank>10</rank>
-                        </item>
-                        <item id="org_id">
-                            <rank>20</rank>
-                        </item>
-                        <item id="title">
-                            <rank>30</rank>
-                        </item>
-                        <item id="description">
-                            <rank>40</rank>
-                        </item>
-                        <item id="start_date">
-                            <rank>50</rank>
-                        </item>
-                        <item id="resolution_date">
-                            <rank>70</rank>
-                        </item>
-                        <item id="close_date">
-                            <rank>80</rank>
-                        </item>
-                        <item id="status">
-                            <rank>90</rank>
-                        </item>
-                        <item id="operational_status">
-                            <rank>95</rank>
-                        </item>
-                        <item id="caller_id">
-                            <rank>100</rank>
-                        </item>
-                        <item id="origin">
-                            <rank>110</rank>
-                        </item>
-                        <item id="request_type">
-                            <rank>120</rank>
-                        </item>
-                        <item id="impact">
-                            <rank>130</rank>
-                        </item>
-                        <item id="urgency">
-                            <rank>140</rank>
-                        </item>
-                        <item id="priority">
-                            <rank>150</rank>
-                        </item>
-                        <item id="service_id">
-                            <rank>160</rank>
-                        </item>
-                        <item id="servicesubcategory_id">
-                            <rank>170</rank>
-                        </item>
-                        <item id="team_id">
-                            <rank>180</rank>
-                        </item>
-                        <item id="agent_id">
-                            <rank>190</rank>
-                        </item>
-                        <item id="escalation_flag">
-                            <rank>200</rank>
-                        </item>
-                        <item id="resolution_code">
-                            <rank>210</rank>
-                        </item>
-                        <item id="user_satisfaction">
-                            <rank>220</rank>
-                        </item>
-                        <item id="sla_tto_passed">
-                            <rank>230</rank>
-                        </item>
-                        <item id="sla_ttr_passed">
-                            <rank>240</rank>
-                        </item>
-                    </items>
-                </search>
-                <list>
-                    <items>
-                        <item id="title">
-                            <rank>10</rank>
-                        </item>
-                        <item id="org_id">
-                            <rank>20</rank>
-                        </item>
-                        <item id="caller_id">
-                            <rank>30</rank>
-                        </item>
-                        <item id="start_date">
-                            <rank>40</rank>
-                        </item>
-                        <item id="status">
-                            <rank>50</rank>
-                        </item>
-                        <item id="agent_id">
-                            <rank>60</rank>
-                        </item>
-                    </items>
-                </list>
-            </presentation>
-        </class>
-        <class id="Organization">
-            <fields>
-                <field id="overview" xsi:type="AttributeDashboard" _delta="if_exists">
-                    <definition>
-                        <cells>
-                            <cell id="9000" _delta="delete">
-                              <rank>5</rank>
-                              <dashlets>
-                                <dashlet id="0" xsi:type="DashletEmptyCell">
-                                  <rank>0</rank>
-                                </dashlet>
-                              </dashlets>
-                            </cell>
-                            <cell id="1" _delta="define">
-                                <rank>10</rank>
-                                <dashlets>
-                                    <dashlet id="9" xsi:type="DashletHeaderDynamic">
-                                        <rank>0</rank>
-                                        <title>Organization:Overview:UserRequests</title>
-                                            <icon>itop-welcome-itil/images/user-request-deadline.svg</icon>
-                                        <subtitle>Menu:UserRequest:OpenRequests</subtitle>
-                                        <query>SELECT UserRequest WHERE status != "closed" AND org_id=:this-&gt;id</query>
-                                        <group_by>status</group_by>
-                                        <values>new,assigned,escalated_tto,escalated_ttr,resolved</values>
-                                    </dashlet>
-                                </dashlets>
-                            </cell>
-                            <cell id="3" _delta="define">
-                              <rank>30</rank>
-                              <dashlets>
-                                <dashlet id="10" xsi:type="DashletObjectList">
-                                  <rank>0</rank>
-                                  <title>Organization:Overview:MyUserRequests</title>
-                                  <query>SELECT UserRequest AS i WHERE i.agent_id = :current_contact_id AND status NOT IN ("closed", "resolved")  AND org_id=:this-&gt;id</query>
-                                  <menu>true</menu>
-                                </dashlet>
-                                <dashlet id="13" xsi:type="DashletGroupByPie">
-                                  <rank>1</rank>
-                                  <title>Organization:Overview:Tickets</title>
-                                  <query>SELECT Ticket WHERE org_id = :this-&gt;id</query>
-                                  <group_by>finalclass</group_by>
-                                  <style>pie</style>
-                                  <aggregation_function>count</aggregation_function>
-                                  <aggregation_attribute/>
-                                  <limit/>
-                                  <order_by>attribute</order_by>
-                                  <order_direction>desc</order_direction>
-                                </dashlet>
-                              </dashlets>
-                            </cell>
-                        </cells>
-                    </definition>
-                </field>
-            </fields>
-        </class>
-    </classes>
-    <menus>
-        <menu id="WelcomeMenuPage" xsi:type="DashboardMenuNode" _delta="must_exist">
-            <definition>
-                <cells>
-                    <cell id="1" _delta="define">
-                        <rank>1</rank>
-                        <dashlets>
-                            <dashlet id="9" xsi:type="DashletHeaderDynamic">
-                                <rank>0</rank>
-                                <title>Menu:RequestManagement</title>
-                                    <icon>itop-welcome-itil/images/user-request-deadline.svg</icon>
-                                <subtitle>Menu:UserRequest:OpenRequests</subtitle>
-                                <query>SELECT UserRequest WHERE status != "closed"</query>
-                                <group_by>status</group_by>
-                                <values>new,assigned,escalated_tto,escalated_ttr,resolved</values>
-                            </dashlet>
-                            <dashlet id="10" xsi:type="DashletObjectList">
-                                <rank>1</rank>
-                                <title>UI:WelcomeMenu:MyCalls</title>
-                                <query>SELECT UserRequest AS i WHERE i.agent_id = :current_contact_id AND status NOT IN
+        </method>
+      </methods>
+      <presentation>
+        <details>
+          <items>
+            <item id="functionalcis_list">
+              <rank>10</rank>
+            </item>
+            <item id="contacts_list">
+              <rank>20</rank>
+            </item>
+            <item id="related_request_list">
+              <rank>30</rank>
+            </item>
+            <item id="workorders_list">
+              <rank>40</rank>
+            </item>
+            <item id="col:col1">
+              <rank>50</rank>
+              <items>
+                <item id="fieldset:Ticket:baseinfo">
+                  <rank>10</rank>
+                  <items>
+                    <item id="org_id">
+                      <rank>10</rank>
+                    </item>
+                    <item id="caller_id">
+                      <rank>20</rank>
+                    </item>
+                    <item id="status">
+                      <rank>30</rank>
+                    </item>
+                    <item id="origin">
+                      <rank>40</rank>
+                    </item>
+                    <item id="title">
+                      <rank>50</rank>
+                    </item>
+                    <item id="description">
+                      <rank>60</rank>
+                    </item>
+                  </items>
+                </item>
+                <item id="fieldset:Ticket:moreinfo">
+                  <rank>20</rank>
+                  <items>
+                    <item id="service_id">
+                      <rank>10</rank>
+                    </item>
+                    <item id="servicesubcategory_id">
+                      <rank>20</rank>
+                    </item>
+                    <item id="escalation_flag">
+                      <rank>30</rank>
+                    </item>
+                    <item id="escalation_reason">
+                      <rank>40</rank>
+                    </item>
+                    <item id="pending_reason">
+                      <rank>50</rank>
+                    </item>
+                  </items>
+                </item>
+              </items>
+            </item>
+            <item id="col:col2">
+              <rank>60</rank>
+              <items>
+                <item id="fieldset:Ticket:Type">
+                  <rank>10</rank>
+                  <items>
+                    <item id="request_type">
+                      <rank>10</rank>
+                    </item>
+                    <item id="impact">
+                      <rank>20</rank>
+                    </item>
+                    <item id="urgency">
+                      <rank>30</rank>
+                    </item>
+                    <item id="priority">
+                      <rank>40</rank>
+                    </item>
+                  </items>
+                </item>
+                <item id="fieldset:Ticket:contact">
+                  <rank>20</rank>
+                  <items>
+                    <item id="team_id">
+                      <rank>10</rank>
+                    </item>
+                    <item id="agent_id">
+                      <rank>20</rank>
+                    </item>
+                    <item id="approver_id">
+                      <rank>30</rank>
+                    </item>
+                  </items>
+                </item>
+                <item id="fieldset:Ticket:date">
+                  <rank>30</rank>
+                  <items>
+                    <item id="start_date">
+                      <rank>10</rank>
+                    </item>
+                    <item id="last_update">
+                      <rank>20</rank>
+                    </item>
+                    <item id="assignment_date">
+                      <rank>30</rank>
+                    </item>
+                    <item id="tto_escalation_deadline">
+                      <rank>40</rank>
+                    </item>
+                    <item id="ttr_escalation_deadline">
+                      <rank>50</rank>
+                    </item>
+                    <item id="last_pending_date">
+                      <rank>60</rank>
+                    </item>
+                    <item id="resolution_date">
+                      <rank>70</rank>
+                    </item>
+                    <item id="close_date">
+                      <rank>80</rank>
+                    </item>
+                  </items>
+                </item>
+              </items>
+            </item>
+            <item id="col:col3">
+              <rank>70</rank>
+              <items>
+                <item id="fieldset:Ticket:relation">
+                  <rank>10</rank>
+                  <items>
+                    <item id="parent_request_id">
+                      <rank>10</rank>
+                    </item>
+                    <item id="parent_problem_id">
+                      <rank>20</rank>
+                    </item>
+                    <item id="parent_change_id">
+                      <rank>30</rank>
+                    </item>
+                  </items>
+                </item>
+                <item id="fieldset:Ticket:resolution">
+                  <rank>20</rank>
+                  <items>
+                    <item id="resolution_code">
+                      <rank>10</rank>
+                    </item>
+                    <item id="solution">
+                      <rank>20</rank>
+                    </item>
+                    <item id="time_spent">
+                      <rank>30</rank>
+                    </item>
+                    <item id="user_satisfaction">
+                      <rank>40</rank>
+                    </item>
+                    <item id="user_comment">
+                      <rank>50</rank>
+                    </item>
+                  </items>
+                </item>
+                <item id="fieldset:Ticket:SLA">
+                  <rank>30</rank>
+                  <items>
+                    <item id="sla_tto_passed">
+                      <rank>10</rank>
+                    </item>
+                    <item id="sla_tto_over">
+                      <rank>20</rank>
+                    </item>
+                    <item id="sla_ttr_passed">
+                      <rank>30</rank>
+                    </item>
+                    <item id="sla_ttr_over">
+                      <rank>40</rank>
+                    </item>
+                  </items>
+                </item>
+              </items>
+            </item>
+            <item id="public_log">
+              <rank>100</rank>
+            </item>
+            <item id="private_log">
+              <rank>110</rank>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="ref">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="title">
+              <rank>30</rank>
+            </item>
+            <item id="description">
+              <rank>40</rank>
+            </item>
+            <item id="start_date">
+              <rank>50</rank>
+            </item>
+            <item id="resolution_date">
+              <rank>70</rank>
+            </item>
+            <item id="close_date">
+              <rank>80</rank>
+            </item>
+            <item id="status">
+              <rank>90</rank>
+            </item>
+            <item id="operational_status">
+              <rank>95</rank>
+            </item>
+            <item id="caller_id">
+              <rank>100</rank>
+            </item>
+            <item id="origin">
+              <rank>110</rank>
+            </item>
+            <item id="request_type">
+              <rank>120</rank>
+            </item>
+            <item id="impact">
+              <rank>130</rank>
+            </item>
+            <item id="urgency">
+              <rank>140</rank>
+            </item>
+            <item id="priority">
+              <rank>150</rank>
+            </item>
+            <item id="service_id">
+              <rank>160</rank>
+            </item>
+            <item id="servicesubcategory_id">
+              <rank>170</rank>
+            </item>
+            <item id="team_id">
+              <rank>180</rank>
+            </item>
+            <item id="agent_id">
+              <rank>190</rank>
+            </item>
+            <item id="escalation_flag">
+              <rank>200</rank>
+            </item>
+            <item id="resolution_code">
+              <rank>210</rank>
+            </item>
+            <item id="user_satisfaction">
+              <rank>220</rank>
+            </item>
+            <item id="sla_tto_passed">
+              <rank>230</rank>
+            </item>
+            <item id="sla_ttr_passed">
+              <rank>240</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="title">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="caller_id">
+              <rank>30</rank>
+            </item>
+            <item id="start_date">
+              <rank>40</rank>
+            </item>
+            <item id="status">
+              <rank>50</rank>
+            </item>
+            <item id="agent_id">
+              <rank>60</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="Organization">
+      <fields>
+        <field id="overview" xsi:type="AttributeDashboard" _delta="if_exists">
+          <definition>
+            <cells>
+              <cell id="9000" _delta="delete">
+                <rank>5</rank>
+                <dashlets>
+                  <dashlet id="0" xsi:type="DashletEmptyCell">
+                    <rank>0</rank>
+                  </dashlet>
+                </dashlets>
+              </cell>
+              <cell id="1" _delta="define">
+                <rank>10</rank>
+                <dashlets>
+                  <dashlet id="9" xsi:type="DashletHeaderDynamic">
+                    <rank>0</rank>
+                    <title>Organization:Overview:UserRequests</title>
+                    <icon>itop-welcome-itil/images/user-request-deadline.svg</icon>
+                    <subtitle>Menu:UserRequest:OpenRequests</subtitle>
+                    <query>SELECT UserRequest WHERE status != "closed" AND org_id=:this-&gt;id</query>
+                    <group_by>status</group_by>
+                    <values>new,assigned,escalated_tto,escalated_ttr,resolved</values>
+                  </dashlet>
+                </dashlets>
+              </cell>
+              <cell id="3" _delta="define">
+                <rank>30</rank>
+                <dashlets>
+                  <dashlet id="10" xsi:type="DashletObjectList">
+                    <rank>0</rank>
+                    <title>Organization:Overview:MyUserRequests</title>
+                    <query>SELECT UserRequest AS i WHERE i.agent_id = :current_contact_id AND status NOT IN ("closed", "resolved")  AND org_id=:this-&gt;id</query>
+                    <menu>true</menu>
+                  </dashlet>
+                  <dashlet id="13" xsi:type="DashletGroupByPie">
+                    <rank>1</rank>
+                    <title>Organization:Overview:Tickets</title>
+                    <query>SELECT Ticket WHERE org_id = :this-&gt;id</query>
+                    <group_by>finalclass</group_by>
+                    <style>pie</style>
+                    <aggregation_function>count</aggregation_function>
+                    <aggregation_attribute/>
+                    <limit/>
+                    <order_by>attribute</order_by>
+                    <order_direction>desc</order_direction>
+                  </dashlet>
+                </dashlets>
+              </cell>
+            </cells>
+          </definition>
+        </field>
+      </fields>
+    </class>
+  </classes>
+  <menus>
+    <menu id="WelcomeMenuPage" xsi:type="DashboardMenuNode" _delta="must_exist">
+      <definition>
+        <cells>
+          <cell id="1" _delta="define">
+            <rank>1</rank>
+            <dashlets>
+              <dashlet id="9" xsi:type="DashletHeaderDynamic">
+                <rank>0</rank>
+                <title>Menu:RequestManagement</title>
+                <icon>itop-welcome-itil/images/user-request-deadline.svg</icon>
+                <subtitle>Menu:UserRequest:OpenRequests</subtitle>
+                <query>SELECT UserRequest WHERE status != "closed"</query>
+                <group_by>status</group_by>
+                <values>new,assigned,escalated_tto,escalated_ttr,resolved</values>
+              </dashlet>
+              <dashlet id="10" xsi:type="DashletObjectList">
+                <rank>1</rank>
+                <title>UI:WelcomeMenu:MyCalls</title>
+                <query>SELECT UserRequest AS i WHERE i.agent_id = :current_contact_id AND status NOT IN
                                     ("closed", "resolved")
                                 </query>
-                                <menu>true</menu>
-                            </dashlet>
-                        </dashlets>
-                    </cell>
-                </cells>
-            </definition>
-        </menu>
-        <menu id="RequestManagement" xsi:type="MenuGroup" _delta="define">
-            <rank>30</rank>
-            <enable_stimulus/>
-				    <style>
-					    <decoration_classes>fas fa-comment-alt</decoration_classes>
-				    </style>
-        </menu>
-        <menu id="UserRequest:Overview" xsi:type="DashboardMenuNode" _delta="define">
+                <menu>true</menu>
+              </dashlet>
+            </dashlets>
+          </cell>
+        </cells>
+      </definition>
+    </menu>
+    <menu id="RequestManagement" xsi:type="MenuGroup" _delta="define">
+      <rank>30</rank>
+      <enable_stimulus/>
+      <style>
+        <decoration_classes>fas fa-comment-alt</decoration_classes>
+      </style>
+    </menu>
+    <menu id="UserRequest:Overview" xsi:type="DashboardMenuNode" _delta="define">
+      <rank>0</rank>
+      <parent>RequestManagement</parent>
+      <definition>
+        <layout>DashboardLayoutTwoCols</layout>
+        <title>UI:RequestMgmtMenuOverview:Title</title>
+        <cells>
+          <cell id="0">
             <rank>0</rank>
-            <parent>RequestManagement</parent>
-            <definition>
-                <layout>DashboardLayoutTwoCols</layout>
-                <title>UI:RequestMgmtMenuOverview:Title</title>
-                <cells>
-                    <cell id="0">
-                        <rank>0</rank>
-                        <dashlets>
-                            <dashlet id="1" xsi:type="DashletGroupByPie">
-                                <rank>0</rank>
-                                <title>UI-RequestManagementOverview-RequestByType-last-14-days</title>
-                                <query>SELECT UserRequest WHERE DATE_SUB(NOW(), INTERVAL 14 DAY) &lt; start_date</query>
-                                <group_by>request_type</group_by>
-                                <style>pie</style>
-                            </dashlet>
-                        </dashlets>
-                    </cell>
-                    <cell id="1">
-                        <rank>1</rank>
-                        <dashlets>
-                            <dashlet id="2" xsi:type="DashletGroupByBars">
-                                <rank>0</rank>
-                                <title>UI-RequestManagementOverview-Last-14-days</title>
-                                <query>SELECT UserRequest WHERE DATE_SUB(NOW(), INTERVAL 14 DAY) &lt; start_date</query>
-                                <group_by>start_date:day_of_month</group_by>
-                                <style>bars</style>
-                            </dashlet>
-                        </dashlets>
-                    </cell>
-                    <cell id="11">
-                        <rank>2</rank>
-                        <dashlets>
-                            <dashlet id="3" xsi:type="DashletGroupByTable">
-                                <rank>0</rank>
-                                <title>UI-RequestManagementOverview-OpenRequestByStatus</title>
-                                <query>SELECT UserRequest WHERE status NOT IN ('closed','rejected')</query>
-                                <group_by>status</group_by>
-                                <style>table</style>
-                            </dashlet>
-                        </dashlets>
-                    </cell>
-                    <cell id="2">
-                        <rank>3</rank>
-                        <dashlets>
-                            <dashlet id="4" xsi:type="DashletGroupByTable">
-                                <rank>0</rank>
-                                <title>UI-RequestManagementOverview-OpenRequestByAgent</title>
-                                <query>SELECT UserRequest WHERE status NOT IN ('closed','rejected')</query>
-                                <group_by>agent_id</group_by>
-                                <style>table</style>
-                            </dashlet>
-                        </dashlets>
-                    </cell>
-                    <cell id="3">
-                        <rank>4</rank>
-                        <dashlets>
-                            <dashlet id="5" xsi:type="DashletGroupByTable">
-                                <rank>0</rank>
-                                <title>UI-RequestManagementOverview-OpenRequestByType</title>
-                                <query>SELECT UserRequest WHERE status NOT IN ('closed','rejected')</query>
-                                <group_by>finalclass</group_by>
-                                <style>table</style>
-                            </dashlet>
-                        </dashlets>
-                    </cell>
-                    <cell id="4">
-                        <rank>5</rank>
-                        <dashlets>
-                            <dashlet id="6" xsi:type="DashletGroupByTable">
-                                <rank>0</rank>
-                                <title>UI-RequestManagementOverview-OpenRequestByCustomer</title>
-                                <query>SELECT UserRequest WHERE status NOT IN ('closed','rejected')</query>
-                                <group_by>org_id</group_by>
-                                <style>table</style>
-                            </dashlet>
-                        </dashlets>
-                    </cell>
-                </cells>
-            </definition>
-        </menu>
-        <menu id="NewUserRequest" xsi:type="NewObjectMenuNode" _delta="define">
+            <dashlets>
+              <dashlet id="1" xsi:type="DashletGroupByPie">
+                <rank>0</rank>
+                <title>UI-RequestManagementOverview-RequestByType-last-14-days</title>
+                <query>SELECT UserRequest WHERE DATE_SUB(NOW(), INTERVAL 14 DAY) &lt; start_date</query>
+                <group_by>request_type</group_by>
+                <style>pie</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="1">
             <rank>1</rank>
-            <parent>RequestManagement</parent>
-            <class>UserRequest</class>
-        </menu>
-        <menu id="SearchUserRequests" xsi:type="SearchMenuNode" _delta="define">
+            <dashlets>
+              <dashlet id="2" xsi:type="DashletGroupByBars">
+                <rank>0</rank>
+                <title>UI-RequestManagementOverview-Last-14-days</title>
+                <query>SELECT UserRequest WHERE DATE_SUB(NOW(), INTERVAL 14 DAY) &lt; start_date</query>
+                <group_by>start_date:day_of_month</group_by>
+                <style>bars</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="11">
             <rank>2</rank>
-            <parent>RequestManagement</parent>
-            <class>UserRequest</class>
-        </menu>
-        <menu id="UserRequest:Shortcuts" xsi:type="TemplateMenuNode" _delta="define">
+            <dashlets>
+              <dashlet id="3" xsi:type="DashletGroupByTable">
+                <rank>0</rank>
+                <title>UI-RequestManagementOverview-OpenRequestByStatus</title>
+                <query>SELECT UserRequest WHERE status NOT IN ('closed','rejected')</query>
+                <group_by>status</group_by>
+                <style>table</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="2">
             <rank>3</rank>
-            <parent>RequestManagement</parent>
-            <template_file/>
-        </menu>
-        <menu id="UserRequest:MyRequests" xsi:type="OQLMenuNode" _delta="define">
-            <rank>0</rank>
-            <parent>UserRequest:Shortcuts</parent>
-            <oql>
-                <![CDATA[SELECT UserRequest WHERE agent_id = :current_contact_id AND status NOT IN ("closed","resolved")]]></oql>
-            <do_search/>
-            <auto_reload>fast</auto_reload>
-        </menu>
-        <menu id="UserRequest:EscalatedRequests" xsi:type="OQLMenuNode" _delta="define">
-            <rank>1</rank>
-            <parent>UserRequest:Shortcuts</parent>
-            <oql>
-                <![CDATA[SELECT UserRequest WHERE status IN ("escalated_tto", "escalated_ttr") OR escalation_flag="yes"]]></oql>
-            <do_search/>
-            <auto_reload>fast</auto_reload>
-        </menu>
-        <menu id="UserRequest:OpenRequests" xsi:type="OQLMenuNode" _delta="define">
-            <rank>2</rank>
-            <parent>UserRequest:Shortcuts</parent>
-            <oql><![CDATA[SELECT UserRequest WHERE status NOT IN ("closed")]]></oql>
-            <do_search>1</do_search>
-            <auto_reload>fast</auto_reload>
-        </menu>
-        <menu id="UserRequest:MySupportRequests" xsi:type="OQLMenuNode" _delta="define">
-            <rank>3</rank>
-            <parent>UserRequest:Shortcuts</parent>
-            <oql><![CDATA[SELECT UserRequest WHERE caller_id = :current_contact_id AND status NOT IN ("closed")]]></oql>
-            <do_search/>
-            <auto_reload>fast</auto_reload>
-        </menu>
-    </menus>
-    <module_parameters>
-        <parameters id="itop-tickets">
-            <relation_context>
-                <UserRequest>
-                    <impacts>
-                        <down>
-                            <items type="array">
-                                <item id="open_incidents" _delta="define">
-                                    <oql>
-                                        <![CDATA[
+            <dashlets>
+              <dashlet id="4" xsi:type="DashletGroupByTable">
+                <rank>0</rank>
+                <title>UI-RequestManagementOverview-OpenRequestByAgent</title>
+                <query>SELECT UserRequest WHERE status NOT IN ('closed','rejected')</query>
+                <group_by>agent_id</group_by>
+                <style>table</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="3">
+            <rank>4</rank>
+            <dashlets>
+              <dashlet id="5" xsi:type="DashletGroupByTable">
+                <rank>0</rank>
+                <title>UI-RequestManagementOverview-OpenRequestByType</title>
+                <query>SELECT UserRequest WHERE status NOT IN ('closed','rejected')</query>
+                <group_by>finalclass</group_by>
+                <style>table</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="4">
+            <rank>5</rank>
+            <dashlets>
+              <dashlet id="6" xsi:type="DashletGroupByTable">
+                <rank>0</rank>
+                <title>UI-RequestManagementOverview-OpenRequestByCustomer</title>
+                <query>SELECT UserRequest WHERE status NOT IN ('closed','rejected')</query>
+                <group_by>org_id</group_by>
+                <style>table</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+        </cells>
+      </definition>
+    </menu>
+    <menu id="NewUserRequest" xsi:type="NewObjectMenuNode" _delta="define">
+      <rank>1</rank>
+      <parent>RequestManagement</parent>
+      <class>UserRequest</class>
+    </menu>
+    <menu id="SearchUserRequests" xsi:type="SearchMenuNode" _delta="define">
+      <rank>2</rank>
+      <parent>RequestManagement</parent>
+      <class>UserRequest</class>
+    </menu>
+    <menu id="UserRequest:Shortcuts" xsi:type="TemplateMenuNode" _delta="define">
+      <rank>3</rank>
+      <parent>RequestManagement</parent>
+      <template_file/>
+    </menu>
+    <menu id="UserRequest:MyRequests" xsi:type="OQLMenuNode" _delta="define">
+      <rank>0</rank>
+      <parent>UserRequest:Shortcuts</parent>
+      <oql><![CDATA[SELECT UserRequest WHERE agent_id = :current_contact_id AND status NOT IN ("closed","resolved")]]></oql>
+      <do_search/>
+      <auto_reload>fast</auto_reload>
+    </menu>
+    <menu id="UserRequest:EscalatedRequests" xsi:type="OQLMenuNode" _delta="define">
+      <rank>1</rank>
+      <parent>UserRequest:Shortcuts</parent>
+      <oql><![CDATA[SELECT UserRequest WHERE status IN ("escalated_tto", "escalated_ttr") OR escalation_flag="yes"]]></oql>
+      <do_search/>
+      <auto_reload>fast</auto_reload>
+    </menu>
+    <menu id="UserRequest:OpenRequests" xsi:type="OQLMenuNode" _delta="define">
+      <rank>2</rank>
+      <parent>UserRequest:Shortcuts</parent>
+      <oql><![CDATA[SELECT UserRequest WHERE status NOT IN ("closed")]]></oql>
+      <do_search>1</do_search>
+      <auto_reload>fast</auto_reload>
+    </menu>
+    <menu id="UserRequest:MySupportRequests" xsi:type="OQLMenuNode" _delta="define">
+      <rank>3</rank>
+      <parent>UserRequest:Shortcuts</parent>
+      <oql><![CDATA[SELECT UserRequest WHERE caller_id = :current_contact_id AND status NOT IN ("closed")]]></oql>
+      <do_search/>
+      <auto_reload>fast</auto_reload>
+    </menu>
+  </menus>
+  <module_parameters>
+    <parameters id="itop-tickets">
+      <relation_context>
+        <UserRequest>
+          <impacts>
+            <down>
+              <items type="array">
+                <item id="open_incidents" _delta="define">
+                  <oql><![CDATA[
                                         SELECT FCI, R
                                         FROM FunctionalCI AS FCI
                                                  JOIN lnkFunctionalCIToTicket AS L ON L.functionalci_id = FCI.id
@@ -2151,21 +2147,20 @@
                                           AND (L.impact_code != 'not_impacted')
                                           AND (R.id != :this->id)
                                         ]]></oql>
-                                    <dict>Tickets:Related:OpenIncidents</dict>
-                                        <icon>itop-request-mgmt/images/incident-red.png</icon>
-                                    <default>yes</default>
-                                </item>
-                            </items>
-                        </down>
-                    </impacts>
-                </UserRequest>
-                <Change>
-                    <impacts>
-                        <down>
-                            <items type="array">
-                                <item id="open_incidents" _delta="define">
-                                    <oql>
-                                        <![CDATA[
+                  <dict>Tickets:Related:OpenIncidents</dict>
+                  <icon>itop-request-mgmt/images/incident-red.png</icon>
+                  <default>yes</default>
+                </item>
+              </items>
+            </down>
+          </impacts>
+        </UserRequest>
+        <Change>
+          <impacts>
+            <down>
+              <items type="array">
+                <item id="open_incidents" _delta="define">
+                  <oql><![CDATA[
                                         SELECT FCI, R
                                         FROM FunctionalCI AS FCI
                                                  JOIN lnkFunctionalCIToTicket AS L ON L.functionalci_id = FCI.id
@@ -2175,25 +2170,24 @@
                                           AND (L.impact_code != 'not_impacted')
                                           AND (R.id != :this->id)
                                         ]]></oql>
-                                    <dict>Tickets:Related:OpenIncidents</dict>
-                                        <icon>itop-request-mgmt/images/incident-red.png</icon>
-                                    <default>yes</default>
-                                </item>
-                            </items>
-                        </down>
-                    </impacts>
-                </Change>
-            </relation_context>
-        </parameters>
-        <parameters id="itop-config-mgmt">
-            <relation_context>
-                <FunctionalCI>
-                    <impacts>
-                        <down>
-                            <items type="array">
-                                <item id="open_incidents" _delta="define">
-                                    <oql>
-                                        <![CDATA[
+                  <dict>Tickets:Related:OpenIncidents</dict>
+                  <icon>itop-request-mgmt/images/incident-red.png</icon>
+                  <default>yes</default>
+                </item>
+              </items>
+            </down>
+          </impacts>
+        </Change>
+      </relation_context>
+    </parameters>
+    <parameters id="itop-config-mgmt">
+      <relation_context>
+        <FunctionalCI>
+          <impacts>
+            <down>
+              <items type="array">
+                <item id="open_incidents" _delta="define">
+                  <oql><![CDATA[
                                         SELECT FCI, R
                                         FROM FunctionalCI AS FCI
                                                  JOIN lnkFunctionalCIToTicket AS L ON L.functionalci_id = FCI.id
@@ -2202,17 +2196,16 @@
                                           AND (R.request_type = 'incident')
                                           AND (L.impact_code != 'not_impacted')
                                         ]]></oql>
-                                    <dict>Tickets:Related:OpenIncidents</dict>
-                                        <icon>itop-request-mgmt/images/incident-red.png</icon>
-                                    <default>yes</default>
-                                </item>
-                            </items>
-                        </down>
-                        <up>
-                            <items type="array">
-                                <item id="open_incidents" _delta="define">
-                                    <oql>
-                                        <![CDATA[
+                  <dict>Tickets:Related:OpenIncidents</dict>
+                  <icon>itop-request-mgmt/images/incident-red.png</icon>
+                  <default>yes</default>
+                </item>
+              </items>
+            </down>
+            <up>
+              <items type="array">
+                <item id="open_incidents" _delta="define">
+                  <oql><![CDATA[
                                         SELECT FCI, R
                                         FROM FunctionalCI AS FCI
                                                  JOIN lnkFunctionalCIToTicket AS L ON L.functionalci_id = FCI.id
@@ -2221,15 +2214,15 @@
                                           AND (R.request_type = 'incident')
                                           AND (L.impact_code != 'not_impacted')
                                         ]]></oql>
-                                    <dict>Tickets:Related:OpenIncidents</dict>
-                                        <icon>itop-request-mgmt/images/incident-red.png</icon>
-                                    <default>yes</default>
-                                </item>
-                            </items>
-                        </up>
-                    </impacts>
-                </FunctionalCI>
-            </relation_context>
-        </parameters>
-    </module_parameters>
+                  <dict>Tickets:Related:OpenIncidents</dict>
+                  <icon>itop-request-mgmt/images/incident-red.png</icon>
+                  <default>yes</default>
+                </item>
+              </items>
+            </up>
+          </impacts>
+        </FunctionalCI>
+      </relation_context>
+    </parameters>
+  </module_parameters>
 </itop_design>
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 b90cfa3db..6341443eb 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
@@ -100,6 +100,7 @@
           <count_max>0</count_max>
           <ext_key_to_remote>contact_id</ext_key_to_remote>
           <duplicates/>
+          <read_only>false</read_only>
         </field>
         <field id="documents_list" xsi:type="AttributeLinkedSetIndirect">
           <linked_class>lnkContractToDocument</linked_class>
@@ -108,6 +109,7 @@
           <count_max>0</count_max>
           <ext_key_to_remote>document_id</ext_key_to_remote>
           <duplicates/>
+          <read_only>false</read_only>
         </field>
         <field id="description" xsi:type="AttributeText">
           <sql>description</sql>
@@ -193,8 +195,7 @@
       </fields>
       <methods>
         <method id="PrefillSearchForm">
-          <code>
-<![CDATA[
+          <code><![CDATA[
 public function PrefillSearchForm(&$aContextParam)
 {
   if($aContextParam['dest_class'] == 'Service' || is_subclass_of($aContextParam['dest_class'], 'Service'))
@@ -217,8 +218,7 @@ public function PrefillSearchForm(&$aContextParam)
     }
   }
 }
-]]>
-          </code>
+]]></code>
         </method>
       </methods>
       <presentation>
@@ -432,6 +432,7 @@ public function PrefillSearchForm(&$aContextParam)
           <count_max>0</count_max>
           <ext_key_to_remote>service_id</ext_key_to_remote>
           <duplicates/>
+          <read_only>false</read_only>
         </field>
         <field id="functionalcis_list" xsi:type="AttributeLinkedSetIndirect">
           <linked_class>lnkCustomerContractToFunctionalCI</linked_class>
@@ -440,6 +441,7 @@ public function PrefillSearchForm(&$aContextParam)
           <count_max>0</count_max>
           <ext_key_to_remote>functionalci_id</ext_key_to_remote>
           <duplicates/>
+          <read_only>false</read_only>
         </field>
         <field id="providercontracts_list" xsi:type="AttributeLinkedSetIndirect">
           <linked_class>lnkCustomerContractToProviderContract</linked_class>
@@ -448,6 +450,7 @@ public function PrefillSearchForm(&$aContextParam)
           <count_max>0</count_max>
           <ext_key_to_remote>providercontract_id</ext_key_to_remote>
           <duplicates/>
+          <read_only>false</read_only>
         </field>
       </fields>
       <methods/>
@@ -606,6 +609,7 @@ public function PrefillSearchForm(&$aContextParam)
           <count_max>0</count_max>
           <ext_key_to_remote>functionalci_id</ext_key_to_remote>
           <duplicates/>
+          <read_only>false</read_only>
         </field>
         <field id="sla" xsi:type="AttributeString">
           <sql>sla</sql>
@@ -958,10 +962,12 @@ public function PrefillSearchForm(&$aContextParam)
         <field id="services_list" xsi:type="AttributeLinkedSet">
           <linked_class>Service</linked_class>
           <ext_key_to_me>servicefamily_id</ext_key_to_me>
-          <edit_mode>add_only</edit_mode>
+          <legacy_edit_mode>add_only</legacy_edit_mode>
           <count_min>0</count_min>
           <count_max>0</count_max>
           <duplicates/>
+          <relation_type>link</relation_type>
+          <read_only>false</read_only>
         </field>
       </fields>
       <methods/>
@@ -1069,6 +1075,7 @@ public function PrefillSearchForm(&$aContextParam)
           <count_max>0</count_max>
           <ext_key_to_remote>document_id</ext_key_to_remote>
           <duplicates/>
+          <read_only>false</read_only>
         </field>
         <field id="contacts_list" xsi:type="AttributeLinkedSetIndirect">
           <linked_class>lnkContactToService</linked_class>
@@ -1077,6 +1084,7 @@ public function PrefillSearchForm(&$aContextParam)
           <count_max>0</count_max>
           <ext_key_to_remote>contact_id</ext_key_to_remote>
           <duplicates/>
+          <read_only>false</read_only>
         </field>
         <field id="status" xsi:type="AttributeEnum">
           <values>
@@ -1110,14 +1118,17 @@ public function PrefillSearchForm(&$aContextParam)
           <count_max>0</count_max>
           <ext_key_to_remote>customercontract_id</ext_key_to_remote>
           <duplicates/>
+          <read_only>false</read_only>
         </field>
         <field id="servicesubcategories_list" xsi:type="AttributeLinkedSet">
           <linked_class>ServiceSubcategory</linked_class>
           <ext_key_to_me>service_id</ext_key_to_me>
-          <edit_mode>add_only</edit_mode>
+          <legacy_edit_mode>add_only</legacy_edit_mode>
           <count_min>0</count_min>
           <count_max>0</count_max>
           <duplicates/>
+          <relation_type>link</relation_type>
+          <read_only>false</read_only>
         </field>
       </fields>
       <methods/>
@@ -1587,6 +1598,7 @@ public function PrefillSearchForm(&$aContextParam)
           <count_max>0</count_max>
           <ext_key_to_remote>slt_id</ext_key_to_remote>
           <duplicates/>
+          <read_only>false</read_only>
         </field>
         <field id="customercontracts_list" xsi:type="AttributeLinkedSetIndirect">
           <linked_class>lnkCustomerContractToService</linked_class>
@@ -1595,13 +1607,14 @@ public function PrefillSearchForm(&$aContextParam)
           <count_max>0</count_max>
           <ext_key_to_remote>customercontract_id</ext_key_to_remote>
           <duplicates>true</duplicates>
+          <read_only>false</read_only>
         </field>
       </fields>
       <methods>
-	      <method id="DoCheckToWrite">
-		      <static>false</static>
-		      <access>public</access>
-		      <code><![CDATA[
+        <method id="DoCheckToWrite">
+          <static>false</static>
+          <access>public</access>
+          <code><![CDATA[
 					public function DoCheckToWrite()
 	{
 		parent::DoCheckToWrite();
@@ -1628,7 +1641,7 @@ public function PrefillSearchForm(&$aContextParam)
 		}
 	}
 			     ]]></code>
-	      </method>
+        </method>
       </methods>
       <presentation>
         <details>
@@ -2279,14 +2292,17 @@ public function PrefillSearchForm(&$aContextParam)
           <count_max>0</count_max>
           <ext_key_to_remote>contact_id</ext_key_to_remote>
           <duplicates/>
+          <read_only>false</read_only>
         </field>
         <field id="customers_list" xsi:type="AttributeLinkedSet">
           <linked_class>Organization</linked_class>
           <ext_key_to_me>deliverymodel_id</ext_key_to_me>
-          <edit_mode>add_remove</edit_mode>
+          <legacy_edit_mode>add_remove</legacy_edit_mode>
           <count_min>0</count_min>
           <count_max>0</count_max>
           <duplicates/>
+          <relation_type>link</relation_type>
+          <read_only>false</read_only>
         </field>
       </fields>
       <methods/>
@@ -2479,9 +2495,9 @@ public function PrefillSearchForm(&$aContextParam)
   <menus>
     <menu id="ServiceManagement" xsi:type="MenuGroup" _delta="define">
       <rank>60</rank>
-	    <style>
-		    <decoration_classes>fas fa-hands-helping</decoration_classes>
-	    </style>
+      <style>
+        <decoration_classes>fas fa-hands-helping</decoration_classes>
+      </style>
     </menu>
     <menu id="Service:Overview" xsi:type="DashboardMenuNode" _delta="define">
       <rank>0</rank>
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 0c7ca8b84..2ffac257b 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,200 +1,201 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
-	<classes>
-		<class id="Organization">
-			<fields>
-				<field id="deliverymodel_id" xsi:type="AttributeExternalKey" _delta="define">
-					<sql>deliverymodel_id</sql>
-					<target_class>DeliveryModel</target_class>
-					<is_null_allowed>true</is_null_allowed>
-					<on_target_delete>DEL_MANUAL</on_target_delete>
-				</field>
-				<field id="deliverymodel_name" xsi:type="AttributeExternalField" _delta="define">
-					<extkey_attcode>deliverymodel_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-			</fields>
-			<methods/>
-			<presentation>
-				<details>
-					<items>
-						<item id="deliverymodel_id" _delta="define">
-							<rank>50</rank>
-						</item>
-					</items>
-				</details>
-			</presentation>
-		</class>
-		<class id="Ticket">
-			<fields>
-				<field id="team_id" xsi:type="AttributeExternalKey" _delta="redefine">
-					<filter><![CDATA[SELECT Team AS t JOIN lnkDeliveryModelToContact AS l1 ON l1.contact_id=t.id JOIN DeliveryModel AS dm ON l1.deliverymodel_id=dm.id JOIN Organization AS o ON o.deliverymodel_id=dm.id WHERE o.id = :this->org_id]]></filter>
-					<dependencies>
-						<attribute id="org_id"/>
-					</dependencies>
-					<sql>team_id</sql>
-					<target_class>Team</target_class>
-					<is_null_allowed>true</is_null_allowed>
-					<on_target_delete>DEL_AUTO</on_target_delete>
-					<allow_target_creation>false</allow_target_creation>
-				</field>
-			</fields>
-		</class>
-		<class id="Contract" _delta="define">
-			<parent>cmdbAbstractObject</parent>
-			<properties>
-				<comment><![CDATA[/**
+  <classes>
+    <class id="Organization">
+      <fields>
+        <field id="deliverymodel_id" xsi:type="AttributeExternalKey" _delta="define">
+          <sql>deliverymodel_id</sql>
+          <target_class>DeliveryModel</target_class>
+          <is_null_allowed>true</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+        </field>
+        <field id="deliverymodel_name" xsi:type="AttributeExternalField" _delta="define">
+          <extkey_attcode>deliverymodel_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+      </fields>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="deliverymodel_id" _delta="define">
+              <rank>50</rank>
+            </item>
+          </items>
+        </details>
+      </presentation>
+    </class>
+    <class id="Ticket">
+      <fields>
+        <field id="team_id" xsi:type="AttributeExternalKey" _delta="redefine">
+          <filter><![CDATA[SELECT Team AS t JOIN lnkDeliveryModelToContact AS l1 ON l1.contact_id=t.id JOIN DeliveryModel AS dm ON l1.deliverymodel_id=dm.id JOIN Organization AS o ON o.deliverymodel_id=dm.id WHERE o.id = :this->org_id]]></filter>
+          <dependencies>
+            <attribute id="org_id"/>
+          </dependencies>
+          <sql>team_id</sql>
+          <target_class>Team</target_class>
+          <is_null_allowed>true</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+          <allow_target_creation>false</allow_target_creation>
+        </field>
+      </fields>
+    </class>
+    <class id="Contract" _delta="define">
+      <parent>cmdbAbstractObject</parent>
+      <properties>
+        <comment><![CDATA[/**
  * Persistent classes for a CMDB
  *
  * @copyright   Copyright (C) 2010-2021 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */]]></comment>
-				<category>bizmodel,searchable,structure</category>
-				<abstract>true</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>contract</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field>finalclass</db_final_class_field>
-				<naming>
-					<attributes>
-						<attribute id="name"/>
-					</attributes>
-				</naming>
-				<fields_semantic>
-					<state_attribute>status</state_attribute>
-				</fields_semantic>
-				<style>
-					<icon>../../images/icons/icons8-contract.svg</icon>
-				</style>
-				<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>
-			<fields>
-				<field id="name" xsi:type="AttributeString">
-					<sql>name</sql>
-					<default_value/>
-					<is_null_allowed>false</is_null_allowed>
-				</field>
-				<field id="org_id" xsi:type="AttributeExternalKey">
-					<sql>org_id</sql>
-					<target_class>Organization</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_MANUAL</on_target_delete>
-				</field>
-				<field id="organization_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>org_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="contacts_list" xsi:type="AttributeLinkedSetIndirect">
-					<linked_class>lnkContactToContract</linked_class>
-					<ext_key_to_me>contract_id</ext_key_to_me>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-					<ext_key_to_remote>contact_id</ext_key_to_remote>
-					<duplicates/>
-				</field>
-				<field id="documents_list" xsi:type="AttributeLinkedSetIndirect">
-					<linked_class>lnkContractToDocument</linked_class>
-					<ext_key_to_me>contract_id</ext_key_to_me>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-					<ext_key_to_remote>document_id</ext_key_to_remote>
-					<duplicates/>
-				</field>
-				<field id="description" xsi:type="AttributeText">
-					<sql>description</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="start_date" xsi:type="AttributeDate">
-					<sql>start_date</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="end_date" xsi:type="AttributeDate">
-					<sql>end_date</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="cost" xsi:type="AttributeString">
-					<sql>cost</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="cost_currency" xsi:type="AttributeEnum">
-					<values>
-						<value id="dollars">
-							<code>dollars</code>
-						</value>
-						<value id="euros">
-							<code>euros</code>
-						</value>
-					</values>
-					<sql>cost_currency</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-					<display_style>list</display_style>
-				</field>
-				<field id="contracttype_id" xsi:type="AttributeExternalKey">
-					<sql>contracttype_id</sql>
-					<target_class>ContractType</target_class>
-					<is_null_allowed>true</is_null_allowed>
-					<on_target_delete>DEL_MANUAL</on_target_delete>
-				</field>
-				<field id="contracttype_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>contracttype_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="billing_frequency" xsi:type="AttributeString">
-					<sql>billing_frequency</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="cost_unit" xsi:type="AttributeString">
-					<sql>cost_unit</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="provider_id" xsi:type="AttributeExternalKey">
-					<sql>provider_id</sql>
-					<target_class>Organization</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_MANUAL</on_target_delete>
-				</field>
-				<field id="provider_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>provider_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="status" xsi:type="AttributeEnum">
-					<values>
-						<value id="production">
-							<code>production</code>
-						</value>
-						<value id="implementation">
-							<code>implementation</code>
-						</value>
-						<value id="obsolete">
-							<code>obsolete</code>
-						</value>
-					</values>
-					<sql>status</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-					<display_style>list</display_style>
-				</field>
-			</fields>
-			<methods>
-				<method id="PrefillSearchForm">
-					<code>
-						<![CDATA[
+        <category>bizmodel,searchable,structure</category>
+        <abstract>true</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>contract</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field>finalclass</db_final_class_field>
+        <naming>
+          <attributes>
+            <attribute id="name"/>
+          </attributes>
+        </naming>
+        <fields_semantic>
+          <state_attribute>status</state_attribute>
+        </fields_semantic>
+        <style>
+          <icon>../../images/icons/icons8-contract.svg</icon>
+        </style>
+        <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>
+      <fields>
+        <field id="name" xsi:type="AttributeString">
+          <sql>name</sql>
+          <default_value/>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
+        <field id="org_id" xsi:type="AttributeExternalKey">
+          <sql>org_id</sql>
+          <target_class>Organization</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+        </field>
+        <field id="organization_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>org_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="contacts_list" xsi:type="AttributeLinkedSetIndirect">
+          <linked_class>lnkContactToContract</linked_class>
+          <ext_key_to_me>contract_id</ext_key_to_me>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <ext_key_to_remote>contact_id</ext_key_to_remote>
+          <duplicates/>
+          <read_only>false</read_only>
+        </field>
+        <field id="documents_list" xsi:type="AttributeLinkedSetIndirect">
+          <linked_class>lnkContractToDocument</linked_class>
+          <ext_key_to_me>contract_id</ext_key_to_me>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <ext_key_to_remote>document_id</ext_key_to_remote>
+          <duplicates/>
+          <read_only>false</read_only>
+        </field>
+        <field id="description" xsi:type="AttributeText">
+          <sql>description</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="start_date" xsi:type="AttributeDate">
+          <sql>start_date</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="end_date" xsi:type="AttributeDate">
+          <sql>end_date</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="cost" xsi:type="AttributeString">
+          <sql>cost</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="cost_currency" xsi:type="AttributeEnum">
+          <values>
+            <value id="dollars">
+              <code>dollars</code>
+            </value>
+            <value id="euros">
+              <code>euros</code>
+            </value>
+          </values>
+          <sql>cost_currency</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+          <display_style>list</display_style>
+        </field>
+        <field id="contracttype_id" xsi:type="AttributeExternalKey">
+          <sql>contracttype_id</sql>
+          <target_class>ContractType</target_class>
+          <is_null_allowed>true</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+        </field>
+        <field id="contracttype_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>contracttype_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="billing_frequency" xsi:type="AttributeString">
+          <sql>billing_frequency</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="cost_unit" xsi:type="AttributeString">
+          <sql>cost_unit</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="provider_id" xsi:type="AttributeExternalKey">
+          <sql>provider_id</sql>
+          <target_class>Organization</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+        </field>
+        <field id="provider_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>provider_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="status" xsi:type="AttributeEnum">
+          <values>
+            <value id="production">
+              <code>production</code>
+            </value>
+            <value id="implementation">
+              <code>implementation</code>
+            </value>
+            <value id="obsolete">
+              <code>obsolete</code>
+            </value>
+          </values>
+          <sql>status</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+          <display_style>list</display_style>
+        </field>
+      </fields>
+      <methods>
+        <method id="PrefillSearchForm">
+          <code><![CDATA[
 public function PrefillSearchForm(&$aContextParam)
 {
   if($aContextParam['dest_class'] == 'Service' || is_subclass_of($aContextParam['dest_class'], 'Service'))
@@ -217,1343 +218,1353 @@ public function PrefillSearchForm(&$aContextParam)
     }
   }
 }
-]]>
-					</code>
-				</method>
-			</methods>
-			<presentation>
-				<details>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="contacts_list">
-							<rank>30</rank>
-						</item>
-						<item id="documents_list">
-							<rank>40</rank>
-						</item>
-						<item id="description">
-							<rank>50</rank>
-						</item>
-						<item id="start_date">
-							<rank>60</rank>
-						</item>
-						<item id="end_date">
-							<rank>70</rank>
-						</item>
-						<item id="cost">
-							<rank>80</rank>
-						</item>
-						<item id="cost_currency">
-							<rank>90</rank>
-						</item>
-						<item id="billing_frequency">
-							<rank>100</rank>
-						</item>
-						<item id="cost_unit">
-							<rank>110</rank>
-						</item>
-						<item id="provider_id">
-							<rank>120</rank>
-						</item>
-						<item id="status">
-							<rank>130</rank>
-						</item>
-						<item id="contracttype_id">
-							<rank>140</rank>
-						</item>
-					</items>
-				</details>
-				<default_search>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="provider_id">
-							<rank>30</rank>
-						</item>
-					</items>
-				</default_search>
-				<search>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="start_date">
-							<rank>30</rank>
-						</item>
-						<item id="end_date">
-							<rank>40</rank>
-						</item>
-						<item id="cost">
-							<rank>50</rank>
-						</item>
-						<item id="provider_id">
-							<rank>60</rank>
-						</item>
-						<item id="cost_currency">
-							<rank>70</rank>
-						</item>
-						<item id="billing_frequency">
-							<rank>80</rank>
-						</item>
-						<item id="cost_unit">
-							<rank>90</rank>
-						</item>
-						<item id="status">
-							<rank>100</rank>
-						</item>
-						<item id="contracttype_id">
-							<rank>110</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="status">
-							<rank>20</rank>
-						</item>
-						<item id="org_id">
-							<rank>30</rank>
-						</item>
-						<item id="description">
-							<rank>40</rank>
-						</item>
-						<item id="start_date">
-							<rank>50</rank>
-						</item>
-						<item id="end_date">
-							<rank>60</rank>
-						</item>
-						<item id="cost_unit">
-							<rank>70</rank>
-						</item>
-						<item id="provider_id">
-							<rank>80</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-		</class>
-		<class id="ContractType" _delta="define">
-			<parent>Typology</parent>
-			<properties>
-				<category>bizmodel,searchable</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>contracttype</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="name"/>
-					</attributes>
-				</naming>
-				<style>
-					<icon/>
-				</style>
-				<reconciliation>
-					<attributes>
-						<attribute id="name"/>
-					</attributes>
-				</reconciliation>
-			</properties>
-			<fields/>
-			<methods/>
-			<presentation>
-				<details>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-					</items>
-				</details>
-				<search>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-		</class>
-		<class id="CustomerContract" _delta="define">
-			<parent>Contract</parent>
-			<properties>
-				<category>bizmodel,searchable</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>customercontract</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="name"/>
-					</attributes>
-				</naming>
-				<style>
-					<icon>../../images/icons/icons8-contract.svg</icon>
-				</style>
-				<reconciliation>
-					<attributes>
-						<attribute id="name"/>
-						<attribute id="org_id"/>
-						<attribute id="organization_name"/>
-						<attribute id="provider_id"/>
-						<attribute id="provider_name"/>
-					</attributes>
-				</reconciliation>
-			</properties>
-			<fields>
-				<field id="services_list" xsi:type="AttributeLinkedSetIndirect">
-					<linked_class>lnkCustomerContractToService</linked_class>
-					<ext_key_to_me>customercontract_id</ext_key_to_me>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-					<ext_key_to_remote>service_id</ext_key_to_remote>
-					<duplicates/>
-				</field>
-			</fields>
-			<methods/>
-			<presentation>
-				<details>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="contacts_list">
-							<rank>30</rank>
-						</item>
-						<item id="documents_list">
-							<rank>40</rank>
-						</item>
-						<item id="description">
-							<rank>50</rank>
-						</item>
-						<item id="start_date">
-							<rank>60</rank>
-						</item>
-						<item id="end_date">
-							<rank>70</rank>
-						</item>
-						<item id="cost">
-							<rank>80</rank>
-						</item>
-						<item id="cost_currency">
-							<rank>90</rank>
-						</item>
-						<item id="billing_frequency">
-							<rank>100</rank>
-						</item>
-						<item id="cost_unit">
-							<rank>110</rank>
-						</item>
-						<item id="provider_id">
-							<rank>120</rank>
-						</item>
-						<item id="status">
-							<rank>130</rank>
-						</item>
-						<item id="contracttype_id">
-							<rank>140</rank>
-						</item>
-						<item id="services_list">
-							<rank>150</rank>
-						</item>
-					</items>
-				</details>
-				<search>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="start_date">
-							<rank>30</rank>
-						</item>
-						<item id="end_date">
-							<rank>40</rank>
-						</item>
-						<item id="provider_id">
-							<rank>50</rank>
-						</item>
-						<item id="cost">
-							<rank>60</rank>
-						</item>
-						<item id="cost_currency">
-							<rank>70</rank>
-						</item>
-						<item id="billing_frequency">
-							<rank>80</rank>
-						</item>
-						<item id="cost_unit">
-							<rank>90</rank>
-						</item>
-						<item id="status">
-							<rank>100</rank>
-						</item>
-						<item id="contracttype_id">
-							<rank>110</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="status">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="description">
-							<rank>30</rank>
-						</item>
-						<item id="start_date">
-							<rank>40</rank>
-						</item>
-						<item id="end_date">
-							<rank>50</rank>
-						</item>
-						<item id="provider_id">
-							<rank>60</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-		</class>
-		<class id="ProviderContract" _delta="define">
-			<parent>Contract</parent>
-			<properties>
-				<category>bizmodel,searchable</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>providercontract</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="name"/>
-					</attributes>
-				</naming>
-				<style>
-					<icon>../../images/icons/icons8-contract.svg</icon>
-				</style>
-				<reconciliation>
-					<attributes>
-						<attribute id="name"/>
-						<attribute id="org_id"/>
-						<attribute id="organization_name"/>
-						<attribute id="provider_id"/>
-						<attribute id="provider_name"/>
-					</attributes>
-				</reconciliation>
-			</properties>
-			<fields>
-				<field id="functionalcis_list" xsi:type="AttributeLinkedSetIndirect">
-					<linked_class>lnkFunctionalCIToProviderContract</linked_class>
-					<ext_key_to_me>providercontract_id</ext_key_to_me>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-					<ext_key_to_remote>functionalci_id</ext_key_to_remote>
-					<duplicates/>
-				</field>
-				<field id="sla" xsi:type="AttributeString">
-					<sql>sla</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="coverage" xsi:type="AttributeString">
-					<sql>coverage</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-			</fields>
-			<methods/>
-			<presentation>
-				<details>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="contacts_list">
-							<rank>30</rank>
-						</item>
-						<item id="documents_list">
-							<rank>40</rank>
-						</item>
-						<item id="description">
-							<rank>50</rank>
-						</item>
-						<item id="start_date">
-							<rank>60</rank>
-						</item>
-						<item id="end_date">
-							<rank>70</rank>
-						</item>
-						<item id="contracttype_id">
-							<rank>80</rank>
-						</item>
-						<item id="cost">
-							<rank>90</rank>
-						</item>
-						<item id="cost_currency">
-							<rank>100</rank>
-						</item>
-						<item id="billing_frequency">
-							<rank>110</rank>
-						</item>
-						<item id="cost_unit">
-							<rank>120</rank>
-						</item>
-						<item id="provider_id">
-							<rank>130</rank>
-						</item>
-						<item id="functionalcis_list">
-							<rank>140</rank>
-						</item>
-						<item id="sla">
-							<rank>150</rank>
-						</item>
-						<item id="coverage">
-							<rank>160</rank>
-						</item>
-						<item id="status">
-							<rank>170</rank>
-						</item>
-					</items>
-				</details>
-				<search>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="start_date">
-							<rank>30</rank>
-						</item>
-						<item id="end_date">
-							<rank>40</rank>
-						</item>
-						<item id="provider_id">
-							<rank>50</rank>
-						</item>
-						<item id="contracttype_id">
-							<rank>60</rank>
-						</item>
-						<item id="cost">
-							<rank>70</rank>
-						</item>
-						<item id="cost_currency">
-							<rank>80</rank>
-						</item>
-						<item id="billing_frequency">
-							<rank>90</rank>
-						</item>
-						<item id="cost_unit">
-							<rank>100</rank>
-						</item>
-						<item id="sla">
-							<rank>110</rank>
-						</item>
-						<item id="coverage">
-							<rank>120</rank>
-						</item>
-						<item id="status">
-							<rank>130</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="status">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="description">
-							<rank>30</rank>
-						</item>
-						<item id="start_date">
-							<rank>40</rank>
-						</item>
-						<item id="end_date">
-							<rank>50</rank>
-						</item>
-						<item id="provider_id">
-							<rank>60</rank>
-						</item>
-						<item id="sla">
-							<rank>70</rank>
-						</item>
-						<item id="coverage">
-							<rank>80</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-		</class>
-		<class id="lnkContactToContract" _delta="define">
-			<parent>cmdbAbstractObject</parent>
-			<properties>
-				<is_link>1</is_link>
-				<category>bizmodel</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>lnkcontacttocontract</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="contract_id"/>
-						<attribute id="contact_id"/>
-					</attributes>
-				</naming>
-				<style>
-					<icon/>
-				</style>
-				<reconciliation>
-					<attributes>
-						<attribute id="contract_id"/>
-						<attribute id="contact_id"/>
-					</attributes>
-				</reconciliation>
-			</properties>
-			<fields>
-				<field id="contract_id" xsi:type="AttributeExternalKey">
-					<sql>contract_id</sql>
-					<target_class>Contract</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_AUTO</on_target_delete>
-				</field>
-				<field id="contract_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>contract_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="contact_id" xsi:type="AttributeExternalKey">
-					<sql>contact_id</sql>
-					<target_class>Contact</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_AUTO</on_target_delete>
-				</field>
-				<field id="contact_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>contact_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-			</fields>
-			<methods/>
-			<presentation>
-				<details>
-					<items>
-						<item id="contract_id">
-							<rank>10</rank>
-						</item>
-						<item id="contact_id">
-							<rank>20</rank>
-						</item>
-					</items>
-				</details>
-				<search>
-					<items>
-						<item id="contract_id">
-							<rank>10</rank>
-						</item>
-						<item id="contact_id">
-							<rank>20</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="contract_id">
-							<rank>10</rank>
-						</item>
-						<item id="contact_id">
-							<rank>20</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-		</class>
-		<class id="lnkContractToDocument" _delta="define">
-			<parent>cmdbAbstractObject</parent>
-			<properties>
-				<is_link>1</is_link>
-				<category>bizmodel</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>lnkcontracttodocument</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="contract_id"/>
-						<attribute id="document_id"/>
-					</attributes>
-				</naming>
-				<style>
-					<icon/>
-				</style>
-				<reconciliation>
-					<attributes>
-						<attribute id="contract_id"/>
-						<attribute id="document_id"/>
-					</attributes>
-				</reconciliation>
-			</properties>
-			<fields>
-				<field id="contract_id" xsi:type="AttributeExternalKey">
-					<sql>contract_id</sql>
-					<target_class>Contract</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_AUTO</on_target_delete>
-				</field>
-				<field id="contract_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>contract_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="document_id" xsi:type="AttributeExternalKey">
-					<sql>document_id</sql>
-					<target_class>Document</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_AUTO</on_target_delete>
-				</field>
-				<field id="document_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>document_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-			</fields>
-			<methods/>
-			<presentation>
-				<details>
-					<items>
-						<item id="contract_id">
-							<rank>10</rank>
-						</item>
-						<item id="document_id">
-							<rank>20</rank>
-						</item>
-					</items>
-				</details>
-				<search>
-					<items>
-						<item id="contract_id">
-							<rank>10</rank>
-						</item>
-						<item id="document_id">
-							<rank>20</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="contract_id">
-							<rank>10</rank>
-						</item>
-						<item id="document_id">
-							<rank>20</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-		</class>
-		<class id="ServiceFamily" _delta="define">
-			<parent>cmdbAbstractObject</parent>
-			<properties>
-				<category>bizmodel,searchable</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>servicefamily</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="name"/>
-					</attributes>
-				</naming>
-				<fields_semantic>
-					<image_attribute>icon</image_attribute>
-				</fields_semantic>
-				<style>
-					<icon>../../images/icons/icons8-service.svg</icon>
-				</style>
-				<reconciliation>
-					<attributes>
-						<attribute id="name"/>
-					</attributes>
-				</reconciliation>
-			</properties>
-			<fields>
-				<field id="name" xsi:type="AttributeString">
-					<sql>name</sql>
-					<default_value/>
-					<is_null_allowed>false</is_null_allowed>
-				</field>
-				<field id="icon" xsi:type="AttributeImage">
-					<display_max_width>96</display_max_width>
-					<display_max_height>96</display_max_height>
-					<storage_max_width>256</storage_max_width>
-					<storage_max_height>256</storage_max_height>
-					<default_image/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="services_list" xsi:type="AttributeLinkedSet">
-					<linked_class>Service</linked_class>
-					<ext_key_to_me>servicefamily_id</ext_key_to_me>
-					<edit_mode>add_only</edit_mode>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-					<duplicates/>
-				</field>
-			</fields>
-			<methods/>
-			<presentation>
-				<details>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="icon">
-							<rank>15</rank>
-						</item>
-						<item id="services_list">
-							<rank>20</rank>
-						</item>
-					</items>
-				</details>
-				<default_search>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-					</items>
-				</default_search>
-				<search>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-		</class>
-		<class id="Service" _delta="define">
-			<parent>cmdbAbstractObject</parent>
-			<properties>
-				<category>bizmodel,searchable</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>service</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="name"/>
-					</attributes>
-				</naming>
-				<fields_semantic>
-					<image_attribute>icon</image_attribute>
-					<state_attribute>status</state_attribute>
-				</fields_semantic>
-				<style>
-					<icon>../../images/icons/icons8-service.svg</icon>
-				</style>
-				<reconciliation>
-					<attributes>
-						<attribute id="name"/>
-						<attribute id="org_id"/>
-						<attribute id="organization_name"/>
-					</attributes>
-				</reconciliation>
-			</properties>
-			<fields>
-				<field id="name" xsi:type="AttributeString">
-					<sql>name</sql>
-					<default_value/>
-					<is_null_allowed>false</is_null_allowed>
-				</field>
-				<field id="org_id" xsi:type="AttributeExternalKey">
-					<sql>org_id</sql>
-					<target_class>Organization</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_MANUAL</on_target_delete>
-				</field>
-				<field id="organization_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>org_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="servicefamily_id" xsi:type="AttributeExternalKey">
-					<sql>servicefamily_id</sql>
-					<target_class>ServiceFamily</target_class>
-					<is_null_allowed>true</is_null_allowed>
-					<on_target_delete>DEL_MANUAL</on_target_delete>
-				</field>
-				<field id="servicefamily_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>servicefamily_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="description" xsi:type="AttributeText">
-					<sql>description</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="documents_list" xsi:type="AttributeLinkedSetIndirect">
-					<linked_class>lnkDocumentToService</linked_class>
-					<ext_key_to_me>service_id</ext_key_to_me>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-					<ext_key_to_remote>document_id</ext_key_to_remote>
-					<duplicates/>
-				</field>
-				<field id="contacts_list" xsi:type="AttributeLinkedSetIndirect">
-					<linked_class>lnkContactToService</linked_class>
-					<ext_key_to_me>service_id</ext_key_to_me>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-					<ext_key_to_remote>contact_id</ext_key_to_remote>
-					<duplicates/>
-				</field>
-				<field id="status" xsi:type="AttributeEnum">
-					<values>
-						<value id="production">
-							<code>production</code>
-						</value>
-						<value id="implementation">
-							<code>implementation</code>
-						</value>
-						<value id="obsolete">
-							<code>obsolete</code>
-						</value>
-					</values>
-					<sql>status</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-					<display_style>list</display_style>
-				</field>
-				<field id="icon" xsi:type="AttributeImage">
-					<display_max_width>96</display_max_width>
-					<display_max_height>96</display_max_height>
-					<storage_max_width>256</storage_max_width>
-					<storage_max_height>256</storage_max_height>
-					<default_image/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="customercontracts_list" xsi:type="AttributeLinkedSetIndirect">
-					<linked_class>lnkCustomerContractToService</linked_class>
-					<ext_key_to_me>service_id</ext_key_to_me>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-					<ext_key_to_remote>customercontract_id</ext_key_to_remote>
-					<duplicates/>
-				</field>
-				<field id="providercontracts_list" xsi:type="AttributeLinkedSetIndirect">
-					<linked_class>lnkProviderContractToService</linked_class>
-					<ext_key_to_me>service_id</ext_key_to_me>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-					<ext_key_to_remote>providercontract_id</ext_key_to_remote>
-					<duplicates/>
-				</field>
-				<field id="functionalcis_list" xsi:type="AttributeLinkedSetIndirect">
-					<linked_class>lnkFunctionalCIToService</linked_class>
-					<ext_key_to_me>service_id</ext_key_to_me>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-					<ext_key_to_remote>functionalci_id</ext_key_to_remote>
-					<duplicates/>
-				</field>
-				<field id="servicesubcategories_list" xsi:type="AttributeLinkedSet">
-					<linked_class>ServiceSubcategory</linked_class>
-					<ext_key_to_me>service_id</ext_key_to_me>
-					<edit_mode>add_only</edit_mode>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-					<duplicates/>
-				</field>
-			</fields>
-			<methods/>
-			<presentation>
-				<details>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="servicefamily_id">
-							<rank>30</rank>
-						</item>
-						<item id="description">
-							<rank>40</rank>
-						</item>
-						<item id="status">
-							<rank>50</rank>
-						</item>
-						<item id="icon">
-							<rank>55</rank>
-						</item>
-						<item id="servicesubcategories_list">
-							<rank>60</rank>
-						</item>
-						<item id="documents_list">
-							<rank>70</rank>
-						</item>
-						<item id="contacts_list">
-							<rank>80</rank>
-						</item>
-						<item id="customercontracts_list">
-							<rank>90</rank>
-						</item>
-						<item id="providercontracts_list">
-							<rank>100</rank>
-						</item>
-						<item id="functionalcis_list">
-							<rank>110</rank>
-						</item>
-					</items>
-				</details>
-				<default_search>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>30</rank>
-						</item>
-						<item id="servicefamily_id">
-							<rank>40</rank>
-						</item>
-					</items>
-				</default_search>
-				<search>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="status">
-							<rank>20</rank>
-						</item>
-						<item id="org_id">
-							<rank>30</rank>
-						</item>
-						<item id="servicefamily_id">
-							<rank>40</rank>
-						</item>
-						<item id="description">
-							<rank>50</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="org_id">
-							<rank>10</rank>
-						</item>
-						<item id="status">
-							<rank>20</rank>
-						</item>
-						<item id="servicefamily_id">
-							<rank>30</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-		</class>
-		<class id="lnkDocumentToService" _delta="define">
-			<parent>cmdbAbstractObject</parent>
-			<properties>
-				<is_link>1</is_link>
-				<category>bizmodel</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>lnkdocumenttoservice</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="service_id"/>
-						<attribute id="document_id"/>
-					</attributes>
-				</naming>
-				<style>
-					<icon/>
-				</style>
-				<reconciliation>
-					<attributes>
-						<attribute id="service_id"/>
-						<attribute id="document_id"/>
-					</attributes>
-				</reconciliation>
-			</properties>
-			<fields>
-				<field id="service_id" xsi:type="AttributeExternalKey">
-					<sql>service_id</sql>
-					<target_class>Service</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_AUTO</on_target_delete>
-				</field>
-				<field id="service_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>service_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="document_id" xsi:type="AttributeExternalKey">
-					<sql>document_id</sql>
-					<target_class>Document</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_AUTO</on_target_delete>
-				</field>
-				<field id="document_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>document_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-			</fields>
-			<methods/>
-			<presentation>
-				<details>
-					<items>
-						<item id="service_id">
-							<rank>10</rank>
-						</item>
-						<item id="document_id">
-							<rank>20</rank>
-						</item>
-					</items>
-				</details>
-				<search>
-					<items>
-						<item id="service_id">
-							<rank>10</rank>
-						</item>
-						<item id="document_id">
-							<rank>20</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="service_id">
-							<rank>10</rank>
-						</item>
-						<item id="document_id">
-							<rank>20</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-		</class>
-		<class id="lnkContactToService" _delta="define">
-			<parent>cmdbAbstractObject</parent>
-			<properties>
-				<is_link>1</is_link>
-				<category>bizmodel</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>lnkcontacttoservice</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="service_id"/>
-						<attribute id="contact_id"/>
-					</attributes>
-				</naming>
-				<style>
-					<icon/>
-				</style>
-				<reconciliation>
-					<attributes>
-						<attribute id="service_id"/>
-						<attribute id="contact_id"/>
-					</attributes>
-				</reconciliation>
-			</properties>
-			<fields>
-				<field id="service_id" xsi:type="AttributeExternalKey">
-					<sql>service_id</sql>
-					<target_class>Service</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_AUTO</on_target_delete>
-				</field>
-				<field id="service_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>service_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="contact_id" xsi:type="AttributeExternalKey">
-					<sql>contact_id</sql>
-					<target_class>Contact</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_AUTO</on_target_delete>
-				</field>
-				<field id="contact_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>contact_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-			</fields>
-			<methods/>
-			<presentation>
-				<details>
-					<items>
-						<item id="service_id">
-							<rank>10</rank>
-						</item>
-						<item id="contact_id">
-							<rank>20</rank>
-						</item>
-					</items>
-				</details>
-				<search>
-					<items>
-						<item id="service_id">
-							<rank>10</rank>
-						</item>
-						<item id="contact_id">
-							<rank>20</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="service_id">
-							<rank>10</rank>
-						</item>
-						<item id="contact_id">
-							<rank>20</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-		</class>
-		<class id="ServiceSubcategory" _delta="define">
-			<parent>cmdbAbstractObject</parent>
-			<properties>
-				<category>bizmodel,searchable</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>servicesubcategory</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="name"/>
-					</attributes>
-				</naming>
-				<fields_semantic>
-					<state_attribute>status</state_attribute>
-				</fields_semantic>
-				<style>
-					<icon>../../images/icons/icons8-service.svg</icon>
-				</style>
-				<reconciliation>
-					<attributes>
-						<attribute id="name"/>
-						<attribute id="service_id"/>
-						<attribute id="service_name"/>
-					</attributes>
-				</reconciliation>
-			</properties>
-			<fields>
-				<field id="name" xsi:type="AttributeString">
-					<sql>name</sql>
-					<default_value/>
-					<is_null_allowed>false</is_null_allowed>
-				</field>
-				<field id="description" xsi:type="AttributeText">
-					<sql>description</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="service_id" xsi:type="AttributeExternalKey">
-					<sql>service_id</sql>
-					<target_class>Service</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_MANUAL</on_target_delete>
-				</field>
-				<field id="service_org_id" xsi:type="AttributeExternalField">
-					<extkey_attcode>service_id</extkey_attcode>
-					<target_attcode>org_id</target_attcode>
-				</field>
-				<field id="service_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>service_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="service_provider" xsi:type="AttributeExternalField">
-					<extkey_attcode>service_id</extkey_attcode>
-					<target_attcode>organization_name</target_attcode>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="request_type" xsi:type="AttributeEnum">
-					<values>
-						<value id="incident">
-							<code>incident</code>
-						</value>
-						<value id="service_request">
-							<code>service_request</code>
-						</value>
-					</values>
-					<sql>request_type</sql>
-					<default_value>incident</default_value>
-					<is_null_allowed>false</is_null_allowed>
-					<display_style>radio_horizontal</display_style>
-				</field>
-				<field id="status" xsi:type="AttributeEnum">
-					<values>
-						<value id="production">
-							<code>production</code>
-						</value>
-						<value id="implementation">
-							<code>implementation</code>
-						</value>
-						<value id="obsolete">
-							<code>obsolete</code>
-						</value>
-					</values>
-					<sql>status</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-					<display_style>list</display_style>
-				</field>
-			</fields>
-			<methods/>
-			<presentation>
-				<details>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="service_id">
-							<rank>20</rank>
-						</item>
-						<item id="service_org_id">
-							<rank>30</rank>
-						</item>
-						<item id="status">
-							<rank>40</rank>
-						</item>
-						<item id="request_type">
-							<rank>50</rank>
-						</item>
-						<item id="description">
-							<rank>70</rank>
-						</item>
-					</items>
-				</details>
-				<default_search>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="service_id">
-							<rank>20</rank>
-						</item>
-						<item id="service_org_id">
-							<rank>60</rank>
-						</item>
-					</items>
-				</default_search>
-				<search>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="service_id">
-							<rank>20</rank>
-						</item>
-						<item id="description">
-							<rank>30</rank>
-						</item>
-						<item id="status">
-							<rank>40</rank>
-						</item>
-						<item id="request_type">
-							<rank>50</rank>
-						</item>
-						<item id="service_org_id">
-							<rank>60</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="service_id">
-							<rank>10</rank>
-						</item>
-						<item id="status">
-							<rank>20</rank>
-						</item>
-						<item id="request_type">
-							<rank>30</rank>
-						</item>
-						<item id="service_org_id">
-							<rank>60</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-		</class>
-		<class id="SLA" _delta="define">
-			<parent>cmdbAbstractObject</parent>
-			<properties>
-				<category>bizmodel,searchable</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>sla</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="name"/>
-					</attributes>
-				</naming>
-				<style>
-					<icon>../../images/icons/icons8-adjust.svg</icon>
-				</style>
-				<reconciliation>
-					<attributes>
-						<attribute id="name"/>
-						<attribute id="org_id"/>
-						<attribute id="organization_name"/>
-					</attributes>
-				</reconciliation>
-			</properties>
-			<fields>
+]]></code>
+        </method>
+      </methods>
+      <presentation>
+        <details>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="contacts_list">
+              <rank>30</rank>
+            </item>
+            <item id="documents_list">
+              <rank>40</rank>
+            </item>
+            <item id="description">
+              <rank>50</rank>
+            </item>
+            <item id="start_date">
+              <rank>60</rank>
+            </item>
+            <item id="end_date">
+              <rank>70</rank>
+            </item>
+            <item id="cost">
+              <rank>80</rank>
+            </item>
+            <item id="cost_currency">
+              <rank>90</rank>
+            </item>
+            <item id="billing_frequency">
+              <rank>100</rank>
+            </item>
+            <item id="cost_unit">
+              <rank>110</rank>
+            </item>
+            <item id="provider_id">
+              <rank>120</rank>
+            </item>
+            <item id="status">
+              <rank>130</rank>
+            </item>
+            <item id="contracttype_id">
+              <rank>140</rank>
+            </item>
+          </items>
+        </details>
+        <default_search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="provider_id">
+              <rank>30</rank>
+            </item>
+          </items>
+        </default_search>
+        <search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="start_date">
+              <rank>30</rank>
+            </item>
+            <item id="end_date">
+              <rank>40</rank>
+            </item>
+            <item id="cost">
+              <rank>50</rank>
+            </item>
+            <item id="provider_id">
+              <rank>60</rank>
+            </item>
+            <item id="cost_currency">
+              <rank>70</rank>
+            </item>
+            <item id="billing_frequency">
+              <rank>80</rank>
+            </item>
+            <item id="cost_unit">
+              <rank>90</rank>
+            </item>
+            <item id="status">
+              <rank>100</rank>
+            </item>
+            <item id="contracttype_id">
+              <rank>110</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="status">
+              <rank>20</rank>
+            </item>
+            <item id="org_id">
+              <rank>30</rank>
+            </item>
+            <item id="description">
+              <rank>40</rank>
+            </item>
+            <item id="start_date">
+              <rank>50</rank>
+            </item>
+            <item id="end_date">
+              <rank>60</rank>
+            </item>
+            <item id="cost_unit">
+              <rank>70</rank>
+            </item>
+            <item id="provider_id">
+              <rank>80</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="ContractType" _delta="define">
+      <parent>Typology</parent>
+      <properties>
+        <category>bizmodel,searchable</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>contracttype</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="name"/>
+          </attributes>
+        </naming>
+        <style>
+          <icon/>
+        </style>
+        <reconciliation>
+          <attributes>
+            <attribute id="name"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields/>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="CustomerContract" _delta="define">
+      <parent>Contract</parent>
+      <properties>
+        <category>bizmodel,searchable</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>customercontract</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="name"/>
+          </attributes>
+        </naming>
+        <style>
+          <icon>../../images/icons/icons8-contract.svg</icon>
+        </style>
+        <reconciliation>
+          <attributes>
+            <attribute id="name"/>
+            <attribute id="org_id"/>
+            <attribute id="organization_name"/>
+            <attribute id="provider_id"/>
+            <attribute id="provider_name"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
+        <field id="services_list" xsi:type="AttributeLinkedSetIndirect">
+          <linked_class>lnkCustomerContractToService</linked_class>
+          <ext_key_to_me>customercontract_id</ext_key_to_me>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <ext_key_to_remote>service_id</ext_key_to_remote>
+          <duplicates/>
+          <read_only>false</read_only>
+        </field>
+      </fields>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="contacts_list">
+              <rank>30</rank>
+            </item>
+            <item id="documents_list">
+              <rank>40</rank>
+            </item>
+            <item id="description">
+              <rank>50</rank>
+            </item>
+            <item id="start_date">
+              <rank>60</rank>
+            </item>
+            <item id="end_date">
+              <rank>70</rank>
+            </item>
+            <item id="cost">
+              <rank>80</rank>
+            </item>
+            <item id="cost_currency">
+              <rank>90</rank>
+            </item>
+            <item id="billing_frequency">
+              <rank>100</rank>
+            </item>
+            <item id="cost_unit">
+              <rank>110</rank>
+            </item>
+            <item id="provider_id">
+              <rank>120</rank>
+            </item>
+            <item id="status">
+              <rank>130</rank>
+            </item>
+            <item id="contracttype_id">
+              <rank>140</rank>
+            </item>
+            <item id="services_list">
+              <rank>150</rank>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="start_date">
+              <rank>30</rank>
+            </item>
+            <item id="end_date">
+              <rank>40</rank>
+            </item>
+            <item id="provider_id">
+              <rank>50</rank>
+            </item>
+            <item id="cost">
+              <rank>60</rank>
+            </item>
+            <item id="cost_currency">
+              <rank>70</rank>
+            </item>
+            <item id="billing_frequency">
+              <rank>80</rank>
+            </item>
+            <item id="cost_unit">
+              <rank>90</rank>
+            </item>
+            <item id="status">
+              <rank>100</rank>
+            </item>
+            <item id="contracttype_id">
+              <rank>110</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="status">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="description">
+              <rank>30</rank>
+            </item>
+            <item id="start_date">
+              <rank>40</rank>
+            </item>
+            <item id="end_date">
+              <rank>50</rank>
+            </item>
+            <item id="provider_id">
+              <rank>60</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="ProviderContract" _delta="define">
+      <parent>Contract</parent>
+      <properties>
+        <category>bizmodel,searchable</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>providercontract</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="name"/>
+          </attributes>
+        </naming>
+        <style>
+          <icon>../../images/icons/icons8-contract.svg</icon>
+        </style>
+        <reconciliation>
+          <attributes>
+            <attribute id="name"/>
+            <attribute id="org_id"/>
+            <attribute id="organization_name"/>
+            <attribute id="provider_id"/>
+            <attribute id="provider_name"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
+        <field id="functionalcis_list" xsi:type="AttributeLinkedSetIndirect">
+          <linked_class>lnkFunctionalCIToProviderContract</linked_class>
+          <ext_key_to_me>providercontract_id</ext_key_to_me>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <ext_key_to_remote>functionalci_id</ext_key_to_remote>
+          <duplicates/>
+          <read_only>false</read_only>
+        </field>
+        <field id="sla" xsi:type="AttributeString">
+          <sql>sla</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="coverage" xsi:type="AttributeString">
+          <sql>coverage</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+      </fields>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="contacts_list">
+              <rank>30</rank>
+            </item>
+            <item id="documents_list">
+              <rank>40</rank>
+            </item>
+            <item id="description">
+              <rank>50</rank>
+            </item>
+            <item id="start_date">
+              <rank>60</rank>
+            </item>
+            <item id="end_date">
+              <rank>70</rank>
+            </item>
+            <item id="contracttype_id">
+              <rank>80</rank>
+            </item>
+            <item id="cost">
+              <rank>90</rank>
+            </item>
+            <item id="cost_currency">
+              <rank>100</rank>
+            </item>
+            <item id="billing_frequency">
+              <rank>110</rank>
+            </item>
+            <item id="cost_unit">
+              <rank>120</rank>
+            </item>
+            <item id="provider_id">
+              <rank>130</rank>
+            </item>
+            <item id="functionalcis_list">
+              <rank>140</rank>
+            </item>
+            <item id="sla">
+              <rank>150</rank>
+            </item>
+            <item id="coverage">
+              <rank>160</rank>
+            </item>
+            <item id="status">
+              <rank>170</rank>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="start_date">
+              <rank>30</rank>
+            </item>
+            <item id="end_date">
+              <rank>40</rank>
+            </item>
+            <item id="provider_id">
+              <rank>50</rank>
+            </item>
+            <item id="contracttype_id">
+              <rank>60</rank>
+            </item>
+            <item id="cost">
+              <rank>70</rank>
+            </item>
+            <item id="cost_currency">
+              <rank>80</rank>
+            </item>
+            <item id="billing_frequency">
+              <rank>90</rank>
+            </item>
+            <item id="cost_unit">
+              <rank>100</rank>
+            </item>
+            <item id="sla">
+              <rank>110</rank>
+            </item>
+            <item id="coverage">
+              <rank>120</rank>
+            </item>
+            <item id="status">
+              <rank>130</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="status">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="description">
+              <rank>30</rank>
+            </item>
+            <item id="start_date">
+              <rank>40</rank>
+            </item>
+            <item id="end_date">
+              <rank>50</rank>
+            </item>
+            <item id="provider_id">
+              <rank>60</rank>
+            </item>
+            <item id="sla">
+              <rank>70</rank>
+            </item>
+            <item id="coverage">
+              <rank>80</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="lnkContactToContract" _delta="define">
+      <parent>cmdbAbstractObject</parent>
+      <properties>
+        <is_link>1</is_link>
+        <category>bizmodel</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>lnkcontacttocontract</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="contract_id"/>
+            <attribute id="contact_id"/>
+          </attributes>
+        </naming>
+        <style>
+          <icon/>
+        </style>
+        <reconciliation>
+          <attributes>
+            <attribute id="contract_id"/>
+            <attribute id="contact_id"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
+        <field id="contract_id" xsi:type="AttributeExternalKey">
+          <sql>contract_id</sql>
+          <target_class>Contract</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+        </field>
+        <field id="contract_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>contract_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="contact_id" xsi:type="AttributeExternalKey">
+          <sql>contact_id</sql>
+          <target_class>Contact</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+        </field>
+        <field id="contact_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>contact_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+      </fields>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="contract_id">
+              <rank>10</rank>
+            </item>
+            <item id="contact_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="contract_id">
+              <rank>10</rank>
+            </item>
+            <item id="contact_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="contract_id">
+              <rank>10</rank>
+            </item>
+            <item id="contact_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="lnkContractToDocument" _delta="define">
+      <parent>cmdbAbstractObject</parent>
+      <properties>
+        <is_link>1</is_link>
+        <category>bizmodel</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>lnkcontracttodocument</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="contract_id"/>
+            <attribute id="document_id"/>
+          </attributes>
+        </naming>
+        <style>
+          <icon/>
+        </style>
+        <reconciliation>
+          <attributes>
+            <attribute id="contract_id"/>
+            <attribute id="document_id"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
+        <field id="contract_id" xsi:type="AttributeExternalKey">
+          <sql>contract_id</sql>
+          <target_class>Contract</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+        </field>
+        <field id="contract_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>contract_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="document_id" xsi:type="AttributeExternalKey">
+          <sql>document_id</sql>
+          <target_class>Document</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+        </field>
+        <field id="document_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>document_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+      </fields>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="contract_id">
+              <rank>10</rank>
+            </item>
+            <item id="document_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="contract_id">
+              <rank>10</rank>
+            </item>
+            <item id="document_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="contract_id">
+              <rank>10</rank>
+            </item>
+            <item id="document_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="ServiceFamily" _delta="define">
+      <parent>cmdbAbstractObject</parent>
+      <properties>
+        <category>bizmodel,searchable</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>servicefamily</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="name"/>
+          </attributes>
+        </naming>
+        <fields_semantic>
+          <image_attribute>icon</image_attribute>
+        </fields_semantic>
+        <style>
+          <icon>../../images/icons/icons8-service.svg</icon>
+        </style>
+        <reconciliation>
+          <attributes>
+            <attribute id="name"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
+        <field id="name" xsi:type="AttributeString">
+          <sql>name</sql>
+          <default_value/>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
+        <field id="icon" xsi:type="AttributeImage">
+          <display_max_width>96</display_max_width>
+          <display_max_height>96</display_max_height>
+          <storage_max_width>256</storage_max_width>
+          <storage_max_height>256</storage_max_height>
+          <default_image/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="services_list" xsi:type="AttributeLinkedSet">
+          <linked_class>Service</linked_class>
+          <ext_key_to_me>servicefamily_id</ext_key_to_me>
+          <legacy_edit_mode>add_only</legacy_edit_mode>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <duplicates/>
+          <relation_type>link</relation_type>
+          <read_only>false</read_only>
+        </field>
+      </fields>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="icon">
+              <rank>15</rank>
+            </item>
+            <item id="services_list">
+              <rank>20</rank>
+            </item>
+          </items>
+        </details>
+        <default_search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+          </items>
+        </default_search>
+        <search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="Service" _delta="define">
+      <parent>cmdbAbstractObject</parent>
+      <properties>
+        <category>bizmodel,searchable</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>service</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="name"/>
+          </attributes>
+        </naming>
+        <fields_semantic>
+          <image_attribute>icon</image_attribute>
+          <state_attribute>status</state_attribute>
+        </fields_semantic>
+        <style>
+          <icon>../../images/icons/icons8-service.svg</icon>
+        </style>
+        <reconciliation>
+          <attributes>
+            <attribute id="name"/>
+            <attribute id="org_id"/>
+            <attribute id="organization_name"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
+        <field id="name" xsi:type="AttributeString">
+          <sql>name</sql>
+          <default_value/>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
+        <field id="org_id" xsi:type="AttributeExternalKey">
+          <sql>org_id</sql>
+          <target_class>Organization</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+        </field>
+        <field id="organization_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>org_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="servicefamily_id" xsi:type="AttributeExternalKey">
+          <sql>servicefamily_id</sql>
+          <target_class>ServiceFamily</target_class>
+          <is_null_allowed>true</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+        </field>
+        <field id="servicefamily_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>servicefamily_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="description" xsi:type="AttributeText">
+          <sql>description</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="documents_list" xsi:type="AttributeLinkedSetIndirect">
+          <linked_class>lnkDocumentToService</linked_class>
+          <ext_key_to_me>service_id</ext_key_to_me>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <ext_key_to_remote>document_id</ext_key_to_remote>
+          <duplicates/>
+          <read_only>false</read_only>
+        </field>
+        <field id="contacts_list" xsi:type="AttributeLinkedSetIndirect">
+          <linked_class>lnkContactToService</linked_class>
+          <ext_key_to_me>service_id</ext_key_to_me>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <ext_key_to_remote>contact_id</ext_key_to_remote>
+          <duplicates/>
+          <read_only>false</read_only>
+        </field>
+        <field id="status" xsi:type="AttributeEnum">
+          <values>
+            <value id="production">
+              <code>production</code>
+            </value>
+            <value id="implementation">
+              <code>implementation</code>
+            </value>
+            <value id="obsolete">
+              <code>obsolete</code>
+            </value>
+          </values>
+          <sql>status</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+          <display_style>list</display_style>
+        </field>
+        <field id="icon" xsi:type="AttributeImage">
+          <display_max_width>96</display_max_width>
+          <display_max_height>96</display_max_height>
+          <storage_max_width>256</storage_max_width>
+          <storage_max_height>256</storage_max_height>
+          <default_image/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="customercontracts_list" xsi:type="AttributeLinkedSetIndirect">
+          <linked_class>lnkCustomerContractToService</linked_class>
+          <ext_key_to_me>service_id</ext_key_to_me>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <ext_key_to_remote>customercontract_id</ext_key_to_remote>
+          <duplicates/>
+          <read_only>false</read_only>
+        </field>
+        <field id="providercontracts_list" xsi:type="AttributeLinkedSetIndirect">
+          <linked_class>lnkProviderContractToService</linked_class>
+          <ext_key_to_me>service_id</ext_key_to_me>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <ext_key_to_remote>providercontract_id</ext_key_to_remote>
+          <duplicates/>
+          <read_only>false</read_only>
+        </field>
+        <field id="functionalcis_list" xsi:type="AttributeLinkedSetIndirect">
+          <linked_class>lnkFunctionalCIToService</linked_class>
+          <ext_key_to_me>service_id</ext_key_to_me>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <ext_key_to_remote>functionalci_id</ext_key_to_remote>
+          <duplicates/>
+          <read_only>false</read_only>
+        </field>
+        <field id="servicesubcategories_list" xsi:type="AttributeLinkedSet">
+          <linked_class>ServiceSubcategory</linked_class>
+          <ext_key_to_me>service_id</ext_key_to_me>
+          <legacy_edit_mode>add_only</legacy_edit_mode>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <duplicates/>
+          <relation_type>link</relation_type>
+          <read_only>false</read_only>
+        </field>
+      </fields>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="servicefamily_id">
+              <rank>30</rank>
+            </item>
+            <item id="description">
+              <rank>40</rank>
+            </item>
+            <item id="status">
+              <rank>50</rank>
+            </item>
+            <item id="icon">
+              <rank>55</rank>
+            </item>
+            <item id="servicesubcategories_list">
+              <rank>60</rank>
+            </item>
+            <item id="documents_list">
+              <rank>70</rank>
+            </item>
+            <item id="contacts_list">
+              <rank>80</rank>
+            </item>
+            <item id="customercontracts_list">
+              <rank>90</rank>
+            </item>
+            <item id="providercontracts_list">
+              <rank>100</rank>
+            </item>
+            <item id="functionalcis_list">
+              <rank>110</rank>
+            </item>
+          </items>
+        </details>
+        <default_search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>30</rank>
+            </item>
+            <item id="servicefamily_id">
+              <rank>40</rank>
+            </item>
+          </items>
+        </default_search>
+        <search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="status">
+              <rank>20</rank>
+            </item>
+            <item id="org_id">
+              <rank>30</rank>
+            </item>
+            <item id="servicefamily_id">
+              <rank>40</rank>
+            </item>
+            <item id="description">
+              <rank>50</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="org_id">
+              <rank>10</rank>
+            </item>
+            <item id="status">
+              <rank>20</rank>
+            </item>
+            <item id="servicefamily_id">
+              <rank>30</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="lnkDocumentToService" _delta="define">
+      <parent>cmdbAbstractObject</parent>
+      <properties>
+        <is_link>1</is_link>
+        <category>bizmodel</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>lnkdocumenttoservice</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="service_id"/>
+            <attribute id="document_id"/>
+          </attributes>
+        </naming>
+        <style>
+          <icon/>
+        </style>
+        <reconciliation>
+          <attributes>
+            <attribute id="service_id"/>
+            <attribute id="document_id"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
+        <field id="service_id" xsi:type="AttributeExternalKey">
+          <sql>service_id</sql>
+          <target_class>Service</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+        </field>
+        <field id="service_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>service_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="document_id" xsi:type="AttributeExternalKey">
+          <sql>document_id</sql>
+          <target_class>Document</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+        </field>
+        <field id="document_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>document_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+      </fields>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="service_id">
+              <rank>10</rank>
+            </item>
+            <item id="document_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="service_id">
+              <rank>10</rank>
+            </item>
+            <item id="document_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="service_id">
+              <rank>10</rank>
+            </item>
+            <item id="document_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="lnkContactToService" _delta="define">
+      <parent>cmdbAbstractObject</parent>
+      <properties>
+        <is_link>1</is_link>
+        <category>bizmodel</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>lnkcontacttoservice</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="service_id"/>
+            <attribute id="contact_id"/>
+          </attributes>
+        </naming>
+        <style>
+          <icon/>
+        </style>
+        <reconciliation>
+          <attributes>
+            <attribute id="service_id"/>
+            <attribute id="contact_id"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
+        <field id="service_id" xsi:type="AttributeExternalKey">
+          <sql>service_id</sql>
+          <target_class>Service</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+        </field>
+        <field id="service_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>service_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="contact_id" xsi:type="AttributeExternalKey">
+          <sql>contact_id</sql>
+          <target_class>Contact</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+        </field>
+        <field id="contact_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>contact_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+      </fields>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="service_id">
+              <rank>10</rank>
+            </item>
+            <item id="contact_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="service_id">
+              <rank>10</rank>
+            </item>
+            <item id="contact_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="service_id">
+              <rank>10</rank>
+            </item>
+            <item id="contact_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="ServiceSubcategory" _delta="define">
+      <parent>cmdbAbstractObject</parent>
+      <properties>
+        <category>bizmodel,searchable</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>servicesubcategory</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="name"/>
+          </attributes>
+        </naming>
+        <fields_semantic>
+          <state_attribute>status</state_attribute>
+        </fields_semantic>
+        <style>
+          <icon>../../images/icons/icons8-service.svg</icon>
+        </style>
+        <reconciliation>
+          <attributes>
+            <attribute id="name"/>
+            <attribute id="service_id"/>
+            <attribute id="service_name"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
+        <field id="name" xsi:type="AttributeString">
+          <sql>name</sql>
+          <default_value/>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
+        <field id="description" xsi:type="AttributeText">
+          <sql>description</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="service_id" xsi:type="AttributeExternalKey">
+          <sql>service_id</sql>
+          <target_class>Service</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+        </field>
+        <field id="service_org_id" xsi:type="AttributeExternalField">
+          <extkey_attcode>service_id</extkey_attcode>
+          <target_attcode>org_id</target_attcode>
+        </field>
+        <field id="service_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>service_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="service_provider" xsi:type="AttributeExternalField">
+          <extkey_attcode>service_id</extkey_attcode>
+          <target_attcode>organization_name</target_attcode>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="request_type" xsi:type="AttributeEnum">
+          <values>
+            <value id="incident">
+              <code>incident</code>
+            </value>
+            <value id="service_request">
+              <code>service_request</code>
+            </value>
+          </values>
+          <sql>request_type</sql>
+          <default_value>incident</default_value>
+          <is_null_allowed>false</is_null_allowed>
+          <display_style>radio_horizontal</display_style>
+        </field>
+        <field id="status" xsi:type="AttributeEnum">
+          <values>
+            <value id="production">
+              <code>production</code>
+            </value>
+            <value id="implementation">
+              <code>implementation</code>
+            </value>
+            <value id="obsolete">
+              <code>obsolete</code>
+            </value>
+          </values>
+          <sql>status</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+          <display_style>list</display_style>
+        </field>
+      </fields>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="service_id">
+              <rank>20</rank>
+            </item>
+            <item id="service_org_id">
+              <rank>30</rank>
+            </item>
+            <item id="status">
+              <rank>40</rank>
+            </item>
+            <item id="request_type">
+              <rank>50</rank>
+            </item>
+            <item id="description">
+              <rank>70</rank>
+            </item>
+          </items>
+        </details>
+        <default_search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="service_id">
+              <rank>20</rank>
+            </item>
+            <item id="service_org_id">
+              <rank>60</rank>
+            </item>
+          </items>
+        </default_search>
+        <search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="service_id">
+              <rank>20</rank>
+            </item>
+            <item id="description">
+              <rank>30</rank>
+            </item>
+            <item id="status">
+              <rank>40</rank>
+            </item>
+            <item id="request_type">
+              <rank>50</rank>
+            </item>
+            <item id="service_org_id">
+              <rank>60</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="service_id">
+              <rank>10</rank>
+            </item>
+            <item id="status">
+              <rank>20</rank>
+            </item>
+            <item id="request_type">
+              <rank>30</rank>
+            </item>
+            <item id="service_org_id">
+              <rank>60</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="SLA" _delta="define">
+      <parent>cmdbAbstractObject</parent>
+      <properties>
+        <category>bizmodel,searchable</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>sla</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="name"/>
+          </attributes>
+        </naming>
+        <style>
+          <icon>../../images/icons/icons8-adjust.svg</icon>
+        </style>
+        <reconciliation>
+          <attributes>
+            <attribute id="name"/>
+            <attribute id="org_id"/>
+            <attribute id="organization_name"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
         <field id="name" xsi:type="AttributeString">
           <sql>name</sql>
           <default_value/>
@@ -1581,17 +1592,20 @@ public function PrefillSearchForm(&$aContextParam)
           <count_max>0</count_max>
           <ext_key_to_remote>slt_id</ext_key_to_remote>
           <duplicates/>
+          <read_only>false</read_only>
         </field>
         <field id="customercontracts_list" xsi:type="AttributeLinkedSet">
           <linked_class>lnkCustomerContractToService</linked_class>
           <ext_key_to_me>sla_id</ext_key_to_me>
           <count_min>0</count_min>
           <count_max>0</count_max>
-          <edit_mode>none</edit_mode>
+          <legacy_edit_mode>none</legacy_edit_mode>
+          <relation_type>link</relation_type>
+          <read_only>true</read_only>
         </field>
       </fields>
-			<methods/>
-			<presentation>
+      <methods/>
+      <presentation>
         <details>
           <items>
             <item id="name">
@@ -1648,96 +1662,96 @@ public function PrefillSearchForm(&$aContextParam)
           </items>
         </list>
       </presentation>
-		</class>
-		<class id="SLT" _delta="define">
-			<parent>cmdbAbstractObject</parent>
-			<properties>
-				<category>bizmodel,searchable</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>slt</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="name"/>
-					</attributes>
-				</naming>
-				<style>
-					<icon>../../images/icons/icons8-time-limit.svg</icon>
-				</style>
-				<reconciliation>
-					<attributes>
-						<attribute id="name"/>
-						<attribute id="priority"/>
-						<attribute id="request_type"/>
-						<attribute id="metric"/>
-					</attributes>
-				</reconciliation>
-			</properties>
-			<fields>
-				<field id="name" xsi:type="AttributeString">
-					<sql>name</sql>
-					<default_value/>
-					<is_null_allowed>false</is_null_allowed>
-				</field>
-				<field id="priority" xsi:type="AttributeEnum">
-					<values>
-						<value id="1">
-							<code>1</code>
-						</value>
-						<value id="2">
-							<code>2</code>
-						</value>
-						<value id="3">
-							<code>3</code>
-						</value>
-						<value id="4">
-							<code>4</code>
-						</value>
-					</values>
-					<sql>priority</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-					<display_style>list</display_style>
-				</field>
-				<field id="request_type" xsi:type="AttributeEnum">
-					<values>
-						<value id="service_request">
-							<code>service_request</code>
-						</value>
-						<value id="incident">
-							<code>incident</code>
-						</value>
-					</values>
-					<sql>request_type</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-					<display_style>list</display_style>
-				</field>
-				<field id="metric" xsi:type="AttributeEnum">
-					<values>
-						<value id="tto">
-							<code>tto</code>
-						</value>
-						<value id="ttr">
-							<code>ttr</code>
-						</value>
-					</values>
-					<sql>metric</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-					<display_style>list</display_style>
-				</field>
-				<field id="value" xsi:type="AttributeInteger">
-					<sql>value</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="unit" xsi:type="AttributeEnum">
-					<values>
-						<value id="hours">
-							<code>hours</code>
+    </class>
+    <class id="SLT" _delta="define">
+      <parent>cmdbAbstractObject</parent>
+      <properties>
+        <category>bizmodel,searchable</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>slt</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="name"/>
+          </attributes>
+        </naming>
+        <style>
+          <icon>../../images/icons/icons8-time-limit.svg</icon>
+        </style>
+        <reconciliation>
+          <attributes>
+            <attribute id="name"/>
+            <attribute id="priority"/>
+            <attribute id="request_type"/>
+            <attribute id="metric"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
+        <field id="name" xsi:type="AttributeString">
+          <sql>name</sql>
+          <default_value/>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
+        <field id="priority" xsi:type="AttributeEnum">
+          <values>
+            <value id="1">
+              <code>1</code>
+            </value>
+            <value id="2">
+              <code>2</code>
+            </value>
+            <value id="3">
+              <code>3</code>
+            </value>
+            <value id="4">
+              <code>4</code>
+            </value>
+          </values>
+          <sql>priority</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+          <display_style>list</display_style>
+        </field>
+        <field id="request_type" xsi:type="AttributeEnum">
+          <values>
+            <value id="service_request">
+              <code>service_request</code>
+            </value>
+            <value id="incident">
+              <code>incident</code>
+            </value>
+          </values>
+          <sql>request_type</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+          <display_style>list</display_style>
+        </field>
+        <field id="metric" xsi:type="AttributeEnum">
+          <values>
+            <value id="tto">
+              <code>tto</code>
+            </value>
+            <value id="ttr">
+              <code>ttr</code>
+            </value>
+          </values>
+          <sql>metric</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+          <display_style>list</display_style>
+        </field>
+        <field id="value" xsi:type="AttributeInteger">
+          <sql>value</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="unit" xsi:type="AttributeEnum">
+          <values>
+            <value id="hours">
+              <code>hours</code>
             </value>
             <value id="minutes">
               <code>minutes</code>
@@ -1755,14 +1769,15 @@ public function PrefillSearchForm(&$aContextParam)
           <count_max>0</count_max>
           <ext_key_to_remote>sla_id</ext_key_to_remote>
           <duplicates/>
+          <read_only>false</read_only>
         </field>
       </fields>
-			<methods/>
-			<presentation>
-				<details>
-					<items>
-						<item id="name">
-							<rank>10</rank>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="name">
+              <rank>10</rank>
             </item>
             <item id="priority">
               <rank>20</rank>
@@ -1842,515 +1857,518 @@ public function PrefillSearchForm(&$aContextParam)
           </items>
         </list>
       </presentation>
-		</class>
-		<class id="lnkSLAToSLT" _delta="define">
-			<parent>cmdbAbstractObject</parent>
-			<properties>
-				<is_link>1</is_link>
-				<category>bizmodel</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>lnkslatoslt</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="sla_id"/>
-						<attribute id="slt_id"/>
-					</attributes>
-				</naming>
-				<style>
-					<icon/>
-				</style>
-				<reconciliation>
-					<attributes>
-						<attribute id="sla_id"/>
-						<attribute id="slt_id"/>
-					</attributes>
-				</reconciliation>
-			</properties>
-			<fields>
-				<field id="sla_id" xsi:type="AttributeExternalKey">
-					<sql>sla_id</sql>
-					<target_class>SLA</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_AUTO</on_target_delete>
-				</field>
-				<field id="sla_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>sla_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="slt_id" xsi:type="AttributeExternalKey">
-					<sql>slt_id</sql>
-					<target_class>SLT</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_AUTO</on_target_delete>
-				</field>
-				<field id="slt_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>slt_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="slt_metric" xsi:type="AttributeExternalField">
-					<extkey_attcode>slt_id</extkey_attcode>
-					<target_attcode>metric</target_attcode>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="slt_request_type" xsi:type="AttributeExternalField">
-					<extkey_attcode>slt_id</extkey_attcode>
-					<target_attcode>request_type</target_attcode>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="slt_ticket_priority" xsi:type="AttributeExternalField">
-					<extkey_attcode>slt_id</extkey_attcode>
-					<target_attcode>priority</target_attcode>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="slt_value" xsi:type="AttributeExternalField">
-					<extkey_attcode>slt_id</extkey_attcode>
-					<target_attcode>value</target_attcode>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="slt_value_unit" xsi:type="AttributeExternalField">
-					<extkey_attcode>slt_id</extkey_attcode>
-					<target_attcode>unit</target_attcode>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-			</fields>
-			<methods/>
-			<presentation>
-				<details>
-					<items>
-						<item id="sla_id">
-							<rank>10</rank>
-						</item>
-						<item id="slt_id">
-							<rank>20</rank>
-						</item>
-					</items>
-				</details>
-				<search>
-					<items>
-						<item id="sla_id">
-							<rank>10</rank>
-						</item>
-						<item id="slt_id">
-							<rank>20</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="sla_id">
-							<rank>10</rank>
-						</item>
-						<item id="slt_id">
-							<rank>20</rank>
-						</item>
-						<item id="slt_metric">
-							<rank>30</rank>
-						</item>
-						<item id="slt_request_type">
-							<rank>40</rank>
-						</item>
-						<item id="slt_ticket_priority">
-							<rank>50</rank>
-						</item>
-						<item id="slt_value">
-							<rank>60</rank>
-						</item>
-						<item id="slt_value_unit">
-							<rank>70</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-		</class>
-		<class id="lnkCustomerContractToService" _delta="define">
-			<parent>cmdbAbstractObject</parent>
-			<properties>
-				<is_link>1</is_link>
-				<category>bizmodel</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>lnkcustomercontracttoservice</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="customercontract_id"/>
-						<attribute id="service_id"/>
-					</attributes>
-				</naming>
-				<style>
-					<icon/>
-				</style>
-				<reconciliation>
-					<attributes>
-						<attribute id="customercontract_id"/>
-						<attribute id="service_id"/>
-					</attributes>
-				</reconciliation>
-			</properties>
-			<fields>
-				<field id="customercontract_id" xsi:type="AttributeExternalKey">
-					<sql>customercontract_id</sql>
-					<target_class>CustomerContract</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_AUTO</on_target_delete>
-				</field>
-				<field id="customercontract_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>customercontract_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="service_id" xsi:type="AttributeExternalKey">
-					<sql>service_id</sql>
-					<target_class>Service</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_AUTO</on_target_delete>
-				</field>
-				<field id="service_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>service_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="sla_id" xsi:type="AttributeExternalKey">
-					<sql>sla_id</sql>
-					<target_class>SLA</target_class>
-					<is_null_allowed>true</is_null_allowed>
-					<on_target_delete>DEL_MANUAL</on_target_delete>
-				</field>
-				<field id="sla_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>sla_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-			</fields>
-			<methods/>
-			<presentation>
-				<details>
-					<items>
-						<item id="customercontract_id">
-							<rank>10</rank>
-						</item>
-						<item id="service_id">
-							<rank>20</rank>
-						</item>
-						<item id="sla_id">
-							<rank>30</rank>
-						</item>
-					</items>
-				</details>
-				<search>
-					<items>
-						<item id="customercontract_id">
-							<rank>10</rank>
-						</item>
-						<item id="service_id">
-							<rank>20</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="customercontract_id">
-							<rank>10</rank>
-						</item>
-						<item id="service_id">
-							<rank>20</rank>
-						</item>
-						<item id="sla_id">
-							<rank>30</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-		</class>
-		<class id="lnkProviderContractToService" _delta="define">
-			<parent>cmdbAbstractObject</parent>
-			<properties>
-				<is_link>1</is_link>
-				<category>bizmodel</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>lnkprovidercontracttoservice</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="service_id"/>
-						<attribute id="providercontract_id"/>
-					</attributes>
-				</naming>
-				<style>
-					<icon/>
-				</style>
-				<reconciliation>
-					<attributes>
-						<attribute id="service_id"/>
-						<attribute id="providercontract_id"/>
-					</attributes>
-				</reconciliation>
-			</properties>
-			<fields>
-				<field id="service_id" xsi:type="AttributeExternalKey">
-					<sql>service_id</sql>
-					<target_class>Service</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_AUTO</on_target_delete>
-				</field>
-				<field id="service_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>service_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="providercontract_id" xsi:type="AttributeExternalKey">
-					<sql>providercontract_id</sql>
-					<target_class>ProviderContract</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_AUTO</on_target_delete>
-				</field>
-				<field id="providercontract_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>providercontract_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-			</fields>
-			<methods/>
-			<presentation>
-				<details>
-					<items>
-						<item id="service_id">
-							<rank>10</rank>
-						</item>
-						<item id="providercontract_id">
-							<rank>20</rank>
-						</item>
-					</items>
-				</details>
-				<search>
-					<items>
-						<item id="service_id">
-							<rank>10</rank>
-						</item>
-						<item id="providercontract_id">
-							<rank>20</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="service_id">
-							<rank>10</rank>
-						</item>
-						<item id="providercontract_id">
-							<rank>20</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-		</class>
-		<class id="DeliveryModel" _delta="define">
-			<parent>cmdbAbstractObject</parent>
-			<properties>
-				<category>bizmodel,searchable</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>deliverymodel</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="name"/>
-					</attributes>
-				</naming>
-				<style>
-					<icon>../../images/icons/icons8-service.svg</icon>
-				</style>
-				<reconciliation>
-					<attributes>
-						<attribute id="name"/>
-						<attribute id="org_id"/>
-						<attribute id="organization_name"/>
-					</attributes>
-				</reconciliation>
-			</properties>
-			<fields>
-				<field id="name" xsi:type="AttributeString">
-					<sql>name</sql>
-					<default_value/>
-					<is_null_allowed>false</is_null_allowed>
-				</field>
-				<field id="org_id" xsi:type="AttributeExternalKey">
-					<sql>org_id</sql>
-					<target_class>Organization</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_MANUAL</on_target_delete>
-				</field>
-				<field id="organization_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>org_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="description" xsi:type="AttributeText">
-					<sql>description</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="contacts_list" xsi:type="AttributeLinkedSetIndirect">
-					<linked_class>lnkDeliveryModelToContact</linked_class>
-					<ext_key_to_me>deliverymodel_id</ext_key_to_me>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-					<ext_key_to_remote>contact_id</ext_key_to_remote>
-					<duplicates/>
-				</field>
-				<field id="customers_list" xsi:type="AttributeLinkedSet">
-					<linked_class>Organization</linked_class>
-					<ext_key_to_me>deliverymodel_id</ext_key_to_me>
-					<edit_mode>add_remove</edit_mode>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-				</field>
-			</fields>
-			<methods/>
-			<presentation>
-				<details>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="description">
-							<rank>30</rank>
-						</item>
-						<item id="contacts_list">
-							<rank>40</rank>
-						</item>
-						<item id="customers_list">
-							<rank>50</rank>
-						</item>
-					</items>
-				</details>
-				<search>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="description">
-							<rank>30</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="org_id">
-							<rank>10</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-		</class>
-		<class id="lnkDeliveryModelToContact" _delta="define">
-			<parent>cmdbAbstractObject</parent>
-			<properties>
-				<is_link>1</is_link>
-				<category>bizmodel</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>lnkdeliverymodeltocontact</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="deliverymodel_id"/>
-						<attribute id="contact_id"/>
-					</attributes>
-				</naming>
-				<style>
-					<icon/>
-				</style>
-				<reconciliation>
-					<attributes>
-						<attribute id="deliverymodel_id"/>
-						<attribute id="contact_id"/>
-					</attributes>
-				</reconciliation>
-			</properties>
-			<fields>
-				<field id="deliverymodel_id" xsi:type="AttributeExternalKey">
-					<sql>deliverymodel_id</sql>
-					<target_class>DeliveryModel</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_AUTO</on_target_delete>
-				</field>
-				<field id="deliverymodel_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>deliverymodel_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="contact_id" xsi:type="AttributeExternalKey">
-					<sql>contact_id</sql>
-					<target_class>Contact</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_AUTO</on_target_delete>
-				</field>
-				<field id="contact_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>contact_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="role_id" xsi:type="AttributeExternalKey">
-					<sql>role_id</sql>
-					<target_class>ContactType</target_class>
-					<is_null_allowed>true</is_null_allowed>
-					<on_target_delete>DEL_MANUAL</on_target_delete>
-				</field>
-				<field id="role_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>role_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-			</fields>
-			<methods/>
-			<presentation>
-				<details>
-					<items>
-						<item id="deliverymodel_id">
-							<rank>10</rank>
-						</item>
-						<item id="contact_id">
-							<rank>20</rank>
-						</item>
-						<item id="role_id">
-							<rank>30</rank>
-						</item>
-					</items>
-				</details>
-				<search>
-					<items>
-						<item id="deliverymodel_id">
-							<rank>10</rank>
-						</item>
-						<item id="contact_id">
-							<rank>20</rank>
-						</item>
-						<item id="role_id">
-							<rank>30</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="deliverymodel_id">
-							<rank>10</rank>
-						</item>
-						<item id="contact_id">
-							<rank>20</rank>
-						</item>
-						<item id="role_id">
-							<rank>30</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-		</class>
+    </class>
+    <class id="lnkSLAToSLT" _delta="define">
+      <parent>cmdbAbstractObject</parent>
+      <properties>
+        <is_link>1</is_link>
+        <category>bizmodel</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>lnkslatoslt</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="sla_id"/>
+            <attribute id="slt_id"/>
+          </attributes>
+        </naming>
+        <style>
+          <icon/>
+        </style>
+        <reconciliation>
+          <attributes>
+            <attribute id="sla_id"/>
+            <attribute id="slt_id"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
+        <field id="sla_id" xsi:type="AttributeExternalKey">
+          <sql>sla_id</sql>
+          <target_class>SLA</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+        </field>
+        <field id="sla_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>sla_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="slt_id" xsi:type="AttributeExternalKey">
+          <sql>slt_id</sql>
+          <target_class>SLT</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+        </field>
+        <field id="slt_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>slt_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="slt_metric" xsi:type="AttributeExternalField">
+          <extkey_attcode>slt_id</extkey_attcode>
+          <target_attcode>metric</target_attcode>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="slt_request_type" xsi:type="AttributeExternalField">
+          <extkey_attcode>slt_id</extkey_attcode>
+          <target_attcode>request_type</target_attcode>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="slt_ticket_priority" xsi:type="AttributeExternalField">
+          <extkey_attcode>slt_id</extkey_attcode>
+          <target_attcode>priority</target_attcode>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="slt_value" xsi:type="AttributeExternalField">
+          <extkey_attcode>slt_id</extkey_attcode>
+          <target_attcode>value</target_attcode>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="slt_value_unit" xsi:type="AttributeExternalField">
+          <extkey_attcode>slt_id</extkey_attcode>
+          <target_attcode>unit</target_attcode>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+      </fields>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="sla_id">
+              <rank>10</rank>
+            </item>
+            <item id="slt_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="sla_id">
+              <rank>10</rank>
+            </item>
+            <item id="slt_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="sla_id">
+              <rank>10</rank>
+            </item>
+            <item id="slt_id">
+              <rank>20</rank>
+            </item>
+            <item id="slt_metric">
+              <rank>30</rank>
+            </item>
+            <item id="slt_request_type">
+              <rank>40</rank>
+            </item>
+            <item id="slt_ticket_priority">
+              <rank>50</rank>
+            </item>
+            <item id="slt_value">
+              <rank>60</rank>
+            </item>
+            <item id="slt_value_unit">
+              <rank>70</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="lnkCustomerContractToService" _delta="define">
+      <parent>cmdbAbstractObject</parent>
+      <properties>
+        <is_link>1</is_link>
+        <category>bizmodel</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>lnkcustomercontracttoservice</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="customercontract_id"/>
+            <attribute id="service_id"/>
+          </attributes>
+        </naming>
+        <style>
+          <icon/>
+        </style>
+        <reconciliation>
+          <attributes>
+            <attribute id="customercontract_id"/>
+            <attribute id="service_id"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
+        <field id="customercontract_id" xsi:type="AttributeExternalKey">
+          <sql>customercontract_id</sql>
+          <target_class>CustomerContract</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+        </field>
+        <field id="customercontract_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>customercontract_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="service_id" xsi:type="AttributeExternalKey">
+          <sql>service_id</sql>
+          <target_class>Service</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+        </field>
+        <field id="service_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>service_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="sla_id" xsi:type="AttributeExternalKey">
+          <sql>sla_id</sql>
+          <target_class>SLA</target_class>
+          <is_null_allowed>true</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+        </field>
+        <field id="sla_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>sla_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+      </fields>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="customercontract_id">
+              <rank>10</rank>
+            </item>
+            <item id="service_id">
+              <rank>20</rank>
+            </item>
+            <item id="sla_id">
+              <rank>30</rank>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="customercontract_id">
+              <rank>10</rank>
+            </item>
+            <item id="service_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="customercontract_id">
+              <rank>10</rank>
+            </item>
+            <item id="service_id">
+              <rank>20</rank>
+            </item>
+            <item id="sla_id">
+              <rank>30</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="lnkProviderContractToService" _delta="define">
+      <parent>cmdbAbstractObject</parent>
+      <properties>
+        <is_link>1</is_link>
+        <category>bizmodel</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>lnkprovidercontracttoservice</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="service_id"/>
+            <attribute id="providercontract_id"/>
+          </attributes>
+        </naming>
+        <style>
+          <icon/>
+        </style>
+        <reconciliation>
+          <attributes>
+            <attribute id="service_id"/>
+            <attribute id="providercontract_id"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
+        <field id="service_id" xsi:type="AttributeExternalKey">
+          <sql>service_id</sql>
+          <target_class>Service</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+        </field>
+        <field id="service_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>service_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="providercontract_id" xsi:type="AttributeExternalKey">
+          <sql>providercontract_id</sql>
+          <target_class>ProviderContract</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+        </field>
+        <field id="providercontract_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>providercontract_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+      </fields>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="service_id">
+              <rank>10</rank>
+            </item>
+            <item id="providercontract_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="service_id">
+              <rank>10</rank>
+            </item>
+            <item id="providercontract_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="service_id">
+              <rank>10</rank>
+            </item>
+            <item id="providercontract_id">
+              <rank>20</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="DeliveryModel" _delta="define">
+      <parent>cmdbAbstractObject</parent>
+      <properties>
+        <category>bizmodel,searchable</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>deliverymodel</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="name"/>
+          </attributes>
+        </naming>
+        <style>
+          <icon>../../images/icons/icons8-service.svg</icon>
+        </style>
+        <reconciliation>
+          <attributes>
+            <attribute id="name"/>
+            <attribute id="org_id"/>
+            <attribute id="organization_name"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
+        <field id="name" xsi:type="AttributeString">
+          <sql>name</sql>
+          <default_value/>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
+        <field id="org_id" xsi:type="AttributeExternalKey">
+          <sql>org_id</sql>
+          <target_class>Organization</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+        </field>
+        <field id="organization_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>org_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="description" xsi:type="AttributeText">
+          <sql>description</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="contacts_list" xsi:type="AttributeLinkedSetIndirect">
+          <linked_class>lnkDeliveryModelToContact</linked_class>
+          <ext_key_to_me>deliverymodel_id</ext_key_to_me>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <ext_key_to_remote>contact_id</ext_key_to_remote>
+          <duplicates/>
+          <read_only>false</read_only>
+        </field>
+        <field id="customers_list" xsi:type="AttributeLinkedSet">
+          <linked_class>Organization</linked_class>
+          <ext_key_to_me>deliverymodel_id</ext_key_to_me>
+          <legacy_edit_mode>add_remove</legacy_edit_mode>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <relation_type>link</relation_type>
+          <read_only>false</read_only>
+        </field>
+      </fields>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="description">
+              <rank>30</rank>
+            </item>
+            <item id="contacts_list">
+              <rank>40</rank>
+            </item>
+            <item id="customers_list">
+              <rank>50</rank>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="description">
+              <rank>30</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="org_id">
+              <rank>10</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="lnkDeliveryModelToContact" _delta="define">
+      <parent>cmdbAbstractObject</parent>
+      <properties>
+        <is_link>1</is_link>
+        <category>bizmodel</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>lnkdeliverymodeltocontact</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="deliverymodel_id"/>
+            <attribute id="contact_id"/>
+          </attributes>
+        </naming>
+        <style>
+          <icon/>
+        </style>
+        <reconciliation>
+          <attributes>
+            <attribute id="deliverymodel_id"/>
+            <attribute id="contact_id"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
+        <field id="deliverymodel_id" xsi:type="AttributeExternalKey">
+          <sql>deliverymodel_id</sql>
+          <target_class>DeliveryModel</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+        </field>
+        <field id="deliverymodel_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>deliverymodel_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="contact_id" xsi:type="AttributeExternalKey">
+          <sql>contact_id</sql>
+          <target_class>Contact</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+        </field>
+        <field id="contact_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>contact_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="role_id" xsi:type="AttributeExternalKey">
+          <sql>role_id</sql>
+          <target_class>ContactType</target_class>
+          <is_null_allowed>true</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+        </field>
+        <field id="role_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>role_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+      </fields>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="deliverymodel_id">
+              <rank>10</rank>
+            </item>
+            <item id="contact_id">
+              <rank>20</rank>
+            </item>
+            <item id="role_id">
+              <rank>30</rank>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="deliverymodel_id">
+              <rank>10</rank>
+            </item>
+            <item id="contact_id">
+              <rank>20</rank>
+            </item>
+            <item id="role_id">
+              <rank>30</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="deliverymodel_id">
+              <rank>10</rank>
+            </item>
+            <item id="contact_id">
+              <rank>20</rank>
+            </item>
+            <item id="role_id">
+              <rank>30</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
     <class id="DocumentFile" _delta="must_exist">
       <presentation>
         <details>
@@ -2393,124 +2411,124 @@ public function PrefillSearchForm(&$aContextParam)
         </details>
       </presentation>
     </class>
-	</classes>
-	<menus>
-		<menu id="ServiceManagement" xsi:type="MenuGroup" _delta="define">
-			<rank>60</rank>
-	    <style>
-		    <decoration_classes>fas fa-hands-helping</decoration_classes>
-	    </style>
-		</menu>
-		<menu id="WelcomeMenuPage" xsi:type="DashboardMenuNode" _delta="must_exist">
-			<rank>10</rank>
-			<parent>WelcomeMenu</parent>
-			<definition>
-				<layout>DashboardLayoutOneCol</layout>
-				<title/>
-				<cells>
-					<cell id="0">
-						<rank>0</rank>
-						<dashlets>
-							<dashlet id="6" xsi:type="DashletBadge" _delta="define">
-								<rank>5</rank>
-								<class>Contract</class>
-							</dashlet>
-						</dashlets>
-					</cell>
-				</cells>
-			</definition>
-		</menu>
-		<menu id="Service:Overview" xsi:type="DashboardMenuNode" _delta="define">
-			<rank>0</rank>
-			<parent>ServiceManagement</parent>
-			<definition>
-				<title>UI:ServiceMgmtMenuOverview:Title</title>
-				<layout>DashboardLayoutTwoCols</layout>
-				<cells>
-					<cell id="1">
-						<rank>1</rank>
-						<dashlets>
-							<dashlet id="1" xsi:type="DashletObjectList">
-								<rank>1</rank>
-								<title>UI-ServiceManagementOverview-CustomerContractToRenew</title>
-								<query>SELECT CustomerContract AS c WHERE c.end_date &lt; DATE_ADD(NOW(), INTERVAL 30 DAY)</query>
-							</dashlet>
-						</dashlets>
-					</cell>
-					<cell id="2">
-						<rank>2</rank>
-						<dashlets>
-							<dashlet id="2" xsi:type="DashletObjectList">
-								<rank>1</rank>
-								<title>UI-ServiceManagementOverview-ProviderContractToRenew</title>
-								<query>SELECT ProviderContract AS c WHERE c.end_date &lt; DATE_ADD(NOW(), INTERVAL 30 DAY)</query>
-							</dashlet>
-						</dashlets>
-					</cell>
-				</cells>
-			</definition>
-		</menu>
-		<menu id="CustomerContract" xsi:type="OQLMenuNode" _delta="define">
-			<rank>1</rank>
-			<parent>ServiceManagement</parent>
-			<oql>SELECT CustomerContract</oql>
-			<do_search>1</do_search>
-		</menu>
-		<menu id="ProviderContract" xsi:type="OQLMenuNode" _delta="define">
-			<rank>2</rank>
-			<parent>ServiceManagement</parent>
-			<oql>SELECT ProviderContract</oql>
-			<do_search>1</do_search>
-		</menu>
-		<menu id="ServiceFamily" xsi:type="OQLMenuNode" _delta="define">
-			<rank>3</rank>
-			<parent>ServiceManagement</parent>
-			<oql>SELECT ServiceFamily</oql>
-			<do_search>1</do_search>
-		</menu>
-		<menu id="Service" xsi:type="OQLMenuNode" _delta="define">
-			<rank>4</rank>
-			<parent>ServiceManagement</parent>
-			<oql>SELECT Service</oql>
-			<do_search>1</do_search>
-		</menu>
-		<menu id="ServiceSubcategory" xsi:type="OQLMenuNode" _delta="define">
-			<rank>5</rank>
-			<parent>ServiceManagement</parent>
-			<oql>SELECT ServiceSubcategory</oql>
-			<do_search>1</do_search>
-		</menu>
-		<menu id="SLA" xsi:type="OQLMenuNode" _delta="define">
-			<rank>6</rank>
-			<parent>ServiceManagement</parent>
-			<oql>SELECT SLA</oql>
-			<do_search>1</do_search>
-		</menu>
-		<menu id="SLT" xsi:type="OQLMenuNode" _delta="define">
-			<rank>7</rank>
-			<parent>ServiceManagement</parent>
-			<oql>SELECT SLT</oql>
-			<do_search>1</do_search>
-		</menu>
-		<menu id="DeliveryModel" xsi:type="OQLMenuNode" _delta="define">
-			<rank>8</rank>
-			<parent>ServiceManagement</parent>
-			<oql>SELECT DeliveryModel</oql>
-			<do_search>1</do_search>
-		</menu>
-		<menu id="Typology" xsi:type="DashboardMenuNode">
-			<definition>
-				<cells>
-					<cell id="0">
-						<dashlets>
-							<dashlet id="8" xsi:type="DashletBadge" _delta="define">
-								<rank>7</rank>
-								<class>ContractType</class>
-							</dashlet>
-						</dashlets>
-					</cell>
-				</cells>
-			</definition>
-		</menu>
-	</menus>
+  </classes>
+  <menus>
+    <menu id="ServiceManagement" xsi:type="MenuGroup" _delta="define">
+      <rank>60</rank>
+      <style>
+        <decoration_classes>fas fa-hands-helping</decoration_classes>
+      </style>
+    </menu>
+    <menu id="WelcomeMenuPage" xsi:type="DashboardMenuNode" _delta="must_exist">
+      <rank>10</rank>
+      <parent>WelcomeMenu</parent>
+      <definition>
+        <layout>DashboardLayoutOneCol</layout>
+        <title/>
+        <cells>
+          <cell id="0">
+            <rank>0</rank>
+            <dashlets>
+              <dashlet id="6" xsi:type="DashletBadge" _delta="define">
+                <rank>5</rank>
+                <class>Contract</class>
+              </dashlet>
+            </dashlets>
+          </cell>
+        </cells>
+      </definition>
+    </menu>
+    <menu id="Service:Overview" xsi:type="DashboardMenuNode" _delta="define">
+      <rank>0</rank>
+      <parent>ServiceManagement</parent>
+      <definition>
+        <title>UI:ServiceMgmtMenuOverview:Title</title>
+        <layout>DashboardLayoutTwoCols</layout>
+        <cells>
+          <cell id="1">
+            <rank>1</rank>
+            <dashlets>
+              <dashlet id="1" xsi:type="DashletObjectList">
+                <rank>1</rank>
+                <title>UI-ServiceManagementOverview-CustomerContractToRenew</title>
+                <query>SELECT CustomerContract AS c WHERE c.end_date &lt; DATE_ADD(NOW(), INTERVAL 30 DAY)</query>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="2">
+            <rank>2</rank>
+            <dashlets>
+              <dashlet id="2" xsi:type="DashletObjectList">
+                <rank>1</rank>
+                <title>UI-ServiceManagementOverview-ProviderContractToRenew</title>
+                <query>SELECT ProviderContract AS c WHERE c.end_date &lt; DATE_ADD(NOW(), INTERVAL 30 DAY)</query>
+              </dashlet>
+            </dashlets>
+          </cell>
+        </cells>
+      </definition>
+    </menu>
+    <menu id="CustomerContract" xsi:type="OQLMenuNode" _delta="define">
+      <rank>1</rank>
+      <parent>ServiceManagement</parent>
+      <oql>SELECT CustomerContract</oql>
+      <do_search>1</do_search>
+    </menu>
+    <menu id="ProviderContract" xsi:type="OQLMenuNode" _delta="define">
+      <rank>2</rank>
+      <parent>ServiceManagement</parent>
+      <oql>SELECT ProviderContract</oql>
+      <do_search>1</do_search>
+    </menu>
+    <menu id="ServiceFamily" xsi:type="OQLMenuNode" _delta="define">
+      <rank>3</rank>
+      <parent>ServiceManagement</parent>
+      <oql>SELECT ServiceFamily</oql>
+      <do_search>1</do_search>
+    </menu>
+    <menu id="Service" xsi:type="OQLMenuNode" _delta="define">
+      <rank>4</rank>
+      <parent>ServiceManagement</parent>
+      <oql>SELECT Service</oql>
+      <do_search>1</do_search>
+    </menu>
+    <menu id="ServiceSubcategory" xsi:type="OQLMenuNode" _delta="define">
+      <rank>5</rank>
+      <parent>ServiceManagement</parent>
+      <oql>SELECT ServiceSubcategory</oql>
+      <do_search>1</do_search>
+    </menu>
+    <menu id="SLA" xsi:type="OQLMenuNode" _delta="define">
+      <rank>6</rank>
+      <parent>ServiceManagement</parent>
+      <oql>SELECT SLA</oql>
+      <do_search>1</do_search>
+    </menu>
+    <menu id="SLT" xsi:type="OQLMenuNode" _delta="define">
+      <rank>7</rank>
+      <parent>ServiceManagement</parent>
+      <oql>SELECT SLT</oql>
+      <do_search>1</do_search>
+    </menu>
+    <menu id="DeliveryModel" xsi:type="OQLMenuNode" _delta="define">
+      <rank>8</rank>
+      <parent>ServiceManagement</parent>
+      <oql>SELECT DeliveryModel</oql>
+      <do_search>1</do_search>
+    </menu>
+    <menu id="Typology" xsi:type="DashboardMenuNode">
+      <definition>
+        <cells>
+          <cell id="0">
+            <dashlets>
+              <dashlet id="8" xsi:type="DashletBadge" _delta="define">
+                <rank>7</rank>
+                <class>ContractType</class>
+              </dashlet>
+            </dashlets>
+          </cell>
+        </cells>
+      </definition>
+    </menu>
+  </menus>
 </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 8433ae071..dcc734fae 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
@@ -30,10 +30,12 @@
         <field id="logicalvolume_list" xsi:type="AttributeLinkedSet">
           <linked_class>LogicalVolume</linked_class>
           <ext_key_to_me>storagesystem_id</ext_key_to_me>
-          <edit_mode>in_place</edit_mode>
+          <legacy_edit_mode>in_place</legacy_edit_mode>
           <tracking_level>all</tracking_level>
           <count_min>0</count_min>
           <count_max>0</count_max>
+          <relation_type>property</relation_type>
+          <read_only>false</read_only>
         </field>
       </fields>
       <presentation>
@@ -285,6 +287,7 @@
           <count_max>0</count_max>
           <ext_key_to_remote>datacenterdevice_id</ext_key_to_remote>
           <duplicates/>
+          <read_only>false</read_only>
         </field>
       </fields>
       <presentation>
@@ -529,10 +532,12 @@
         <field id="tapes_list" xsi:type="AttributeLinkedSet">
           <linked_class>Tape</linked_class>
           <ext_key_to_me>tapelibrary_id</ext_key_to_me>
-          <edit_mode>in_place</edit_mode>
+          <legacy_edit_mode>in_place</legacy_edit_mode>
           <tracking_level>all</tracking_level>
           <count_min>0</count_min>
           <count_max>0</count_max>
+          <relation_type>property</relation_type>
+          <read_only>false</read_only>
         </field>
       </fields>
       <presentation>
@@ -777,10 +782,12 @@
         <field id="nasfilesystem_list" xsi:type="AttributeLinkedSet">
           <linked_class>NASFileSystem</linked_class>
           <ext_key_to_me>nas_id</ext_key_to_me>
-          <edit_mode>in_place</edit_mode>
+          <legacy_edit_mode>in_place</legacy_edit_mode>
           <tracking_level>all</tracking_level>
           <count_min>0</count_min>
           <count_max>0</count_max>
+          <relation_type>property</relation_type>
+          <read_only>false</read_only>
         </field>
       </fields>
       <presentation>
@@ -1381,6 +1388,7 @@
           <count_max>0</count_max>
           <ext_key_to_remote>server_id</ext_key_to_remote>
           <duplicates/>
+          <read_only>false</read_only>
         </field>
         <field id="virtualdevices_list" xsi:type="AttributeLinkedSetIndirect">
           <linked_class>lnkVirtualDeviceToVolume</linked_class>
@@ -1389,6 +1397,7 @@
           <count_max>0</count_max>
           <ext_key_to_remote>virtualdevice_id</ext_key_to_remote>
           <duplicates/>
+          <read_only>false</read_only>
         </field>
       </fields>
       <presentation>
diff --git a/datamodels/2.x/itop-structure/datamodel.itop-structure.xml b/datamodels/2.x/itop-structure/datamodel.itop-structure.xml
index 09fa8e901..46f8e99e9 100644
--- a/datamodels/2.x/itop-structure/datamodel.itop-structure.xml
+++ b/datamodels/2.x/itop-structure/datamodel.itop-structure.xml
@@ -282,9 +282,11 @@
         <field id="person_list" xsi:type="AttributeLinkedSet">
           <linked_class>Person</linked_class>
           <ext_key_to_me>location_id</ext_key_to_me>
-          <edit_mode>add_only</edit_mode>
+          <legacy_edit_mode>add_only</legacy_edit_mode>
           <count_min>0</count_min>
           <count_max>0</count_max>
+          <relation_type>link</relation_type>
+          <read_only>false</read_only>
         </field>
       </fields>
       <methods/>
@@ -674,6 +676,7 @@
           <count_max>0</count_max>
           <ext_key_to_remote>team_id</ext_key_to_remote>
           <duplicates/>
+          <read_only>false</read_only>
         </field>
       </fields>
       <methods>
@@ -921,6 +924,7 @@
           <count_max>0</count_max>
           <ext_key_to_remote>person_id</ext_key_to_remote>
           <duplicates/>
+          <read_only>false</read_only>
         </field>
       </fields>
       <methods/>
@@ -1882,11 +1886,11 @@
       </theme>
     </themes>
     <themes_common>
-        <variables>
+      <variables>
         </variables>
-        <imports>
+      <imports>
         </imports>
-        <stylesheets>
+      <stylesheets>
         </stylesheets>
     </themes_common>
   </branding>
@@ -1897,4 +1901,4 @@
     </profiles>
   </user_rights>
   <constants/>
-</itop_design>
\ No newline at end of file
+</itop_design>
diff --git a/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml b/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
index fad83db62..7160a5814 100755
--- a/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
+++ b/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
@@ -1,227 +1,231 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
-	<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>
-	<classes>
-		<class id="Ticket" _delta="define">
-			<parent>cmdbAbstractObject</parent>
-			<php_parent>
-				<name>_Ticket</name>
-			</php_parent>
-			<properties>
-				<comment><![CDATA[/**
+  <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>
+  <classes>
+    <class id="Ticket" _delta="define">
+      <parent>cmdbAbstractObject</parent>
+      <php_parent>
+        <name>_Ticket</name>
+      </php_parent>
+      <properties>
+        <comment><![CDATA[/**
  * Persistent classes for a CMDB
  *
  * @copyright   Copyright (C) 2010-2021 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */]]></comment>
-				<category>bizmodel,searchable,structure</category>
-				<abstract>true</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>ticket</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field>finalclass</db_final_class_field>
-				<naming>
-					<attributes>
-						<attribute id="ref"/>
-					</attributes>
-				</naming>
-				<style>
-					<icon/>
-				</style>
-				<reconciliation>
-					<attributes>
-						<attribute id="ref"/>
-						<attribute id="finalclass"/>
-					</attributes>
-				</reconciliation>
-				<indexes>
-				 <index id="ref">
-				   <attributes>
-				     <attribute id="ref"/>
-				   </attributes>
-				 </index>
-				</indexes>
-				<uniqueness_rules>
-					<rule id="ref">
-						<attributes>
-							<attribute id="ref"/>
-						</attributes>
-						<is_blocking>false</is_blocking>
-					</rule>
-				</uniqueness_rules>
-			</properties>
-			<fields>
-				<field id="operational_status" xsi:type="AttributeMetaEnum">
-					<values>
-						<value id="ongoing">
-							<code>ongoing</code>
-						</value>
-						<value id="resolved">
-							<code>resolved</code>
-							<style>
-								<main_color>$ibo-lifecycle-success-state-primary-color</main_color>
-								<complementary_color>$ibo-lifecycle-success-state-secondary-color</complementary_color>
-								<decoration_classes>fas fa-check</decoration_classes>
-							</style>
-						</value>
-						<value id="closed">
-							<code>closed</code>
-							<style>
-								<main_color>$ibo-lifecycle-frozen-state-primary-color</main_color>
-								<complementary_color>$ibo-lifecycle-frozen-state-secondary-color</complementary_color>
-								<decoration_classes/>
-							</style>
-						</value>
-					</values>
-					<default_style>
-						<main_color>$ibo-lifecycle-neutral-state-primary-color</main_color>
-						<complementary_color>$ibo-lifecycle-neutral-state-secondary-color</complementary_color>
-						<decoration_classes/>
-					</default_style>
-					<sql>operational_status</sql>
-					<default_value>ongoing</default_value>
-					<mappings>
-						<mapping id="Ticket">
-							<attcode>status</attcode>
-							<metavalues>
-								<metavalue id="resolved">
-									<values>
-										<value id="resolved"/>
-									</values>
-								</metavalue>
-								<metavalue id="closed">
-									<values>
-										<value id="closed"/>
-										<value id="rejected"/>
-									</values>
-								</metavalue>
-							</metavalues>
-						</mapping>
-					</mappings>
-				</field>
-				<field id="ref" xsi:type="AttributeString">
-					<sql>ref</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="org_id" xsi:type="AttributeExternalKey">
-					<sql>org_id</sql>
-					<target_class>Organization</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_AUTO</on_target_delete>
-				</field>
-				<field id="org_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>org_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="caller_id" xsi:type="AttributeExternalKey">
-					<filter><![CDATA[SELECT Person WHERE org_id = :this->org_id]]></filter>
-					<dependencies>
-						<attribute id="org_id"/>
-					</dependencies>
-					<sql>caller_id</sql>
-					<target_class>Person</target_class>
-					<is_null_allowed>true</is_null_allowed>
-					<on_target_delete>DEL_AUTO</on_target_delete>
-				</field>
-				<field id="caller_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>caller_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="team_id" xsi:type="AttributeExternalKey">
-					<sql>team_id</sql>
-					<target_class>Team</target_class>
-					<is_null_allowed>true</is_null_allowed>
-					<on_target_delete>DEL_AUTO</on_target_delete>
-				</field>
-				<field id="team_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>team_id</extkey_attcode>
-					<target_attcode>email</target_attcode>
-				</field>
-				<field id="agent_id" xsi:type="AttributeExternalKey">
-					<filter><![CDATA[SELECT Person AS p JOIN lnkPersonToTeam AS l ON l.person_id=p.id JOIN Team AS t ON l.team_id=t.id WHERE t.id = :this->team_id]]></filter>
-					<dependencies>
-						<attribute id="team_id"/>
-					</dependencies>
-					<sql>agent_id</sql>
-					<target_class>Person</target_class>
-					<is_null_allowed>true</is_null_allowed>
-					<on_target_delete>DEL_AUTO</on_target_delete>
-					<allow_target_creation>false</allow_target_creation>
-				</field>
-				<field id="agent_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>agent_id</extkey_attcode>
-					<target_attcode>name</target_attcode>
-				</field>
-				<field id="title" xsi:type="AttributeString">
-					<sql>title</sql>
-					<default_value/>
-					<is_null_allowed>false</is_null_allowed>
-				</field>
-				<field id="description" xsi:type="AttributeText">
-					<sql>description</sql>
-					<default_value/>
-					<is_null_allowed>false</is_null_allowed>
-					<format>html</format>
-				</field>
-				<field id="start_date" xsi:type="AttributeDateTime">
-					<always_load_in_tables>true</always_load_in_tables>
-					<sql>start_date</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="end_date" xsi:type="AttributeDateTime">
-					<sql>end_date</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="last_update" xsi:type="AttributeDateTime">
-					<sql>last_update</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-					<tracking_level>none</tracking_level>
-				</field>
-				<field id="close_date" xsi:type="AttributeDateTime">
-					<sql>close_date</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="private_log" xsi:type="AttributeCaseLog">
-					<sql>private_log</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="contacts_list" xsi:type="AttributeLinkedSetIndirect">
-					<linked_class>lnkContactToTicket</linked_class>
-					<ext_key_to_me>ticket_id</ext_key_to_me>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-					<ext_key_to_remote>contact_id</ext_key_to_remote>
-					<duplicates/>
-				</field>
-				<field id="functionalcis_list" xsi:type="AttributeLinkedSetIndirect">
-					<linked_class>lnkFunctionalCIToTicket</linked_class>
-					<ext_key_to_me>ticket_id</ext_key_to_me>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-					<ext_key_to_remote>functionalci_id</ext_key_to_remote>
-					<duplicates/>
-				</field>
-				<field id="workorders_list" xsi:type="AttributeLinkedSet">
-					<linked_class>WorkOrder</linked_class>
-					<ext_key_to_me>ticket_id</ext_key_to_me>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-				</field>
-			</fields>
+        <category>bizmodel,searchable,structure</category>
+        <abstract>true</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>ticket</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field>finalclass</db_final_class_field>
+        <naming>
+          <attributes>
+            <attribute id="ref"/>
+          </attributes>
+        </naming>
+        <style>
+          <icon/>
+        </style>
+        <reconciliation>
+          <attributes>
+            <attribute id="ref"/>
+            <attribute id="finalclass"/>
+          </attributes>
+        </reconciliation>
+        <indexes>
+          <index id="ref">
+            <attributes>
+              <attribute id="ref"/>
+            </attributes>
+          </index>
+        </indexes>
+        <uniqueness_rules>
+          <rule id="ref">
+            <attributes>
+              <attribute id="ref"/>
+            </attributes>
+            <is_blocking>false</is_blocking>
+          </rule>
+        </uniqueness_rules>
+      </properties>
+      <fields>
+        <field id="operational_status" xsi:type="AttributeMetaEnum">
+          <values>
+            <value id="ongoing">
+              <code>ongoing</code>
+            </value>
+            <value id="resolved">
+              <code>resolved</code>
+              <style>
+                <main_color>$ibo-lifecycle-success-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-success-state-secondary-color</complementary_color>
+                <decoration_classes>fas fa-check</decoration_classes>
+              </style>
+            </value>
+            <value id="closed">
+              <code>closed</code>
+              <style>
+                <main_color>$ibo-lifecycle-frozen-state-primary-color</main_color>
+                <complementary_color>$ibo-lifecycle-frozen-state-secondary-color</complementary_color>
+                <decoration_classes/>
+              </style>
+            </value>
+          </values>
+          <default_style>
+            <main_color>$ibo-lifecycle-neutral-state-primary-color</main_color>
+            <complementary_color>$ibo-lifecycle-neutral-state-secondary-color</complementary_color>
+            <decoration_classes/>
+          </default_style>
+          <sql>operational_status</sql>
+          <default_value>ongoing</default_value>
+          <mappings>
+            <mapping id="Ticket">
+              <attcode>status</attcode>
+              <metavalues>
+                <metavalue id="resolved">
+                  <values>
+                    <value id="resolved"/>
+                  </values>
+                </metavalue>
+                <metavalue id="closed">
+                  <values>
+                    <value id="closed"/>
+                    <value id="rejected"/>
+                  </values>
+                </metavalue>
+              </metavalues>
+            </mapping>
+          </mappings>
+        </field>
+        <field id="ref" xsi:type="AttributeString">
+          <sql>ref</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="org_id" xsi:type="AttributeExternalKey">
+          <sql>org_id</sql>
+          <target_class>Organization</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+        </field>
+        <field id="org_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>org_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="caller_id" xsi:type="AttributeExternalKey">
+          <filter><![CDATA[SELECT Person WHERE org_id = :this->org_id]]></filter>
+          <dependencies>
+            <attribute id="org_id"/>
+          </dependencies>
+          <sql>caller_id</sql>
+          <target_class>Person</target_class>
+          <is_null_allowed>true</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+        </field>
+        <field id="caller_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>caller_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="team_id" xsi:type="AttributeExternalKey">
+          <sql>team_id</sql>
+          <target_class>Team</target_class>
+          <is_null_allowed>true</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+        </field>
+        <field id="team_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>team_id</extkey_attcode>
+          <target_attcode>email</target_attcode>
+        </field>
+        <field id="agent_id" xsi:type="AttributeExternalKey">
+          <filter><![CDATA[SELECT Person AS p JOIN lnkPersonToTeam AS l ON l.person_id=p.id JOIN Team AS t ON l.team_id=t.id WHERE t.id = :this->team_id]]></filter>
+          <dependencies>
+            <attribute id="team_id"/>
+          </dependencies>
+          <sql>agent_id</sql>
+          <target_class>Person</target_class>
+          <is_null_allowed>true</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+          <allow_target_creation>false</allow_target_creation>
+        </field>
+        <field id="agent_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>agent_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="title" xsi:type="AttributeString">
+          <sql>title</sql>
+          <default_value/>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
+        <field id="description" xsi:type="AttributeText">
+          <sql>description</sql>
+          <default_value/>
+          <is_null_allowed>false</is_null_allowed>
+          <format>html</format>
+        </field>
+        <field id="start_date" xsi:type="AttributeDateTime">
+          <always_load_in_tables>true</always_load_in_tables>
+          <sql>start_date</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="end_date" xsi:type="AttributeDateTime">
+          <sql>end_date</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="last_update" xsi:type="AttributeDateTime">
+          <sql>last_update</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+          <tracking_level>none</tracking_level>
+        </field>
+        <field id="close_date" xsi:type="AttributeDateTime">
+          <sql>close_date</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="private_log" xsi:type="AttributeCaseLog">
+          <sql>private_log</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="contacts_list" xsi:type="AttributeLinkedSetIndirect">
+          <linked_class>lnkContactToTicket</linked_class>
+          <ext_key_to_me>ticket_id</ext_key_to_me>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <ext_key_to_remote>contact_id</ext_key_to_remote>
+          <duplicates/>
+          <read_only>false</read_only>
+        </field>
+        <field id="functionalcis_list" xsi:type="AttributeLinkedSetIndirect">
+          <linked_class>lnkFunctionalCIToTicket</linked_class>
+          <ext_key_to_me>ticket_id</ext_key_to_me>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <ext_key_to_remote>functionalci_id</ext_key_to_remote>
+          <duplicates/>
+          <read_only>false</read_only>
+        </field>
+        <field id="workorders_list" xsi:type="AttributeLinkedSet">
+          <linked_class>WorkOrder</linked_class>
+          <ext_key_to_me>ticket_id</ext_key_to_me>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <relation_type>link</relation_type>
+          <read_only>false</read_only>
+        </field>
+      </fields>
       <methods>
-				<method id="DBInsertNoReload">
-					<static>false</static>
-					<access>public</access>
-					<type>Overload-DBObject</type>
-					<code><![CDATA[
+        <method id="DBInsertNoReload">
+          <static>false</static>
+          <access>public</access>
+          <type>Overload-DBObject</type>
+          <code><![CDATA[
     public function DBInsertNoReload()
     {
           $iNextId = ItopCounter::IncClass(get_class($this));
@@ -231,381 +235,381 @@
           return $iKey;
     }
         ]]></code>
-				</method>
-				<method id="MakeTicketRef">
-					<static>false</static>
-					<access>protected</access>
-					<type>Overload-DBObject</type>
-					<code><![CDATA[
+        </method>
+        <method id="MakeTicketRef">
+          <static>false</static>
+          <access>protected</access>
+          <type>Overload-DBObject</type>
+          <code><![CDATA[
         protected function MakeTicketRef($iNextId)
         {
                 return sprintf(static::GetTicketRefFormat(), $iNextId);
         }
         ]]></code>
-				</method>
-				<method id="GetTicketRefFormat">
-					<static>true</static>
-					<access>public</access>
-					<type>Overload-DBObject</type>
-					<code><![CDATA[
+        </method>
+        <method id="GetTicketRefFormat">
+          <static>true</static>
+          <access>public</access>
+          <type>Overload-DBObject</type>
+          <code><![CDATA[
         public static function GetTicketRefFormat()
         {
                 return 'T-%06d';
         }
         ]]></code>
-				</method>
-			</methods>
-			<presentation>
-				<details>
-					<items>
-						<item id="ref">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="caller_id">
-							<rank>30</rank>
-						</item>
-						<item id="team_id">
-							<rank>40</rank>
-						</item>
-						<item id="agent_id">
-							<rank>50</rank>
-						</item>
-						<item id="title">
-							<rank>60</rank>
-						</item>
-						<item id="description">
-							<rank>70</rank>
-						</item>
-						<item id="operational_status">
-							<rank>75</rank>
-						</item>
-						<item id="start_date">
-							<rank>80</rank>
-						</item>
-						<item id="end_date">
-							<rank>90</rank>
-						</item>
-						<item id="last_update">
-							<rank>100</rank>
-						</item>
-						<item id="close_date">
-							<rank>110</rank>
-						</item>
-						<item id="private_log">
-							<rank>120</rank>
-						</item>
-						<item id="contacts_list">
-							<rank>130</rank>
-						</item>
-						<item id="workorders_list">
-							<rank>150</rank>
-						</item>
-					</items>
-				</details>
-				<default_search>
-					<items>
-						<item id="ref">
-							<rank>10</rank>
-						</item>
-						<item id="title">
-							<rank>20</rank>
-						</item>
-						<item id="caller_id">
-							<rank>30</rank>
-						</item>
-						<item id="org_id">
-							<rank>35</rank>
-						</item>
-					</items>
-				</default_search>
-				<search>
-					<items>
-						<item id="ref">
-							<rank>10</rank>
-						</item>
-						<item id="title">
-							<rank>20</rank>
-						</item>
-						<item id="description">
-							<rank>30</rank>
-						</item>
-						<item id="operational_status">
-							<rank>35</rank>
-						</item>
-						<item id="start_date">
-							<rank>40</rank>
-						</item>
-						<item id="end_date">
-							<rank>50</rank>
-						</item>
-						<item id="last_update">
-							<rank>60</rank>
-						</item>
-						<item id="close_date">
-							<rank>70</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="ref">
-							<rank>10</rank>
-						</item>
-						<item id="org_id">
-							<rank>20</rank>
-						</item>
-						<item id="title">
-							<rank>30</rank>
-						</item>
-						<item id="caller_id">
-							<rank>40</rank>
-						</item>
-						<item id="team_id">
-							<rank>50</rank>
-						</item>
-						<item id="agent_id">
-							<rank>60</rank>
-						</item>
-						<item id="operational_status">
-							<rank>65</rank>
-						</item>
-						<item id="start_date">
-							<rank>70</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-		</class>
-		<class id="lnkContactToTicket" _delta="define">
-			<parent>cmdbAbstractObject</parent>
-			<properties>
-				<is_link>1</is_link>
-				<category>bizmodel</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>lnkcontacttoticket</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="ticket_id"/>
-						<attribute id="contact_id"/>
-					</attributes>
-				</naming>
-				<style>
-					<icon/>
-				</style>
-				<reconciliation>
-					<attributes>
-						<attribute id="ticket_id"/>
-						<attribute id="contact_id"/>
-					</attributes>
-				</reconciliation>
-			</properties>
-			<fields>
-				<field id="ticket_id" xsi:type="AttributeExternalKey">
-					<sql>ticket_id</sql>
-					<target_class>Ticket</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_AUTO</on_target_delete>
-				</field>
-				<field id="ticket_ref" xsi:type="AttributeExternalField">
-					<extkey_attcode>ticket_id</extkey_attcode>
-					<target_attcode>ref</target_attcode>
-				</field>
-				<field id="contact_id" xsi:type="AttributeExternalKey">
-					<sql>contact_id</sql>
-					<target_class>Contact</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_AUTO</on_target_delete>
-				</field>
-				<field id="contact_email" xsi:type="AttributeExternalField">
-					<extkey_attcode>contact_id</extkey_attcode>
-					<target_attcode>email</target_attcode>
-				</field>
-				<field id="role" xsi:type="AttributeString">
-					<sql>role</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="role_code" xsi:type="AttributeEnum">
-					<values>
-						<value id="manual">
-							<code>manual</code>
-						</value>
-						<value id="computed">
-							<code>computed</code>
-						</value>
-						<value id="do_not_notify">
-							<code>do_not_notify</code>
-						</value>
-					</values>
-					<sql>impact_code</sql>
-					<default_value>manual</default_value>
-					<is_null_allowed>false</is_null_allowed>
-					<display_style>list</display_style>
-				</field>
-			</fields>
-			<methods/>
-			<presentation>
-				<details>
-					<items>
-						<item id="ticket_id">
-							<rank>10</rank>
-						</item>
-						<item id="contact_id">
-							<rank>20</rank>
-						</item>
-						<item id="role_code">
-							<rank>30</rank>
-						</item>
-					</items>
-				</details>
-				<search>
-					<items>
-						<item id="ticket_id">
-							<rank>10</rank>
-						</item>
-						<item id="contact_id">
-							<rank>20</rank>
-						</item>
-						<item id="role_code">
-							<rank>30</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="ticket_id">
-							<rank>10</rank>
-						</item>
-						<item id="contact_id">
-							<rank>20</rank>
-						</item>
-						<item id="role_code">
-							<rank>30</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-		</class>
-		<class id="WorkOrder" _delta="define">
-			<parent>cmdbAbstractObject</parent>
-			<properties>
-				<category>bizmodel,searchable,incidentmgmt,requestmgmt,changemgmt,m2prequest</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>workorder</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="name"/>
-					</attributes>
-				</naming>
-				<fields_semantic>
-					<state_attribute>status</state_attribute>
-				</fields_semantic>
-				<style>
-					<icon>../../images/icons/icons8-tasklist.svg</icon>
-				</style>
-				<reconciliation>
-					<attributes>
-						<attribute id="name"/>
-						<attribute id="ticket_id"/>
-					</attributes>
-				</reconciliation>
-			</properties>
-			<fields>
-				<field id="name" xsi:type="AttributeString">
-					<sql>name</sql>
-					<default_value/>
-					<is_null_allowed>false</is_null_allowed>
-				</field>
-				<field id="status" xsi:type="AttributeEnum">
-					<values>
-						<value id="open">
-							<code>open</code>
-						</value>
-						<value id="closed">
-							<code>closed</code>
-						</value>
-					</values>
-					<sql>status</sql>
-					<default_value>open</default_value>
-					<is_null_allowed>false</is_null_allowed>
-					<display_style>list</display_style>
-				</field>
-				<field id="description" xsi:type="AttributeText">
-					<sql>description</sql>
-					<default_value/>
-					<is_null_allowed>false</is_null_allowed>
-				</field>
-				<field id="ticket_id" xsi:type="AttributeExternalKey">
-					<sql>ticket_id</sql>
-					<target_class>Ticket</target_class>
-					<is_null_allowed>true</is_null_allowed>
-					<on_target_delete>DEL_AUTO</on_target_delete>
-				</field>
-				<field id="ticket_ref" xsi:type="AttributeExternalField">
-					<extkey_attcode>ticket_id</extkey_attcode>
-					<target_attcode>ref</target_attcode>
-				</field>
-				<field id="team_id" xsi:type="AttributeExternalKey">
-					<filter>SELECT Team</filter>
-					<sql>team_id</sql>
-					<target_class>Team</target_class>
-					<is_null_allowed>false</is_null_allowed>
-					<on_target_delete>DEL_MANUAL</on_target_delete>
-				</field>
-				<field id="team_name" xsi:type="AttributeExternalField">
-					<extkey_attcode>team_id</extkey_attcode>
-					<target_attcode>email</target_attcode>
-				</field>
-				<field id="agent_id" xsi:type="AttributeExternalKey">
-					<filter><![CDATA[SELECT Person AS p JOIN lnkPersonToTeam AS l ON l.person_id=p.id JOIN Team AS t ON l.team_id=t.id WHERE t.id = :this->team_id]]></filter>
-					<dependencies>
-						<attribute id="team_id"/>
-					</dependencies>
-					<sql>owner_id</sql>
-					<target_class>Person</target_class>
-					<is_null_allowed>true</is_null_allowed>
-					<on_target_delete>DEL_MANUAL</on_target_delete>
-					<allow_target_creation>false</allow_target_creation>
-				</field>
-				<field id="agent_email" xsi:type="AttributeExternalField">
-					<extkey_attcode>agent_id</extkey_attcode>
-					<target_attcode>email</target_attcode>
-				</field>
-				<field id="start_date" xsi:type="AttributeDateTime">
-					<sql>start_date</sql>
-					<default_value/>
-					<is_null_allowed>false</is_null_allowed>
-				</field>
-				<field id="end_date" xsi:type="AttributeDateTime">
-					<sql>end_date</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="log" xsi:type="AttributeCaseLog">
-					<sql>log</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-			</fields>
-			<lifecycle>
-				<stimuli>
-					<stimulus id="ev_close" xsi:type="StimulusUserAction"/>
-				</stimuli>
-				<states>
-					<state id="open">
-						<flags/>
-						<transitions>
-							<transition id="ev_close">
-								<target>closed</target>
+        </method>
+      </methods>
+      <presentation>
+        <details>
+          <items>
+            <item id="ref">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="caller_id">
+              <rank>30</rank>
+            </item>
+            <item id="team_id">
+              <rank>40</rank>
+            </item>
+            <item id="agent_id">
+              <rank>50</rank>
+            </item>
+            <item id="title">
+              <rank>60</rank>
+            </item>
+            <item id="description">
+              <rank>70</rank>
+            </item>
+            <item id="operational_status">
+              <rank>75</rank>
+            </item>
+            <item id="start_date">
+              <rank>80</rank>
+            </item>
+            <item id="end_date">
+              <rank>90</rank>
+            </item>
+            <item id="last_update">
+              <rank>100</rank>
+            </item>
+            <item id="close_date">
+              <rank>110</rank>
+            </item>
+            <item id="private_log">
+              <rank>120</rank>
+            </item>
+            <item id="contacts_list">
+              <rank>130</rank>
+            </item>
+            <item id="workorders_list">
+              <rank>150</rank>
+            </item>
+          </items>
+        </details>
+        <default_search>
+          <items>
+            <item id="ref">
+              <rank>10</rank>
+            </item>
+            <item id="title">
+              <rank>20</rank>
+            </item>
+            <item id="caller_id">
+              <rank>30</rank>
+            </item>
+            <item id="org_id">
+              <rank>35</rank>
+            </item>
+          </items>
+        </default_search>
+        <search>
+          <items>
+            <item id="ref">
+              <rank>10</rank>
+            </item>
+            <item id="title">
+              <rank>20</rank>
+            </item>
+            <item id="description">
+              <rank>30</rank>
+            </item>
+            <item id="operational_status">
+              <rank>35</rank>
+            </item>
+            <item id="start_date">
+              <rank>40</rank>
+            </item>
+            <item id="end_date">
+              <rank>50</rank>
+            </item>
+            <item id="last_update">
+              <rank>60</rank>
+            </item>
+            <item id="close_date">
+              <rank>70</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="ref">
+              <rank>10</rank>
+            </item>
+            <item id="org_id">
+              <rank>20</rank>
+            </item>
+            <item id="title">
+              <rank>30</rank>
+            </item>
+            <item id="caller_id">
+              <rank>40</rank>
+            </item>
+            <item id="team_id">
+              <rank>50</rank>
+            </item>
+            <item id="agent_id">
+              <rank>60</rank>
+            </item>
+            <item id="operational_status">
+              <rank>65</rank>
+            </item>
+            <item id="start_date">
+              <rank>70</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="lnkContactToTicket" _delta="define">
+      <parent>cmdbAbstractObject</parent>
+      <properties>
+        <is_link>1</is_link>
+        <category>bizmodel</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>lnkcontacttoticket</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="ticket_id"/>
+            <attribute id="contact_id"/>
+          </attributes>
+        </naming>
+        <style>
+          <icon/>
+        </style>
+        <reconciliation>
+          <attributes>
+            <attribute id="ticket_id"/>
+            <attribute id="contact_id"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
+        <field id="ticket_id" xsi:type="AttributeExternalKey">
+          <sql>ticket_id</sql>
+          <target_class>Ticket</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+        </field>
+        <field id="ticket_ref" xsi:type="AttributeExternalField">
+          <extkey_attcode>ticket_id</extkey_attcode>
+          <target_attcode>ref</target_attcode>
+        </field>
+        <field id="contact_id" xsi:type="AttributeExternalKey">
+          <sql>contact_id</sql>
+          <target_class>Contact</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+        </field>
+        <field id="contact_email" xsi:type="AttributeExternalField">
+          <extkey_attcode>contact_id</extkey_attcode>
+          <target_attcode>email</target_attcode>
+        </field>
+        <field id="role" xsi:type="AttributeString">
+          <sql>role</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="role_code" xsi:type="AttributeEnum">
+          <values>
+            <value id="manual">
+              <code>manual</code>
+            </value>
+            <value id="computed">
+              <code>computed</code>
+            </value>
+            <value id="do_not_notify">
+              <code>do_not_notify</code>
+            </value>
+          </values>
+          <sql>impact_code</sql>
+          <default_value>manual</default_value>
+          <is_null_allowed>false</is_null_allowed>
+          <display_style>list</display_style>
+        </field>
+      </fields>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="ticket_id">
+              <rank>10</rank>
+            </item>
+            <item id="contact_id">
+              <rank>20</rank>
+            </item>
+            <item id="role_code">
+              <rank>30</rank>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="ticket_id">
+              <rank>10</rank>
+            </item>
+            <item id="contact_id">
+              <rank>20</rank>
+            </item>
+            <item id="role_code">
+              <rank>30</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="ticket_id">
+              <rank>10</rank>
+            </item>
+            <item id="contact_id">
+              <rank>20</rank>
+            </item>
+            <item id="role_code">
+              <rank>30</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="WorkOrder" _delta="define">
+      <parent>cmdbAbstractObject</parent>
+      <properties>
+        <category>bizmodel,searchable,incidentmgmt,requestmgmt,changemgmt,m2prequest</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>workorder</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="name"/>
+          </attributes>
+        </naming>
+        <fields_semantic>
+          <state_attribute>status</state_attribute>
+        </fields_semantic>
+        <style>
+          <icon>../../images/icons/icons8-tasklist.svg</icon>
+        </style>
+        <reconciliation>
+          <attributes>
+            <attribute id="name"/>
+            <attribute id="ticket_id"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
+        <field id="name" xsi:type="AttributeString">
+          <sql>name</sql>
+          <default_value/>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
+        <field id="status" xsi:type="AttributeEnum">
+          <values>
+            <value id="open">
+              <code>open</code>
+            </value>
+            <value id="closed">
+              <code>closed</code>
+            </value>
+          </values>
+          <sql>status</sql>
+          <default_value>open</default_value>
+          <is_null_allowed>false</is_null_allowed>
+          <display_style>list</display_style>
+        </field>
+        <field id="description" xsi:type="AttributeText">
+          <sql>description</sql>
+          <default_value/>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
+        <field id="ticket_id" xsi:type="AttributeExternalKey">
+          <sql>ticket_id</sql>
+          <target_class>Ticket</target_class>
+          <is_null_allowed>true</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+        </field>
+        <field id="ticket_ref" xsi:type="AttributeExternalField">
+          <extkey_attcode>ticket_id</extkey_attcode>
+          <target_attcode>ref</target_attcode>
+        </field>
+        <field id="team_id" xsi:type="AttributeExternalKey">
+          <filter>SELECT Team</filter>
+          <sql>team_id</sql>
+          <target_class>Team</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+        </field>
+        <field id="team_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>team_id</extkey_attcode>
+          <target_attcode>email</target_attcode>
+        </field>
+        <field id="agent_id" xsi:type="AttributeExternalKey">
+          <filter><![CDATA[SELECT Person AS p JOIN lnkPersonToTeam AS l ON l.person_id=p.id JOIN Team AS t ON l.team_id=t.id WHERE t.id = :this->team_id]]></filter>
+          <dependencies>
+            <attribute id="team_id"/>
+          </dependencies>
+          <sql>owner_id</sql>
+          <target_class>Person</target_class>
+          <is_null_allowed>true</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+          <allow_target_creation>false</allow_target_creation>
+        </field>
+        <field id="agent_email" xsi:type="AttributeExternalField">
+          <extkey_attcode>agent_id</extkey_attcode>
+          <target_attcode>email</target_attcode>
+        </field>
+        <field id="start_date" xsi:type="AttributeDateTime">
+          <sql>start_date</sql>
+          <default_value/>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
+        <field id="end_date" xsi:type="AttributeDateTime">
+          <sql>end_date</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="log" xsi:type="AttributeCaseLog">
+          <sql>log</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+      </fields>
+      <lifecycle>
+        <stimuli>
+          <stimulus id="ev_close" xsi:type="StimulusUserAction"/>
+        </stimuli>
+        <states>
+          <state id="open">
+            <flags/>
+            <transitions>
+              <transition id="ev_close">
+                <target>closed</target>
                 <actions>
                   <action>
                     <verb>SetCurrentDateIfNull</verb>
@@ -614,23 +618,23 @@
                     </params>
                   </action>
                 </actions>
-							</transition>
-						</transitions>
-					</state>
-					<state id="closed">
-						<flags/>
-						<transitions/>
-					</state>
-				</states>
-			</lifecycle>
-			<methods>
-				<method id="UpdateParentTicketLog">
-					<static>false</static>
-					<access>public</access>
-					<type>StimulusUserAction</type>
-					<arguments>
+              </transition>
+            </transitions>
+          </state>
+          <state id="closed">
+            <flags/>
+            <transitions/>
+          </state>
+        </states>
+      </lifecycle>
+      <methods>
+        <method id="UpdateParentTicketLog">
+          <static>false</static>
+          <access>public</access>
+          <type>StimulusUserAction</type>
+          <arguments>
 					</arguments>
-					<code><![CDATA[	public function UpdateParentTicketLog()
+          <code><![CDATA[	public function UpdateParentTicketLog()
 	{
 		$oLog = $this->Get('log');
 		$sLog = $oLog->GetModifiedEntry('html');
@@ -644,136 +648,140 @@
 			}
 		}
 	}]]></code>
-				</method>
-				<method id="OnUpdate">
-					<static>false</static>
-					<access>protected</access>
-					<type>Overload-DBObject</type>
-					<code><![CDATA[	protected function OnUpdate()
+        </method>
+        <method id="OnUpdate">
+          <static>false</static>
+          <access>protected</access>
+          <type>Overload-DBObject</type>
+          <code><![CDATA[	protected function OnUpdate()
 	{
 		$this->UpdateParentTicketLog();
 	}]]></code>
-				</method>
-			</methods>
-			<presentation>
-				<details>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="status">
-							<rank>20</rank>
-						</item>
-						<item id="ticket_id">
-							<rank>30</rank>
-						</item>
-						<item id="team_id">
-							<rank>40</rank>
-						</item>
-						<item id="agent_id">
-							<rank>50</rank>
-						</item>
-						<item id="description">
-							<rank>60</rank>
-						</item>
-						<item id="start_date">
-							<rank>70</rank>
-						</item>
-						<item id="end_date">
-							<rank>80</rank>
-						</item>
-					</items>
-				</details>
-				<search>
-					<items>
-						<item id="name">
-							<rank>10</rank>
-						</item>
-						<item id="status">
-							<rank>20</rank>
-						</item>
-						<item id="ticket_id">
-							<rank>30</rank>
-						</item>
-						<item id="team_id">
-							<rank>40</rank>
-						</item>
-						<item id="agent_id">
-							<rank>50</rank>
-						</item>
-						<item id="start_date">
-							<rank>60</rank>
-						</item>
-						<item id="end_date">
-							<rank>70</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="status">
-							<rank>10</rank>
-						</item>
-						<item id="ticket_id">
-							<rank>20</rank>
-						</item>
-						<item id="start_date">
-							<rank>30</rank>
-						</item>
-						<item id="end_date">
-							<rank>40</rank>
-						</item>
-						<item id="team_id">
-							<rank>50</rank>
-						</item>
-						<item id="agent_id">
-							<rank>60</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-		</class>
-		<class id="Document" _delta="must_exist">
-			<fields>
-				<field id="contracts_list" xsi:type="AttributeLinkedSetIndirect" _delta="define">
-					<linked_class>lnkContractToDocument</linked_class>
-					<ext_key_to_me>document_id</ext_key_to_me>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-					<ext_key_to_remote>contract_id</ext_key_to_remote>
-					<duplicates/>
-				</field>
-				<field id="services_list" xsi:type="AttributeLinkedSetIndirect" _delta="define">
-					<linked_class>lnkDocumentToService</linked_class>
-					<ext_key_to_me>document_id</ext_key_to_me>
-					<count_min>0</count_min>
-					<count_max>0</count_max>
-					<ext_key_to_remote>service_id</ext_key_to_remote>
-					<duplicates/>
-				</field>
-			</fields>
-			<methods/>
-			<presentation>
-				<details>
-					<items>
-						<item id="contracts_list" _delta="define">
-							<rank>70</rank>
-						</item>
-						<item id="services_list" _delta="define">
-							<rank>80</rank>
-						</item>
-					</items>
-				</details>
-			</presentation>
-		</class>
+        </method>
+      </methods>
+      <presentation>
+        <details>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="status">
+              <rank>20</rank>
+            </item>
+            <item id="ticket_id">
+              <rank>30</rank>
+            </item>
+            <item id="team_id">
+              <rank>40</rank>
+            </item>
+            <item id="agent_id">
+              <rank>50</rank>
+            </item>
+            <item id="description">
+              <rank>60</rank>
+            </item>
+            <item id="start_date">
+              <rank>70</rank>
+            </item>
+            <item id="end_date">
+              <rank>80</rank>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+            <item id="status">
+              <rank>20</rank>
+            </item>
+            <item id="ticket_id">
+              <rank>30</rank>
+            </item>
+            <item id="team_id">
+              <rank>40</rank>
+            </item>
+            <item id="agent_id">
+              <rank>50</rank>
+            </item>
+            <item id="start_date">
+              <rank>60</rank>
+            </item>
+            <item id="end_date">
+              <rank>70</rank>
+            </item>
+          </items>
+        </search>
+        <list>
+          <items>
+            <item id="status">
+              <rank>10</rank>
+            </item>
+            <item id="ticket_id">
+              <rank>20</rank>
+            </item>
+            <item id="start_date">
+              <rank>30</rank>
+            </item>
+            <item id="end_date">
+              <rank>40</rank>
+            </item>
+            <item id="team_id">
+              <rank>50</rank>
+            </item>
+            <item id="agent_id">
+              <rank>60</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="Document" _delta="must_exist">
+      <fields>
+        <field id="contracts_list" xsi:type="AttributeLinkedSetIndirect" _delta="define">
+          <linked_class>lnkContractToDocument</linked_class>
+          <ext_key_to_me>document_id</ext_key_to_me>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <ext_key_to_remote>contract_id</ext_key_to_remote>
+          <duplicates/>
+          <read_only>false</read_only>
+        </field>
+        <field id="services_list" xsi:type="AttributeLinkedSetIndirect" _delta="define">
+          <linked_class>lnkDocumentToService</linked_class>
+          <ext_key_to_me>document_id</ext_key_to_me>
+          <count_min>0</count_min>
+          <count_max>0</count_max>
+          <ext_key_to_remote>service_id</ext_key_to_remote>
+          <duplicates/>
+          <read_only>false</read_only>
+        </field>
+      </fields>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="contracts_list" _delta="define">
+              <rank>70</rank>
+            </item>
+            <item id="services_list" _delta="define">
+              <rank>80</rank>
+            </item>
+          </items>
+        </details>
+      </presentation>
+    </class>
     <class id="Person" _delta="must_exist">
       <fields>
         <field id="tickets_list" xsi:type="AttributeLinkedSet" _delta="define">
           <linked_class>Ticket</linked_class>
           <ext_key_to_me>caller_id</ext_key_to_me>
-          <edit_mode>add_only</edit_mode>
+          <legacy_edit_mode>add_only</legacy_edit_mode>
           <count_min>0</count_min>
           <count_max>0</count_max>
+          <relation_type>link</relation_type>
+          <read_only>false</read_only>
         </field>
       </fields>
       <presentation>
@@ -791,9 +799,11 @@
         <field id="tickets_list" xsi:type="AttributeLinkedSet" _delta="define">
           <linked_class>Ticket</linked_class>
           <ext_key_to_me>team_id</ext_key_to_me>
-          <edit_mode>none</edit_mode>
+          <legacy_edit_mode>none</legacy_edit_mode>
           <count_min>0</count_min>
           <count_max>0</count_max>
+          <relation_type>link</relation_type>
+          <read_only>true</read_only>
         </field>
       </fields>
       <presentation>
@@ -806,590 +816,590 @@
         </details>
       </presentation>
     </class>
-	</classes>
-	<meta>
-		<classes>
-			<class id="ResponseTicketTTO" _delta="define">
-				<interfaces>
-					<interface id="iMetricComputer"/>
-				</interfaces>
-			</class>
-			<class id="ResponseTicketTTR" _delta="define">
-				<interfaces>
-					<interface id="iMetricComputer"/>
-				</interfaces>
-			</class>
-		</classes>
-	</meta>
-	<module_designs>
-		<module_design id="itop-portal" xsi:type="portal" >
-			<bricks>
-				<brick id="services" xsi:type="Combodo\iTop\Portal\Brick\BrowseBrick" _delta="define">
-					<active>true</active>
-					<width>6</width>
-					<rank>
-						<default>10</default>
-					</rank>
-					<title>
-						<default>Brick:Portal:NewRequest:Title</default>
-					</title>
-					<description>Brick:Portal:NewRequest:Title+</description>
-					<decoration_class>
-						<default>fc fc-new-request fc-2x</default>
-					</decoration_class>
-					<!-- <fields  /> Optional tag to add attributes to the table by their code, can be specified for each level -->
-					<levels>
-						<level id="1">
-							<class>ServiceFamily</class>
-							<image_att>icon</image_att>
-							<levels>
-								<!-- Level IDs must be numeric -->
-								<level id="1">
-									<!-- Can be either a class tag with the class name or an oql tag with the query -->
-									<class>Service</class>
-									<!-- Attribute code of the above class [from the OQL] that point to the upper level class -->
-									<parent_att>servicefamily_id</parent_att>
-									<!-- Attribute code of the above class [from the OQL] used to display the object name, default is 'name'. -->
-									<name_att/>
-									<!-- Attribute code of the above class [from the OQL] used to display in a tooltip when mouse is over the object -->
-									<tooltip_att>description</tooltip_att>
-									<!-- Attribute code of the above class [from the OQL] used to display a small text beside the object's name -->
-									<!-- Note: This is not used in "list" mode -->
-									<description_att>description</description_att>
-									<!-- Attribute code of the above class [from the OQL] used to display a image beside the object's name -->
-									<!-- Note: This is used in "mosaic" mode only for now -->
-									<image_att>icon</image_att>
-									<!-- Title of the level, will be display in lists and others browse modes -->
-									<title>Class:Service</title>
-									<!-- Optional tag to add attributes to the table by their code, can be specified for each level -->
-									<!-- Note: Fields will only be displayed in "list" mode but will still be used for filter in other modes -->
-									<!-- <fields  /> -->
-									<!-- Can be empty on intermediate levels, default is drilldown -->
-									<actions>
-										<action id="drilldown" xsi:type="drilldown"/>
-									</actions>
-									<levels>
-										<level id="1">
-											<!-- Note : We could have used just a class tag and put the OQL in the scope for everybody -->
-											<oql><![CDATA[SELECT ServiceSubcategory WHERE ServiceSubcategory.status != 'obsolete']]></oql>
-											<parent_att>service_id</parent_att>
-											<name_att/>
-											<tooltip_att>description</tooltip_att>
-											<description_att>description</description_att>
-											<title>Class:ServiceSubcategory</title>
-											<actions>
-												<action id="create_from_this" xsi:type="create_from_this">
-													<!-- Can be either a class tag containing the class of the object to create, or a static method taking the origin object as a parameter and that will return a object of the desired class -->
-													<!-- (eg. \Ticket::FromServiceSubcategory($oOrigin) that should return either a UserRequest or Incident regarding the request type) -->
-													<class>UserRequest</class>
-													<!-- Optional tag that can be used on any action type -->
-													<!--<title>Create a ticket</title>-->
-													<!-- Optional tag to define if the action should be done in a modal window ("modal"), a new window ("new") or the current window ("self") -->
-													<!--<opening_target>modal</opening_target>-->
-													<icon_class>fc fc-new-request fc-1-6x fc-flip-horizontal</icon_class>
-													<!-- Optional tag to order actions -->
-													<!--<rank>1</rank>-->
-													<rules>
-														<rule id="contact-to-userrequest"/>
-														<rule id="servicesubcategory-to-userrequest"/>
-														<rule id="go-to-open-request-on-submit"/>
-													</rules>
-												</action>
-												<action id="view" xsi:type="view"/>
-											</actions>
-											<levels/>
-										</level>
-									</levels>
-								</level>
-							</levels>
-						</level>
-					</levels>
-					<browse_modes>
-						<availables>
-							<mode id="list"/>
-							<mode id="tree"/>
-							<mode id="mosaic"/>
-						</availables>
-						<default>list</default>
-					</browse_modes>
-					<!-- Optional. Set the default number of item lists will display. -->
-					<!-- <default_list_length>20</default_list_length> -->
-					<data_loading>auto</data_loading>
-					<!-- lazy|full|auto. Let the consultant choose if the list/tree data are load progressively at each page/level or in one-shot or if it is up to the system regarding the "lazy_loading_threshold" parameter -->
-				</brick>
-				<brick id="ongoing-tickets-for-portal-user" xsi:type="Combodo\iTop\Portal\Brick\ManageBrick" _delta="define">
-					<active>true</active>
-					<rank>
-						<default>20</default>
-					</rank>
-					<width>6</width>
-					<title>
-						<default>Brick:Portal:OngoingRequests:Title</default>
-					</title>
-					<!-- Optional tag to define which display modes can be used in the brick's page and the brick's tile -->
-					<!--<display_modes>-->
-					<!-- Optional tag that must contain at least 1 <mode> tag. -->
-					<!--<availables>-->
-					<!--<mode id="list"/>-->
-					<!--<mode id="pie-chart"/>-->
-					<!--<mode id="bar-chart"/>-->
-					<!--</availables>-->
-					<!-- Optional tag to define which display mode will be used by default when opening the brick -->
-					<!--<default>list</default>-->
-					<!-- Optional tag to define which display mode will be used to render the brick's tile -->
-					<!--<tile>text</tile>-->
-					<!--</display_modes>-->
-					<description>Brick:Portal:OngoingRequests:Title+</description>
-					<decoration_class>
-						<default>fc fc-ongoing-request fc-2x</default>
-					</decoration_class>
-					<oql><![CDATA[SELECT Ticket]]></oql>
-					<!-- Optional tag to define if the action should be done in a modal window ("modal"), a new window ("new") or the current window ("self") -->
-					<!--<opening_target>modal</opening_target>-->
-					<!-- Optional tag to define the how the objects should be opened. Values can be edit|view. Note that even if this is set to edit, objects not allowed in edition mode for the user (cf. scopes and security layers) will open in view mode -->
-					<!-- <opening_mode>edit</opening_mode> -->
-					<!-- Can be either a class tag with the class name or an oql tag with the query -->
-					<!-- <class>Ticket</class> -->
-					<fields>
-						<field id="title"/>
-						<field id="start_date"/>
-						<field id="status"/>
-						<field id="service_id"/>
-						<field id="servicesubcategory_id"/>
-						<field id="priority"/>
-						<field id="caller_id"/>
-					</fields>
-					<!-- Optional tag to add attributes to the table by their code -->
-					<grouping>
-						<!-- Mandatory -->
-						<tabs>
-							<!-- Optional. Show object count for each tabs. Available values are true|false. Default is false. -->
-							<show_tab_counts>true</show_tab_counts>
-							<!-- Mandatory. Grouping by tabs -->
-							<!--<attribute>operational_status</attribute>-->
-							<!-- attribute xor groups tag -->
-							<groups>
-								<!-- Can be used only with ../oql tag, not ../class tag. Reason is that we can't know the class alias to apply to the condition's fields. We might have an exception saying that the field in ambiguous for the generated query. -->
-								<group id="opened">
-									<rank>1</rank>
-									<title>Brick:Portal:OngoingRequests:Tab:OnGoing</title>
-									<!-- Optional. A string or dictionary entry to display under the page title for this tab -->
-									<!-- <description>Brick:Portal:OngoingRequests:Tab:OnGoing+</description> -->
-									<condition><![CDATA[SELECT Ticket AS T WHERE operational_status NOT IN ('closed', 'resolved')]]></condition>
-								</group>
-								<group id="resolved">
-									<rank>2</rank>
-									<title>Brick:Portal:OngoingRequests:Tab:Resolved</title>
-									<condition><![CDATA[SELECT Ticket AS T WHERE operational_status = 'resolved']]></condition>
-								</group>
-							</groups>
-						</tabs>
-						<!-- Implicit grouping on y axis by finalclass -->
-					</grouping>
-					<!-- Optional. Set the default number of item lists will display. -->
-					<!-- <default_list_length>20</default_list_length> -->
-					<data_loading>full</data_loading>
-					<export>
-						<export_default_fields>true</export_default_fields>
-					</export>
-				</brick>
-				<brick id="closed-tickets-for-portal-user" xsi:type="Combodo\iTop\Portal\Brick\ManageBrick" _delta="define">
-					<active>true</active>
-					<rank>
-						<navigation_menu>50</navigation_menu>
-					</rank>
-					<visible>
-						<home>false</home>
-					</visible>
-					<width>12</width>
-					<title>
-						<default>Brick:Portal:ClosedRequests:Title</default>
-					</title>
-					<description></description>
-					<decoration_class>
-						<default>fc fc-closed-request fc-2x</default>
-					</decoration_class>
-					<oql><![CDATA[SELECT Ticket WHERE operational_status = 'closed']]></oql>
-					<!-- Can be either a class tag with the class name or an oql tag with the query -->
-					<!-- <class>Ticket</class> -->
-					<fields>
-						<field id="finalclass"/>
-						<field id="title"/>
-						<field id="start_date"/>
-						<field id="status"/>
-						<field id="servicesubcategory_id"/>
-						<field id="priority"/>
-						<field id="caller_id"/>
-					</fields>
-					<grouping>
-						<tabs>
-							<!-- Optional. Show object count for each tabs. Available values are true|false. Default is false. -->
-							<!--<show_tab_counts>false</show_tab_counts>-->
-							<groups>
-								<group id="all">
-									<rank>1</rank>
-									<title>Brick:Portal:ClosedRequests:Title</title>
-									<condition><![CDATA[SELECT Ticket]]></condition>
-								</group>
-							</groups>
-						</tabs>
-						<!-- Implicit grouping on y axis by finalclass -->
-					</grouping>
-					<data_loading>auto</data_loading>
-					<export>
-						<export_default_fields>true</export_default_fields>
-					</export>
-				</brick>
-			</bricks>
-			<forms>
-				<form id="service-view" _delta="define">
-					<class>Service</class>
-					<fields></fields>
-					<twig>
-						<div class="row">
-							<div class="col-sm-6">
-								<div class="form_field" data-field-id="name">
+  </classes>
+  <meta>
+    <classes>
+      <class id="ResponseTicketTTO" _delta="define">
+        <interfaces>
+          <interface id="iMetricComputer"/>
+        </interfaces>
+      </class>
+      <class id="ResponseTicketTTR" _delta="define">
+        <interfaces>
+          <interface id="iMetricComputer"/>
+        </interfaces>
+      </class>
+    </classes>
+  </meta>
+  <module_designs>
+    <module_design id="itop-portal" xsi:type="portal">
+      <bricks>
+        <brick id="services" xsi:type="Combodo\iTop\Portal\Brick\BrowseBrick" _delta="define">
+          <active>true</active>
+          <width>6</width>
+          <rank>
+            <default>10</default>
+          </rank>
+          <title>
+            <default>Brick:Portal:NewRequest:Title</default>
+          </title>
+          <description>Brick:Portal:NewRequest:Title+</description>
+          <decoration_class>
+            <default>fc fc-new-request fc-2x</default>
+          </decoration_class>
+          <!-- <fields  /> Optional tag to add attributes to the table by their code, can be specified for each level -->
+          <levels>
+            <level id="1">
+              <class>ServiceFamily</class>
+              <image_att>icon</image_att>
+              <levels>
+                <!-- Level IDs must be numeric -->
+                <level id="1">
+                  <!-- Can be either a class tag with the class name or an oql tag with the query -->
+                  <class>Service</class>
+                  <!-- Attribute code of the above class [from the OQL] that point to the upper level class -->
+                  <parent_att>servicefamily_id</parent_att>
+                  <!-- Attribute code of the above class [from the OQL] used to display the object name, default is 'name'. -->
+                  <name_att/>
+                  <!-- Attribute code of the above class [from the OQL] used to display in a tooltip when mouse is over the object -->
+                  <tooltip_att>description</tooltip_att>
+                  <!-- Attribute code of the above class [from the OQL] used to display a small text beside the object's name -->
+                  <!-- Note: This is not used in "list" mode -->
+                  <description_att>description</description_att>
+                  <!-- Attribute code of the above class [from the OQL] used to display a image beside the object's name -->
+                  <!-- Note: This is used in "mosaic" mode only for now -->
+                  <image_att>icon</image_att>
+                  <!-- Title of the level, will be display in lists and others browse modes -->
+                  <title>Class:Service</title>
+                  <!-- Optional tag to add attributes to the table by their code, can be specified for each level -->
+                  <!-- Note: Fields will only be displayed in "list" mode but will still be used for filter in other modes -->
+                  <!-- <fields  /> -->
+                  <!-- Can be empty on intermediate levels, default is drilldown -->
+                  <actions>
+                    <action id="drilldown" xsi:type="drilldown"/>
+                  </actions>
+                  <levels>
+                    <level id="1">
+                      <!-- Note : We could have used just a class tag and put the OQL in the scope for everybody -->
+                      <oql><![CDATA[SELECT ServiceSubcategory WHERE ServiceSubcategory.status != 'obsolete']]></oql>
+                      <parent_att>service_id</parent_att>
+                      <name_att/>
+                      <tooltip_att>description</tooltip_att>
+                      <description_att>description</description_att>
+                      <title>Class:ServiceSubcategory</title>
+                      <actions>
+                        <action id="create_from_this" xsi:type="create_from_this">
+                          <!-- Can be either a class tag containing the class of the object to create, or a static method taking the origin object as a parameter and that will return a object of the desired class -->
+                          <!-- (eg. \Ticket::FromServiceSubcategory($oOrigin) that should return either a UserRequest or Incident regarding the request type) -->
+                          <class>UserRequest</class>
+                          <!-- Optional tag that can be used on any action type -->
+                          <!--<title>Create a ticket</title>-->
+                          <!-- Optional tag to define if the action should be done in a modal window ("modal"), a new window ("new") or the current window ("self") -->
+                          <!--<opening_target>modal</opening_target>-->
+                          <icon_class>fc fc-new-request fc-1-6x fc-flip-horizontal</icon_class>
+                          <!-- Optional tag to order actions -->
+                          <!--<rank>1</rank>-->
+                          <rules>
+                            <rule id="contact-to-userrequest"/>
+                            <rule id="servicesubcategory-to-userrequest"/>
+                            <rule id="go-to-open-request-on-submit"/>
+                          </rules>
+                        </action>
+                        <action id="view" xsi:type="view"/>
+                      </actions>
+                      <levels/>
+                    </level>
+                  </levels>
+                </level>
+              </levels>
+            </level>
+          </levels>
+          <browse_modes>
+            <availables>
+              <mode id="list"/>
+              <mode id="tree"/>
+              <mode id="mosaic"/>
+            </availables>
+            <default>list</default>
+          </browse_modes>
+          <!-- Optional. Set the default number of item lists will display. -->
+          <!-- <default_list_length>20</default_list_length> -->
+          <data_loading>auto</data_loading>
+          <!-- lazy|full|auto. Let the consultant choose if the list/tree data are load progressively at each page/level or in one-shot or if it is up to the system regarding the "lazy_loading_threshold" parameter -->
+        </brick>
+        <brick id="ongoing-tickets-for-portal-user" xsi:type="Combodo\iTop\Portal\Brick\ManageBrick" _delta="define">
+          <active>true</active>
+          <rank>
+            <default>20</default>
+          </rank>
+          <width>6</width>
+          <title>
+            <default>Brick:Portal:OngoingRequests:Title</default>
+          </title>
+          <!-- Optional tag to define which display modes can be used in the brick's page and the brick's tile -->
+          <!--<display_modes>-->
+          <!-- Optional tag that must contain at least 1 <mode> tag. -->
+          <!--<availables>-->
+          <!--<mode id="list"/>-->
+          <!--<mode id="pie-chart"/>-->
+          <!--<mode id="bar-chart"/>-->
+          <!--</availables>-->
+          <!-- Optional tag to define which display mode will be used by default when opening the brick -->
+          <!--<default>list</default>-->
+          <!-- Optional tag to define which display mode will be used to render the brick's tile -->
+          <!--<tile>text</tile>-->
+          <!--</display_modes>-->
+          <description>Brick:Portal:OngoingRequests:Title+</description>
+          <decoration_class>
+            <default>fc fc-ongoing-request fc-2x</default>
+          </decoration_class>
+          <oql><![CDATA[SELECT Ticket]]></oql>
+          <!-- Optional tag to define if the action should be done in a modal window ("modal"), a new window ("new") or the current window ("self") -->
+          <!--<opening_target>modal</opening_target>-->
+          <!-- Optional tag to define the how the objects should be opened. Values can be edit|view. Note that even if this is set to edit, objects not allowed in edition mode for the user (cf. scopes and security layers) will open in view mode -->
+          <!-- <opening_mode>edit</opening_mode> -->
+          <!-- Can be either a class tag with the class name or an oql tag with the query -->
+          <!-- <class>Ticket</class> -->
+          <fields>
+            <field id="title"/>
+            <field id="start_date"/>
+            <field id="status"/>
+            <field id="service_id"/>
+            <field id="servicesubcategory_id"/>
+            <field id="priority"/>
+            <field id="caller_id"/>
+          </fields>
+          <!-- Optional tag to add attributes to the table by their code -->
+          <grouping>
+            <!-- Mandatory -->
+            <tabs>
+              <!-- Optional. Show object count for each tabs. Available values are true|false. Default is false. -->
+              <show_tab_counts>true</show_tab_counts>
+              <!-- Mandatory. Grouping by tabs -->
+              <!--<attribute>operational_status</attribute>-->
+              <!-- attribute xor groups tag -->
+              <groups>
+                <!-- Can be used only with ../oql tag, not ../class tag. Reason is that we can't know the class alias to apply to the condition's fields. We might have an exception saying that the field in ambiguous for the generated query. -->
+                <group id="opened">
+                  <rank>1</rank>
+                  <title>Brick:Portal:OngoingRequests:Tab:OnGoing</title>
+                  <!-- Optional. A string or dictionary entry to display under the page title for this tab -->
+                  <!-- <description>Brick:Portal:OngoingRequests:Tab:OnGoing+</description> -->
+                  <condition><![CDATA[SELECT Ticket AS T WHERE operational_status NOT IN ('closed', 'resolved')]]></condition>
+                </group>
+                <group id="resolved">
+                  <rank>2</rank>
+                  <title>Brick:Portal:OngoingRequests:Tab:Resolved</title>
+                  <condition><![CDATA[SELECT Ticket AS T WHERE operational_status = 'resolved']]></condition>
+                </group>
+              </groups>
+            </tabs>
+            <!-- Implicit grouping on y axis by finalclass -->
+          </grouping>
+          <!-- Optional. Set the default number of item lists will display. -->
+          <!-- <default_list_length>20</default_list_length> -->
+          <data_loading>full</data_loading>
+          <export>
+            <export_default_fields>true</export_default_fields>
+          </export>
+        </brick>
+        <brick id="closed-tickets-for-portal-user" xsi:type="Combodo\iTop\Portal\Brick\ManageBrick" _delta="define">
+          <active>true</active>
+          <rank>
+            <navigation_menu>50</navigation_menu>
+          </rank>
+          <visible>
+            <home>false</home>
+          </visible>
+          <width>12</width>
+          <title>
+            <default>Brick:Portal:ClosedRequests:Title</default>
+          </title>
+          <description/>
+          <decoration_class>
+            <default>fc fc-closed-request fc-2x</default>
+          </decoration_class>
+          <oql><![CDATA[SELECT Ticket WHERE operational_status = 'closed']]></oql>
+          <!-- Can be either a class tag with the class name or an oql tag with the query -->
+          <!-- <class>Ticket</class> -->
+          <fields>
+            <field id="finalclass"/>
+            <field id="title"/>
+            <field id="start_date"/>
+            <field id="status"/>
+            <field id="servicesubcategory_id"/>
+            <field id="priority"/>
+            <field id="caller_id"/>
+          </fields>
+          <grouping>
+            <tabs>
+              <!-- Optional. Show object count for each tabs. Available values are true|false. Default is false. -->
+              <!--<show_tab_counts>false</show_tab_counts>-->
+              <groups>
+                <group id="all">
+                  <rank>1</rank>
+                  <title>Brick:Portal:ClosedRequests:Title</title>
+                  <condition><![CDATA[SELECT Ticket]]></condition>
+                </group>
+              </groups>
+            </tabs>
+            <!-- Implicit grouping on y axis by finalclass -->
+          </grouping>
+          <data_loading>auto</data_loading>
+          <export>
+            <export_default_fields>true</export_default_fields>
+          </export>
+        </brick>
+      </bricks>
+      <forms>
+        <form id="service-view" _delta="define">
+          <class>Service</class>
+          <fields/>
+          <twig>
+            <div class="row">
+              <div class="col-sm-6">
+                <div class="form_field" data-field-id="name">
 								</div>
-								<div class="form_field" data-field-id="description">
+                <div class="form_field" data-field-id="description">
 								</div>
+              </div>
+              <div class="col-sm-6">
+                <div class="form_field" data-field-id="org_id">
+								</div>
+                <div class="form_field" data-field-id="servicefamily_id">
+								</div>
+                <div class="form_field" data-field-id="status">
+								</div>
+              </div>
+            </div>
+          </twig>
+          <modes>
+            <mode id="view"/>
+          </modes>
+        </form>
+        <form id="servicesubcategory" _delta="define">
+          <class>ServiceSubcategory</class>
+          <!-- Optional tag to list the fields. If empty only fields from <twig> tag will be displayed, if omitted fields from zlist details will. -->
+          <fields/>
+          <!-- Optional tag to specify the form layout. Fields that are not positioned in the layout will be placed at the end of the form -->
+          <twig>
+            <div class="row">
+              <div class="col-sm-6">
+                <!-- data-field-id attribute must be an attribute code of the class -->
+                <div class="form_field" data-field-id="service_id">
+								</div>
+                <!-- data-field-flags attribute contains flags among read_only/hidden/mandatory/must_prompt/must_change -->
+                <div class="form_field" data-field-id="name" data-field-flags="read_only">
+								</div>
+                <div class="form_field" data-field-id="status" data-field-flags="read_only">
+								</div>
+              </div>
+              <div class="col-sm-6">
+                <div class="form_field" data-field-id="service_org_id">
+								</div>
+                <div class="form_field" data-field-id="request_type">
+								</div>
+              </div>
+            </div>
+            <div>
+              <div class="form_field" data-field-id="description">
 							</div>
-							<div class="col-sm-6">
-								<div class="form_field" data-field-id="org_id">
+            </div>
+          </twig>
+        </form>
+        <form id="ticket-create" _delta="define">
+          <class>Ticket</class>
+          <properties>
+            <navigation_rules>
+              <submit>
+                <default>go-to-open-requests</default>
+              </submit>
+            </navigation_rules>
+          </properties>
+          <fields/>
+          <twig>
+            <div class="row">
+              <div class="col-sm-6">
+                <div class="form_field" data-field-id="service_id" data-field-flags="mandatory">
 								</div>
-								<div class="form_field" data-field-id="servicefamily_id">
+              </div>
+              <div class="col-sm-6">
+                <div class="form_field" data-field-id="servicesubcategory_id" data-field-flags="mandatory">
 								</div>
-								<div class="form_field" data-field-id="status">
-								</div>
-							</div>
+              </div>
+            </div>
+            <div id="service_details_placeholder">
 						</div>
-					</twig>
-					<modes>
-						<mode id="view" />
-					</modes>
-				</form>
-				<form id="servicesubcategory" _delta="define">
-					<class>ServiceSubcategory</class>
-					<!-- Optional tag to list the fields. If empty only fields from <twig> tag will be displayed, if omitted fields from zlist details will. -->
-					<fields />
-					<!-- Optional tag to specify the form layout. Fields that are not positioned in the layout will be placed at the end of the form -->
-					<twig>
-						<div class="row">
-							<div class="col-sm-6">
-								<!-- data-field-id attribute must be an attribute code of the class -->
-								<div class="form_field" data-field-id="service_id">
+            <div class="row">
+              <div class="col-sm-6">
+                <div class="form_field" data-field-id="impact">
 								</div>
-								<!-- data-field-flags attribute contains flags among read_only/hidden/mandatory/must_prompt/must_change -->
-								<div class="form_field" data-field-id="name" data-field-flags="read_only">
-								</div>
-								<div class="form_field" data-field-id="status" data-field-flags="read_only">
+              </div>
+              <div class="col-sm-6">
+                <div class="form_field" data-field-id="urgency">
 								</div>
+              </div>
+            </div>
+            <div>
+              <div class="form_field" data-field-id="title">
 							</div>
-							<div class="col-sm-6">
-								<div class="form_field" data-field-id="service_org_id">
-								</div>
-								<div class="form_field" data-field-id="request_type">
-								</div>
+              <div class="form_field" data-field-id="description">
 							</div>
-						</div>
-						<div>
-							<div class="form_field" data-field-id="description">
+              <div class="form_field" data-field-id="contacts_list">
 							</div>
-						</div>
-					</twig>
-				</form>
-				<form id="ticket-create" _delta="define">
-					<class>Ticket</class>
-					<properties>
-						<navigation_rules>
-							<submit>
-								<default>go-to-open-requests</default>
-							</submit>
-						</navigation_rules>
-					</properties>
-					<fields />
-					<twig>
-						<div class="row">
-							<div class="col-sm-6">
-								<div class="form_field" data-field-id="service_id" data-field-flags="mandatory">
-								</div>
-							</div>
-							<div class="col-sm-6">
-								<div class="form_field" data-field-id="servicesubcategory_id" data-field-flags="mandatory">
-								</div>
-							</div>
-						</div>
-						<div id="service_details_placeholder">
-						</div>
-						<div class="row">
-							<div class="col-sm-6">
-								<div class="form_field" data-field-id="impact">
-								</div>
-							</div>
-							<div class="col-sm-6">
-								<div class="form_field" data-field-id="urgency">
-								</div>
-							</div>
-						</div>
-						<div>
-							<div class="form_field" data-field-id="title">
-							</div>
-							<div class="form_field" data-field-id="description">
-							</div>
-							<div class="form_field" data-field-id="contacts_list">
-							</div>
-						</div>
-					</twig>
-					<modes>
-						<!-- mode id can among create / edit / view -->
-						<mode id="create"/>
-					</modes>
-				</form>
-				<form id="ticket-edit" _delta="define">
-					<class>Ticket</class>
-					<properties>
-						<!-- Optional, display mode of the form fields. "cosy" for a regular labels over values layout; "compact" for a side-by-side
+            </div>
+          </twig>
+          <modes>
+            <!-- mode id can among create / edit / view -->
+            <mode id="create"/>
+          </modes>
+        </form>
+        <form id="ticket-edit" _delta="define">
+          <class>Ticket</class>
+          <properties>
+            <!-- Optional, display mode of the form fields. "cosy" for a regular labels over values layout; "compact" for a side-by-side
 						layout with input aligned; "dense" for a side-by-side layout with input filling all available space. You can also use a custom css class that will be used on the form as "form_xxx", as well as on the fields as "form_field_xxx".-->
-						<!--<display_mode>cosy</display_mode>-->
-						<!-- Optional, when set to false, submit button is hidden when transitions are available on the object (in creation and edit
+            <!--<display_mode>cosy</display_mode>-->
+            <!-- Optional, when set to false, submit button is hidden when transitions are available on the object (in creation and edit
 						mode). Default is false. -->
-						<!--<always_show_submit>false</always_show_submit>-->
-						<!-- Optional, navigation rules to define where to go when clicking on the submit/cancel buttons of the form -->
-						<navigation_rules>
-							<submit>
-								<default>go-to-open-requests</default>
-							</submit>
-						</navigation_rules>
-					</properties>
-					<fields></fields>
-					<twig>
-						<div class="row">
-							<div class="col-sm-7">
-								<fieldset>
-									<legend>{{'Ticket:baseinfo'|dict_s}}</legend>
-									<div class="col-sm-6">
-										<div class="form_field" data-field-id="title" data-field-flags="read_only"></div>
-										<div class="form_field" data-field-id="service_id" data-field-flags="read_only"></div>
-									</div>
-									<div class="col-sm-6">
-										<div class="form_field" data-field-id="caller_id" data-field-flags="read_only"></div>
-										<div class="form_field" data-field-id="servicesubcategory_id" data-field-flags="read_only"></div>
-									</div>
-									<div class="col-sm-12">
-										<div class="form_field" data-field-id="description" data-field-flags="read_only"></div>
-										<div class="form_field" data-field-id="solution" data-field-flags="read_only"></div>
-									</div>
-									<div class="col-sm-6">
-										<div class="form_field" data-field-id="user_satisfaction" data-field-flags="read_only"></div>
-									</div>
-									<div class="col-sm-6">
-										<div class="form_field" data-field-id="user_comment" data-field-flags="read_only"></div>
-									</div>
-								</fieldset>
-							</div>
-							<div class="col-sm-5">
-								<fieldset>
-									<legend>{{'Ticket:Type'|dict_s}} &amp; {{'Ticket:date'|dict_s}}</legend>
-									<div class="col-sm-6">
-										<div class="form_field" data-field-id="status" data-field-flags="read_only"></div>
-										<div class="form_field" data-field-id="impact" data-field-flags="read_only"></div>
-										<div class="form_field" data-field-id="urgency" data-field-flags="read_only"></div>
-										<div class="form_field" data-field-id="priority" data-field-flags="read_only"></div>
-									</div>
-									<div class="col-sm-6">
-										<div class="form_field" data-field-id="start_date" data-field-flags="read_only"></div>
-										<div class="form_field" data-field-id="last_update" data-field-flags="read_only"></div>
-										<div class="form_field" data-field-id="resolution_date" data-field-flags="read_only"></div>
-										<div class="form_field" data-field-id="agent_id" data-field-flags="read_only"></div>
-									</div>
-								</fieldset>
-							</div>
-						</div>
-						<div>
-							<div class="form_field" data-field-id="contacts_list"></div>
-							<div class="form_field" data-field-id="public_log"></div>
-						</div>
-					</twig>
-					<modes>
-						<mode id="edit"/>
-						<mode id="view"/>
-					</modes>
-				</form>
-				<form id="ticket-reopen" _delta="define">
-					<class>Ticket</class>
-					<properties>
-						<navigation_rules>
-							<submit>
-								<default>go-to-open-requests</default>
-							</submit>
-						</navigation_rules>
-					</properties>
-					<fields />
-					<twig>
-						<div>
-							<div class="form_field" data-field-id="public_log" data-field-flags="must_change"></div>
-							<div class="form_field" data-field-id="team_id" data-field-flags="hidden"></div>
-							<div class="form_field" data-field-id="agent_id" data-field-flags="hidden"></div>
-						</div>
-					</twig>
-					<modes>
-						<mode id="apply_stimulus">
-							<stimuli>
-								<stimulus id="ev_reopen"/>
-							</stimuli>
-						</mode>
-					</modes>
-				</form>
-				<form id="ticket-apply-stimulus" _delta="define">
-					<class>Ticket</class>
-					<properties>
-						<navigation_rules>
-							<submit>
-								<default>go-to-open-requests</default>
-							</submit>
-						</navigation_rules>
-					</properties>
-					<fields />
-					<twig />
-					<modes>
-						<mode id="apply_stimulus"/>
-					</modes>
-				</form>
-				<form id="person-view" _delta="define">
-					<class>Person</class>
-					<fields />
-					<twig>
-						<div class="row">
-							<div class="col-sm-4">
-								<div class="form_field" data-field-id="picture" data-field-flags="read_only">
+            <!--<always_show_submit>false</always_show_submit>-->
+            <!-- Optional, navigation rules to define where to go when clicking on the submit/cancel buttons of the form -->
+            <navigation_rules>
+              <submit>
+                <default>go-to-open-requests</default>
+              </submit>
+            </navigation_rules>
+          </properties>
+          <fields/>
+          <twig>
+            <div class="row">
+              <div class="col-sm-7">
+                <fieldset>
+                  <legend>{{'Ticket:baseinfo'|dict_s}}</legend>
+                  <div class="col-sm-6">
+                    <div class="form_field" data-field-id="title" data-field-flags="read_only"/>
+                    <div class="form_field" data-field-id="service_id" data-field-flags="read_only"/>
+                  </div>
+                  <div class="col-sm-6">
+                    <div class="form_field" data-field-id="caller_id" data-field-flags="read_only"/>
+                    <div class="form_field" data-field-id="servicesubcategory_id" data-field-flags="read_only"/>
+                  </div>
+                  <div class="col-sm-12">
+                    <div class="form_field" data-field-id="description" data-field-flags="read_only"/>
+                    <div class="form_field" data-field-id="solution" data-field-flags="read_only"/>
+                  </div>
+                  <div class="col-sm-6">
+                    <div class="form_field" data-field-id="user_satisfaction" data-field-flags="read_only"/>
+                  </div>
+                  <div class="col-sm-6">
+                    <div class="form_field" data-field-id="user_comment" data-field-flags="read_only"/>
+                  </div>
+                </fieldset>
+              </div>
+              <div class="col-sm-5">
+                <fieldset>
+                  <legend>{{'Ticket:Type'|dict_s}} &amp; {{'Ticket:date'|dict_s}}</legend>
+                  <div class="col-sm-6">
+                    <div class="form_field" data-field-id="status" data-field-flags="read_only"/>
+                    <div class="form_field" data-field-id="impact" data-field-flags="read_only"/>
+                    <div class="form_field" data-field-id="urgency" data-field-flags="read_only"/>
+                    <div class="form_field" data-field-id="priority" data-field-flags="read_only"/>
+                  </div>
+                  <div class="col-sm-6">
+                    <div class="form_field" data-field-id="start_date" data-field-flags="read_only"/>
+                    <div class="form_field" data-field-id="last_update" data-field-flags="read_only"/>
+                    <div class="form_field" data-field-id="resolution_date" data-field-flags="read_only"/>
+                    <div class="form_field" data-field-id="agent_id" data-field-flags="read_only"/>
+                  </div>
+                </fieldset>
+              </div>
+            </div>
+            <div>
+              <div class="form_field" data-field-id="contacts_list"/>
+              <div class="form_field" data-field-id="public_log"/>
+            </div>
+          </twig>
+          <modes>
+            <mode id="edit"/>
+            <mode id="view"/>
+          </modes>
+        </form>
+        <form id="ticket-reopen" _delta="define">
+          <class>Ticket</class>
+          <properties>
+            <navigation_rules>
+              <submit>
+                <default>go-to-open-requests</default>
+              </submit>
+            </navigation_rules>
+          </properties>
+          <fields/>
+          <twig>
+            <div>
+              <div class="form_field" data-field-id="public_log" data-field-flags="must_change"/>
+              <div class="form_field" data-field-id="team_id" data-field-flags="hidden"/>
+              <div class="form_field" data-field-id="agent_id" data-field-flags="hidden"/>
+            </div>
+          </twig>
+          <modes>
+            <mode id="apply_stimulus">
+              <stimuli>
+                <stimulus id="ev_reopen"/>
+              </stimuli>
+            </mode>
+          </modes>
+        </form>
+        <form id="ticket-apply-stimulus" _delta="define">
+          <class>Ticket</class>
+          <properties>
+            <navigation_rules>
+              <submit>
+                <default>go-to-open-requests</default>
+              </submit>
+            </navigation_rules>
+          </properties>
+          <fields/>
+          <twig/>
+          <modes>
+            <mode id="apply_stimulus"/>
+          </modes>
+        </form>
+        <form id="person-view" _delta="define">
+          <class>Person</class>
+          <fields/>
+          <twig>
+            <div class="row">
+              <div class="col-sm-4">
+                <div class="form_field" data-field-id="picture" data-field-flags="read_only">
 								</div>
-							</div>
-							<div class="col-sm-4">
-								<div class="form_field" data-field-id="name" data-field-flags="read_only">
+              </div>
+              <div class="col-sm-4">
+                <div class="form_field" data-field-id="name" data-field-flags="read_only">
 								</div>
-								<div class="form_field" data-field-id="first_name" data-field-flags="read_only">
+                <div class="form_field" data-field-id="first_name" data-field-flags="read_only">
 								</div>
-								<div class="form_field" data-field-id="status" data-field-flags="read_only">
+                <div class="form_field" data-field-id="status" data-field-flags="read_only">
 								</div>
-							</div>
-							<div class="col-sm-4">
-								<div class="form_field" data-field-id="org_id" data-field-flags="read_only">
+              </div>
+              <div class="col-sm-4">
+                <div class="form_field" data-field-id="org_id" data-field-flags="read_only">
 								</div>
-								<div class="form_field" data-field-id="function" data-field-flags="read_only">
+                <div class="form_field" data-field-id="function" data-field-flags="read_only">
 								</div>
-								<div class="form_field" data-field-id="manager_id" data-field-flags="read_only">
+                <div class="form_field" data-field-id="manager_id" data-field-flags="read_only">
 								</div>
-							</div>
-						</div>
-					</twig>
-				</form>
-			</forms>
-			<classes>
-				<!-- Note : A class (or one of its ancestors) MUST be declared here to be displayed in the portal -->
-				<class id="ServiceFamily" _delta="define">
-					<scopes>
-						<scope id="all">
-							<oql_view><![CDATA[SELECT ServiceFamily AS sf JOIN Service AS s ON s.servicefamily_id = sf.id JOIN lnkCustomerContractToService AS l1 ON l1.service_id=s.id JOIN CustomerContract AS cc ON l1.customercontract_id=cc.id WHERE cc.org_id = :current_contact->org_id]]></oql_view>
-							<ignore_silos>true</ignore_silos>
-						</scope>
-					</scopes>
-				</class>
-				<class id="Service" _delta="define">
-					<scopes>
-						<scope id="all">
-							<oql_view><![CDATA[SELECT Service AS s JOIN lnkCustomerContractToService AS l1 ON l1.service_id=s.id JOIN CustomerContract AS cc ON l1.customercontract_id=cc.id WHERE cc.org_id = :current_contact->org_id AND s.status != 'obsolete']]></oql_view>
-							<ignore_silos>true</ignore_silos>
-						</scope>
-					</scopes>
-				</class>
-				<class id="ServiceSubcategory" _delta="define">
-					<scopes>
-						<scope id="all">
-							<oql_view><![CDATA[SELECT ServiceSubcategory AS ssc JOIN Service AS s ON ssc.service_id=s.id JOIN lnkCustomerContractToService AS l1 ON l1.service_id=s.id JOIN CustomerContract AS cc ON l1.customercontract_id=cc.id WHERE cc.org_id = :current_contact->org_id AND ssc.status != 'obsolete']]></oql_view>
-							<ignore_silos>true</ignore_silos>
-						</scope>
-					</scopes>
-				</class>
-				<class id="Ticket" _delta="define">
-					<scopes>
-						<scope id="all">
-							<oql_view><![CDATA[SELECT Ticket AS T WHERE T.caller_id = :current_contact_id AND T.finalclass IN ('UserRequest', 'Incident')]]></oql_view>
-							<oql_edit><![CDATA[SELECT Ticket AS T]]></oql_edit>
-						</scope>
-						<scope id="portal-power-user">
-							<oql_view><![CDATA[SELECT Ticket AS T WHERE T.org_id = :current_contact->org_id AND T.finalclass IN ('UserRequest', 'Incident')]]></oql_view>
-							<oql_edit><![CDATA[SELECT Ticket AS T]]></oql_edit>
-							<allowed_profiles>
-								<allowed_profile id="Portal power user"/>
-							</allowed_profiles>
-						</scope>
-					</scopes>
-				</class>
-			</classes>
-			<action_rules>
-				<action_rule id="contact-to-userrequest" _delta="define">
-					<!-- source_oql|source_class is only necessary if there is some copy preset|retrofit -->
-					<source_oql><![CDATA[SELECT Contact AS C WHERE C.id = :current_contact_id]]></source_oql>
-					<presets>
-						<!-- Only set() and copy() are supported for now -->
-						<preset id="1">set(caller_id, $current_contact_id$)</preset>
-						<preset id="2">copy(org_id, org_id)</preset>
-						<preset id="3">set(origin, portal)</preset>
-					</presets>
-					<retrofits/>
-				</action_rule>
-				<action_rule id="service-to-userrequest" _delta="define">
-					<source_class>Service</source_class>
-					<presets>
-						<preset id="1">copy(id, service_id)</preset>
-					</presets>
-				</action_rule>
-				<action_rule id="servicesubcategory-to-userrequest" _delta="define">
-					<source_class>ServiceSubcategory</source_class>
-					<presets>
-						<preset id="1">copy(id, servicesubcategory_id)</preset>
-						<preset id="2">copy(service_id, service_id)</preset>
-					</presets>
-				</action_rule>
-				<!-- Deprecated, will be removed in iTop 2.8 -->
-				<action_rule id="go-to-open-request-on-submit" _delta="define">
-					<submit xsi:type="goto">
-						<brick>ongoing-tickets-for-portal-user</brick>
-					</submit>
-				</action_rule>
-			</action_rules>
-			<navigation_rules>
-				<!-- Open a manage brick (simple method) -->
-				<navigation_rule id="go-to-open-requests" xsi:type="go-to-manage-brick" _delta="define">
-					<!-- Mandatory, ID of the ManageBrick to go to -->
-					<id>ongoing-tickets-for-portal-user</id>
-					<!-- Optional, must be an ID of the available display modes of the brick (//brick/display_modes/availables/mode) -->
-					<!-- <display_mode>list</mode> -->
-					<!-- Optional, must be an ID of the grouping tab of the brick (//brick/grouping/tabs/groups/group)-->
-					<!-- <grouping_tab>resolved</grouping_tab> -->
-					<!-- Optional, a string to preset as filter in the brick. ":this->XXX" can be used for the current object -->
-					<!-- <filter>:this->caller_id_friendlyname</filter> -->
-				</navigation_rule>
-				<!-- Open a browse brick -->
-				<navigation_rule id="go-to-services" xsi:type="go-to-browse-brick" _delta="define">
-					<!-- Mandatory, ID of the BrowseBrick to go to -->
-					<id>services</id>
-					<!-- Optional, must be an ID of the available browse modes of the brick (//brick/browse_modes/availables/mode) -->
-					<!-- <browse_mode>tree</browse_mode> -->
-					<!-- Optional, a string to preset as filter in the brick. ":this->XXX" can be used for the current object -->
-					<!-- <filter>computer</filter> -->
-				</navigation_rule>
-				<!-- Open a brick, developer method -->
-				<!-- <navigation_rule id="go-to-open-requests-alternate-way" xsi:type="go-to-brick"> -->
-				<!-- <route> -->
-				<!-- <id>p_manage_brick_display_as</id> -->
-				<!-- <params> -->
-				<!-- <param id="sBrickId">ongoing-tickets-for-portal-user</param> -->
-				<!-- <param id="sDisplayMode">pie-chart</param> -->
-				<!-- <param id="sGroupingTab">resolved</param> -->
-				<!-- </params> -->
-				<!-- </route> -->
-				<!-- </navigation_rule> -->
-			</navigation_rules>
-		</module_design>
-	</module_designs>
+              </div>
+            </div>
+          </twig>
+        </form>
+      </forms>
+      <classes>
+        <!-- Note : A class (or one of its ancestors) MUST be declared here to be displayed in the portal -->
+        <class id="ServiceFamily" _delta="define">
+          <scopes>
+            <scope id="all">
+              <oql_view><![CDATA[SELECT ServiceFamily AS sf JOIN Service AS s ON s.servicefamily_id = sf.id JOIN lnkCustomerContractToService AS l1 ON l1.service_id=s.id JOIN CustomerContract AS cc ON l1.customercontract_id=cc.id WHERE cc.org_id = :current_contact->org_id]]></oql_view>
+              <ignore_silos>true</ignore_silos>
+            </scope>
+          </scopes>
+        </class>
+        <class id="Service" _delta="define">
+          <scopes>
+            <scope id="all">
+              <oql_view><![CDATA[SELECT Service AS s JOIN lnkCustomerContractToService AS l1 ON l1.service_id=s.id JOIN CustomerContract AS cc ON l1.customercontract_id=cc.id WHERE cc.org_id = :current_contact->org_id AND s.status != 'obsolete']]></oql_view>
+              <ignore_silos>true</ignore_silos>
+            </scope>
+          </scopes>
+        </class>
+        <class id="ServiceSubcategory" _delta="define">
+          <scopes>
+            <scope id="all">
+              <oql_view><![CDATA[SELECT ServiceSubcategory AS ssc JOIN Service AS s ON ssc.service_id=s.id JOIN lnkCustomerContractToService AS l1 ON l1.service_id=s.id JOIN CustomerContract AS cc ON l1.customercontract_id=cc.id WHERE cc.org_id = :current_contact->org_id AND ssc.status != 'obsolete']]></oql_view>
+              <ignore_silos>true</ignore_silos>
+            </scope>
+          </scopes>
+        </class>
+        <class id="Ticket" _delta="define">
+          <scopes>
+            <scope id="all">
+              <oql_view><![CDATA[SELECT Ticket AS T WHERE T.caller_id = :current_contact_id AND T.finalclass IN ('UserRequest', 'Incident')]]></oql_view>
+              <oql_edit><![CDATA[SELECT Ticket AS T]]></oql_edit>
+            </scope>
+            <scope id="portal-power-user">
+              <oql_view><![CDATA[SELECT Ticket AS T WHERE T.org_id = :current_contact->org_id AND T.finalclass IN ('UserRequest', 'Incident')]]></oql_view>
+              <oql_edit><![CDATA[SELECT Ticket AS T]]></oql_edit>
+              <allowed_profiles>
+                <allowed_profile id="Portal power user"/>
+              </allowed_profiles>
+            </scope>
+          </scopes>
+        </class>
+      </classes>
+      <action_rules>
+        <action_rule id="contact-to-userrequest" _delta="define">
+          <!-- source_oql|source_class is only necessary if there is some copy preset|retrofit -->
+          <source_oql><![CDATA[SELECT Contact AS C WHERE C.id = :current_contact_id]]></source_oql>
+          <presets>
+            <!-- Only set() and copy() are supported for now -->
+            <preset id="1">set(caller_id, $current_contact_id$)</preset>
+            <preset id="2">copy(org_id, org_id)</preset>
+            <preset id="3">set(origin, portal)</preset>
+          </presets>
+          <retrofits/>
+        </action_rule>
+        <action_rule id="service-to-userrequest" _delta="define">
+          <source_class>Service</source_class>
+          <presets>
+            <preset id="1">copy(id, service_id)</preset>
+          </presets>
+        </action_rule>
+        <action_rule id="servicesubcategory-to-userrequest" _delta="define">
+          <source_class>ServiceSubcategory</source_class>
+          <presets>
+            <preset id="1">copy(id, servicesubcategory_id)</preset>
+            <preset id="2">copy(service_id, service_id)</preset>
+          </presets>
+        </action_rule>
+        <!-- Deprecated, will be removed in iTop 2.8 -->
+        <action_rule id="go-to-open-request-on-submit" _delta="define">
+          <submit xsi:type="goto">
+            <brick>ongoing-tickets-for-portal-user</brick>
+          </submit>
+        </action_rule>
+      </action_rules>
+      <navigation_rules>
+        <!-- Open a manage brick (simple method) -->
+        <navigation_rule id="go-to-open-requests" xsi:type="go-to-manage-brick" _delta="define">
+          <!-- Mandatory, ID of the ManageBrick to go to -->
+          <id>ongoing-tickets-for-portal-user</id>
+          <!-- Optional, must be an ID of the available display modes of the brick (//brick/display_modes/availables/mode) -->
+          <!-- <display_mode>list</mode> -->
+          <!-- Optional, must be an ID of the grouping tab of the brick (//brick/grouping/tabs/groups/group)-->
+          <!-- <grouping_tab>resolved</grouping_tab> -->
+          <!-- Optional, a string to preset as filter in the brick. ":this->XXX" can be used for the current object -->
+          <!-- <filter>:this->caller_id_friendlyname</filter> -->
+        </navigation_rule>
+        <!-- Open a browse brick -->
+        <navigation_rule id="go-to-services" xsi:type="go-to-browse-brick" _delta="define">
+          <!-- Mandatory, ID of the BrowseBrick to go to -->
+          <id>services</id>
+          <!-- Optional, must be an ID of the available browse modes of the brick (//brick/browse_modes/availables/mode) -->
+          <!-- <browse_mode>tree</browse_mode> -->
+          <!-- Optional, a string to preset as filter in the brick. ":this->XXX" can be used for the current object -->
+          <!-- <filter>computer</filter> -->
+        </navigation_rule>
+        <!-- Open a brick, developer method -->
+        <!-- <navigation_rule id="go-to-open-requests-alternate-way" xsi:type="go-to-brick"> -->
+        <!-- <route> -->
+        <!-- <id>p_manage_brick_display_as</id> -->
+        <!-- <params> -->
+        <!-- <param id="sBrickId">ongoing-tickets-for-portal-user</param> -->
+        <!-- <param id="sDisplayMode">pie-chart</param> -->
+        <!-- <param id="sGroupingTab">resolved</param> -->
+        <!-- </params> -->
+        <!-- </route> -->
+        <!-- </navigation_rule> -->
+      </navigation_rules>
+    </module_design>
+  </module_designs>
 </itop_design>
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 461edb7eb..e8f78fe9b 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
@@ -16,7 +16,7 @@
           </attributes>
         </naming>
         <fields_semantic>
-            <state_attribute>status</state_attribute>
+          <state_attribute>status</state_attribute>
         </fields_semantic>
         <style>
           <icon/>
@@ -61,6 +61,7 @@
           <count_max>0</count_max>
           <ext_key_to_remote>volume_id</ext_key_to_remote>
           <duplicates/>
+          <read_only>false</read_only>
         </field>
       </fields>
       <methods/>
@@ -169,9 +170,11 @@
         <field id="virtualmachine_list" xsi:type="AttributeLinkedSet">
           <linked_class>VirtualMachine</linked_class>
           <ext_key_to_me>virtualhost_id</ext_key_to_me>
-          <edit_mode>add_only</edit_mode>
+          <legacy_edit_mode>add_only</legacy_edit_mode>
           <count_min>0</count_min>
           <count_max>0</count_max>
+          <relation_type>link</relation_type>
+          <read_only>false</read_only>
         </field>
       </fields>
       <presentation>
@@ -437,9 +440,11 @@
         <field id="hypervisor_list" xsi:type="AttributeLinkedSet">
           <linked_class>Hypervisor</linked_class>
           <ext_key_to_me>farm_id</ext_key_to_me>
-          <edit_mode>add_only</edit_mode>
+          <legacy_edit_mode>add_only</legacy_edit_mode>
           <count_min>0</count_min>
           <count_max>0</count_max>
+          <relation_type>link</relation_type>
+          <read_only>false</read_only>
         </field>
         <field id="redundancy" xsi:type="AttributeRedundancySettings">
           <sql>redundancy</sql>
@@ -626,10 +631,12 @@
         <field id="logicalinterface_list" xsi:type="AttributeLinkedSet">
           <linked_class>LogicalInterface</linked_class>
           <ext_key_to_me>virtualmachine_id</ext_key_to_me>
-          <edit_mode>in_place</edit_mode>
+          <legacy_edit_mode>in_place</legacy_edit_mode>
           <tracking_level>all</tracking_level>
           <count_min>0</count_min>
           <count_max>0</count_max>
+          <relation_type>property</relation_type>
+          <read_only>false</read_only>
         </field>
         <field id="managementip" xsi:type="AttributeIPAddress">
           <sql>managementip</sql>
@@ -905,7 +912,7 @@
               <dashlet id="38" xsi:type="DashletHeaderStatic">
                 <rank>0</rank>
                 <title>Menu:ConfigManagement:virtualization</title>
-                  <icon>../images/icons/icons8-old-vmware-logo.svg</icon>
+                <icon>../images/icons/icons8-old-vmware-logo.svg</icon>
               </dashlet>
               <dashlet id="39" xsi:type="DashletBadge">
                 <rank>1</rank>
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 9985d4ed6..8c49b15ae 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
@@ -11,11 +11,11 @@
           <cell id="0">
             <rank>0</rank>
             <dashlets>
-	            <dashlet id="1" xsi:type="DashletHeaderStatic">
-                  <rank>0</rank>
-                  <title>Menu:ConfigManagementCI</title>
-                    <icon>../images/icons/icons8-database.svg</icon>
-                </dashlet>
+              <dashlet id="1" xsi:type="DashletHeaderStatic">
+                <rank>0</rank>
+                <title>Menu:ConfigManagementCI</title>
+                <icon>../images/icons/icons8-database.svg</icon>
+              </dashlet>
               <dashlet id="4" xsi:type="DashletBadge">
                 <rank>3</rank>
                 <class>Contact</class>