From f25cd70e73288efd9820d34aea5e46562bff274f Mon Sep 17 00:00:00 2001
From: Benjamin Planque <benjamin.planque@combodo.com>
Date: Tue, 28 Jul 2020 15:08:11 +0200
Subject: [PATCH 01/43] datamodel and dictionnaries refactoring/cleanup

---
 .idea/codeStyles/codeStyleConfig.xml          |     2 +-
 application/datamodel.application.xml         |    30 +
 core/datamodel.core.xml                       |     2 +-
 datamodels/2.x/installation.xml               |   427 +-
 .../cs.dict.itop-bridge-cmdb-ticket.php       |    72 +
 .../da.dict.itop-bridge-cmdb-ticket.php       |    72 +
 .../datamodel.itop-bridge-cmdb-ticket.xml     |   570 +
 .../de.dict.itop-bridge-cmdb-ticket.php       |    72 +
 .../en.dict.itop-bridge-cmdb-ticket.php       |    72 +
 .../es_cr.dict.itop-bridge-cmdb-ticket.php    |    72 +
 .../2.x/itop-bridge-cmdb-ticket/extension.xml |     9 +
 .../fr.dict.itop-bridge-cmdb-ticket.php       |    72 +
 .../hu.dict.itop-bridge-cmdb-ticket.php       |    72 +
 .../it.dict.itop-bridge-cmdb-ticket.php       |    72 +
 .../ja.dict.itop-bridge-cmdb-ticket.php       |    72 +
 .../module.itop-bridge-cmdb-ticket.php        |    55 +
 .../nl.dict.itop-bridge-cmdb-ticket.php       |    72 +
 .../pt_br.dict.itop-bridge-cmdb-ticket.php    |    72 +
 .../ru.dict.itop-bridge-cmdb-ticket.php       |    72 +
 .../sk.dict.itop-bridge-cmdb-ticket.php       |    72 +
 .../tr.dict.itop-bridge-cmdb-ticket.php       |    72 +
 .../zh_cn.dict.itop-bridge-cmdb-ticket.php    |    73 +
 .../cs.dict.itop-config-mgmt.php              |   373 +-
 .../da.dict.itop-config-mgmt.php              |   378 +-
 .../datamodel.itop-config-mgmt.xml            | 14412 +++++++---------
 .../de.dict.itop-config-mgmt.php              |   374 +-
 .../en.dict.itop-config-mgmt.php              |   408 +-
 .../es_cr.dict.itop-config-mgmt.php           |   378 +-
 .../fr.dict.itop-config-mgmt.php              |   508 +-
 .../hu.dict.itop-config-mgmt.php              |   361 +-
 .../it.dict.itop-config-mgmt.php              |   374 +-
 .../ja.dict.itop-config-mgmt.php              |   376 +-
 .../module.itop-config-mgmt.php               |     9 +-
 .../nl.dict.itop-config-mgmt.php              |   376 +-
 .../pt_br.dict.itop-config-mgmt.php           |   377 +-
 .../ru.dict.itop-config-mgmt.php              |   379 +-
 .../sk.dict.itop-config-mgmt.php              |   378 +-
 .../tr.dict.itop-config-mgmt.php              |   375 +-
 .../2.x/itop-config-mgmt/typology_menu.html   |   143 -
 .../zh_cn.dict.itop-config-mgmt.php           |   376 +-
 .../2.x/itop-portal/cs.dict.itop-portal.php   |    43 +
 .../2.x/itop-portal/da.dict.itop-portal.php   |    43 +
 .../2.x/itop-portal/datamodel.itop-portal.xml |   133 +
 .../2.x/itop-portal/de.dict.itop-portal.php   |    43 +
 .../2.x/itop-portal/en.dict.itop-portal.php   |    43 +
 .../itop-portal/es_cr.dict.itop-portal.php    |    43 +
 .../2.x/itop-portal/fr.dict.itop-portal.php   |    43 +
 .../2.x/itop-portal/hu.dict.itop-portal.php   |    43 +
 .../2.x/itop-portal/it.dict.itop-portal.php   |    43 +
 .../2.x/itop-portal/ja.dict.itop-portal.php   |    43 +
 .../2.x/itop-portal/module.itop-portal.php    |     3 +-
 .../2.x/itop-portal/nl.dict.itop-portal.php   |    43 +
 .../itop-portal/pt_br.dict.itop-portal.php    |    43 +
 .../2.x/itop-portal/ru.dict.itop-portal.php   |    43 +
 .../2.x/itop-portal/sk.dict.itop-portal.php   |    43 +
 .../2.x/itop-portal/tr.dict.itop-portal.php   |    43 +
 .../itop-portal/zh_cn.dict.itop-portal.php    |    43 +
 .../module.itop-problem-mgmt.php              |     1 -
 .../module.itop-request-mgmt-itil.php         |     1 -
 .../module.itop-request-mgmt.php              |     1 -
 .../module.itop-service-mgmt-provider.php     |     1 -
 .../datamodel.itop-service-mgmt.xml           |  4803 +++--
 .../module.itop-service-mgmt.php              |     1 -
 .../itop-structure/cs.dict.itop-structure.php |   362 +
 .../itop-structure/da.dict.itop-structure.php |   349 +
 .../data.sample.contactteam.xml               |     0
 .../data.sample.contacttype.xml               |     0
 .../data.sample.organizations.xml             |     0
 .../data.sample.persons.xml                   |     0
 .../data.sample.teams.xml                     |     0
 .../datamodel.itop-structure.xml              |  1794 ++
 .../itop-structure/de.dict.itop-structure.php |   361 +
 .../itop-structure/en.dict.itop-structure.php |   398 +
 .../es_cr.dict.itop-structure.php             |   355 +
 .../itop-structure/fr.dict.itop-structure.php |   396 +
 .../itop-structure/hu.dict.itop-structure.php |   335 +
 .../2.x/itop-structure/images/application.png |   Bin 0 -> 3583 bytes
 .../images/applicationservice.png             |   Bin 0 -> 3037 bytes
 .../2.x/itop-structure/images/building.png    |   Bin 0 -> 4929 bytes
 .../images/business-process.png               |   Bin 0 -> 3126 bytes
 .../2.x/itop-structure/images/computer.png    |   Bin 0 -> 4602 bytes
 .../2.x/itop-structure/images/contact.png     |   Bin 0 -> 2742 bytes
 .../images/database-instance.png              |   Bin 0 -> 2876 bytes
 .../itop-structure/images/database-schema.png |   Bin 0 -> 4140 bytes
 .../2.x/itop-structure/images/database.png    |   Bin 0 -> 3970 bytes
 .../2.x/itop-structure/images/diskarray.png   |   Bin 0 -> 2325 bytes
 .../2.x/itop-structure/images/document.png    |   Bin 0 -> 5158 bytes
 .../2.x/itop-structure/images/group.png       |   Bin 0 -> 3668 bytes
 .../images/incident-escalated.png             |   Bin 0 -> 4182 bytes
 .../2.x/itop-structure/images/interface.png   |   Bin 0 -> 5150 bytes
 .../2.x/itop-structure/images/licence.png     |   Bin 0 -> 5899 bytes
 .../2.x/itop-structure/images/location.png    |   Bin 0 -> 4152 bytes
 .../2.x/itop-structure/images/middleware.png  |   Bin 0 -> 4507 bytes
 .../2.x/itop-structure/images/patch.png       |   Bin 0 -> 3410 bytes
 .../2.x/itop-structure/images/person.png      |   Bin 0 -> 2969 bytes
 .../2.x/itop-structure/images/printer.png     |   Bin 0 -> 4036 bytes
 .../2.x/itop-structure/images/server.png      |   Bin 0 -> 3531 bytes
 .../2.x/itop-structure/images/silhouette.png  |   Bin 0 -> 3050 bytes
 .../2.x/itop-structure/images/software.png    |   Bin 0 -> 4630 bytes
 .../2.x/itop-structure/images/solution.png    |   Bin 0 -> 2892 bytes
 .../2.x/itop-structure/images/subnet.png      |   Bin 0 -> 4594 bytes
 .../2.x/itop-structure/images/switch.png      |   Bin 0 -> 2376 bytes
 datamodels/2.x/itop-structure/images/team.png |   Bin 0 -> 4896 bytes
 .../2.x/itop-structure/images/typology.png    |   Bin 0 -> 5171 bytes
 datamodels/2.x/itop-structure/images/vlan.png |   Bin 0 -> 3313 bytes
 .../2.x/itop-structure/images/volume.png      |   Bin 0 -> 4685 bytes
 .../2.x/itop-structure/images/webapp.png      |   Bin 0 -> 5084 bytes
 .../2.x/itop-structure/images/webserver.png   |   Bin 0 -> 4874 bytes
 .../itop-structure/it.dict.itop-structure.php |   351 +
 .../itop-structure/ja.dict.itop-structure.php |   351 +
 .../itop-structure/main.itop-structure.php    |    25 +
 .../itop-structure/module.itop-structure.php  |    99 +
 .../itop-structure/nl.dict.itop-structure.php |   356 +
 .../pt_br.dict.itop-structure.php             |   350 +
 .../itop-structure/ru.dict.itop-structure.php |   336 +
 .../itop-structure/sk.dict.itop-structure.php |   349 +
 .../itop-structure/tr.dict.itop-structure.php |   351 +
 .../zh_cn.dict.itop-structure.php             |   349 +
 .../2.x/itop-tickets/cs.dict.itop-tickets.php |    38 -
 .../2.x/itop-tickets/da.dict.itop-tickets.php |    37 -
 .../itop-tickets/datamodel.itop-tickets.xml   |   415 +-
 .../2.x/itop-tickets/de.dict.itop-tickets.php |    37 -
 .../2.x/itop-tickets/en.dict.itop-tickets.php |    37 -
 .../itop-tickets/es_cr.dict.itop-tickets.php  |    37 -
 .../2.x/itop-tickets/fr.dict.itop-tickets.php |    38 -
 .../2.x/itop-tickets/hu.dict.itop-tickets.php |    37 -
 .../2.x/itop-tickets/it.dict.itop-tickets.php |    37 -
 .../2.x/itop-tickets/ja.dict.itop-tickets.php |    37 -
 .../2.x/itop-tickets/main.itop-tickets.php    |    37 +-
 .../2.x/itop-tickets/module.itop-tickets.php  |     6 +-
 .../2.x/itop-tickets/nl.dict.itop-tickets.php |    37 -
 .../itop-tickets/pt_br.dict.itop-tickets.php  |    37 -
 .../2.x/itop-tickets/ru.dict.itop-tickets.php |    37 -
 .../2.x/itop-tickets/sk.dict.itop-tickets.php |    37 -
 .../2.x/itop-tickets/tr.dict.itop-tickets.php |    37 -
 .../itop-tickets/zh_cn.dict.itop-tickets.php  |    37 -
 .../datamodel.itop-welcome-itil.xml           |    30 +-
 dictionaries/en.dictionary.itop.core.php      |     3 +
 dictionaries/fr.dictionary.itop.core.php      |     2 +
 setup/compiler.class.inc.php                  |     4 +-
 140 files changed, 19076 insertions(+), 17365 deletions(-)
 create mode 100644 datamodels/2.x/itop-bridge-cmdb-ticket/cs.dict.itop-bridge-cmdb-ticket.php
 create mode 100644 datamodels/2.x/itop-bridge-cmdb-ticket/da.dict.itop-bridge-cmdb-ticket.php
 create mode 100644 datamodels/2.x/itop-bridge-cmdb-ticket/datamodel.itop-bridge-cmdb-ticket.xml
 create mode 100644 datamodels/2.x/itop-bridge-cmdb-ticket/de.dict.itop-bridge-cmdb-ticket.php
 create mode 100644 datamodels/2.x/itop-bridge-cmdb-ticket/en.dict.itop-bridge-cmdb-ticket.php
 create mode 100644 datamodels/2.x/itop-bridge-cmdb-ticket/es_cr.dict.itop-bridge-cmdb-ticket.php
 create mode 100644 datamodels/2.x/itop-bridge-cmdb-ticket/extension.xml
 create mode 100644 datamodels/2.x/itop-bridge-cmdb-ticket/fr.dict.itop-bridge-cmdb-ticket.php
 create mode 100644 datamodels/2.x/itop-bridge-cmdb-ticket/hu.dict.itop-bridge-cmdb-ticket.php
 create mode 100644 datamodels/2.x/itop-bridge-cmdb-ticket/it.dict.itop-bridge-cmdb-ticket.php
 create mode 100644 datamodels/2.x/itop-bridge-cmdb-ticket/ja.dict.itop-bridge-cmdb-ticket.php
 create mode 100644 datamodels/2.x/itop-bridge-cmdb-ticket/module.itop-bridge-cmdb-ticket.php
 create mode 100644 datamodels/2.x/itop-bridge-cmdb-ticket/nl.dict.itop-bridge-cmdb-ticket.php
 create mode 100644 datamodels/2.x/itop-bridge-cmdb-ticket/pt_br.dict.itop-bridge-cmdb-ticket.php
 create mode 100644 datamodels/2.x/itop-bridge-cmdb-ticket/ru.dict.itop-bridge-cmdb-ticket.php
 create mode 100644 datamodels/2.x/itop-bridge-cmdb-ticket/sk.dict.itop-bridge-cmdb-ticket.php
 create mode 100644 datamodels/2.x/itop-bridge-cmdb-ticket/tr.dict.itop-bridge-cmdb-ticket.php
 create mode 100644 datamodels/2.x/itop-bridge-cmdb-ticket/zh_cn.dict.itop-bridge-cmdb-ticket.php
 delete mode 100755 datamodels/2.x/itop-config-mgmt/typology_menu.html
 create mode 100644 datamodels/2.x/itop-portal/cs.dict.itop-portal.php
 create mode 100644 datamodels/2.x/itop-portal/da.dict.itop-portal.php
 create mode 100644 datamodels/2.x/itop-portal/de.dict.itop-portal.php
 create mode 100644 datamodels/2.x/itop-portal/en.dict.itop-portal.php
 create mode 100644 datamodels/2.x/itop-portal/es_cr.dict.itop-portal.php
 create mode 100644 datamodels/2.x/itop-portal/fr.dict.itop-portal.php
 create mode 100644 datamodels/2.x/itop-portal/hu.dict.itop-portal.php
 create mode 100644 datamodels/2.x/itop-portal/it.dict.itop-portal.php
 create mode 100644 datamodels/2.x/itop-portal/ja.dict.itop-portal.php
 create mode 100644 datamodels/2.x/itop-portal/nl.dict.itop-portal.php
 create mode 100644 datamodels/2.x/itop-portal/pt_br.dict.itop-portal.php
 create mode 100644 datamodels/2.x/itop-portal/ru.dict.itop-portal.php
 create mode 100644 datamodels/2.x/itop-portal/sk.dict.itop-portal.php
 create mode 100644 datamodels/2.x/itop-portal/tr.dict.itop-portal.php
 create mode 100644 datamodels/2.x/itop-portal/zh_cn.dict.itop-portal.php
 create mode 100644 datamodels/2.x/itop-structure/cs.dict.itop-structure.php
 create mode 100644 datamodels/2.x/itop-structure/da.dict.itop-structure.php
 rename datamodels/2.x/{itop-config-mgmt => itop-structure}/data.sample.contactteam.xml (100%)
 mode change 100755 => 100644
 rename datamodels/2.x/{itop-config-mgmt => itop-structure}/data.sample.contacttype.xml (100%)
 mode change 100755 => 100644
 rename datamodels/2.x/{itop-config-mgmt => itop-structure}/data.sample.organizations.xml (100%)
 mode change 100755 => 100644
 rename datamodels/2.x/{itop-config-mgmt => itop-structure}/data.sample.persons.xml (100%)
 mode change 100755 => 100644
 rename datamodels/2.x/{itop-config-mgmt => itop-structure}/data.sample.teams.xml (100%)
 mode change 100755 => 100644
 create mode 100644 datamodels/2.x/itop-structure/datamodel.itop-structure.xml
 create mode 100644 datamodels/2.x/itop-structure/de.dict.itop-structure.php
 create mode 100644 datamodels/2.x/itop-structure/en.dict.itop-structure.php
 create mode 100644 datamodels/2.x/itop-structure/es_cr.dict.itop-structure.php
 create mode 100644 datamodels/2.x/itop-structure/fr.dict.itop-structure.php
 create mode 100644 datamodels/2.x/itop-structure/hu.dict.itop-structure.php
 create mode 100644 datamodels/2.x/itop-structure/images/application.png
 create mode 100644 datamodels/2.x/itop-structure/images/applicationservice.png
 create mode 100644 datamodels/2.x/itop-structure/images/building.png
 create mode 100644 datamodels/2.x/itop-structure/images/business-process.png
 create mode 100644 datamodels/2.x/itop-structure/images/computer.png
 create mode 100644 datamodels/2.x/itop-structure/images/contact.png
 create mode 100644 datamodels/2.x/itop-structure/images/database-instance.png
 create mode 100644 datamodels/2.x/itop-structure/images/database-schema.png
 create mode 100644 datamodels/2.x/itop-structure/images/database.png
 create mode 100644 datamodels/2.x/itop-structure/images/diskarray.png
 create mode 100644 datamodels/2.x/itop-structure/images/document.png
 create mode 100644 datamodels/2.x/itop-structure/images/group.png
 create mode 100644 datamodels/2.x/itop-structure/images/incident-escalated.png
 create mode 100644 datamodels/2.x/itop-structure/images/interface.png
 create mode 100644 datamodels/2.x/itop-structure/images/licence.png
 create mode 100644 datamodels/2.x/itop-structure/images/location.png
 create mode 100644 datamodels/2.x/itop-structure/images/middleware.png
 create mode 100644 datamodels/2.x/itop-structure/images/patch.png
 create mode 100644 datamodels/2.x/itop-structure/images/person.png
 create mode 100644 datamodels/2.x/itop-structure/images/printer.png
 create mode 100644 datamodels/2.x/itop-structure/images/server.png
 create mode 100644 datamodels/2.x/itop-structure/images/silhouette.png
 create mode 100644 datamodels/2.x/itop-structure/images/software.png
 create mode 100644 datamodels/2.x/itop-structure/images/solution.png
 create mode 100644 datamodels/2.x/itop-structure/images/subnet.png
 create mode 100644 datamodels/2.x/itop-structure/images/switch.png
 create mode 100644 datamodels/2.x/itop-structure/images/team.png
 create mode 100644 datamodels/2.x/itop-structure/images/typology.png
 create mode 100644 datamodels/2.x/itop-structure/images/vlan.png
 create mode 100644 datamodels/2.x/itop-structure/images/volume.png
 create mode 100644 datamodels/2.x/itop-structure/images/webapp.png
 create mode 100644 datamodels/2.x/itop-structure/images/webserver.png
 create mode 100644 datamodels/2.x/itop-structure/it.dict.itop-structure.php
 create mode 100644 datamodels/2.x/itop-structure/ja.dict.itop-structure.php
 create mode 100644 datamodels/2.x/itop-structure/main.itop-structure.php
 create mode 100644 datamodels/2.x/itop-structure/module.itop-structure.php
 create mode 100644 datamodels/2.x/itop-structure/nl.dict.itop-structure.php
 create mode 100644 datamodels/2.x/itop-structure/pt_br.dict.itop-structure.php
 create mode 100644 datamodels/2.x/itop-structure/ru.dict.itop-structure.php
 create mode 100644 datamodels/2.x/itop-structure/sk.dict.itop-structure.php
 create mode 100644 datamodels/2.x/itop-structure/tr.dict.itop-structure.php
 create mode 100644 datamodels/2.x/itop-structure/zh_cn.dict.itop-structure.php

diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
index d68e1e434..a55e7a179 100644
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -1,5 +1,5 @@
 <component name="ProjectCodeStyleConfiguration">
   <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Combodo" />
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
   </state>
 </component>
\ No newline at end of file
diff --git a/application/datamodel.application.xml b/application/datamodel.application.xml
index b8c634773..453086634 100644
--- a/application/datamodel.application.xml
+++ b/application/datamodel.application.xml
@@ -388,4 +388,34 @@
       </class>
     </classes>
   </meta>
+	<branding >
+		<themes>
+			<theme id="light-grey" _delta="define">
+				<variables>
+				</variables>
+				<imports>
+					<import id="css-variables">../css/css-variables.scss</import>
+				</imports>
+				<stylesheets>
+					<stylesheet id="jqueryui">../css/ui-lightness/jqueryui.scss</stylesheet>
+					<stylesheet id="main">../css/light-grey.scss</stylesheet>
+				</stylesheets>
+			</theme>
+			<theme id="test-red" _delta="define">
+				<variables>
+					<variable id="backoffice-environment-banner-background-color">#C53030</variable>
+					<variable id="backoffice-environment-banner-text-color">#F7FAFC</variable>
+					<variable id="backoffice-environment-banner-text-content">"THIS IS A TEST INSTANCE"</variable>
+				</variables>
+				<imports>
+					<import id="css-variables">../css/css-variables.scss</import>
+				</imports>
+				<stylesheets>
+					<stylesheet id="jqueryui">../css/ui-lightness/jqueryui.scss</stylesheet>
+					<stylesheet id="main">../css/light-grey.scss</stylesheet>
+					<stylesheet id="environment-banner">../css/backoffice-environment-banner.scss</stylesheet>
+				</stylesheets>
+			</theme>
+		</themes>
+	</branding>
 </itop_design>
diff --git a/core/datamodel.core.xml b/core/datamodel.core.xml
index 624854e32..cbc3c329c 100644
--- a/core/datamodel.core.xml
+++ b/core/datamodel.core.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.6">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.7">
   <user_rights>
     <profiles>
       <profile id="1024" _delta="define">
diff --git a/datamodels/2.x/installation.xml b/datamodels/2.x/installation.xml
index 6f7fc2760..9609bcdc2 100755
--- a/datamodels/2.x/installation.xml
+++ b/datamodels/2.x/installation.xml
@@ -1,215 +1,216 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <installation>
-  <steps type="array">
-    <step>
-      <title>Configuration Management options</title>
-      <description><![CDATA[<h2>The options below allow you to configure the type of elements that are to be managed inside iTop.</h2>]]></description>
-      <banner>/images/modules.png</banner>
-      <options type="array">
-        <choice>
-          <extension_code>itop-config-mgmt-core</extension_code>
-          <title>Configuration Management Core</title>
-          <description>All the base objects that are mandatory in the iTop CMDB: Organizations, Locations, Teams, Persons, etc.</description>
-          <modules type="array">
-            <module>itop-config-mgmt</module>
-            <module>itop-attachments</module>
-            <module>itop-profiles-itil</module>
-            <module>itop-welcome-itil</module>
-            <module>itop-tickets</module>
-            <module>itop-files-information</module>
-            <module>combodo-db-tools</module>
-            <module>itop-core-update</module>
-            <module>itop-hub-connector</module>
-          </modules>
-          <mandatory>true</mandatory>
-        </choice>
-        <choice>
-          <extension_code>itop-config-mgmt-datacenter</extension_code>
-          <title>Data Center Devices</title>
-          <description>Manage Data Center devices such as Racks, Enclosures, PDUs, etc.</description>
-          <modules type="array">
-            <module>itop-datacenter-mgmt</module>
-          </modules>
-          <default>true</default>
-        </choice>
-        <choice>
-          <extension_code>itop-config-mgmt-end-user</extension_code>
-          <title>End-User Devices</title>
-          <description>Manage devices related to end-users: PCs, Phones, Tablets, etc.</description>
-          <modules type="array">
-            <module>itop-endusers-devices</module>
-          </modules>
-           <default>true</default>
-        </choice>
-        <choice>
-          <extension_code>itop-config-mgmt-storage</extension_code>
-          <title>Storage Devices</title>
-          <description>Manage storage devices such as NAS, SAN Switches, Tape Libraries and Tapes, etc.</description>
-          <modules type="array">
-            <module>itop-storage-mgmt</module>
-          </modules>
-          <default>true</default>
-        </choice>
-        <choice>
-          <extension_code>itop-config-mgmt-virtualization</extension_code>
-          <title>Virtualization</title>
-          <description>Manage Hypervisors, Virtual Machines and Farms.</description>
-          <modules type="array">
-            <module>itop-virtualization-mgmt</module>
-          </modules>
-          <default>true</default>
-        </choice>
-      </options>
-    </step>
-    <step>
-      <title>Service Management options</title>
-      <description><![CDATA[<h2>Select the choice that best describes the relationships between the services and the IT infrastructure in your IT environment.</h2>]]></description>
-      <banner>./wizard-icons/service.png</banner>
-      <alternatives type="array">
-        <choice>
-          <extension_code>itop-service-mgmt-enterprise</extension_code>
-          <title>Service Management for Enterprises</title>
-          <description>Select this option if the IT delivers services based on a shared infrastructure. For example if different organizations within your company subscribe to services (like Mail and Print services) delivered by a single shared backend.</description>
-          <modules type="array">
-            <module>itop-service-mgmt</module>
-          </modules>
-          <default>true</default>
-        </choice>
-        <choice>
-          <extension_code>itop-service-mgmt-service-provider</extension_code>
-          <title>Service Management for Service Providers</title>
-          <description>Select this option if the IT manages the infrastructure of independent customers. This is the most flexible model, since the services can be delivered with a mix of shared and customer specific infrastructure devices.</description>
-          <modules type="array">
-            <module>itop-service-mgmt-provider</module>
-          </modules>
-        </choice>
-      </alternatives>
-    </step>
-    <step>
-      <title>Tickets Management options</title>
-      <description><![CDATA[<h2>Select the type of tickets you want to use in order to respond to user requests and incidents.</h2>]]></description>
-      <banner>./itop-incident-mgmt-itil/images/incident-escalated.png</banner>
-      <alternatives type="array">
-        <choice>
-          <extension_code>itop-ticket-mgmt-simple-ticket</extension_code>
-          <title>Simple Ticket Management</title>
-          <description>Select this option to use one single type of tickets for all kind of requests.</description>
-          <modules type="array">
-            <module>itop-request-mgmt</module>
-          </modules>
-          <default>true</default>
-          <sub_options>
-            <options type="array">
-              <choice>
-                <extension_code>itop-ticket-mgmt-simple-ticket-enhanced-portal</extension_code>
-                <title>Customer Portal</title>
-                <description><![CDATA[Modern & responsive portal for the end-users]]></description>
-                <modules type="array">
-                  <module>itop-portal</module>
-                  <module>itop-portal-base</module>
-                </modules>
-                <default>true</default>
-              </choice>
-            </options>
-          </sub_options>
-        </choice>
-        <choice>
-          <extension_code>itop-ticket-mgmt-itil</extension_code>
-          <title>ITIL Compliant Tickets Management</title>
-          <description>Select this option to have different types of ticket for managing user requests and incidents. Each type of ticket has a specific life cycle and specific fields</description>
-          <sub_options>
-            <options type="array">
-              <choice>
-                <extension_code>itop-ticket-mgmt-itil-user-request</extension_code>
-                <title>User Request Management</title>
-                <description>Manage User Request tickets in iTop</description>
-                <modules type="array">
-                  <module>itop-request-mgmt-itil</module>
-                </modules>
-              </choice>
-              <choice>
-                <extension_code>itop-ticket-mgmt-itil-incident</extension_code>
-                <title>Incident Management</title>
-                <description>Manage Incidents tickets in iTop</description>
-                <modules type="array">
-                  <module>itop-incident-mgmt-itil</module>
-                </modules>
-              </choice>
-              <choice>
-                <extension_code>itop-ticket-mgmt-itil-enhanced-portal</extension_code>
-                <title>Customer Portal</title>
-                <description><![CDATA[Modern & responsive portal for the end-users]]></description>
-                <modules type="array">
-                  <module>itop-portal</module>
-                  <module>itop-portal-base</module>
-                </modules>
-                <default>true</default>
-              </choice>
-            </options>
-          </sub_options>
-        </choice>
-        <choice>
-          <extension_code>itop-ticket-mgmt-none</extension_code>
-          <title>No Tickets Management</title>
-          <description>Don't manage incidents or user requests in iTop</description>
-          <modules type="array">
-          </modules>
-        </choice>
-      </alternatives>
-    </step>
-    <step>
-      <title>Change Management options</title>
-      <description><![CDATA[<h2>Select the type of tickets you want to use in order to manage changes to the IT infrastructure.</h2>]]></description>
-      <banner>./itop-change-mgmt/images/change.png</banner>
-      <alternatives type="array">
-        <choice>
-          <extension_code>itop-change-mgmt-simple</extension_code>
-          <title>Simple Change Management</title>
-          <description>Select this option to use one type of ticket for all kind of changes.</description>
-          <modules type="array">
-            <module>itop-change-mgmt</module>
-          </modules>
-          <default>true</default>
-        </choice>
-        <choice>
-          <extension_code>itop-change-mgmt-itil</extension_code>
-          <title>ITIL Change Management</title>
-          <description>Select this option to use Normal/Routine/Emergency change tickets.</description>
-          <modules type="array">
-            <module>itop-change-mgmt-itil</module>
-          </modules>
-        </choice>
-        <choice>
-          <extension_code>itop-change-mgmt-none</extension_code>
-          <title>No Change Management</title>
-          <description>Don't manage changes in iTop</description>
-          <modules type="array">
-          </modules>
-        </choice>
-      </alternatives>
-    </step>
-    <step>
-      <title>Additional ITIL tickets</title>
-      <description><![CDATA[<h2>Pick from the list below the additional ITIL processes that are to be implemented in iTop.</h2>]]></description>
-      <banner>./itop-knownerror-mgmt/images/known-error.png</banner>
-      <options type="array">
-        <choice>
-          <extension_code>itop-kown-error-mgmt</extension_code>
-          <title>Known Errors Management</title>
-          <description>Select this option to track "Known Errors" and FAQs in iTop.</description>
-          <modules type="array">
-            <module>itop-knownerror-mgmt</module>
-          </modules>
-        </choice>
-        <choice>
-          <extension_code>itop-problem-mgmt</extension_code>
-          <title>Problem Management</title>
-          <description>Select this option track "Problems" in iTop.</description>
-          <modules type="array">
-            <module>itop-problem-mgmt</module>
-          </modules>
-        </choice>
-      </options>
-    </step>
-  </steps>
-</installation>
+	<steps type="array">
+		<step>
+			<title>Configuration Management options</title>
+			<description><![CDATA[<h2>The options below allow you to configure the type of elements that are to be managed inside iTop.</h2>]]></description>
+			<banner>/images/modules.png</banner>
+			<options type="array">
+				<choice>
+					<extension_code>itop-config-mgmt-core</extension_code>
+					<title>Configuration Management Core</title>
+					<description>All the base objects that are mandatory in the iTop CMDB: Organizations, Locations, Teams, Persons, etc.</description>
+					<modules type="array">
+						<module>itop-structure</module>
+						<module>itop-config-mgmt</module>
+						<module>itop-attachments</module>
+						<module>itop-profiles-itil</module>
+						<module>itop-welcome-itil</module>
+						<module>itop-tickets</module>
+						<module>itop-files-information</module>
+						<module>combodo-db-tools</module>
+						<module>itop-core-update</module>
+						<module>itop-hub-connector</module>
+					</modules>
+					<mandatory>true</mandatory>
+				</choice>
+				<choice>
+					<extension_code>itop-config-mgmt-datacenter</extension_code>
+					<title>Data Center Devices</title>
+					<description>Manage Data Center devices such as Racks, Enclosures, PDUs, etc.</description>
+					<modules type="array">
+						<module>itop-datacenter-mgmt</module>
+					</modules>
+					<default>true</default>
+				</choice>
+				<choice>
+					<extension_code>itop-config-mgmt-end-user</extension_code>
+					<title>End-User Devices</title>
+					<description>Manage devices related to end-users: PCs, Phones, Tablets, etc.</description>
+					<modules type="array">
+						<module>itop-endusers-devices</module>
+					</modules>
+					<default>true</default>
+				</choice>
+				<choice>
+					<extension_code>itop-config-mgmt-storage</extension_code>
+					<title>Storage Devices</title>
+					<description>Manage storage devices such as NAS, SAN Switches, Tape Libraries and Tapes, etc.</description>
+					<modules type="array">
+						<module>itop-storage-mgmt</module>
+					</modules>
+					<default>true</default>
+				</choice>
+				<choice>
+					<extension_code>itop-config-mgmt-virtualization</extension_code>
+					<title>Virtualization</title>
+					<description>Manage Hypervisors, Virtual Machines and Farms.</description>
+					<modules type="array">
+						<module>itop-virtualization-mgmt</module>
+					</modules>
+					<default>true</default>
+				</choice>
+			</options>
+		</step>
+		<step>
+			<title>Service Management options</title>
+			<description><![CDATA[<h2>Select the choice that best describes the relationships between the services and the IT infrastructure in your IT environment.</h2>]]></description>
+			<banner>./wizard-icons/service.png</banner>
+			<alternatives type="array">
+				<choice>
+					<extension_code>itop-service-mgmt-enterprise</extension_code>
+					<title>Service Management for Enterprises</title>
+					<description>Select this option if the IT delivers services based on a shared infrastructure. For example if different organizations within your company subscribe to services (like Mail and Print services) delivered by a single shared backend.</description>
+					<modules type="array">
+						<module>itop-service-mgmt</module>
+					</modules>
+					<default>true</default>
+				</choice>
+				<choice>
+					<extension_code>itop-service-mgmt-service-provider</extension_code>
+					<title>Service Management for Service Providers</title>
+					<description>Select this option if the IT manages the infrastructure of independent customers. This is the most flexible model, since the services can be delivered with a mix of shared and customer specific infrastructure devices.</description>
+					<modules type="array">
+						<module>itop-service-mgmt-provider</module>
+					</modules>
+				</choice>
+			</alternatives>
+		</step>
+		<step>
+			<title>Tickets Management options</title>
+			<description><![CDATA[<h2>Select the type of tickets you want to use in order to respond to user requests and incidents.</h2>]]></description>
+			<banner>./itop-incident-mgmt-itil/images/incident-escalated.png</banner>
+			<alternatives type="array">
+				<choice>
+					<extension_code>itop-ticket-mgmt-simple-ticket</extension_code>
+					<title>Simple Ticket Management</title>
+					<description>Select this option to use one single type of tickets for all kind of requests.</description>
+					<modules type="array">
+						<module>itop-request-mgmt</module>
+					</modules>
+					<default>true</default>
+					<sub_options>
+						<options type="array">
+							<choice>
+								<extension_code>itop-ticket-mgmt-simple-ticket-enhanced-portal</extension_code>
+								<title>Customer Portal</title>
+								<description><![CDATA[Modern & responsive portal for the end-users]]></description>
+								<modules type="array">
+									<module>itop-portal</module>
+									<module>itop-portal-base</module>
+								</modules>
+								<default>true</default>
+							</choice>
+						</options>
+					</sub_options>
+				</choice>
+				<choice>
+					<extension_code>itop-ticket-mgmt-itil</extension_code>
+					<title>ITIL Compliant Tickets Management</title>
+					<description>Select this option to have different types of ticket for managing user requests and incidents. Each type of ticket has a specific life cycle and specific fields</description>
+					<sub_options>
+						<options type="array">
+							<choice>
+								<extension_code>itop-ticket-mgmt-itil-user-request</extension_code>
+								<title>User Request Management</title>
+								<description>Manage User Request tickets in iTop</description>
+								<modules type="array">
+									<module>itop-request-mgmt-itil</module>
+								</modules>
+							</choice>
+							<choice>
+								<extension_code>itop-ticket-mgmt-itil-incident</extension_code>
+								<title>Incident Management</title>
+								<description>Manage Incidents tickets in iTop</description>
+								<modules type="array">
+									<module>itop-incident-mgmt-itil</module>
+								</modules>
+							</choice>
+							<choice>
+								<extension_code>itop-ticket-mgmt-itil-enhanced-portal</extension_code>
+								<title>Customer Portal</title>
+								<description><![CDATA[Modern & responsive portal for the end-users]]></description>
+								<modules type="array">
+									<module>itop-portal</module>
+									<module>itop-portal-base</module>
+								</modules>
+								<default>true</default>
+							</choice>
+						</options>
+					</sub_options>
+				</choice>
+				<choice>
+					<extension_code>itop-ticket-mgmt-none</extension_code>
+					<title>No Tickets Management</title>
+					<description>Don't manage incidents or user requests in iTop</description>
+					<modules type="array">
+					</modules>
+				</choice>
+			</alternatives>
+		</step>
+		<step>
+			<title>Change Management options</title>
+			<description><![CDATA[<h2>Select the type of tickets you want to use in order to manage changes to the IT infrastructure.</h2>]]></description>
+			<banner>./itop-change-mgmt/images/change.png</banner>
+			<alternatives type="array">
+				<choice>
+					<extension_code>itop-change-mgmt-simple</extension_code>
+					<title>Simple Change Management</title>
+					<description>Select this option to use one type of ticket for all kind of changes.</description>
+					<modules type="array">
+						<module>itop-change-mgmt</module>
+					</modules>
+					<default>true</default>
+				</choice>
+				<choice>
+					<extension_code>itop-change-mgmt-itil</extension_code>
+					<title>ITIL Change Management</title>
+					<description>Select this option to use Normal/Routine/Emergency change tickets.</description>
+					<modules type="array">
+						<module>itop-change-mgmt-itil</module>
+					</modules>
+				</choice>
+				<choice>
+					<extension_code>itop-change-mgmt-none</extension_code>
+					<title>No Change Management</title>
+					<description>Don't manage changes in iTop</description>
+					<modules type="array">
+					</modules>
+				</choice>
+			</alternatives>
+		</step>
+		<step>
+			<title>Additional ITIL tickets</title>
+			<description><![CDATA[<h2>Pick from the list below the additional ITIL processes that are to be implemented in iTop.</h2>]]></description>
+			<banner>./itop-knownerror-mgmt/images/known-error.png</banner>
+			<options type="array">
+				<choice>
+					<extension_code>itop-kown-error-mgmt</extension_code>
+					<title>Known Errors Management</title>
+					<description>Select this option to track "Known Errors" and FAQs in iTop.</description>
+					<modules type="array">
+						<module>itop-knownerror-mgmt</module>
+					</modules>
+				</choice>
+				<choice>
+					<extension_code>itop-problem-mgmt</extension_code>
+					<title>Problem Management</title>
+					<description>Select this option track "Problems" in iTop.</description>
+					<modules type="array">
+						<module>itop-problem-mgmt</module>
+					</modules>
+				</choice>
+			</options>
+		</step>
+	</steps>
+</installation>
\ No newline at end of file
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/cs.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/cs.dict.itop-bridge-cmdb-ticket.php
new file mode 100644
index 000000000..44559732a
--- /dev/null
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/cs.dict.itop-bridge-cmdb-ticket.php
@@ -0,0 +1,72 @@
+<?php
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+* @author       Benjamin Planque <benjamin.planque@combodo.com>
+* @copyright   Copyright (C) 2010-2018 Combodo SARL
+* @license     http://opensource.org/licenses/AGPL-3.0
+*/
+
+//////////////////////////////////////////////////////////////////////
+// Note: The classes have been grouped by categories: bizmodel
+//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+//
+// Class: lnkContactToFunctionalCI
+//
+
+Dict::Add('CS CZ', 'Czech', 'Čeština', array(
+	'Class:lnkContactToFunctionalCI' => 'Spojení (Kontakt / Funkční konfigurační položka)',
+	'Class:lnkContactToFunctionalCI+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Funkční konfigurační položka',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Název funkční konfigurační položky',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Kontakt',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Název kontaktu',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
+));
+
+//
+// Class: lnkFunctionalCIToTicket
+//
+
+Dict::Add('CS CZ', 'Czech', 'Čeština', array(
+	'Class:lnkFunctionalCIToTicket' => 'Spojení (Funkční konfigurační položka / Tiket)',
+	'Class:lnkFunctionalCIToTicket+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Tiket',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'ID',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title' => 'Ticket title~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title+' => '~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id' => 'Konfigurační položka',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name' => 'Název konfigurační položky',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact' => 'Dopad (text)',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code' => 'Dopad',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Přidán manuálně',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Automaticky',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Není zasažen',
+));
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/da.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/da.dict.itop-bridge-cmdb-ticket.php
new file mode 100644
index 000000000..504a12cc4
--- /dev/null
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/da.dict.itop-bridge-cmdb-ticket.php
@@ -0,0 +1,72 @@
+<?php
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+* @author       Benjamin Planque <benjamin.planque@combodo.com>
+* @copyright   Copyright (C) 2010-2018 Combodo SARL
+* @license     http://opensource.org/licenses/AGPL-3.0
+*/
+
+//////////////////////////////////////////////////////////////////////
+// Note: The classes have been grouped by categories: bizmodel
+//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+//
+// Class: lnkContactToFunctionalCI
+//
+
+Dict::Add('DA DA', 'Danish', 'Dansk', array(
+	'Class:lnkContactToFunctionalCI' => 'Sammenhæng Kontakt/FunctionalCI',
+	'Class:lnkContactToFunctionalCI+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'FunctionalCI',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'FunctionalCI navn',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Kontakt',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Kontakt navn',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
+));
+
+//
+// Class: lnkFunctionalCIToTicket
+//
+
+Dict::Add('DA DA', 'Danish', 'Dansk', array(
+	'Class:lnkFunctionalCIToTicket' => 'Sammenhæng FunctionalCI/Ticket',
+	'Class:lnkFunctionalCIToTicket+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Ticket',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'Reference',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title' => 'Ticket title~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title+' => '~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id' => 'CI',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name' => 'CI Navn',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact' => 'Påvirkning',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code' => 'Impact~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Added manually~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Computed~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Not impacted~~',
+));
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
new file mode 100644
index 000000000..0933160cc
--- /dev/null
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/datamodel.itop-bridge-cmdb-ticket.xml
@@ -0,0 +1,570 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.6">
+	<constants>
+	</constants>
+	<classes>
+		<class id="lnkFunctionalCIToTicket" _delta="define">
+			<parent>cmdbAbstractObject</parent>
+			<properties>
+				<is_link>1</is_link>
+				<category>bizmodel</category>
+				<abstract>false</abstract>
+				<key_type>autoincrement</key_type>
+				<db_table>lnkfunctionalcitoticket</db_table>
+				<db_key_field>id</db_key_field>
+				<db_final_class_field/>
+				<naming>
+					<attributes>
+						<attribute id="ticket_id"/>
+						<attribute id="functionalci_id"/>
+					</attributes>
+				</naming>
+				<display_template/>
+				<icon/>
+				<reconciliation>
+					<attributes>
+						<attribute id="ticket_id"/>
+						<attribute id="functionalci_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="ticket_title" xsi:type="AttributeExternalField">
+					<extkey_attcode>ticket_id</extkey_attcode>
+					<target_attcode>title</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>
+				<field id="impact" xsi:type="AttributeString">
+					<sql>impact</sql>
+					<default_value/>
+					<is_null_allowed>true</is_null_allowed>
+				</field>
+				<field id="impact_code" xsi:type="AttributeEnum">
+					<values>
+						<value id="manual">manual</value>
+						<value id="computed">computed</value>
+						<value id="not_impacted">not_impacted</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="functionalci_id">
+							<rank>20</rank>
+						</item>
+						<item id="impact_code">
+							<rank>30</rank>
+						</item>
+					</items>
+				</details>
+				<search>
+					<items>
+						<item id="ticket_id">
+							<rank>10</rank>
+						</item>
+						<item id="functionalci_id">
+							<rank>20</rank>
+						</item>
+						<item id="impact_code">
+							<rank>30</rank>
+						</item>
+					</items>
+				</search>
+				<list>
+					<items>
+						<item id="ticket_id">
+							<rank>10</rank>
+						</item>
+						<item id="functionalci_id">
+							<rank>20</rank>
+						</item>
+						<item id="impact_code">
+							<rank>30</rank>
+						</item>
+					</items>
+				</list>
+			</presentation>
+		</class>
+		<class id="lnkFunctionalCIToProviderContract" _delta="define">
+			<parent>cmdbAbstractObject</parent>
+			<properties>
+				<is_link>1</is_link>
+				<category>bizmodel</category>
+				<abstract>false</abstract>
+				<key_type>autoincrement</key_type>
+				<db_table>lnkfunctionalcitoprovidercontract</db_table>
+				<db_key_field>id</db_key_field>
+				<db_final_class_field/>
+				<naming>
+					<attributes>
+						<attribute id="providercontract_id"/>
+						<attribute id="functionalci_id"/>
+					</attributes>
+				</naming>
+				<display_template/>
+				<icon/>
+				<reconciliation>
+					<attributes>
+						<attribute id="providercontract_id"/>
+						<attribute id="functionalci_id"/>
+					</attributes>
+				</reconciliation>
+			</properties>
+			<fields>
+				<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>
+				<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="providercontract_id">
+							<rank>10</rank>
+						</item>
+						<item id="functionalci_id">
+							<rank>20</rank>
+						</item>
+					</items>
+				</details>
+				<search>
+					<items>
+						<item id="providercontract_id">
+							<rank>10</rank>
+						</item>
+						<item id="functionalci_id">
+							<rank>20</rank>
+						</item>
+					</items>
+				</search>
+				<list>
+					<items>
+						<item id="providercontract_id">
+							<rank>10</rank>
+						</item>
+						<item id="functionalci_id">
+							<rank>20</rank>
+						</item>
+					</items>
+				</list>
+			</presentation>
+		</class>
+		<class id="lnkFunctionalCIToService" _delta="define">
+			<parent>cmdbAbstractObject</parent>
+			<properties>
+				<is_link>1</is_link>
+				<category>bizmodel</category>
+				<abstract>false</abstract>
+				<key_type>autoincrement</key_type>
+				<db_table>lnkfunctionalcitoservice</db_table>
+				<db_key_field>id</db_key_field>
+				<db_final_class_field/>
+				<naming>
+					<attributes>
+						<attribute id="service_id"/>
+						<attribute id="functionalci_id"/>
+					</attributes>
+				</naming>
+				<display_template/>
+				<icon/>
+				<reconciliation>
+					<attributes>
+						<attribute id="service_id"/>
+						<attribute id="functionalci_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="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="service_id">
+							<rank>10</rank>
+						</item>
+						<item id="functionalci_id">
+							<rank>20</rank>
+						</item>
+					</items>
+				</details>
+				<search>
+					<items>
+						<item id="service_id">
+							<rank>10</rank>
+						</item>
+						<item id="functionalci_id">
+							<rank>20</rank>
+						</item>
+					</items>
+				</search>
+				<list>
+					<items>
+						<item id="service_id">
+							<rank>10</rank>
+						</item>
+						<item id="functionalci_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>
+				<display_template/>
+				<icon/>
+				<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="FunctionalCI" _delta="must_exist">
+			<fields>
+				<field id="providercontracts_list" xsi:type="AttributeLinkedSetIndirect" _delta="define">
+					<linked_class>lnkFunctionalCIToProviderContract</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>providercontract_id</ext_key_to_remote>
+					<duplicates/>
+				</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="services_list" xsi:type="AttributeLinkedSetIndirect" _delta="define">
+					<linked_class>lnkFunctionalCIToService</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>service_id</ext_key_to_remote>
+					<duplicates/>
+				</field>
+				<field id="tickets_list" xsi:type="AttributeLinkedSetIndirect" _delta="define">
+					<linked_class>lnkFunctionalCIToTicket</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>ticket_id</ext_key_to_remote>
+					<duplicates/>
+				</field>
+			</fields>
+			<presentation>
+				<details>
+					<items>
+						<item id="providercontracts_list" _delta="define">
+							<rank>100</rank>
+						</item>
+						<item id="services_list" _delta="define">
+							<rank>110</rank>
+						</item>
+					</items>
+				</details>
+			</presentation>
+		</class>
+		<class id="NetworkDevice" _delta="must_exist">
+			<presentation>
+				<details>
+					<items>
+						<item id="providercontracts_list" _delta="define">
+							<rank>60</rank>
+						</item>
+						<item id="services_list" _delta="define">
+							<rank>70</rank>
+						</item>
+					</items>
+				</details>
+			</presentation>
+		</class>
+		<class id="Server" _delta="must_exist">
+			<presentation>
+				<details>
+					<items>
+						<item id="providercontracts_list" _delta="define">
+							<rank>100</rank>
+						</item>
+						<item id="services_list" _delta="define">
+							<rank>110</rank>
+						</item>
+					</items>
+				</details>
+			</presentation>
+		</class>
+		<class id="ApplicationSolution" _delta="must_exist">
+			<presentation>
+				<details>
+					<items>
+						<item id="providercontracts_list" _delta="define">
+							<rank>120</rank>
+						</item>
+						<item id="services_list" _delta="define">
+							<rank>130</rank>
+						</item>
+					</items>
+				</details>
+			</presentation>
+		</class>
+		<class id="Middleware" _delta="must_exist">
+			<presentation>
+				<details>
+					<items>
+						<item id="providercontracts_list" _delta="define">
+							<rank>160</rank>
+						</item>
+						<item id="services_list" _delta="define">
+							<rank>170</rank>
+						</item>
+					</items>
+				</details>
+			</presentation>
+		</class>
+		<class id="DBServer" _delta="must_exist">
+			<presentation>
+				<details>
+					<items>
+						<item id="providercontracts_list" _delta="define">
+							<rank>160</rank>
+						</item>
+						<item id="services_list" _delta="define">
+							<rank>170</rank>
+						</item>
+					</items>
+				</details>
+			</presentation>
+		</class>
+		<class id="WebServer" _delta="must_exist">
+			<presentation>
+				<details>
+					<items>
+						<item id="providercontracts_list" _delta="define">
+							<rank>160</rank>
+						</item>
+						<item id="services_list" _delta="define">
+							<rank>170</rank>
+						</item>
+					</items>
+				</details>
+			</presentation>
+		</class>
+		<class id="PCSoftware" _delta="must_exist">
+			<presentation>
+				<details>
+					<items>
+						<item id="providercontracts_list" _delta="define">
+							<rank>150</rank>
+						</item>
+						<item id="services_list" _delta="define">
+							<rank>160</rank>
+						</item>
+					</items>
+				</details>
+			</presentation>
+		</class>
+		<class id="OtherSoftware" _delta="must_exist">
+			<presentation>
+				<details>
+					<items>
+						<item id="providercontracts_list" _delta="define">
+							<rank>150</rank>
+						</item>
+						<item id="services_list" _delta="define">
+							<rank>160</rank>
+						</item>
+					</items>
+				</details>
+			</presentation>
+		</class>
+		<class id="MiddlewareInstance" _delta="must_exist">
+			<presentation>
+				<details>
+					<items>
+						<item id="providercontracts_list" _delta="define">
+							<rank>110</rank>
+						</item>
+						<item id="services_list" _delta="define">
+							<rank>120</rank>
+						</item>
+					</items>
+				</details>
+			</presentation>
+		</class>
+		<class id="DatabaseSchema" _delta="must_exist">
+			<presentation>
+				<details>
+					<items>
+						<item id="providercontracts_list" _delta="define">
+							<rank>110</rank>
+						</item>
+						<item id="services_list" _delta="define">
+							<rank>120</rank>
+						</item>
+					</items>
+				</details>
+			</presentation>
+		</class>
+		<class id="WebApplication" _delta="must_exist">
+			<presentation>
+				<details>
+					<items>
+						<item id="providercontracts_list" _delta="define">
+							<rank>120</rank>
+						</item>
+						<item id="services_list" _delta="define">
+							<rank>130</rank>
+						</item>
+					</items>
+				</details>
+			</presentation>
+		</class>
+	</classes>
+	<menus>
+	</menus>
+	<user_rights>
+		<groups>
+		</groups>
+		<profiles>
+		</profiles>
+	</user_rights>
+</itop_design>
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/de.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/de.dict.itop-bridge-cmdb-ticket.php
new file mode 100644
index 000000000..c50943797
--- /dev/null
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/de.dict.itop-bridge-cmdb-ticket.php
@@ -0,0 +1,72 @@
+<?php
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+* @author       Benjamin Planque <benjamin.planque@combodo.com>
+* @copyright   Copyright (C) 2010-2018 Combodo SARL
+* @license     http://opensource.org/licenses/AGPL-3.0
+*/
+
+//////////////////////////////////////////////////////////////////////
+// Note: The classes have been grouped by categories: bizmodel
+//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+//
+// Class: lnkContactToFunctionalCI
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:lnkContactToFunctionalCI' => 'Verknüpfung Kontakt/FunctionalCI',
+	'Class:lnkContactToFunctionalCI+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'FunctionalCI',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'FunctionalCI-Name',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Kontakt',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Kontakt-Name',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
+));
+
+//
+// Class: lnkFunctionalCIToTicket
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:lnkFunctionalCIToTicket' => 'Verknüpfung FunctionalCI/Ticket',
+	'Class:lnkFunctionalCIToTicket+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Ticket',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'Referenz',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title' => 'Tickettitel',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id' => 'CI',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name' => 'CI-Name',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact' => 'Auswirkung (Text)',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code' => 'Auswirkung',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Manuell hinzugefügt',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Berechnet',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Nicht betroffen',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/en.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/en.dict.itop-bridge-cmdb-ticket.php
new file mode 100644
index 000000000..cad9a3573
--- /dev/null
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/en.dict.itop-bridge-cmdb-ticket.php
@@ -0,0 +1,72 @@
+<?php
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+* @author       Benjamin Planque <benjamin.planque@combodo.com>
+* @copyright   Copyright (C) 2010-2018 Combodo SARL
+* @license     http://opensource.org/licenses/AGPL-3.0
+*/
+
+//////////////////////////////////////////////////////////////////////
+// Note: The classes have been grouped by categories: bizmodel
+//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+//
+// Class: lnkContactToFunctionalCI
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:lnkContactToFunctionalCI' => 'Link Contact / FunctionalCI',
+	'Class:lnkContactToFunctionalCI+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Functionalci',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contact',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Contact name',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
+));
+
+//
+// Class: lnkFunctionalCIToTicket
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:lnkFunctionalCIToTicket' => 'Link FunctionalCI / Ticket',
+	'Class:lnkFunctionalCIToTicket+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Ticket',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'Ref',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title' => 'Ticket title',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id' => 'CI',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name' => 'CI Name',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact' => 'Impact (text)',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code' => 'Impact',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Added manually',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Computed',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Not impacted',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/es_cr.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/es_cr.dict.itop-bridge-cmdb-ticket.php
new file mode 100644
index 000000000..9bea448eb
--- /dev/null
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/es_cr.dict.itop-bridge-cmdb-ticket.php
@@ -0,0 +1,72 @@
+<?php
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+* @author       Benjamin Planque <benjamin.planque@combodo.com>
+* @copyright   Copyright (C) 2010-2018 Combodo SARL
+* @license     http://opensource.org/licenses/AGPL-3.0
+*/
+
+//////////////////////////////////////////////////////////////////////
+// Note: The classes have been grouped by categories: bizmodel
+//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+//
+// Class: lnkContactToFunctionalCI
+//
+
+Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+	'Class:lnkContactToFunctionalCI' => 'Relación Contacto y  EC Funcional',
+	'Class:lnkContactToFunctionalCI+' => 'Relación Contacto y  EC Funcional',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'EC Funcional',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => 'EC Funcional',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'EC Funcional',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => 'EC Funcional',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contacto',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => 'Contacto',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Contacto',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => 'Contacto',
+));
+
+//
+// Class: lnkFunctionalCIToTicket
+//
+
+Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+	'Class:lnkFunctionalCIToTicket' => 'Relación EC Funcional y Ticket',
+	'Class:lnkFunctionalCIToTicket+' => 'Relación EC Funcional y Ticket',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Ticket',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => 'Ticket',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'Ref.',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref+' => 'Ref.',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title' => 'Ticket title~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title+' => '~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id' => 'EC',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id+' => 'Elemanto de Configuración',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name' => 'Elemanto de Configuración',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name+' => 'Elemanto de Configuración',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact' => 'Impacto',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact+' => 'Impacto',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code' => 'Impacto',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Agregado Manualmente',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Calculado',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'No impactado',
+));
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/extension.xml b/datamodels/2.x/itop-bridge-cmdb-ticket/extension.xml
new file mode 100644
index 000000000..6d4b9b967
--- /dev/null
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/extension.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<extension format="1.0">
+  <extension_code>itop-bridge-cmdb-ticket</extension_code>
+  <version>1.0.0</version>
+  <label><![CDATA[Bridge for CMDB and Ticket]]></label>
+  <description><![CDATA[This module adds lnk between classes brought by CMDB and Ticket]]></description>
+  <mandatory>false</mandatory>
+  <more_info_url></more_info_url>
+</extension>
\ No newline at end of file
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/fr.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/fr.dict.itop-bridge-cmdb-ticket.php
new file mode 100644
index 000000000..4d4134214
--- /dev/null
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/fr.dict.itop-bridge-cmdb-ticket.php
@@ -0,0 +1,72 @@
+<?php
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+* @author       Benjamin Planque <benjamin.planque@combodo.com>
+* @copyright   Copyright (C) 2010-2018 Combodo SARL
+* @license     http://opensource.org/licenses/AGPL-3.0
+*/
+
+//////////////////////////////////////////////////////////////////////
+// Note: The classes have been grouped by categories: bizmodel
+//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+//
+// Class: lnkContactToFunctionalCI
+//
+
+Dict::Add('FR FR', 'French', 'Français', array(
+	'Class:lnkContactToFunctionalCI' => 'Lien Contact / CI Fonctionel',
+	'Class:lnkContactToFunctionalCI+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'CI',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Nom CI',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contact',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Nom contact',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
+));
+
+//
+// Class: lnkFunctionalCIToTicket
+//
+
+Dict::Add('FR FR', 'French', 'Français', array(
+	'Class:lnkFunctionalCIToTicket' => 'Lien CI / Ticket',
+	'Class:lnkFunctionalCIToTicket+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Ticket',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'Référence',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title' => 'Titre Ticket',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id' => 'CI',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name' => 'Nom CI',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact' => 'Impact (texte)',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code' => 'Impact',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Ajouté manuellement',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Calculé',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Non impacté',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/hu.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/hu.dict.itop-bridge-cmdb-ticket.php
new file mode 100644
index 000000000..db9810ef9
--- /dev/null
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/hu.dict.itop-bridge-cmdb-ticket.php
@@ -0,0 +1,72 @@
+<?php
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+* @author       Benjamin Planque <benjamin.planque@combodo.com>
+* @copyright   Copyright (C) 2010-2018 Combodo SARL
+* @license     http://opensource.org/licenses/AGPL-3.0
+*/
+
+//////////////////////////////////////////////////////////////////////
+// Note: The classes have been grouped by categories: bizmodel
+//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+//
+// Class: lnkContactToFunctionalCI
+//
+
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+	'Class:lnkContactToFunctionalCI' => 'Link Contact / FunctionalCI~~',
+	'Class:lnkContactToFunctionalCI+' => '~~',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Functionalci~~',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '~~',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name~~',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '~~',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contact~~',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '~~',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Contact name~~',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '~~',
+));
+
+//
+// Class: lnkFunctionalCIToTicket
+//
+
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+	'Class:lnkFunctionalCIToTicket' => 'Link FunctionalCI / Ticket~~',
+	'Class:lnkFunctionalCIToTicket+' => '~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Ticket~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'Ref~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref+' => '~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title' => 'Ticket title~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title+' => '~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id' => 'CI~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id+' => '~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name' => 'CI Name~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name+' => '~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact' => 'Impact (text)~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact+' => '~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code' => 'Impact~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Added manually~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Computed~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Not impacted~~',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/it.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/it.dict.itop-bridge-cmdb-ticket.php
new file mode 100644
index 000000000..019133220
--- /dev/null
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/it.dict.itop-bridge-cmdb-ticket.php
@@ -0,0 +1,72 @@
+<?php
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+* @author       Benjamin Planque <benjamin.planque@combodo.com>
+* @copyright   Copyright (C) 2010-2018 Combodo SARL
+* @license     http://opensource.org/licenses/AGPL-3.0
+*/
+
+//////////////////////////////////////////////////////////////////////
+// Note: The classes have been grouped by categories: bizmodel
+//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+//
+// Class: lnkContactToFunctionalCI
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:lnkContactToFunctionalCI' => 'Link Contact / FunctionalCI~~',
+	'Class:lnkContactToFunctionalCI+' => '~~',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Functionalci~~',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '~~',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name~~',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '~~',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contact~~',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '~~',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Contact name~~',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '~~',
+));
+
+//
+// Class: lnkFunctionalCIToTicket
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:lnkFunctionalCIToTicket' => 'Link FunctionalCI / Ticket~~',
+	'Class:lnkFunctionalCIToTicket+' => '~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Ticket~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'Ref~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref+' => '~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title' => 'Ticket title~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title+' => '~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id' => 'CI~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id+' => '~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name' => 'CI Name~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name+' => '~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact' => 'Impact (text)~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact+' => '~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code' => 'Impact~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Added manually~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Computed~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Not impacted~~',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/ja.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/ja.dict.itop-bridge-cmdb-ticket.php
new file mode 100644
index 000000000..e5151e667
--- /dev/null
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/ja.dict.itop-bridge-cmdb-ticket.php
@@ -0,0 +1,72 @@
+<?php
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+* @author       Benjamin Planque <benjamin.planque@combodo.com>
+* @copyright   Copyright (C) 2010-2018 Combodo SARL
+* @license     http://opensource.org/licenses/AGPL-3.0
+*/
+
+//////////////////////////////////////////////////////////////////////
+// Note: The classes have been grouped by categories: bizmodel
+//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+//
+// Class: lnkContactToFunctionalCI
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:lnkContactToFunctionalCI' => 'リンク 連絡先/機能的CI',
+	'Class:lnkContactToFunctionalCI+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => '機能的ci',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => '機能的ci名',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => '連絡先',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => '連絡先名',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
+));
+
+//
+// Class: lnkFunctionalCIToTicket
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:lnkFunctionalCIToTicket' => 'リンク 機能的CI/チケット',
+	'Class:lnkFunctionalCIToTicket+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'チケット',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => '参照',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title' => 'Ticket title~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title+' => '~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id' => 'CI',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name' => 'CI名',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact' => 'インパクト',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code' => 'Impact~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Added manually~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Computed~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Not impacted~~',
+));
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/module.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/module.itop-bridge-cmdb-ticket.php
new file mode 100644
index 000000000..396df73f3
--- /dev/null
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/module.itop-bridge-cmdb-ticket.php
@@ -0,0 +1,55 @@
+<?php
+//
+// iTop module definition file
+//
+
+SetupWebPage::AddModule(
+	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
+	'itop-bridge-cmdb-ticket/1.0.0',
+	array(
+		// Identification
+		//
+		'label' => 'Bridge for CMDB and Ticket',
+		'category' => 'business',
+
+		// Setup
+		//
+		'dependencies' => array(
+				'itop-config-mgmt/2.7.1',
+				'itop-tickets/2.7.0',
+				'itop-service-mgmt/2.7.1 || itop-service-mgmt-provider/2.7.1',
+		),
+		'mandatory' => false,
+		'visible' => false,
+		'auto_select' => 'SetupInfo::ModuleIsSelected("itop-config-mgmt") && SetupInfo::ModuleIsSelected("itop-tickets") && (SetupInfo::ModuleIsSelected("itop-service-mgmt") || SetupInfo::ModuleIsSelected("itop-service-mgmt-provider")) ',
+
+		// Components
+		//
+		'datamodel' => array(
+			'model.itop-bridge-cmdb-ticket.php', // Contains the PHP code generated by the "compilation" of datamodel.itop-cmdb-ticket-bridge.xml
+		),
+		'webservice' => array(
+			
+		),
+		'data.struct' => array(
+			// add your 'structure' definition XML files here,
+		),
+		'data.sample' => array(
+			// add your sample data XML files here,
+		),
+		
+		// Documentation
+		//
+		'doc.manual_setup' => '', // hyperlink to manual setup documentation, if any
+		'doc.more_information' => '', // hyperlink to more information, if any 
+
+		// Default settings
+		//
+		'settings' => array(
+			// Module specific settings go here, if any
+		),
+	)
+);
+
+
+?>
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/nl.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/nl.dict.itop-bridge-cmdb-ticket.php
new file mode 100644
index 000000000..643d1b054
--- /dev/null
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/nl.dict.itop-bridge-cmdb-ticket.php
@@ -0,0 +1,72 @@
+<?php
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+* @author       Benjamin Planque <benjamin.planque@combodo.com>
+* @copyright   Copyright (C) 2010-2018 Combodo SARL
+* @license     http://opensource.org/licenses/AGPL-3.0
+*/
+
+//////////////////////////////////////////////////////////////////////
+// Note: The classes have been grouped by categories: bizmodel
+//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+//
+// Class: lnkContactToFunctionalCI
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:lnkContactToFunctionalCI' => 'Link Contact / Functioneel CI',
+	'Class:lnkContactToFunctionalCI+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Functioneel CI',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Naam functioneel CI',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contact',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Naam contact',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
+));
+
+//
+// Class: lnkFunctionalCIToTicket
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:lnkFunctionalCIToTicket' => 'Link Functioneel CI / Ticket',
+	'Class:lnkFunctionalCIToTicket+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Ticket',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'Referentie',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title' => 'Titel ticket',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id' => 'CI',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name' => 'Naam CI',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact' => 'Impact',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code' => 'Impact',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Manueel toegevoegd',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Automatisch afgeleid',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Niet geïmpacteerd',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/pt_br.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/pt_br.dict.itop-bridge-cmdb-ticket.php
new file mode 100644
index 000000000..0e0464944
--- /dev/null
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/pt_br.dict.itop-bridge-cmdb-ticket.php
@@ -0,0 +1,72 @@
+<?php
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+* @author       Benjamin Planque <benjamin.planque@combodo.com>
+* @copyright   Copyright (C) 2010-2018 Combodo SARL
+* @license     http://opensource.org/licenses/AGPL-3.0
+*/
+
+//////////////////////////////////////////////////////////////////////
+// Note: The classes have been grouped by categories: bizmodel
+//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+//
+// Class: lnkContactToFunctionalCI
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:lnkContactToFunctionalCI' => 'Link Contato / CI',
+	'Class:lnkContactToFunctionalCI+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'CIs',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Nome CI',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contato',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Nome contato',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
+));
+
+//
+// Class: lnkFunctionalCIToTicket
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:lnkFunctionalCIToTicket' => 'Link CI / Solicitação',
+	'Class:lnkFunctionalCIToTicket+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Solicitação',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'Ref',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title' => 'Título do bilhete',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id' => 'CIs',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name' => 'Nome CI',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact' => 'Impacto',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code' => 'Impacto',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Adicionado manualmente',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Computado',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Não impactado',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/ru.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/ru.dict.itop-bridge-cmdb-ticket.php
new file mode 100644
index 000000000..2e6c22e8a
--- /dev/null
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/ru.dict.itop-bridge-cmdb-ticket.php
@@ -0,0 +1,72 @@
+<?php
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+* @author       Benjamin Planque <benjamin.planque@combodo.com>
+* @copyright   Copyright (C) 2010-2018 Combodo SARL
+* @license     http://opensource.org/licenses/AGPL-3.0
+*/
+
+//////////////////////////////////////////////////////////////////////
+// Note: The classes have been grouped by categories: bizmodel
+//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+//
+// Class: lnkContactToFunctionalCI
+//
+
+Dict::Add('RU RU', 'Russian', 'Русский', array(
+	'Class:lnkContactToFunctionalCI' => 'Связь Контакт/Функциональная КЕ',
+	'Class:lnkContactToFunctionalCI+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Функциональная КЕ',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Функциональная КЕ',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Контакт',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Контакт',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
+));
+
+//
+// Class: lnkFunctionalCIToTicket
+//
+
+Dict::Add('RU RU', 'Russian', 'Русский', array(
+	'Class:lnkFunctionalCIToTicket' => 'Связь Функциональная КЕ/Тикет',
+	'Class:lnkFunctionalCIToTicket+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Тикет',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'Тикет',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title' => 'Название тикета',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id' => 'КЕ',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name' => 'КЕ',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact' => 'Влияние (текст)',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code' => 'Влияние',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Добавлено вручную',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Вычислено',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Не влияет',
+));
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/sk.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/sk.dict.itop-bridge-cmdb-ticket.php
new file mode 100644
index 000000000..0852cc116
--- /dev/null
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/sk.dict.itop-bridge-cmdb-ticket.php
@@ -0,0 +1,72 @@
+<?php
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+* @author       Benjamin Planque <benjamin.planque@combodo.com>
+* @copyright   Copyright (C) 2010-2018 Combodo SARL
+* @license     http://opensource.org/licenses/AGPL-3.0
+*/
+
+//////////////////////////////////////////////////////////////////////
+// Note: The classes have been grouped by categories: bizmodel
+//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+//
+// Class: lnkContactToFunctionalCI
+//
+
+Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
+	'Class:lnkContactToFunctionalCI' => 'väzba - Kontakt / Komponent',
+	'Class:lnkContactToFunctionalCI+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Komponent',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Názov funkčných CI',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Kontakt',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Názov kontaktu',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
+));
+
+//
+// Class: lnkFunctionalCIToTicket
+//
+
+Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
+	'Class:lnkFunctionalCIToTicket' => 'väzba - Komponent / Ticket',
+	'Class:lnkFunctionalCIToTicket+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Ticket',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'Referencia na Ticket',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title' => 'Ticket title~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title+' => '~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id' => 'Komponent',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name' => 'Názov CI',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact' => 'Dopad',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code' => 'Impact~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Added manually~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Computed~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Not impacted~~',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/tr.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/tr.dict.itop-bridge-cmdb-ticket.php
new file mode 100644
index 000000000..b706e8ae3
--- /dev/null
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/tr.dict.itop-bridge-cmdb-ticket.php
@@ -0,0 +1,72 @@
+<?php
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+* @author       Benjamin Planque <benjamin.planque@combodo.com>
+* @copyright   Copyright (C) 2010-2018 Combodo SARL
+* @license     http://opensource.org/licenses/AGPL-3.0
+*/
+
+//////////////////////////////////////////////////////////////////////
+// Note: The classes have been grouped by categories: bizmodel
+//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+//
+// Class: lnkContactToFunctionalCI
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:lnkContactToFunctionalCI' => 'Link Contact / FunctionalCI~~',
+	'Class:lnkContactToFunctionalCI+' => '~~',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Functionalci~~',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '~~',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name~~',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '~~',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contact~~',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '~~',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Contact name~~',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '~~',
+));
+
+//
+// Class: lnkFunctionalCIToTicket
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:lnkFunctionalCIToTicket' => 'Link FunctionalCI / Ticket~~',
+	'Class:lnkFunctionalCIToTicket+' => '~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Ticket~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'Ref~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref+' => '~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title' => 'Ticket title~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title+' => '~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id' => 'CI~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id+' => '~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name' => 'CI Name~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name+' => '~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact' => 'Impact (text)~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact+' => '~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code' => 'Impact~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Added manually~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Computed~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Not impacted~~',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/zh_cn.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/zh_cn.dict.itop-bridge-cmdb-ticket.php
new file mode 100644
index 000000000..dd51cd28d
--- /dev/null
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/zh_cn.dict.itop-bridge-cmdb-ticket.php
@@ -0,0 +1,73 @@
+<?php
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+* @author       Benjamin Planque <benjamin.planque@combodo.com>
+* @copyright   Copyright (C) 2010-2018 Combodo SARL
+* @license     http://opensource.org/licenses/AGPL-3.0
+*/
+
+//////////////////////////////////////////////////////////////////////
+// Note: The classes have been grouped by categories: bizmodel
+//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+//
+// Class: lnkContactToFunctionalCI
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:lnkContactToFunctionalCI' => '链接 联系人 / 功能项',
+	'Class:lnkContactToFunctionalCI+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => '功能项',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => '功能项名称',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => '联系人',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => '联系人名称',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
+));
+
+
+//
+// Class: lnkFunctionalCIToTicket
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:lnkFunctionalCIToTicket' => '关联 功能配置项/工单',
+	'Class:lnkFunctionalCIToTicket+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => '工单',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => '工单编号',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title' => 'Ticket title~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title+' => '~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id' => '配置项',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name' => '配置项名称',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact' => '影响 (文本)',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code' => '影响',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => '手动添加',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => '自动添加',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => '不通知',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-config-mgmt/cs.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/cs.dict.itop-config-mgmt.php
index a0cd5eb74..e616d14ea 100755
--- a/datamodels/2.x/itop-config-mgmt/cs.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/cs.dict.itop-config-mgmt.php
@@ -77,232 +77,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 //////////////////////////////////////////////////////////////////////
 //
 
-
-//
-// Class: Organization
-//
-
-Dict::Add('CS CZ', 'Czech', 'Čeština', array(
-	'Class:Organization' => 'Organizace',
-	'Class:Organization+' => '',
-	'Class:Organization/Attribute:name' => 'Název',
-	'Class:Organization/Attribute:name+' => '',
-	'Class:Organization/Attribute:code' => 'Kód',
-	'Class:Organization/Attribute:code+' => 'Kód organizace (IČO, DIČO,...)',
-	'Class:Organization/Attribute:status' => 'Stav',
-	'Class:Organization/Attribute:status+' => '',
-	'Class:Organization/Attribute:status/Value:active' => 'Aktivní',
-	'Class:Organization/Attribute:status/Value:active+' => '',
-	'Class:Organization/Attribute:status/Value:inactive' => 'Neaktivní',
-	'Class:Organization/Attribute:status/Value:inactive+' => '',
-	'Class:Organization/Attribute:parent_id' => 'Mateřská organizace',
-	'Class:Organization/Attribute:parent_id+' => '',
-	'Class:Organization/Attribute:parent_name' => 'Název mateřské organizace',
-	'Class:Organization/Attribute:parent_name+' => '',
-	'Class:Organization/Attribute:deliverymodel_id' => 'Model poskytování služeb',
-	'Class:Organization/Attribute:deliverymodel_id+' => '',
-	'Class:Organization/Attribute:deliverymodel_name' => 'Název modelu poskytování služeb',
-	'Class:Organization/Attribute:deliverymodel_name+' => '',
-	'Class:Organization/Attribute:parent_id_friendlyname' => 'Mateřská organizace',
-	'Class:Organization/Attribute:parent_id_friendlyname+' => '',
-	'Class:Organization/Attribute:overview' => 'Overview~~',
-	'Organization:Overview:FunctionalCIs' => 'Configuration items of this organization~~',
-	'Organization:Overview:FunctionalCIs:subtitle' => 'by type~~',
-	'Organization:Overview:Users' => 'iTop Users within this organization~~',
-));
-
-//
-// Class: Location
-//
-
-Dict::Add('CS CZ', 'Czech', 'Čeština', array(
-	'Class:Location' => 'Umístění',
-	'Class:Location+' => 'Jakékoli umístění: země, okres, město, čtvrť, budova, patro, místnost, rack,...',
-	'Class:Location/Attribute:name' => 'Název',
-	'Class:Location/Attribute:name+' => '',
-	'Class:Location/Attribute:status' => 'Stav',
-	'Class:Location/Attribute:status+' => '',
-	'Class:Location/Attribute:status/Value:active' => 'Aktivní',
-	'Class:Location/Attribute:status/Value:active+' => '',
-	'Class:Location/Attribute:status/Value:inactive' => 'Neaktivní',
-	'Class:Location/Attribute:status/Value:inactive+' => '',
-	'Class:Location/Attribute:org_id' => 'Vlastník (Organizace)',
-	'Class:Location/Attribute:org_id+' => '',
-	'Class:Location/Attribute:org_name' => 'Vlastník (Organizace)',
-	'Class:Location/Attribute:org_name+' => '',
-	'Class:Location/Attribute:address' => 'Adresa',
-	'Class:Location/Attribute:address+' => '',
-	'Class:Location/Attribute:postal_code' => 'PSČ',
-	'Class:Location/Attribute:postal_code+' => 'Poštovní směrovací číslo',
-	'Class:Location/Attribute:city' => 'Město',
-	'Class:Location/Attribute:city+' => '',
-	'Class:Location/Attribute:country' => 'Země',
-	'Class:Location/Attribute:country+' => '',
-	'Class:Location/Attribute:physicaldevice_list' => 'Zařízení',
-	'Class:Location/Attribute:physicaldevice_list+' => 'Všechna zařízení v tomto umístění',
-	'Class:Location/Attribute:person_list' => 'Kontakty',
-	'Class:Location/Attribute:person_list+' => 'Všechny kontakty v tomto umístění',
-));
-
-//
-// Class: Contact
-//
-
-Dict::Add('CS CZ', 'Czech', 'Čeština', array(
-	'Class:Contact' => 'Kontakt',
-	'Class:Contact+' => '',
-	'Class:Contact/Attribute:name' => 'Název',
-	'Class:Contact/Attribute:name+' => '',
-	'Class:Contact/Attribute:status' => 'Stav',
-	'Class:Contact/Attribute:status+' => '',
-	'Class:Contact/Attribute:status/Value:active' => 'Aktivní',
-	'Class:Contact/Attribute:status/Value:active+' => '',
-	'Class:Contact/Attribute:status/Value:inactive' => 'Neaktivní',
-	'Class:Contact/Attribute:status/Value:inactive+' => '',
-	'Class:Contact/Attribute:org_id' => 'Organizace',
-	'Class:Contact/Attribute:org_id+' => '',
-	'Class:Contact/Attribute:org_name' => 'Název organizace',
-	'Class:Contact/Attribute:org_name+' => '',
-	'Class:Contact/Attribute:email' => 'Email',
-	'Class:Contact/Attribute:email+' => '',
-	'Class:Contact/Attribute:phone' => 'Telefon',
-	'Class:Contact/Attribute:phone+' => '',
-	'Class:Contact/Attribute:notify' => 'Upozornění',
-	'Class:Contact/Attribute:notify+' => '',
-	'Class:Contact/Attribute:notify/Value:no' => 'ne',
-	'Class:Contact/Attribute:notify/Value:no+' => '',
-	'Class:Contact/Attribute:notify/Value:yes' => 'ano',
-	'Class:Contact/Attribute:notify/Value:yes+' => '',
-	'Class:Contact/Attribute:function' => 'Funkce',
-	'Class:Contact/Attribute:function+' => '',
-	'Class:Contact/Attribute:cis_list' => 'Konfigurační položky',
-	'Class:Contact/Attribute:cis_list+' => 'Všechny konfigurační položky spojené s tímto kontaktem',
-	'Class:Contact/Attribute:finalclass' => 'Typ kontaktu',
-	'Class:Contact/Attribute:finalclass+' => '',
-));
-
-//
-// Class: Person
-//
-
-Dict::Add('CS CZ', 'Czech', 'Čeština', array(
-	'Class:Person' => 'Osoba',
-	'Class:Person+' => '',
-	'Class:Person/Attribute:name' => 'Příjmení',
-	'Class:Person/Attribute:name+' => '',
-	'Class:Person/Attribute:first_name' => 'Jméno',
-	'Class:Person/Attribute:first_name+' => '',
-	'Class:Person/Attribute:employee_number' => 'Osobní číslo',
-	'Class:Person/Attribute:employee_number+' => '',
-	'Class:Person/Attribute:mobile_phone' => 'Mobilní telefon',
-	'Class:Person/Attribute:mobile_phone+' => '',
-	'Class:Person/Attribute:location_id' => 'Umístění',
-	'Class:Person/Attribute:location_id+' => '',
-	'Class:Person/Attribute:location_name' => 'Umístění',
-	'Class:Person/Attribute:location_name+' => '',
-	'Class:Person/Attribute:manager_id' => 'Vedoucí',
-	'Class:Person/Attribute:manager_id+' => '',
-	'Class:Person/Attribute:manager_name' => 'Vedoucí',
-	'Class:Person/Attribute:manager_name+' => '',
-	'Class:Person/Attribute:team_list' => 'Týmy',
-	'Class:Person/Attribute:team_list+' => 'Všechny týmy, kterých je tato osoba členem',
-	'Class:Person/Attribute:tickets_list' => 'Tikety',
-	'Class:Person/Attribute:tickets_list+' => 'Všechny tikety, které tato osoba zadala',
-	'Class:Person/Attribute:manager_id_friendlyname' => 'Popisný název vedoucího',
-	'Class:Person/Attribute:manager_id_friendlyname+' => '',
-	'Class:Person/Attribute:picture' => 'Picture~~',
-	'Class:Person/Attribute:picture+' => '~~',
-	'Class:Person/UniquenessRule:employee_number+' => 'The employee number must be unique in the organization~~',
-	'Class:Person/UniquenessRule:employee_number' => 'there is already a person in \'$this->org_name$\' organization with the same employee number~~',
-	'Class:Person/UniquenessRule:name+' => 'The employee name should be unique inside its organization~~',
-	'Class:Person/UniquenessRule:name' => 'There is already a person in \'$this->org_name$\' organization with the same name~~',
-));
-
-//
-// Class: Team
-//
-
-Dict::Add('CS CZ', 'Czech', 'Čeština', array(
-	'Class:Team' => 'Tým',
-	'Class:Team+' => '',
-	'Class:Team/Attribute:persons_list' => 'Členové',
-	'Class:Team/Attribute:persons_list+' => 'Všichni členové týmu',
-	'Class:Team/Attribute:tickets_list' => 'Tikety',
-	'Class:Team/Attribute:tickets_list+' => 'Všechny tikety přidělené tomuto týmu',
-));
-
-//
-// Class: Document
-//
-
-Dict::Add('CS CZ', 'Czech', 'Čeština', array(
-	'Class:Document' => 'Dokument',
-	'Class:Document+' => '',
-	'Class:Document/Attribute:name' => 'Název',
-	'Class:Document/Attribute:name+' => '',
-	'Class:Document/Attribute:org_id' => 'Organizace',
-	'Class:Document/Attribute:org_id+' => '',
-	'Class:Document/Attribute:org_name' => 'Název organizace',
-	'Class:Document/Attribute:org_name+' => '',
-	'Class:Document/Attribute:documenttype_id' => 'Typ dokumentu',
-	'Class:Document/Attribute:documenttype_id+' => '',
-	'Class:Document/Attribute:documenttype_name' => 'Název typu dokumentu',
-	'Class:Document/Attribute:documenttype_name+' => '',
-	'Class:Document/Attribute:version' => 'Verze',
-	'Class:Document/Attribute:version+' => '',
-	'Class:Document/Attribute:description' => 'Popis',
-	'Class:Document/Attribute:description+' => '',
-	'Class:Document/Attribute:status' => 'Stav',
-	'Class:Document/Attribute:status+' => '',
-	'Class:Document/Attribute:status/Value:draft' => 'Návrh',
-	'Class:Document/Attribute:status/Value:draft+' => '',
-	'Class:Document/Attribute:status/Value:obsolete' => 'Zastaralý',
-	'Class:Document/Attribute:status/Value:obsolete+' => '',
-	'Class:Document/Attribute:status/Value:published' => 'Publikovaný',
-	'Class:Document/Attribute:status/Value:published+' => '',
-	'Class:Document/Attribute:cis_list' => 'Konfigurační položky',
-	'Class:Document/Attribute:cis_list+' => '',
-	'Class:Document/Attribute:contracts_list' => 'Smlouvy',
-	'Class:Document/Attribute:contracts_list+' => '',
-	'Class:Document/Attribute:services_list' => 'Služby',
-	'Class:Document/Attribute:services_list+' => '',
-	'Class:Document/Attribute:finalclass' => 'Typ dokumentu',
-	'Class:Document/Attribute:finalclass+' => '',
-));
-
-//
-// Class: DocumentFile
-//
-
-Dict::Add('CS CZ', 'Czech', 'Čeština', array(
-	'Class:DocumentFile' => 'Dokument (soubor)',
-	'Class:DocumentFile+' => '',
-	'Class:DocumentFile/Attribute:file' => 'Soubor',
-	'Class:DocumentFile/Attribute:file+' => '',
-));
-
-//
-// Class: DocumentNote
-//
-
-Dict::Add('CS CZ', 'Czech', 'Čeština', array(
-	'Class:DocumentNote' => 'Dokument (poznámka)',
-	'Class:DocumentNote+' => '',
-	'Class:DocumentNote/Attribute:text' => 'Poznámka',
-	'Class:DocumentNote/Attribute:text+' => '',
-));
-
-//
-// Class: DocumentWeb
-//
-
-Dict::Add('CS CZ', 'Czech', 'Čeština', array(
-	'Class:DocumentWeb' => 'Dokument (web)',
-	'Class:DocumentWeb+' => '',
-	'Class:DocumentWeb/Attribute:url' => 'URL',
-	'Class:DocumentWeb/Attribute:url+' => '',
-));
-
 //
 // Class: FunctionalCI
 //
@@ -1245,18 +1019,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:lnkDocumentToLicence/Attribute:document_name+' => '',
 ));
 
-//
-// Class: Typology
-//
-
-Dict::Add('CS CZ', 'Czech', 'Čeština', array(
-	'Class:Typology' => 'Typologie',
-	'Class:Typology+' => '',
-	'Class:Typology/Attribute:name' => 'Název',
-	'Class:Typology/Attribute:name+' => '',
-	'Class:Typology/Attribute:finalclass' => 'Typ',
-	'Class:Typology/Attribute:finalclass+' => '',
-));
 
 //
 // Class: OSVersion
@@ -1280,25 +1042,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:OSFamily+' => '',
 ));
 
-//
-// Class: DocumentType
-//
-
-Dict::Add('CS CZ', 'Czech', 'Čeština', array(
-	'Class:DocumentType' => 'Typ dokumentu',
-	'Class:DocumentType+' => '',
-));
-
-//
-// Class: ContactType
-//
-
-Dict::Add('CS CZ', 'Czech', 'Čeština', array(
-	'Class:ContactType' => 'Typ kontaktu',
-	'Class:ContactType+' => '',
-));
-
-//
 // Class: Brand
 //
 
@@ -1458,23 +1201,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:lnkDocumentToSoftware/Attribute:document_name+' => '',
 ));
 
-//
-// Class: lnkContactToFunctionalCI
-//
-
-Dict::Add('CS CZ', 'Czech', 'Čeština', array(
-	'Class:lnkContactToFunctionalCI' => 'Spojení (Kontakt / Funkční konfigurační položka)',
-	'Class:lnkContactToFunctionalCI+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Funkční konfigurační položka',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Název funkční konfigurační položky',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Kontakt',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Název kontaktu',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
-));
-
 //
 // Class: lnkDocumentToFunctionalCI
 //
@@ -1577,8 +1303,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:IPInterface+' => '',
 	'Class:IPInterface/Attribute:ipaddress' => 'IP adresa',
 	'Class:IPInterface/Attribute:ipaddress+' => '',
-
-
 	'Class:IPInterface/Attribute:macaddress' => 'MAC adresa',
 	'Class:IPInterface/Attribute:macaddress+' => '',
 	'Class:IPInterface/Attribute:comment' => 'Komentář',
@@ -1721,27 +1445,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_name+' => '',
 ));
 
-//
-// Class: lnkPersonToTeam
-//
-
-Dict::Add('CS CZ', 'Czech', 'Čeština', array(
-	'Class:lnkPersonToTeam' => 'Spojení (Osoba / Tým)',
-	'Class:lnkPersonToTeam+' => '',
-	'Class:lnkPersonToTeam/Attribute:team_id' => 'Tým',
-	'Class:lnkPersonToTeam/Attribute:team_id+' => '',
-	'Class:lnkPersonToTeam/Attribute:team_name' => 'Název týmu',
-	'Class:lnkPersonToTeam/Attribute:team_name+' => '',
-	'Class:lnkPersonToTeam/Attribute:person_id' => 'Osoba',
-	'Class:lnkPersonToTeam/Attribute:person_id+' => '',
-	'Class:lnkPersonToTeam/Attribute:person_name' => 'Název osoby',
-	'Class:lnkPersonToTeam/Attribute:person_name+' => '',
-	'Class:lnkPersonToTeam/Attribute:role_id' => 'Role',
-	'Class:lnkPersonToTeam/Attribute:role_id+' => '',
-	'Class:lnkPersonToTeam/Attribute:role_name' => 'Název role',
-	'Class:lnkPersonToTeam/Attribute:role_name+' => '',
-));
-
 //
 // Class: Group
 //
@@ -1797,42 +1500,35 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:lnkGroupToCI/Attribute:reason+' => '',
 ));
 
+// Add translation for Fieldsets
+
+Dict::Add('CS CZ', 'Czech', 'Čeština', array(
+	'Server:baseinfo' => 'Obecné informace',
+	'Server:Date' => 'Data',
+	'Server:moreinfo' => 'Více informací',
+	'Server:otherinfo' => 'Další informace',
+	'Server:power' => 'Napájení',
+	'Person:info' => 'Obecné informace',
+	'UserLocal:info' => 'General information~~',
+	'Person:personal_info' => 'Personal information~~',
+	'Person:notifiy' => 'Upozornění',
+	'Class:Subnet/Tab:IPUsage' => 'Využití IP',
+	'Class:Subnet/Tab:IPUsage-explain' => 'Rozhraní, která mají IP adresu v rozsahu: <em>%1$s</em>-<em>%2$s</em>',
+	'Class:Subnet/Tab:FreeIPs' => 'Volné IP adresy',
+	'Class:Subnet/Tab:FreeIPs-count' => 'Počet volných adres: %1$s',
+	'Class:Subnet/Tab:FreeIPs-explain' => 'Tady je výčet volných IP adres (10)',
+	'Class:Document:PreviewTab' => 'Náhled',
+));
 
 //
 // Application Menu
 //
 
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
-	'Menu:DataAdministration' => 'Správa dat',
-	'Menu:DataAdministration+' => 'Správa dat',
-	'Menu:Catalogs' => 'Katalogy',
-	'Menu:Catalogs+' => 'Datové typy',
-	'Menu:Audit' => 'Audit',
-	'Menu:Audit+' => 'Audit',
-	'Menu:CSVImport' => 'CSV import',
-	'Menu:CSVImport+' => 'Hromadné vytvoření nebo aktualizace',
-	'Menu:Organization' => 'Organizace',
-	'Menu:Organization+' => 'Všechny organizace',
 	'Menu:Application' => 'Aplikace',
 	'Menu:Application+' => 'Všechny aplikace',
 	'Menu:DBServer' => 'Databázové servery',
 	'Menu:DBServer+' => 'Databázové servery',
-	'Menu:ConfigManagement' => 'Správa konfigurací',
-	'Menu:ConfigManagement+' => 'Správa konfigurací',
-	'Menu:ConfigManagementOverview' => 'Přehled',
-	'Menu:ConfigManagementOverview+' => 'Přehled',
-	'Menu:Contact' => 'Kontakty',
-	'Menu:Contact+' => 'Kontakty',
-	'Menu:Contact:Count' => '%1$d kontaktů',
-	'Menu:Person' => 'Osoby',
-	'Menu:Person+' => 'Všechny osoby',
-	'Menu:Team' => 'Týmy',
-	'Menu:Team+' => 'Všechny týmy',
-	'Menu:Document' => 'Dokumenty',
-	'Menu:Document+' => 'Všechny dokumenty',
-	'Menu:Location' => 'Umístění',
-
-	'Menu:Location+' => 'Všechna umístění',
 	'Menu:ConfigManagementCI' => 'Konfigurační položky',
 	'Menu:ConfigManagementCI+' => 'Konfigurační položky',
 	'Menu:BusinessProcess' => 'Obchodní procesy',
@@ -1859,10 +1555,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Menu:MobilePhone+' => 'Všechny mobilní telefony',
 	'Menu:PC' => 'Osobní počítače',
 	'Menu:PC+' => 'Všechny osobní počítače',
-	'Menu:NewContact' => 'Nový kontakt',
-	'Menu:NewContact+' => 'Nový kontakt',
-	'Menu:SearchContacts' => 'Hledat kontakty',
-	'Menu:SearchContacts+' => 'Hledat kontakty',
 	'Menu:NewCI' => 'Nová konfigurační položka',
 	'Menu:NewCI+' => 'Nová konfigurační položka',
 	'Menu:SearchCIs' => 'Hledat konfigurační položky',
@@ -1875,36 +1567,11 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Menu:ConfigManagement:Misc' => 'Ostatní',
 	'Menu:Group' => 'Skupiny konfiguračních položek',
 	'Menu:Group+' => 'Skupiny konfiguračních položek',
-	'Menu:ConfigManagement:Shortcuts' => 'Odkazy',
-	'Menu:ConfigManagement:AllContacts' => 'Všechny kontakty: %1$d',
-	'Menu:Typology' => 'Typologie',
-	'Menu:Typology+' => 'Konfigurace typologie',
 	'Menu:OSVersion' => 'Verze OS',
 	'Menu:OSVersion+' => '',
 	'Menu:Software' => 'Katalog softwaru',
 	'Menu:Software+' => 'Katalog softwaru',
-	'UI_WelcomeMenu_AllConfigItems' => 'Souhrn',
-	'Menu:ConfigManagement:Typology' => 'Konfigurace typologie',
-
 ));
 
 
-// Add translation for Fieldsets
-
-Dict::Add('CS CZ', 'Czech', 'Čeština', array(
-	'Server:baseinfo' => 'Obecné informace',
-	'Server:Date' => 'Data',
-	'Server:moreinfo' => 'Více informací',
-	'Server:otherinfo' => 'Další informace',
-	'Server:power' => 'Napájení',
-	'Person:info' => 'Obecné informace',
-	'UserLocal:info' => 'General information~~',
-	'Person:personal_info' => 'Personal information~~',
-	'Person:notifiy' => 'Upozornění',
-	'Class:Subnet/Tab:IPUsage' => 'Využití IP',
-	'Class:Subnet/Tab:IPUsage-explain' => 'Rozhraní, která mají IP adresu v rozsahu: <em>%1$s</em>-<em>%2$s</em>',
-	'Class:Subnet/Tab:FreeIPs' => 'Volné IP adresy',
-	'Class:Subnet/Tab:FreeIPs-count' => 'Počet volných adres: %1$s',
-	'Class:Subnet/Tab:FreeIPs-explain' => 'Tady je výčet volných IP adres (10)',
-	'Class:Document:PreviewTab' => 'Náhled',
-));
+?>
\ No newline at end of file
diff --git a/datamodels/2.x/itop-config-mgmt/da.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/da.dict.itop-config-mgmt.php
index b9fe22972..e5d05ef71 100644
--- a/datamodels/2.x/itop-config-mgmt/da.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/da.dict.itop-config-mgmt.php
@@ -71,231 +71,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 //
 
 
-//
-// Class: Organization
-//
-
-Dict::Add('DA DA', 'Danish', 'Dansk', array(
-	'Class:Organization' => 'Organisation',
-	'Class:Organization+' => '',
-	'Class:Organization/Attribute:name' => 'Navn',
-	'Class:Organization/Attribute:name+' => 'Almindeligt navn',
-	'Class:Organization/Attribute:code' => 'Kodenummer',
-	'Class:Organization/Attribute:code+' => '',
-	'Class:Organization/Attribute:status' => 'Status',
-	'Class:Organization/Attribute:status+' => '',
-	'Class:Organization/Attribute:status/Value:active' => 'Aktiv',
-	'Class:Organization/Attribute:status/Value:active+' => 'Aktiv',
-	'Class:Organization/Attribute:status/Value:inactive' => 'Inaktiv',
-	'Class:Organization/Attribute:status/Value:inactive+' => 'Inaktiv',
-	'Class:Organization/Attribute:parent_id' => 'Parent id',
-	'Class:Organization/Attribute:parent_id+' => '',
-	'Class:Organization/Attribute:parent_name' => 'Parent name',
-	'Class:Organization/Attribute:parent_name+' => 'Parent name',
-	'Class:Organization/Attribute:deliverymodel_id' => 'Leverings Model Id',
-	'Class:Organization/Attribute:deliverymodel_id+' => '',
-	'Class:Organization/Attribute:deliverymodel_name' => 'Leveringsmodel navn',
-	'Class:Organization/Attribute:deliverymodel_name+' => '',
-	'Class:Organization/Attribute:parent_id_friendlyname' => 'Parent',
-	'Class:Organization/Attribute:parent_id_friendlyname+' => '',
-	'Class:Organization/Attribute:overview' => 'Overview~~',
-	'Organization:Overview:FunctionalCIs' => 'Configuration items of this organization~~',
-	'Organization:Overview:FunctionalCIs:subtitle' => 'by type~~',
-	'Organization:Overview:Users' => 'iTop Users within this organization~~',
-));
-
-//
-// Class: Location
-//
-
-Dict::Add('DA DA', 'Danish', 'Dansk', array(
-	'Class:Location' => 'Placering',
-	'Class:Location+' => 'Enhver type af placering: Region, land, by, bygning, rum rack, ...',
-	'Class:Location/Attribute:name' => 'Navn',
-	'Class:Location/Attribute:name+' => '',
-	'Class:Location/Attribute:status' => 'Status',
-	'Class:Location/Attribute:status+' => '',
-	'Class:Location/Attribute:status/Value:active' => 'Aktiv',
-	'Class:Location/Attribute:status/Value:active+' => 'Aktiv',
-	'Class:Location/Attribute:status/Value:inactive' => 'Inaktiv',
-	'Class:Location/Attribute:status/Value:inactive+' => 'Inaktiv',
-	'Class:Location/Attribute:org_id' => 'Organisation',
-	'Class:Location/Attribute:org_id+' => '',
-	'Class:Location/Attribute:org_name' => 'Organisationsnavn',
-	'Class:Location/Attribute:org_name+' => '',
-	'Class:Location/Attribute:address' => 'Adresse',
-	'Class:Location/Attribute:address+' => 'Postadresse',
-	'Class:Location/Attribute:postal_code' => 'Postnummer',
-	'Class:Location/Attribute:postal_code+' => 'Postnummer',
-	'Class:Location/Attribute:city' => 'By',
-	'Class:Location/Attribute:city+' => '',
-	'Class:Location/Attribute:country' => 'Land',
-	'Class:Location/Attribute:country+' => '',
-	'Class:Location/Attribute:physicaldevice_list' => 'List Fysiske Enheder',
-	'Class:Location/Attribute:physicaldevice_list+' => '',
-	'Class:Location/Attribute:person_list' => 'List Kontakter',
-	'Class:Location/Attribute:person_list+' => '',
-));
-
-//
-// Class: Contact
-//
-
-Dict::Add('DA DA', 'Danish', 'Dansk', array(
-	'Class:Contact' => 'Kontakt',
-	'Class:Contact+' => '',
-	'Class:Contact/Attribute:name' => 'Navn',
-	'Class:Contact/Attribute:name+' => '',
-	'Class:Contact/Attribute:status' => 'Status',
-	'Class:Contact/Attribute:status+' => '',
-	'Class:Contact/Attribute:status/Value:active' => 'Aktiv',
-	'Class:Contact/Attribute:status/Value:active+' => 'Aktiv',
-	'Class:Contact/Attribute:status/Value:inactive' => 'Inaktiv',
-	'Class:Contact/Attribute:status/Value:inactive+' => 'Inaktiv',
-	'Class:Contact/Attribute:org_id' => 'Organisation',
-	'Class:Contact/Attribute:org_id+' => '',
-	'Class:Contact/Attribute:org_name' => 'Organisation',
-	'Class:Contact/Attribute:org_name+' => '',
-	'Class:Contact/Attribute:email' => 'Email',
-	'Class:Contact/Attribute:email+' => '',
-	'Class:Contact/Attribute:phone' => 'Telefonnummer',
-	'Class:Contact/Attribute:phone+' => '',
-	'Class:Contact/Attribute:notify' => 'Underretning',
-	'Class:Contact/Attribute:notify+' => '',
-	'Class:Contact/Attribute:notify/Value:no' => 'Nej',
-	'Class:Contact/Attribute:notify/Value:no+' => '',
-	'Class:Contact/Attribute:notify/Value:yes' => 'Ja',
-	'Class:Contact/Attribute:notify/Value:yes+' => '',
-	'Class:Contact/Attribute:function' => 'Funktion',
-	'Class:Contact/Attribute:function+' => '',
-	'Class:Contact/Attribute:cis_list' => 'CIs',
-	'Class:Contact/Attribute:cis_list+' => '',
-	'Class:Contact/Attribute:finalclass' => 'Type',
-	'Class:Contact/Attribute:finalclass+' => '',
-));
-
-//
-// Class: Person
-//
-
-Dict::Add('DA DA', 'Danish', 'Dansk', array(
-	'Class:Person' => 'Person',
-	'Class:Person+' => '',
-	'Class:Person/Attribute:name' => 'Efternavn',
-	'Class:Person/Attribute:name+' => '~~',
-	'Class:Person/Attribute:first_name' => 'Fornavn',
-	'Class:Person/Attribute:first_name+' => '',
-	'Class:Person/Attribute:employee_number' => 'Personalenummer',
-	'Class:Person/Attribute:employee_number+' => '',
-	'Class:Person/Attribute:mobile_phone' => 'Mobiltelefon',
-	'Class:Person/Attribute:mobile_phone+' => '',
-	'Class:Person/Attribute:location_id' => 'Placering',
-	'Class:Person/Attribute:location_id+' => '',
-	'Class:Person/Attribute:location_name' => 'Placering',
-	'Class:Person/Attribute:location_name+' => '',
-	'Class:Person/Attribute:manager_id' => 'Manager',
-	'Class:Person/Attribute:manager_id+' => '',
-	'Class:Person/Attribute:manager_name' => 'Manager-Navn',
-	'Class:Person/Attribute:manager_name+' => '',
-	'Class:Person/Attribute:team_list' => 'List Teams',
-	'Class:Person/Attribute:team_list+' => '',
-	'Class:Person/Attribute:tickets_list' => 'List Tickets',
-	'Class:Person/Attribute:tickets_list+' => '',
-	'Class:Person/Attribute:manager_id_friendlyname' => 'Manager Friendly Name',
-	'Class:Person/Attribute:manager_id_friendlyname+' => '',
-	'Class:Person/Attribute:picture' => 'Picture~~',
-	'Class:Person/Attribute:picture+' => '~~',
-	'Class:Person/UniquenessRule:employee_number+' => 'The employee number must be unique in the organization~~',
-	'Class:Person/UniquenessRule:employee_number' => 'there is already a person in \'$this->org_name$\' organization with the same employee number~~',
-	'Class:Person/UniquenessRule:name+' => 'The employee name should be unique inside its organization~~',
-	'Class:Person/UniquenessRule:name' => 'There is already a person in \'$this->org_name$\' organization with the same name~~',
-));
-
-//
-// Class: Team
-//
-
-Dict::Add('DA DA', 'Danish', 'Dansk', array(
-	'Class:Team' => 'Team',
-	'Class:Team+' => '',
-	'Class:Team/Attribute:persons_list' => 'List Medlemmer',
-	'Class:Team/Attribute:persons_list+' => '',
-	'Class:Team/Attribute:tickets_list' => 'List Tickets',
-	'Class:Team/Attribute:tickets_list+' => '',
-));
-
-//
-// Class: Document
-//
-
-Dict::Add('DA DA', 'Danish', 'Dansk', array(
-	'Class:Document' => 'Dokument',
-	'Class:Document+' => '',
-	'Class:Document/Attribute:name' => 'Navn',
-	'Class:Document/Attribute:name+' => '',
-	'Class:Document/Attribute:org_id' => 'Organisation',
-	'Class:Document/Attribute:org_id+' => '',
-	'Class:Document/Attribute:org_name' => 'Organisationsnavn',
-	'Class:Document/Attribute:org_name+' => '',
-	'Class:Document/Attribute:documenttype_id' => 'Dokumenttype',
-	'Class:Document/Attribute:documenttype_id+' => '',
-	'Class:Document/Attribute:documenttype_name' => 'Dokumenttypnavn',
-	'Class:Document/Attribute:documenttype_name+' => '',
-	'Class:Document/Attribute:version' => 'Version~~',
-	'Class:Document/Attribute:version+' => '~~',
-	'Class:Document/Attribute:description' => 'Beskrivelse',
-	'Class:Document/Attribute:description+' => '',
-	'Class:Document/Attribute:status' => 'Status',
-	'Class:Document/Attribute:status+' => '',
-	'Class:Document/Attribute:status/Value:draft' => 'Udkast',
-	'Class:Document/Attribute:status/Value:draft+' => '',
-	'Class:Document/Attribute:status/Value:obsolete' => 'Forældet',
-	'Class:Document/Attribute:status/Value:obsolete+' => '',
-	'Class:Document/Attribute:status/Value:published' => 'Offentlig',
-	'Class:Document/Attribute:status/Value:published+' => '',
-	'Class:Document/Attribute:cis_list' => 'CIs',
-	'Class:Document/Attribute:cis_list+' => '',
-	'Class:Document/Attribute:contracts_list' => 'Kontrakter',
-	'Class:Document/Attribute:contracts_list+' => '',
-	'Class:Document/Attribute:services_list' => 'Ydelser',
-	'Class:Document/Attribute:services_list+' => '',
-	'Class:Document/Attribute:finalclass' => 'Dokumenttype',
-	'Class:Document/Attribute:finalclass+' => '',
-));
-
-//
-// Class: DocumentFile
-//
-
-Dict::Add('DA DA', 'Danish', 'Dansk', array(
-	'Class:DocumentFile' => 'Dokument (Data)',
-	'Class:DocumentFile+' => '',
-	'Class:DocumentFile/Attribute:file' => 'Data',
-	'Class:DocumentFile/Attribute:file+' => '',
-));
-
-//
-// Class: DocumentNote
-//
-
-Dict::Add('DA DA', 'Danish', 'Dansk', array(
-	'Class:DocumentNote' => 'Dokument (Noter)',
-	'Class:DocumentNote+' => '',
-	'Class:DocumentNote/Attribute:text' => 'Tekst',
-	'Class:DocumentNote/Attribute:text+' => '',
-));
-
-//
-// Class: DocumentWeb
-//
-
-Dict::Add('DA DA', 'Danish', 'Dansk', array(
-	'Class:DocumentWeb' => 'Dokument (Web)',
-	'Class:DocumentWeb+' => '',
-	'Class:DocumentWeb/Attribute:url' => 'URL',
-	'Class:DocumentWeb/Attribute:url+' => '',
-));
-
 //
 // Class: FunctionalCI
 //
@@ -1238,19 +1013,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:lnkDocumentToLicence/Attribute:document_name+' => '',
 ));
 
-//
-// Class: Typology
-//
-
-Dict::Add('DA DA', 'Danish', 'Dansk', array(
-	'Class:Typology' => 'Typologi',
-	'Class:Typology+' => '',
-	'Class:Typology/Attribute:name' => 'Navn',
-	'Class:Typology/Attribute:name+' => '',
-	'Class:Typology/Attribute:finalclass' => 'Type',
-	'Class:Typology/Attribute:finalclass+' => '',
-));
-
 //
 // Class: OSVersion
 //
@@ -1273,24 +1035,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:OSFamily+' => '',
 ));
 
-//
-// Class: DocumentType
-//
-
-Dict::Add('DA DA', 'Danish', 'Dansk', array(
-	'Class:DocumentType' => 'Dokumentype',
-	'Class:DocumentType+' => '',
-));
-
-//
-// Class: ContactType
-//
-
-Dict::Add('DA DA', 'Danish', 'Dansk', array(
-	'Class:ContactType' => 'Kontakttype',
-	'Class:ContactType+' => '',
-));
-
 //
 // Class: Brand
 //
@@ -1451,23 +1195,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:lnkDocumentToSoftware/Attribute:document_name+' => '',
 ));
 
-//
-// Class: lnkContactToFunctionalCI
-//
-
-Dict::Add('DA DA', 'Danish', 'Dansk', array(
-	'Class:lnkContactToFunctionalCI' => 'Sammenhæng Kontakt/FunctionalCI',
-	'Class:lnkContactToFunctionalCI+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'FunctionalCI',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'FunctionalCI navn',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Kontakt',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Kontakt navn',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
-));
-
 //
 // Class: lnkDocumentToFunctionalCI
 //
@@ -1570,8 +1297,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:IPInterface+' => '',
 	'Class:IPInterface/Attribute:ipaddress' => 'IP Adresse',
 	'Class:IPInterface/Attribute:ipaddress+' => '',
-
-
 	'Class:IPInterface/Attribute:macaddress' => 'MAC Adresse',
 	'Class:IPInterface/Attribute:macaddress+' => '',
 	'Class:IPInterface/Attribute:comment' => 'Kommentar',
@@ -1714,27 +1439,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_name+' => '',
 ));
 
-//
-// Class: lnkPersonToTeam
-//
-
-Dict::Add('DA DA', 'Danish', 'Dansk', array(
-	'Class:lnkPersonToTeam' => 'Sammenhæng Person/Team',
-	'Class:lnkPersonToTeam+' => '',
-	'Class:lnkPersonToTeam/Attribute:team_id' => 'Team',
-	'Class:lnkPersonToTeam/Attribute:team_id+' => '',
-	'Class:lnkPersonToTeam/Attribute:team_name' => 'Team navn',
-	'Class:lnkPersonToTeam/Attribute:team_name+' => '',
-	'Class:lnkPersonToTeam/Attribute:person_id' => 'Person',
-	'Class:lnkPersonToTeam/Attribute:person_id+' => '',
-	'Class:lnkPersonToTeam/Attribute:person_name' => 'Person navn',
-	'Class:lnkPersonToTeam/Attribute:person_name+' => '',
-	'Class:lnkPersonToTeam/Attribute:role_id' => 'Rolle',
-	'Class:lnkPersonToTeam/Attribute:role_id+' => '',
-	'Class:lnkPersonToTeam/Attribute:role_name' => 'Rollen navn',
-	'Class:lnkPersonToTeam/Attribute:role_name+' => '',
-));
-
 //
 // Class: Group
 //
@@ -1791,41 +1495,37 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 ));
 
 
+
+
+// Add translation for Fieldsets
+
+Dict::Add('DA DA', 'Danish', 'Dansk', array(
+	'Server:baseinfo' => 'Almindelig Informationen',
+	'Server:Date' => 'Dato',
+	'Server:moreinfo' => 'Yderligere Information',
+	'Server:otherinfo' => 'Øvrig Information',
+	'Server:power' => 'Power supply~~',
+	'Person:info' => 'Almindelig Information',
+	'UserLocal:info' => 'General information~~',
+	'Person:personal_info' => 'Personal information~~',
+	'Person:notifiy' => 'Underretning',
+	'Class:Subnet/Tab:IPUsage' => 'IP Brug',
+	'Class:Subnet/Tab:IPUsage-explain' => 'Interfaces der har en IP i området: <em>%1$s</em> til <em>%2$s</em>',
+	'Class:Subnet/Tab:FreeIPs' => 'Ledige IP',
+	'Class:Subnet/Tab:FreeIPs-count' => 'Ledige IP: %1$s',
+	'Class:Subnet/Tab:FreeIPs-explain' => 'Her er et udtræk af 10 ledige IP adresser',
+	'Class:Document:PreviewTab' => 'Preview~~',
+));
+
 //
 // Application Menu
 //
 
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
-	'Menu:DataAdministration' => 'Data administration',
-	'Menu:DataAdministration+' => '',
-	'Menu:Catalogs' => 'Katalog',
-	'Menu:Catalogs+' => 'Datatyper',
-	'Menu:Audit' => 'Audit',
-	'Menu:Audit+' => 'Audit',
-	'Menu:CSVImport' => 'CSV import~~',
-	'Menu:CSVImport+' => 'Bulk creation or update~~',
-	'Menu:Organization' => 'Organisation',
-	'Menu:Organization+' => 'Alle Organisationer',
 	'Menu:Application' => 'Anvendelse',
 	'Menu:Application+' => 'Alle Anvendelser',
 	'Menu:DBServer' => 'Database server',
 	'Menu:DBServer+' => 'Database server',
-	'Menu:ConfigManagement' => 'Configuration Management',
-	'Menu:ConfigManagement+' => 'Configuration Management',
-	'Menu:ConfigManagementOverview' => 'Oversigt',
-	'Menu:ConfigManagementOverview+' => 'Oversigt',
-	'Menu:Contact' => 'Kontakt',
-	'Menu:Contact+' => 'Kontakt',
-	'Menu:Contact:Count' => '%1$d kontakter',
-	'Menu:Person' => 'Person',
-	'Menu:Person+' => 'Alle Personer',
-	'Menu:Team' => 'Teams',
-	'Menu:Team+' => 'Alle Teams',
-	'Menu:Document' => 'Dokument',
-	'Menu:Document+' => 'Alle Dokumenter',
-	'Menu:Location' => 'Placering',
-
-	'Menu:Location+' => 'Alle Placeringer',
 	'Menu:ConfigManagementCI' => 'Configuration Items',
 	'Menu:ConfigManagementCI+' => 'Configuration Items',
 	'Menu:BusinessProcess' => 'Forretnings proces',
@@ -1852,10 +1552,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Menu:MobilePhone+' => 'Alle Mobiltelefoner',
 	'Menu:PC' => 'PC',
 	'Menu:PC+' => 'Alle PCer',
-	'Menu:NewContact' => 'Ny Kontakt',
-	'Menu:NewContact+' => 'Ny Kontakt',
-	'Menu:SearchContacts' => 'Søg efter kontakter',
-	'Menu:SearchContacts+' => 'Søg efter kontakter',
 	'Menu:NewCI' => 'Ny CI',
 	'Menu:NewCI+' => 'Ny CI',
 	'Menu:SearchCIs' => 'Søg efter CIs',
@@ -1868,36 +1564,8 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Menu:ConfigManagement:Misc' => 'Diverse',
 	'Menu:Group' => 'Gruppe af CIs',
 	'Menu:Group+' => 'Gruppe af CIs',
-	'Menu:ConfigManagement:Shortcuts' => 'Genveje',
-	'Menu:ConfigManagement:AllContacts' => 'Alle Kontakter: %1$d',
-	'Menu:Typology' => 'Typologi-Konfiguration',
-	'Menu:Typology+' => '',
 	'Menu:OSVersion' => 'OS versioner',
 	'Menu:OSVersion+' => '~~',
 	'Menu:Software' => 'Software Katalog',
 	'Menu:Software+' => '',
-	'UI_WelcomeMenu_AllConfigItems' => 'Sammenfatning',
-	'Menu:ConfigManagement:Typology' => 'Typologi Konfiguration',
-
-));
-
-
-// Add translation for Fieldsets
-
-Dict::Add('DA DA', 'Danish', 'Dansk', array(
-	'Server:baseinfo' => 'Almindelig Informationen',
-	'Server:Date' => 'Dato',
-	'Server:moreinfo' => 'Yderligere Information',
-	'Server:otherinfo' => 'Øvrig Information',
-	'Server:power' => 'Power supply~~',
-	'Person:info' => 'Almindelig Information',
-	'UserLocal:info' => 'General information~~',
-	'Person:personal_info' => 'Personal information~~',
-	'Person:notifiy' => 'Underretning',
-	'Class:Subnet/Tab:IPUsage' => 'IP Brug',
-	'Class:Subnet/Tab:IPUsage-explain' => 'Interfaces der har en IP i området: <em>%1$s</em> til <em>%2$s</em>',
-	'Class:Subnet/Tab:FreeIPs' => 'Ledige IP',
-	'Class:Subnet/Tab:FreeIPs-count' => 'Ledige IP: %1$s',
-	'Class:Subnet/Tab:FreeIPs-explain' => 'Her er et udtræk af 10 ledige IP adresser',
-	'Class:Document:PreviewTab' => 'Preview~~',
-));
+));
\ No newline at end of file
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 af44aa376..e61aba1dc 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,1691 +1,171 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.7">
-  <classes>
-    <class id="Organization" _delta="define">
-      <parent>cmdbAbstractObject</parent>
-      <properties>
-        <comment><![CDATA[/**
- * Persistent classes for a CMDB
- *
- * @copyright   Copyright (C) 2010-2017 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */]]></comment>
-        <category>bizmodel,searchable,structure</category>
-        <abstract>false</abstract>
-        <key_type>autoincrement</key_type>
-        <db_table>organization</db_table>
-        <db_key_field>id</db_key_field>
-        <db_final_class_field/>
-        <naming>
-          <attributes>
-            <attribute id="name"/>
-          </attributes>
-        </naming>
-        <display_template/>
-        <icon>images/building.png</icon>
-        <reconciliation>
-          <attributes>
-            <attribute id="name"/>
-            <attribute id="code"/>
-          </attributes>
-        </reconciliation>
-        <obsolescence>
-          <condition><![CDATA[status = 'inactive']]></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="code" xsi:type="AttributeString">
-          <sql>code</sql>
-          <default_value/>
-          <is_null_allowed>true</is_null_allowed>
-        </field>
-        <field id="status" xsi:type="AttributeEnum">
-          <values>
-            <value id="active">active</value>
-            <value id="inactive">inactive</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="parent_id" xsi:type="AttributeHierarchicalKey">
-          <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="overview" xsi:type="AttributeDashboard">
-            <is_user_editable>true</is_user_editable>
-            <definition>
-              <layout>DashboardLayoutTwoCols</layout>
-              <auto_reload>
-                <enabled>false</enabled>
-                <interval>300</interval>
-              </auto_reload>
-              <cells>
-                <cell id="0">
-                  <rank>0</rank>
-                  <dashlets>
-                    <dashlet id="11" xsi:type="DashletHeaderDynamic">
-                      <rank>0</rank>
-                      <title>Organization:Overview:FunctionalCIs</title>
-                      <icon>itop-config-mgmt/images/server.png</icon>
-                      <subtitle>Organization:Overview:FunctionalCIs:subtitle</subtitle>
-                      <query>SELECT FunctionalCI WHERE org_id=:this-&gt;id</query>
-                      <group_by>finalclass</group_by>
-                      <values>NetworkDevice,Server,ApplicationSolution</values>
-                    </dashlet>
-                  </dashlets>
-                </cell>
-                <cell id="2">
-                  <rank>20</rank>
-                  <dashlets>
-                    <dashlet id="12" xsi:type="DashletObjectList">
-                      <rank>0</rank>
-                      <title>Organization:Overview:Users</title>
-                      <query>SELECT Person AS p JOIN User AS u ON u.contactid=p.id WHERE p.org_id=:this-&gt;id</query>
-                      <menu>true</menu>
-                    </dashlet>
-                  </dashlets>
-                </cell>
-                <cell id="9000">
-                  <rank>5</rank>
-                  <dashlets>
-                    <dashlet id="0" xsi:type="DashletEmptyCell">
-                      <rank>0</rank>
-                    </dashlet>
-                  </dashlets>
-                </cell>
-              </cells>
-            </definition>
-        </field>
-      </fields>
-      <methods/>
-      <presentation>
-        <details>
-          <items>
-            <item id="name">
-              <rank>10</rank>
-            </item>
-            <item id="code">
-              <rank>20</rank>
-            </item>
-            <item id="status">
-              <rank>30</rank>
-            </item>
-            <item id="parent_id">
-              <rank>40</rank>
-            </item>
-            <item id="overview">
-              <rank>50</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>
-            <item id="code">
-              <rank>20</rank>
-            </item>
-            <item id="status">
-              <rank>30</rank>
-            </item>
-            <item id="parent_id">
-              <rank>40</rank>
-            </item>
-          </items>
-        </search>
-        <list>
-          <items>
-            <item id="code">
-              <rank>10</rank>
-            </item>
-            <item id="status">
-              <rank>20</rank>
-            </item>
-            <item id="parent_id">
-              <rank>30</rank>
-            </item>
-          </items>
-        </list>
-      </presentation>
-    </class>
-    <class id="Location" _delta="define">
-      <parent>cmdbAbstractObject</parent>
-      <properties>
-        <category>bizmodel,searchable,structure</category>
-        <abstract>false</abstract>
-        <key_type>autoincrement</key_type>
-        <db_table>location</db_table>
-        <db_key_field>id</db_key_field>
-        <db_final_class_field/>
-        <naming>
-          <attributes>
-            <attribute id="name"/>
-          </attributes>
-        </naming>
-        <display_template/>
-        <icon>images/location.png</icon>
-        <reconciliation>
-          <attributes>
-            <attribute id="name"/>
-            <attribute id="org_id"/>
-            <attribute id="org_name"/>
-          </attributes>
-        </reconciliation>
-        <obsolescence>
-          <condition><![CDATA[status = 'inactive']]></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="active">active</value>
-            <value id="inactive">inactive</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="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="address" xsi:type="AttributeText">
-          <sql>address</sql>
-          <default_value/>
-          <is_null_allowed>true</is_null_allowed>
-        </field>
-        <field id="postal_code" xsi:type="AttributeString">
-          <sql>postal_code</sql>
-          <default_value/>
-          <is_null_allowed>true</is_null_allowed>
-        </field>
-        <field id="city" xsi:type="AttributeString">
-          <sql>city</sql>
-          <default_value/>
-          <is_null_allowed>true</is_null_allowed>
-        </field>
-        <field id="country" xsi:type="AttributeString">
-          <sql>country</sql>
-          <default_value/>
-          <is_null_allowed>true</is_null_allowed>
-        </field>
-        <field id="physicaldevice_list" xsi:type="AttributeLinkedSet">
-          <linked_class>PhysicalDevice</linked_class>
-          <ext_key_to_me>location_id</ext_key_to_me>
-          <edit_mode>add_only</edit_mode>
-          <count_min>0</count_min>
-          <count_max>0</count_max>
-        </field>
-        <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>
-          <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="status">
-              <rank>20</rank>
-            </item>
-            <item id="org_id">
-              <rank>30</rank>
-            </item>
-            <item id="address">
-              <rank>40</rank>
-            </item>
-            <item id="postal_code">
-              <rank>50</rank>
-            </item>
-            <item id="city">
-              <rank>60</rank>
-            </item>
-            <item id="country">
-              <rank>70</rank>
-            </item>
-            <item id="person_list">
-              <rank>80</rank>
-            </item>
-            <item id="physicaldevice_list">
-              <rank>90</rank>
-            </item>
-          </items>
-        </details>
-        <default_search>
-          <items>
-            <item id="name">
-              <rank>10</rank>
-            </item>
-            <item id="country">
-              <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="address">
-              <rank>40</rank>
-            </item>
-            <item id="postal_code">
-              <rank>50</rank>
-            </item>
-            <item id="city">
-              <rank>60</rank>
-            </item>
-            <item id="country">
-              <rank>70</rank>
-            </item>
-          </items>
-        </search>
-        <list>
-          <items>
-            <item id="status">
-              <rank>10</rank>
-            </item>
-            <item id="org_id">
-              <rank>20</rank>
-            </item>
-            <item id="city">
-              <rank>30</rank>
-            </item>
-            <item id="country">
-              <rank>40</rank>
-            </item>
-          </items>
-        </list>
-      </presentation>
-    </class>
-    <class id="Contact" _delta="define">
-      <parent>cmdbAbstractObject</parent>
-      <properties>
-        <category>bizmodel,searchable,structure</category>
-        <abstract>true</abstract>
-        <key_type>autoincrement</key_type>
-        <db_table>contact</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>
-        <display_template/>
-        <icon>images/team.png</icon>
-        <reconciliation>
-          <attributes>
-            <attribute id="name"/>
-            <attribute id="org_id"/>
-            <attribute id="org_name"/>
-            <attribute id="email"/>
-            <attribute id="finalclass"/>
-          </attributes>
-        </reconciliation>
-        <obsolescence>
-          <condition>status='inactive'</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="active">active</value>
-            <value id="inactive">inactive</value>
-          </values>
-          <sql>status</sql>
-          <default_value>active</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="org_name" xsi:type="AttributeExternalField">
-          <extkey_attcode>org_id</extkey_attcode>
-          <target_attcode>name</target_attcode>
-        </field>
-        <field id="email" xsi:type="AttributeEmailAddress">
-          <sql>email</sql>
-          <default_value/>
-          <is_null_allowed>true</is_null_allowed>
-        </field>
-        <field id="phone" xsi:type="AttributePhoneNumber">
-          <sql>phone</sql>
-          <default_value/>
-          <is_null_allowed>true</is_null_allowed>
-        </field>
-        <field id="notify" xsi:type="AttributeEnum">
-          <values>
-            <value id="yes">yes</value>
-            <value id="no">no</value>
-          </values>
-          <sql>notify</sql>
-          <default_value>yes</default_value>
-          <is_null_allowed>true</is_null_allowed>
-          <display_style>radio_horizontal</display_style>
-        </field>
-        <field id="function" xsi:type="AttributeString">
-          <sql>function</sql>
-          <default_value/>
-          <is_null_allowed>true</is_null_allowed>
-        </field>
-        <field id="cis_list" xsi:type="AttributeLinkedSetIndirect">
-          <linked_class>lnkContactToFunctionalCI</linked_class>
-          <ext_key_to_me>contact_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="name">
-              <rank>10</rank>
-            </item>
-            <item id="status">
-              <rank>20</rank>
-            </item>
-            <item id="org_id">
-              <rank>30</rank>
-            </item>
-            <item id="email">
-              <rank>40</rank>
-            </item>
-            <item id="phone">
-              <rank>50</rank>
-            </item>
-            <item id="notify">
-              <rank>60</rank>
-            </item>
-            <item id="function">
-              <rank>70</rank>
-            </item>
-          </items>
-        </details>
-        <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="email">
-              <rank>40</rank>
-            </item>
-            <item id="phone">
-              <rank>50</rank>
-            </item>
-            <item id="notify">
-              <rank>60</rank>
-            </item>
-            <item id="function">
-              <rank>70</rank>
-            </item>
-          </items>
-        </search>
-        <default_search>
-          <items>
-            <item id="friendlyname">
-              <rank>10</rank>
-            </item>
-            <item id="email">
-              <rank>20</rank>
-            </item>
-            <item id="org_id">
-              <rank>30</rank>
-            </item>
-          </items>
-        </default_search>
-        <list>
-          <items>
-            <item id="status">
-              <rank>10</rank>
-            </item>
-            <item id="org_id">
-              <rank>20</rank>
-            </item>
-            <item id="email">
-              <rank>30</rank>
-            </item>
-            <item id="phone">
-              <rank>40</rank>
-            </item>
-            <item id="function">
-              <rank>50</rank>
-            </item>
-          </items>
-        </list>
-      </presentation>
-    </class>
-    <class id="Person" _delta="define">
-      <parent>Contact</parent>
-      <properties>
-        <category>bizmodel,searchable,structure</category>
-        <abstract>false</abstract>
-        <key_type>autoincrement</key_type>
-        <db_table>person</db_table>
-        <db_key_field>id</db_key_field>
-        <db_final_class_field/>
-        <naming>
-          <attributes>
-            <attribute id="first_name"/>
-            <attribute id="name"/>
-          </attributes>
-        </naming>
-        <display_template/>
-        <icon>images/person.png</icon>
-        <reconciliation>
-          <attributes>
-            <attribute id="name"/>
-            <attribute id="first_name"/>
-            <attribute id="org_id"/>
-            <attribute id="org_name"/>
-            <attribute id="email"/>
-            <attribute id="employee_number"/>
-          </attributes>
-        </reconciliation>
-        <uniqueness_rules>
-          <rule id="employee_number">
-            <attributes>
-              <attribute id="org_id"/>
-              <attribute id="employee_number"/>
-            </attributes>
-            <filter><![CDATA[employee_number != '']]></filter>
-            <disabled>false</disabled>
-            <is_blocking>true</is_blocking>
-          </rule>
-          <rule id="name">
-            <attributes>
-              <attribute id="org_id"/>
-              <attribute id="name"/>
-              <attribute id="first_name"/>
-            </attributes>
-            <filter/>
-            <disabled>false</disabled>
-            <is_blocking>false</is_blocking>
-          </rule>
-        </uniqueness_rules>
-      </properties>
-      <fields>
-        <field id="picture" xsi:type="AttributeImage">
-          <display_max_width>96</display_max_width>
-          <display_max_height>96</display_max_height>
-          <storage_max_width>128</storage_max_width>
-          <storage_max_height>128</storage_max_height>
-          <default_image>images/silhouette.png</default_image>
-          <is_null_allowed>true</is_null_allowed>
-        </field>
-        <field id="first_name" xsi:type="AttributeString">
-          <sql>first_name</sql>
-          <default_value/>
-          <is_null_allowed>false</is_null_allowed>
-        </field>
-        <field id="employee_number" xsi:type="AttributeString">
-          <sql>employee_number</sql>
-          <default_value/>
-          <is_null_allowed>true</is_null_allowed>
-        </field>
-        <field id="mobile_phone" xsi:type="AttributePhoneNumber">
-          <sql>mobile_phone</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="manager_id" xsi:type="AttributeExternalKey">
-          <filter><![CDATA[SELECT Person]]></filter>
-          <sql>manager_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="manager_name" xsi:type="AttributeExternalField">
-          <extkey_attcode>manager_id</extkey_attcode>
-          <target_attcode>name</target_attcode>
-        </field>
-        <field id="team_list" xsi:type="AttributeLinkedSetIndirect">
-          <linked_class>lnkPersonToTeam</linked_class>
-          <ext_key_to_me>person_id</ext_key_to_me>
-          <count_min>0</count_min>
-          <count_max>0</count_max>
-          <ext_key_to_remote>team_id</ext_key_to_remote>
-          <duplicates/>
-        </field>
-        <field id="tickets_list" xsi:type="AttributeLinkedSet">
-          <linked_class>Ticket</linked_class>
-          <ext_key_to_me>caller_id</ext_key_to_me>
-          <edit_mode>add_only</edit_mode>
-          <count_min>0</count_min>
-          <count_max>0</count_max>
-        </field>
-      </fields>
-      <methods>
-        <method id="CheckToDelete">
-          <static>false</static>
-          <access>public</access>
-          <type>Overload-DBObject</type>
-          <code><![CDATA[  	public function CheckToDelete(&$oDeletionPlan)
-  	{
-  		if (MetaModel::GetConfig()->Get('demo_mode'))
-		{
-			if ($this->HasUserAccount())
-			{
-				// Do not let users change user accounts in demo mode
-				$oDeletionPlan->AddToDelete($this, null);
-				$oDeletionPlan->SetDeletionIssues($this, array('deletion not allowed in demo mode.'), true);
-				$oDeletionPlan->ComputeResults();
-				return false;
-			}
-		}
-		return parent::CheckToDelete($oDeletionPlan);
-  	}
-]]></code>
-        </method>
-        <method id="DBDeleteSingleObject">
-          <static>false</static>
-          <access>public</access>
-          <type>Overload-DBObject</type>
-          <code><![CDATA[  	public function DBDeleteSingleObject()
-	{
-		if (MetaModel::GetConfig()->Get('demo_mode'))
-		{
-			if ($this->HasUserAccount())
-			{
-				// Do not let users change user accounts in demo mode
-				return;
-			}
-		}
-		parent::DBDeleteSingleObject();
-	}
-]]></code>
-        </method>
-        <method id="GetAttributeFlags">
-          <static>false</static>
-          <access>public</access>
-          <type>Overload-DBObject</type>
-          <code><![CDATA[	public function GetAttributeFlags($sAttCode, &$aReasons = array(), $sTargetState = '')
-	{
-		if ( ($sAttCode == 'org_id') && (!$this->IsNew()) )
-		{
-			if (MetaModel::GetConfig()->Get('demo_mode'))
-			{
-				if ($this->HasUserAccount())
-				{
-					// Do not let users change user accounts in demo mode
-					return OPT_ATT_READONLY;
-				}
-			}
-		}
-		return parent::GetAttributeFlags($sAttCode, $aReasons, $sTargetState);
-	}
-]]></code>
-        </method>
-        <method id="HasUserAccount">
-          <static>false</static>
-          <access>public</access>
-          <type>Helper</type>
-          <code><![CDATA[  	public function HasUserAccount()
-  	{
-		static $bHasUserAccount = null;
-		if (is_null($bHasUserAccount))
-		{
-			$oUserSet = new DBObjectSet(DBSearch::FromOQL('SELECT User WHERE contactid = :person', array('person' => $this->GetKey())));
-			$bHasUserAccount = ($oUserSet->Count() > 0);
-		}
-		return $bHasUserAccount;
-  	}
-]]></code>
-        </method>
-      </methods>
-      <presentation>
-        <details>
-          <items>
-            <item id="team_list">
-              <rank>10</rank>
-            </item>
-            <item id="tickets_list">
-              <rank>20</rank>
-            </item>
-            <item id="cis_list">
-              <rank>30</rank>
-            </item>
-            <item id="col:col1">
-              <rank>40</rank>
-              <items>
-                <item id="fieldset:Person:info">
-                  <rank>10</rank>
-                  <items>
-                    <item id="name">
-                      <rank>10</rank>
-                    </item>
-                    <item id="first_name">
-                      <rank>20</rank>
-                    </item>
-                    <item id="org_id">
-                      <rank>30</rank>
-                    </item>
-                    <item id="status">
-                      <rank>40</rank>
-                    </item>
-                    <item id="location_id">
-                      <rank>50</rank>
-                    </item>
-                    <item id="function">
-                      <rank>60</rank>
-                    </item>
-                    <item id="manager_id">
-                      <rank>70</rank>
-                    </item>
-                    <item id="employee_number">
-                      <rank>80</rank>
-                    </item>
-                  </items>
-                </item>
-              </items>
-            </item>
-            <item id="col:col2">
-              <rank>50</rank>
-              <items>
-                <item id="fieldset:Person:personal_info">
-                  <rank>5</rank>
-                  <items>
-                    <item id="picture">
-                      <rank>10</rank>
-                    </item>
-                  </items>
-                </item>
-                <item id="fieldset:Person:notifiy">
-                  <rank>10</rank>
-                  <items>
-                    <item id="email">
-                      <rank>10</rank>
-                    </item>
-                    <item id="notify">
-                      <rank>20</rank>
-                    </item>
-                    <item id="phone">
-                      <rank>30</rank>
-                    </item>
-                    <item id="mobile_phone">
-                      <rank>40</rank>
-                    </item>
-                  </items>
-                </item>
-              </items>
-            </item>
-          </items>
-        </details>
-        <search>
-          <items>
-            <item id="name">
-              <rank>10</rank>
-            </item>
-            <item id="first_name">
-              <rank>20</rank>
-            </item>
-            <item id="org_id">
-              <rank>30</rank>
-            </item>
-            <item id="status">
-              <rank>40</rank>
-            </item>
-            <item id="location_id">
-              <rank>50</rank>
-            </item>
-            <item id="email">
-              <rank>60</rank>
-            </item>
-            <item id="phone">
-              <rank>70</rank>
-            </item>
-            <item id="employee_number">
-              <rank>80</rank>
-            </item>
-            <item id="manager_id">
-              <rank>90</rank>
-            </item>
-            <item id="mobile_phone">
-              <rank>100</rank>
-            </item>
-            <item id="notify">
-              <rank>110</rank>
-            </item>
-          </items>
-        </search>
-        <list>
-          <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="location_id">
-              <rank>40</rank>
-            </item>
-            <item id="email">
-              <rank>50</rank>
-            </item>
-            <item id="phone">
-              <rank>60</rank>
-            </item>
-          </items>
-        </list>
-      </presentation>
-    </class>
-    <class id="Team" _delta="define">
-      <parent>Contact</parent>
-      <properties>
-        <category>bizmodel,searchable</category>
-        <abstract>false</abstract>
-        <key_type>autoincrement</key_type>
-        <db_table>team</db_table>
-        <db_key_field>id</db_key_field>
-        <db_final_class_field/>
-        <naming>
-          <attributes>
-            <attribute id="name"/>
-          </attributes>
-        </naming>
-        <display_template/>
-        <icon>images/team.png</icon>
-        <reconciliation>
-          <attributes>
-            <attribute id="name"/>
-            <attribute id="org_id"/>
-            <attribute id="org_name"/>
-            <attribute id="email"/>
-          </attributes>
-        </reconciliation>
-      </properties>
-      <fields>
-        <field id="persons_list" xsi:type="AttributeLinkedSetIndirect">
-          <linked_class>lnkPersonToTeam</linked_class>
-          <ext_key_to_me>team_id</ext_key_to_me>
-          <count_min>0</count_min>
-          <count_max>0</count_max>
-          <ext_key_to_remote>person_id</ext_key_to_remote>
-          <duplicates/>
-        </field>
-        <field id="tickets_list" xsi:type="AttributeLinkedSet">
-          <linked_class>Ticket</linked_class>
-          <ext_key_to_me>team_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="status">
-              <rank>20</rank>
-            </item>
-            <item id="org_id">
-              <rank>30</rank>
-            </item>
-            <item id="email">
-              <rank>40</rank>
-            </item>
-            <item id="phone">
-              <rank>50</rank>
-            </item>
-            <item id="notify">
-              <rank>60</rank>
-            </item>
-            <item id="function">
-              <rank>70</rank>
-            </item>
-            <item id="persons_list">
-              <rank>80</rank>
-            </item>
-            <item id="tickets_list">
-              <rank>90</rank>
-            </item>
-            <item id="cis_list">
-              <rank>100</rank>
-            </item>
-          </items>
-        </details>
-        <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="email">
-              <rank>40</rank>
-            </item>
-            <item id="phone">
-              <rank>50</rank>
-            </item>
-            <item id="notify">
-              <rank>60</rank>
-            </item>
-            <item id="function">
-              <rank>70</rank>
-            </item>
-          </items>
-        </search>
-        <list>
-          <items>
-            <item id="status">
-              <rank>10</rank>
-            </item>
-            <item id="org_id">
-              <rank>20</rank>
-            </item>
-            <item id="email">
-              <rank>30</rank>
-            </item>
-            <item id="phone">
-              <rank>40</rank>
-            </item>
-          </items>
-        </list>
-      </presentation>
-    </class>
-    <class id="Document" _delta="define">
-      <parent>cmdbAbstractObject</parent>
-      <properties>
-        <category>bizmodel,searchable</category>
-        <abstract>true</abstract>
-        <key_type>autoincrement</key_type>
-        <db_table>document</db_table>
-        <db_key_field>id</db_key_field>
-        <db_final_class_field>finalclass</db_final_class_field>
-        <naming>
-          <attributes/>
-        </naming>
-        <display_template/>
-        <icon>images/document.png</icon>
-        <reconciliation>
-          <attributes>
-            <attribute id="name"/>
-            <attribute id="org_id"/>
-            <attribute id="org_name"/>
-            <attribute id="finalclass"/>
-          </attributes>
-        </reconciliation>
-        <obsolescence>
-          <condition><![CDATA[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="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="documenttype_id" xsi:type="AttributeExternalKey">
-          <sql>documenttype_id</sql>
-          <target_class>DocumentType</target_class>
-          <is_null_allowed>true</is_null_allowed>
-          <on_target_delete>DEL_MANUAL</on_target_delete>
-        </field>
-        <field id="documenttype_name" xsi:type="AttributeExternalField">
-          <extkey_attcode>documenttype_id</extkey_attcode>
-          <target_attcode>name</target_attcode>
-        </field>
-        <field id="version" xsi:type="AttributeString">
-          <sql>version</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="status" xsi:type="AttributeEnum">
-          <values>
-            <value id="draft">draft</value>
-            <value id="published">published</value>
-            <value id="obsolete">obsolete</value>
-          </values>
-          <sql>status</sql>
-          <default_value/>
-          <is_null_allowed>true</is_null_allowed>
-          <display_style>list</display_style>
-        </field>
-        <field id="cis_list" xsi:type="AttributeLinkedSetIndirect">
-          <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>
-        <field id="contracts_list" xsi:type="AttributeLinkedSetIndirect">
-          <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">
-          <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="name">
-              <rank>10</rank>
-            </item>
-            <item id="org_id">
-              <rank>20</rank>
-            </item>
-            <item id="status">
-              <rank>30</rank>
-            </item>
-            <item id="version">
-              <rank>35</rank>
-            </item>
-            <item id="documenttype_id">
-              <rank>40</rank>
-            </item>
-            <item id="description">
-              <rank>50</rank>
-            </item>
-            <item id="cis_list">
-              <rank>60</rank>
-            </item>
-            <item id="contracts_list">
-              <rank>70</rank>
-            </item>
-            <item id="services_list">
-              <rank>80</rank>
-            </item>
-          </items>
-        </details>
-        <default_search>
-          <items>
-            <item id="name">
-              <rank>10</rank>
-            </item>
-            <item id="description">
-              <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="documenttype_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="documenttype_id">
-              <rank>30</rank>
-            </item>
-            <item id="description">
-              <rank>40</rank>
-            </item>
-          </items>
-        </list>
-      </presentation>
-    </class>
-    <class id="DocumentFile" _delta="define">
-      <parent>Document</parent>
-      <properties>
-        <category>bizmodel,searchable</category>
-        <abstract>false</abstract>
-        <key_type>autoincrement</key_type>
-        <db_table>documentfile</db_table>
-        <db_key_field>id</db_key_field>
-        <db_final_class_field/>
-        <naming>
-          <attributes>
-            <attribute id="name"/>
-          </attributes>
-        </naming>
-        <display_template/>
-        <icon>images/document.png</icon>
-        <reconciliation>
-          <attributes>
-            <attribute id="name"/>
-            <attribute id="org_id"/>
-            <attribute id="org_name"/>
-          </attributes>
-        </reconciliation>
-      </properties>
-      <fields>
-        <field id="file" xsi:type="AttributeBlob"/>
-      </fields>
-      <methods>
-        <method id="DisplayBareRelations">
-          <static>false</static>
-          <access>public</access>
-          <type>Overload-cmdbAbstractObject</type>
-          <comment><![CDATA[/**
-	 * Overload the display of the properties to add a tab (the first one)
-	 * with the preview of the document
-	 */
-	]]></comment>
-          <code><![CDATA[public function DisplayBareProperties(WebPage $oPage, $bEditMode = false, $sPrefix = '', $aExtraParams = array())
-	{
-		$aFieldsMap = parent::DisplayBareProperties($oPage, $bEditMode, $sPrefix, $aExtraParams);
-		if (!$bEditMode)
-		{
-			$oPage->add('<fieldset>');
-			$oPage->add('<legend>'.Dict::S('Class:Document:PreviewTab').'</legend>');
-			$oPage->add($this->DisplayDocumentInline($oPage, 'file'));
-			$oPage->add('</fieldset>');
-		}
-		return $aFieldsMap;
-	}]]></code>
-        </method>
-      </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="version">
-              <rank>35</rank>
-            </item>
-            <item id="documenttype_id">
-              <rank>40</rank>
-            </item>
-            <item id="description">
-              <rank>50</rank>
-            </item>
-            <item id="file">
-              <rank>60</rank>
-            </item>
-            <item id="cis_list">
-              <rank>70</rank>
-            </item>
-            <item id="contracts_list">
-              <rank>80</rank>
-            </item>
-            <item id="services_list">
-              <rank>90</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="documenttype_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="documenttype_id">
-              <rank>30</rank>
-            </item>
-            <item id="file">
-              <rank>40</rank>
-            </item>
-          </items>
-        </list>
-      </presentation>
-    </class>
-    <class id="DocumentNote" _delta="define">
-      <parent>Document</parent>
-      <properties>
-        <category>bizmodel,searchable</category>
-        <abstract>false</abstract>
-        <key_type>autoincrement</key_type>
-        <db_table>documentnote</db_table>
-        <db_key_field>id</db_key_field>
-        <db_final_class_field/>
-        <naming>
-          <attributes>
-            <attribute id="name"/>
-          </attributes>
-        </naming>
-        <display_template/>
-        <icon>images/document.png</icon>
-        <reconciliation>
-          <attributes>
-            <attribute id="name"/>
-            <attribute id="org_id"/>
-            <attribute id="org_name"/>
-          </attributes>
-        </reconciliation>
-      </properties>
-      <fields>
-        <field id="text" xsi:type="AttributeHTML">
-          <sql>text</sql>
-          <default_value/>
-          <is_null_allowed>false</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="version">
-              <rank>35</rank>
-            </item>
-            <item id="documenttype_id">
-              <rank>40</rank>
-            </item>
-            <item id="description">
-              <rank>50</rank>
-            </item>
-            <item id="text">
-              <rank>60</rank>
-            </item>
-            <item id="cis_list">
-              <rank>70</rank>
-            </item>
-            <item id="contracts_list">
-              <rank>80</rank>
-            </item>
-            <item id="services_list">
-              <rank>90</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="documenttype_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="documenttype_id">
-              <rank>30</rank>
-            </item>
-            <item id="description">
-              <rank>40</rank>
-            </item>
-          </items>
-        </list>
-      </presentation>
-    </class>
-    <class id="DocumentWeb" _delta="define">
-      <parent>Document</parent>
-      <properties>
-        <category>bizmodel,searchable</category>
-        <abstract>false</abstract>
-        <key_type>autoincrement</key_type>
-        <db_table>documentweb</db_table>
-        <db_key_field>id</db_key_field>
-        <db_final_class_field/>
-        <naming>
-          <attributes>
-            <attribute id="name"/>
-          </attributes>
-        </naming>
-        <display_template/>
-        <icon>images/document.png</icon>
-        <reconciliation>
-          <attributes>
-            <attribute id="name"/>
-            <attribute id="org_id"/>
-            <attribute id="org_name"/>
-          </attributes>
-        </reconciliation>
-      </properties>
-      <fields>
-        <field id="url" xsi:type="AttributeURL">
-          <sql>url</sql>
-          <default_value/>
-          <is_null_allowed>true</is_null_allowed>
-          <target>_blank</target>
-        </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="version">
-              <rank>35</rank>
-            </item>
-            <item id="description">
-              <rank>40</rank>
-            </item>
-            <item id="url">
-              <rank>50</rank>
-            </item>
-            <item id="cis_list">
-              <rank>60</rank>
-            </item>
-            <item id="contracts_list">
-              <rank>70</rank>
-            </item>
-            <item id="services_list">
-              <rank>80</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="description">
-              <rank>40</rank>
-            </item>
-            <item id="url">
-              <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="description">
-              <rank>30</rank>
-            </item>
-            <item id="url">
-              <rank>40</rank>
-            </item>
-          </items>
-        </list>
-      </presentation>
-    </class>
-    <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>
-        <display_template/>
-        <icon>images/server.png</icon>
-        <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">high</value>
-            <value id="medium">medium</value>
-            <value id="low">low</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">
-          <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="providercontracts_list" xsi:type="AttributeLinkedSetIndirect">
-          <linked_class>lnkFunctionalCIToProviderContract</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>providercontract_id</ext_key_to_remote>
-          <duplicates/>
-        </field>
-        <field id="services_list" xsi:type="AttributeLinkedSetIndirect">
-          <linked_class>lnkFunctionalCIToService</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>service_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>
-        <field id="tickets_list" xsi:type="AttributeLinkedSetIndirect">
-          <linked_class>lnkFunctionalCIToTicket</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>ticket_id</ext_key_to_remote>
-          <duplicates/>
-        </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>
-            <item id="providercontracts_list">
-              <rank>100</rank>
-            </item>
-            <item id="services_list">
-              <rank>110</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>
+				<display_template/>
+				<icon>images/server.png</icon>
+				<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">high</value>
+						<value id="medium">medium</value>
+						<value id="low">low</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="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)
 	{
 		parent::DisplayBareRelations($oPage, $bEditMode);
 
@@ -1727,7 +207,7 @@
 			foreach ($aSearches as $sSubClass => $oSearch)
 			{
 				$sBlockId = __class__.'_opened_'.$sSubClass;
-		
+
 				$oPage->add('<fieldset>');
 				$oPage->add('<legend>'.MetaModel::GetName($sSubClass).'</legend>');
 				$oBlock = new DisplayBlock($oSearch, 'list', false);
@@ -1736,4873 +216,4574 @@
 			}
 		}
 	}]]></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>
-        <display_template/>
-        <icon>images/server.png</icon>
-        <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">production</value>
-            <value id="implementation">implementation</value>
-            <value id="stock">stock</value>
-            <value id="obsolete">obsolete</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>
-        <display_template/>
-        <icon>images/server.png</icon>
-        <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>
-        <display_template/>
-        <icon>images/server.png</icon>
-        <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>
-        <display_template/>
-        <icon>images/switch.png</icon>
-        <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="providercontracts_list">
-              <rank>60</rank>
-            </item>
-            <item id="services_list">
-              <rank>70</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 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>
-        <display_template/>
-        <icon>images/server.png</icon>
-        <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="providercontracts_list">
-              <rank>100</rank>
-            </item>
-            <item id="services_list">
-              <rank>110</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>
-        <display_template/>
-        <icon>images/solution.png</icon>
-        <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">active</value>
-            <value id="inactive">inactive</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>
-            <item id="providercontracts_list">
-              <rank>120</rank>
-            </item>
-            <item id="services_list">
-              <rank>130</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>
-        <display_template/>
-        <icon>images/business-process.png</icon>
-        <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">active</value>
-            <value id="inactive">inactive</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>
-        <display_template/>
-        <icon>images/application.png</icon>
-        <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">active</value>
-            <value id="inactive">inactive</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>
-        <display_template/>
-        <icon>images/middleware.png</icon>
-        <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>
-            <item id="providercontracts_list">
-              <rank>160</rank>
-            </item>
-            <item id="services_list">
-              <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="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>
-        <display_template/>
-        <icon>images/database.png</icon>
-        <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>
-            <item id="providercontracts_list">
-              <rank>160</rank>
-            </item>
-            <item id="services_list">
-              <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="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>
-        <display_template/>
-        <icon>images/webserver.png</icon>
-        <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>
-            <item id="providercontracts_list">
-              <rank>160</rank>
-            </item>
-            <item id="services_list">
-              <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="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>
-        <display_template/>
-        <icon>images/application.png</icon>
-        <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>
-            <item id="providercontracts_list">
-              <rank>150</rank>
-            </item>
-            <item id="services_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="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>
-        <display_template/>
-        <icon>images/application.png</icon>
-        <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>
-            <item id="providercontracts_list">
-              <rank>150</rank>
-            </item>
-            <item id="services_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="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>
-        <display_template/>
-        <icon>images/middleware.png</icon>
-        <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>
-            <item id="providercontracts_list">
-              <rank>110</rank>
-            </item>
-            <item id="services_list">
-              <rank>120</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>
-        <display_template/>
-        <icon>images/database-schema.png</icon>
-        <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>
-            <item id="providercontracts_list">
-              <rank>110</rank>
-            </item>
-            <item id="services_list">
-              <rank>120</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>
-        <display_template/>
-        <icon>images/webapp.png</icon>
-        <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>
-            <item id="providercontracts_list">
-              <rank>120</rank>
-            </item>
-            <item id="services_list">
-              <rank>130</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>
-        <display_template/>
-        <icon>images/software.png</icon>
-        <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">Middleware</value>
-            <value id="DBServer">DBServer</value>
-            <value id="PCSoftware">PCSoftware</value>
-            <value id="OtherSoftware">OtherSoftware</value>
-            <value id="WebServer">WebServer</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>
-        <display_template/>
-        <icon>images/patch.png</icon>
-        <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>
-        <display_template/>
-        <icon>images/patch.png</icon>
-        <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>
-        <display_template/>
-        <icon>images/patch.png</icon>
-        <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>
-        <display_template/>
-        <icon>images/licence.png</icon>
-        <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">yes</value>
-            <value id="no">no</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>
-        <display_template/>
-        <icon>images/licence.png</icon>
-        <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>
-        <display_template/>
-        <icon>images/licence.png</icon>
-        <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>
-        <display_template/>
-        <icon/>
-        <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>
-            </item>
-          </items>
-        </list>
-      </presentation>
-    </class>
-    <class id="Typology" _delta="define">
-      <parent>cmdbAbstractObject</parent>
-      <properties>
-        <category>bizmodel,searchable</category>
-        <abstract>true</abstract>
-        <key_type>autoincrement</key_type>
-        <db_table>typology</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>
-        <display_template/>
-        <icon/>
-        <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="finalclass">
-              <rank>10</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>
-        <display_template/>
-        <icon/>
-        <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>
-        <display_template/>
-        <icon/>
-        <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="DocumentType" _delta="define">
-      <parent>Typology</parent>
-      <properties>
-        <category>bizmodel,searchable</category>
-        <abstract>false</abstract>
-        <key_type>autoincrement</key_type>
-        <db_table>documenttype</db_table>
-        <db_key_field>id</db_key_field>
-        <db_final_class_field/>
-        <naming>
-          <attributes>
-            <attribute id="name"/>
-          </attributes>
-        </naming>
-        <display_template/>
-        <icon/>
-        <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="ContactType" _delta="define">
-      <parent>Typology</parent>
-      <properties>
-        <category>bizmodel,searchable</category>
-        <abstract>false</abstract>
-        <key_type>autoincrement</key_type>
-        <db_table>contacttype</db_table>
-        <db_key_field>id</db_key_field>
-        <db_final_class_field/>
-        <naming>
-          <attributes>
-            <attribute id="name"/>
-          </attributes>
-        </naming>
-        <display_template/>
-        <icon/>
-        <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>
-        <display_template/>
-        <icon/>
-        <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>
-        <display_template/>
-        <icon/>
-        <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">NetworkDevice</value>
-            <value id="Server">Server</value>
-            <value id="SANSwitch">SANSwitch</value>
-            <value id="StorageSystem">StorageSystem</value>
-            <value id="Rack">Rack</value>
-            <value id="Enclosure">Enclosure</value>
-            <value id="PC">PC</value>
-            <value id="Tablet">Tablet</value>
-            <value id="Phone">Phone</value>
-            <value id="MobilePhone">MobilePhone</value>
-            <value id="Printer">Printer</value>
-            <value id="DiskArray">DiskArray</value>
-            <value id="NAS">NAS</value>
-            <value id="TapeLibrary">TapeLibrary</value>
-            <value id="IPPhone">IPPhone</value>
-            <value id="Peripheral">Peripheral</value>
-            <value id="PowerSource">PowerSource</value>
-            <value id="PDU">PDU</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>
-        <display_template/>
-        <icon/>
-        <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>
-        <display_template/>
-        <icon/>
-        <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="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>
-        <display_template/>
-        <icon/>
-        <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>
-        <display_template/>
-        <icon/>
-        <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>
-        <display_template/>
-        <icon/>
-        <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>
-        <display_template/>
-        <icon/>
-        <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="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>
-        <display_template/>
-        <icon/>
-        <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="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>
-        <display_template/>
-        <icon/>
-        <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>
-        <display_template/>
-        <icon>images/subnet.png</icon>
-        <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/>
-        </field>
-      </fields>
-      <methods>
-        <method id="DisplayBareRelations">
-          <static>false</static>
-          <access>public</access>
-          <type>Overload-cmdbAbstractObject</type>
-          <code><![CDATA[	function DisplayBareRelations(WebPage $oPage, $bEditMode = false)
+				</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>
+				<display_template/>
+				<icon>images/server.png</icon>
+				<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">production</value>
+						<value id="implementation">implementation</value>
+						<value id="stock">stock</value>
+						<value id="obsolete">obsolete</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>
+				<display_template/>
+				<icon>images/server.png</icon>
+				<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>
+				<display_template/>
+				<icon>images/server.png</icon>
+				<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>
+				<display_template/>
+				<icon>images/switch.png</icon>
+				<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
+								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
+								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>
+				<display_template/>
+				<icon>images/server.png</icon>
+				<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>
+				<display_template/>
+				<icon>images/solution.png</icon>
+				<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">active</value>
+						<value id="inactive">inactive</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>
+				<display_template/>
+				<icon>images/business-process.png</icon>
+				<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">active</value>
+						<value id="inactive">inactive</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>
+				<display_template/>
+				<icon>images/application.png</icon>
+				<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">active</value>
+						<value id="inactive">inactive</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>
+				<display_template/>
+				<icon>images/middleware.png</icon>
+				<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>
+				<display_template/>
+				<icon>images/database.png</icon>
+				<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>
+				<display_template/>
+				<icon>images/webserver.png</icon>
+				<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>
+				<display_template/>
+				<icon>images/application.png</icon>
+				<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>
+				<display_template/>
+				<icon>images/application.png</icon>
+				<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>
+				<display_template/>
+				<icon>images/middleware.png</icon>
+				<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>
+				<display_template/>
+				<icon>images/database-schema.png</icon>
+				<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>
+				<display_template/>
+				<icon>images/webapp.png</icon>
+				<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>
+				<display_template/>
+				<icon>images/software.png</icon>
+				<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">Middleware</value>
+						<value id="DBServer">DBServer</value>
+						<value id="PCSoftware">PCSoftware</value>
+						<value id="OtherSoftware">OtherSoftware</value>
+						<value id="WebServer">WebServer</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>
+				<display_template/>
+				<icon>images/patch.png</icon>
+				<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>
+				<display_template/>
+				<icon>images/patch.png</icon>
+				<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>
+				<display_template/>
+				<icon>images/patch.png</icon>
+				<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>
+				<display_template/>
+				<icon>images/licence.png</icon>
+				<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">yes</value>
+						<value id="no">no</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>
+				<display_template/>
+				<icon>images/licence.png</icon>
+				<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>
+				<display_template/>
+				<icon>images/licence.png</icon>
+				<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>
+				<display_template/>
+				<icon/>
+				<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>
+						</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>
+				<display_template/>
+				<icon/>
+				<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>
+				<display_template/>
+				<icon/>
+				<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>
+				<display_template/>
+				<icon/>
+				<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>
+				<display_template/>
+				<icon/>
+				<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">NetworkDevice</value>
+						<value id="Server">Server</value>
+						<value id="SANSwitch">SANSwitch</value>
+						<value id="StorageSystem">StorageSystem</value>
+						<value id="Rack">Rack</value>
+						<value id="Enclosure">Enclosure</value>
+						<value id="PC">PC</value>
+						<value id="Tablet">Tablet</value>
+						<value id="Phone">Phone</value>
+						<value id="MobilePhone">MobilePhone</value>
+						<value id="Printer">Printer</value>
+						<value id="DiskArray">DiskArray</value>
+						<value id="NAS">NAS</value>
+						<value id="TapeLibrary">TapeLibrary</value>
+						<value id="IPPhone">IPPhone</value>
+						<value id="Peripheral">Peripheral</value>
+						<value id="PowerSource">PowerSource</value>
+						<value id="PDU">PDU</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>
+				<display_template/>
+				<icon/>
+				<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>
+				<display_template/>
+				<icon/>
+				<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="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>
+				<display_template/>
+				<icon/>
+				<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>
+				<display_template/>
+				<icon/>
+				<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>
+				<display_template/>
+				<icon/>
+				<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>
+				<display_template/>
+				<icon/>
+				<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>
+				<display_template/>
+				<icon/>
+				<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>
+				<display_template/>
+				<icon>images/subnet.png</icon>
+				<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/>
+				</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);
 
 		if (!$bEditMode)
 		{
 			$oPage->SetCurrentTab('Class:Subnet/Tab:IPUsage');
-	
+
 			$bit_ip = ip2long($this->Get('ip'));
 			$bit_mask = ip2long($this->Get('ip_mask'));
-	
+
 			$iIPMin = sprintf('%u', ($bit_ip & $bit_mask) | 1); // exclude the first one: identifies the subnet itself
 			$iIPMax = sprintf('%u', (($bit_ip | (~$bit_mask))) & 0xfffffffe); // exclude the last one : broadcast address
-			
+
 			$sIPMin = long2ip($iIPMin);
 			$sIPMax = long2ip($iIPMax);
-	
+
 			$oPage->p(Dict::Format('Class:Subnet/Tab:IPUsage-explain', $sIPMin, $sIPMax));
-			
+
 			$oIfFilter = DBObjectSearch::FromOQL("SELECT IPInterface AS if WHERE INET_ATON(if.ipaddress) >= INET_ATON('$sIPMin') AND INET_ATON(if.ipaddress) <= INET_ATON('$sIPMax')");
 			$oIfSet = new CMDBObjectSet($oIfFilter);
 			$oBlock = new DisplayBlock($oIfFilter, 'list', false);
 			$oBlock->Display($oPage, 'nwif', array('menu' => false));
-	
+
 			$iCountUsed = $oIfSet->Count();
 			$iCountRange = $iIPMax - $iIPMin; // On 32-bit systems the substraction will be computed using floats for values greater than PHP_MAX_INT;
 			$iFreeCount =  $iCountRange - $iCountUsed;
-	
+
 			$oPage->SetCurrentTab('Class:Subnet/Tab:FreeIPs');
 			$oPage->p(Dict::Format('Class:Subnet/Tab:FreeIPs-count', $iFreeCount));
 			$oPage->p(Dict::S('Class:Subnet/Tab:FreeIPs-explain'));
-	
+
 			$aUsedIPs = $oIfSet->GetColumnAsArray('ipaddress', false);
 			$iAnIP = $iIPMin;
 			$iFound = 0;
@@ -6621,776 +4802,776 @@
 			}
 		}
 	}]]></code>
-        </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>
-        <display_template/>
-        <icon>images/vlan.png</icon>
-        <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>
-        <display_template/>
-        <icon/>
-        <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>
-        <display_template/>
-        <icon>images/interface.png</icon>
-        <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>
-        <display_template/>
-        <icon>images/interface.png</icon>
-        <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>
-        <display_template/>
-        <icon>images/interface.png</icon>
-        <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>
-        <display_template/>
-        <icon/>
-        <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>
-        <display_template/>
-        <icon/>
-        <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">uplink</value>
-            <value id="downlink">downlink</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()
+				</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>
+				<display_template/>
+				<icon>images/vlan.png</icon>
+				<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>
+				<display_template/>
+				<icon/>
+				<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>
+				<display_template/>
+				<icon>images/interface.png</icon>
+				<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>
+				<display_template/>
+				<icon>images/interface.png</icon>
+				<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>
+				<display_template/>
+				<icon>images/interface.png</icon>
+				<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>
+				<display_template/>
+				<icon/>
+				<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>
+				<display_template/>
+				<icon/>
+				<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">uplink</value>
+						<value id="downlink">downlink</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'))
@@ -7404,7 +5585,7 @@
 								'devport' => $this->Get('network_port'),
 								'nwport' => $this->Get('device_port'),
 								)
-			);	
+			);
 			if ($oConnectionSet->Count() == 0)
 			{
 				$sLink = $this->Get('connection_type');
@@ -7416,16 +5597,16 @@
 				$oNewLink->Set('network_port', $this->Get('device_port'));
 				$oNewLink->Set('device_port', $this->Get('network_port'));
 				$oNewLink->Set('connection_type', $sConnLink);
-				$oNewLink->DBInsert();	
+				$oNewLink->DBInsert();
 			}
 		}
 	}]]></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()
 	{
 		$oDevice = MetaModel::GetObject('ConnectableCI', $this->Get('connectableci_id'));
 		if (is_object($oDevice) && (get_class($oDevice) == 'NetworkDevice'))
@@ -7440,7 +5621,7 @@
 								'devport' => $this->GetOriginal('network_port'),
 								'nwport' => $this->GetOriginal('device_port'),
 								)
-			);	
+			);
 			$sLink = $this->Get('connection_type');
 			$sConnLink = ($sLink == 'uplink') ? 'downlink' : 'uplink';
 
@@ -7450,16 +5631,16 @@
 				$oConnection->Set('connection_type', $sConnLink);
 				$oConnection->Set('network_port', $this->Get('device_port'));
 				$oConnection->Set('device_port', $this->Get('network_port'));
-				$oConnection->DBUpdate();	
+				$oConnection->DBUpdate();
 			}
 		}
 	}]]></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);
@@ -7479,927 +5660,706 @@
 			// There should be one link - do it in a safe manner anyway
 			while ($oConnection = $oConnectionSet->Fetch())
 			{
-				$oConnection->DBDelete();	
+				$oConnection->DBDelete();
 			}
-		}	
+		}
 	}]]></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>
-        <display_template/>
-        <icon/>
-        <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>
-        <display_template/>
-        <icon/>
-        <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="lnkPersonToTeam" _delta="define">
-      <parent>cmdbAbstractObject</parent>
-      <properties>
-        <is_link>1</is_link>
-        <category>bizmodel</category>
-        <abstract>false</abstract>
-        <key_type>autoincrement</key_type>
-        <db_table>lnkpersontoteam</db_table>
-        <db_key_field>id</db_key_field>
-        <db_final_class_field/>
-        <naming>
-          <attributes>
-            <attribute id="team_id"/>
-            <attribute id="person_id"/>
-          </attributes>
-        </naming>
-        <display_template/>
-        <icon/>
-        <reconciliation>
-          <attributes>
-            <attribute id="team_id"/>
-            <attribute id="person_id"/>
-          </attributes>
-        </reconciliation>
-      </properties>
-      <fields>
-        <field id="team_id" xsi:type="AttributeExternalKey">
-          <sql>team_id</sql>
-          <target_class>Team</target_class>
-          <is_null_allowed>false</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>name</target_attcode>
-        </field>
-        <field id="person_id" xsi:type="AttributeExternalKey">
-          <sql>person_id</sql>
-          <target_class>Person</target_class>
-          <is_null_allowed>false</is_null_allowed>
-          <on_target_delete>DEL_AUTO</on_target_delete>
-        </field>
-        <field id="person_name" xsi:type="AttributeExternalField">
-          <extkey_attcode>person_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="team_id">
-              <rank>10</rank>
-            </item>
-            <item id="person_id">
-              <rank>20</rank>
-            </item>
-            <item id="role_id">
-              <rank>30</rank>
-            </item>
-          </items>
-        </details>
-        <search>
-          <items>
-            <item id="team_id">
-              <rank>10</rank>
-            </item>
-            <item id="person_id">
-              <rank>20</rank>
-            </item>
-            <item id="role_id">
-              <rank>30</rank>
-            </item>
-          </items>
-        </search>
-        <list>
-          <items>
-            <item id="team_id">
-              <rank>10</rank>
-            </item>
-            <item id="person_id">
-              <rank>20</rank>
-            </item>
-            <item id="role_id">
-              <rank>30</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>
-        <display_template/>
-        <icon>images/group.png</icon>
-        <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">production</value>
-            <value id="implementation">implementation</value>
-            <value id="obsolete">obsolete</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>
-        <display_template/>
-        <icon/>
-        <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>
-  </classes>
-  <menus>
-    <menu id="DataAdministration" xsi:type="MenuGroup" _delta="define">
-      <rank>70</rank>
-      <enable_class>Organization</enable_class>
-      <enable_action>UR_ACTION_MODIFY</enable_action>
-      <enable_permission>UR_ALLOWED_YES</enable_permission>
-      <enable_stimulus/>
-    </menu>
-    <menu id="CSVImport" xsi:type="WebPageMenuNode" _delta="define">
-      <rank>10</rank>
-      <parent>DataAdministration</parent>
-      <url>$pages/csvimport.php</url>
-    </menu>
-    <menu id="Audit" xsi:type="WebPageMenuNode" _delta="define">
-      <rank>33</rank>
-      <parent>DataAdministration</parent>
-      <url>$pages/audit.php</url>
-    </menu>
-    <menu id="Catalogs" xsi:type="TemplateMenuNode" _delta="define">
-      <rank>50</rank>
-      <parent>DataAdministration</parent>
-      <template_file/>
-    </menu>
-    <menu id="Organization" xsi:type="OQLMenuNode" _delta="define">
-      <rank>10</rank>
-      <parent>Catalogs</parent>
-      <oql>SELECT Organization</oql>
-      <do_search>1</do_search>
-    </menu>
-    <menu id="ConfigManagement" xsi:type="MenuGroup" _delta="define">
-      <rank>20</rank>
-    </menu>
-    <menu id="ConfigManagementOverview" xsi:type="DashboardMenuNode" _delta="define">
-      <rank>1</rank>
-      <parent>ConfigManagement</parent>
-      <definition>
-        <layout>DashboardLayoutOneCol</layout>
-        <title/>
-        <cells>
-          <cell id="0">
-            <rank>0</rank>
-            <dashlets>
-              <dashlet id="1" xsi:type="DashletHeaderStatic">
-                <rank>0</rank>
-                <title>Menu:ConfigManagement:AllDevices</title>
-                <icon>itop-config-mgmt/images/server.png</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>itop-config-mgmt/images/application.png</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>itop-config-mgmt/images/subnet.png</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="Contact" xsi:type="DashboardMenuNode" _delta="define">
-      <rank>2</rank>
-      <parent>ConfigManagement</parent>
-      <definition>
-        <layout>DashboardLayoutOneCol</layout>
-        <title/>
-        <cells>
-          <cell id="0">
-            <rank>0</rank>
-            <dashlets>
-              <dashlet id="1" xsi:type="DashletHeaderDynamic">
-                <rank>1</rank>
-                <title>Menu:Contact</title>
-                <icon>itop-config-mgmt/images/team.png</icon>
-                <subtitle>Menu:Contact:Count</subtitle>
-                <query>SELECT Contact</query>
-                <group_by>status</group_by>
-                <values>active,inactive</values>
-              </dashlet>
-              <dashlet id="2" xsi:type="DashletBadge">
-                <rank>2</rank>
-                <class>Team</class>
-              </dashlet>
-              <dashlet id="3" xsi:type="DashletBadge">
-                <rank>3</rank>
-                <class>Person</class>
-              </dashlet>
-            </dashlets>
-          </cell>
-        </cells>
-      </definition>
-    </menu>
-    <menu id="NewContact" xsi:type="NewObjectMenuNode" _delta="define">
-      <rank>3</rank>
-      <parent>Contact</parent>
-      <class>Contact</class>
-    </menu>
-    <menu id="SearchContacts" xsi:type="SearchMenuNode" _delta="define">
-      <rank>4</rank>
-      <parent>Contact</parent>
-      <class>Contact</class>
-    </menu>
-    <menu id="Location" xsi:type="OQLMenuNode" _delta="define">
-      <rank>3</rank>
-      <parent>ConfigManagement</parent>
-      <oql>SELECT Location</oql>
-      <do_search>1</do_search>
-    </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="Document" xsi:type="OQLMenuNode" _delta="define">
-      <rank>6</rank>
-      <parent>ConfigManagement</parent>
-      <oql>SELECT Document</oql>
-      <do_search>1</do_search>
-    </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>
-    <menu id="Typology" xsi:type="DashboardMenuNode" _delta="define">
-      <rank>80</rank>
-      <parent>Catalogs</parent>
-      <definition>
-        <layout>DashboardLayoutOneCol</layout>
-        <title>Menu:ConfigManagement:Typology</title>
-        <cells>
-          <cell id="0">
-            <rank>0</rank>
-            <dashlets>
-              <dashlet id="1" xsi:type="DashletHeaderStatic">
-                <rank>0</rank>
-                <title>Menu:ConfigManagement:Typology</title>
-                <icon>itop-config-mgmt/images/typology.png</icon>
-              </dashlet>
-              <dashlet id="2" xsi:type="DashletBadge">
-                <rank>1</rank>
-                <class>Brand</class>
-              </dashlet>
-              <dashlet id="3" xsi:type="DashletBadge">
-                <rank>2</rank>
-                <class>Model</class>
-              </dashlet>
-              <dashlet id="4" xsi:type="DashletBadge">
-                <rank>3</rank>
-                <class>OSFamily</class>
-              </dashlet>
-              <dashlet id="5" xsi:type="DashletBadge">
-                <rank>4</rank>
-                <class>OSVersion</class>
-              </dashlet>
-              <dashlet id="6" xsi:type="DashletBadge">
-                <rank>5</rank>
-                <class>IOSVersion</class>
-              </dashlet>
-              <dashlet id="7" xsi:type="DashletBadge">
-                <rank>6</rank>
-                <class>NetworkDeviceType</class>
-              </dashlet>
-              <dashlet id="9" xsi:type="DashletBadge">
-                <rank>8</rank>
-                <class>ContactType</class>
-              </dashlet>
-              <dashlet id="10" xsi:type="DashletBadge">
-                <rank>9</rank>
-                <class>DocumentType</class>
-              </dashlet>
-            </dashlets>
-          </cell>
-        </cells>
-      </definition>
-    </menu>
-    <menu id="TagAdminMenu" xsi:type="WebPageMenuNode" _delta="define">
-      <rank>100</rank>
-      <parent>Catalogs</parent>
-      <url>$pages/tagadmin.php</url>
-      <enable_class>TagSetFieldData</enable_class>
-      <enable_action>UR_ACTION_MODIFY</enable_action>
-    </menu>
-  </menus>
-  <branding >
-    <themes>
-      <theme id="light-grey" _delta="define">
-        <variables>
-        </variables>
-        <imports>
-          <import id="css-variables">../css/css-variables.scss</import>
-        </imports>
-        <stylesheets>
-          <stylesheet id="jqueryui">../css/ui-lightness/jqueryui.scss</stylesheet>
-          <stylesheet id="main">../css/light-grey.scss</stylesheet>
-        </stylesheets>
-      </theme>
-      <theme id="test-red" _delta="define">
-        <variables>
-          <variable id="backoffice-environment-banner-background-color">#C53030</variable>
-          <variable id="backoffice-environment-banner-text-color">#F7FAFC</variable>
-          <variable id="backoffice-environment-banner-text-content">"THIS IS A TEST INSTANCE"</variable>
-        </variables>
-        <imports>
-          <import id="css-variables">../css/css-variables.scss</import>
-        </imports>
-        <stylesheets>
-          <stylesheet id="jqueryui">../css/ui-lightness/jqueryui.scss</stylesheet>
-          <stylesheet id="main">../css/light-grey.scss</stylesheet>
-          <stylesheet id="environment-banner">../css/backoffice-environment-banner.scss</stylesheet>
-        </stylesheets>
-      </theme>
-    </themes>
-  </branding>
+				</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>
+				<display_template/>
+				<icon/>
+				<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>
+				<display_template/>
+				<icon/>
+				<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>
+				<display_template/>
+				<icon>images/group.png</icon>
+				<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">production</value>
+						<value id="implementation">implementation</value>
+						<value id="obsolete">obsolete</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>
+				<display_template/>
+				<icon/>
+				<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>
+	</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/>
+				<cells>
+					<cell id="0">
+						<rank>0</rank>
+						<dashlets>
+							<dashlet id="1" xsi:type="DashletHeaderStatic">
+								<rank>0</rank>
+								<title>Menu:ConfigManagement:AllDevices</title>
+								<icon>itop-config-mgmt/images/server.png</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>itop-config-mgmt/images/application.png</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>itop-config-mgmt/images/subnet.png</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="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-config-mgmt/de.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/de.dict.itop-config-mgmt.php
index 55d6ffe22..2e7ce51fa 100755
--- a/datamodels/2.x/itop-config-mgmt/de.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/de.dict.itop-config-mgmt.php
@@ -72,232 +72,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 //////////////////////////////////////////////////////////////////////
 //
 
-
-//
-// Class: Organization
-//
-
-Dict::Add('DE DE', 'German', 'Deutsch', array(
-	'Class:Organization' => 'Organisation',
-	'Class:Organization+' => '',
-	'Class:Organization/Attribute:name' => 'Name',
-	'Class:Organization/Attribute:name+' => 'Gemeinsamer Name',
-	'Class:Organization/Attribute:code' => 'Kennziffer',
-	'Class:Organization/Attribute:code+' => 'Organisationskennziffer (D-U-N-S, Siret)',
-	'Class:Organization/Attribute:status' => 'Status',
-	'Class:Organization/Attribute:status+' => '',
-	'Class:Organization/Attribute:status/Value:active' => 'Aktiv',
-	'Class:Organization/Attribute:status/Value:active+' => 'Aktiv',
-	'Class:Organization/Attribute:status/Value:inactive' => 'Inaktiv',
-	'Class:Organization/Attribute:status/Value:inactive+' => 'Inaktiv',
-	'Class:Organization/Attribute:parent_id' => 'Mutterfirma',
-	'Class:Organization/Attribute:parent_id+' => 'Dachorganisation',
-	'Class:Organization/Attribute:parent_name' => 'Name der Mutterfirma',
-	'Class:Organization/Attribute:parent_name+' => 'Name der Mutterfirma',
-	'Class:Organization/Attribute:deliverymodel_id' => 'Delivery-Modell',
-	'Class:Organization/Attribute:deliverymodel_id+' => '',
-	'Class:Organization/Attribute:deliverymodel_name' => 'Delivery-Modell-Name',
-	'Class:Organization/Attribute:deliverymodel_name+' => '',
-	'Class:Organization/Attribute:parent_id_friendlyname' => 'Parent',
-	'Class:Organization/Attribute:parent_id_friendlyname+' => '',
-	'Class:Organization/Attribute:overview' => 'Überblick',
-	'Organization:Overview:FunctionalCIs' => 'CIs dieser Organisation',
-	'Organization:Overview:FunctionalCIs:subtitle' => 'nach Typ',
-	'Organization:Overview:Users' => 'iTop Benutzer innerhalb dieser Organisation',
-));
-
-//
-// Class: Location
-//
-
-Dict::Add('DE DE', 'German', 'Deutsch', array(
-	'Class:Location' => 'Standort',
-	'Class:Location+' => 'Jeder Typ von Standort: Region, Land, Stadt, Seite, Gebäude, Flur, Raum, Rack,...',
-	'Class:Location/Attribute:name' => 'Name',
-	'Class:Location/Attribute:name+' => '',
-	'Class:Location/Attribute:status' => 'Status',
-	'Class:Location/Attribute:status+' => '',
-	'Class:Location/Attribute:status/Value:active' => 'Aktiv',
-	'Class:Location/Attribute:status/Value:active+' => 'Aktiv',
-	'Class:Location/Attribute:status/Value:inactive' => 'Inaktiv',
-	'Class:Location/Attribute:status/Value:inactive+' => 'Inaktiv',
-	'Class:Location/Attribute:org_id' => 'Organisation',
-	'Class:Location/Attribute:org_id+' => '',
-	'Class:Location/Attribute:org_name' => 'Name der Organisation',
-	'Class:Location/Attribute:org_name+' => '',
-	'Class:Location/Attribute:address' => 'Adresse',
-	'Class:Location/Attribute:address+' => 'Postanschrift',
-	'Class:Location/Attribute:postal_code' => 'Postleitzahl',
-	'Class:Location/Attribute:postal_code+' => 'Postleitzahl',
-	'Class:Location/Attribute:city' => 'Stadt',
-	'Class:Location/Attribute:city+' => '',
-	'Class:Location/Attribute:country' => 'Land',
-	'Class:Location/Attribute:country+' => '',
-	'Class:Location/Attribute:physicaldevice_list' => 'Geräte',
-	'Class:Location/Attribute:physicaldevice_list+' => '',
-	'Class:Location/Attribute:person_list' => 'Kontakte',
-	'Class:Location/Attribute:person_list+' => '',
-));
-
-//
-// Class: Contact
-//
-
-Dict::Add('DE DE', 'German', 'Deutsch', array(
-	'Class:Contact' => 'Kontakt',
-	'Class:Contact+' => '',
-	'Class:Contact/Attribute:name' => 'Name',
-	'Class:Contact/Attribute:name+' => '',
-	'Class:Contact/Attribute:status' => 'Status',
-	'Class:Contact/Attribute:status+' => '',
-	'Class:Contact/Attribute:status/Value:active' => 'Aktiv',
-	'Class:Contact/Attribute:status/Value:active+' => 'Aktiv',
-	'Class:Contact/Attribute:status/Value:inactive' => 'Inaktiv',
-	'Class:Contact/Attribute:status/Value:inactive+' => 'Inaktiv',
-	'Class:Contact/Attribute:org_id' => 'Organisation',
-	'Class:Contact/Attribute:org_id+' => '',
-	'Class:Contact/Attribute:org_name' => 'Organisation',
-	'Class:Contact/Attribute:org_name+' => '',
-	'Class:Contact/Attribute:email' => 'Email',
-	'Class:Contact/Attribute:email+' => '',
-	'Class:Contact/Attribute:phone' => 'Telefonnummer',
-	'Class:Contact/Attribute:phone+' => '',
-	'Class:Contact/Attribute:notify' => 'Benachrichtigung',
-	'Class:Contact/Attribute:notify+' => '',
-	'Class:Contact/Attribute:notify/Value:no' => 'Nein',
-	'Class:Contact/Attribute:notify/Value:no+' => '',
-	'Class:Contact/Attribute:notify/Value:yes' => 'Ja',
-	'Class:Contact/Attribute:notify/Value:yes+' => '',
-	'Class:Contact/Attribute:function' => 'Funktion',
-	'Class:Contact/Attribute:function+' => '',
-	'Class:Contact/Attribute:cis_list' => 'CIs',
-	'Class:Contact/Attribute:cis_list+' => '',
-	'Class:Contact/Attribute:finalclass' => 'Typ',
-	'Class:Contact/Attribute:finalclass+' => '',
-));
-
-//
-// Class: Person
-//
-
-Dict::Add('DE DE', 'German', 'Deutsch', array(
-	'Class:Person' => 'Person',
-	'Class:Person+' => '',
-	'Class:Person/Attribute:name' => 'Name',
-	'Class:Person/Attribute:name+' => '',
-	'Class:Person/Attribute:first_name' => 'Vorname',
-	'Class:Person/Attribute:first_name+' => '',
-	'Class:Person/Attribute:employee_number' => 'Personalnummer',
-	'Class:Person/Attribute:employee_number+' => '',
-	'Class:Person/Attribute:mobile_phone' => 'Mobiltelefone',
-	'Class:Person/Attribute:mobile_phone+' => '',
-	'Class:Person/Attribute:location_id' => 'Standort',
-	'Class:Person/Attribute:location_id+' => '',
-	'Class:Person/Attribute:location_name' => 'Standortname',
-	'Class:Person/Attribute:location_name+' => '',
-	'Class:Person/Attribute:manager_id' => 'Manager',
-	'Class:Person/Attribute:manager_id+' => '',
-	'Class:Person/Attribute:manager_name' => 'Manager-Name',
-	'Class:Person/Attribute:manager_name+' => '',
-	'Class:Person/Attribute:team_list' => 'Teams',
-	'Class:Person/Attribute:team_list+' => '',
-	'Class:Person/Attribute:tickets_list' => 'Tickets',
-	'Class:Person/Attribute:tickets_list+' => '',
-	'Class:Person/Attribute:manager_id_friendlyname' => 'Manager Friendly Name',
-	'Class:Person/Attribute:manager_id_friendlyname+' => '',
-	'Class:Person/Attribute:picture' => 'Bild',
-	'Class:Person/Attribute:picture+' => '',
-	'Class:Person/UniquenessRule:employee_number+' => 'Die Personalnummer muss innerhalb dieser Organisation eindeutig sein.',
-	'Class:Person/UniquenessRule:employee_number' => 'In der Organisation \'$this->org_name$\' existiert bereits eine Person mit der gleichen Personalnummer',
-	'Class:Person/UniquenessRule:name+' => 'Innerhalb einer Organisation muss der Name einer Person eindeutig sein',
-	'Class:Person/UniquenessRule:name' => 'In der Organisation \'$this->org_name$\' existiert bereits eine Person mit dem gleichen Namen',
-));
-
-//
-// Class: Team
-//
-
-Dict::Add('DE DE', 'German', 'Deutsch', array(
-	'Class:Team' => 'Team',
-	'Class:Team+' => '',
-	'Class:Team/Attribute:persons_list' => 'Mitglieder',
-	'Class:Team/Attribute:persons_list+' => '',
-	'Class:Team/Attribute:tickets_list' => 'Tickets',
-	'Class:Team/Attribute:tickets_list+' => '',
-));
-
-//
-// Class: Document
-//
-
-Dict::Add('DE DE', 'German', 'Deutsch', array(
-	'Class:Document' => 'Dokument',
-	'Class:Document+' => '',
-	'Class:Document/Attribute:name' => 'Name',
-	'Class:Document/Attribute:name+' => '',
-	'Class:Document/Attribute:org_id' => 'Organisation',
-	'Class:Document/Attribute:org_id+' => '',
-	'Class:Document/Attribute:org_name' => 'Organisationsname',
-	'Class:Document/Attribute:org_name+' => '',
-	'Class:Document/Attribute:documenttype_id' => 'Dokumenttyp',
-	'Class:Document/Attribute:documenttype_id+' => '',
-	'Class:Document/Attribute:documenttype_name' => 'Dokumenttypname',
-	'Class:Document/Attribute:documenttype_name+' => '',
-	'Class:Document/Attribute:version' => 'Version',
-	'Class:Document/Attribute:version+' => '',
-	'Class:Document/Attribute:description' => 'Beschreibung',
-	'Class:Document/Attribute:description+' => '',
-	'Class:Document/Attribute:status' => 'Status',
-	'Class:Document/Attribute:status+' => '',
-	'Class:Document/Attribute:status/Value:draft' => 'Entwurf',
-	'Class:Document/Attribute:status/Value:draft+' => '',
-	'Class:Document/Attribute:status/Value:obsolete' => 'Obsolet (Veraltet)',
-	'Class:Document/Attribute:status/Value:obsolete+' => '',
-	'Class:Document/Attribute:status/Value:published' => 'Veröffentlicht',
-	'Class:Document/Attribute:status/Value:published+' => '',
-	'Class:Document/Attribute:cis_list' => 'CIs',
-	'Class:Document/Attribute:cis_list+' => '',
-	'Class:Document/Attribute:contracts_list' => 'Verträge',
-	'Class:Document/Attribute:contracts_list+' => '',
-	'Class:Document/Attribute:services_list' => 'Services',
-	'Class:Document/Attribute:services_list+' => '',
-	'Class:Document/Attribute:finalclass' => 'Dokumenttyp',
-	'Class:Document/Attribute:finalclass+' => '',
-));
-
-//
-// Class: DocumentFile
-//
-
-Dict::Add('DE DE', 'German', 'Deutsch', array(
-	'Class:DocumentFile' => 'Dokument (Datei)',
-	'Class:DocumentFile+' => '',
-	'Class:DocumentFile/Attribute:file' => 'Datei',
-	'Class:DocumentFile/Attribute:file+' => '',
-));
-
-//
-// Class: DocumentNote
-//
-
-Dict::Add('DE DE', 'German', 'Deutsch', array(
-	'Class:DocumentNote' => 'Dokument (Notiz)',
-	'Class:DocumentNote+' => '',
-	'Class:DocumentNote/Attribute:text' => 'Text',
-	'Class:DocumentNote/Attribute:text+' => '',
-));
-
-//
-// Class: DocumentWeb
-//
-
-Dict::Add('DE DE', 'German', 'Deutsch', array(
-	'Class:DocumentWeb' => 'Dokument (Web)',
-	'Class:DocumentWeb+' => '',
-	'Class:DocumentWeb/Attribute:url' => 'URL',
-	'Class:DocumentWeb/Attribute:url+' => '',
-));
-
 //
 // Class: FunctionalCI
 //
@@ -1240,19 +1014,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkDocumentToLicence/Attribute:document_name+' => '',
 ));
 
-//
-// Class: Typology
-//
-
-Dict::Add('DE DE', 'German', 'Deutsch', array(
-	'Class:Typology' => 'Typologie',
-	'Class:Typology+' => '',
-	'Class:Typology/Attribute:name' => 'Name',
-	'Class:Typology/Attribute:name+' => '',
-	'Class:Typology/Attribute:finalclass' => 'Typ',
-	'Class:Typology/Attribute:finalclass+' => '',
-));
-
 //
 // Class: OSVersion
 //
@@ -1275,24 +1036,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:OSFamily+' => '',
 ));
 
-//
-// Class: DocumentType
-//
-
-Dict::Add('DE DE', 'German', 'Deutsch', array(
-	'Class:DocumentType' => 'Dokumentyp',
-	'Class:DocumentType+' => '',
-));
-
-//
-// Class: ContactType
-//
-
-Dict::Add('DE DE', 'German', 'Deutsch', array(
-	'Class:ContactType' => 'Kontakttyp',
-	'Class:ContactType+' => '',
-));
-
 //
 // Class: Brand
 //
@@ -1453,23 +1196,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkDocumentToSoftware/Attribute:document_name+' => '',
 ));
 
-//
-// Class: lnkContactToFunctionalCI
-//
-
-Dict::Add('DE DE', 'German', 'Deutsch', array(
-	'Class:lnkContactToFunctionalCI' => 'Verknüpfung Kontakt/FunctionalCI',
-	'Class:lnkContactToFunctionalCI+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'FunctionalCI',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'FunctionalCI-Name',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Kontakt',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Kontakt-Name',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
-));
-
 //
 // Class: lnkDocumentToFunctionalCI
 //
@@ -1716,26 +1442,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_name+' => '',
 ));
 
-//
-// Class: lnkPersonToTeam
-//
-
-Dict::Add('DE DE', 'German', 'Deutsch', array(
-	'Class:lnkPersonToTeam' => 'Verknüpfung Person/Team',
-	'Class:lnkPersonToTeam+' => '',
-	'Class:lnkPersonToTeam/Attribute:team_id' => 'Team',
-	'Class:lnkPersonToTeam/Attribute:team_id+' => '',
-	'Class:lnkPersonToTeam/Attribute:team_name' => 'Teamname',
-	'Class:lnkPersonToTeam/Attribute:team_name+' => '',
-	'Class:lnkPersonToTeam/Attribute:person_id' => 'Person',
-	'Class:lnkPersonToTeam/Attribute:person_id+' => '',
-	'Class:lnkPersonToTeam/Attribute:person_name' => 'Personenname',
-	'Class:lnkPersonToTeam/Attribute:person_name+' => '',
-	'Class:lnkPersonToTeam/Attribute:role_id' => 'Rolle',
-	'Class:lnkPersonToTeam/Attribute:role_id+' => '',
-	'Class:lnkPersonToTeam/Attribute:role_name' => 'Rollenname',
-	'Class:lnkPersonToTeam/Attribute:role_name+' => '',
-));
 
 //
 // Class: Group
@@ -1763,7 +1469,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Group/Attribute:type' => 'Typ',
 	'Class:Group/Attribute:type+' => '',
 	'Class:Group/Attribute:parent_id' => 'Muttergruppe',
-
 	'Class:Group/Attribute:parent_id+' => '',
 	'Class:Group/Attribute:parent_name' => 'Name',
 	'Class:Group/Attribute:parent_name+' => '',
@@ -1792,42 +1497,37 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkGroupToCI/Attribute:reason+' => '',
 ));
 
+//
+// Add translation for Fieldsets
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Server:baseinfo' => 'Allgemeine Informationen',
+	'Server:Date' => 'Datum',
+	'Server:moreinfo' => 'Weitere Informationen',
+	'Server:otherinfo' => 'Sonstige Informationen',
+	'Server:power' => 'Stromversorgung',
+	'Person:info' => 'Allgemeine Informationen',
+	'UserLocal:info' => 'Allgemeine Informationen',
+	'Person:personal_info' => 'Persönliche Informationen',
+	'Person:notifiy' => 'Benachrichtigungen',
+	'Class:Subnet/Tab:IPUsage' => 'IP-Nutzung',
+	'Class:Subnet/Tab:IPUsage-explain' => 'Interfaces mit einer IP in der Range: <em>%1$s</em> bis <em>%2$s</em>',
+	'Class:Subnet/Tab:FreeIPs' => 'Freie IPs',
+	'Class:Subnet/Tab:FreeIPs-count' => 'Freie IPs: %1$s',
+	'Class:Subnet/Tab:FreeIPs-explain' => 'Hier ist eine Aufstellung von 10 freien IP Adressen',
+	'Class:Document:PreviewTab' => 'Vorschau',
+));
 
 //
 // Application Menu
 //
 
 Dict::Add('DE DE', 'German', 'Deutsch', array(
-	'Menu:DataAdministration' => 'Data Management',
-	'Menu:DataAdministration+' => 'Data Management',
-	'Menu:Catalogs' => 'Kataloge',
-	'Menu:Catalogs+' => 'Datentypen',
-	'Menu:Audit' => 'Audit',
-	'Menu:Audit+' => 'Audit',
-	'Menu:CSVImport' => 'CSV-Import',
-	'Menu:CSVImport+' => 'Massenerstellung oder -aktualisierung',
-	'Menu:Organization' => 'Organisationen',
-	'Menu:Organization+' => 'Alle Organisationen',
 	'Menu:Application' => 'Anwendungen',
 	'Menu:Application+' => 'Alle Anwendungen',
 	'Menu:DBServer' => 'Datenbank-Server',
 	'Menu:DBServer+' => 'Datenbank-Server',
-	'Menu:ConfigManagement' => 'Configuration Management',
-	'Menu:ConfigManagement+' => 'Configuration Management',
-	'Menu:ConfigManagementOverview' => 'Übersicht',
-	'Menu:ConfigManagementOverview+' => 'Übersicht',
-	'Menu:Contact' => 'Kontakte',
-	'Menu:Contact+' => 'Kontakte',
-	'Menu:Contact:Count' => '%1$d Kontakte',
-	'Menu:Person' => 'Personen',
-	'Menu:Person+' => 'Alle Personen',
-	'Menu:Team' => 'Teams',
-	'Menu:Team+' => 'Alle Teams',
-	'Menu:Document' => 'Dokumente',
-	'Menu:Document+' => 'Alle Dokumente',
-	'Menu:Location' => 'Standorte',
-
-	'Menu:Location+' => 'Alle Standorte',
 	'Menu:ConfigManagementCI' => 'Configuration Items',
 	'Menu:ConfigManagementCI+' => 'Configuration Items',
 	'Menu:BusinessProcess' => 'Business-Prozesse',
@@ -1854,10 +1554,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Menu:MobilePhone+' => 'Alle Mobiltelefone',
 	'Menu:PC' => 'Rechner (PC)',
 	'Menu:PC+' => 'Alle Rechner (PC)',
-	'Menu:NewContact' => 'Neuer Kontakt',
-	'Menu:NewContact+' => 'Neuer Kontakt',
-	'Menu:SearchContacts' => 'Nach Kontakten suchen',
-	'Menu:SearchContacts+' => 'Nach Kontakten suchen',
 	'Menu:NewCI' => 'Neues CI',
 	'Menu:NewCI+' => 'Neues CI',
 	'Menu:SearchCIs' => 'Nach CIs suchen',
@@ -1870,36 +1566,8 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Menu:ConfigManagement:Misc' => 'Diverses',
 	'Menu:Group' => 'Gruppen von CIs',
 	'Menu:Group+' => 'Gruppen von CIs',
-	'Menu:ConfigManagement:Shortcuts' => 'Shortcuts',
-	'Menu:ConfigManagement:AllContacts' => 'Alle Kontakte: %1$d',
-	'Menu:Typology' => 'Typologie-Konfiguration',
-	'Menu:Typology+' => '',
 	'Menu:OSVersion' => 'OS-Versionen',
 	'Menu:OSVersion+' => '',
 	'Menu:Software' => 'Software-Katalog',
 	'Menu:Software+' => '',
-	'UI_WelcomeMenu_AllConfigItems' => 'Zusammenfassung',
-	'Menu:ConfigManagement:Typology' => 'Typologie-Konfiguration',
-
-));
-
-
-// Add translation for Fieldsets
-
-Dict::Add('DE DE', 'German', 'Deutsch', array(
-	'Server:baseinfo' => 'Allgemeine Informationen',
-	'Server:Date' => 'Datum',
-	'Server:moreinfo' => 'Weitere Informationen',
-	'Server:otherinfo' => 'Sonstige Informationen',
-	'Server:power' => 'Stromversorgung',
-	'Person:info' => 'Allgemeine Informationen',
-	'UserLocal:info' => 'Allgemeine Informationen',
-	'Person:personal_info' => 'Persönliche Informationen',
-	'Person:notifiy' => 'Benachrichtigungen',
-	'Class:Subnet/Tab:IPUsage' => 'IP-Nutzung',
-	'Class:Subnet/Tab:IPUsage-explain' => 'Interfaces mit einer IP in der Range: <em>%1$s</em> bis <em>%2$s</em>',
-	'Class:Subnet/Tab:FreeIPs' => 'Freie IPs',
-	'Class:Subnet/Tab:FreeIPs-count' => 'Freie IPs: %1$s',
-	'Class:Subnet/Tab:FreeIPs-explain' => 'Hier ist eine Aufstellung von 10 freien IP Adressen',
-	'Class:Document:PreviewTab' => 'Vorschau',
 ));
diff --git a/datamodels/2.x/itop-config-mgmt/en.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/en.dict.itop-config-mgmt.php
index b2e3139d6..1970354c1 100755
--- a/datamodels/2.x/itop-config-mgmt/en.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/en.dict.itop-config-mgmt.php
@@ -76,232 +76,6 @@ Dict::Add('EN US', 'English', 'English', array(
 //////////////////////////////////////////////////////////////////////
 //
 
-
-//
-// Class: Organization
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:Organization' => 'Organization',
-	'Class:Organization+' => '',
-	'Class:Organization/Attribute:name' => 'Name',
-	'Class:Organization/Attribute:name+' => 'Common name',
-	'Class:Organization/Attribute:code' => 'Code',
-	'Class:Organization/Attribute:code+' => 'Organization code (Siret, DUNS,...)',
-	'Class:Organization/Attribute:status' => 'Status',
-	'Class:Organization/Attribute:status+' => '',
-	'Class:Organization/Attribute:status/Value:active' => 'Active',
-	'Class:Organization/Attribute:status/Value:active+' => 'Active',
-	'Class:Organization/Attribute:status/Value:inactive' => 'Inactive',
-	'Class:Organization/Attribute:status/Value:inactive+' => 'Inactive',
-	'Class:Organization/Attribute:parent_id' => 'Parent',
-	'Class:Organization/Attribute:parent_id+' => 'Parent organization',
-	'Class:Organization/Attribute:parent_name' => 'Parent name',
-	'Class:Organization/Attribute:parent_name+' => 'Name of the parent organization',
-	'Class:Organization/Attribute:deliverymodel_id' => 'Delivery model',
-	'Class:Organization/Attribute:deliverymodel_id+' => '',
-	'Class:Organization/Attribute:deliverymodel_name' => 'Delivery model name',
-	'Class:Organization/Attribute:deliverymodel_name+' => '',
-	'Class:Organization/Attribute:parent_id_friendlyname' => 'Parent',
-	'Class:Organization/Attribute:parent_id_friendlyname+' => 'Parent organization',
-	'Class:Organization/Attribute:overview' => 'Overview',
-	'Organization:Overview:FunctionalCIs' => 'Configuration items of this organization',
-	'Organization:Overview:FunctionalCIs:subtitle' => 'by type',
-	'Organization:Overview:Users' => 'iTop Users within this organization',
-));
-
-//
-// Class: Location
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:Location' => 'Location',
-	'Class:Location+' => 'Any type of location: Region, Country, City, Site, Building, Floor, Room, Rack,...',
-	'Class:Location/Attribute:name' => 'Name',
-	'Class:Location/Attribute:name+' => '',
-	'Class:Location/Attribute:status' => 'Status',
-	'Class:Location/Attribute:status+' => '',
-	'Class:Location/Attribute:status/Value:active' => 'Active',
-	'Class:Location/Attribute:status/Value:active+' => 'Active',
-	'Class:Location/Attribute:status/Value:inactive' => 'Inactive',
-	'Class:Location/Attribute:status/Value:inactive+' => 'Inactive',
-	'Class:Location/Attribute:org_id' => 'Owner organization',
-	'Class:Location/Attribute:org_id+' => '',
-	'Class:Location/Attribute:org_name' => 'Name of the owner organization',
-	'Class:Location/Attribute:org_name+' => '',
-	'Class:Location/Attribute:address' => 'Address',
-	'Class:Location/Attribute:address+' => 'Postal address',
-	'Class:Location/Attribute:postal_code' => 'Postal code',
-	'Class:Location/Attribute:postal_code+' => 'ZIP/Postal code',
-	'Class:Location/Attribute:city' => 'City',
-	'Class:Location/Attribute:city+' => '',
-	'Class:Location/Attribute:country' => 'Country',
-	'Class:Location/Attribute:country+' => '',
-	'Class:Location/Attribute:physicaldevice_list' => 'Devices',
-	'Class:Location/Attribute:physicaldevice_list+' => 'All the devices in this location',
-	'Class:Location/Attribute:person_list' => 'Contacts',
-	'Class:Location/Attribute:person_list+' => 'All the contacts located on this location',
-));
-
-//
-// Class: Contact
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:Contact' => 'Contact',
-	'Class:Contact+' => '',
-	'Class:Contact/Attribute:name' => 'Name',
-	'Class:Contact/Attribute:name+' => '',
-	'Class:Contact/Attribute:status' => 'Status',
-	'Class:Contact/Attribute:status+' => '',
-	'Class:Contact/Attribute:status/Value:active' => 'Active',
-	'Class:Contact/Attribute:status/Value:active+' => 'Active',
-	'Class:Contact/Attribute:status/Value:inactive' => 'Inactive',
-	'Class:Contact/Attribute:status/Value:inactive+' => 'Inactive',
-	'Class:Contact/Attribute:org_id' => 'Organization',
-	'Class:Contact/Attribute:org_id+' => '',
-	'Class:Contact/Attribute:org_name' => 'Organization name',
-	'Class:Contact/Attribute:org_name+' => '',
-	'Class:Contact/Attribute:email' => 'Email',
-	'Class:Contact/Attribute:email+' => '',
-	'Class:Contact/Attribute:phone' => 'Phone',
-	'Class:Contact/Attribute:phone+' => '',
-	'Class:Contact/Attribute:notify' => 'Notification',
-	'Class:Contact/Attribute:notify+' => '',
-	'Class:Contact/Attribute:notify/Value:no' => 'no',
-	'Class:Contact/Attribute:notify/Value:no+' => 'no',
-	'Class:Contact/Attribute:notify/Value:yes' => 'yes',
-	'Class:Contact/Attribute:notify/Value:yes+' => 'yes',
-	'Class:Contact/Attribute:function' => 'Function',
-	'Class:Contact/Attribute:function+' => '',
-	'Class:Contact/Attribute:cis_list' => 'CIs',
-	'Class:Contact/Attribute:cis_list+' => 'All the configuration items linked to this contact',
-	'Class:Contact/Attribute:finalclass' => 'Contact sub-class',
-	'Class:Contact/Attribute:finalclass+' => 'Name of the final class',
-));
-
-//
-// Class: Person
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:Person' => 'Person',
-	'Class:Person+' => '',
-	'Class:Person/Attribute:name' => 'Last Name',
-	'Class:Person/Attribute:name+' => '',
-	'Class:Person/Attribute:first_name' => 'First Name',
-	'Class:Person/Attribute:first_name+' => '',
-	'Class:Person/Attribute:employee_number' => 'Employee number',
-	'Class:Person/Attribute:employee_number+' => '',
-	'Class:Person/Attribute:mobile_phone' => 'Mobile phone',
-	'Class:Person/Attribute:mobile_phone+' => '',
-	'Class:Person/Attribute:location_id' => 'Location',
-	'Class:Person/Attribute:location_id+' => '',
-	'Class:Person/Attribute:location_name' => 'Location name',
-	'Class:Person/Attribute:location_name+' => '',
-	'Class:Person/Attribute:manager_id' => 'Manager',
-	'Class:Person/Attribute:manager_id+' => '',
-	'Class:Person/Attribute:manager_name' => 'Manager name',
-	'Class:Person/Attribute:manager_name+' => '',
-	'Class:Person/Attribute:team_list' => 'Teams',
-	'Class:Person/Attribute:team_list+' => 'All the teams this person belongs to',
-	'Class:Person/Attribute:tickets_list' => 'Tickets',
-	'Class:Person/Attribute:tickets_list+' => 'All the tickets this person is the caller',
-	'Class:Person/Attribute:manager_id_friendlyname' => 'Manager friendly name',
-	'Class:Person/Attribute:manager_id_friendlyname+' => '',
-	'Class:Person/Attribute:picture' => 'Picture',
-	'Class:Person/Attribute:picture+' => '',
-	'Class:Person/UniquenessRule:employee_number+' => 'The employee number must be unique in the organization',
-	'Class:Person/UniquenessRule:employee_number' => 'there is already a person in \'$this->org_name$\' organization with the same employee number',
-	'Class:Person/UniquenessRule:name+' => 'The employee name should be unique inside its organization',
-	'Class:Person/UniquenessRule:name' => 'There is already a person in \'$this->org_name$\' organization with the same name',
-));
-
-//
-// Class: Team
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:Team' => 'Team',
-	'Class:Team+' => '',
-	'Class:Team/Attribute:persons_list' => 'Members',
-	'Class:Team/Attribute:persons_list+' => 'All the people belonging to this team',
-	'Class:Team/Attribute:tickets_list' => 'Tickets',
-	'Class:Team/Attribute:tickets_list+' => 'All the tickets assigned to this team',
-));
-
-//
-// Class: Document
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:Document' => 'Document',
-	'Class:Document+' => '',
-	'Class:Document/Attribute:name' => 'Name',
-	'Class:Document/Attribute:name+' => '',
-	'Class:Document/Attribute:org_id' => 'Organization',
-	'Class:Document/Attribute:org_id+' => '',
-	'Class:Document/Attribute:org_name' => 'Organization name',
-	'Class:Document/Attribute:org_name+' => '',
-	'Class:Document/Attribute:documenttype_id' => 'Document type',
-	'Class:Document/Attribute:documenttype_id+' => '',
-	'Class:Document/Attribute:documenttype_name' => 'Document type name',
-	'Class:Document/Attribute:documenttype_name+' => '',
-	'Class:Document/Attribute:version' => 'Version',
-	'Class:Document/Attribute:version+' => '',
-	'Class:Document/Attribute:description' => 'Description',
-	'Class:Document/Attribute:description+' => '',
-	'Class:Document/Attribute:status' => 'Status',
-	'Class:Document/Attribute:status+' => '',
-	'Class:Document/Attribute:status/Value:draft' => 'Draft',
-	'Class:Document/Attribute:status/Value:draft+' => '',
-	'Class:Document/Attribute:status/Value:obsolete' => 'Obsolete',
-	'Class:Document/Attribute:status/Value:obsolete+' => '',
-	'Class:Document/Attribute:status/Value:published' => 'Published',
-	'Class:Document/Attribute:status/Value:published+' => '',
-	'Class:Document/Attribute:cis_list' => 'CIs',
-	'Class:Document/Attribute:cis_list+' => 'All the configuration items linked to this document',
-	'Class:Document/Attribute:contracts_list' => 'Contracts',
-	'Class:Document/Attribute:contracts_list+' => 'All the contracts linked to this document',
-	'Class:Document/Attribute:services_list' => 'Services',
-	'Class:Document/Attribute:services_list+' => 'All the services linked to this document',
-	'Class:Document/Attribute:finalclass' => 'Document sub-class',
-	'Class:Document/Attribute:finalclass+' => 'Name of the final class',
-));
-
-//
-// Class: DocumentFile
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:DocumentFile' => 'Document File',
-	'Class:DocumentFile+' => '',
-	'Class:DocumentFile/Attribute:file' => 'File',
-	'Class:DocumentFile/Attribute:file+' => '',
-));
-
-//
-// Class: DocumentNote
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:DocumentNote' => 'Document Note',
-	'Class:DocumentNote+' => '',
-	'Class:DocumentNote/Attribute:text' => 'Text',
-	'Class:DocumentNote/Attribute:text+' => '',
-));
-
-//
-// Class: DocumentWeb
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:DocumentWeb' => 'Document Web',
-	'Class:DocumentWeb+' => '',
-	'Class:DocumentWeb/Attribute:url' => 'URL',
-	'Class:DocumentWeb/Attribute:url+' => '',
-));
-
 //
 // Class: FunctionalCI
 //
@@ -1244,19 +1018,6 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:lnkDocumentToLicence/Attribute:document_name+' => '',
 ));
 
-//
-// Class: Typology
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:Typology' => 'Typology',
-	'Class:Typology+' => '',
-	'Class:Typology/Attribute:name' => 'Name',
-	'Class:Typology/Attribute:name+' => '',
-	'Class:Typology/Attribute:finalclass' => 'Typology sub-class',
-	'Class:Typology/Attribute:finalclass+' => 'Name of the final class',
-));
-
 //
 // Class: OSVersion
 //
@@ -1279,24 +1040,6 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:OSFamily+' => '',
 ));
 
-//
-// Class: DocumentType
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:DocumentType' => 'Document Type',
-	'Class:DocumentType+' => '',
-));
-
-//
-// Class: ContactType
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:ContactType' => 'Contact Type',
-	'Class:ContactType+' => '',
-));
-
 //
 // Class: Brand
 //
@@ -1457,40 +1200,6 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:lnkDocumentToSoftware/Attribute:document_name+' => '',
 ));
 
-//
-// Class: lnkContactToFunctionalCI
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:lnkContactToFunctionalCI' => 'Link Contact / FunctionalCI',
-	'Class:lnkContactToFunctionalCI+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Functionalci',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contact',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Contact name',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
-));
-
-//
-// Class: lnkDocumentToFunctionalCI
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:lnkDocumentToFunctionalCI' => 'Link Document / FunctionalCI',
-	'Class:lnkDocumentToFunctionalCI+' => '',
-	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id' => 'Functionalci',
-	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id+' => '',
-	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name',
-	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name+' => '',
-	'Class:lnkDocumentToFunctionalCI/Attribute:document_id' => 'Document',
-	'Class:lnkDocumentToFunctionalCI/Attribute:document_id+' => '',
-	'Class:lnkDocumentToFunctionalCI/Attribute:document_name' => 'Document name',
-	'Class:lnkDocumentToFunctionalCI/Attribute:document_name+' => '',
-));
-
 //
 // Class: Subnet
 //
@@ -1720,27 +1429,6 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_name+' => '',
 ));
 
-//
-// Class: lnkPersonToTeam
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:lnkPersonToTeam' => 'Link Person / Team',
-	'Class:lnkPersonToTeam+' => '',
-	'Class:lnkPersonToTeam/Attribute:team_id' => 'Team',
-	'Class:lnkPersonToTeam/Attribute:team_id+' => '',
-	'Class:lnkPersonToTeam/Attribute:team_name' => 'Team name',
-	'Class:lnkPersonToTeam/Attribute:team_name+' => '',
-	'Class:lnkPersonToTeam/Attribute:person_id' => 'Person',
-	'Class:lnkPersonToTeam/Attribute:person_id+' => '',
-	'Class:lnkPersonToTeam/Attribute:person_name' => 'Person name',
-	'Class:lnkPersonToTeam/Attribute:person_name+' => '',
-	'Class:lnkPersonToTeam/Attribute:role_id' => 'Role',
-	'Class:lnkPersonToTeam/Attribute:role_id+' => '',
-	'Class:lnkPersonToTeam/Attribute:role_name' => 'Role name',
-	'Class:lnkPersonToTeam/Attribute:role_name+' => '',
-));
-
 //
 // Class: Group
 //
@@ -1796,42 +1484,53 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:lnkGroupToCI/Attribute:reason+' => '',
 ));
 
+// Add translation for Fieldsets
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Server:baseinfo' => 'General information',
+	'Server:Date' => 'Dates',
+	'Server:moreinfo' => 'More information',
+	'Server:otherinfo' => 'Other information',
+	'Server:power' => 'Power supply',
+	'Person:info' => 'General information',
+	'UserLocal:info' => 'General information',
+	'Person:personal_info' => 'Personal information',
+	'Person:notifiy' => 'Notification',
+	'Class:Subnet/Tab:IPUsage' => 'IP Usage',
+	'Class:Subnet/Tab:IPUsage-explain' => 'Interfaces having an IP in the range: <em>%1$s</em> to <em>%2$s</em>',
+	'Class:Subnet/Tab:FreeIPs' => 'Free IPs',
+	'Class:Subnet/Tab:FreeIPs-count' => 'Free IPs: %1$s',
+	'Class:Subnet/Tab:FreeIPs-explain' => 'Here is an extract of 10 free IP addresses',
+	'Class:Document:PreviewTab' => 'Preview',
+));
+
+
+//
+// Class: lnkDocumentToFunctionalCI
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:lnkDocumentToFunctionalCI' => 'Link Document / FunctionalCI',
+	'Class:lnkDocumentToFunctionalCI+' => '',
+	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id' => 'Functionalci',
+	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name',
+	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name+' => '',
+	'Class:lnkDocumentToFunctionalCI/Attribute:document_id' => 'Document',
+	'Class:lnkDocumentToFunctionalCI/Attribute:document_id+' => '',
+	'Class:lnkDocumentToFunctionalCI/Attribute:document_name' => 'Document name',
+	'Class:lnkDocumentToFunctionalCI/Attribute:document_name+' => '',
+));
 
 //
 // Application Menu
 //
 
 Dict::Add('EN US', 'English', 'English', array(
-	'Menu:DataAdministration' => 'Data administration',
-	'Menu:DataAdministration+' => 'Data administration',
-	'Menu:Catalogs' => 'Catalogs',
-	'Menu:Catalogs+' => 'Data types',
-	'Menu:Audit' => 'Audit',
-	'Menu:Audit+' => 'Audit',
-	'Menu:CSVImport' => 'CSV import',
-	'Menu:CSVImport+' => 'Bulk creation or update',
-	'Menu:Organization' => 'Organizations',
-	'Menu:Organization+' => 'All organizations',
 	'Menu:Application' => 'Applications',
 	'Menu:Application+' => 'All applications',
 	'Menu:DBServer' => 'Database servers',
 	'Menu:DBServer+' => 'Database servers',
-	'Menu:ConfigManagement' => 'Configuration Management',
-	'Menu:ConfigManagement+' => 'Configuration Management',
-	'Menu:ConfigManagementOverview' => 'Overview',
-	'Menu:ConfigManagementOverview+' => 'Overview',
-	'Menu:Contact' => 'Contacts',
-	'Menu:Contact+' => 'Contacts',
-	'Menu:Contact:Count' => '%1$d contacts',
-	'Menu:Person' => 'Persons',
-	'Menu:Person+' => 'All persons',
-	'Menu:Team' => 'Teams',
-	'Menu:Team+' => 'All teams',
-	'Menu:Document' => 'Documents',
-	'Menu:Document+' => 'All documents',
-	'Menu:Location' => 'Locations',
-
-	'Menu:Location+' => 'All locations',
 	'Menu:ConfigManagementCI' => 'Configuration items',
 	'Menu:ConfigManagementCI+' => 'Configuration items',
 	'Menu:BusinessProcess' => 'Business processes',
@@ -1858,10 +1557,6 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Menu:MobilePhone+' => 'All mobile phones',
 	'Menu:PC' => 'Personal computers',
 	'Menu:PC+' => 'All Personal computers',
-	'Menu:NewContact' => 'New contact',
-	'Menu:NewContact+' => 'New contact',
-	'Menu:SearchContacts' => 'Search for contacts',
-	'Menu:SearchContacts+' => 'Search for contacts',
 	'Menu:NewCI' => 'New CI',
 	'Menu:NewCI+' => 'New CI',
 	'Menu:SearchCIs' => 'Search for CIs',
@@ -1874,36 +1569,9 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Menu:ConfigManagement:Misc' => 'Miscellaneous',
 	'Menu:Group' => 'Groups of CIs',
 	'Menu:Group+' => 'Groups of CIs',
-	'Menu:ConfigManagement:Shortcuts' => 'Shortcuts',
-	'Menu:ConfigManagement:AllContacts' => 'All contacts: %1$d',
-	'Menu:Typology' => 'Typology configuration',
-	'Menu:Typology+' => 'Typology configuration',
 	'Menu:OSVersion' => 'OS versions',
 	'Menu:OSVersion+' => '',
 	'Menu:Software' => 'Software catalog',
 	'Menu:Software+' => 'Software catalog',
-	'UI_WelcomeMenu_AllConfigItems' => 'Summary',
-	'Menu:ConfigManagement:Typology' => 'Typology configuration',
-
-));
-
-
-// Add translation for Fieldsets
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Server:baseinfo' => 'General information',
-	'Server:Date' => 'Dates',
-	'Server:moreinfo' => 'More information',
-	'Server:otherinfo' => 'Other information',
-	'Server:power' => 'Power supply',
-	'Person:info' => 'General information',
-	'UserLocal:info' => 'General information',
-	'Person:personal_info' => 'Personal information',
-	'Person:notifiy' => 'Notification',
-	'Class:Subnet/Tab:IPUsage' => 'IP Usage',
-	'Class:Subnet/Tab:IPUsage-explain' => 'Interfaces having an IP in the range: <em>%1$s</em> to <em>%2$s</em>',
-	'Class:Subnet/Tab:FreeIPs' => 'Free IPs',
-	'Class:Subnet/Tab:FreeIPs-count' => 'Free IPs: %1$s',
-	'Class:Subnet/Tab:FreeIPs-explain' => 'Here is an extract of 10 free IP addresses',
-	'Class:Document:PreviewTab' => 'Preview',
 ));
+?>
diff --git a/datamodels/2.x/itop-config-mgmt/es_cr.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/es_cr.dict.itop-config-mgmt.php
index c08857361..26e080246 100755
--- a/datamodels/2.x/itop-config-mgmt/es_cr.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/es_cr.dict.itop-config-mgmt.php
@@ -76,232 +76,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 //////////////////////////////////////////////////////////////////////
 //
 
-
-//
-// Class: Organization
-//
-
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
-	'Class:Organization' => 'Organización',
-	'Class:Organization+' => 'Organización',
-	'Class:Organization/Attribute:name' => 'Nombre',
-	'Class:Organization/Attribute:name+' => 'Nombre de la Organización',
-	'Class:Organization/Attribute:code' => 'Código',
-	'Class:Organization/Attribute:code+' => 'Código de Organización  (RFC, DUNS, Siret, etc.)',
-	'Class:Organization/Attribute:status' => 'Estatus',
-	'Class:Organization/Attribute:status+' => 'Estatus',
-	'Class:Organization/Attribute:status/Value:active' => 'Activo',
-	'Class:Organization/Attribute:status/Value:active+' => 'Activo',
-	'Class:Organization/Attribute:status/Value:inactive' => 'Inactivo',
-	'Class:Organization/Attribute:status/Value:inactive+' => 'Inactivo',
-	'Class:Organization/Attribute:parent_id' => 'Padre',
-	'Class:Organization/Attribute:parent_id+' => 'Organización Padre',
-	'Class:Organization/Attribute:parent_name' => 'Organización Padre',
-	'Class:Organization/Attribute:parent_name+' => 'Nombre de la Organización Padre',
-	'Class:Organization/Attribute:deliverymodel_id' => 'Modelo de Entrega',
-	'Class:Organization/Attribute:deliverymodel_id+' => 'Modelo de Entrega',
-	'Class:Organization/Attribute:deliverymodel_name' => 'Nombre del Modelo de Entrega',
-	'Class:Organization/Attribute:deliverymodel_name+' => 'Nombre del Modelo de Entrega',
-	'Class:Organization/Attribute:parent_id_friendlyname' => 'Organización Padre',
-	'Class:Organization/Attribute:parent_id_friendlyname+' => 'Organización Padre',
-	'Class:Organization/Attribute:overview' => 'Overview~~',
-	'Organization:Overview:FunctionalCIs' => 'Configuration items of this organization~~',
-	'Organization:Overview:FunctionalCIs:subtitle' => 'by type~~',
-	'Organization:Overview:Users' => 'iTop Users within this organization~~',
-));
-
-//
-// Class: Location
-//
-
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
-	'Class:Location' => 'Localidad',
-	'Class:Location+' => 'Cualquier Tipo de Localidad: Región, País, Ciudad, Sitio, Edificio, Piso, Cuarto, Rack,...',
-	'Class:Location/Attribute:name' => 'Nombre',
-	'Class:Location/Attribute:name+' => 'Nombre de Localidad',
-	'Class:Location/Attribute:status' => 'Estatus',
-	'Class:Location/Attribute:status+' => 'Estatus de Localidad',
-	'Class:Location/Attribute:status/Value:active' => 'Activo',
-	'Class:Location/Attribute:status/Value:active+' => 'Activo',
-	'Class:Location/Attribute:status/Value:inactive' => 'Inactivo',
-	'Class:Location/Attribute:status/Value:inactive+' => 'Inactivo',
-	'Class:Location/Attribute:org_id' => 'Organización',
-	'Class:Location/Attribute:org_id+' => 'Organización',
-	'Class:Location/Attribute:org_name' => 'Nombre de la Organización',
-	'Class:Location/Attribute:org_name+' => 'Nombre de la Organización',
-	'Class:Location/Attribute:address' => 'Dirección',
-	'Class:Location/Attribute:address+' => 'Dirección Postal',
-	'Class:Location/Attribute:postal_code' => 'Código Postal',
-	'Class:Location/Attribute:postal_code+' => 'ZIP/Código Postal',
-	'Class:Location/Attribute:city' => 'Ciudad',
-	'Class:Location/Attribute:city+' => 'Ciudad',
-	'Class:Location/Attribute:country' => 'País',
-	'Class:Location/Attribute:country+' => 'País',
-	'Class:Location/Attribute:physicaldevice_list' => 'Dispositivos',
-	'Class:Location/Attribute:physicaldevice_list+' => 'Dispositivos',
-	'Class:Location/Attribute:person_list' => 'Contactos',
-	'Class:Location/Attribute:person_list+' => 'Contactos',
-));
-
-//
-// Class: Contact
-//
-
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
-	'Class:Contact' => 'Contacto',
-	'Class:Contact+' => 'Contacto',
-	'Class:Contact/Attribute:name' => 'Nombre',
-	'Class:Contact/Attribute:name+' => 'Nombre del Contacto',
-	'Class:Contact/Attribute:status' => 'Estatus',
-	'Class:Contact/Attribute:status+' => 'Estatus',
-	'Class:Contact/Attribute:status/Value:active' => 'Activo',
-	'Class:Contact/Attribute:status/Value:active+' => 'Activo',
-	'Class:Contact/Attribute:status/Value:inactive' => 'Inactivo',
-	'Class:Contact/Attribute:status/Value:inactive+' => 'Inactivo',
-	'Class:Contact/Attribute:org_id' => 'Organización',
-	'Class:Contact/Attribute:org_id+' => 'Organización',
-	'Class:Contact/Attribute:org_name' => 'Organización',
-	'Class:Contact/Attribute:org_name+' => 'Organización',
-	'Class:Contact/Attribute:email' => 'Correo Electrónico',
-	'Class:Contact/Attribute:email+' => 'Correo Electrónico',
-	'Class:Contact/Attribute:phone' => 'Teléfono',
-	'Class:Contact/Attribute:phone+' => 'Teléfono',
-	'Class:Contact/Attribute:notify' => 'Notificación',
-	'Class:Contact/Attribute:notify+' => 'Notificación',
-	'Class:Contact/Attribute:notify/Value:no' => 'No',
-	'Class:Contact/Attribute:notify/Value:no+' => 'No',
-	'Class:Contact/Attribute:notify/Value:yes' => 'Si',
-	'Class:Contact/Attribute:notify/Value:yes+' => 'Si',
-	'Class:Contact/Attribute:function' => 'Función',
-	'Class:Contact/Attribute:function+' => 'Función',
-	'Class:Contact/Attribute:cis_list' => 'ECs',
-	'Class:Contact/Attribute:cis_list+' => 'Elementos de Configuración relacionados con el contacto',
-	'Class:Contact/Attribute:finalclass' => 'Clase',
-	'Class:Contact/Attribute:finalclass+' => 'Clase',
-));
-
-//
-// Class: Person
-//
-
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
-	'Class:Person' => 'Persona',
-	'Class:Person+' => 'Persona',
-	'Class:Person/Attribute:name' => 'Apellidos',
-	'Class:Person/Attribute:name+' => 'Apellidos',
-	'Class:Person/Attribute:first_name' => 'Nombre',
-	'Class:Person/Attribute:first_name+' => 'Nombre de la Persona',
-	'Class:Person/Attribute:employee_number' => 'Número de Empleado',
-	'Class:Person/Attribute:employee_number+' => 'Número de Empleado',
-	'Class:Person/Attribute:mobile_phone' => 'Móvil',
-	'Class:Person/Attribute:mobile_phone+' => 'Móvil',
-	'Class:Person/Attribute:location_id' => 'Localidad',
-	'Class:Person/Attribute:location_id+' => 'Localidad',
-	'Class:Person/Attribute:location_name' => 'Nombre de Localidad',
-	'Class:Person/Attribute:location_name+' => 'Nombre de Localidad',
-	'Class:Person/Attribute:manager_id' => 'Jefe',
-	'Class:Person/Attribute:manager_id+' => 'Jefe',
-	'Class:Person/Attribute:manager_name' => 'Nombre del Jefe',
-	'Class:Person/Attribute:manager_name+' => 'Nombre del Jefe',
-	'Class:Person/Attribute:team_list' => 'Grupos',
-	'Class:Person/Attribute:team_list+' => 'Grupos',
-	'Class:Person/Attribute:tickets_list' => 'Tickets',
-	'Class:Person/Attribute:tickets_list+' => 'Tickets',
-	'Class:Person/Attribute:manager_id_friendlyname' => 'Nombre del Jefe',
-	'Class:Person/Attribute:manager_id_friendlyname+' => 'Nombre del Jefe',
-	'Class:Person/Attribute:picture' => 'Fotografía',
-	'Class:Person/Attribute:picture+' => 'Fotografía',
-	'Class:Person/UniquenessRule:employee_number+' => 'The employee number must be unique in the organization~~',
-	'Class:Person/UniquenessRule:employee_number' => 'there is already a person in \'$this->org_name$\' organization with the same employee number~~',
-	'Class:Person/UniquenessRule:name+' => 'The employee name should be unique inside its organization~~',
-	'Class:Person/UniquenessRule:name' => 'There is already a person in \'$this->org_name$\' organization with the same name~~',
-));
-
-//
-// Class: Team
-//
-
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
-	'Class:Team' => 'Grupo de Trabajo',
-	'Class:Team+' => 'Grupo de Trabajo',
-	'Class:Team/Attribute:persons_list' => 'Miembros',
-	'Class:Team/Attribute:persons_list+' => 'Miembros',
-	'Class:Team/Attribute:tickets_list' => 'Tickets',
-	'Class:Team/Attribute:tickets_list+' => 'Tickets',
-));
-
-//
-// Class: Document
-//
-
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
-	'Class:Document' => 'Documento',
-	'Class:Document+' => 'Documento',
-	'Class:Document/Attribute:name' => 'Nombre',
-	'Class:Document/Attribute:name+' => 'Nombre del Documento',
-	'Class:Document/Attribute:org_id' => 'Organización',
-	'Class:Document/Attribute:org_id+' => 'Organización',
-	'Class:Document/Attribute:org_name' => 'Nombre de la Organización',
-	'Class:Document/Attribute:org_name+' => 'Nombre de la Organización',
-	'Class:Document/Attribute:documenttype_id' => 'Tipo de Documento',
-	'Class:Document/Attribute:documenttype_id+' => 'Tipo de Documento',
-	'Class:Document/Attribute:documenttype_name' => 'Tipo de Documento',
-	'Class:Document/Attribute:documenttype_name+' => 'Tipo de Documento',
-	'Class:Document/Attribute:version' => 'Versión',
-	'Class:Document/Attribute:version+' => 'Versión',
-	'Class:Document/Attribute:description' => 'Descripción',
-	'Class:Document/Attribute:description+' => 'Descripción',
-	'Class:Document/Attribute:status' => 'Estatus',
-	'Class:Document/Attribute:status+' => 'Estatus',
-	'Class:Document/Attribute:status/Value:draft' => 'Borrador de Documento',
-	'Class:Document/Attribute:status/Value:draft+' => 'Borrador de Documento',
-	'Class:Document/Attribute:status/Value:obsolete' => 'Obsoleto',
-	'Class:Document/Attribute:status/Value:obsolete+' => 'Obsoleto',
-	'Class:Document/Attribute:status/Value:published' => 'Publicado',
-	'Class:Document/Attribute:status/Value:published+' => 'Publicado',
-	'Class:Document/Attribute:cis_list' => 'ECs',
-	'Class:Document/Attribute:cis_list+' => 'Elementos de Configuración referenciados en este documento',
-	'Class:Document/Attribute:contracts_list' => 'Contratos',
-	'Class:Document/Attribute:contracts_list+' => 'Contratos Referenciados con este Documento',
-	'Class:Document/Attribute:services_list' => 'Servicios',
-	'Class:Document/Attribute:services_list+' => 'Servicios Referenciados con este Documento',
-	'Class:Document/Attribute:finalclass' => 'Tipo de Documento',
-	'Class:Document/Attribute:finalclass+' => 'Tipo de Documento',
-));
-
-//
-// Class: DocumentFile
-//
-
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
-	'Class:DocumentFile' => 'Documento de Archivo',
-	'Class:DocumentFile+' => '~~',
-	'Class:DocumentFile/Attribute:file' => 'Archivo',
-	'Class:DocumentFile/Attribute:file+' => 'Archivo',
-));
-
-//
-// Class: DocumentNote
-//
-
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
-	'Class:DocumentNote' => 'Nota',
-	'Class:DocumentNote+' => 'Nota',
-	'Class:DocumentNote/Attribute:text' => 'Texto',
-	'Class:DocumentNote/Attribute:text+' => 'Texto',
-));
-
-//
-// Class: DocumentWeb
-//
-
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
-	'Class:DocumentWeb' => 'Documento Web',
-	'Class:DocumentWeb+' => 'Documento disponible en otro servidor Web',
-	'Class:DocumentWeb/Attribute:url' => 'URL',
-	'Class:DocumentWeb/Attribute:url+' => 'URL de Internet',
-));
-
 //
 // Class: FunctionalCI
 //
@@ -1244,19 +1018,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'Class:lnkDocumentToLicence/Attribute:document_name+' => 'Documento',
 ));
 
-//
-// Class: Typology
-//
-
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
-	'Class:Typology' => 'Tipología',
-	'Class:Typology+' => 'Tipología',
-	'Class:Typology/Attribute:name' => 'Nombre',
-	'Class:Typology/Attribute:name+' => 'Nombre del Tipo',
-	'Class:Typology/Attribute:finalclass' => 'Clase',
-	'Class:Typology/Attribute:finalclass+' => 'Clase',
-));
-
 //
 // Class: OSVersion
 //
@@ -1279,24 +1040,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'Class:OSFamily+' => 'Familia de SO',
 ));
 
-//
-// Class: DocumentType
-//
-
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
-	'Class:DocumentType' => 'Tipo de Documento',
-	'Class:DocumentType+' => 'Tipo de Documento',
-));
-
-//
-// Class: ContactType
-//
-
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
-	'Class:ContactType' => 'Tipo de Contacto',
-	'Class:ContactType+' => 'Tipo de Contacto',
-));
-
 //
 // Class: Brand
 //
@@ -1457,23 +1200,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'Class:lnkDocumentToSoftware/Attribute:document_name+' => 'Documento',
 ));
 
-//
-// Class: lnkContactToFunctionalCI
-//
-
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
-	'Class:lnkContactToFunctionalCI' => 'Relación Contacto y  EC Funcional',
-	'Class:lnkContactToFunctionalCI+' => 'Relación Contacto y  EC Funcional',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'EC Funcional',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => 'EC Funcional',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'EC Funcional',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => 'EC Funcional',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contacto',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => 'Contacto',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Contacto',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => 'Contacto',
-));
-
 //
 // Class: lnkDocumentToFunctionalCI
 //
@@ -1576,8 +1302,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'Class:IPInterface+' => 'Interfaz IP',
 	'Class:IPInterface/Attribute:ipaddress' => 'Dirección IP',
 	'Class:IPInterface/Attribute:ipaddress+' => 'Dirección IP',
-
-
 	'Class:IPInterface/Attribute:macaddress' => 'Dirección MAC',
 	'Class:IPInterface/Attribute:macaddress+' => 'Dirección MAC',
 	'Class:IPInterface/Attribute:comment' => 'Comentario',
@@ -1720,26 +1444,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_name+' => 'Solución Aplicativa',
 ));
 
-//
-// Class: lnkPersonToTeam
-//
-
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
-	'Class:lnkPersonToTeam' => 'Relación Persona y Grupo',
-	'Class:lnkPersonToTeam+' => 'Relación Persona y Grupo',
-	'Class:lnkPersonToTeam/Attribute:team_id' => 'Grupo',
-	'Class:lnkPersonToTeam/Attribute:team_id+' => 'Grupo',
-	'Class:lnkPersonToTeam/Attribute:team_name' => 'Grupo',
-	'Class:lnkPersonToTeam/Attribute:team_name+' => 'Grupo',
-	'Class:lnkPersonToTeam/Attribute:person_id' => 'Persona',
-	'Class:lnkPersonToTeam/Attribute:person_id+' => 'Persona',
-	'Class:lnkPersonToTeam/Attribute:person_name' => 'Persona',
-	'Class:lnkPersonToTeam/Attribute:person_name+' => 'Persona',
-	'Class:lnkPersonToTeam/Attribute:role_id' => 'Rol',
-	'Class:lnkPersonToTeam/Attribute:role_id+' => 'Rol',
-	'Class:lnkPersonToTeam/Attribute:role_name' => 'Rol',
-	'Class:lnkPersonToTeam/Attribute:role_name+' => 'Rol',
-));
 
 //
 // Class: Group
@@ -1767,7 +1471,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'Class:Group/Attribute:type' => 'Tipo',
 	'Class:Group/Attribute:type+' => 'Tipo',
 	'Class:Group/Attribute:parent_id' => 'Grupo Padre',
-
 	'Class:Group/Attribute:parent_id+' => 'Grupo Padre',
 	'Class:Group/Attribute:parent_name' => 'Grupo Padre',
 	'Class:Group/Attribute:parent_name+' => 'Grupo Padre',
@@ -1796,42 +1499,37 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'Class:lnkGroupToCI/Attribute:reason+' => 'Motivo',
 ));
 
+//
+// Add translation for Fieldsets
+//
+
+Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+	'Server:baseinfo' => 'Información General',
+	'Server:Date' => 'Fecha',
+	'Server:moreinfo' => 'Más Información',
+	'Server:otherinfo' => 'Otra Información',
+	'Server:power' => 'Fuente de Poder',
+	'Person:info' => 'Información General',
+	'UserLocal:info' => 'Información General',
+	'Person:personal_info' => 'Información Personal',
+	'Person:notifiy' => 'Notificación',
+	'Class:Subnet/Tab:IPUsage' => 'Uso de IP',
+	'Class:Subnet/Tab:IPUsage-explain' => 'Interfases con IP en el rango: <em>%1$s</em> a <em>%2$s</em>',
+	'Class:Subnet/Tab:FreeIPs' => 'IPs Libres',
+	'Class:Subnet/Tab:FreeIPs-count' => 'IPs Libres: %1$s',
+	'Class:Subnet/Tab:FreeIPs-explain' => 'Aquí está un extracto de 10 direcciones IP Libres',
+	'Class:Document:PreviewTab' => 'Vista Previa',
+));
 
 //
 // Application Menu
 //
 
 Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
-	'Menu:DataAdministration' => 'Administración de Datos',
-	'Menu:DataAdministration+' => 'Administración de Datos',
-	'Menu:Catalogs' => 'Catálogos',
-	'Menu:Catalogs+' => 'Tipos de Datos',
-	'Menu:Audit' => 'Auditoría',
-	'Menu:Audit+' => 'Auditoría',
-	'Menu:CSVImport' => 'Importar CSV',
-	'Menu:CSVImport+' => 'Creación o Actualización Másiva',
-	'Menu:Organization' => 'Organizaciones',
-	'Menu:Organization+' => 'Organizaciones',
 	'Menu:Application' => 'Aplicaciones',
 	'Menu:Application+' => 'Aplicaciones/Programas',
 	'Menu:DBServer' => 'Servidores de Base de Datos',
 	'Menu:DBServer+' => 'Servidores de Base de Datos',
-	'Menu:ConfigManagement' => 'Administración de la Configuración',
-	'Menu:ConfigManagement+' => 'Administración de la Configuración',
-	'Menu:ConfigManagementOverview' => 'Resumen de Infraestructura',
-	'Menu:ConfigManagementOverview+' => 'Resumen de Infraestructura',
-	'Menu:Contact' => 'Contactos',
-	'Menu:Contact+' => 'Contactos',
-	'Menu:Contact:Count' => '%1$d Contactos',
-	'Menu:Person' => 'Personas',
-	'Menu:Person+' => 'Personas',
-	'Menu:Team' => 'Grupos',
-	'Menu:Team+' => 'Grupos de Trabajo',
-	'Menu:Document' => 'Documentos',
-	'Menu:Document+' => 'Documentos',
-	'Menu:Location' => 'Localidades',
-
-	'Menu:Location+' => 'Localidades',
 	'Menu:ConfigManagementCI' => 'Elementos de Configuración',
 	'Menu:ConfigManagementCI+' => 'Elementos de Confirguración',
 	'Menu:BusinessProcess' => 'Proceso de Negocio',
@@ -1858,10 +1556,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'Menu:MobilePhone+' => 'Teléfonos Móviles',
 	'Menu:PC' => 'PCs y Laptops',
 	'Menu:PC+' => 'PCs y Laptops',
-	'Menu:NewContact' => 'Nuevo Contacto',
-	'Menu:NewContact+' => 'Nuevo Contacto',
-	'Menu:SearchContacts' => 'Búsqueda de Contactos',
-	'Menu:SearchContacts+' => 'Búsqueda de Contactos',
 	'Menu:NewCI' => 'Nuevo EC',
 	'Menu:NewCI+' => 'Nuevo EC',
 	'Menu:SearchCIs' => 'Búsqueda de ECs',
@@ -1874,36 +1568,8 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'Menu:ConfigManagement:Misc' => 'Misceláneo',
 	'Menu:Group' => 'Grupos de ECs',
 	'Menu:Group+' => 'Grupos de ECs',
-	'Menu:ConfigManagement:Shortcuts' => 'Acceso Rápido',
-	'Menu:ConfigManagement:AllContacts' => 'Contactos: %1$d',
-	'Menu:Typology' => 'Configuración de Tipos',
-	'Menu:Typology+' => 'Configuración de Tipos',
 	'Menu:OSVersion' => 'OS versions~~',
 	'Menu:OSVersion+' => '~~',
 	'Menu:Software' => 'Catálogo de Software',
 	'Menu:Software+' => 'Catálogo de Software',
-	'UI_WelcomeMenu_AllConfigItems' => 'Resumen',
-	'Menu:ConfigManagement:Typology' => 'Configuración de Tipos',
-
-));
-
-
-// Add translation for Fieldsets
-
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
-	'Server:baseinfo' => 'Información General',
-	'Server:Date' => 'Fecha',
-	'Server:moreinfo' => 'Más Información',
-	'Server:otherinfo' => 'Otra Información',
-	'Server:power' => 'Fuente de Poder',
-	'Person:info' => 'Información General',
-	'UserLocal:info' => 'Información General',
-	'Person:personal_info' => 'Información Personal',
-	'Person:notifiy' => 'Notificación',
-	'Class:Subnet/Tab:IPUsage' => 'Uso de IP',
-	'Class:Subnet/Tab:IPUsage-explain' => 'Interfases con IP en el rango: <em>%1$s</em> a <em>%2$s</em>',
-	'Class:Subnet/Tab:FreeIPs' => 'IPs Libres',
-	'Class:Subnet/Tab:FreeIPs-count' => 'IPs Libres: %1$s',
-	'Class:Subnet/Tab:FreeIPs-explain' => 'Aquí está un extracto de 10 direcciones IP Libres',
-	'Class:Document:PreviewTab' => 'Vista Previa',
-));
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-config-mgmt/fr.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/fr.dict.itop-config-mgmt.php
index 60d9bb67e..f371005e8 100755
--- a/datamodels/2.x/itop-config-mgmt/fr.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/fr.dict.itop-config-mgmt.php
@@ -72,233 +72,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 //////////////////////////////////////////////////////////////////////
 //
 
-
-//
-// Class: Organization
-//
-
-Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:Organization' => 'Organisation',
-	'Class:Organization+' => '',
-	'Class:Organization/Attribute:name' => 'Nom organisation',
-	'Class:Organization/Attribute:name+' => 'Nom commun',
-	'Class:Organization/Attribute:code' => 'Code',
-	'Class:Organization/Attribute:code+' => 'Organisation code (Siret, DUNS,...)',
-	'Class:Organization/Attribute:status' => 'Statut',
-	'Class:Organization/Attribute:status+' => '',
-	'Class:Organization/Attribute:status/Value:active' => 'active',
-	'Class:Organization/Attribute:status/Value:active+' => 'active',
-	'Class:Organization/Attribute:status/Value:inactive' => 'inactive',
-	'Class:Organization/Attribute:status/Value:inactive+' => 'Inactive',
-	'Class:Organization/Attribute:parent_id' => 'Organisation Parent',
-	'Class:Organization/Attribute:parent_id+' => 'Organisation parent',
-	'Class:Organization/Attribute:parent_name' => 'Nom du parent',
-	'Class:Organization/Attribute:parent_name+' => 'Nom de l\'organisation parente',
-	'Class:Organization/Attribute:deliverymodel_id' => 'Modèle de support',
-	'Class:Organization/Attribute:deliverymodel_id+' => '~~',
-	'Class:Organization/Attribute:deliverymodel_name' => 'Nom modèle de support',
-	'Class:Organization/Attribute:deliverymodel_name+' => '~~',
-	'Class:Organization/Attribute:parent_id_friendlyname' => 'Nom commun',
-	'Class:Organization/Attribute:parent_id_friendlyname+' => '',
-	'Class:Organization/Attribute:overview' => 'Tableau de bord',
-	'Organization:Overview:FunctionalCIs' => 'Infrastructure de cette organisation',
-	'Organization:Overview:FunctionalCIs:subtitle' => 'par type',
-	'Organization:Overview:Users' => 'Utilisateurs iTop dans cette organisation',
-));
-
-//
-// Class: Location
-//
-
-Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:Location' => 'Lieu',
-	'Class:Location+' => 'Tout type de lieu: Région, Pays, Ville, Site, batiment, Bureau,...',
-	'Class:Location/Attribute:name' => 'Nom',
-	'Class:Location/Attribute:name+' => '',
-	'Class:Location/Attribute:status' => 'Statut',
-	'Class:Location/Attribute:status+' => '',
-	'Class:Location/Attribute:status/Value:active' => 'Actif',
-	'Class:Location/Attribute:status/Value:active+' => 'Actif',
-	'Class:Location/Attribute:status/Value:inactive' => 'Inactif',
-	'Class:Location/Attribute:status/Value:inactive+' => 'Inactif',
-	'Class:Location/Attribute:org_id' => 'Organisation',
-	'Class:Location/Attribute:org_id+' => '',
-	'Class:Location/Attribute:org_name' => 'Nom organisation',
-	'Class:Location/Attribute:org_name+' => '',
-	'Class:Location/Attribute:address' => 'Adresse',
-	'Class:Location/Attribute:address+' => 'Adresse postale',
-	'Class:Location/Attribute:postal_code' => 'Code postal',
-	'Class:Location/Attribute:postal_code+' => 'Code postal',
-	'Class:Location/Attribute:city' => 'Ville',
-	'Class:Location/Attribute:city+' => '',
-	'Class:Location/Attribute:country' => 'Pays',
-	'Class:Location/Attribute:country+' => '',
-	'Class:Location/Attribute:physicaldevice_list' => 'Matériels',
-	'Class:Location/Attribute:physicaldevice_list+' => '',
-	'Class:Location/Attribute:person_list' => 'Contacts',
-	'Class:Location/Attribute:person_list+' => '',
-));
-
-//
-// Class: Contact
-//
-
-Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:Contact' => 'Contact',
-	'Class:Contact+' => '',
-	'Class:Contact/Attribute:name' => 'Nom',
-	'Class:Contact/Attribute:name+' => '',
-	'Class:Contact/Attribute:status' => 'Statut',
-	'Class:Contact/Attribute:status+' => '',
-	'Class:Contact/Attribute:status/Value:active' => 'Actif',
-	'Class:Contact/Attribute:status/Value:active+' => 'Actif',
-	'Class:Contact/Attribute:status/Value:inactive' => 'Inactif',
-	'Class:Contact/Attribute:status/Value:inactive+' => 'Inactif',
-	'Class:Contact/Attribute:org_id' => 'Organisation',
-	'Class:Contact/Attribute:org_id+' => '',
-	'Class:Contact/Attribute:org_name' => 'Nom organisation',
-	'Class:Contact/Attribute:org_name+' => '',
-	'Class:Contact/Attribute:email' => 'Email',
-	'Class:Contact/Attribute:email+' => '',
-	'Class:Contact/Attribute:phone' => 'Téléphone',
-	'Class:Contact/Attribute:phone+' => '',
-	'Class:Contact/Attribute:notify' => 'Notification',
-	'Class:Contact/Attribute:notify+' => '',
-	'Class:Contact/Attribute:notify/Value:no' => 'non',
-	'Class:Contact/Attribute:notify/Value:no+' => 'non',
-	'Class:Contact/Attribute:notify/Value:yes' => 'oui',
-	'Class:Contact/Attribute:notify/Value:yes+' => 'oui',
-	'Class:Contact/Attribute:function' => 'Fonction',
-	'Class:Contact/Attribute:function+' => '',
-	'Class:Contact/Attribute:cis_list' => 'CIs',
-	'Class:Contact/Attribute:cis_list+' => '',
-	'Class:Contact/Attribute:finalclass' => 'Sous-classe de Contact',
-	'Class:Contact/Attribute:finalclass+' => 'Nom de la classe instanciable',
-));
-
-//
-// Class: Person
-//
-
-Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:Person' => 'Personne',
-	'Class:Person+' => '',
-	'Class:Person/Attribute:name' => 'Nom',
-	'Class:Person/Attribute:name+' => '~~',
-	'Class:Person/Attribute:first_name' => 'Prénom',
-	'Class:Person/Attribute:first_name+' => '',
-	'Class:Person/Attribute:employee_number' => 'Numéro d\'employé',
-	'Class:Person/Attribute:employee_number+' => '',
-	'Class:Person/Attribute:mobile_phone' => 'Téléphone mobile',
-	'Class:Person/Attribute:mobile_phone+' => '',
-	'Class:Person/Attribute:location_id' => 'Site',
-	'Class:Person/Attribute:location_id+' => '',
-	'Class:Person/Attribute:location_name' => 'Nom site',
-	'Class:Person/Attribute:location_name+' => '',
-	'Class:Person/Attribute:manager_id' => 'Manager',
-	'Class:Person/Attribute:manager_id+' => '',
-	'Class:Person/Attribute:manager_name' => 'Nom Manager',
-	'Class:Person/Attribute:manager_name+' => '',
-	'Class:Person/Attribute:team_list' => 'Equipes',
-	'Class:Person/Attribute:team_list+' => '',
-	'Class:Person/Attribute:tickets_list' => 'Tickets',
-	'Class:Person/Attribute:tickets_list+' => '',
-	'Class:Person/Attribute:manager_id_friendlyname' => 'Manager friendly name',
-	'Class:Person/Attribute:manager_id_friendlyname+' => '',
-	'Class:Person/Attribute:picture' => 'Photo',
-	'Class:Person/Attribute:picture+' => '',
-	'Class:Person/UniquenessRule:employee_number+' => 'Le numéro d\'employé doit être unique dans l\'organisation',
-	'Class:Person/UniquenessRule:employee_number' => 'il y a déjà une personne avec ce numéro d\'employé dans l\'organisation 
-	\'$this->org_name$\'',
-	'Class:Person/UniquenessRule:name+' => 'Le nom de l\'employé devrait être unique dans l\'organisation',
-	'Class:Person/UniquenessRule:name' => 'Il y a déjà une personne avec ce nom dans l\'organisation \'$this->org_name$\'',
-));
-
-//
-// Class: Team
-//
-
-Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:Team' => 'Equipe',
-	'Class:Team+' => '',
-	'Class:Team/Attribute:persons_list' => 'Membres',
-	'Class:Team/Attribute:persons_list+' => '',
-	'Class:Team/Attribute:tickets_list' => 'Tickets',
-	'Class:Team/Attribute:tickets_list+' => '',
-));
-
-//
-// Class: Document
-//
-
-Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:Document' => 'Document',
-	'Class:Document+' => '',
-	'Class:Document/Attribute:name' => 'Nom',
-	'Class:Document/Attribute:name+' => '',
-	'Class:Document/Attribute:org_id' => 'Organisation',
-	'Class:Document/Attribute:org_id+' => '',
-	'Class:Document/Attribute:org_name' => 'Nom organisation',
-	'Class:Document/Attribute:org_name+' => '',
-	'Class:Document/Attribute:documenttype_id' => 'Type de document',
-	'Class:Document/Attribute:documenttype_id+' => '',
-	'Class:Document/Attribute:documenttype_name' => 'Nom type de document',
-	'Class:Document/Attribute:documenttype_name+' => '',
-	'Class:Document/Attribute:version' => 'Version',
-	'Class:Document/Attribute:version+' => '',
-	'Class:Document/Attribute:description' => 'Description',
-	'Class:Document/Attribute:description+' => '',
-	'Class:Document/Attribute:status' => 'Statut',
-	'Class:Document/Attribute:status+' => '',
-	'Class:Document/Attribute:status/Value:draft' => 'Brouillon',
-	'Class:Document/Attribute:status/Value:draft+' => '',
-	'Class:Document/Attribute:status/Value:obsolete' => 'Obsolète',
-	'Class:Document/Attribute:status/Value:obsolete+' => '',
-	'Class:Document/Attribute:status/Value:published' => 'Publié',
-	'Class:Document/Attribute:status/Value:published+' => '',
-	'Class:Document/Attribute:cis_list' => 'CIs',
-	'Class:Document/Attribute:cis_list+' => '',
-	'Class:Document/Attribute:contracts_list' => 'Contrats',
-	'Class:Document/Attribute:contracts_list+' => '',
-	'Class:Document/Attribute:services_list' => 'Services',
-	'Class:Document/Attribute:services_list+' => '',
-	'Class:Document/Attribute:finalclass' => 'Sous-classe de Document',
-	'Class:Document/Attribute:finalclass+' => 'Nom de la classe instanciable',
-));
-
-//
-// Class: DocumentFile
-//
-
-Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:DocumentFile' => 'Document Fichier',
-	'Class:DocumentFile+' => '',
-	'Class:DocumentFile/Attribute:file' => 'Fichier',
-	'Class:DocumentFile/Attribute:file+' => '',
-));
-
-//
-// Class: DocumentNote
-//
-
-Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:DocumentNote' => 'Document Note',
-	'Class:DocumentNote+' => '',
-	'Class:DocumentNote/Attribute:text' => 'Texte',
-	'Class:DocumentNote/Attribute:text+' => '',
-));
-
-//
-// Class: DocumentWeb
-//
-
-Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:DocumentWeb' => 'Document Web',
-	'Class:DocumentWeb+' => '',
-	'Class:DocumentWeb/Attribute:url' => 'URL',
-	'Class:DocumentWeb/Attribute:url+' => '',
-));
-
 //
 // Class: FunctionalCI
 //
@@ -1224,35 +997,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:SoftwareLicence/Attribute:softwareinstance_list+' => '',
 ));
 
-//
-// Class: lnkDocumentToLicence
-//
 
-Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:lnkDocumentToLicence' => 'Lien Document / Licence',
-	'Class:lnkDocumentToLicence+' => '',
-	'Class:lnkDocumentToLicence/Attribute:licence_id' => 'Licence',
-	'Class:lnkDocumentToLicence/Attribute:licence_id+' => '',
-	'Class:lnkDocumentToLicence/Attribute:licence_name' => 'Nom Licence',
-	'Class:lnkDocumentToLicence/Attribute:licence_name+' => '',
-	'Class:lnkDocumentToLicence/Attribute:document_id' => 'Document',
-	'Class:lnkDocumentToLicence/Attribute:document_id+' => '',
-	'Class:lnkDocumentToLicence/Attribute:document_name' => 'Nom Document',
-	'Class:lnkDocumentToLicence/Attribute:document_name+' => '',
-));
-
-//
-// Class: Typology
-//
-
-Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:Typology' => 'Typologie',
-	'Class:Typology+' => '',
-	'Class:Typology/Attribute:name' => 'Nom',
-	'Class:Typology/Attribute:name+' => '',
-	'Class:Typology/Attribute:finalclass' => 'Sous-classe de Typologie',
-	'Class:Typology/Attribute:finalclass+' => 'Nom de la classe instanciable',
-));
 
 //
 // Class: OSVersion
@@ -1276,23 +1021,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:OSFamily+' => '',
 ));
 
-//
-// Class: DocumentType
-//
-
-Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:DocumentType' => 'Type de document',
-	'Class:DocumentType+' => '',
-));
-
-//
-// Class: ContactType
-//
-
-Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:ContactType' => 'Type de contact',
-	'Class:ContactType+' => '',
-));
 
 //
 // Class: Brand
@@ -1386,23 +1114,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:IOSVersion/Attribute:brand_name+' => '',
 ));
 
-//
-// Class: lnkDocumentToPatch
-//
-
-Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:lnkDocumentToPatch' => 'Lien Document / Patch',
-	'Class:lnkDocumentToPatch+' => '',
-	'Class:lnkDocumentToPatch/Attribute:patch_id' => 'Patch',
-	'Class:lnkDocumentToPatch/Attribute:patch_id+' => '',
-	'Class:lnkDocumentToPatch/Attribute:patch_name' => 'Nom patch',
-	'Class:lnkDocumentToPatch/Attribute:patch_name+' => '',
-	'Class:lnkDocumentToPatch/Attribute:document_id' => 'Document',
-	'Class:lnkDocumentToPatch/Attribute:document_id+' => '',
-	'Class:lnkDocumentToPatch/Attribute:document_name' => 'Nom document',
-	'Class:lnkDocumentToPatch/Attribute:document_name+' => '',
-));
-
 //
 // Class: lnkSoftwareInstanceToSoftwarePatch
 //
@@ -1437,56 +1148,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_name+' => '',
 ));
 
-//
-// Class: lnkDocumentToSoftware
-//
-
-Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:lnkDocumentToSoftware' => 'Lien Document / Logiciel',
-	'Class:lnkDocumentToSoftware+' => '',
-	'Class:lnkDocumentToSoftware/Attribute:software_id' => 'Logiciel',
-	'Class:lnkDocumentToSoftware/Attribute:software_id+' => '',
-	'Class:lnkDocumentToSoftware/Attribute:software_name' => 'Nom logiciel',
-	'Class:lnkDocumentToSoftware/Attribute:software_name+' => '',
-	'Class:lnkDocumentToSoftware/Attribute:document_id' => 'Document',
-	'Class:lnkDocumentToSoftware/Attribute:document_id+' => '',
-	'Class:lnkDocumentToSoftware/Attribute:document_name' => 'Nom document',
-	'Class:lnkDocumentToSoftware/Attribute:document_name+' => '',
-));
-
-//
-// Class: lnkContactToFunctionalCI
-//
-
-Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:lnkContactToFunctionalCI' => 'Lien Contact / CI Fonctionel',
-	'Class:lnkContactToFunctionalCI+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'CI',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Nom CI',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contact',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Nom contact',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
-));
-
-//
-// Class: lnkDocumentToFunctionalCI
-//
-
-Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:lnkDocumentToFunctionalCI' => 'Lien Document / CI Fonctionel',
-	'Class:lnkDocumentToFunctionalCI+' => '',
-	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id' => 'CI',
-	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id+' => '',
-	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name' => 'Nom CI',
-	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name+' => '',
-	'Class:lnkDocumentToFunctionalCI/Attribute:document_id' => 'Document',
-	'Class:lnkDocumentToFunctionalCI/Attribute:document_id+' => '',
-	'Class:lnkDocumentToFunctionalCI/Attribute:document_name' => 'Nom Document',
-	'Class:lnkDocumentToFunctionalCI/Attribute:document_name+' => '',
-));
 
 //
 // Class: Subnet
@@ -1717,26 +1378,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_name+' => '',
 ));
 
-//
-// Class: lnkPersonToTeam
-//
-
-Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:lnkPersonToTeam' => 'Lien Personne / Equipe',
-	'Class:lnkPersonToTeam+' => '',
-	'Class:lnkPersonToTeam/Attribute:team_id' => 'Equipe',
-	'Class:lnkPersonToTeam/Attribute:team_id+' => '',
-	'Class:lnkPersonToTeam/Attribute:team_name' => 'Nom Equipe',
-	'Class:lnkPersonToTeam/Attribute:team_name+' => '',
-	'Class:lnkPersonToTeam/Attribute:person_id' => 'Personne',
-	'Class:lnkPersonToTeam/Attribute:person_id+' => '',
-	'Class:lnkPersonToTeam/Attribute:person_name' => 'Nom Personne',
-	'Class:lnkPersonToTeam/Attribute:person_name+' => '',
-	'Class:lnkPersonToTeam/Attribute:role_id' => 'Rôle',
-	'Class:lnkPersonToTeam/Attribute:role_id+' => '',
-	'Class:lnkPersonToTeam/Attribute:role_name' => 'Nom Role',
-	'Class:lnkPersonToTeam/Attribute:role_name+' => '',
-));
 
 //
 // Class: Group
@@ -1794,41 +1435,107 @@ Dict::Add('FR FR', 'French', 'Français', array(
 ));
 
 
+// Add translation for Fieldsets
+
+Dict::Add('FR FR', 'French', 'Français', array(
+	'Server:baseinfo' => 'Informations générales',
+	'Server:Date' => 'Dates',
+	'Server:moreinfo' => 'Informations complémentaires',
+	'Server:otherinfo' => 'Autres informations',
+	'Server:power' => 'Alimentation électrique',
+	'Person:info' => 'Informations générales',
+	'UserLocal:info' => 'Informations générales',
+	'Person:personal_info' => 'Informations personnelles',
+	'Person:notifiy' => 'Notification',
+	'Class:Subnet/Tab:IPUsage' => 'IP utilisées',
+	'Class:Subnet/Tab:IPUsage-explain' => 'Interfaces ayant une IP dans la plage: <em>%1$s</em> à <em>%2$s</em>',
+	'Class:Subnet/Tab:FreeIPs' => 'IP disponibles',
+	'Class:Subnet/Tab:FreeIPs-count' => 'IP disponibles: %1$s',
+	'Class:Subnet/Tab:FreeIPs-explain' => 'Voici un échantillon de dix addresses IP disponibles',
+	'Class:Document:PreviewTab' => 'Aperçu',
+));
+
+
+//
+// Class: lnkDocumentToLicence
+//
+
+Dict::Add('FR FR', 'French', 'Français', array(
+	'Class:lnkDocumentToLicence' => 'Lien Document / Licence',
+	'Class:lnkDocumentToLicence+' => '',
+	'Class:lnkDocumentToLicence/Attribute:licence_id' => 'Licence',
+	'Class:lnkDocumentToLicence/Attribute:licence_id+' => '',
+	'Class:lnkDocumentToLicence/Attribute:licence_name' => 'Nom Licence',
+	'Class:lnkDocumentToLicence/Attribute:licence_name+' => '',
+	'Class:lnkDocumentToLicence/Attribute:document_id' => 'Document',
+	'Class:lnkDocumentToLicence/Attribute:document_id+' => '',
+	'Class:lnkDocumentToLicence/Attribute:document_name' => 'Nom Document',
+	'Class:lnkDocumentToLicence/Attribute:document_name+' => '',
+));
+
+
+//
+// Class: lnkDocumentToPatch
+//
+
+
+Dict::Add('FR FR', 'French', 'Français', array(
+	'Class:lnkDocumentToPatch' => 'Lien Document / Patch',
+	'Class:lnkDocumentToPatch+' => '',
+	'Class:lnkDocumentToPatch/Attribute:patch_id' => 'Patch',
+	'Class:lnkDocumentToPatch/Attribute:patch_id+' => '',
+	'Class:lnkDocumentToPatch/Attribute:patch_name' => 'Nom patch',
+	'Class:lnkDocumentToPatch/Attribute:patch_name+' => '',
+	'Class:lnkDocumentToPatch/Attribute:document_id' => 'Document',
+	'Class:lnkDocumentToPatch/Attribute:document_id+' => '',
+	'Class:lnkDocumentToPatch/Attribute:document_name' => 'Nom document',
+	'Class:lnkDocumentToPatch/Attribute:document_name+' => '',
+));
+
+
+//
+// Class: lnkDocumentToSoftware
+//
+
+Dict::Add('FR FR', 'French', 'Français', array(
+	'Class:lnkDocumentToSoftware' => 'Lien Document / Logiciel',
+	'Class:lnkDocumentToSoftware+' => '',
+	'Class:lnkDocumentToSoftware/Attribute:software_id' => 'Logiciel',
+	'Class:lnkDocumentToSoftware/Attribute:software_id+' => '',
+	'Class:lnkDocumentToSoftware/Attribute:software_name' => 'Nom logiciel',
+	'Class:lnkDocumentToSoftware/Attribute:software_name+' => '',
+	'Class:lnkDocumentToSoftware/Attribute:document_id' => 'Document',
+	'Class:lnkDocumentToSoftware/Attribute:document_id+' => '',
+	'Class:lnkDocumentToSoftware/Attribute:document_name' => 'Nom document',
+	'Class:lnkDocumentToSoftware/Attribute:document_name+' => '',
+));
+
+//
+// Class: lnkDocumentToFunctionalCI
+//
+
+Dict::Add('FR FR', 'French', 'Français', array(
+	'Class:lnkDocumentToFunctionalCI' => 'Lien Document / CI Fonctionel',
+	'Class:lnkDocumentToFunctionalCI+' => '',
+	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id' => 'CI',
+	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name' => 'Nom CI',
+	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name+' => '',
+	'Class:lnkDocumentToFunctionalCI/Attribute:document_id' => 'Document',
+	'Class:lnkDocumentToFunctionalCI/Attribute:document_id+' => '',
+	'Class:lnkDocumentToFunctionalCI/Attribute:document_name' => 'Nom Document',
+	'Class:lnkDocumentToFunctionalCI/Attribute:document_name+' => '',
+));
+
 //
 // Application Menu
 //
 
 Dict::Add('FR FR', 'French', 'Français', array(
-	'Menu:DataAdministration' => 'Administration des données',
-	'Menu:DataAdministration+' => 'Administration des données',
-	'Menu:Catalogs' => 'Catalogues',
-	'Menu:Catalogs+' => 'Types de données',
-	'Menu:Audit' => 'Audit',
-	'Menu:Audit+' => 'Audit',
-	'Menu:CSVImport' => 'Import CSV',
-	'Menu:CSVImport+' => 'Import ou mise à jour en masse',
-	'Menu:Organization' => 'Organisations',
-	'Menu:Organization+' => 'Toutes les organisations',
 	'Menu:Application' => 'Logiciels',
 	'Menu:Application+' => 'Tous les logiciels',
 	'Menu:DBServer' => 'Serveur de base de données',
 	'Menu:DBServer+' => '',
-	'Menu:ConfigManagement' => 'Gestion des configurations',
-	'Menu:ConfigManagement+' => 'Gestion des configurations',
-	'Menu:ConfigManagementOverview' => 'Tableaux de bord',
-	'Menu:ConfigManagementOverview+' => 'Tableaux de bord',
-	'Menu:Contact' => 'Contacts',
-	'Menu:Contact+' => 'Contacts',
-	'Menu:Contact:Count' => '%1$d contacts',
-	'Menu:Person' => 'Personnes',
-	'Menu:Person+' => 'Toutes les personnes',
-	'Menu:Team' => 'Equipes',
-	'Menu:Team+' => 'Toutes les équipes',
-	'Menu:Document' => 'Documents',
-	'Menu:Document+' => 'Tous les documents',
-	'Menu:Location' => 'Lieux',
-
-	'Menu:Location+' => 'Tous les lieux',
 	'Menu:ConfigManagementCI' => 'CIs',
 	'Menu:ConfigManagementCI+' => 'CIs',
 	'Menu:BusinessProcess' => 'Processus métier',
@@ -1855,10 +1562,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Menu:MobilePhone+' => 'Tous les téléphones portables',
 	'Menu:PC' => 'PCs',
 	'Menu:PC+' => 'Tous les PCs',
-	'Menu:NewContact' => 'Nouveau contact',
-	'Menu:NewContact+' => 'Nouveau contact',
-	'Menu:SearchContacts' => 'Rechercher des contacts',
-	'Menu:SearchContacts+' => 'Rechercher des contacts',
 	'Menu:NewCI' => 'Nouveau CI',
 	'Menu:NewCI+' => 'Nouveau CI',
 	'Menu:SearchCIs' => 'Rechercher des CIs',
@@ -1871,36 +1574,11 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Menu:ConfigManagement:Misc' => 'Divers',
 	'Menu:Group' => 'Groupe de CIs',
 	'Menu:Group+' => 'Groupe de CIs',
-	'Menu:ConfigManagement:Shortcuts' => 'Raccourcis',
-	'Menu:ConfigManagement:AllContacts' => 'Tous les contacts: %1$d',
-	'Menu:Typology' => 'Typologie configuration',
-	'Menu:Typology+' => 'Typologie configuration',
 	'Menu:OSVersion' => 'Versions d\'OS',
 	'Menu:OSVersion+' => '',
 	'Menu:Software' => 'Catalogue des logiciels de références',
 	'Menu:Software+' => 'Catalogue des logiciels de références',
-	'UI_WelcomeMenu_AllConfigItems' => 'Résumé',
-	'Menu:ConfigManagement:Typology' => 'Configuration des typologies',
-
 ));
 
 
-// Add translation for Fieldsets
-
-Dict::Add('FR FR', 'French', 'Français', array(
-	'Server:baseinfo' => 'Informations générales',
-	'Server:Date' => 'Dates',
-	'Server:moreinfo' => 'Informations complémentaires',
-	'Server:otherinfo' => 'Autres informations',
-	'Server:power' => 'Alimentation électrique',
-	'Person:info' => 'Informations générales',
-	'UserLocal:info' => 'Informations générales',
-	'Person:personal_info' => 'Informations personnelles',
-	'Person:notifiy' => 'Notification',
-	'Class:Subnet/Tab:IPUsage' => 'IP utilisées',
-	'Class:Subnet/Tab:IPUsage-explain' => 'Interfaces ayant une IP dans la plage: <em>%1$s</em> à <em>%2$s</em>',
-	'Class:Subnet/Tab:FreeIPs' => 'IP disponibles',
-	'Class:Subnet/Tab:FreeIPs-count' => 'IP disponibles: %1$s',
-	'Class:Subnet/Tab:FreeIPs-explain' => 'Voici un échantillon de dix addresses IP disponibles',
-	'Class:Document:PreviewTab' => 'Aperçu',
-));
+?>
diff --git a/datamodels/2.x/itop-config-mgmt/hu.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/hu.dict.itop-config-mgmt.php
index 2ca28d6f1..5932a7bb8 100755
--- a/datamodels/2.x/itop-config-mgmt/hu.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/hu.dict.itop-config-mgmt.php
@@ -69,232 +69,6 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //////////////////////////////////////////////////////////////////////
 //
 
-
-//
-// Class: Organization
-//
-
-Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'Class:Organization' => 'Szevezeti egység',
-	'Class:Organization+' => '',
-	'Class:Organization/Attribute:name' => 'Név',
-	'Class:Organization/Attribute:name+' => '',
-	'Class:Organization/Attribute:code' => 'Azonosító',
-	'Class:Organization/Attribute:code+' => '',
-	'Class:Organization/Attribute:status' => 'Státusz',
-	'Class:Organization/Attribute:status+' => '',
-	'Class:Organization/Attribute:status/Value:active' => 'Aktív',
-	'Class:Organization/Attribute:status/Value:active+' => '',
-	'Class:Organization/Attribute:status/Value:inactive' => 'Inaktív',
-	'Class:Organization/Attribute:status/Value:inactive+' => '',
-	'Class:Organization/Attribute:parent_id' => 'Felérendelt szervezeti egység',
-	'Class:Organization/Attribute:parent_id+' => '',
-	'Class:Organization/Attribute:parent_name' => 'Felérendelt szervezeti egység neve',
-	'Class:Organization/Attribute:parent_name+' => '',
-	'Class:Organization/Attribute:deliverymodel_id' => 'Delivery model~~',
-	'Class:Organization/Attribute:deliverymodel_id+' => '~~',
-	'Class:Organization/Attribute:deliverymodel_name' => 'Delivery model name~~',
-	'Class:Organization/Attribute:deliverymodel_name+' => '~~',
-	'Class:Organization/Attribute:parent_id_friendlyname' => 'Parent~~',
-	'Class:Organization/Attribute:parent_id_friendlyname+' => 'Parent organization~~',
-	'Class:Organization/Attribute:overview' => 'Overview~~',
-	'Organization:Overview:FunctionalCIs' => 'Configuration items of this organization~~',
-	'Organization:Overview:FunctionalCIs:subtitle' => 'by type~~',
-	'Organization:Overview:Users' => 'iTop Users within this organization~~',
-));
-
-//
-// Class: Location
-//
-
-Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'Class:Location' => 'Helyszín',
-	'Class:Location+' => '',
-	'Class:Location/Attribute:name' => 'Név',
-	'Class:Location/Attribute:name+' => '',
-	'Class:Location/Attribute:status' => 'Státusz',
-	'Class:Location/Attribute:status+' => '',
-	'Class:Location/Attribute:status/Value:active' => 'Aktív',
-	'Class:Location/Attribute:status/Value:active+' => '',
-	'Class:Location/Attribute:status/Value:inactive' => 'Inaktív',
-	'Class:Location/Attribute:status/Value:inactive+' => '',
-	'Class:Location/Attribute:org_id' => 'Tulajdonos szevezeti egység',
-	'Class:Location/Attribute:org_id+' => '',
-	'Class:Location/Attribute:org_name' => 'Tulejdonos szevezeti egység neve',
-	'Class:Location/Attribute:org_name+' => '',
-	'Class:Location/Attribute:address' => 'Cím',
-	'Class:Location/Attribute:address+' => '',
-	'Class:Location/Attribute:postal_code' => 'Irányítószám',
-	'Class:Location/Attribute:postal_code+' => '',
-	'Class:Location/Attribute:city' => 'Város',
-	'Class:Location/Attribute:city+' => '',
-	'Class:Location/Attribute:country' => 'Ország',
-	'Class:Location/Attribute:country+' => '',
-	'Class:Location/Attribute:physicaldevice_list' => 'Devices~~',
-	'Class:Location/Attribute:physicaldevice_list+' => 'All the devices in this location~~',
-	'Class:Location/Attribute:person_list' => 'Contacts~~',
-	'Class:Location/Attribute:person_list+' => 'All the contacts located on this location~~',
-));
-
-//
-// Class: Contact
-//
-
-Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'Class:Contact' => 'Kapcsolattartó',
-	'Class:Contact+' => '',
-	'Class:Contact/Attribute:name' => 'Név',
-	'Class:Contact/Attribute:name+' => '',
-	'Class:Contact/Attribute:status' => 'Státusz',
-	'Class:Contact/Attribute:status+' => '',
-	'Class:Contact/Attribute:status/Value:active' => 'Aktív',
-	'Class:Contact/Attribute:status/Value:active+' => '',
-	'Class:Contact/Attribute:status/Value:inactive' => 'Inaktív',
-	'Class:Contact/Attribute:status/Value:inactive+' => '',
-	'Class:Contact/Attribute:org_id' => 'Szevezeti egység',
-	'Class:Contact/Attribute:org_id+' => '',
-	'Class:Contact/Attribute:org_name' => 'Szevezeti egység',
-	'Class:Contact/Attribute:org_name+' => '',
-	'Class:Contact/Attribute:email' => 'E-mail',
-	'Class:Contact/Attribute:email+' => '',
-	'Class:Contact/Attribute:phone' => 'Telefonszám',
-	'Class:Contact/Attribute:phone+' => '',
-	'Class:Contact/Attribute:notify' => 'Notification~~',
-	'Class:Contact/Attribute:notify+' => '~~',
-	'Class:Contact/Attribute:notify/Value:no' => 'no~~',
-	'Class:Contact/Attribute:notify/Value:no+' => 'no~~',
-	'Class:Contact/Attribute:notify/Value:yes' => 'yes~~',
-	'Class:Contact/Attribute:notify/Value:yes+' => 'yes~~',
-	'Class:Contact/Attribute:function' => 'Function~~',
-	'Class:Contact/Attribute:function+' => '~~',
-	'Class:Contact/Attribute:cis_list' => 'CIs~~',
-	'Class:Contact/Attribute:cis_list+' => 'All the configuration items linked to this contact~~',
-	'Class:Contact/Attribute:finalclass' => 'Típus',
-	'Class:Contact/Attribute:finalclass+' => '',
-));
-
-//
-// Class: Person
-//
-
-Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'Class:Person' => 'Személy',
-	'Class:Person+' => '',
-	'Class:Person/Attribute:name' => 'Last Name~~',
-	'Class:Person/Attribute:name+' => '~~',
-	'Class:Person/Attribute:first_name' => 'Keresztnév',
-	'Class:Person/Attribute:first_name+' => '',
-	'Class:Person/Attribute:employee_number' => 'Employee number~~',
-	'Class:Person/Attribute:employee_number+' => '~~',
-	'Class:Person/Attribute:mobile_phone' => 'Mobile phone~~',
-	'Class:Person/Attribute:mobile_phone+' => '~~',
-	'Class:Person/Attribute:location_id' => 'Location~~',
-	'Class:Person/Attribute:location_id+' => '~~',
-	'Class:Person/Attribute:location_name' => 'Location name~~',
-	'Class:Person/Attribute:location_name+' => '~~',
-	'Class:Person/Attribute:manager_id' => 'Manager~~',
-	'Class:Person/Attribute:manager_id+' => '~~',
-	'Class:Person/Attribute:manager_name' => 'Manager name~~',
-	'Class:Person/Attribute:manager_name+' => '~~',
-	'Class:Person/Attribute:team_list' => 'Teams~~',
-	'Class:Person/Attribute:team_list+' => 'All the teams this person belongs to~~',
-	'Class:Person/Attribute:tickets_list' => 'Tickets~~',
-	'Class:Person/Attribute:tickets_list+' => 'All the tickets this person is the caller~~',
-	'Class:Person/Attribute:manager_id_friendlyname' => 'Manager friendly name~~',
-	'Class:Person/Attribute:manager_id_friendlyname+' => '~~',
-	'Class:Person/Attribute:picture' => 'Picture~~',
-	'Class:Person/Attribute:picture+' => '~~',
-	'Class:Person/UniquenessRule:employee_number+' => 'The employee number must be unique in the organization~~',
-	'Class:Person/UniquenessRule:employee_number' => 'there is already a person in \'$this->org_name$\' organization with the same employee number~~',
-	'Class:Person/UniquenessRule:name+' => 'The employee name should be unique inside its organization~~',
-	'Class:Person/UniquenessRule:name' => 'There is already a person in \'$this->org_name$\' organization with the same name~~',
-));
-
-//
-// Class: Team
-//
-
-Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'Class:Team' => 'Csoport',
-	'Class:Team+' => '',
-	'Class:Team/Attribute:persons_list' => 'Members~~',
-	'Class:Team/Attribute:persons_list+' => 'All the people belonging to this team~~',
-	'Class:Team/Attribute:tickets_list' => 'Tickets~~',
-	'Class:Team/Attribute:tickets_list+' => 'All the tickets assigned to this team~~',
-));
-
-//
-// Class: Document
-//
-
-Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'Class:Document' => 'Dokumentum',
-	'Class:Document+' => '',
-	'Class:Document/Attribute:name' => 'Név',
-	'Class:Document/Attribute:name+' => '',
-	'Class:Document/Attribute:org_id' => 'Szevezeti egység',
-	'Class:Document/Attribute:org_id+' => '~~',
-	'Class:Document/Attribute:org_name' => 'Szervezeti egység neve',
-	'Class:Document/Attribute:org_name+' => '',
-	'Class:Document/Attribute:documenttype_id' => 'Document type~~',
-	'Class:Document/Attribute:documenttype_id+' => '~~',
-	'Class:Document/Attribute:documenttype_name' => 'Document type name~~',
-	'Class:Document/Attribute:documenttype_name+' => '~~',
-	'Class:Document/Attribute:version' => 'Version~~',
-	'Class:Document/Attribute:version+' => '~~',
-	'Class:Document/Attribute:description' => 'Leírás',
-	'Class:Document/Attribute:description+' => '',
-	'Class:Document/Attribute:status' => 'Státusz',
-	'Class:Document/Attribute:status+' => '',
-	'Class:Document/Attribute:status/Value:draft' => 'Munkapéldány',
-	'Class:Document/Attribute:status/Value:draft+' => '',
-	'Class:Document/Attribute:status/Value:obsolete' => 'Elavult',
-	'Class:Document/Attribute:status/Value:obsolete+' => '',
-	'Class:Document/Attribute:status/Value:published' => 'Érvényes',
-	'Class:Document/Attribute:status/Value:published+' => '',
-	'Class:Document/Attribute:cis_list' => 'CIs~~',
-	'Class:Document/Attribute:cis_list+' => 'All the configuration items linked to this document~~',
-	'Class:Document/Attribute:contracts_list' => 'Contracts~~',
-	'Class:Document/Attribute:contracts_list+' => 'All the contracts linked to this document~~',
-	'Class:Document/Attribute:services_list' => 'Services~~',
-	'Class:Document/Attribute:services_list+' => 'All the services linked to this document~~',
-	'Class:Document/Attribute:finalclass' => 'Document Type~~',
-	'Class:Document/Attribute:finalclass+' => 'Name of the final class~~',
-));
-
-//
-// Class: DocumentFile
-//
-
-Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'Class:DocumentFile' => 'Document File~~',
-	'Class:DocumentFile+' => '~~',
-	'Class:DocumentFile/Attribute:file' => 'File~~',
-	'Class:DocumentFile/Attribute:file+' => '~~',
-));
-
-//
-// Class: DocumentNote
-//
-
-Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'Class:DocumentNote' => 'Document Note~~',
-	'Class:DocumentNote+' => '~~',
-	'Class:DocumentNote/Attribute:text' => 'Text~~',
-	'Class:DocumentNote/Attribute:text+' => '~~',
-));
-
-//
-// Class: DocumentWeb
-//
-
-Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'Class:DocumentWeb' => 'Document Web~~',
-	'Class:DocumentWeb+' => '~~',
-	'Class:DocumentWeb/Attribute:url' => 'URL~~',
-	'Class:DocumentWeb/Attribute:url+' => '~~',
-));
-
 //
 // Class: FunctionalCI
 //
@@ -1237,19 +1011,6 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:lnkDocumentToLicence/Attribute:document_name+' => '~~',
 ));
 
-//
-// Class: Typology
-//
-
-Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'Class:Typology' => 'Typology~~',
-	'Class:Typology+' => '~~',
-	'Class:Typology/Attribute:name' => 'Name~~',
-	'Class:Typology/Attribute:name+' => '~~',
-	'Class:Typology/Attribute:finalclass' => 'Type~~',
-	'Class:Typology/Attribute:finalclass+' => 'Name of the final class~~',
-));
-
 //
 // Class: OSVersion
 //
@@ -1450,23 +1211,6 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:lnkDocumentToSoftware/Attribute:document_name+' => '~~',
 ));
 
-//
-// Class: lnkContactToFunctionalCI
-//
-
-Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'Class:lnkContactToFunctionalCI' => 'Link Contact / FunctionalCI~~',
-	'Class:lnkContactToFunctionalCI+' => '~~',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Functionalci~~',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '~~',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name~~',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '~~',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contact~~',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '~~',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Contact name~~',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '~~',
-));
-
 //
 // Class: lnkDocumentToFunctionalCI
 //
@@ -1569,8 +1313,6 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:IPInterface+' => '~~',
 	'Class:IPInterface/Attribute:ipaddress' => 'IP address~~',
 	'Class:IPInterface/Attribute:ipaddress+' => '~~',
-
-
 	'Class:IPInterface/Attribute:macaddress' => 'MAC address~~',
 	'Class:IPInterface/Attribute:macaddress+' => '~~',
 	'Class:IPInterface/Attribute:comment' => 'Comment~~',
@@ -1713,27 +1455,6 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_name+' => '~~',
 ));
 
-//
-// Class: lnkPersonToTeam
-//
-
-Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'Class:lnkPersonToTeam' => 'Link Person / Team~~',
-	'Class:lnkPersonToTeam+' => '~~',
-	'Class:lnkPersonToTeam/Attribute:team_id' => 'Team~~',
-	'Class:lnkPersonToTeam/Attribute:team_id+' => '~~',
-	'Class:lnkPersonToTeam/Attribute:team_name' => 'Team name~~',
-	'Class:lnkPersonToTeam/Attribute:team_name+' => '~~',
-	'Class:lnkPersonToTeam/Attribute:person_id' => 'Person~~',
-	'Class:lnkPersonToTeam/Attribute:person_id+' => '~~',
-	'Class:lnkPersonToTeam/Attribute:person_name' => 'Person name~~',
-	'Class:lnkPersonToTeam/Attribute:person_name+' => '~~',
-	'Class:lnkPersonToTeam/Attribute:role_id' => 'Role~~',
-	'Class:lnkPersonToTeam/Attribute:role_id+' => '~~',
-	'Class:lnkPersonToTeam/Attribute:role_name' => 'Role name~~',
-	'Class:lnkPersonToTeam/Attribute:role_name+' => '~~',
-));
-
 //
 // Class: Group
 //
@@ -1760,7 +1481,6 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:Group/Attribute:type' => 'Típus',
 	'Class:Group/Attribute:type+' => '',
 	'Class:Group/Attribute:parent_id' => 'Felérendelt csoport',
-
 	'Class:Group/Attribute:parent_id+' => '',
 	'Class:Group/Attribute:parent_name' => 'Név',
 	'Class:Group/Attribute:parent_name+' => '',
@@ -1789,42 +1509,37 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:lnkGroupToCI/Attribute:reason+' => '',
 ));
 
+//
+// Add translation for Fieldsets
+//
+
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+	'Server:baseinfo' => 'General information~~',
+	'Server:Date' => 'Dates~~',
+	'Server:moreinfo' => 'More information~~',
+	'Server:otherinfo' => 'Other information~~',
+	'Server:power' => 'Power supply~~',
+	'Person:info' => 'General information~~',
+	'UserLocal:info' => 'General information~~',
+	'Person:personal_info' => 'Personal information~~',
+	'Person:notifiy' => 'Notification~~',
+	'Class:Subnet/Tab:IPUsage' => 'IP felhasználás',
+	'Class:Subnet/Tab:IPUsage-explain' => 'Interfészek a következő tartományba esnek: <em>%1$s</em> - <em>%2$s</em>',
+	'Class:Subnet/Tab:FreeIPs' => 'Szabad IP-k',
+	'Class:Subnet/Tab:FreeIPs-count' => 'Szabad IP-k: %1$s',
+	'Class:Subnet/Tab:FreeIPs-explain' => '10 szabad IP cím kivonata',
+	'Class:Document:PreviewTab' => 'Előnézet',
+));
 
 //
 // Application Menu
 //
 
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'Menu:DataAdministration' => 'Adat adminisztráció',
-	'Menu:DataAdministration+' => '',
-	'Menu:Catalogs' => 'Katalógusok',
-	'Menu:Catalogs+' => '',
-	'Menu:Audit' => 'Audit',
-	'Menu:Audit+' => '',
-	'Menu:CSVImport' => 'CSV import',
-	'Menu:CSVImport+' => '',
-	'Menu:Organization' => 'Szervezet',
-	'Menu:Organization+' => '',
 	'Menu:Application' => 'Alkalmazások',
 	'Menu:Application+' => '',
 	'Menu:DBServer' => 'Adatbázis szerverek',
 	'Menu:DBServer+' => '',
-	'Menu:ConfigManagement' => 'Konfiguráció menedzsment',
-	'Menu:ConfigManagement+' => '',
-	'Menu:ConfigManagementOverview' => 'Áttekintő',
-	'Menu:ConfigManagementOverview+' => '',
-	'Menu:Contact' => 'Kapcsolattartók',
-	'Menu:Contact+' => '',
-	'Menu:Contact:Count' => '%1$d',
-	'Menu:Person' => 'Személyek',
-	'Menu:Person+' => '',
-	'Menu:Team' => 'Csoportok',
-	'Menu:Team+' => '',
-	'Menu:Document' => 'Dokumentumok',
-	'Menu:Document+' => '',
-	'Menu:Location' => 'Helyszínek',
-
-	'Menu:Location+' => '',
 	'Menu:ConfigManagementCI' => 'Konfigurációs elemek (CI)',
 	'Menu:ConfigManagementCI+' => '',
 	'Menu:BusinessProcess' => 'Üzleti folyamatok',
@@ -1851,10 +1566,6 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Menu:MobilePhone+' => '',
 	'Menu:PC' => 'Személyi számítógépek',
 	'Menu:PC+' => '',
-	'Menu:NewContact' => 'Új kapcsolattartó',
-	'Menu:NewContact+' => '',
-	'Menu:SearchContacts' => 'Kapcsolattartó keresés',
-	'Menu:SearchContacts+' => '',
 	'Menu:NewCI' => 'Új CI',
 	'Menu:NewCI+' => '',
 	'Menu:SearchCIs' => 'CI keresés',
@@ -1867,36 +1578,8 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Menu:ConfigManagement:Misc' => 'Egyéb',
 	'Menu:Group' => 'CI csoportok',
 	'Menu:Group+' => '',
-	'Menu:ConfigManagement:Shortcuts' => 'Gyorsmenük',
-	'Menu:ConfigManagement:AllContacts' => 'Összes kapcsolattartó: %1$d',
-	'Menu:Typology' => 'Typology configuration~~',
-	'Menu:Typology+' => 'Typology configuration~~',
 	'Menu:OSVersion' => 'OS versions~~',
 	'Menu:OSVersion+' => '~~',
 	'Menu:Software' => 'Software catalog~~',
 	'Menu:Software+' => 'Software catalog~~',
-	'UI_WelcomeMenu_AllConfigItems' => 'Summary~~',
-	'Menu:ConfigManagement:Typology' => 'Typology configuration~~',
-
-));
-
-
-// Add translation for Fieldsets
-
-Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'Server:baseinfo' => 'General information~~',
-	'Server:Date' => 'Dates~~',
-	'Server:moreinfo' => 'More information~~',
-	'Server:otherinfo' => 'Other information~~',
-	'Server:power' => 'Power supply~~',
-	'Person:info' => 'General information~~',
-	'UserLocal:info' => 'General information~~',
-	'Person:personal_info' => 'Personal information~~',
-	'Person:notifiy' => 'Notification~~',
-	'Class:Subnet/Tab:IPUsage' => 'IP felhasználás',
-	'Class:Subnet/Tab:IPUsage-explain' => 'Interfészek a következő tartományba esnek: <em>%1$s</em> - <em>%2$s</em>',
-	'Class:Subnet/Tab:FreeIPs' => 'Szabad IP-k',
-	'Class:Subnet/Tab:FreeIPs-count' => 'Szabad IP-k: %1$s',
-	'Class:Subnet/Tab:FreeIPs-explain' => '10 szabad IP cím kivonata',
-	'Class:Document:PreviewTab' => 'Előnézet',
-));
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-config-mgmt/it.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/it.dict.itop-config-mgmt.php
index 18ea081d2..4dbf4d215 100755
--- a/datamodels/2.x/itop-config-mgmt/it.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/it.dict.itop-config-mgmt.php
@@ -69,232 +69,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 //////////////////////////////////////////////////////////////////////
 //
 
-
-//
-// Class: Organization
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:Organization' => 'Organizzazione',
-	'Class:Organization+' => '',
-	'Class:Organization/Attribute:name' => 'Cognome',
-	'Class:Organization/Attribute:name+' => 'Nome',
-	'Class:Organization/Attribute:code' => 'Codice',
-	'Class:Organization/Attribute:code+' => 'Codice dell\'organizzazione (Siret, DUNS,...)',
-	'Class:Organization/Attribute:status' => 'Stato',
-	'Class:Organization/Attribute:status+' => '',
-	'Class:Organization/Attribute:status/Value:active' => 'Attivo',
-	'Class:Organization/Attribute:status/Value:active+' => 'Attivo',
-	'Class:Organization/Attribute:status/Value:inactive' => 'Inattivo',
-	'Class:Organization/Attribute:status/Value:inactive+' => 'Inattivo',
-	'Class:Organization/Attribute:parent_id' => 'Parent',
-	'Class:Organization/Attribute:parent_id+' => 'Parent organization',
-	'Class:Organization/Attribute:parent_name' => 'Parent name',
-	'Class:Organization/Attribute:parent_name+' => 'Name of the parent organization',
-	'Class:Organization/Attribute:deliverymodel_id' => 'Delivery model~~',
-	'Class:Organization/Attribute:deliverymodel_id+' => '~~',
-	'Class:Organization/Attribute:deliverymodel_name' => 'Delivery model name~~',
-	'Class:Organization/Attribute:deliverymodel_name+' => '~~',
-	'Class:Organization/Attribute:parent_id_friendlyname' => 'Parent~~',
-	'Class:Organization/Attribute:parent_id_friendlyname+' => 'Parent organization~~',
-	'Class:Organization/Attribute:overview' => 'Overview~~',
-	'Organization:Overview:FunctionalCIs' => 'Configuration items of this organization~~',
-	'Organization:Overview:FunctionalCIs:subtitle' => 'by type~~',
-	'Organization:Overview:Users' => 'iTop Users within this organization~~',
-));
-
-//
-// Class: Location
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:Location' => 'Localizzazione',
-	'Class:Location+' => 'Qualsiasi tipo di localizzazione: Regione, Paese, Città, Sito, Edificio, Piano, Stanza, Rack,,...',
-	'Class:Location/Attribute:name' => 'Nome',
-	'Class:Location/Attribute:name+' => '',
-	'Class:Location/Attribute:status' => 'Stato',
-	'Class:Location/Attribute:status+' => '',
-	'Class:Location/Attribute:status/Value:active' => 'Attivo',
-	'Class:Location/Attribute:status/Value:active+' => 'Attivo',
-	'Class:Location/Attribute:status/Value:inactive' => 'Inattivo',
-	'Class:Location/Attribute:status/Value:inactive+' => 'Inattivo',
-	'Class:Location/Attribute:org_id' => 'Organizzazione proprietaria',
-	'Class:Location/Attribute:org_id+' => '',
-	'Class:Location/Attribute:org_name' => 'Nome dell\'organizzazione',
-	'Class:Location/Attribute:org_name+' => '',
-	'Class:Location/Attribute:address' => 'Indirizzo',
-	'Class:Location/Attribute:address+' => 'Indirizzo postale',
-	'Class:Location/Attribute:postal_code' => 'Codice avviamento postale',
-	'Class:Location/Attribute:postal_code+' => 'CAP/codice avviamento postale',
-	'Class:Location/Attribute:city' => 'Città',
-	'Class:Location/Attribute:city+' => '',
-	'Class:Location/Attribute:country' => 'Paese',
-	'Class:Location/Attribute:country+' => '',
-	'Class:Location/Attribute:physicaldevice_list' => 'Devices~~',
-	'Class:Location/Attribute:physicaldevice_list+' => 'All the devices in this location~~',
-	'Class:Location/Attribute:person_list' => 'Contacts~~',
-	'Class:Location/Attribute:person_list+' => 'All the contacts located on this location~~',
-));
-
-//
-// Class: Contact
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:Contact' => 'Contatto',
-	'Class:Contact+' => '',
-	'Class:Contact/Attribute:name' => 'Nome',
-	'Class:Contact/Attribute:name+' => '',
-	'Class:Contact/Attribute:status' => 'Stato',
-	'Class:Contact/Attribute:status+' => '',
-	'Class:Contact/Attribute:status/Value:active' => 'Attivo',
-	'Class:Contact/Attribute:status/Value:active+' => 'Attivo',
-	'Class:Contact/Attribute:status/Value:inactive' => 'Inattivo',
-	'Class:Contact/Attribute:status/Value:inactive+' => 'Inattivo',
-	'Class:Contact/Attribute:org_id' => 'Organizzazione',
-	'Class:Contact/Attribute:org_id+' => '',
-	'Class:Contact/Attribute:org_name' => 'Organizzazione',
-	'Class:Contact/Attribute:org_name+' => '',
-	'Class:Contact/Attribute:email' => 'Email',
-	'Class:Contact/Attribute:email+' => '',
-	'Class:Contact/Attribute:phone' => 'Telefono',
-	'Class:Contact/Attribute:phone+' => '',
-	'Class:Contact/Attribute:notify' => 'Notification~~',
-	'Class:Contact/Attribute:notify+' => '~~',
-	'Class:Contact/Attribute:notify/Value:no' => 'no~~',
-	'Class:Contact/Attribute:notify/Value:no+' => 'no~~',
-	'Class:Contact/Attribute:notify/Value:yes' => 'yes~~',
-	'Class:Contact/Attribute:notify/Value:yes+' => 'yes~~',
-	'Class:Contact/Attribute:function' => 'Function~~',
-	'Class:Contact/Attribute:function+' => '~~',
-	'Class:Contact/Attribute:cis_list' => 'CIs~~',
-	'Class:Contact/Attribute:cis_list+' => 'All the configuration items linked to this contact~~',
-	'Class:Contact/Attribute:finalclass' => 'Tipo',
-	'Class:Contact/Attribute:finalclass+' => '',
-));
-
-//
-// Class: Person
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:Person' => 'Persona',
-	'Class:Person+' => '',
-	'Class:Person/Attribute:name' => 'Last Name~~',
-	'Class:Person/Attribute:name+' => '~~',
-	'Class:Person/Attribute:first_name' => 'Nome',
-	'Class:Person/Attribute:first_name+' => '',
-	'Class:Person/Attribute:employee_number' => 'Employee number~~',
-	'Class:Person/Attribute:employee_number+' => '~~',
-	'Class:Person/Attribute:mobile_phone' => 'Mobile phone~~',
-	'Class:Person/Attribute:mobile_phone+' => '~~',
-	'Class:Person/Attribute:location_id' => 'Location~~',
-	'Class:Person/Attribute:location_id+' => '~~',
-	'Class:Person/Attribute:location_name' => 'Location name~~',
-	'Class:Person/Attribute:location_name+' => '~~',
-	'Class:Person/Attribute:manager_id' => 'Manager~~',
-	'Class:Person/Attribute:manager_id+' => '~~',
-	'Class:Person/Attribute:manager_name' => 'Manager name~~',
-	'Class:Person/Attribute:manager_name+' => '~~',
-	'Class:Person/Attribute:team_list' => 'Teams~~',
-	'Class:Person/Attribute:team_list+' => 'All the teams this person belongs to~~',
-	'Class:Person/Attribute:tickets_list' => 'Tickets~~',
-	'Class:Person/Attribute:tickets_list+' => 'All the tickets this person is the caller~~',
-	'Class:Person/Attribute:manager_id_friendlyname' => 'Manager friendly name~~',
-	'Class:Person/Attribute:manager_id_friendlyname+' => '~~',
-	'Class:Person/Attribute:picture' => 'Picture~~',
-	'Class:Person/Attribute:picture+' => '~~',
-	'Class:Person/UniquenessRule:employee_number+' => 'The employee number must be unique in the organization~~',
-	'Class:Person/UniquenessRule:employee_number' => 'there is already a person in \'$this->org_name$\' organization with the same employee number~~',
-	'Class:Person/UniquenessRule:name+' => 'The employee name should be unique inside its organization~~',
-	'Class:Person/UniquenessRule:name' => 'There is already a person in \'$this->org_name$\' organization with the same name~~',
-));
-
-//
-// Class: Team
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:Team' => 'Squadra',
-	'Class:Team+' => '',
-	'Class:Team/Attribute:persons_list' => 'Members~~',
-	'Class:Team/Attribute:persons_list+' => 'All the people belonging to this team~~',
-	'Class:Team/Attribute:tickets_list' => 'Tickets~~',
-	'Class:Team/Attribute:tickets_list+' => 'All the tickets assigned to this team~~',
-));
-
-//
-// Class: Document
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:Document' => 'Documento',
-	'Class:Document+' => '',
-	'Class:Document/Attribute:name' => 'Nome',
-	'Class:Document/Attribute:name+' => '',
-	'Class:Document/Attribute:org_id' => 'Organizzazione',
-	'Class:Document/Attribute:org_id+' => '~~',
-	'Class:Document/Attribute:org_name' => 'Nome dell\'organizzazione',
-	'Class:Document/Attribute:org_name+' => '',
-	'Class:Document/Attribute:documenttype_id' => 'Document type~~',
-	'Class:Document/Attribute:documenttype_id+' => '~~',
-	'Class:Document/Attribute:documenttype_name' => 'Document type name~~',
-	'Class:Document/Attribute:documenttype_name+' => '~~',
-	'Class:Document/Attribute:version' => 'Version~~',
-	'Class:Document/Attribute:version+' => '~~',
-	'Class:Document/Attribute:description' => 'Descrizione',
-	'Class:Document/Attribute:description+' => '',
-	'Class:Document/Attribute:status' => 'Stato',
-	'Class:Document/Attribute:status+' => '',
-	'Class:Document/Attribute:status/Value:draft' => 'Draft',
-	'Class:Document/Attribute:status/Value:draft+' => '',
-	'Class:Document/Attribute:status/Value:obsolete' => 'Obsoleto',
-	'Class:Document/Attribute:status/Value:obsolete+' => '',
-	'Class:Document/Attribute:status/Value:published' => 'Pubblicato',
-	'Class:Document/Attribute:status/Value:published+' => '',
-	'Class:Document/Attribute:cis_list' => 'CIs~~',
-	'Class:Document/Attribute:cis_list+' => 'All the configuration items linked to this document~~',
-	'Class:Document/Attribute:contracts_list' => 'Contracts~~',
-	'Class:Document/Attribute:contracts_list+' => 'All the contracts linked to this document~~',
-	'Class:Document/Attribute:services_list' => 'Services~~',
-	'Class:Document/Attribute:services_list+' => 'All the services linked to this document~~',
-	'Class:Document/Attribute:finalclass' => 'Document Type~~',
-	'Class:Document/Attribute:finalclass+' => 'Name of the final class~~',
-));
-
-//
-// Class: DocumentFile
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:DocumentFile' => 'Document File~~',
-	'Class:DocumentFile+' => '~~',
-	'Class:DocumentFile/Attribute:file' => 'File~~',
-	'Class:DocumentFile/Attribute:file+' => '~~',
-));
-
-//
-// Class: DocumentNote
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:DocumentNote' => 'Document Note~~',
-	'Class:DocumentNote+' => '~~',
-	'Class:DocumentNote/Attribute:text' => 'Text~~',
-	'Class:DocumentNote/Attribute:text+' => '~~',
-));
-
-//
-// Class: DocumentWeb
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:DocumentWeb' => 'Document Web~~',
-	'Class:DocumentWeb+' => '~~',
-	'Class:DocumentWeb/Attribute:url' => 'URL~~',
-	'Class:DocumentWeb/Attribute:url+' => '~~',
-));
-
 //
 // Class: FunctionalCI
 //
@@ -1237,19 +1011,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:lnkDocumentToLicence/Attribute:document_name+' => '~~',
 ));
 
-//
-// Class: Typology
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:Typology' => 'Typology~~',
-	'Class:Typology+' => '~~',
-	'Class:Typology/Attribute:name' => 'Name~~',
-	'Class:Typology/Attribute:name+' => '~~',
-	'Class:Typology/Attribute:finalclass' => 'Type~~',
-	'Class:Typology/Attribute:finalclass+' => 'Name of the final class~~',
-));
-
 //
 // Class: OSVersion
 //
@@ -1272,24 +1033,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:OSFamily+' => '~~',
 ));
 
-//
-// Class: DocumentType
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:DocumentType' => 'Document Type~~',
-	'Class:DocumentType+' => '~~',
-));
-
-//
-// Class: ContactType
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:ContactType' => 'Contact Type~~',
-	'Class:ContactType+' => '~~',
-));
-
 //
 // Class: Brand
 //
@@ -1450,23 +1193,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:lnkDocumentToSoftware/Attribute:document_name+' => '~~',
 ));
 
-//
-// Class: lnkContactToFunctionalCI
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:lnkContactToFunctionalCI' => 'Link Contact / FunctionalCI~~',
-	'Class:lnkContactToFunctionalCI+' => '~~',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Functionalci~~',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '~~',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name~~',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '~~',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contact~~',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '~~',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Contact name~~',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '~~',
-));
-
 //
 // Class: lnkDocumentToFunctionalCI
 //
@@ -1713,27 +1439,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_name+' => '~~',
 ));
 
-//
-// Class: lnkPersonToTeam
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:lnkPersonToTeam' => 'Link Person / Team~~',
-	'Class:lnkPersonToTeam+' => '~~',
-	'Class:lnkPersonToTeam/Attribute:team_id' => 'Team~~',
-	'Class:lnkPersonToTeam/Attribute:team_id+' => '~~',
-	'Class:lnkPersonToTeam/Attribute:team_name' => 'Team name~~',
-	'Class:lnkPersonToTeam/Attribute:team_name+' => '~~',
-	'Class:lnkPersonToTeam/Attribute:person_id' => 'Person~~',
-	'Class:lnkPersonToTeam/Attribute:person_id+' => '~~',
-	'Class:lnkPersonToTeam/Attribute:person_name' => 'Person name~~',
-	'Class:lnkPersonToTeam/Attribute:person_name+' => '~~',
-	'Class:lnkPersonToTeam/Attribute:role_id' => 'Role~~',
-	'Class:lnkPersonToTeam/Attribute:role_id+' => '~~',
-	'Class:lnkPersonToTeam/Attribute:role_name' => 'Role name~~',
-	'Class:lnkPersonToTeam/Attribute:role_name+' => '~~',
-));
-
 //
 // Class: Group
 //
@@ -1789,42 +1494,37 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:lnkGroupToCI/Attribute:reason+' => '',
 ));
 
+//
+// Add translation for Fieldsets
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Server:baseinfo' => 'General information~~',
+	'Server:Date' => 'Dates~~',
+	'Server:moreinfo' => 'More information~~',
+	'Server:otherinfo' => 'Other information~~',
+	'Server:power' => 'Power supply~~',
+	'Person:info' => 'General information~~',
+	'UserLocal:info' => 'General information~~',
+	'Person:personal_info' => 'Personal information~~',
+	'Person:notifiy' => 'Notification~~',
+	'Class:Subnet/Tab:IPUsage' => 'Utilizzo IP',
+	'Class:Subnet/Tab:IPUsage-explain' => 'Iterfacce che hanno un IP nell\'intervallo: <em>%1$s</em> e <em>%2$s</em>',
+	'Class:Subnet/Tab:FreeIPs' => 'IP liberi',
+	'Class:Subnet/Tab:FreeIPs-count' => 'IP liberi: %1$s',
+	'Class:Subnet/Tab:FreeIPs-explain' => 'Qui c\'è un estratto di 10 indirizzi IP liberi',
+	'Class:Document:PreviewTab' => 'Anteprima',
+));
 
 //
 // Application Menu
 //
 
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Menu:DataAdministration' => 'Dati di amministrazione',
-	'Menu:DataAdministration+' => '',
-	'Menu:Catalogs' => 'Cataloghi',
-	'Menu:Catalogs+' => 'Tipi di dato',
-	'Menu:Audit' => 'Audit',
-	'Menu:Audit+' => 'Audit',
-	'Menu:CSVImport' => 'Importazione CSV',
-	'Menu:CSVImport+' => '',
-	'Menu:Organization' => 'Organizzazioni',
-	'Menu:Organization+' => 'Tutte le organizzazioni',
 	'Menu:Application' => 'Applicazioni',
 	'Menu:Application+' => 'Tutte le applicazioni',
 	'Menu:DBServer' => 'Database Servers',
 	'Menu:DBServer+' => 'Database Servers',
-	'Menu:ConfigManagement' => 'Gestione delle Configurazioni',
-	'Menu:ConfigManagement+' => 'Gestione delle Configurazioni',
-	'Menu:ConfigManagementOverview' => 'Panoramica',
-	'Menu:ConfigManagementOverview+' => 'Panoramica',
-	'Menu:Contact' => 'Contatti',
-	'Menu:Contact+' => 'Contatti',
-	'Menu:Contact:Count' => '%1$d contatti',
-	'Menu:Person' => 'Persone',
-	'Menu:Person+' => 'Tutte le persone',
-	'Menu:Team' => 'Teams',
-	'Menu:Team+' => 'Tutti i Teams',
-	'Menu:Document' => 'Documenti',
-	'Menu:Document+' => 'Tutti i Documenti',
-	'Menu:Location' => 'Posizioni',
-
-	'Menu:Location+' => 'Tutte le pozisioni',
 	'Menu:ConfigManagementCI' => 'Elementi di Configurazione (CI)',
 	'Menu:ConfigManagementCI+' => 'Elementi di Configurazione (CI)',
 	'Menu:BusinessProcess' => 'Processi di business',
@@ -1851,10 +1551,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Menu:MobilePhone+' => 'Tutti i cellulari',
 	'Menu:PC' => 'Personal Computers',
 	'Menu:PC+' => 'Tutti i Personal Computers',
-	'Menu:NewContact' => 'Nuovo Contatto',
-	'Menu:NewContact+' => 'Nuovo Contatto',
-	'Menu:SearchContacts' => 'Ricerca contatti',
-	'Menu:SearchContacts+' => 'Ricerca contatti',
 	'Menu:NewCI' => 'Nuovo CI',
 	'Menu:NewCI+' => 'Nuovo CI',
 	'Menu:SearchCIs' => 'Ricerca CIs',
@@ -1867,36 +1563,8 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Menu:ConfigManagement:Misc' => 'Varie',
 	'Menu:Group' => 'Gruppi di CIs',
 	'Menu:Group+' => 'Gruppi di CIs',
-	'Menu:ConfigManagement:Shortcuts' => 'Scorciatoie',
-	'Menu:ConfigManagement:AllContacts' => 'Tutti i contatti: %1$d',
-	'Menu:Typology' => 'Typology configuration~~',
-	'Menu:Typology+' => 'Typology configuration~~',
 	'Menu:OSVersion' => 'OS versions~~',
 	'Menu:OSVersion+' => '~~',
 	'Menu:Software' => 'Software catalog~~',
 	'Menu:Software+' => 'Software catalog~~',
-	'UI_WelcomeMenu_AllConfigItems' => 'Summary~~',
-	'Menu:ConfigManagement:Typology' => 'Typology configuration~~',
-
-));
-
-
-// Add translation for Fieldsets
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Server:baseinfo' => 'General information~~',
-	'Server:Date' => 'Dates~~',
-	'Server:moreinfo' => 'More information~~',
-	'Server:otherinfo' => 'Other information~~',
-	'Server:power' => 'Power supply~~',
-	'Person:info' => 'General information~~',
-	'UserLocal:info' => 'General information~~',
-	'Person:personal_info' => 'Personal information~~',
-	'Person:notifiy' => 'Notification~~',
-	'Class:Subnet/Tab:IPUsage' => 'Utilizzo IP',
-	'Class:Subnet/Tab:IPUsage-explain' => 'Iterfacce che hanno un IP nell\'intervallo: <em>%1$s</em> e <em>%2$s</em>',
-	'Class:Subnet/Tab:FreeIPs' => 'IP liberi',
-	'Class:Subnet/Tab:FreeIPs-count' => 'IP liberi: %1$s',
-	'Class:Subnet/Tab:FreeIPs-explain' => 'Qui c\'è un estratto di 10 indirizzi IP liberi',
-	'Class:Document:PreviewTab' => 'Anteprima',
 ));
diff --git a/datamodels/2.x/itop-config-mgmt/ja.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/ja.dict.itop-config-mgmt.php
index a3d97ae14..9ab8eabee 100755
--- a/datamodels/2.x/itop-config-mgmt/ja.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/ja.dict.itop-config-mgmt.php
@@ -69,232 +69,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 //////////////////////////////////////////////////////////////////////
 //
 
-
-//
-// Class: Organization
-//
-
-Dict::Add('JA JP', 'Japanese', '日本語', array(
-	'Class:Organization' => '組織',
-	'Class:Organization+' => '',
-	'Class:Organization/Attribute:name' => '名前',
-	'Class:Organization/Attribute:name+' => '共通名',
-	'Class:Organization/Attribute:code' => 'コード',
-	'Class:Organization/Attribute:code+' => '組織コード(Siret, DUNS, ...)',
-	'Class:Organization/Attribute:status' => '状態',
-	'Class:Organization/Attribute:status+' => '',
-	'Class:Organization/Attribute:status/Value:active' => 'アクティブ',
-	'Class:Organization/Attribute:status/Value:active+' => 'アクティブ',
-	'Class:Organization/Attribute:status/Value:inactive' => '非アクティブ',
-	'Class:Organization/Attribute:status/Value:inactive+' => '非アクティブ',
-	'Class:Organization/Attribute:parent_id' => '親',
-	'Class:Organization/Attribute:parent_id+' => '親組織',
-	'Class:Organization/Attribute:parent_name' => '親名前',
-	'Class:Organization/Attribute:parent_name+' => '親組織の名前',
-	'Class:Organization/Attribute:deliverymodel_id' => '提供モデル',
-	'Class:Organization/Attribute:deliverymodel_id+' => '',
-	'Class:Organization/Attribute:deliverymodel_name' => '提供モデル名',
-	'Class:Organization/Attribute:deliverymodel_name+' => '',
-	'Class:Organization/Attribute:parent_id_friendlyname' => '親',
-	'Class:Organization/Attribute:parent_id_friendlyname+' => '親組織',
-	'Class:Organization/Attribute:overview' => 'Overview~~',
-	'Organization:Overview:FunctionalCIs' => 'Configuration items of this organization~~',
-	'Organization:Overview:FunctionalCIs:subtitle' => 'by type~~',
-	'Organization:Overview:Users' => 'iTop Users within this organization~~',
-));
-
-//
-// Class: Location
-//
-
-Dict::Add('JA JP', 'Japanese', '日本語', array(
-	'Class:Location' => '場所',
-	'Class:Location+' => '任意の場所のタイプ: リージョン、国、都市、サイト、ビル、フロア、部屋、ラック、...',
-	'Class:Location/Attribute:name' => '名前',
-	'Class:Location/Attribute:name+' => '',
-	'Class:Location/Attribute:status' => '状態',
-	'Class:Location/Attribute:status+' => '',
-	'Class:Location/Attribute:status/Value:active' => 'アクティブ',
-	'Class:Location/Attribute:status/Value:active+' => 'アクティブ',
-	'Class:Location/Attribute:status/Value:inactive' => '非アクティブ',
-	'Class:Location/Attribute:status/Value:inactive+' => '非アクティブ',
-	'Class:Location/Attribute:org_id' => 'オーナー組織',
-	'Class:Location/Attribute:org_id+' => '',
-	'Class:Location/Attribute:org_name' => 'オーナー組織名前',
-	'Class:Location/Attribute:org_name+' => '',
-	'Class:Location/Attribute:address' => '住所',
-	'Class:Location/Attribute:address+' => '住所',
-	'Class:Location/Attribute:postal_code' => '郵便番号',
-	'Class:Location/Attribute:postal_code+' => 'ZIP/郵便番号',
-	'Class:Location/Attribute:city' => '都市',
-	'Class:Location/Attribute:city+' => '',
-	'Class:Location/Attribute:country' => '国',
-	'Class:Location/Attribute:country+' => '',
-	'Class:Location/Attribute:physicaldevice_list' => 'デバイス',
-	'Class:Location/Attribute:physicaldevice_list+' => '',
-	'Class:Location/Attribute:person_list' => '連絡先',
-	'Class:Location/Attribute:person_list+' => '',
-));
-
-//
-// Class: Contact
-//
-
-Dict::Add('JA JP', 'Japanese', '日本語', array(
-	'Class:Contact' => '連絡先',
-	'Class:Contact+' => '',
-	'Class:Contact/Attribute:name' => '名前',
-	'Class:Contact/Attribute:name+' => '',
-	'Class:Contact/Attribute:status' => '状態',
-	'Class:Contact/Attribute:status+' => '',
-	'Class:Contact/Attribute:status/Value:active' => 'アクティブ',
-	'Class:Contact/Attribute:status/Value:active+' => 'アクティブ',
-	'Class:Contact/Attribute:status/Value:inactive' => '非アクティブ',
-	'Class:Contact/Attribute:status/Value:inactive+' => '非アクティブ',
-	'Class:Contact/Attribute:org_id' => '組織',
-	'Class:Contact/Attribute:org_id+' => '',
-	'Class:Contact/Attribute:org_name' => '組織',
-	'Class:Contact/Attribute:org_name+' => '',
-	'Class:Contact/Attribute:email' => 'Eメール',
-	'Class:Contact/Attribute:email+' => '',
-	'Class:Contact/Attribute:phone' => '電話',
-	'Class:Contact/Attribute:phone+' => '',
-	'Class:Contact/Attribute:notify' => '通知',
-	'Class:Contact/Attribute:notify+' => '',
-	'Class:Contact/Attribute:notify/Value:no' => 'いいえ',
-	'Class:Contact/Attribute:notify/Value:no+' => 'いいえ',
-	'Class:Contact/Attribute:notify/Value:yes' => 'はい',
-	'Class:Contact/Attribute:notify/Value:yes+' => 'はい',
-	'Class:Contact/Attribute:function' => '機能',
-	'Class:Contact/Attribute:function+' => '',
-	'Class:Contact/Attribute:cis_list' => 'CI',
-	'Class:Contact/Attribute:cis_list+' => '',
-	'Class:Contact/Attribute:finalclass' => '連絡先タイプ',
-	'Class:Contact/Attribute:finalclass+' => '',
-));
-
-//
-// Class: Person
-//
-
-Dict::Add('JA JP', 'Japanese', '日本語', array(
-	'Class:Person' => '人物',
-	'Class:Person+' => '',
-	'Class:Person/Attribute:name' => '姓',
-	'Class:Person/Attribute:name+' => '~~',
-	'Class:Person/Attribute:first_name' => 'ファーストネーム',
-	'Class:Person/Attribute:first_name+' => '',
-	'Class:Person/Attribute:employee_number' => '社員番号',
-	'Class:Person/Attribute:employee_number+' => '',
-	'Class:Person/Attribute:mobile_phone' => '携帯電話',
-	'Class:Person/Attribute:mobile_phone+' => '',
-	'Class:Person/Attribute:location_id' => '場所',
-	'Class:Person/Attribute:location_id+' => '',
-	'Class:Person/Attribute:location_name' => '場所名',
-	'Class:Person/Attribute:location_name+' => '',
-	'Class:Person/Attribute:manager_id' => 'マネージャ',
-	'Class:Person/Attribute:manager_id+' => '',
-	'Class:Person/Attribute:manager_name' => 'マネージャ名',
-	'Class:Person/Attribute:manager_name+' => '',
-	'Class:Person/Attribute:team_list' => 'チーム',
-	'Class:Person/Attribute:team_list+' => '',
-	'Class:Person/Attribute:tickets_list' => 'チケット',
-	'Class:Person/Attribute:tickets_list+' => '',
-	'Class:Person/Attribute:manager_id_friendlyname' => 'マネージャーフレンドリ名',
-	'Class:Person/Attribute:manager_id_friendlyname+' => '',
-	'Class:Person/Attribute:picture' => 'Picture~~',
-	'Class:Person/Attribute:picture+' => '~~',
-	'Class:Person/UniquenessRule:employee_number+' => 'The employee number must be unique in the organization~~',
-	'Class:Person/UniquenessRule:employee_number' => 'there is already a person in \'$this->org_name$\' organization with the same employee number~~',
-	'Class:Person/UniquenessRule:name+' => 'The employee name should be unique inside its organization~~',
-	'Class:Person/UniquenessRule:name' => 'There is already a person in \'$this->org_name$\' organization with the same name~~',
-));
-
-//
-// Class: Team
-//
-
-Dict::Add('JA JP', 'Japanese', '日本語', array(
-	'Class:Team' => 'チーム',
-	'Class:Team+' => '',
-	'Class:Team/Attribute:persons_list' => 'メンバー',
-	'Class:Team/Attribute:persons_list+' => '',
-	'Class:Team/Attribute:tickets_list' => 'チケット',
-	'Class:Team/Attribute:tickets_list+' => '',
-));
-
-//
-// Class: Document
-//
-
-Dict::Add('JA JP', 'Japanese', '日本語', array(
-	'Class:Document' => '文書',
-	'Class:Document+' => '',
-	'Class:Document/Attribute:name' => '名前',
-	'Class:Document/Attribute:name+' => '',
-	'Class:Document/Attribute:org_id' => '組織',
-	'Class:Document/Attribute:org_id+' => '',
-	'Class:Document/Attribute:org_name' => '組織名',
-	'Class:Document/Attribute:org_name+' => '',
-	'Class:Document/Attribute:documenttype_id' => '文書タイプ',
-	'Class:Document/Attribute:documenttype_id+' => '',
-	'Class:Document/Attribute:documenttype_name' => '文書タイプ名',
-	'Class:Document/Attribute:documenttype_name+' => '',
-	'Class:Document/Attribute:version' => 'Version~~',
-	'Class:Document/Attribute:version+' => '~~',
-	'Class:Document/Attribute:description' => '説明',
-	'Class:Document/Attribute:description+' => '',
-	'Class:Document/Attribute:status' => '状態',
-	'Class:Document/Attribute:status+' => '',
-	'Class:Document/Attribute:status/Value:draft' => '下書き',
-	'Class:Document/Attribute:status/Value:draft+' => '',
-	'Class:Document/Attribute:status/Value:obsolete' => '廃止',
-	'Class:Document/Attribute:status/Value:obsolete+' => '',
-	'Class:Document/Attribute:status/Value:published' => '公開済み',
-	'Class:Document/Attribute:status/Value:published+' => '',
-	'Class:Document/Attribute:cis_list' => 'CI',
-	'Class:Document/Attribute:cis_list+' => '',
-	'Class:Document/Attribute:contracts_list' => '契約',
-	'Class:Document/Attribute:contracts_list+' => '',
-	'Class:Document/Attribute:services_list' => 'サービス',
-	'Class:Document/Attribute:services_list+' => '',
-	'Class:Document/Attribute:finalclass' => '文書タイプ',
-	'Class:Document/Attribute:finalclass+' => '',
-));
-
-//
-// Class: DocumentFile
-//
-
-Dict::Add('JA JP', 'Japanese', '日本語', array(
-	'Class:DocumentFile' => '文書ファイル',
-	'Class:DocumentFile+' => '',
-	'Class:DocumentFile/Attribute:file' => 'ファイル',
-	'Class:DocumentFile/Attribute:file+' => '',
-));
-
-//
-// Class: DocumentNote
-//
-
-Dict::Add('JA JP', 'Japanese', '日本語', array(
-	'Class:DocumentNote' => '文書ノート',
-	'Class:DocumentNote+' => '',
-	'Class:DocumentNote/Attribute:text' => 'テキスト',
-	'Class:DocumentNote/Attribute:text+' => '',
-));
-
-//
-// Class: DocumentWeb
-//
-
-Dict::Add('JA JP', 'Japanese', '日本語', array(
-	'Class:DocumentWeb' => '文書Web',
-	'Class:DocumentWeb+' => '',
-	'Class:DocumentWeb/Attribute:url' => 'URL',
-	'Class:DocumentWeb/Attribute:url+' => '',
-));
-
 //
 // Class: FunctionalCI
 //
@@ -1237,19 +1011,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkDocumentToLicence/Attribute:document_name+' => '',
 ));
 
-//
-// Class: Typology
-//
-
-Dict::Add('JA JP', 'Japanese', '日本語', array(
-	'Class:Typology' => '分類',
-	'Class:Typology+' => '',
-	'Class:Typology/Attribute:name' => '名前',
-	'Class:Typology/Attribute:name+' => '',
-	'Class:Typology/Attribute:finalclass' => 'タイプ',
-	'Class:Typology/Attribute:finalclass+' => '',
-));
-
 //
 // Class: OSVersion
 //
@@ -1272,24 +1033,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:OSFamily+' => '',
 ));
 
-//
-// Class: DocumentType
-//
-
-Dict::Add('JA JP', 'Japanese', '日本語', array(
-	'Class:DocumentType' => '文書タイプ',
-	'Class:DocumentType+' => '',
-));
-
-//
-// Class: ContactType
-//
-
-Dict::Add('JA JP', 'Japanese', '日本語', array(
-	'Class:ContactType' => '問い合せ先タイプ',
-	'Class:ContactType+' => '',
-));
-
 //
 // Class: Brand
 //
@@ -1450,23 +1193,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkDocumentToSoftware/Attribute:document_name+' => '',
 ));
 
-//
-// Class: lnkContactToFunctionalCI
-//
-
-Dict::Add('JA JP', 'Japanese', '日本語', array(
-	'Class:lnkContactToFunctionalCI' => 'リンク 連絡先/機能的CI',
-	'Class:lnkContactToFunctionalCI+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => '機能的ci',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => '機能的ci名',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => '連絡先',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => '連絡先名',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
-));
-
 //
 // Class: lnkDocumentToFunctionalCI
 //
@@ -1713,27 +1439,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_name+' => '',
 ));
 
-//
-// Class: lnkPersonToTeam
-//
-
-Dict::Add('JA JP', 'Japanese', '日本語', array(
-	'Class:lnkPersonToTeam' => 'リンク 人物/チーム',
-	'Class:lnkPersonToTeam+' => '',
-	'Class:lnkPersonToTeam/Attribute:team_id' => 'チーム',
-	'Class:lnkPersonToTeam/Attribute:team_id+' => '',
-	'Class:lnkPersonToTeam/Attribute:team_name' => 'チーム名',
-	'Class:lnkPersonToTeam/Attribute:team_name+' => '',
-	'Class:lnkPersonToTeam/Attribute:person_id' => '人物',
-	'Class:lnkPersonToTeam/Attribute:person_id+' => '',
-	'Class:lnkPersonToTeam/Attribute:person_name' => '名前',
-	'Class:lnkPersonToTeam/Attribute:person_name+' => '',
-	'Class:lnkPersonToTeam/Attribute:role_id' => '役割',
-	'Class:lnkPersonToTeam/Attribute:role_id+' => '',
-	'Class:lnkPersonToTeam/Attribute:role_name' => '役割名',
-	'Class:lnkPersonToTeam/Attribute:role_name+' => '',
-));
-
 //
 // Class: Group
 //
@@ -1789,42 +1494,37 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkGroupToCI/Attribute:reason+' => '',
 ));
 
+//
+// Add translation for Fieldsets
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Server:baseinfo' => '基本情報',
+	'Server:Date' => '日付',
+	'Server:moreinfo' => '追加情報',
+	'Server:otherinfo' => '他の情報',
+	'Server:power' => 'Power supply~~',
+	'Person:info' => '情報',
+	'UserLocal:info' => 'General information~~',
+	'Person:personal_info' => 'Personal information~~',
+	'Person:notifiy' => '通知',
+	'Class:Subnet/Tab:IPUsage' => 'IP 利用',
+	'Class:Subnet/Tab:IPUsage-explain' => 'インターフェースは、レンジ: <em>%1$s</em> から <em>%2$s</em>の中のIPを持っています。',
+	'Class:Subnet/Tab:FreeIPs' => 'フリーなIP',
+	'Class:Subnet/Tab:FreeIPs-count' => 'フリーIP: %1$s',
+	'Class:Subnet/Tab:FreeIPs-explain' => '10個のフリーなIPアドレス',
+	'Class:Document:PreviewTab' => 'プレビュー',
+));
 
 //
 // Application Menu
 //
 
 Dict::Add('JA JP', 'Japanese', '日本語', array(
-	'Menu:DataAdministration' => 'データ管理',
-	'Menu:DataAdministration+' => 'データ管理',
-	'Menu:Catalogs' => 'カタログ',
-	'Menu:Catalogs+' => 'データタイプ',
-	'Menu:Audit' => '監査',
-	'Menu:Audit+' => '監査',
-	'Menu:CSVImport' => 'CSV インポート',
-	'Menu:CSVImport+' => '一括作成/一括更新',
-	'Menu:Organization' => '組織',
-	'Menu:Organization+' => '全組織',
 	'Menu:Application' => 'アプリケーション',
 	'Menu:Application+' => '全アプリケーション',
 	'Menu:DBServer' => 'DBサーバ',
 	'Menu:DBServer+' => 'DBサーバ',
-	'Menu:ConfigManagement' => '構成管理',
-	'Menu:ConfigManagement+' => '構成管理',
-	'Menu:ConfigManagementOverview' => '概要',
-	'Menu:ConfigManagementOverview+' => '概要',
-	'Menu:Contact' => '連絡先',
-	'Menu:Contact+' => '連絡先',
-	'Menu:Contact:Count' => '%1$d',
-	'Menu:Person' => '人物',
-	'Menu:Person+' => '全人物',
-	'Menu:Team' => 'チーム',
-	'Menu:Team+' => '全チーム',
-	'Menu:Document' => '文書',
-	'Menu:Document+' => '全文書',
-	'Menu:Location' => '場所',
-
-	'Menu:Location+' => '全ての場所',
 	'Menu:ConfigManagementCI' => '構成管理項目',
 	'Menu:ConfigManagementCI+' => '構成管理項目',
 	'Menu:BusinessProcess' => 'ビジネスプロセス',
@@ -1850,11 +1550,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Menu:MobilePhone' => '携帯電話',
 	'Menu:MobilePhone+' => '全携帯電話',
 	'Menu:PC' => 'パーソナルコンピュタ',
-	'Menu:PC+' => '全パーソナルコンピュータ',
-	'Menu:NewContact' => '新規連絡先',
-	'Menu:NewContact+' => '新規連絡先',
-	'Menu:SearchContacts' => '連絡先検索',
-	'Menu:SearchContacts+' => '連絡先検索',
 	'Menu:NewCI' => '新規CI',
 	'Menu:NewCI+' => '新規CI',
 	'Menu:SearchCIs' => 'CI検索',
@@ -1866,37 +1561,8 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Menu:ConfigManagement:SWAndApps' => 'ソフトウエアとアプリケーション',
 	'Menu:ConfigManagement:Misc' => 'その他',
 	'Menu:Group' => 'CIグループ',
-	'Menu:Group+' => 'CIグループ',
-	'Menu:ConfigManagement:Shortcuts' => 'ショートカット',
-	'Menu:ConfigManagement:AllContacts' => '全連絡先: %1$d',
-	'Menu:Typology' => 'トポロジー構成',
-	'Menu:Typology+' => 'トポロジー構成',
 	'Menu:OSVersion' => 'OS バージョン',
 	'Menu:OSVersion+' => '',
 	'Menu:Software' => 'ソフトウエアカタログ',
 	'Menu:Software+' => 'ソフトウエアカタログ',
-	'UI_WelcomeMenu_AllConfigItems' => 'サマリー',
-	'Menu:ConfigManagement:Typology' => '分類構成',
-
-));
-
-
-// Add translation for Fieldsets
-
-Dict::Add('JA JP', 'Japanese', '日本語', array(
-	'Server:baseinfo' => '基本情報',
-	'Server:Date' => '日付',
-	'Server:moreinfo' => '追加情報',
-	'Server:otherinfo' => '他の情報',
-	'Server:power' => 'Power supply~~',
-	'Person:info' => '情報',
-	'UserLocal:info' => 'General information~~',
-	'Person:personal_info' => 'Personal information~~',
-	'Person:notifiy' => '通知',
-	'Class:Subnet/Tab:IPUsage' => 'IP 利用',
-	'Class:Subnet/Tab:IPUsage-explain' => 'インターフェースは、レンジ: <em>%1$s</em> から <em>%2$s</em>の中のIPを持っています。',
-	'Class:Subnet/Tab:FreeIPs' => 'フリーなIP',
-	'Class:Subnet/Tab:FreeIPs-count' => 'フリーIP: %1$s',
-	'Class:Subnet/Tab:FreeIPs-explain' => '10個のフリーなIPアドレス',
-	'Class:Document:PreviewTab' => 'プレビュー',
 ));
diff --git a/datamodels/2.x/itop-config-mgmt/module.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/module.itop-config-mgmt.php
index 6ae525f15..04d9ca05c 100755
--- a/datamodels/2.x/itop-config-mgmt/module.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/module.itop-config-mgmt.php
@@ -13,8 +13,9 @@ SetupWebPage::AddModule(
 		// Setup
 		//
 		'dependencies' => array(
+			'itop-structure/2.7.1',
 		),
-		'mandatory' => true,
+		'mandatory' => false,
 		'visible' => true,
 		'installer' => 'ConfigMgmtInstaller',
 
@@ -27,17 +28,11 @@ SetupWebPage::AddModule(
 		'data.struct' => array(
 		),
 		'data.sample' => array(
-			'data.sample.organizations.xml',
 			'data.sample.brand.xml',
 			'data.sample.model.xml',
 			'data.sample.osfamily.xml',
 			'data.sample.osversion.xml',
 			'data.sample.networkdevicetype.xml',
-			'data.sample.contacttype.xml',
-			'data.sample.locations.xml',
-			'data.sample.persons.xml',
-			'data.sample.teams.xml',
-			'data.sample.contactteam.xml',
 			'data.sample.servers.xml',
 			'data.sample.nw-devices.xml',
 			'data.sample.software.xml',
diff --git a/datamodels/2.x/itop-config-mgmt/nl.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/nl.dict.itop-config-mgmt.php
index c4932932f..fea5f6b17 100644
--- a/datamodels/2.x/itop-config-mgmt/nl.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/nl.dict.itop-config-mgmt.php
@@ -81,232 +81,6 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 //////////////////////////////////////////////////////////////////////
 //
 
-
-//
-// Class: Organization
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:Organization' => 'Organisatie',
-	'Class:Organization+' => '',
-	'Class:Organization/Attribute:name' => 'Naam',
-	'Class:Organization/Attribute:name+' => 'Gekende naam voor de organisatie',
-	'Class:Organization/Attribute:code' => 'Code',
-	'Class:Organization/Attribute:code+' => 'Code voor de organisatie',
-	'Class:Organization/Attribute:status' => 'Status',
-	'Class:Organization/Attribute:status+' => '',
-	'Class:Organization/Attribute:status/Value:active' => 'Actief',
-	'Class:Organization/Attribute:status/Value:active+' => 'Actief',
-	'Class:Organization/Attribute:status/Value:inactive' => 'Inactief',
-	'Class:Organization/Attribute:status/Value:inactive+' => 'Inactief',
-	'Class:Organization/Attribute:parent_id' => 'Hoofdorganisatie',
-	'Class:Organization/Attribute:parent_id+' => 'Hoofdorganisatie',
-	'Class:Organization/Attribute:parent_name' => 'Naam hoofdorganisatie',
-	'Class:Organization/Attribute:parent_name+' => 'Naam van de hoofdorganisatie',
-	'Class:Organization/Attribute:deliverymodel_id' => 'Leveringsmodel',
-	'Class:Organization/Attribute:deliverymodel_id+' => '',
-	'Class:Organization/Attribute:deliverymodel_name' => 'Naam leveringsmodel',
-	'Class:Organization/Attribute:deliverymodel_name+' => '',
-	'Class:Organization/Attribute:parent_id_friendlyname' => 'Hoofdorganisatie',
-	'Class:Organization/Attribute:parent_id_friendlyname+' => 'Hoofdorganisatie',
-	'Class:Organization/Attribute:overview' => 'Overzicht',
-	'Organization:Overview:FunctionalCIs' => 'Configuratie-items van deze organisatie',
-	'Organization:Overview:FunctionalCIs:subtitle' => 'per type',
-	'Organization:Overview:Users' => 'iTop-gebruikers in deze organisatie',
-));
-
-//
-// Class: Location
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:Location' => 'Locatie',
-	'Class:Location+' => 'Een locatie zoals: land, regio, gemeente/stad, gebouw, verdieping, kamer, ...',
-	'Class:Location/Attribute:name' => 'Naam',
-	'Class:Location/Attribute:name+' => '',
-	'Class:Location/Attribute:status' => 'Status',
-	'Class:Location/Attribute:status+' => '',
-	'Class:Location/Attribute:status/Value:active' => 'Actief',
-	'Class:Location/Attribute:status/Value:active+' => 'Actief',
-	'Class:Location/Attribute:status/Value:inactive' => 'Inactief',
-	'Class:Location/Attribute:status/Value:inactive+' => 'Inactief',
-	'Class:Location/Attribute:org_id' => 'Organisatie',
-	'Class:Location/Attribute:org_id+' => '',
-	'Class:Location/Attribute:org_name' => 'Naam organisatie',
-	'Class:Location/Attribute:org_name+' => '',
-	'Class:Location/Attribute:address' => 'Adres',
-	'Class:Location/Attribute:address+' => 'Adres van de organisatie',
-	'Class:Location/Attribute:postal_code' => 'Postcode',
-	'Class:Location/Attribute:postal_code+' => 'Postcode van de organisatie',
-	'Class:Location/Attribute:city' => 'Gemeente',
-	'Class:Location/Attribute:city+' => '',
-	'Class:Location/Attribute:country' => 'Land',
-	'Class:Location/Attribute:country+' => '',
-	'Class:Location/Attribute:physicaldevice_list' => 'Apparaten',
-	'Class:Location/Attribute:physicaldevice_list+' => 'Alle apparaten die zich op deze locatie bevinden',
-	'Class:Location/Attribute:person_list' => 'Contacten',
-	'Class:Location/Attribute:person_list+' => 'Alle contacten die zich op deze locatie bevinden',
-));
-
-//
-// Class: Contact
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:Contact' => 'Contact',
-	'Class:Contact+' => '',
-	'Class:Contact/Attribute:name' => 'Naam',
-	'Class:Contact/Attribute:name+' => '',
-	'Class:Contact/Attribute:status' => 'Status',
-	'Class:Contact/Attribute:status+' => '',
-	'Class:Contact/Attribute:status/Value:active' => 'Actief',
-	'Class:Contact/Attribute:status/Value:active+' => 'Actief',
-	'Class:Contact/Attribute:status/Value:inactive' => 'Inactief',
-	'Class:Contact/Attribute:status/Value:inactive+' => 'Inactief',
-	'Class:Contact/Attribute:org_id' => 'Organisatie',
-	'Class:Contact/Attribute:org_id+' => '',
-	'Class:Contact/Attribute:org_name' => 'Naam organisatie',
-	'Class:Contact/Attribute:org_name+' => '',
-	'Class:Contact/Attribute:email' => 'E-mailadres',
-	'Class:Contact/Attribute:email+' => '',
-	'Class:Contact/Attribute:phone' => 'Telefoon',
-	'Class:Contact/Attribute:phone+' => '',
-	'Class:Contact/Attribute:notify' => 'Melding',
-	'Class:Contact/Attribute:notify+' => '',
-	'Class:Contact/Attribute:notify/Value:no' => 'Nee',
-	'Class:Contact/Attribute:notify/Value:no+' => 'Nee',
-	'Class:Contact/Attribute:notify/Value:yes' => 'Ja',
-	'Class:Contact/Attribute:notify/Value:yes+' => 'Ja',
-	'Class:Contact/Attribute:function' => 'Functie',
-	'Class:Contact/Attribute:function+' => '',
-	'Class:Contact/Attribute:cis_list' => 'CI\'s',
-	'Class:Contact/Attribute:cis_list+' => 'Alle configuratie-items die gerelateerd zijn aan dit team',
-	'Class:Contact/Attribute:finalclass' => 'Subklasse contact',
-	'Class:Contact/Attribute:finalclass+' => '',
-));
-
-//
-// Class: Person
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:Person' => 'Persoon',
-	'Class:Person+' => '',
-	'Class:Person/Attribute:name' => 'Achternaam',
-	'Class:Person/Attribute:name+' => '',
-	'Class:Person/Attribute:first_name' => 'Voornaam',
-	'Class:Person/Attribute:first_name+' => '',
-	'Class:Person/Attribute:employee_number' => 'Identificatienummer',
-	'Class:Person/Attribute:employee_number+' => 'Een uniek nummer om de persoon te identificeren (bv. rijksregister, burgerservicenummer, werknemernummer, ...)',
-	'Class:Person/Attribute:mobile_phone' => 'Mobiele telefoon',
-	'Class:Person/Attribute:mobile_phone+' => '',
-	'Class:Person/Attribute:location_id' => 'Locatie',
-	'Class:Person/Attribute:location_id+' => 'Locatie waar de persoon gecontacteerd kan worden',
-	'Class:Person/Attribute:location_name' => 'Naam locatie',
-	'Class:Person/Attribute:location_name+' => '',
-	'Class:Person/Attribute:manager_id' => 'Manager',
-	'Class:Person/Attribute:manager_id+' => '',
-	'Class:Person/Attribute:manager_name' => 'Naam manager',
-	'Class:Person/Attribute:manager_name+' => '',
-	'Class:Person/Attribute:team_list' => 'Teams',
-	'Class:Person/Attribute:team_list+' => 'Alle teams waarvan deze persoon lid is',
-	'Class:Person/Attribute:tickets_list' => 'Tickets',
-	'Class:Person/Attribute:tickets_list+' => 'Alle tickets waarvan deze persoon de aanvrager is',
-	'Class:Person/Attribute:manager_id_friendlyname' => 'Herkenbare naam manager',
-	'Class:Person/Attribute:manager_id_friendlyname+' => '',
-	'Class:Person/Attribute:picture' => 'Foto',
-	'Class:Person/Attribute:picture+' => 'Foto van de contactpersoon',
-	'Class:Person/UniquenessRule:employee_number+' => 'Het identificatienummer moet uniek zijn binnen de organisatie',
-	'Class:Person/UniquenessRule:employee_number' => 'Er is al een persoon in de organisatie \'$this->org_name$\' met hetzelfde identificatienummer',
-	'Class:Person/UniquenessRule:name+' => 'De naam moet uniek zijn binnen een organisatie',
-	'Class:Person/UniquenessRule:name' => 'Er is al een persoon in de organisatie \'$this->org_name$\' met dezelfde naam',
-));
-
-//
-// Class: Team
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:Team' => 'Team',
-	'Class:Team+' => '',
-	'Class:Team/Attribute:persons_list' => 'Leden',
-	'Class:Team/Attribute:persons_list+' => 'Alle personen die lid zijn van dit team',
-	'Class:Team/Attribute:tickets_list' => 'Tickets',
-	'Class:Team/Attribute:tickets_list+' => 'Alle tickets die toegewezen zijn aan dit team',
-));
-
-//
-// Class: Document
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:Document' => 'Document',
-	'Class:Document+' => '',
-	'Class:Document/Attribute:name' => 'Naam',
-	'Class:Document/Attribute:name+' => '',
-	'Class:Document/Attribute:org_id' => 'Organisatie',
-	'Class:Document/Attribute:org_id+' => '',
-	'Class:Document/Attribute:org_name' => 'Naam organisatie',
-	'Class:Document/Attribute:org_name+' => '',
-	'Class:Document/Attribute:documenttype_id' => 'Soort document',
-	'Class:Document/Attribute:documenttype_id+' => '',
-	'Class:Document/Attribute:documenttype_name' => 'Naam van het soort document',
-	'Class:Document/Attribute:documenttype_name+' => '',
-	'Class:Document/Attribute:version' => 'Versie',
-	'Class:Document/Attribute:version+' => '',
-	'Class:Document/Attribute:description' => 'Omschrijving',
-	'Class:Document/Attribute:description+' => '',
-	'Class:Document/Attribute:status' => 'Status',
-	'Class:Document/Attribute:status+' => '',
-	'Class:Document/Attribute:status/Value:draft' => 'Concept',
-	'Class:Document/Attribute:status/Value:draft+' => '',
-	'Class:Document/Attribute:status/Value:obsolete' => 'Verouderd',
-	'Class:Document/Attribute:status/Value:obsolete+' => '',
-	'Class:Document/Attribute:status/Value:published' => 'Gepubliceerd',
-	'Class:Document/Attribute:status/Value:published+' => '',
-	'Class:Document/Attribute:cis_list' => 'CI\'s',
-	'Class:Document/Attribute:cis_list+' => 'Alle configuratie-items gerelateerd aan dit document',
-	'Class:Document/Attribute:contracts_list' => 'Contracten',
-	'Class:Document/Attribute:contracts_list+' => 'Alle contracten gerelateerd aan dit document',
-	'Class:Document/Attribute:services_list' => 'Services',
-	'Class:Document/Attribute:services_list+' => 'Alle services gerelateerd aan dit document.',
-	'Class:Document/Attribute:finalclass' => 'Subklasse document',
-	'Class:Document/Attribute:finalclass+' => '',
-));
-
-//
-// Class: DocumentFile
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:DocumentFile' => 'Document: Bestand',
-	'Class:DocumentFile+' => '',
-	'Class:DocumentFile/Attribute:file' => 'Bestand',
-	'Class:DocumentFile/Attribute:file+' => '',
-));
-
-//
-// Class: DocumentNote
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:DocumentNote' => 'Document: Notitie',
-	'Class:DocumentNote+' => '',
-	'Class:DocumentNote/Attribute:text' => 'Tekst',
-	'Class:DocumentNote/Attribute:text+' => '',
-));
-
-//
-// Class: DocumentWeb
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:DocumentWeb' => 'Document: Web',
-	'Class:DocumentWeb+' => '',
-	'Class:DocumentWeb/Attribute:url' => 'Link (URL)',
-	'Class:DocumentWeb/Attribute:url+' => '',
-));
-
 //
 // Class: FunctionalCI
 //
@@ -1249,19 +1023,6 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:lnkDocumentToLicence/Attribute:document_name+' => '',
 ));
 
-//
-// Class: Typology
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:Typology' => 'Typologie',
-	'Class:Typology+' => '',
-	'Class:Typology/Attribute:name' => 'Naam',
-	'Class:Typology/Attribute:name+' => '',
-	'Class:Typology/Attribute:finalclass' => 'Subklasse typologie',
-	'Class:Typology/Attribute:finalclass+' => '',
-));
-
 //
 // Class: OSVersion
 //
@@ -1284,24 +1045,6 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:OSFamily+' => '',
 ));
 
-//
-// Class: DocumentType
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:DocumentType' => 'Soort Document',
-	'Class:DocumentType+' => '',
-));
-
-//
-// Class: ContactType
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:ContactType' => 'Soort Contact',
-	'Class:ContactType+' => '',
-));
-
 //
 // Class: Brand
 //
@@ -1462,23 +1205,6 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:lnkDocumentToSoftware/Attribute:document_name+' => '',
 ));
 
-//
-// Class: lnkContactToFunctionalCI
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:lnkContactToFunctionalCI' => 'Link Contact / Functioneel CI',
-	'Class:lnkContactToFunctionalCI+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Functioneel CI',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Naam functioneel CI',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contact',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Naam contact',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
-));
-
 //
 // Class: lnkDocumentToFunctionalCI
 //
@@ -1725,27 +1451,6 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_name+' => '',
 ));
 
-//
-// Class: lnkPersonToTeam
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:lnkPersonToTeam' => 'Link Persoon / Team',
-	'Class:lnkPersonToTeam+' => '',
-	'Class:lnkPersonToTeam/Attribute:team_id' => 'Team',
-	'Class:lnkPersonToTeam/Attribute:team_id+' => '',
-	'Class:lnkPersonToTeam/Attribute:team_name' => 'Naam team',
-	'Class:lnkPersonToTeam/Attribute:team_name+' => '',
-	'Class:lnkPersonToTeam/Attribute:person_id' => 'Persoon',
-	'Class:lnkPersonToTeam/Attribute:person_id+' => '',
-	'Class:lnkPersonToTeam/Attribute:person_name' => 'Naam persoon',
-	'Class:lnkPersonToTeam/Attribute:person_name+' => '',
-	'Class:lnkPersonToTeam/Attribute:role_id' => 'Rol',
-	'Class:lnkPersonToTeam/Attribute:role_id+' => '',
-	'Class:lnkPersonToTeam/Attribute:role_name' => 'Naam rol',
-	'Class:lnkPersonToTeam/Attribute:role_name+' => '',
-));
-
 //
 // Class: Group
 //
@@ -1801,42 +1506,37 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:lnkGroupToCI/Attribute:reason+' => '',
 ));
 
+//
+// Add translation for Fieldsets
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Server:baseinfo' => 'Globale informatie',
+	'Server:Date' => 'Datum',
+	'Server:moreinfo' => 'Meer informatie',
+	'Server:otherinfo' => 'Andere informatie',
+	'Server:power' => 'Stroomtoevoer',
+	'Person:info' => 'Globale informatie',
+	'UserLocal:info' => 'Globale informatie',
+	'Person:personal_info' => 'Persoonlijke informatie',
+	'Person:notifiy' => 'Notificeer',
+	'Class:Subnet/Tab:IPUsage' => 'IP-gebruik',
+	'Class:Subnet/Tab:IPUsage-explain' => 'Interfaces met een IP-adres in de reeks: <em>%1$s</em> tot en met <em>%2$s</em>',
+	'Class:Subnet/Tab:FreeIPs' => 'Beschikbare IP-adressen',
+	'Class:Subnet/Tab:FreeIPs-count' => 'Beschikbare IP-adressen: %1$s',
+	'Class:Subnet/Tab:FreeIPs-explain' => 'Dit zijn 10 beschikbare IP-adressen',
+	'Class:Document:PreviewTab' => 'Voorbeeld',
+));
 
 //
 // Application Menu
 //
 
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Menu:DataAdministration' => 'Databeheer',
-	'Menu:DataAdministration+' => 'Databeheer',
-	'Menu:Catalogs' => 'Catalogus',
-	'Menu:Catalogs+' => 'Soorten data',
-	'Menu:Audit' => 'Audit',
-	'Menu:Audit+' => 'Audit',
-	'Menu:CSVImport' => 'CSV-import',
-	'Menu:CSVImport+' => 'Grootschalige aanmaak of update',
-	'Menu:Organization' => 'Organisaties',
-	'Menu:Organization+' => 'Alle organisaties',
 	'Menu:Application' => 'Applicaties',
 	'Menu:Application+' => 'Alle applicaties',
 	'Menu:DBServer' => 'Databaseservers',
 	'Menu:DBServer+' => 'Databaseservers',
-	'Menu:ConfigManagement' => 'Configuratiebeheer',
-	'Menu:ConfigManagement+' => 'Configuratiebeheer',
-	'Menu:ConfigManagementOverview' => 'Overzicht',
-	'Menu:ConfigManagementOverview+' => 'Overzicht',
-	'Menu:Contact' => 'Contacten',
-	'Menu:Contact+' => 'Contacten',
-	'Menu:Contact:Count' => '%1$d contacten',
-	'Menu:Person' => 'Personen',
-	'Menu:Person+' => 'Alle personen',
-	'Menu:Team' => 'Teams',
-	'Menu:Team+' => 'Alle teams',
-	'Menu:Document' => 'Documenten',
-	'Menu:Document+' => 'Alle documenten',
-	'Menu:Location' => 'Locaties',
-
-	'Menu:Location+' => 'Alle locaties',
 	'Menu:ConfigManagementCI' => 'Configuratie-items',
 	'Menu:ConfigManagementCI+' => 'Configuratie-items',
 	'Menu:BusinessProcess' => 'Bedrijfsprocessen',
@@ -1863,10 +1563,6 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Menu:MobilePhone+' => 'Alle mobiele telefoons',
 	'Menu:PC' => 'PC\'s',
 	'Menu:PC+' => 'Alle PC\'s',
-	'Menu:NewContact' => 'Nieuw contact',
-	'Menu:NewContact+' => 'Maak een nieuw contact aan',
-	'Menu:SearchContacts' => 'Zoek naar contacten',
-	'Menu:SearchContacts+' => 'Zoek naar contacten',
 	'Menu:NewCI' => 'Nieuw configuratie-item',
 	'Menu:NewCI+' => 'Maak een nieuw configuratie-item aan',
 	'Menu:SearchCIs' => 'Zoek naar CI\'s',
@@ -1879,36 +1575,8 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Menu:ConfigManagement:Misc' => 'Diversen',
 	'Menu:Group' => 'Groepen van CI\'s',
 	'Menu:Group+' => 'Groepen van CI\'s',
-	'Menu:ConfigManagement:Shortcuts' => 'Snelkoppelingen',
-	'Menu:ConfigManagement:AllContacts' => 'Alle contacten: %1$d',
-	'Menu:Typology' => 'Configuratie typologie',
-	'Menu:Typology+' => 'Configuratie van de typologie',
 	'Menu:OSVersion' => 'Versies besturingssysteem',
 	'Menu:OSVersion+' => '',
 	'Menu:Software' => 'Softwarecatalogus',
 	'Menu:Software+' => 'Softwarecatalogus',
-	'UI_WelcomeMenu_AllConfigItems' => 'Samenvatting',
-	'Menu:ConfigManagement:Typology' => 'Configuratie typologie',
-
-));
-
-
-// Add translation for Fieldsets
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Server:baseinfo' => 'Globale informatie',
-	'Server:Date' => 'Datum',
-	'Server:moreinfo' => 'Meer informatie',
-	'Server:otherinfo' => 'Andere informatie',
-	'Server:power' => 'Stroomtoevoer',
-	'Person:info' => 'Globale informatie',
-	'UserLocal:info' => 'Globale informatie',
-	'Person:personal_info' => 'Persoonlijke informatie',
-	'Person:notifiy' => 'Notificeer',
-	'Class:Subnet/Tab:IPUsage' => 'IP-gebruik',
-	'Class:Subnet/Tab:IPUsage-explain' => 'Interfaces met een IP-adres in de reeks: <em>%1$s</em> tot en met <em>%2$s</em>',
-	'Class:Subnet/Tab:FreeIPs' => 'Beschikbare IP-adressen',
-	'Class:Subnet/Tab:FreeIPs-count' => 'Beschikbare IP-adressen: %1$s',
-	'Class:Subnet/Tab:FreeIPs-explain' => 'Dit zijn 10 beschikbare IP-adressen',
-	'Class:Document:PreviewTab' => 'Voorbeeld',
-));
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-config-mgmt/pt_br.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/pt_br.dict.itop-config-mgmt.php
index 8e08db5f6..8a5aa572b 100755
--- a/datamodels/2.x/itop-config-mgmt/pt_br.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/pt_br.dict.itop-config-mgmt.php
@@ -75,232 +75,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //////////////////////////////////////////////////////////////////////
 //
 
-
-//
-// Class: Organization
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:Organization' => 'Organização',
-	'Class:Organization+' => '',
-	'Class:Organization/Attribute:name' => 'Nome',
-	'Class:Organization/Attribute:name+' => 'Nome comum',
-	'Class:Organization/Attribute:code' => 'Código',
-	'Class:Organization/Attribute:code+' => 'Código organização (Siret, DUNS,...)',
-	'Class:Organization/Attribute:status' => 'Estado',
-	'Class:Organization/Attribute:status+' => '',
-	'Class:Organization/Attribute:status/Value:active' => 'Ativo',
-	'Class:Organization/Attribute:status/Value:active+' => 'Ativo',
-	'Class:Organization/Attribute:status/Value:inactive' => 'Inativo',
-	'Class:Organization/Attribute:status/Value:inactive+' => 'Inativo',
-	'Class:Organization/Attribute:parent_id' => 'Principal',
-	'Class:Organization/Attribute:parent_id+' => 'Organização principal',
-	'Class:Organization/Attribute:parent_name' => 'Nome principal',
-	'Class:Organization/Attribute:parent_name+' => 'Nome da organização principal',
-	'Class:Organization/Attribute:deliverymodel_id' => 'Modelo entrega',
-	'Class:Organization/Attribute:deliverymodel_id+' => '',
-	'Class:Organization/Attribute:deliverymodel_name' => 'Nome modelo entrega',
-	'Class:Organization/Attribute:deliverymodel_name+' => '',
-	'Class:Organization/Attribute:parent_id_friendlyname' => 'Principal',
-	'Class:Organization/Attribute:parent_id_friendlyname+' => 'Organização principal',
-	'Class:Organization/Attribute:overview' => 'Visão geral',
-	'Organization:Overview:FunctionalCIs' => 'Itens de configuração desta organização',
-	'Organization:Overview:FunctionalCIs:subtitle' => 'por tipo',
-	'Organization:Overview:Users' => 'Usuários iTop dentro desta organização',
-));
-
-//
-// Class: Location
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:Location' => 'Localidade',
-	'Class:Location+' => 'Qualquer tipo de localização: Região, País, Cidade, Lugar, Edifício, Andar, Sala, Rack,...',
-	'Class:Location/Attribute:name' => 'Nome',
-	'Class:Location/Attribute:name+' => '',
-	'Class:Location/Attribute:status' => 'Estado',
-	'Class:Location/Attribute:status+' => '',
-	'Class:Location/Attribute:status/Value:active' => 'Ativo',
-	'Class:Location/Attribute:status/Value:active+' => 'Ativo',
-	'Class:Location/Attribute:status/Value:inactive' => 'Inativo',
-	'Class:Location/Attribute:status/Value:inactive+' => 'Inativo',
-	'Class:Location/Attribute:org_id' => 'Organização',
-	'Class:Location/Attribute:org_id+' => '',
-	'Class:Location/Attribute:org_name' => 'Nome organização',
-	'Class:Location/Attribute:org_name+' => '',
-	'Class:Location/Attribute:address' => 'Endereço',
-	'Class:Location/Attribute:address+' => 'Endereço',
-	'Class:Location/Attribute:postal_code' => 'CEP',
-	'Class:Location/Attribute:postal_code+' => 'CEP',
-	'Class:Location/Attribute:city' => 'Cidade',
-	'Class:Location/Attribute:city+' => '',
-	'Class:Location/Attribute:country' => 'País',
-	'Class:Location/Attribute:country+' => '',
-	'Class:Location/Attribute:physicaldevice_list' => 'Dispositivos',
-	'Class:Location/Attribute:physicaldevice_list+' => 'Todos os dispositivos desta localidade',
-	'Class:Location/Attribute:person_list' => 'Contatos',
-	'Class:Location/Attribute:person_list+' => 'Todos os contatos desta localidade',
-));
-
-//
-// Class: Contact
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:Contact' => 'Contato',
-	'Class:Contact+' => '',
-	'Class:Contact/Attribute:name' => 'Nome',
-	'Class:Contact/Attribute:name+' => '',
-	'Class:Contact/Attribute:status' => 'Estado',
-	'Class:Contact/Attribute:status+' => '',
-	'Class:Contact/Attribute:status/Value:active' => 'Ativo',
-	'Class:Contact/Attribute:status/Value:active+' => 'Ativo',
-	'Class:Contact/Attribute:status/Value:inactive' => 'Inativo',
-	'Class:Contact/Attribute:status/Value:inactive+' => 'Inativo',
-	'Class:Contact/Attribute:org_id' => 'Organização',
-	'Class:Contact/Attribute:org_id+' => '',
-	'Class:Contact/Attribute:org_name' => 'Nome organização',
-	'Class:Contact/Attribute:org_name+' => '',
-	'Class:Contact/Attribute:email' => 'Email',
-	'Class:Contact/Attribute:email+' => '',
-	'Class:Contact/Attribute:phone' => 'Telefone',
-	'Class:Contact/Attribute:phone+' => '',
-	'Class:Contact/Attribute:notify' => 'Notificação',
-	'Class:Contact/Attribute:notify+' => '',
-	'Class:Contact/Attribute:notify/Value:no' => 'Não',
-	'Class:Contact/Attribute:notify/Value:no+' => 'Não',
-	'Class:Contact/Attribute:notify/Value:yes' => 'Sim',
-	'Class:Contact/Attribute:notify/Value:yes+' => 'Sim',
-	'Class:Contact/Attribute:function' => 'Função',
-	'Class:Contact/Attribute:function+' => '',
-	'Class:Contact/Attribute:cis_list' => 'CIs',
-	'Class:Contact/Attribute:cis_list+' => 'Todos os itens de configuração vinculado a esse contato',
-	'Class:Contact/Attribute:finalclass' => 'Tipo contato',
-	'Class:Contact/Attribute:finalclass+' => '',
-));
-
-//
-// Class: Person
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:Person' => 'Pessoa',
-	'Class:Person+' => '',
-	'Class:Person/Attribute:name' => 'Último nome',
-	'Class:Person/Attribute:name+' => '',
-	'Class:Person/Attribute:first_name' => 'Primeiro nome',
-	'Class:Person/Attribute:first_name+' => '',
-	'Class:Person/Attribute:employee_number' => 'Número colaborador',
-	'Class:Person/Attribute:employee_number+' => '',
-	'Class:Person/Attribute:mobile_phone' => 'Celular',
-	'Class:Person/Attribute:mobile_phone+' => '',
-	'Class:Person/Attribute:location_id' => 'Localidade',
-	'Class:Person/Attribute:location_id+' => '',
-	'Class:Person/Attribute:location_name' => 'Nome localidade',
-	'Class:Person/Attribute:location_name+' => '',
-	'Class:Person/Attribute:manager_id' => 'Gerente',
-	'Class:Person/Attribute:manager_id+' => '',
-	'Class:Person/Attribute:manager_name' => 'Nome gerente',
-	'Class:Person/Attribute:manager_name+' => '',
-	'Class:Person/Attribute:team_list' => 'Equipes',
-	'Class:Person/Attribute:team_list+' => 'Todas as equipes que essa pessoa pertence',
-	'Class:Person/Attribute:tickets_list' => 'Solicitações',
-	'Class:Person/Attribute:tickets_list+' => 'Todos as solicitações que essa pessoa solicitou',
-	'Class:Person/Attribute:manager_id_friendlyname' => 'Nome amigável gerente',
-	'Class:Person/Attribute:manager_id_friendlyname+' => '',
-	'Class:Person/Attribute:picture' => 'Foto',
-	'Class:Person/Attribute:picture+' => '',
-	'Class:Person/UniquenessRule:employee_number+' => 'O número de funcionário deve ser único na organização',
-	'Class:Person/UniquenessRule:employee_number' => 'Já existe uma pessoa na organização \'$this->org_name$\' com o mesmo número de funcionário',
-	'Class:Person/UniquenessRule:name+' => 'O nome do funcionário deve ser único dentro de sua organização',
-	'Class:Person/UniquenessRule:name' => 'Já existe uma pessoa na organização \'$this->org_name$\' com o mesmo nome',
-));
-
-//
-// Class: Team
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:Team' => 'Equipe',
-	'Class:Team+' => '',
-	'Class:Team/Attribute:persons_list' => 'Membros',
-	'Class:Team/Attribute:persons_list+' => 'Todas as pessoas que pertencem a esta equipe',
-	'Class:Team/Attribute:tickets_list' => 'Solicitações',
-	'Class:Team/Attribute:tickets_list+' => 'Todas as solicitações atribuídas a esta equipe',
-));
-
-//
-// Class: Document
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:Document' => 'Documento',
-	'Class:Document+' => '',
-	'Class:Document/Attribute:name' => 'Nome',
-	'Class:Document/Attribute:name+' => '',
-	'Class:Document/Attribute:org_id' => 'Organização',
-	'Class:Document/Attribute:org_id+' => '',
-	'Class:Document/Attribute:org_name' => 'Nome organização',
-	'Class:Document/Attribute:org_name+' => '',
-	'Class:Document/Attribute:documenttype_id' => 'Tipo documento',
-	'Class:Document/Attribute:documenttype_id+' => '',
-	'Class:Document/Attribute:documenttype_name' => 'Nome tipo documento',
-	'Class:Document/Attribute:documenttype_name+' => '',
-	'Class:Document/Attribute:version' => 'Versão',
-	'Class:Document/Attribute:version+' => '',
-	'Class:Document/Attribute:description' => 'Descrição',
-	'Class:Document/Attribute:description+' => '',
-	'Class:Document/Attribute:status' => 'Estado',
-	'Class:Document/Attribute:status+' => '',
-	'Class:Document/Attribute:status/Value:draft' => 'Rascunho',
-	'Class:Document/Attribute:status/Value:draft+' => '',
-	'Class:Document/Attribute:status/Value:obsolete' => 'Obsoleto',
-	'Class:Document/Attribute:status/Value:obsolete+' => '',
-	'Class:Document/Attribute:status/Value:published' => 'Publicado',
-	'Class:Document/Attribute:status/Value:published+' => '',
-	'Class:Document/Attribute:cis_list' => 'CIs',
-	'Class:Document/Attribute:cis_list+' => 'Todos os itens de configuração vinculados a esse documento',
-	'Class:Document/Attribute:contracts_list' => 'Contratos',
-	'Class:Document/Attribute:contracts_list+' => 'Todos os contratos vinculados com esse documento',
-	'Class:Document/Attribute:services_list' => 'Services',
-	'Class:Document/Attribute:services_list+' => 'Todos os serviços vinculados a esse documento',
-	'Class:Document/Attribute:finalclass' => 'Tipo documento',
-	'Class:Document/Attribute:finalclass+' => '',
-));
-
-//
-// Class: DocumentFile
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:DocumentFile' => 'Arquivo',
-	'Class:DocumentFile+' => '',
-	'Class:DocumentFile/Attribute:file' => 'Arquivo',
-	'Class:DocumentFile/Attribute:file+' => '',
-));
-
-//
-// Class: DocumentNote
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:DocumentNote' => 'Texto',
-	'Class:DocumentNote+' => '',
-	'Class:DocumentNote/Attribute:text' => 'Texto',
-	'Class:DocumentNote/Attribute:text+' => '',
-));
-
-//
-// Class: DocumentWeb
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:DocumentWeb' => 'Web',
-	'Class:DocumentWeb+' => '',
-	'Class:DocumentWeb/Attribute:url' => 'URL',
-	'Class:DocumentWeb/Attribute:url+' => '',
-));
-
 //
 // Class: FunctionalCI
 //
@@ -1243,19 +1017,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkDocumentToLicence/Attribute:document_name+' => '',
 ));
 
-//
-// Class: Typology
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:Typology' => 'Tipologia',
-	'Class:Typology+' => '',
-	'Class:Typology/Attribute:name' => 'Nome',
-	'Class:Typology/Attribute:name+' => '',
-	'Class:Typology/Attribute:finalclass' => 'Tipo',
-	'Class:Typology/Attribute:finalclass+' => '',
-));
-
 //
 // Class: OSVersion
 //
@@ -1278,24 +1039,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:OSFamily+' => '',
 ));
 
-//
-// Class: DocumentType
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:DocumentType' => 'Tipo documento',
-	'Class:DocumentType+' => '',
-));
-
-//
-// Class: ContactType
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:ContactType' => 'Tipo contato',
-	'Class:ContactType+' => '',
-));
-
 //
 // Class: Brand
 //
@@ -1456,23 +1199,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkDocumentToSoftware/Attribute:document_name+' => '',
 ));
 
-//
-// Class: lnkContactToFunctionalCI
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkContactToFunctionalCI' => 'Link Contato / CI',
-	'Class:lnkContactToFunctionalCI+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'CIs',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Nome CI',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contato',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Nome contato',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
-));
-
 //
 // Class: lnkDocumentToFunctionalCI
 //
@@ -1625,7 +1351,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:vlan_tag+' => '',
 ));
 
-
 //
 // Class: LogicalInterface
 //
@@ -1719,27 +1444,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_name+' => '',
 ));
 
-//
-// Class: lnkPersonToTeam
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkPersonToTeam' => 'Link Pessoa / Equipe',
-	'Class:lnkPersonToTeam+' => '',
-	'Class:lnkPersonToTeam/Attribute:team_id' => 'Equipe',
-	'Class:lnkPersonToTeam/Attribute:team_id+' => '',
-	'Class:lnkPersonToTeam/Attribute:team_name' => 'Nome equipe',
-	'Class:lnkPersonToTeam/Attribute:team_name+' => '',
-	'Class:lnkPersonToTeam/Attribute:person_id' => 'Pessoa',
-	'Class:lnkPersonToTeam/Attribute:person_id+' => '',
-	'Class:lnkPersonToTeam/Attribute:person_name' => 'Nome pessoa',
-	'Class:lnkPersonToTeam/Attribute:person_name+' => '',
-	'Class:lnkPersonToTeam/Attribute:role_id' => 'Função',
-	'Class:lnkPersonToTeam/Attribute:role_id+' => '',
-	'Class:lnkPersonToTeam/Attribute:role_name' => 'Nome função',
-	'Class:lnkPersonToTeam/Attribute:role_name+' => '',
-));
-
 //
 // Class: Group
 //
@@ -1795,42 +1499,37 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkGroupToCI/Attribute:reason+' => '',
 ));
 
+//
+// Add translation for Fieldsets
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Server:baseinfo' => 'Informações gerais',
+	'Server:Date' => 'Data',
+	'Server:moreinfo' => 'Mais informações',
+	'Server:otherinfo' => 'Outras informações',
+	'Server:power' => 'Fonte de alimentação',
+	'Person:info' => 'Informações gerais',
+	'UserLocal:info' => 'General information~~',
+	'Person:personal_info' => 'Informação pessoal',
+	'Person:notifiy' => 'Notificação',
+	'Class:Subnet/Tab:IPUsage' => 'IP usado',
+	'Class:Subnet/Tab:IPUsage-explain' => 'Placas de rede contendo IP na faixa: <em>%1$s</em> para <em>%2$s</em>',
+	'Class:Subnet/Tab:FreeIPs' => 'IPs livres',
+	'Class:Subnet/Tab:FreeIPs-count' => 'IPs livres: %1$s',
+	'Class:Subnet/Tab:FreeIPs-explain' => 'Aqui uma faixa de 10 endereços IPs livres',
+	'Class:Document:PreviewTab' => 'Visualização',
+));
 
 //
 // Application Menu
 //
 
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Menu:DataAdministration' => 'Administração Dados',
-	'Menu:DataAdministration+' => 'Administração Dados',
-	'Menu:Catalogs' => 'Catálogos',
-	'Menu:Catalogs+' => 'Tipos dados',
-	'Menu:Audit' => 'Auditoria',
-	'Menu:Audit+' => 'Auditoria',
-	'Menu:CSVImport' => 'Importar CSV',
-	'Menu:CSVImport+' => 'Criação ou atualização em massa',
-	'Menu:Organization' => 'Organizações',
-	'Menu:Organization+' => 'Todas organizações',
 	'Menu:Application' => 'Applicações',
 	'Menu:Application+' => 'Todas aplicações',
 	'Menu:DBServer' => 'Serviços Banco de Dados',
 	'Menu:DBServer+' => 'Serviços Banco de Dados',
-	'Menu:ConfigManagement' => 'Gerenciamento Configurações',
-	'Menu:ConfigManagement+' => 'Gerenciamento Configurações',
-	'Menu:ConfigManagementOverview' => 'Visão geral',
-	'Menu:ConfigManagementOverview+' => 'Visão geral',
-	'Menu:Contact' => 'Contatos',
-	'Menu:Contact+' => 'Contatos',
-	'Menu:Contact:Count' => '%1$d contatos',
-	'Menu:Person' => 'Pessoas',
-	'Menu:Person+' => 'Todas pessoas',
-	'Menu:Team' => 'Equipes',
-	'Menu:Team+' => 'Todas equipes',
-	'Menu:Document' => 'Documentos',
-	'Menu:Document+' => 'Todos documentos',
-	'Menu:Location' => 'Localidades',
-
-	'Menu:Location+' => 'Todas localidades',
 	'Menu:ConfigManagementCI' => 'Itens de configuração',
 	'Menu:ConfigManagementCI+' => 'Itens de configuração',
 	'Menu:BusinessProcess' => 'Processos de negócios',
@@ -1857,10 +1556,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Menu:MobilePhone+' => 'Todos telefone celulares',
 	'Menu:PC' => 'Estação de trabalho',
 	'Menu:PC+' => 'Todas estação de trabalho',
-	'Menu:NewContact' => 'Novo contato',
-	'Menu:NewContact+' => 'Novo contato',
-	'Menu:SearchContacts' => 'Pesquisar por contatos',
-	'Menu:SearchContacts+' => 'Pesquisar por contatos',
 	'Menu:NewCI' => 'Novo CI',
 	'Menu:NewCI+' => 'Novo CI',
 	'Menu:SearchCIs' => 'Pesquisar por CIs',
@@ -1873,36 +1568,8 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Menu:ConfigManagement:Misc' => 'Diversos',
 	'Menu:Group' => 'Grupos de CIs',
 	'Menu:Group+' => 'Grupos de CIs',
-	'Menu:ConfigManagement:Shortcuts' => 'Atalhos',
-	'Menu:ConfigManagement:AllContacts' => 'Todos contatos: %1$d',
-	'Menu:Typology' => 'Configuração tipologia',
-	'Menu:Typology+' => 'Configuração tipologia',
 	'Menu:OSVersion' => 'Versão OS',
 	'Menu:OSVersion+' => '',
 	'Menu:Software' => 'Catálogo software',
 	'Menu:Software+' => 'Catálogo software',
-	'UI_WelcomeMenu_AllConfigItems' => 'Índice',
-	'Menu:ConfigManagement:Typology' => 'Configuração tipologia',
-
-));
-
-
-// Add translation for Fieldsets
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Server:baseinfo' => 'Informações gerais',
-	'Server:Date' => 'Data',
-	'Server:moreinfo' => 'Mais informações',
-	'Server:otherinfo' => 'Outras informações',
-	'Server:power' => 'Fonte de alimentação',
-	'Person:info' => 'Informações gerais',
-	'UserLocal:info' => 'General information~~',
-	'Person:personal_info' => 'Informação pessoal',
-	'Person:notifiy' => 'Notificação',
-	'Class:Subnet/Tab:IPUsage' => 'IP usado',
-	'Class:Subnet/Tab:IPUsage-explain' => 'Placas de rede contendo IP na faixa: <em>%1$s</em> para <em>%2$s</em>',
-	'Class:Subnet/Tab:FreeIPs' => 'IPs livres',
-	'Class:Subnet/Tab:FreeIPs-count' => 'IPs livres: %1$s',
-	'Class:Subnet/Tab:FreeIPs-explain' => 'Aqui uma faixa de 10 endereços IPs livres',
-	'Class:Document:PreviewTab' => 'Visualização',
-));
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-config-mgmt/ru.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/ru.dict.itop-config-mgmt.php
index 62d1ea3bc..981f58443 100755
--- a/datamodels/2.x/itop-config-mgmt/ru.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/ru.dict.itop-config-mgmt.php
@@ -62,232 +62,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 //////////////////////////////////////////////////////////////////////
 //
 
-
-//
-// Class: Organization
-//
-
-Dict::Add('RU RU', 'Russian', 'Русский', array(
-	'Class:Organization' => 'Организация',
-	'Class:Organization+' => 'Организация',
-	'Class:Organization/Attribute:name' => 'Название',
-	'Class:Organization/Attribute:name+' => 'Название',
-	'Class:Organization/Attribute:code' => 'Код',
-	'Class:Organization/Attribute:code+' => 'Код в реестре организаций или другой идентификатор',
-	'Class:Organization/Attribute:status' => 'Статус',
-	'Class:Organization/Attribute:status+' => '',
-	'Class:Organization/Attribute:status/Value:active' => 'Активный',
-	'Class:Organization/Attribute:status/Value:active+' => 'Активный',
-	'Class:Organization/Attribute:status/Value:inactive' => 'Неактивный',
-	'Class:Organization/Attribute:status/Value:inactive+' => 'Неактивный',
-	'Class:Organization/Attribute:parent_id' => 'Вышестоящая',
-	'Class:Organization/Attribute:parent_id+' => 'Вышестоящая организация',
-	'Class:Organization/Attribute:parent_name' => 'Вышестоящая',
-	'Class:Organization/Attribute:parent_name+' => 'Вышестоящая организация',
-	'Class:Organization/Attribute:deliverymodel_id' => 'Модель услуг',
-	'Class:Organization/Attribute:deliverymodel_id+' => 'Модель предоставления услуг',
-	'Class:Organization/Attribute:deliverymodel_name' => 'Модель услуг',
-	'Class:Organization/Attribute:deliverymodel_name+' => 'Модель предоставления услуг',
-	'Class:Organization/Attribute:parent_id_friendlyname' => 'Вышестоящая',
-	'Class:Organization/Attribute:parent_id_friendlyname+' => 'Вышестоящая организация',
-	'Class:Organization/Attribute:overview' => 'Обзор',
-	'Organization:Overview:FunctionalCIs' => 'Конфигурационные единицы этой организации',
-	'Organization:Overview:FunctionalCIs:subtitle' => 'по типу',
-	'Organization:Overview:Users' => 'Пользователи iTop этой организации',
-));
-
-//
-// Class: Location
-//
-
-Dict::Add('RU RU', 'Russian', 'Русский', array(
-	'Class:Location' => 'Расположение',
-	'Class:Location+' => 'Типы расположения: Регион, Страна, Город, Сайт, Здание, Этаж, Комната, Стойка и т.п.',
-	'Class:Location/Attribute:name' => 'Название',
-	'Class:Location/Attribute:name+' => '',
-	'Class:Location/Attribute:status' => 'Статус',
-	'Class:Location/Attribute:status+' => '',
-	'Class:Location/Attribute:status/Value:active' => 'Активный',
-	'Class:Location/Attribute:status/Value:active+' => 'Активный',
-	'Class:Location/Attribute:status/Value:inactive' => 'Неактивный',
-	'Class:Location/Attribute:status/Value:inactive+' => 'Неактивный',
-	'Class:Location/Attribute:org_id' => 'Организация',
-	'Class:Location/Attribute:org_id+' => '',
-	'Class:Location/Attribute:org_name' => 'Организация',
-	'Class:Location/Attribute:org_name+' => '',
-	'Class:Location/Attribute:address' => 'Адрес',
-	'Class:Location/Attribute:address+' => 'Почтовый адрес',
-	'Class:Location/Attribute:postal_code' => 'Индекс',
-	'Class:Location/Attribute:postal_code+' => 'Почтовый индекс',
-	'Class:Location/Attribute:city' => 'Город',
-	'Class:Location/Attribute:city+' => '',
-	'Class:Location/Attribute:country' => 'Страна',
-	'Class:Location/Attribute:country+' => '',
-	'Class:Location/Attribute:physicaldevice_list' => 'Устройства',
-	'Class:Location/Attribute:physicaldevice_list+' => 'Устройства в этом расположении',
-	'Class:Location/Attribute:person_list' => 'Контакты',
-	'Class:Location/Attribute:person_list+' => 'Контакты в этом расположении',
-));
-
-//
-// Class: Contact
-//
-
-Dict::Add('RU RU', 'Russian', 'Русский', array(
-	'Class:Contact' => 'Контакт',
-	'Class:Contact+' => 'Контакт',
-	'Class:Contact/Attribute:name' => 'Название',
-	'Class:Contact/Attribute:name+' => '',
-	'Class:Contact/Attribute:status' => 'Статус',
-	'Class:Contact/Attribute:status+' => '',
-	'Class:Contact/Attribute:status/Value:active' => 'Активный',
-	'Class:Contact/Attribute:status/Value:active+' => 'Активный',
-	'Class:Contact/Attribute:status/Value:inactive' => 'Неактивный',
-	'Class:Contact/Attribute:status/Value:inactive+' => 'Неактивный',
-	'Class:Contact/Attribute:org_id' => 'Организация',
-	'Class:Contact/Attribute:org_id+' => '',
-	'Class:Contact/Attribute:org_name' => 'Организация',
-	'Class:Contact/Attribute:org_name+' => '',
-	'Class:Contact/Attribute:email' => 'Email',
-	'Class:Contact/Attribute:email+' => '',
-	'Class:Contact/Attribute:phone' => 'Телефон',
-	'Class:Contact/Attribute:phone+' => '',
-	'Class:Contact/Attribute:notify' => 'Уведомлять',
-	'Class:Contact/Attribute:notify+' => '',
-	'Class:Contact/Attribute:notify/Value:no' => 'нет',
-	'Class:Contact/Attribute:notify/Value:no+' => 'нет',
-	'Class:Contact/Attribute:notify/Value:yes' => 'да',
-	'Class:Contact/Attribute:notify/Value:yes+' => 'да',
-	'Class:Contact/Attribute:function' => 'Функция',
-	'Class:Contact/Attribute:function+' => '',
-	'Class:Contact/Attribute:cis_list' => 'КЕ',
-	'Class:Contact/Attribute:cis_list+' => 'Связанные конфигурационные единицы',
-	'Class:Contact/Attribute:finalclass' => 'Тип контакта',
-	'Class:Contact/Attribute:finalclass+' => '',
-));
-
-//
-// Class: Person
-//
-
-Dict::Add('RU RU', 'Russian', 'Русский', array(
-	'Class:Person' => 'Персона',
-	'Class:Person+' => 'Персона',
-	'Class:Person/Attribute:name' => 'Фамилия',
-	'Class:Person/Attribute:name+' => '',
-	'Class:Person/Attribute:first_name' => 'Имя',
-	'Class:Person/Attribute:first_name+' => '',
-	'Class:Person/Attribute:employee_number' => 'Номер сотрудника',
-	'Class:Person/Attribute:employee_number+' => 'Табельный номер сотрудника или т.п.',
-	'Class:Person/Attribute:mobile_phone' => 'Мобильный телефон',
-	'Class:Person/Attribute:mobile_phone+' => '',
-	'Class:Person/Attribute:location_id' => 'Расположение',
-	'Class:Person/Attribute:location_id+' => '',
-	'Class:Person/Attribute:location_name' => 'Расположение',
-	'Class:Person/Attribute:location_name+' => '',
-	'Class:Person/Attribute:manager_id' => 'Руководитель',
-	'Class:Person/Attribute:manager_id+' => '',
-	'Class:Person/Attribute:manager_name' => 'Руководитель',
-	'Class:Person/Attribute:manager_name+' => '',
-	'Class:Person/Attribute:team_list' => 'Команды',
-	'Class:Person/Attribute:team_list+' => 'Команды с участием персоны',
-	'Class:Person/Attribute:tickets_list' => 'Тикеты',
-	'Class:Person/Attribute:tickets_list+' => 'Связанные тикеты',
-	'Class:Person/Attribute:manager_id_friendlyname' => 'Руководитель',
-	'Class:Person/Attribute:manager_id_friendlyname+' => '',
-	'Class:Person/Attribute:picture' => 'Фотография',
-	'Class:Person/Attribute:picture+' => '',
-	'Class:Person/UniquenessRule:employee_number+' => 'Номер сотрудника должен быть уникальным в организации',
-	'Class:Person/UniquenessRule:employee_number' => 'В организации \'$this->org_name$\' уже есть персона с таким номером сотрудника',
-	'Class:Person/UniquenessRule:name+' => 'Имя сотрудника должно быть уникальным внутри организации',
-	'Class:Person/UniquenessRule:name' => 'В организации \'$this->org_name$\' уже есть персона с таким именем',
-));
-
-//
-// Class: Team
-//
-
-Dict::Add('RU RU', 'Russian', 'Русский', array(
-	'Class:Team' => 'Команда',
-	'Class:Team+' => 'Команда',
-	'Class:Team/Attribute:persons_list' => 'Участники',
-	'Class:Team/Attribute:persons_list+' => 'Участники команды',
-	'Class:Team/Attribute:tickets_list' => 'Тикеты',
-	'Class:Team/Attribute:tickets_list+' => 'Все тикеты, назначенные на команду',
-));
-
-//
-// Class: Document
-//
-
-Dict::Add('RU RU', 'Russian', 'Русский', array(
-	'Class:Document' => 'Документ',
-	'Class:Document+' => 'Документ',
-	'Class:Document/Attribute:name' => 'Название',
-	'Class:Document/Attribute:name+' => '',
-	'Class:Document/Attribute:org_id' => 'Организация',
-	'Class:Document/Attribute:org_id+' => '',
-	'Class:Document/Attribute:org_name' => 'Организация',
-	'Class:Document/Attribute:org_name+' => '',
-	'Class:Document/Attribute:documenttype_id' => 'Тип документа',
-	'Class:Document/Attribute:documenttype_id+' => '',
-	'Class:Document/Attribute:documenttype_name' => 'Тип документа',
-	'Class:Document/Attribute:documenttype_name+' => '',
-	'Class:Document/Attribute:version' => 'Версия',
-	'Class:Document/Attribute:version+' => '',
-	'Class:Document/Attribute:description' => 'Описание',
-	'Class:Document/Attribute:description+' => '',
-	'Class:Document/Attribute:status' => 'Статус',
-	'Class:Document/Attribute:status+' => '',
-	'Class:Document/Attribute:status/Value:draft' => 'Черновик',
-	'Class:Document/Attribute:status/Value:draft+' => '',
-	'Class:Document/Attribute:status/Value:obsolete' => 'Устаревший',
-	'Class:Document/Attribute:status/Value:obsolete+' => '',
-	'Class:Document/Attribute:status/Value:published' => 'Опубликованный',
-	'Class:Document/Attribute:status/Value:published+' => '',
-	'Class:Document/Attribute:cis_list' => 'КЕ',
-	'Class:Document/Attribute:cis_list+' => 'Связанные конфигурационные единицы',
-	'Class:Document/Attribute:contracts_list' => 'Договоры',
-	'Class:Document/Attribute:contracts_list+' => 'Связанные договоры',
-	'Class:Document/Attribute:services_list' => 'Услуги',
-	'Class:Document/Attribute:services_list+' => 'Связанные услуги',
-	'Class:Document/Attribute:finalclass' => 'Тип',
-	'Class:Document/Attribute:finalclass+' => '',
-));
-
-//
-// Class: DocumentFile
-//
-
-Dict::Add('RU RU', 'Russian', 'Русский', array(
-	'Class:DocumentFile' => 'Файл',
-	'Class:DocumentFile+' => 'Файл',
-	'Class:DocumentFile/Attribute:file' => 'Файл',
-	'Class:DocumentFile/Attribute:file+' => '',
-));
-
-//
-// Class: DocumentNote
-//
-
-Dict::Add('RU RU', 'Russian', 'Русский', array(
-	'Class:DocumentNote' => 'Заметка',
-	'Class:DocumentNote+' => 'Заметка',
-	'Class:DocumentNote/Attribute:text' => 'Заметка',
-	'Class:DocumentNote/Attribute:text+' => '',
-));
-
-//
-// Class: DocumentWeb
-//
-
-Dict::Add('RU RU', 'Russian', 'Русский', array(
-	'Class:DocumentWeb' => 'Веб-документ',
-	'Class:DocumentWeb+' => 'Веб-документ',
-	'Class:DocumentWeb/Attribute:url' => 'URL',
-	'Class:DocumentWeb/Attribute:url+' => '',
-));
-
 //
 // Class: FunctionalCI
 //
@@ -1230,19 +1004,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkDocumentToLicence/Attribute:document_name+' => '',
 ));
 
-//
-// Class: Typology
-//
-
-Dict::Add('RU RU', 'Russian', 'Русский', array(
-	'Class:Typology' => 'Типология',
-	'Class:Typology+' => 'Типология',
-	'Class:Typology/Attribute:name' => 'Название',
-	'Class:Typology/Attribute:name+' => '',
-	'Class:Typology/Attribute:finalclass' => 'Тип',
-	'Class:Typology/Attribute:finalclass+' => '',
-));
-
 //
 // Class: OSVersion
 //
@@ -1265,24 +1026,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:OSFamily+' => '',
 ));
 
-//
-// Class: DocumentType
-//
-
-Dict::Add('RU RU', 'Russian', 'Русский', array(
-	'Class:DocumentType' => 'Тип документа',
-	'Class:DocumentType+' => '',
-));
-
-//
-// Class: ContactType
-//
-
-Dict::Add('RU RU', 'Russian', 'Русский', array(
-	'Class:ContactType' => 'Тип контакта',
-	'Class:ContactType+' => '',
-));
-
 //
 // Class: Brand
 //
@@ -1443,23 +1186,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkDocumentToSoftware/Attribute:document_name+' => '',
 ));
 
-//
-// Class: lnkContactToFunctionalCI
-//
-
-Dict::Add('RU RU', 'Russian', 'Русский', array(
-	'Class:lnkContactToFunctionalCI' => 'Связь Контакт/Функциональная КЕ',
-	'Class:lnkContactToFunctionalCI+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Функциональная КЕ',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Функциональная КЕ',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Контакт',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Контакт',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
-));
-
 //
 // Class: lnkDocumentToFunctionalCI
 //
@@ -1562,8 +1288,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:IPInterface+' => '',
 	'Class:IPInterface/Attribute:ipaddress' => 'IP-адрес',
 	'Class:IPInterface/Attribute:ipaddress+' => '',
-
-
 	'Class:IPInterface/Attribute:macaddress' => 'MAC-адрес',
 	'Class:IPInterface/Attribute:macaddress+' => '',
 	'Class:IPInterface/Attribute:comment' => 'Комментарий',
@@ -1706,27 +1430,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_name+' => '',
 ));
 
-//
-// Class: lnkPersonToTeam
-//
-
-Dict::Add('RU RU', 'Russian', 'Русский', array(
-	'Class:lnkPersonToTeam' => 'Связь Персона/Команда',
-	'Class:lnkPersonToTeam+' => '',
-	'Class:lnkPersonToTeam/Attribute:team_id' => 'Команда',
-	'Class:lnkPersonToTeam/Attribute:team_id+' => '',
-	'Class:lnkPersonToTeam/Attribute:team_name' => 'Команда',
-	'Class:lnkPersonToTeam/Attribute:team_name+' => '',
-	'Class:lnkPersonToTeam/Attribute:person_id' => 'Персона',
-	'Class:lnkPersonToTeam/Attribute:person_id+' => '',
-	'Class:lnkPersonToTeam/Attribute:person_name' => 'Персона',
-	'Class:lnkPersonToTeam/Attribute:person_name+' => '',
-	'Class:lnkPersonToTeam/Attribute:role_id' => 'Роль',
-	'Class:lnkPersonToTeam/Attribute:role_id+' => '',
-	'Class:lnkPersonToTeam/Attribute:role_name' => 'Роль',
-	'Class:lnkPersonToTeam/Attribute:role_name+' => '',
-));
-
 //
 // Class: Group
 //
@@ -1753,7 +1456,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:Group/Attribute:type' => 'Тип',
 	'Class:Group/Attribute:type+' => '',
 	'Class:Group/Attribute:parent_id' => 'Родительская группа',
-
 	'Class:Group/Attribute:parent_id+' => '',
 	'Class:Group/Attribute:parent_name' => 'Родительская группа',
 	'Class:Group/Attribute:parent_name+' => '',
@@ -1782,42 +1484,37 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkGroupToCI/Attribute:reason+' => 'Основание, причина и т.п.',
 ));
 
+//
+// Add translation for Fieldsets
+//
+
+Dict::Add('RU RU', 'Russian', 'Русский', array(
+	'Server:baseinfo' => 'Основное',
+	'Server:Date' => 'Даты',
+	'Server:moreinfo' => 'Спецификация',
+	'Server:otherinfo' => 'Дополнительно',
+	'Server:power' => 'Электропитание',
+	'Person:info' => 'Основная информация',
+	'UserLocal:info' => 'Основная информация',
+	'Person:personal_info' => 'Личная информация',
+	'Person:notifiy' => 'Уведомления',
+	'Class:Subnet/Tab:IPUsage' => 'Использование IP-адресов',
+	'Class:Subnet/Tab:IPUsage-explain' => 'Интерфейсы с IP-адресом в диапазоне: <em>%1$s</em> - <em>%2$s</em>',
+	'Class:Subnet/Tab:FreeIPs' => 'Свободные IP-адреса',
+	'Class:Subnet/Tab:FreeIPs-count' => 'Свободных IP-адресов: %1$s',
+	'Class:Subnet/Tab:FreeIPs-explain' => 'Вот выборка из 10 свободных IP-адресов',
+	'Class:Document:PreviewTab' => 'Просмотр',
+));
 
 //
 // Application Menu
 //
 
 Dict::Add('RU RU', 'Russian', 'Русский', array(
-	'Menu:DataAdministration' => 'Администрирование данных',
-	'Menu:DataAdministration+' => 'Администрирование данных',
-	'Menu:Catalogs' => 'Каталоги',
-	'Menu:Catalogs+' => 'Каталоги',
-	'Menu:Audit' => 'Аудит',
-	'Menu:Audit+' => 'Аудит',
-	'Menu:CSVImport' => 'Импорт CSV',
-	'Menu:CSVImport+' => 'Массовое создание или обновление объектов',
-	'Menu:Organization' => 'Организации',
-	'Menu:Organization+' => 'Все организации',
 	'Menu:Application' => 'Приложения',
 	'Menu:Application+' => 'Все приложения',
 	'Menu:DBServer' => 'Серверы баз данных',
 	'Menu:DBServer+' => 'Серверы баз данных',
-	'Menu:ConfigManagement' => 'Управление конфигурациями',
-	'Menu:ConfigManagement+' => 'Управление конфигурациями',
-	'Menu:ConfigManagementOverview' => 'Обзор',
-	'Menu:ConfigManagementOverview+' => 'Обзор',
-	'Menu:Contact' => 'Контакты',
-	'Menu:Contact+' => 'Контакты',
-	'Menu:Contact:Count' => '%1$d Контактов',
-	'Menu:Person' => 'Персоны',
-	'Menu:Person+' => 'Все персоны',
-	'Menu:Team' => 'Команды',
-	'Menu:Team+' => 'Все команды',
-	'Menu:Document' => 'Документы',
-	'Menu:Document+' => 'Все документы',
-	'Menu:Location' => 'Расположения',
-
-	'Menu:Location+' => 'Все расположения',
 	'Menu:ConfigManagementCI' => 'Конфигурационные единицы',
 	'Menu:ConfigManagementCI+' => 'Конфигурационные единицы',
 	'Menu:BusinessProcess' => 'Бизнес-процессы',
@@ -1844,10 +1541,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Menu:MobilePhone+' => 'Все мобильные телефоны',
 	'Menu:PC' => 'Персональные компьютеры',
 	'Menu:PC+' => 'Все ПК',
-	'Menu:NewContact' => 'Новый контакт',
-	'Menu:NewContact+' => 'Новый контакт',
-	'Menu:SearchContacts' => 'Поиск контактов',
-	'Menu:SearchContacts+' => 'Поиск контактов',
 	'Menu:NewCI' => 'Новая КЕ',
 	'Menu:NewCI+' => 'Новая КЕ',
 	'Menu:SearchCIs' => 'Поиск КЕ',
@@ -1860,36 +1553,8 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Menu:ConfigManagement:Misc' => 'Разное',
 	'Menu:Group' => 'Группы КЕ',
 	'Menu:Group+' => 'Группы КЕ',
-	'Menu:ConfigManagement:Shortcuts' => 'Ярлыки',
-	'Menu:ConfigManagement:AllContacts' => 'Все контакты: %1$d',
-	'Menu:Typology' => 'Типология',
-	'Menu:Typology+' => 'Типология',
 	'Menu:OSVersion' => 'Версия ОС',
 	'Menu:OSVersion+' => 'Версия ОС',
 	'Menu:Software' => 'Каталог ПО',
 	'Menu:Software+' => 'Каталог ПО',
-	'UI_WelcomeMenu_AllConfigItems' => 'Все конфигурационные единицы',
-	'Menu:ConfigManagement:Typology' => 'Настройка типологии',
-
-));
-
-
-// Add translation for Fieldsets
-
-Dict::Add('RU RU', 'Russian', 'Русский', array(
-	'Server:baseinfo' => 'Основное',
-	'Server:Date' => 'Даты',
-	'Server:moreinfo' => 'Спецификация',
-	'Server:otherinfo' => 'Дополнительно',
-	'Server:power' => 'Электропитание',
-	'Person:info' => 'Основная информация',
-	'UserLocal:info' => 'Основная информация',
-	'Person:personal_info' => 'Личная информация',
-	'Person:notifiy' => 'Уведомления',
-	'Class:Subnet/Tab:IPUsage' => 'Использование IP-адресов',
-	'Class:Subnet/Tab:IPUsage-explain' => 'Интерфейсы с IP-адресом в диапазоне: <em>%1$s</em> - <em>%2$s</em>',
-	'Class:Subnet/Tab:FreeIPs' => 'Свободные IP-адреса',
-	'Class:Subnet/Tab:FreeIPs-count' => 'Свободных IP-адресов: %1$s',
-	'Class:Subnet/Tab:FreeIPs-explain' => 'Вот выборка из 10 свободных IP-адресов',
-	'Class:Document:PreviewTab' => 'Просмотр',
-));
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-config-mgmt/sk.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/sk.dict.itop-config-mgmt.php
index 0674f0707..aa93b864f 100644
--- a/datamodels/2.x/itop-config-mgmt/sk.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/sk.dict.itop-config-mgmt.php
@@ -74,232 +74,6 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 //////////////////////////////////////////////////////////////////////
 //
 
-
-//
-// Class: Organization
-//
-
-Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
-	'Class:Organization' => 'Organizácia',
-	'Class:Organization+' => '',
-	'Class:Organization/Attribute:name' => 'Názov',
-	'Class:Organization/Attribute:name+' => '',
-	'Class:Organization/Attribute:code' => 'Kód',
-	'Class:Organization/Attribute:code+' => '',
-	'Class:Organization/Attribute:status' => 'Stav',
-	'Class:Organization/Attribute:status+' => '',
-	'Class:Organization/Attribute:status/Value:active' => 'Aktívna',
-	'Class:Organization/Attribute:status/Value:active+' => '',
-	'Class:Organization/Attribute:status/Value:inactive' => 'Neaktívna',
-	'Class:Organization/Attribute:status/Value:inactive+' => '',
-	'Class:Organization/Attribute:parent_id' => 'Nadradená organizácia',
-	'Class:Organization/Attribute:parent_id+' => '',
-	'Class:Organization/Attribute:parent_name' => 'Nadradená organizácia',
-	'Class:Organization/Attribute:parent_name+' => '',
-	'Class:Organization/Attribute:deliverymodel_id' => 'Model dodávky',
-	'Class:Organization/Attribute:deliverymodel_id+' => '',
-	'Class:Organization/Attribute:deliverymodel_name' => 'Názov modelu dodávky',
-	'Class:Organization/Attribute:deliverymodel_name+' => '',
-	'Class:Organization/Attribute:parent_id_friendlyname' => 'Nadradená organizácia',
-	'Class:Organization/Attribute:parent_id_friendlyname+' => '',
-	'Class:Organization/Attribute:overview' => 'Overview~~',
-	'Organization:Overview:FunctionalCIs' => 'Configuration items of this organization~~',
-	'Organization:Overview:FunctionalCIs:subtitle' => 'by type~~',
-	'Organization:Overview:Users' => 'iTop Users within this organization~~',
-));
-
-//
-// Class: Location
-//
-
-Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
-	'Class:Location' => 'Poloha',
-	'Class:Location+' => '',
-	'Class:Location/Attribute:name' => 'Názov',
-	'Class:Location/Attribute:name+' => '',
-	'Class:Location/Attribute:status' => 'Stav',
-	'Class:Location/Attribute:status+' => '',
-	'Class:Location/Attribute:status/Value:active' => 'Aktívna',
-	'Class:Location/Attribute:status/Value:active+' => '',
-	'Class:Location/Attribute:status/Value:inactive' => 'Neaktívna',
-	'Class:Location/Attribute:status/Value:inactive+' => '',
-	'Class:Location/Attribute:org_id' => 'Organizácia vlastníka',
-	'Class:Location/Attribute:org_id+' => '',
-	'Class:Location/Attribute:org_name' => 'Názov organizácie vlastníka',
-	'Class:Location/Attribute:org_name+' => '',
-	'Class:Location/Attribute:address' => 'Adresa',
-	'Class:Location/Attribute:address+' => '',
-	'Class:Location/Attribute:postal_code' => 'PSČ',
-	'Class:Location/Attribute:postal_code+' => '',
-	'Class:Location/Attribute:city' => 'Mesto',
-	'Class:Location/Attribute:city+' => '',
-	'Class:Location/Attribute:country' => 'Štát',
-	'Class:Location/Attribute:country+' => '',
-	'Class:Location/Attribute:physicaldevice_list' => 'Zariadenia',
-	'Class:Location/Attribute:physicaldevice_list+' => '',
-	'Class:Location/Attribute:person_list' => 'Kontakty',
-	'Class:Location/Attribute:person_list+' => '',
-));
-
-//
-// Class: Contact
-//
-
-Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
-	'Class:Contact' => 'Kontakt',
-	'Class:Contact+' => '',
-	'Class:Contact/Attribute:name' => 'Meno',
-	'Class:Contact/Attribute:name+' => '',
-	'Class:Contact/Attribute:status' => 'Stav',
-	'Class:Contact/Attribute:status+' => '',
-	'Class:Contact/Attribute:status/Value:active' => 'Aktívny',
-	'Class:Contact/Attribute:status/Value:active+' => '',
-	'Class:Contact/Attribute:status/Value:inactive' => 'Neaktívny',
-	'Class:Contact/Attribute:status/Value:inactive+' => '',
-	'Class:Contact/Attribute:org_id' => 'Organizácia',
-	'Class:Contact/Attribute:org_id+' => '',
-	'Class:Contact/Attribute:org_name' => 'Názov Organizácie',
-	'Class:Contact/Attribute:org_name+' => '',
-	'Class:Contact/Attribute:email' => 'Email',
-	'Class:Contact/Attribute:email+' => '',
-	'Class:Contact/Attribute:phone' => 'Telefón',
-	'Class:Contact/Attribute:phone+' => '',
-	'Class:Contact/Attribute:notify' => 'Upozornenie',
-	'Class:Contact/Attribute:notify+' => '',
-	'Class:Contact/Attribute:notify/Value:no' => 'nie',
-	'Class:Contact/Attribute:notify/Value:no+' => '',
-	'Class:Contact/Attribute:notify/Value:yes' => 'áno',
-	'Class:Contact/Attribute:notify/Value:yes+' => '',
-	'Class:Contact/Attribute:function' => 'Funkcia',
-	'Class:Contact/Attribute:function+' => '',
-	'Class:Contact/Attribute:cis_list' => 'Zariadenia',
-	'Class:Contact/Attribute:cis_list+' => '',
-	'Class:Contact/Attribute:finalclass' => 'Typ kontaktu',
-	'Class:Contact/Attribute:finalclass+' => '',
-));
-
-//
-// Class: Person
-//
-
-Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
-	'Class:Person' => 'Osoba',
-	'Class:Person+' => '',
-	'Class:Person/Attribute:name' => 'Priezvisko',
-	'Class:Person/Attribute:name+' => '',
-	'Class:Person/Attribute:first_name' => 'Krstné meno',
-	'Class:Person/Attribute:first_name+' => '',
-	'Class:Person/Attribute:employee_number' => 'Číslo zamestnanca',
-	'Class:Person/Attribute:employee_number+' => '',
-	'Class:Person/Attribute:mobile_phone' => 'Telefónne číslo',
-	'Class:Person/Attribute:mobile_phone+' => '',
-	'Class:Person/Attribute:location_id' => 'Poloha',
-	'Class:Person/Attribute:location_id+' => '',
-	'Class:Person/Attribute:location_name' => 'Názov lokality',
-	'Class:Person/Attribute:location_name+' => '',
-	'Class:Person/Attribute:manager_id' => 'Manažér',
-	'Class:Person/Attribute:manager_id+' => '',
-	'Class:Person/Attribute:manager_name' => 'Meno manažéra',
-	'Class:Person/Attribute:manager_name+' => '',
-	'Class:Person/Attribute:team_list' => 'Tímy',
-	'Class:Person/Attribute:team_list+' => '',
-	'Class:Person/Attribute:tickets_list' => 'Tickety',
-	'Class:Person/Attribute:tickets_list+' => '',
-	'Class:Person/Attribute:manager_id_friendlyname' => 'Ľahko čitateľné meno manažéra',
-	'Class:Person/Attribute:manager_id_friendlyname+' => '',
-	'Class:Person/Attribute:picture' => 'Picture~~',
-	'Class:Person/Attribute:picture+' => '~~',
-	'Class:Person/UniquenessRule:employee_number+' => 'The employee number must be unique in the organization~~',
-	'Class:Person/UniquenessRule:employee_number' => 'there is already a person in \'$this->org_name$\' organization with the same employee number~~',
-	'Class:Person/UniquenessRule:name+' => 'The employee name should be unique inside its organization~~',
-	'Class:Person/UniquenessRule:name' => 'There is already a person in \'$this->org_name$\' organization with the same name~~',
-));
-
-//
-// Class: Team
-//
-
-Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
-	'Class:Team' => 'Tím',
-	'Class:Team+' => '',
-	'Class:Team/Attribute:persons_list' => 'Osoby',
-	'Class:Team/Attribute:persons_list+' => '',
-	'Class:Team/Attribute:tickets_list' => 'Tickety',
-	'Class:Team/Attribute:tickets_list+' => '',
-));
-
-//
-// Class: Document
-//
-
-Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
-	'Class:Document' => 'Dokument',
-	'Class:Document+' => '',
-	'Class:Document/Attribute:name' => 'Názov',
-	'Class:Document/Attribute:name+' => '',
-	'Class:Document/Attribute:org_id' => 'Organizácia',
-	'Class:Document/Attribute:org_id+' => '',
-	'Class:Document/Attribute:org_name' => 'Názov Organizácie',
-	'Class:Document/Attribute:org_name+' => '',
-	'Class:Document/Attribute:documenttype_id' => 'Typ dokumentu',
-	'Class:Document/Attribute:documenttype_id+' => '',
-	'Class:Document/Attribute:documenttype_name' => 'Názov typu dokumentu',
-	'Class:Document/Attribute:documenttype_name+' => '',
-	'Class:Document/Attribute:version' => 'Version~~',
-	'Class:Document/Attribute:version+' => '~~',
-	'Class:Document/Attribute:description' => 'Popis',
-	'Class:Document/Attribute:description+' => '',
-	'Class:Document/Attribute:status' => 'Stav',
-	'Class:Document/Attribute:status+' => '',
-	'Class:Document/Attribute:status/Value:draft' => 'Návrh',
-	'Class:Document/Attribute:status/Value:draft+' => '',
-	'Class:Document/Attribute:status/Value:obsolete' => 'Vyradený',
-	'Class:Document/Attribute:status/Value:obsolete+' => '',
-	'Class:Document/Attribute:status/Value:published' => 'Publikovaný',
-	'Class:Document/Attribute:status/Value:published+' => '',
-	'Class:Document/Attribute:cis_list' => 'Komponenty',
-	'Class:Document/Attribute:cis_list+' => '',
-	'Class:Document/Attribute:contracts_list' => 'Zmluvy',
-	'Class:Document/Attribute:contracts_list+' => '',
-	'Class:Document/Attribute:services_list' => 'Služby',
-	'Class:Document/Attribute:services_list+' => '',
-	'Class:Document/Attribute:finalclass' => 'Typ dokumentu',
-	'Class:Document/Attribute:finalclass+' => '',
-));
-
-//
-// Class: DocumentFile
-//
-
-Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
-	'Class:DocumentFile' => 'Dokumentový súbor',
-	'Class:DocumentFile+' => '',
-	'Class:DocumentFile/Attribute:file' => 'Súbor',
-	'Class:DocumentFile/Attribute:file+' => '',
-));
-
-//
-// Class: DocumentNote
-//
-
-Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
-	'Class:DocumentNote' => 'Poznámka dokumentu',
-	'Class:DocumentNote+' => '',
-	'Class:DocumentNote/Attribute:text' => 'Text',
-	'Class:DocumentNote/Attribute:text+' => '',
-));
-
-//
-// Class: DocumentWeb
-//
-
-Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
-	'Class:DocumentWeb' => 'Web stránka dokumentu',
-	'Class:DocumentWeb+' => '',
-	'Class:DocumentWeb/Attribute:url' => 'URL',
-	'Class:DocumentWeb/Attribute:url+' => '',
-));
-
 //
 // Class: FunctionalCI
 //
@@ -1242,19 +1016,6 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:lnkDocumentToLicence/Attribute:document_name+' => '',
 ));
 
-//
-// Class: Typology
-//
-
-Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
-	'Class:Typology' => 'Typológia',
-	'Class:Typology+' => '',
-	'Class:Typology/Attribute:name' => 'Názov',
-	'Class:Typology/Attribute:name+' => '',
-	'Class:Typology/Attribute:finalclass' => 'Typ',
-	'Class:Typology/Attribute:finalclass+' => '',
-));
-
 //
 // Class: OSVersion
 //
@@ -1277,24 +1038,6 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:OSFamily+' => '',
 ));
 
-//
-// Class: DocumentType
-//
-
-Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
-	'Class:DocumentType' => 'Typ dokumentu',
-	'Class:DocumentType+' => '',
-));
-
-//
-// Class: ContactType
-//
-
-Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
-	'Class:ContactType' => 'Typ kontaktu',
-	'Class:ContactType+' => '',
-));
-
 //
 // Class: Brand
 //
@@ -1455,23 +1198,6 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:lnkDocumentToSoftware/Attribute:document_name+' => '',
 ));
 
-//
-// Class: lnkContactToFunctionalCI
-//
-
-Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
-	'Class:lnkContactToFunctionalCI' => 'väzba - Kontakt / Komponent',
-	'Class:lnkContactToFunctionalCI+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Komponent',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Názov funkčných CI',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Kontakt',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Názov kontaktu',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
-));
-
 //
 // Class: lnkDocumentToFunctionalCI
 //
@@ -1718,27 +1444,6 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_name+' => '',
 ));
 
-//
-// Class: lnkPersonToTeam
-//
-
-Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
-	'Class:lnkPersonToTeam' => 'väzba - Osoba / Tím',
-	'Class:lnkPersonToTeam+' => '',
-	'Class:lnkPersonToTeam/Attribute:team_id' => 'Tím',
-	'Class:lnkPersonToTeam/Attribute:team_id+' => '',
-	'Class:lnkPersonToTeam/Attribute:team_name' => 'Názov tímu',
-	'Class:lnkPersonToTeam/Attribute:team_name+' => '',
-	'Class:lnkPersonToTeam/Attribute:person_id' => 'Osoba',
-	'Class:lnkPersonToTeam/Attribute:person_id+' => '',
-	'Class:lnkPersonToTeam/Attribute:person_name' => 'Meno osoby',
-	'Class:lnkPersonToTeam/Attribute:person_name+' => '',
-	'Class:lnkPersonToTeam/Attribute:role_id' => 'Rola',
-	'Class:lnkPersonToTeam/Attribute:role_id+' => '',
-	'Class:lnkPersonToTeam/Attribute:role_name' => 'Názov role',
-	'Class:lnkPersonToTeam/Attribute:role_name+' => '',
-));
-
 //
 // Class: Group
 //
@@ -1765,7 +1470,6 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:Group/Attribute:type' => 'Typ',
 	'Class:Group/Attribute:type+' => '',
 	'Class:Group/Attribute:parent_id' => 'Nadradená skupina',
-
 	'Class:Group/Attribute:parent_id+' => '',
 	'Class:Group/Attribute:parent_name' => 'Meno rodiča',
 	'Class:Group/Attribute:parent_name+' => '',
@@ -1794,42 +1498,37 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:lnkGroupToCI/Attribute:reason+' => '',
 ));
 
+//
+// Add translation for Fieldsets
+//
+
+Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
+	'Server:baseinfo' => 'Všeobecné informácie',
+	'Server:Date' => 'Dátum',
+	'Server:moreinfo' => 'Viac informácií',
+	'Server:otherinfo' => 'Iné informácie',
+	'Server:power' => 'Power supply~~',
+	'Person:info' => 'Všeobecné informácie',
+	'UserLocal:info' => 'General information~~',
+	'Person:personal_info' => 'Personal information~~',
+	'Person:notifiy' => 'Upozornenie',
+	'Class:Subnet/Tab:IPUsage' => 'Využívanosť IP adries',
+	'Class:Subnet/Tab:IPUsage-explain' => 'Rozhrania majúce IP adresu v rozsahu: <em>%1$s</em> do <em>%2$s</em>',
+	'Class:Subnet/Tab:FreeIPs' => 'Voľné IP adresy',
+	'Class:Subnet/Tab:FreeIPs-count' => 'Voľných IP adries: %1$s',
+	'Class:Subnet/Tab:FreeIPs-explain' => 'Tu je extrakt 10 voľných IP adries',
+	'Class:Document:PreviewTab' => 'Preview~~',
+));
 
 //
 // Application Menu
 //
 
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
-	'Menu:DataAdministration' => 'Dátová administrácia',
-	'Menu:DataAdministration+' => '',
-	'Menu:Catalogs' => 'Katalógy',
-	'Menu:Catalogs+' => '',
-	'Menu:Audit' => 'Audity',
-	'Menu:Audit+' => '',
-	'Menu:CSVImport' => 'CSV import~~',
-	'Menu:CSVImport+' => 'Bulk creation or update~~',
-	'Menu:Organization' => 'Organizácia',
-	'Menu:Organization+' => '',
 	'Menu:Application' => 'Aplikácie',
 	'Menu:Application+' => '',
 	'Menu:DBServer' => 'Databázové servery',
 	'Menu:DBServer+' => '',
-	'Menu:ConfigManagement' => 'Manažment konfigurácie',
-	'Menu:ConfigManagement+' => '',
-	'Menu:ConfigManagementOverview' => 'Prehľad',
-	'Menu:ConfigManagementOverview+' => '',
-	'Menu:Contact' => 'Kontakty',
-	'Menu:Contact+' => '',
-	'Menu:Contact:Count' => '%1$d kontakt/y/ov',
-	'Menu:Person' => 'Osoby',
-	'Menu:Person+' => '',
-	'Menu:Team' => 'Tímy',
-	'Menu:Team+' => '',
-	'Menu:Document' => 'Dokumenty',
-	'Menu:Document+' => '',
-	'Menu:Location' => 'Poloha',
-
-	'Menu:Location+' => '',
 	'Menu:ConfigManagementCI' => 'Konfiguračné položky',
 	'Menu:ConfigManagementCI+' => '',
 	'Menu:BusinessProcess' => 'Biznisové procesy',
@@ -1855,11 +1554,6 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Menu:MobilePhone' => 'Mobilné telefóny',
 	'Menu:MobilePhone+' => '',
 	'Menu:PC' => 'Osobné počítače',
-	'Menu:PC+' => '',
-	'Menu:NewContact' => 'Nový kontakt',
-	'Menu:NewContact+' => '',
-	'Menu:SearchContacts' => 'Vyhľadať kontakty',
-	'Menu:SearchContacts+' => '',
 	'Menu:NewCI' => 'Nové CI',
 	'Menu:NewCI+' => '',
 	'Menu:SearchCIs' => 'Vyhľadať CIs',
@@ -1872,36 +1566,8 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Menu:ConfigManagement:Misc' => 'Rôzne',
 	'Menu:Group' => 'Skupiny CI',
 	'Menu:Group+' => '',
-	'Menu:ConfigManagement:Shortcuts' => 'Skratky',
-	'Menu:ConfigManagement:AllContacts' => 'Všetky kontakty: %1$d',
-	'Menu:Typology' => 'Konfiguračná typológia',
-	'Menu:Typology+' => '',
 	'Menu:OSVersion' => 'OS verzie',
 	'Menu:OSVersion+' => '',
 	'Menu:Software' => 'Katalóg softvéru',
 	'Menu:Software+' => '',
-	'UI_WelcomeMenu_AllConfigItems' => 'Zhrnutie',
-	'Menu:ConfigManagement:Typology' => 'Konfiguračná typológia',
-
-));
-
-
-// Add translation for Fieldsets
-
-Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
-	'Server:baseinfo' => 'Všeobecné informácie',
-	'Server:Date' => 'Dátum',
-	'Server:moreinfo' => 'Viac informácií',
-	'Server:otherinfo' => 'Iné informácie',
-	'Server:power' => 'Power supply~~',
-	'Person:info' => 'Všeobecné informácie',
-	'UserLocal:info' => 'General information~~',
-	'Person:personal_info' => 'Personal information~~',
-	'Person:notifiy' => 'Upozornenie',
-	'Class:Subnet/Tab:IPUsage' => 'Využívanosť IP adries',
-	'Class:Subnet/Tab:IPUsage-explain' => 'Rozhrania majúce IP adresu v rozsahu: <em>%1$s</em> do <em>%2$s</em>',
-	'Class:Subnet/Tab:FreeIPs' => 'Voľné IP adresy',
-	'Class:Subnet/Tab:FreeIPs-count' => 'Voľných IP adries: %1$s',
-	'Class:Subnet/Tab:FreeIPs-explain' => 'Tu je extrakt 10 voľných IP adries',
-	'Class:Document:PreviewTab' => 'Preview~~',
-));
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-config-mgmt/tr.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/tr.dict.itop-config-mgmt.php
index f05b3707c..f169debc7 100755
--- a/datamodels/2.x/itop-config-mgmt/tr.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/tr.dict.itop-config-mgmt.php
@@ -76,232 +76,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 //////////////////////////////////////////////////////////////////////
 //
 
-
-//
-// Class: Organization
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:Organization' => 'Kurum',
-	'Class:Organization+' => '',
-	'Class:Organization/Attribute:name' => 'Adı',
-	'Class:Organization/Attribute:name+' => 'Kullanılan adı',
-	'Class:Organization/Attribute:code' => 'Kodu',
-	'Class:Organization/Attribute:code+' => 'Kurumu kodu (Siret, DUNS,...)',
-	'Class:Organization/Attribute:status' => 'Durumu',
-	'Class:Organization/Attribute:status+' => '',
-	'Class:Organization/Attribute:status/Value:active' => 'Etkin',
-	'Class:Organization/Attribute:status/Value:active+' => 'Etkin',
-	'Class:Organization/Attribute:status/Value:inactive' => 'Etkin değil',
-	'Class:Organization/Attribute:status/Value:inactive+' => 'Etkin değil',
-	'Class:Organization/Attribute:parent_id' => 'Bağlı olduğu kurum',
-	'Class:Organization/Attribute:parent_id+' => 'Bağlı olduğu kurum',
-	'Class:Organization/Attribute:parent_name' => 'Bağlı olduğu kurumun adı',
-	'Class:Organization/Attribute:parent_name+' => 'Bağlı olduğu kurumun adı',
-	'Class:Organization/Attribute:deliverymodel_id' => 'Delivery model~~',
-	'Class:Organization/Attribute:deliverymodel_id+' => '~~',
-	'Class:Organization/Attribute:deliverymodel_name' => 'Delivery model name~~',
-	'Class:Organization/Attribute:deliverymodel_name+' => '~~',
-	'Class:Organization/Attribute:parent_id_friendlyname' => 'Parent~~',
-	'Class:Organization/Attribute:parent_id_friendlyname+' => 'Parent organization~~',
-	'Class:Organization/Attribute:overview' => 'Overview~~',
-	'Organization:Overview:FunctionalCIs' => 'Configuration items of this organization~~',
-	'Organization:Overview:FunctionalCIs:subtitle' => 'by type~~',
-	'Organization:Overview:Users' => 'iTop Users within this organization~~',
-));
-
-//
-// Class: Location
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:Location' => 'Yerleşke',
-	'Class:Location+' => 'Yerleşke : Bölge, Ülke, Şehir, Yerleşke, Bina, Kat, Oda, kabin,...',
-	'Class:Location/Attribute:name' => 'Adı',
-	'Class:Location/Attribute:name+' => '',
-	'Class:Location/Attribute:status' => 'Durumu',
-	'Class:Location/Attribute:status+' => '',
-	'Class:Location/Attribute:status/Value:active' => 'Etkin',
-	'Class:Location/Attribute:status/Value:active+' => 'Etkin',
-	'Class:Location/Attribute:status/Value:inactive' => 'Etkin değil',
-	'Class:Location/Attribute:status/Value:inactive+' => 'Etkin değil',
-	'Class:Location/Attribute:org_id' => 'Kurumun sahibi',
-	'Class:Location/Attribute:org_id+' => '',
-	'Class:Location/Attribute:org_name' => 'Kurumun sahibinin adı',
-	'Class:Location/Attribute:org_name+' => '',
-	'Class:Location/Attribute:address' => 'Adres',
-	'Class:Location/Attribute:address+' => 'Posta adresi',
-	'Class:Location/Attribute:postal_code' => 'Posta kodu',
-	'Class:Location/Attribute:postal_code+' => 'Posta kodu',
-	'Class:Location/Attribute:city' => 'Şehir',
-	'Class:Location/Attribute:city+' => '',
-	'Class:Location/Attribute:country' => 'Ülke',
-	'Class:Location/Attribute:country+' => '',
-	'Class:Location/Attribute:physicaldevice_list' => 'Devices~~',
-	'Class:Location/Attribute:physicaldevice_list+' => 'All the devices in this location~~',
-	'Class:Location/Attribute:person_list' => 'Contacts~~',
-	'Class:Location/Attribute:person_list+' => 'All the contacts located on this location~~',
-));
-
-//
-// Class: Contact
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:Contact' => 'İrtibat',
-	'Class:Contact+' => '',
-	'Class:Contact/Attribute:name' => 'Adı',
-	'Class:Contact/Attribute:name+' => '',
-	'Class:Contact/Attribute:status' => 'Durumu',
-	'Class:Contact/Attribute:status+' => '',
-	'Class:Contact/Attribute:status/Value:active' => 'Etkin',
-	'Class:Contact/Attribute:status/Value:active+' => 'Etkin',
-	'Class:Contact/Attribute:status/Value:inactive' => 'Etkin değil',
-	'Class:Contact/Attribute:status/Value:inactive+' => 'Etkin değil',
-	'Class:Contact/Attribute:org_id' => 'Kurum',
-	'Class:Contact/Attribute:org_id+' => '',
-	'Class:Contact/Attribute:org_name' => 'Kurum',
-	'Class:Contact/Attribute:org_name+' => '',
-	'Class:Contact/Attribute:email' => 'E-posta',
-	'Class:Contact/Attribute:email+' => '',
-	'Class:Contact/Attribute:phone' => 'Telefon',
-	'Class:Contact/Attribute:phone+' => '',
-	'Class:Contact/Attribute:notify' => 'Notification~~',
-	'Class:Contact/Attribute:notify+' => '~~',
-	'Class:Contact/Attribute:notify/Value:no' => 'no~~',
-	'Class:Contact/Attribute:notify/Value:no+' => 'no~~',
-	'Class:Contact/Attribute:notify/Value:yes' => 'yes~~',
-	'Class:Contact/Attribute:notify/Value:yes+' => 'yes~~',
-	'Class:Contact/Attribute:function' => 'Function~~',
-	'Class:Contact/Attribute:function+' => '~~',
-	'Class:Contact/Attribute:cis_list' => 'CIs~~',
-	'Class:Contact/Attribute:cis_list+' => 'All the configuration items linked to this contact~~',
-	'Class:Contact/Attribute:finalclass' => 'Tip',
-	'Class:Contact/Attribute:finalclass+' => '',
-));
-
-//
-// Class: Person
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:Person' => 'Kişi',
-	'Class:Person+' => '',
-	'Class:Person/Attribute:name' => 'Last Name~~',
-	'Class:Person/Attribute:name+' => '~~',
-	'Class:Person/Attribute:first_name' => 'Adı',
-	'Class:Person/Attribute:first_name+' => '',
-	'Class:Person/Attribute:employee_number' => 'Employee number~~',
-	'Class:Person/Attribute:employee_number+' => '~~',
-	'Class:Person/Attribute:mobile_phone' => 'Mobile phone~~',
-	'Class:Person/Attribute:mobile_phone+' => '~~',
-	'Class:Person/Attribute:location_id' => 'Location~~',
-	'Class:Person/Attribute:location_id+' => '~~',
-	'Class:Person/Attribute:location_name' => 'Location name~~',
-	'Class:Person/Attribute:location_name+' => '~~',
-	'Class:Person/Attribute:manager_id' => 'Manager~~',
-	'Class:Person/Attribute:manager_id+' => '~~',
-	'Class:Person/Attribute:manager_name' => 'Manager name~~',
-	'Class:Person/Attribute:manager_name+' => '~~',
-	'Class:Person/Attribute:team_list' => 'Teams~~',
-	'Class:Person/Attribute:team_list+' => 'All the teams this person belongs to~~',
-	'Class:Person/Attribute:tickets_list' => 'Tickets~~',
-	'Class:Person/Attribute:tickets_list+' => 'All the tickets this person is the caller~~',
-	'Class:Person/Attribute:manager_id_friendlyname' => 'Manager friendly name~~',
-	'Class:Person/Attribute:manager_id_friendlyname+' => '~~',
-	'Class:Person/Attribute:picture' => 'Picture~~',
-	'Class:Person/Attribute:picture+' => '~~',
-	'Class:Person/UniquenessRule:employee_number+' => 'The employee number must be unique in the organization~~',
-	'Class:Person/UniquenessRule:employee_number' => 'there is already a person in \'$this->org_name$\' organization with the same employee number~~',
-	'Class:Person/UniquenessRule:name+' => 'The employee name should be unique inside its organization~~',
-	'Class:Person/UniquenessRule:name' => 'There is already a person in \'$this->org_name$\' organization with the same name~~',
-));
-
-//
-// Class: Team
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:Team' => 'Ekip',
-	'Class:Team+' => '',
-	'Class:Team/Attribute:persons_list' => 'Members~~',
-	'Class:Team/Attribute:persons_list+' => 'All the people belonging to this team~~',
-	'Class:Team/Attribute:tickets_list' => 'Tickets~~',
-	'Class:Team/Attribute:tickets_list+' => 'All the tickets assigned to this team~~',
-));
-
-//
-// Class: Document
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:Document' => 'Doküman',
-	'Class:Document+' => '',
-	'Class:Document/Attribute:name' => 'Adı',
-	'Class:Document/Attribute:name+' => '',
-	'Class:Document/Attribute:org_id' => 'Kurum',
-	'Class:Document/Attribute:org_id+' => '~~',
-	'Class:Document/Attribute:org_name' => 'Kurum Adı',
-	'Class:Document/Attribute:org_name+' => '',
-	'Class:Document/Attribute:documenttype_id' => 'Document type~~',
-	'Class:Document/Attribute:documenttype_id+' => '~~',
-	'Class:Document/Attribute:documenttype_name' => 'Document type name~~',
-	'Class:Document/Attribute:documenttype_name+' => '~~',
-	'Class:Document/Attribute:version' => 'Version~~',
-	'Class:Document/Attribute:version+' => '~~',
-	'Class:Document/Attribute:description' => 'Tanımlama',
-	'Class:Document/Attribute:description+' => '',
-	'Class:Document/Attribute:status' => 'Durumu',
-	'Class:Document/Attribute:status+' => '',
-	'Class:Document/Attribute:status/Value:draft' => 'Taslak',
-	'Class:Document/Attribute:status/Value:draft+' => '',
-	'Class:Document/Attribute:status/Value:obsolete' => 'Geçersiz',
-	'Class:Document/Attribute:status/Value:obsolete+' => '',
-	'Class:Document/Attribute:status/Value:published' => 'Yayınlanan',
-	'Class:Document/Attribute:status/Value:published+' => '',
-	'Class:Document/Attribute:cis_list' => 'CIs~~',
-	'Class:Document/Attribute:cis_list+' => 'All the configuration items linked to this document~~',
-	'Class:Document/Attribute:contracts_list' => 'Contracts~~',
-	'Class:Document/Attribute:contracts_list+' => 'All the contracts linked to this document~~',
-	'Class:Document/Attribute:services_list' => 'Services~~',
-	'Class:Document/Attribute:services_list+' => 'All the services linked to this document~~',
-	'Class:Document/Attribute:finalclass' => 'Document Type~~',
-	'Class:Document/Attribute:finalclass+' => 'Name of the final class~~',
-));
-
-//
-// Class: DocumentFile
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:DocumentFile' => 'Document File~~',
-	'Class:DocumentFile+' => '~~',
-	'Class:DocumentFile/Attribute:file' => 'File~~',
-	'Class:DocumentFile/Attribute:file+' => '~~',
-));
-
-//
-// Class: DocumentNote
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:DocumentNote' => 'Document Note~~',
-	'Class:DocumentNote+' => '~~',
-	'Class:DocumentNote/Attribute:text' => 'Text~~',
-	'Class:DocumentNote/Attribute:text+' => '~~',
-));
-
-//
-// Class: DocumentWeb
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:DocumentWeb' => 'Document Web~~',
-	'Class:DocumentWeb+' => '~~',
-	'Class:DocumentWeb/Attribute:url' => 'URL~~',
-	'Class:DocumentWeb/Attribute:url+' => '~~',
-));
-
 //
 // Class: FunctionalCI
 //
@@ -1244,19 +1018,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:lnkDocumentToLicence/Attribute:document_name+' => '~~',
 ));
 
-//
-// Class: Typology
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:Typology' => 'Typology~~',
-	'Class:Typology+' => '~~',
-	'Class:Typology/Attribute:name' => 'Name~~',
-	'Class:Typology/Attribute:name+' => '~~',
-	'Class:Typology/Attribute:finalclass' => 'Type~~',
-	'Class:Typology/Attribute:finalclass+' => 'Name of the final class~~',
-));
-
 //
 // Class: OSVersion
 //
@@ -1279,24 +1040,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:OSFamily+' => '~~',
 ));
 
-//
-// Class: DocumentType
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:DocumentType' => 'Document Type~~',
-	'Class:DocumentType+' => '~~',
-));
-
-//
-// Class: ContactType
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:ContactType' => 'Contact Type~~',
-	'Class:ContactType+' => '~~',
-));
-
 //
 // Class: Brand
 //
@@ -1457,23 +1200,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:lnkDocumentToSoftware/Attribute:document_name+' => '~~',
 ));
 
-//
-// Class: lnkContactToFunctionalCI
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:lnkContactToFunctionalCI' => 'Link Contact / FunctionalCI~~',
-	'Class:lnkContactToFunctionalCI+' => '~~',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Functionalci~~',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '~~',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name~~',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '~~',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contact~~',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '~~',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Contact name~~',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '~~',
-));
-
 //
 // Class: lnkDocumentToFunctionalCI
 //
@@ -1720,27 +1446,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_name+' => '~~',
 ));
 
-//
-// Class: lnkPersonToTeam
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:lnkPersonToTeam' => 'Link Person / Team~~',
-	'Class:lnkPersonToTeam+' => '~~',
-	'Class:lnkPersonToTeam/Attribute:team_id' => 'Team~~',
-	'Class:lnkPersonToTeam/Attribute:team_id+' => '~~',
-	'Class:lnkPersonToTeam/Attribute:team_name' => 'Team name~~',
-	'Class:lnkPersonToTeam/Attribute:team_name+' => '~~',
-	'Class:lnkPersonToTeam/Attribute:person_id' => 'Person~~',
-	'Class:lnkPersonToTeam/Attribute:person_id+' => '~~',
-	'Class:lnkPersonToTeam/Attribute:person_name' => 'Person name~~',
-	'Class:lnkPersonToTeam/Attribute:person_name+' => '~~',
-	'Class:lnkPersonToTeam/Attribute:role_id' => 'Role~~',
-	'Class:lnkPersonToTeam/Attribute:role_id+' => '~~',
-	'Class:lnkPersonToTeam/Attribute:role_name' => 'Role name~~',
-	'Class:lnkPersonToTeam/Attribute:role_name+' => '~~',
-));
-
 //
 // Class: Group
 //
@@ -1767,7 +1472,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:Group/Attribute:type' => 'Tip',
 	'Class:Group/Attribute:type+' => '',
 	'Class:Group/Attribute:parent_id' => 'Bağlı olduğu grup',
-
 	'Class:Group/Attribute:parent_id+' => '',
 	'Class:Group/Attribute:parent_name' => 'Adı',
 	'Class:Group/Attribute:parent_name+' => '',
@@ -1796,42 +1500,37 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:lnkGroupToCI/Attribute:reason+' => '',
 ));
 
+//
+// Add translation for Fieldsets
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Server:baseinfo' => 'General information~~',
+	'Server:Date' => 'Dates~~',
+	'Server:moreinfo' => 'More information~~',
+	'Server:otherinfo' => 'Other information~~',
+	'Server:power' => 'Power supply~~',
+	'Person:info' => 'General information~~',
+	'UserLocal:info' => 'General information~~',
+	'Person:personal_info' => 'Personal information~~',
+	'Person:notifiy' => 'Notification~~',
+	'Class:Subnet/Tab:IPUsage' => 'IP Kullanımı',
+	'Class:Subnet/Tab:IPUsage-explain' => '<em>%1$s</em> - <em>%2$s</em> aralığındaki IPye sahip arayüzler',
+	'Class:Subnet/Tab:FreeIPs' => 'Boş IPler',
+	'Class:Subnet/Tab:FreeIPs-count' => 'Boş IPler: %1$s',
+	'Class:Subnet/Tab:FreeIPs-explain' => 'Boş IP adresleri',
+	'Class:Document:PreviewTab' => 'Ön görünüm',
+));
 
 //
 // Application Menu
 //
 
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Menu:DataAdministration' => 'Veri Yönetimi',
-	'Menu:DataAdministration+' => 'Veri Yönetimi',
-	'Menu:Catalogs' => 'Kataloglar',
-	'Menu:Catalogs+' => 'Veri tipleri',
-	'Menu:Audit' => 'Denetleme',
-	'Menu:Audit+' => 'Denetleme',
-	'Menu:CSVImport' => 'CSV dışardan al',
-	'Menu:CSVImport+' => 'Çoklu yaratım veya güncelleme',
-	'Menu:Organization' => 'Kurumlar',
-	'Menu:Organization+' => 'Tüm Kurumlar',
 	'Menu:Application' => 'Uygulamalar',
 	'Menu:Application+' => 'Tüm Uygulamalar',
 	'Menu:DBServer' => 'Veritabanı sunucuları',
 	'Menu:DBServer+' => 'Veritabanı sunucuları',
-	'Menu:ConfigManagement' => 'Konfigürasyon Yönetimi',
-	'Menu:ConfigManagement+' => 'Konfigürasyon Yönetimi',
-	'Menu:ConfigManagementOverview' => 'Özet',
-	'Menu:ConfigManagementOverview+' => 'Özet',
-	'Menu:Contact' => 'İrtibatlar',
-	'Menu:Contact+' => 'İrtibatlar',
-	'Menu:Contact:Count' => '%1$d',
-	'Menu:Person' => 'Kişiler',
-	'Menu:Person+' => 'Tüm Kişiler',
-	'Menu:Team' => 'Ekipler',
-	'Menu:Team+' => 'Tüm ekipler',
-	'Menu:Document' => 'Dokümanlar',
-	'Menu:Document+' => 'Tüm dokümanlar',
-	'Menu:Location' => 'Yerleşkeler',
-
-	'Menu:Location+' => 'Tüm Yerleşkeler',
 	'Menu:ConfigManagementCI' => 'Konfigürasyon Kalemleri',
 	'Menu:ConfigManagementCI+' => 'Konfigürasyon Kalemleri',
 	'Menu:BusinessProcess' => 'İş süreçleri',
@@ -1858,10 +1557,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Menu:MobilePhone+' => 'Tüm Cep Telefonları',
 	'Menu:PC' => 'Kişisel Bilgisayarlar',
 	'Menu:PC+' => 'Tüm Kişisel Bilgisayarlar',
-	'Menu:NewContact' => 'Yeni İrtibat',
-	'Menu:NewContact+' => 'Yeni İrtibat',
-	'Menu:SearchContacts' => 'İrtibat ara',
-	'Menu:SearchContacts+' => 'İrtibat ara',
 	'Menu:NewCI' => 'Yeni KK',
 	'Menu:NewCI+' => 'Yeni KK',
 	'Menu:SearchCIs' => 'KK ara',
@@ -1874,36 +1569,8 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Menu:ConfigManagement:Misc' => 'Diğer',
 	'Menu:Group' => 'KK Grupları',
 	'Menu:Group+' => 'KK Grupları',
-	'Menu:ConfigManagement:Shortcuts' => 'Kısalyollar',
-	'Menu:ConfigManagement:AllContacts' => 'Tüm irtibatlar: %1$d',
-	'Menu:Typology' => 'Typology configuration~~',
-	'Menu:Typology+' => 'Typology configuration~~',
 	'Menu:OSVersion' => 'OS versions~~',
 	'Menu:OSVersion+' => '~~',
 	'Menu:Software' => 'Software catalog~~',
 	'Menu:Software+' => 'Software catalog~~',
-	'UI_WelcomeMenu_AllConfigItems' => 'Summary~~',
-	'Menu:ConfigManagement:Typology' => 'Typology configuration~~',
-
-));
-
-
-// Add translation for Fieldsets
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Server:baseinfo' => 'General information~~',
-	'Server:Date' => 'Dates~~',
-	'Server:moreinfo' => 'More information~~',
-	'Server:otherinfo' => 'Other information~~',
-	'Server:power' => 'Power supply~~',
-	'Person:info' => 'General information~~',
-	'UserLocal:info' => 'General information~~',
-	'Person:personal_info' => 'Personal information~~',
-	'Person:notifiy' => 'Notification~~',
-	'Class:Subnet/Tab:IPUsage' => 'IP Kullanımı',
-	'Class:Subnet/Tab:IPUsage-explain' => '<em>%1$s</em> - <em>%2$s</em> aralığındaki IPye sahip arayüzler',
-	'Class:Subnet/Tab:FreeIPs' => 'Boş IPler',
-	'Class:Subnet/Tab:FreeIPs-count' => 'Boş IPler: %1$s',
-	'Class:Subnet/Tab:FreeIPs-explain' => 'Boş IP adresleri',
-	'Class:Document:PreviewTab' => 'Ön görünüm',
 ));
diff --git a/datamodels/2.x/itop-config-mgmt/typology_menu.html b/datamodels/2.x/itop-config-mgmt/typology_menu.html
deleted file mode 100755
index 22a50d146..000000000
--- a/datamodels/2.x/itop-config-mgmt/typology_menu.html
+++ /dev/null
@@ -1,143 +0,0 @@
-<style>
-.main_container {
-	width: 100%;
-	border: 0;
-	overflow-y: hidden;
-	overflow-x: hidden;
-	margin-bottom: 5px;
-	margin-top: 5px;
-	border-bottom: #ccc 1px solid;
-	border-top: #ccc 1px solid;
-}
-.main_header {
-	width:100%;
-	height: 60px;
-	cursor: move;
-	background-color: #F1F1F6;
-}
-.main_header h1 {
-	color: #1C94C4;
-	margin-top:0;
-	margin-bottom:0;
-	padding-top: 10px;
-	padding-bottom: 10px;p
-	font-size: 16px;
-	line-height: 16px;
-}
-.main_header img {
-	margin-top: 10px;
-	margin-right: 10px;
-	float:left;
-}
-.item {
-	overflow-y: auto;
-	overflow-x: hidden;
-	background-color: #fff;
-	padding: 5px;
-	height: auto;
-}
-.main_menu {
-	overflow-y: auto;
-	overflow-x: hidden;
-	height: auto;
-	background-color: #eee;
-	width: 100%;
-}
-.element {
-	display: inline-block;
-}
-.element a {
-	font-size: 10px;
-}
-.element a.actions {
-	font-size: 16px;
-	text-decoration: none;
-	background: transparent;
-	color: #666;
-}
-.element a img {
-	border: 0;
-}
-.summary-details {
-	float:right;
-	margin-top: 5px;
-}
-
-.summary-details td {
-	text-align: center;
-	background: transparent;
-	padding: 5px;
-}
-.summary-details th {
-	text-align: center;
-	background: #CCC;
-	padding: 5px;
-	color: #eee;
-}
-a.summary {
-	text-decoration: none;
-	background: transparent;
-	color: #666;
-}
-a.summary:hover {
-	text-decoration: underline;
-}
-</style>
-<div id="ci_menu" class="sortable persistent">
-
-<!-- ######################################### -->
-
-<div id="menu_1" class="main_container v-resizable">
-
-<div class="main_header drag_handle" id="config_typology">
-<h1><itopstring>Menu:ConfigManagement:Typology</itopstring></h1>
-</div><!-- Drag Handle -->
-
-<div class="item">
-
-<div class="element">
-<itopblock BlockClass="DisplayBlock" type="actions" asynchronous="false" encoding="text/oql" parameters="context_filter:1">SELECT Brand</itopblock>
-</div><!-- element -->
-
-<div class="element">
-<itopblock BlockClass="DisplayBlock" type="actions" asynchronous="false" encoding="text/oql" parameters="context_filter:1">SELECT Model</itopblock>
-</div><!-- element -->
-
-<div class="element">
-<itopblock BlockClass="DisplayBlock" type="actions" asynchronous="false" encoding="text/oql" parameters="context_filter:1">SELECT OSfamily</itopblock>
-</div><!-- element -->
-
-<div class="element">
-<itopblock BlockClass="DisplayBlock" type="actions" asynchronous="false" encoding="text/oql" parameters="context_filter:1">SELECT OSversion</itopblock>
-</div><!-- element -->
-
-<div class="element">
-<itopblock BlockClass="DisplayBlock" type="actions" asynchronous="false" encoding="text/oql" parameters="context_filter:1">SELECT IOSversion</itopblock>
-</div><!-- element -->
-
-<div class="element">
-<itopblock BlockClass="DisplayBlock" type="actions" asynchronous="false" encoding="text/oql" parameters="context_filter:1">SELECT NetworkDeviceType</itopblock>
-</div><!-- element -->
-
-<div class="element">
-<itopblock BlockClass="DisplayBlock" type="actions" asynchronous="false" encoding="text/oql" parameters="context_filter:1">SELECT ContractType</itopblock>
-</div><!-- element -->
-
-<div class="element">
-<itopblock BlockClass="DisplayBlock" type="actions" asynchronous="false" encoding="text/oql" parameters="context_filter:1">SELECT ContactType</itopblock>
-</div><!-- element -->
-
-<div class="element">
-<itopblock BlockClass="DisplayBlock" type="actions" asynchronous="false" encoding="text/oql" parameters="context_filter:1">SELECT DocumentType</itopblock>
-</div><!-- element -->
-
-</div><!-- item -->
-
-</div><!-- menu_1 -->
-
-
-
-
-<!-- ######################################### -->
-
-</div>
diff --git a/datamodels/2.x/itop-config-mgmt/zh_cn.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/zh_cn.dict.itop-config-mgmt.php
index 546ed1ef9..e34ffd22c 100755
--- a/datamodels/2.x/itop-config-mgmt/zh_cn.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/zh_cn.dict.itop-config-mgmt.php
@@ -74,232 +74,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 //////////////////////////////////////////////////////////////////////
 //
 
-
-//
-// Class: Organization
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:Organization' => '组织',
-	'Class:Organization+' => '',
-	'Class:Organization/Attribute:name' => '名称',
-	'Class:Organization/Attribute:name+' => '常用名称',
-	'Class:Organization/Attribute:code' => '编码',
-	'Class:Organization/Attribute:code+' => '组织编码(Siret, DUNS,...)',
-	'Class:Organization/Attribute:status' => '状态',
-	'Class:Organization/Attribute:status+' => '',
-	'Class:Organization/Attribute:status/Value:active' => '启用',
-	'Class:Organization/Attribute:status/Value:active+' => '启用',
-	'Class:Organization/Attribute:status/Value:inactive' => '停用',
-	'Class:Organization/Attribute:status/Value:inactive+' => '停用',
-	'Class:Organization/Attribute:parent_id' => '父级',
-	'Class:Organization/Attribute:parent_id+' => '父级组织',
-	'Class:Organization/Attribute:parent_name' => '父级名称',
-	'Class:Organization/Attribute:parent_name+' => '父级组织名称',
-	'Class:Organization/Attribute:deliverymodel_id' => '交付模式',
-	'Class:Organization/Attribute:deliverymodel_id+' => '',
-	'Class:Organization/Attribute:deliverymodel_name' => '交付模式名称',
-	'Class:Organization/Attribute:deliverymodel_name+' => '',
-	'Class:Organization/Attribute:parent_id_friendlyname' => '上级组织',
-	'Class:Organization/Attribute:parent_id_friendlyname+' => '上级组织',
-	'Class:Organization/Attribute:overview' => '概览',
-	'Organization:Overview:FunctionalCIs' => '该组织的所有配置项',
-	'Organization:Overview:FunctionalCIs:subtitle' => '按类型',
-	'Organization:Overview:Users' => '该组织里所有的iTop 用户',
-));
-
-//
-// Class: Location
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:Location' => '地理位置',
-	'Class:Location+' => '任何类型的地理位置: 区域, 国家, 城市, 位置, 建筑, 楼层, 房间, 机架,...',
-	'Class:Location/Attribute:name' => '名称',
-	'Class:Location/Attribute:name+' => '',
-	'Class:Location/Attribute:status' => '状态',
-	'Class:Location/Attribute:status+' => '',
-	'Class:Location/Attribute:status/Value:active' => '启用',
-	'Class:Location/Attribute:status/Value:active+' => '启用',
-	'Class:Location/Attribute:status/Value:inactive' => '停用',
-	'Class:Location/Attribute:status/Value:inactive+' => '停用',
-	'Class:Location/Attribute:org_id' => '拥有者组织',
-	'Class:Location/Attribute:org_id+' => '',
-	'Class:Location/Attribute:org_name' => '拥有者组织名称',
-	'Class:Location/Attribute:org_name+' => '',
-	'Class:Location/Attribute:address' => '地址',
-	'Class:Location/Attribute:address+' => '门户地址',
-	'Class:Location/Attribute:postal_code' => '邮编',
-	'Class:Location/Attribute:postal_code+' => 'ZIP/邮政编码',
-	'Class:Location/Attribute:city' => '城市',
-	'Class:Location/Attribute:city+' => '',
-	'Class:Location/Attribute:country' => '国家',
-	'Class:Location/Attribute:country+' => '',
-	'Class:Location/Attribute:physicaldevice_list' => '设备',
-	'Class:Location/Attribute:physicaldevice_list+' => '该位置的所有设备',
-	'Class:Location/Attribute:person_list' => '联系人',
-	'Class:Location/Attribute:person_list+' => '该位置的所有联系人',
-));
-
-//
-// Class: Contact
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:Contact' => '联系人',
-	'Class:Contact+' => '',
-	'Class:Contact/Attribute:name' => '名称',
-	'Class:Contact/Attribute:name+' => '',
-	'Class:Contact/Attribute:status' => '状态',
-	'Class:Contact/Attribute:status+' => '',
-	'Class:Contact/Attribute:status/Value:active' => '启用',
-	'Class:Contact/Attribute:status/Value:active+' => '启用',
-	'Class:Contact/Attribute:status/Value:inactive' => '停用',
-	'Class:Contact/Attribute:status/Value:inactive+' => '停用',
-	'Class:Contact/Attribute:org_id' => '组织',
-	'Class:Contact/Attribute:org_id+' => '',
-	'Class:Contact/Attribute:org_name' => '组织',
-	'Class:Contact/Attribute:org_name+' => '',
-	'Class:Contact/Attribute:email' => 'Email',
-	'Class:Contact/Attribute:email+' => '',
-	'Class:Contact/Attribute:phone' => '电话',
-	'Class:Contact/Attribute:phone+' => '',
-	'Class:Contact/Attribute:notify' => '通知',
-	'Class:Contact/Attribute:notify+' => '',
-	'Class:Contact/Attribute:notify/Value:no' => '否',
-	'Class:Contact/Attribute:notify/Value:no+' => '否',
-	'Class:Contact/Attribute:notify/Value:yes' => '是',
-	'Class:Contact/Attribute:notify/Value:yes+' => '是',
-	'Class:Contact/Attribute:function' => '职责',
-	'Class:Contact/Attribute:function+' => '',
-	'Class:Contact/Attribute:cis_list' => '配置项',
-	'Class:Contact/Attribute:cis_list+' => '该联系人关联的所有配置项',
-	'Class:Contact/Attribute:finalclass' => '联系人子类别',
-	'Class:Contact/Attribute:finalclass+' => 'Name of the final class',
-));
-
-//
-// Class: Person
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:Person' => '个人',
-	'Class:Person+' => '',
-	'Class:Person/Attribute:name' => '姓',
-	'Class:Person/Attribute:name+' => '',
-	'Class:Person/Attribute:first_name' => '名',
-	'Class:Person/Attribute:first_name+' => '',
-	'Class:Person/Attribute:employee_number' => '员工编号',
-	'Class:Person/Attribute:employee_number+' => '',
-	'Class:Person/Attribute:mobile_phone' => '移动电话',
-	'Class:Person/Attribute:mobile_phone+' => '',
-	'Class:Person/Attribute:location_id' => '地理位置',
-	'Class:Person/Attribute:location_id+' => '',
-	'Class:Person/Attribute:location_name' => '名称',
-	'Class:Person/Attribute:location_name+' => '',
-	'Class:Person/Attribute:manager_id' => '经理',
-	'Class:Person/Attribute:manager_id+' => '',
-	'Class:Person/Attribute:manager_name' => '名称',
-	'Class:Person/Attribute:manager_name+' => '',
-	'Class:Person/Attribute:team_list' => '团队',
-	'Class:Person/Attribute:team_list+' => '这个人归属的所有团队',
-	'Class:Person/Attribute:tickets_list' => '工单',
-	'Class:Person/Attribute:tickets_list+' => '这个人发起的所有工单',
-	'Class:Person/Attribute:manager_id_friendlyname' => '经理姓名',
-	'Class:Person/Attribute:manager_id_friendlyname+' => '',
-	'Class:Person/Attribute:picture' => '头像',
-	'Class:Person/Attribute:picture+' => '',
-	'Class:Person/UniquenessRule:employee_number+' => '同一组织内的员工号必须唯一',
-	'Class:Person/UniquenessRule:employee_number' => '\'$this->org_name$\' 内已经有人占用了这个员工号',
-	'Class:Person/UniquenessRule:name+' => '同一组织内的员工姓名必须唯一',
-	'Class:Person/UniquenessRule:name' => '\'$this->org_name$\' 内已经有人叫这个名字',
-));
-
-//
-// Class: Team
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:Team' => '团队',
-	'Class:Team+' => '',
-	'Class:Team/Attribute:persons_list' => '成员',
-	'Class:Team/Attribute:persons_list+' => '该团队包含的所有成员',
-	'Class:Team/Attribute:tickets_list' => '工单',
-	'Class:Team/Attribute:tickets_list+' => '该团队的所有工单',
-));
-
-//
-// Class: Document
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:Document' => '文档',
-	'Class:Document+' => '',
-	'Class:Document/Attribute:name' => '名称',
-	'Class:Document/Attribute:name+' => '',
-	'Class:Document/Attribute:org_id' => '组织',
-	'Class:Document/Attribute:org_id+' => '',
-	'Class:Document/Attribute:org_name' => '组织名称',
-	'Class:Document/Attribute:org_name+' => '',
-	'Class:Document/Attribute:documenttype_id' => '文档类型',
-	'Class:Document/Attribute:documenttype_id+' => '',
-	'Class:Document/Attribute:documenttype_name' => '文档类型名称',
-	'Class:Document/Attribute:documenttype_name+' => '',
-	'Class:Document/Attribute:version' => '版本',
-	'Class:Document/Attribute:version+' => '',
-	'Class:Document/Attribute:description' => '描述',
-	'Class:Document/Attribute:description+' => '',
-	'Class:Document/Attribute:status' => '状态',
-	'Class:Document/Attribute:status+' => '',
-	'Class:Document/Attribute:status/Value:draft' => '草稿',
-	'Class:Document/Attribute:status/Value:draft+' => '',
-	'Class:Document/Attribute:status/Value:obsolete' => '废弃',
-	'Class:Document/Attribute:status/Value:obsolete+' => '',
-	'Class:Document/Attribute:status/Value:published' => '已发布',
-	'Class:Document/Attribute:status/Value:published+' => '',
-	'Class:Document/Attribute:cis_list' => '配置项',
-	'Class:Document/Attribute:cis_list+' => '该文档关联的所有配置项',
-	'Class:Document/Attribute:contracts_list' => '合同',
-	'Class:Document/Attribute:contracts_list+' => '该文档关联的所有合同',
-	'Class:Document/Attribute:services_list' => '服务',
-	'Class:Document/Attribute:services_list+' => '该文档关联的所有服务',
-	'Class:Document/Attribute:finalclass' => '文档子类别',
-	'Class:Document/Attribute:finalclass+' => 'Name of the final class',
-));
-
-//
-// Class: DocumentFile
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:DocumentFile' => '文档文件',
-	'Class:DocumentFile+' => '',
-	'Class:DocumentFile/Attribute:file' => '文件',
-	'Class:DocumentFile/Attribute:file+' => '',
-));
-
-//
-// Class: DocumentNote
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:DocumentNote' => '文档笔记',
-	'Class:DocumentNote+' => '',
-	'Class:DocumentNote/Attribute:text' => '文本',
-	'Class:DocumentNote/Attribute:text+' => '',
-));
-
-//
-// Class: DocumentWeb
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:DocumentWeb' => '文档网页',
-	'Class:DocumentWeb+' => '',
-	'Class:DocumentWeb/Attribute:url' => 'URL',
-	'Class:DocumentWeb/Attribute:url+' => '',
-));
-
 //
 // Class: FunctionalCI
 //
@@ -1242,19 +1016,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:lnkDocumentToLicence/Attribute:document_name+' => '',
 ));
 
-//
-// Class: Typology
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:Typology' => '类型',
-	'Class:Typology+' => '',
-	'Class:Typology/Attribute:name' => '名称',
-	'Class:Typology/Attribute:name+' => '',
-	'Class:Typology/Attribute:finalclass' => '类型',
-	'Class:Typology/Attribute:finalclass+' => 'Name of the final class',
-));
-
 //
 // Class: OSVersion
 //
@@ -1277,24 +1038,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:OSFamily+' => '',
 ));
 
-//
-// Class: DocumentType
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:DocumentType' => '文档类型',
-	'Class:DocumentType+' => '',
-));
-
-//
-// Class: ContactType
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:ContactType' => '联系人类型',
-	'Class:ContactType+' => '',
-));
-
 //
 // Class: Brand
 //
@@ -1455,23 +1198,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:lnkDocumentToSoftware/Attribute:document_name+' => '',
 ));
 
-//
-// Class: lnkContactToFunctionalCI
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:lnkContactToFunctionalCI' => '链接 联系人 / 功能项',
-	'Class:lnkContactToFunctionalCI+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => '功能项',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => '功能项名称',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => '联系人',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => '联系人名称',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
-));
-
 //
 // Class: lnkDocumentToFunctionalCI
 //
@@ -1718,27 +1444,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_name+' => '',
 ));
 
-//
-// Class: lnkPersonToTeam
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:lnkPersonToTeam' => '链接 个体 / 团队',
-	'Class:lnkPersonToTeam+' => '',
-	'Class:lnkPersonToTeam/Attribute:team_id' => '团队',
-	'Class:lnkPersonToTeam/Attribute:team_id+' => '',
-	'Class:lnkPersonToTeam/Attribute:team_name' => '团队名称',
-	'Class:lnkPersonToTeam/Attribute:team_name+' => '',
-	'Class:lnkPersonToTeam/Attribute:person_id' => '个体',
-	'Class:lnkPersonToTeam/Attribute:person_id+' => '',
-	'Class:lnkPersonToTeam/Attribute:person_name' => '姓名',
-	'Class:lnkPersonToTeam/Attribute:person_name+' => '',
-	'Class:lnkPersonToTeam/Attribute:role_id' => '角色',
-	'Class:lnkPersonToTeam/Attribute:role_id+' => '',
-	'Class:lnkPersonToTeam/Attribute:role_name' => '角色名称',
-	'Class:lnkPersonToTeam/Attribute:role_name+' => '',
-));
-
 //
 // Class: Group
 //
@@ -1794,42 +1499,33 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:lnkGroupToCI/Attribute:reason+' => '',
 ));
 
-
 //
-// Application Menu
+// Add translation for Fieldsets
 //
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Menu:DataAdministration' => '数据管理',
-	'Menu:DataAdministration+' => '数据管理',
-	'Menu:Catalogs' => '类别',
-	'Menu:Catalogs+' => '数据类型',
-	'Menu:Audit' => '审计',
-	'Menu:Audit+' => '审计',
-	'Menu:CSVImport' => 'CSV 导入',
-	'Menu:CSVImport+' => '批量创建或更新',
-	'Menu:Organization' => '组织',
-	'Menu:Organization+' => '所有组织',
+	'Server:baseinfo' => '基本信息',
+	'Server:Date' => '日期',
+	'Server:moreinfo' => '更多信息',
+	'Server:otherinfo' => '其它信息',
+	'Server:power' => '电力供应',
+	'Person:info' => '基本信息',
+	'UserLocal:info' => 'General information~~',
+	'Person:personal_info' => '个人信息',
+	'Person:notifiy' => '通知',
+	'Class:Subnet/Tab:IPUsage' => 'IP 使用率',
+	'Class:Subnet/Tab:IPUsage-explain' => '网卡IP范围: <em>%1$s</em> 到 <em>%2$s</em>',
+	'Class:Subnet/Tab:FreeIPs' => '空闲 IP',
+	'Class:Subnet/Tab:FreeIPs-count' => '空闲 IP: %1$s',
+	'Class:Subnet/Tab:FreeIPs-explain' => '以下是抽取的10个空闲IP',
+	'Class:Document:PreviewTab' => '预览',
+));
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Menu:Application' => '应用',
 	'Menu:Application+' => '所有应用',
 	'Menu:DBServer' => '数据库服务器',
 	'Menu:DBServer+' => '数据库服务器',
-	'Menu:ConfigManagement' => '配置管理',
-	'Menu:ConfigManagement+' => '配置管理',
-	'Menu:ConfigManagementOverview' => '概览',
-	'Menu:ConfigManagementOverview+' => '概览',
-	'Menu:Contact' => '联系人',
-	'Menu:Contact+' => '联系人',
-	'Menu:Contact:Count' => '%1$d 个联系人',
-	'Menu:Person' => '个体',
-	'Menu:Person+' => '所有个体',
-	'Menu:Team' => '团队',
-	'Menu:Team+' => '所有团队',
-	'Menu:Document' => '文档',
-	'Menu:Document+' => '所有文档',
-	'Menu:Location' => '地理位置',
-
-	'Menu:Location+' => '所有位置',
 	'Menu:ConfigManagementCI' => '配置项',
 	'Menu:ConfigManagementCI+' => '配置项',
 	'Menu:BusinessProcess' => '业务流程',
@@ -1856,10 +1552,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Menu:MobilePhone+' => '所有移动电话',
 	'Menu:PC' => '个人电脑',
 	'Menu:PC+' => '所有个人电脑',
-	'Menu:NewContact' => '新建联系人',
-	'Menu:NewContact+' => '新建联系人',
-	'Menu:SearchContacts' => '搜索联系人',
-	'Menu:SearchContacts+' => '搜索联系人',
 	'Menu:NewCI' => '新建配置项',
 	'Menu:NewCI+' => '新建配置项',
 	'Menu:SearchCIs' => '搜索配置项',
@@ -1872,36 +1564,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Menu:ConfigManagement:Misc' => '杂项',
 	'Menu:Group' => '配置组',
 	'Menu:Group+' => '配置组',
-	'Menu:ConfigManagement:Shortcuts' => '快捷方式',
-	'Menu:ConfigManagement:AllContacts' => '所有联系人: %1$d',
-	'Menu:Typology' => '类型配置',
-	'Menu:Typology+' => '类型配置',
 	'Menu:OSVersion' => 'OS 版本',
 	'Menu:OSVersion+' => '',
 	'Menu:Software' => '软件清单',
 	'Menu:Software+' => '软件清单',
-	'UI_WelcomeMenu_AllConfigItems' => '摘要',
-	'Menu:ConfigManagement:Typology' => '类型配置',
-
-));
-
-
-// Add translation for Fieldsets
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Server:baseinfo' => '基本信息',
-	'Server:Date' => '日期',
-	'Server:moreinfo' => '更多信息',
-	'Server:otherinfo' => '其它信息',
-	'Server:power' => '电力供应',
-	'Person:info' => '基本信息',
-	'UserLocal:info' => 'General information~~',
-	'Person:personal_info' => '个人信息',
-	'Person:notifiy' => '通知',
-	'Class:Subnet/Tab:IPUsage' => 'IP 使用率',
-	'Class:Subnet/Tab:IPUsage-explain' => '网卡IP范围: <em>%1$s</em> 到 <em>%2$s</em>',
-	'Class:Subnet/Tab:FreeIPs' => '空闲 IP',
-	'Class:Subnet/Tab:FreeIPs-count' => '空闲 IP: %1$s',
-	'Class:Subnet/Tab:FreeIPs-explain' => '以下是抽取的10个空闲IP',
-	'Class:Document:PreviewTab' => '预览',
-));
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-portal/cs.dict.itop-portal.php b/datamodels/2.x/itop-portal/cs.dict.itop-portal.php
new file mode 100644
index 000000000..10aa3ccb4
--- /dev/null
+++ b/datamodels/2.x/itop-portal/cs.dict.itop-portal.php
@@ -0,0 +1,43 @@
+<?php
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+ * @author      Benjamin Planque <benjamin.planque@combodo.com>
+ * @copyright   Copyright (C) 2010-2018 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+//////////////////////////////////////////////////////////////////////
+// Note: The classes have been grouped by categories: bizmodel
+//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+Dict::Add('CS CZ', 'Czech', 'Čeština', array(
+	'portal:itop-portal' => 'Standardní portál', // This is the portal name that will be displayed in portal dispatcher (eg. URL in menus)
+	'Page:DefaultTitle' => '%1$s - Uživatelský portál',
+	'Brick:Portal:UserProfile:Title' => 'Můj profil',
+	'Brick:Portal:NewRequest:Title' => 'Nový požadavek',
+	'Brick:Portal:NewRequest:Title+' => '<p>Potřebujete pomoci?</p><p>Vyberte z katalogu služeb a vytvořte nový požadavek.</p>',
+	'Brick:Portal:OngoingRequests:Title' => 'Otevřené požadavky',
+	'Brick:Portal:OngoingRequests:Title+' => '<p>Sledujte své otevřené požadavky.</p><p>Zkontrolujte stav, přidejte komentář, přiložte dokumenty, potvrďte řešení.</p>',
+	'Brick:Portal:OngoingRequests:Tab:OnGoing' => 'Probíhající',
+	'Brick:Portal:OngoingRequests:Tab:Resolved' => 'Vyřešené',
+	'Brick:Portal:ClosedRequests:Title' => 'Uzavřené požadavky',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-portal/da.dict.itop-portal.php b/datamodels/2.x/itop-portal/da.dict.itop-portal.php
new file mode 100644
index 000000000..aa55e0ec7
--- /dev/null
+++ b/datamodels/2.x/itop-portal/da.dict.itop-portal.php
@@ -0,0 +1,43 @@
+<?php
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+ * @author      Benjamin Planque <benjamin.planque@combodo.com>
+ * @copyright   Copyright (C) 2010-2018 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+//////////////////////////////////////////////////////////////////////
+// Note: The classes have been grouped by categories: bizmodel
+//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+Dict::Add('DA DA', 'Danish', 'Dansk', array(
+	'portal:itop-portal' => 'Standard portal~~', // This is the portal name that will be displayed in portal dispatcher (eg. URL in menus)
+	'Page:DefaultTitle' => '%1$s - User portal~~',
+	'Brick:Portal:UserProfile:Title' => 'My profile~~',
+	'Brick:Portal:NewRequest:Title' => 'New request~~',
+	'Brick:Portal:NewRequest:Title+' => '<p>Need help?</p><p>Pick from the services catalog and submit your request to our support teams.</p>~~',
+	'Brick:Portal:OngoingRequests:Title' => 'Ongoing requests~~',
+	'Brick:Portal:OngoingRequests:Title+' => '<p>Follow up with your ongoing requests.</p><p>Check the progress, add comments, attach documents, acknowledge the solution.</p>~~',
+	'Brick:Portal:OngoingRequests:Tab:OnGoing' => 'Open~~',
+	'Brick:Portal:OngoingRequests:Tab:Resolved' => 'Resolved~~',
+	'Brick:Portal:ClosedRequests:Title' => 'Closed requests~~',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-portal/datamodel.itop-portal.xml b/datamodels/2.x/itop-portal/datamodel.itop-portal.xml
index 346fb043c..03b9329b3 100644
--- a/datamodels/2.x/itop-portal/datamodel.itop-portal.xml
+++ b/datamodels/2.x/itop-portal/datamodel.itop-portal.xml
@@ -10,4 +10,137 @@
 			<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>
+					<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>
+					<div class="form_field" data-field-id="phone">
+					</div>
+					<div class="form_field" data-field-id="location_id">
+					</div>
+					<div class="form_field" data-field-id="function">
+					</div>
+					<div class="form_field" data-field-id="manager_id" data-field-flags="read_only">
+					</div>
+				</twig>
+			</form>
+		</brick>
+			</bricks>
+		</module_design>
+	</module_designs>
 </itop_design>
diff --git a/datamodels/2.x/itop-portal/de.dict.itop-portal.php b/datamodels/2.x/itop-portal/de.dict.itop-portal.php
new file mode 100644
index 000000000..25105bc7e
--- /dev/null
+++ b/datamodels/2.x/itop-portal/de.dict.itop-portal.php
@@ -0,0 +1,43 @@
+<?php
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+ * @author      Benjamin Planque <benjamin.planque@combodo.com>
+ * @copyright   Copyright (C) 2010-2018 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+//////////////////////////////////////////////////////////////////////
+// Note: The classes have been grouped by categories: bizmodel
+//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'portal:itop-portal' => 'Standard Portal', // This is the portal name that will be displayed in portal dispatcher (eg. URL in menus)
+	'Page:DefaultTitle' => '%1$s - Benutzer Portal',
+	'Brick:Portal:UserProfile:Title' => 'Mein Profile',
+	'Brick:Portal:NewRequest:Title' => 'Neue Störung/Anfrage',
+	'Brick:Portal:NewRequest:Title+' => '<p>Hilfe?</p><p>Wählen Sie einen Service aus und senden Sie Ihre Anfrage zum Service Desk.</p>',
+	'Brick:Portal:OngoingRequests:Title' => 'Offene Störungen/Anfragen',
+	'Brick:Portal:OngoingRequests:Title+' => '<p>Hier können Sie Ihre laufenden Anfragen und Störungsmeldungen ansehen,</p><p>den Verlauf verfolgen, Kommentare und Anhänge hinzufügen und gelöste Anfragen schließen.</p>',
+	'Brick:Portal:OngoingRequests:Tab:OnGoing' => 'Offen',
+	'Brick:Portal:OngoingRequests:Tab:Resolved' => 'Gelöst',
+	'Brick:Portal:ClosedRequests:Title' => 'Geschlossene Störungen/Anfragen',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-portal/en.dict.itop-portal.php b/datamodels/2.x/itop-portal/en.dict.itop-portal.php
new file mode 100644
index 000000000..a19b7039c
--- /dev/null
+++ b/datamodels/2.x/itop-portal/en.dict.itop-portal.php
@@ -0,0 +1,43 @@
+<?php
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+ * @author      Benjamin Planque <benjamin.planque@combodo.com>
+ * @copyright   Copyright (C) 2010-2018 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+//////////////////////////////////////////////////////////////////////
+// Note: The classes have been grouped by categories: bizmodel
+//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'portal:itop-portal' => 'Standard portal', // This is the portal name that will be displayed in portal dispatcher (eg. URL in menus)
+	'Page:DefaultTitle' => '%1$s - User portal',
+	'Brick:Portal:UserProfile:Title' => 'My profile',
+	'Brick:Portal:NewRequest:Title' => 'New request',
+	'Brick:Portal:NewRequest:Title+' => '<p>Need help?</p><p>Pick from the services catalog and submit your request to our support teams.</p>',
+	'Brick:Portal:OngoingRequests:Title' => 'Ongoing requests',
+	'Brick:Portal:OngoingRequests:Title+' => '<p>Follow up with your ongoing requests.</p><p>Check the progress, add comments, attach documents, acknowledge the solution.</p>',
+	'Brick:Portal:OngoingRequests:Tab:OnGoing' => 'Open',
+	'Brick:Portal:OngoingRequests:Tab:Resolved' => 'Resolved',
+	'Brick:Portal:ClosedRequests:Title' => 'Closed requests',
+));
diff --git a/datamodels/2.x/itop-portal/es_cr.dict.itop-portal.php b/datamodels/2.x/itop-portal/es_cr.dict.itop-portal.php
new file mode 100644
index 000000000..28282137b
--- /dev/null
+++ b/datamodels/2.x/itop-portal/es_cr.dict.itop-portal.php
@@ -0,0 +1,43 @@
+<?php
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+ * @author      Benjamin Planque <benjamin.planque@combodo.com>
+ * @copyright   Copyright (C) 2010-2018 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+//////////////////////////////////////////////////////////////////////
+// Note: The classes have been grouped by categories: bizmodel
+//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+	'portal:itop-portal' => 'Portal de Usuario', // This is the portal name that will be displayed in portal dispatcher (eg. URL in menus)
+	'Page:DefaultTitle' => 'ITop - Portal de Usuario',
+	'Brick:Portal:UserProfile:Title' => 'Mi perfil',
+	'Brick:Portal:NewRequest:Title' => 'Nuevo Requerimiento',
+	'Brick:Portal:NewRequest:Title+' => '¿Necesita ayuda? Elija del catálogo de servicios y envíe su requerimiento a nuestros equipos de soporte.',
+	'Brick:Portal:OngoingRequests:Title' => 'Requerimientos en Proceso',
+	'Brick:Portal:OngoingRequests:Title+' => 'Revise sus requerimientos en proceso. Compruebe el progreso, agregue comentarios, adjunte documentos, entienda la solución. </ P>',
+	'Brick:Portal:OngoingRequests:Tab:OnGoing' => 'En proceso',
+	'Brick:Portal:OngoingRequests:Tab:Resolved' => 'Solucionado',
+	'Brick:Portal:ClosedRequests:Title' => 'Requerimientos Cerrados',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-portal/fr.dict.itop-portal.php b/datamodels/2.x/itop-portal/fr.dict.itop-portal.php
new file mode 100644
index 000000000..04bf15e78
--- /dev/null
+++ b/datamodels/2.x/itop-portal/fr.dict.itop-portal.php
@@ -0,0 +1,43 @@
+<?php
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+ * @author      Benjamin Planque <benjamin.planque@combodo.com>
+ * @copyright   Copyright (C) 2010-2018 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+//////////////////////////////////////////////////////////////////////
+// Note: The classes have been grouped by categories: bizmodel
+//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+Dict::Add('FR FR', 'French', 'Francais', array(
+	'portal:itop-portal' => 'Portail standard', // This is the portal name that will be displayed in portal dispatcher (eg. URL in menus)
+	'Page:DefaultTitle' => '%1$s - Portail utilisateur',
+	'Brick:Portal:UserProfile:Title' => 'Mon profil',
+	'Brick:Portal:NewRequest:Title' => 'Nouvelle requête',
+	'Brick:Portal:NewRequest:Title+' => '<p>Besoin d\'assistance&nbsp;?</p><p>Choisissez un service (assistance ou dépannage) et soumettez votre requête à nos équipes de support.</p>',
+	'Brick:Portal:OngoingRequests:Title' => 'Requêtes en cours',
+	'Brick:Portal:OngoingRequests:Title+' => '<p>Suivez vos requêtes en cours.</p><p>Consultez l\'avancement, ajoutez des commentaires ou des pièces jointes, validez la solution.</p>',
+	'Brick:Portal:OngoingRequests:Tab:OnGoing' => 'Ouvertes',
+	'Brick:Portal:OngoingRequests:Tab:Resolved' => 'Résolues',
+	'Brick:Portal:ClosedRequests:Title' => 'Requêtes fermées',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-portal/hu.dict.itop-portal.php b/datamodels/2.x/itop-portal/hu.dict.itop-portal.php
new file mode 100644
index 000000000..593abba68
--- /dev/null
+++ b/datamodels/2.x/itop-portal/hu.dict.itop-portal.php
@@ -0,0 +1,43 @@
+<?php
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+ * @author      Benjamin Planque <benjamin.planque@combodo.com>
+ * @copyright   Copyright (C) 2010-2018 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+//////////////////////////////////////////////////////////////////////
+// Note: The classes have been grouped by categories: bizmodel
+//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+	'portal:itop-portal' => 'Standard portal~~', // This is the portal name that will be displayed in portal dispatcher (eg. URL in menus)
+	'Page:DefaultTitle' => '%1$s - User portal~~',
+	'Brick:Portal:UserProfile:Title' => 'My profile~~',
+	'Brick:Portal:NewRequest:Title' => 'New request~~',
+	'Brick:Portal:NewRequest:Title+' => '<p>Need help?</p><p>Pick from the services catalog and submit your request to our support teams.</p>~~',
+	'Brick:Portal:OngoingRequests:Title' => 'Ongoing requests~~',
+	'Brick:Portal:OngoingRequests:Title+' => '<p>Follow up with your ongoing requests.</p><p>Check the progress, add comments, attach documents, acknowledge the solution.</p>~~',
+	'Brick:Portal:OngoingRequests:Tab:OnGoing' => 'Open~~',
+	'Brick:Portal:OngoingRequests:Tab:Resolved' => 'Resolved~~',
+	'Brick:Portal:ClosedRequests:Title' => 'Closed requests~~',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-portal/it.dict.itop-portal.php b/datamodels/2.x/itop-portal/it.dict.itop-portal.php
new file mode 100644
index 000000000..db1ee0b9a
--- /dev/null
+++ b/datamodels/2.x/itop-portal/it.dict.itop-portal.php
@@ -0,0 +1,43 @@
+<?php
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+ * @author      Benjamin Planque <benjamin.planque@combodo.com>
+ * @copyright   Copyright (C) 2010-2018 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+//////////////////////////////////////////////////////////////////////
+// Note: The classes have been grouped by categories: bizmodel
+//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'portal:itop-portal' => 'Standard portal~~', // This is the portal name that will be displayed in portal dispatcher (eg. URL in menus)
+	'Page:DefaultTitle' => '%1$s - User portal~~',
+	'Brick:Portal:UserProfile:Title' => 'Il Mio Profilo',
+	'Brick:Portal:NewRequest:Title' => 'Nuova Richiesta',
+	'Brick:Portal:NewRequest:Title+' => '<p>Hai bisogno di aiuto?</p><p>Cerca nel catalogo dei servizi e inviaci una richiesta al nostro supporto.</p>',
+	'Brick:Portal:OngoingRequests:Title' => 'Richieste in corso',
+	'Brick:Portal:OngoingRequests:Title+' => '<p>Segui le tue richieste in corso.</p><p>Verifica i progressi, aggiungi dei commenti, allega i documenti, scopri la soluzione.</p>',
+	'Brick:Portal:OngoingRequests:Tab:OnGoing' => 'Aperte',
+	'Brick:Portal:OngoingRequests:Tab:Resolved' => 'Risolte',
+	'Brick:Portal:ClosedRequests:Title' => 'Richieste Chiuse',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-portal/ja.dict.itop-portal.php b/datamodels/2.x/itop-portal/ja.dict.itop-portal.php
new file mode 100644
index 000000000..f89d719ce
--- /dev/null
+++ b/datamodels/2.x/itop-portal/ja.dict.itop-portal.php
@@ -0,0 +1,43 @@
+<?php
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+ * @author      Benjamin Planque <benjamin.planque@combodo.com>
+ * @copyright   Copyright (C) 2010-2018 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+//////////////////////////////////////////////////////////////////////
+// Note: The classes have been grouped by categories: bizmodel
+//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'portal:itop-portal' => 'Standard portal~~', // This is the portal name that will be displayed in portal dispatcher (eg. URL in menus)
+	'Page:DefaultTitle' => '%1$s - User portal~~',
+	'Brick:Portal:UserProfile:Title' => 'My profile~~',
+	'Brick:Portal:NewRequest:Title' => 'New request~~',
+	'Brick:Portal:NewRequest:Title+' => '<p>Need help?</p><p>Pick from the services catalog and submit your request to our support teams.</p>~~',
+	'Brick:Portal:OngoingRequests:Title' => 'Ongoing requests~~',
+	'Brick:Portal:OngoingRequests:Title+' => '<p>Follow up with your ongoing requests.</p><p>Check the progress, add comments, attach documents, acknowledge the solution.</p>~~',
+	'Brick:Portal:OngoingRequests:Tab:OnGoing' => 'Open~~',
+	'Brick:Portal:OngoingRequests:Tab:Resolved' => 'Resolved~~',
+	'Brick:Portal:ClosedRequests:Title' => 'Closed requests~~',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-portal/module.itop-portal.php b/datamodels/2.x/itop-portal/module.itop-portal.php
index 7d43de806..b72360256 100644
--- a/datamodels/2.x/itop-portal/module.itop-portal.php
+++ b/datamodels/2.x/itop-portal/module.itop-portal.php
@@ -38,8 +38,7 @@ SetupWebPage::AddModule(
 	'webservice' => array(
 	//'webservices.itop-portal.php',
 	),
-	'dictionary' => array(
-	),
+
 	'data.struct' => array(
 	//'data.struct.itop-portal.xml',
 	),
diff --git a/datamodels/2.x/itop-portal/nl.dict.itop-portal.php b/datamodels/2.x/itop-portal/nl.dict.itop-portal.php
new file mode 100644
index 000000000..91b9a9ec0
--- /dev/null
+++ b/datamodels/2.x/itop-portal/nl.dict.itop-portal.php
@@ -0,0 +1,43 @@
+<?php
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+ * @author      Benjamin Planque <benjamin.planque@combodo.com>
+ * @copyright   Copyright (C) 2010-2018 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+//////////////////////////////////////////////////////////////////////
+// Note: The classes have been grouped by categories: bizmodel
+//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'portal:itop-portal' => 'Standaard portaal', // This is the portal name that will be displayed in portal dispatcher (eg. URL in menus)
+	'Page:DefaultTitle' => '%1$s - Gebruikersportaal',
+	'Brick:Portal:UserProfile:Title' => 'Mijn profiel',
+	'Brick:Portal:NewRequest:Title' => 'Nieuw verzoek',
+	'Brick:Portal:NewRequest:Title+' => '<p>Hulp nodig?</p><p>Selecteer de categorie uit de servicecatalogus en verstuur jouw verzoek naar onze supportteams.</p>',
+	'Brick:Portal:OngoingRequests:Title' => 'Lopende verzoeken',
+	'Brick:Portal:OngoingRequests:Title+' => '<p>Verder gaan met jouw openstaande verzoeken.</p><p>Controleer de voortgang, voeg commentaar of documenten toe, bevestig de geboden oplossing.</p>',
+	'Brick:Portal:OngoingRequests:Tab:OnGoing' => 'Openstaand',
+	'Brick:Portal:OngoingRequests:Tab:Resolved' => 'Opgelost',
+	'Brick:Portal:ClosedRequests:Title' => 'Gesloten verzoeken',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-portal/pt_br.dict.itop-portal.php b/datamodels/2.x/itop-portal/pt_br.dict.itop-portal.php
new file mode 100644
index 000000000..f67b78abb
--- /dev/null
+++ b/datamodels/2.x/itop-portal/pt_br.dict.itop-portal.php
@@ -0,0 +1,43 @@
+<?php
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+ * @author      Benjamin Planque <benjamin.planque@combodo.com>
+ * @copyright   Copyright (C) 2010-2018 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+//////////////////////////////////////////////////////////////////////
+// Note: The classes have been grouped by categories: bizmodel
+//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'portal:itop-portal' => 'Standard portal~~', // This is the portal name that will be displayed in portal dispatcher (eg. URL in menus)
+	'Page:DefaultTitle' => 'iTop - Portal do Usuário',
+	'Brick:Portal:UserProfile:Title' => 'Meu Perfil',
+	'Brick:Portal:NewRequest:Title' => 'Nova Solicitação',
+	'Brick:Portal:NewRequest:Title+' => '<p>Precisa de ajuda?</p><p>Escolha no Catálogo de Serviços e envie sua solicitação para nossas equipes de suporte.</p>',
+	'Brick:Portal:OngoingRequests:Title' => 'Em andamento',
+	'Brick:Portal:OngoingRequests:Title+' => '<p>Acompanhar suas solicitações em andamento, adicionar comentários, anexar documentos e confirmar a solução.</p>',
+	'Brick:Portal:OngoingRequests:Tab:OnGoing' => 'Abrir',
+	'Brick:Portal:OngoingRequests:Tab:Resolved' => 'Resolvido',
+	'Brick:Portal:ClosedRequests:Title' => 'Fechar solicitações',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-portal/ru.dict.itop-portal.php b/datamodels/2.x/itop-portal/ru.dict.itop-portal.php
new file mode 100644
index 000000000..69d240b0c
--- /dev/null
+++ b/datamodels/2.x/itop-portal/ru.dict.itop-portal.php
@@ -0,0 +1,43 @@
+<?php
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+ * @author      Benjamin Planque <benjamin.planque@combodo.com>
+ * @copyright   Copyright (C) 2010-2018 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+//////////////////////////////////////////////////////////////////////
+// Note: The classes have been grouped by categories: bizmodel
+//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+Dict::Add('RU RU', 'Russian', 'Русский', array(
+	'portal:itop-portal' => 'Пользовательский портал', // This is the portal name that will be displayed in portal dispatcher (eg. URL in menus)
+	'Page:DefaultTitle' => '%1$s - Пользовательский портал',
+	'Brick:Portal:UserProfile:Title' => 'Мой профиль',
+	'Brick:Portal:NewRequest:Title' => 'Новый запрос',
+	'Brick:Portal:NewRequest:Title+' => '<p>Нужна помощь?</p><p>Выберите услугу из&nbsp;каталога и&nbsp;отправьте свой запрос команде поддержки.</p>',
+	'Brick:Portal:OngoingRequests:Title' => 'Текущие запросы',
+	'Brick:Portal:OngoingRequests:Title+' => '<p>Следите за&nbsp;открытыми запросами.</p><p>Проверяйте ход решения, добавляйте комментарии и&nbsp;вложения, подтверждайте решение.</p>',
+	'Brick:Portal:OngoingRequests:Tab:OnGoing' => 'В работе',
+	'Brick:Portal:OngoingRequests:Tab:Resolved' => 'Решенные',
+	'Brick:Portal:ClosedRequests:Title' => 'Закрытые запросы',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-portal/sk.dict.itop-portal.php b/datamodels/2.x/itop-portal/sk.dict.itop-portal.php
new file mode 100644
index 000000000..090ce5ab8
--- /dev/null
+++ b/datamodels/2.x/itop-portal/sk.dict.itop-portal.php
@@ -0,0 +1,43 @@
+<?php
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+ * @author      Benjamin Planque <benjamin.planque@combodo.com>
+ * @copyright   Copyright (C) 2010-2018 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+//////////////////////////////////////////////////////////////////////
+// Note: The classes have been grouped by categories: bizmodel
+//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
+	'portal:itop-portal' => 'Standard portal~~', // This is the portal name that will be displayed in portal dispatcher (eg. URL in menus)
+	'Page:DefaultTitle' => '%1$s - User portal~~',
+	'Brick:Portal:UserProfile:Title' => 'My profile~~',
+	'Brick:Portal:NewRequest:Title' => 'New request~~',
+	'Brick:Portal:NewRequest:Title+' => '<p>Need help?</p><p>Pick from the services catalog and submit your request to our support teams.</p>~~',
+	'Brick:Portal:OngoingRequests:Title' => 'Ongoing requests~~',
+	'Brick:Portal:OngoingRequests:Title+' => '<p>Follow up with your ongoing requests.</p><p>Check the progress, add comments, attach documents, acknowledge the solution.</p>~~',
+	'Brick:Portal:OngoingRequests:Tab:OnGoing' => 'Open~~',
+	'Brick:Portal:OngoingRequests:Tab:Resolved' => 'Resolved~~',
+	'Brick:Portal:ClosedRequests:Title' => 'Closed requests~~',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-portal/tr.dict.itop-portal.php b/datamodels/2.x/itop-portal/tr.dict.itop-portal.php
new file mode 100644
index 000000000..91420e27f
--- /dev/null
+++ b/datamodels/2.x/itop-portal/tr.dict.itop-portal.php
@@ -0,0 +1,43 @@
+<?php
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+ * @author      Benjamin Planque <benjamin.planque@combodo.com>
+ * @copyright   Copyright (C) 2010-2018 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+//////////////////////////////////////////////////////////////////////
+// Note: The classes have been grouped by categories: bizmodel
+//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'portal:itop-portal' => 'Standard portal~~', // This is the portal name that will be displayed in portal dispatcher (eg. URL in menus)
+	'Page:DefaultTitle' => '%1$s - User portal~~',
+	'Brick:Portal:UserProfile:Title' => 'My profile~~',
+	'Brick:Portal:NewRequest:Title' => 'New request~~',
+	'Brick:Portal:NewRequest:Title+' => '<p>Need help?</p><p>Pick from the services catalog and submit your request to our support teams.</p>~~',
+	'Brick:Portal:OngoingRequests:Title' => 'Ongoing requests~~',
+	'Brick:Portal:OngoingRequests:Title+' => '<p>Follow up with your ongoing requests.</p><p>Check the progress, add comments, attach documents, acknowledge the solution.</p>~~',
+	'Brick:Portal:OngoingRequests:Tab:OnGoing' => 'Open~~',
+	'Brick:Portal:OngoingRequests:Tab:Resolved' => 'Resolved~~',
+	'Brick:Portal:ClosedRequests:Title' => 'Closed requests~~',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-portal/zh_cn.dict.itop-portal.php b/datamodels/2.x/itop-portal/zh_cn.dict.itop-portal.php
new file mode 100644
index 000000000..39f63e36a
--- /dev/null
+++ b/datamodels/2.x/itop-portal/zh_cn.dict.itop-portal.php
@@ -0,0 +1,43 @@
+<?php
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+ * @author      Benjamin Planque <benjamin.planque@combodo.com>
+ * @copyright   Copyright (C) 2010-2018 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+//////////////////////////////////////////////////////////////////////
+// Note: The classes have been grouped by categories: bizmodel
+//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'portal:itop-portal' => '标准门户', // This is the portal name that will be displayed in portal dispatcher (eg. URL in menus)
+	'Page:DefaultTitle' => 'iTop - 用户门户',
+	'Brick:Portal:UserProfile:Title' => '我的资料',
+	'Brick:Portal:NewRequest:Title' => '新建工单',
+	'Brick:Portal:NewRequest:Title+' => '<p>需要帮助?</p><p>选择子服务,然后提交工单给我们的支持团队.</p>',
+	'Brick:Portal:OngoingRequests:Title' => '正在处理的工单',
+	'Brick:Portal:OngoingRequests:Title+' => '<p>跟踪正在处理的工单.</p><p>查询进度, 添加留言, 添加附件, 确认解决方案.</p>',
+	'Brick:Portal:OngoingRequests:Tab:OnGoing' => '正在处理',
+	'Brick:Portal:OngoingRequests:Tab:Resolved' => '已解决',
+	'Brick:Portal:ClosedRequests:Title' => '已关闭的工单',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-problem-mgmt/module.itop-problem-mgmt.php b/datamodels/2.x/itop-problem-mgmt/module.itop-problem-mgmt.php
index 132d0dbef..fc5d0d2c7 100755
--- a/datamodels/2.x/itop-problem-mgmt/module.itop-problem-mgmt.php
+++ b/datamodels/2.x/itop-problem-mgmt/module.itop-problem-mgmt.php
@@ -13,7 +13,6 @@ SetupWebPage::AddModule(
 		// Setup
 		//
 		'dependencies' => array(
-			'itop-config-mgmt/2.2.0',
 			'itop-tickets/2.0.0',
 		),
 		'mandatory' => false,
diff --git a/datamodels/2.x/itop-request-mgmt-itil/module.itop-request-mgmt-itil.php b/datamodels/2.x/itop-request-mgmt-itil/module.itop-request-mgmt-itil.php
index 38c83194e..b8be07884 100755
--- a/datamodels/2.x/itop-request-mgmt-itil/module.itop-request-mgmt-itil.php
+++ b/datamodels/2.x/itop-request-mgmt-itil/module.itop-request-mgmt-itil.php
@@ -13,7 +13,6 @@ SetupWebPage::AddModule(
 		// Setup
 		//
 		'dependencies' => array(
-			'itop-config-mgmt/2.4.0',
 			'itop-tickets/2.4.0',
 		),
 		'mandatory' => false,
diff --git a/datamodels/2.x/itop-request-mgmt/module.itop-request-mgmt.php b/datamodels/2.x/itop-request-mgmt/module.itop-request-mgmt.php
index 74550ccb6..95f7de4ac 100755
--- a/datamodels/2.x/itop-request-mgmt/module.itop-request-mgmt.php
+++ b/datamodels/2.x/itop-request-mgmt/module.itop-request-mgmt.php
@@ -13,7 +13,6 @@ SetupWebPage::AddModule(
 		// Setup
 		//
 		'dependencies' => array(
-			'itop-config-mgmt/2.4.0',
 			'itop-tickets/2.4.0',
 		),
 		'mandatory' => false,
diff --git a/datamodels/2.x/itop-service-mgmt-provider/module.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/module.itop-service-mgmt-provider.php
index 9df9fe668..28b13a49b 100755
--- a/datamodels/2.x/itop-service-mgmt-provider/module.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/module.itop-service-mgmt-provider.php
@@ -13,7 +13,6 @@ SetupWebPage::AddModule(
 		// Setup
 		//
 		'dependencies' => array(
-			'itop-config-mgmt/2.2.0',
 		        'itop-tickets/2.0.0',
 		),
 		'mandatory' => false,
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 20aa4680c..ab0d05fea 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,186 +1,186 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.7">
-  <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-2012 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>
-        <display_template/>
-        <icon>images/contract.png</icon>
-        <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">dollars</value>
-            <value id="euros">euros</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">production</value>
-            <value id="implementation">implementation</value>
-            <value id="obsolete">obsolete</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>
+				<display_template/>
+				<icon>images/contract.png</icon>
+				<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">dollars</value>
+						<value id="euros">euros</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">production</value>
+						<value id="implementation">implementation</value>
+						<value id="obsolete">obsolete</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'))
@@ -204,1428 +204,1347 @@ 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>
-        <display_template/>
-        <icon/>
-        <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>
-        <display_template/>
-        <icon>images/contract.png</icon>
-        <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>
-        <display_template/>
-        <icon>images/contract.png</icon>
-        <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>
-        <display_template/>
-        <icon/>
-        <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>
-        <display_template/>
-        <icon/>
-        <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="lnkFunctionalCIToProviderContract" _delta="define">
-      <parent>cmdbAbstractObject</parent>
-      <properties>
-        <is_link>1</is_link>
-        <category>bizmodel</category>
-        <abstract>false</abstract>
-        <key_type>autoincrement</key_type>
-        <db_table>lnkfunctionalcitoprovidercontract</db_table>
-        <db_key_field>id</db_key_field>
-        <db_final_class_field/>
-        <naming>
-          <attributes>
-            <attribute id="providercontract_id"/>
-            <attribute id="functionalci_id"/>
-          </attributes>
-        </naming>
-        <display_template/>
-        <icon/>
-        <reconciliation>
-          <attributes>
-            <attribute id="providercontract_id"/>
-            <attribute id="functionalci_id"/>
-          </attributes>
-        </reconciliation>
-      </properties>
-      <fields>
-        <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>
-        <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="providercontract_id">
-              <rank>10</rank>
-            </item>
-            <item id="functionalci_id">
-              <rank>20</rank>
-            </item>
-          </items>
-        </details>
-        <search>
-          <items>
-            <item id="providercontract_id">
-              <rank>10</rank>
-            </item>
-            <item id="functionalci_id">
-              <rank>20</rank>
-            </item>
-          </items>
-        </search>
-        <list>
-          <items>
-            <item id="providercontract_id">
-              <rank>10</rank>
-            </item>
-            <item id="functionalci_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>
-        <display_template/>
-        <icon>images/service.png</icon>
-        <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>
-        <display_template/>
-        <icon>images/service.png</icon>
-        <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">production</value>
-            <value id="implementation">implementation</value>
-            <value id="obsolete">obsolete</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>
-        <display_template/>
-        <icon/>
-        <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>
-        <display_template/>
-        <icon/>
-        <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>
-        <display_template/>
-        <icon>images/service.png</icon>
-        <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">incident</value>
-            <value id="service_request">service_request</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">production</value>
-            <value id="implementation">implementation</value>
-            <value id="obsolete">obsolete</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>
-        <display_template/>
-        <icon>images/sla.png</icon>
-        <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="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="slts_list" xsi:type="AttributeLinkedSetIndirect">
-          <linked_class>lnkSLAToSLT</linked_class>
-          <ext_key_to_me>sla_id</ext_key_to_me>
-          <count_min>0</count_min>
-          <count_max>0</count_max>
-          <ext_key_to_remote>slt_id</ext_key_to_remote>
-          <duplicates/>
-        </field>
-        <field id="customercontracts_list" xsi:type="AttributeLinkedSetIndirect">
-          <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>
-          <ext_key_to_remote>customercontract_id</ext_key_to_remote>
-          <duplicates>true</duplicates>
-        </field>
-      </fields>
-	    <methods>
-		    <method id="DoCheckToWrite">
-			    <static>false</static>
-			    <access>public</access>
-			    <code><![CDATA[
+					</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>
+				<display_template/>
+				<icon/>
+				<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>
+				<display_template/>
+				<icon>images/contract.png</icon>
+				<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>
+				<display_template/>
+				<icon>images/contract.png</icon>
+				<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>
+				<display_template/>
+				<icon/>
+				<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>
+				<display_template/>
+				<icon/>
+				<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>
+				<display_template/>
+				<icon>images/service.png</icon>
+				<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>
+				<display_template/>
+				<icon>images/service.png</icon>
+				<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">production</value>
+						<value id="implementation">implementation</value>
+						<value id="obsolete">obsolete</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>
+				<display_template/>
+				<icon/>
+				<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>
+				<display_template/>
+				<icon/>
+				<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>
+				<display_template/>
+				<icon>images/service.png</icon>
+				<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">incident</value>
+						<value id="service_request">service_request</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">production</value>
+						<value id="implementation">implementation</value>
+						<value id="obsolete">obsolete</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>
+				<display_template/>
+				<icon>images/sla.png</icon>
+				<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="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="slts_list" xsi:type="AttributeLinkedSetIndirect">
+					<linked_class>lnkSLAToSLT</linked_class>
+					<ext_key_to_me>sla_id</ext_key_to_me>
+					<count_min>0</count_min>
+					<count_max>0</count_max>
+					<ext_key_to_remote>slt_id</ext_key_to_remote>
+					<duplicates/>
+				</field>
+				<field id="customercontracts_list" xsi:type="AttributeLinkedSetIndirect">
+					<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>
+					<ext_key_to_remote>customercontract_id</ext_key_to_remote>
+					<duplicates>true</duplicates>
+				</field>
+			</fields>
+			<methods>
+				<method id="DoCheckToWrite">
+					<static>false</static>
+					<access>public</access>
+					<code><![CDATA[
 					public function DoCheckToWrite()
 	{
 		parent::DoCheckToWrite();
@@ -1652,879 +1571,817 @@ 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="description">
-              <rank>30</rank>
-            </item>
-            <item id="slts_list">
-              <rank>40</rank>
-            </item>
-            <item id="customercontracts_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="name">
-              <rank>10</rank>
-            </item>
-            <item id="org_id">
-              <rank>20</rank>
-            </item>
-          </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>
-        <display_template/>
-        <icon>images/slt.png</icon>
-        <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">1</value>
-            <value id="2">2</value>
-            <value id="3">3</value>
-            <value id="4">4</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">service_request</value>
-            <value id="incident">incident</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">tto</value>
-            <value id="ttr">ttr</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">hours</value>
-            <value id="minutes">minutes</value>
-          </values>
-          <sql>unit</sql>
-          <default_value/>
-          <is_null_allowed>true</is_null_allowed>
-          <display_style>radio_horizontal</display_style>
-        </field>
-      </fields>
-      <methods/>
-      <presentation>
-        <details>
-          <items>
-            <item id="name">
-              <rank>10</rank>
-            </item>
-            <item id="priority">
-              <rank>20</rank>
-            </item>
-            <item id="request_type">
-              <rank>30</rank>
-            </item>
-            <item id="metric">
-              <rank>40</rank>
-            </item>
-            <item id="value">
-              <rank>50</rank>
-            </item>
-            <item id="unit">
-              <rank>60</rank>
-            </item>
-          </items>
-        </details>
-        <search>
-          <items>
-            <item id="name">
-              <rank>10</rank>
-            </item>
-            <item id="priority">
-              <rank>20</rank>
-            </item>
-            <item id="request_type">
-              <rank>30</rank>
-            </item>
-            <item id="metric">
-              <rank>40</rank>
-            </item>
-            <item id="value">
-              <rank>50</rank>
-            </item>
-            <item id="unit">
-              <rank>60</rank>
-            </item>
-          </items>
-        </search>
-        <list>
-          <items>
-            <item id="priority">
-              <rank>10</rank>
-            </item>
-            <item id="request_type">
-              <rank>20</rank>
-            </item>
-            <item id="metric">
-              <rank>30</rank>
-            </item>
-            <item id="value">
-              <rank>40</rank>
-            </item>
-            <item id="unit">
-              <rank>50</rank>
-            </item>
-          </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>
-        <display_template/>
-        <icon/>
-        <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>
-        <display_template/>
-        <icon/>
-        <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>
-        <display_template/>
-        <icon/>
-        <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="lnkFunctionalCIToService" _delta="define">
-      <parent>cmdbAbstractObject</parent>
-      <properties>
-        <is_link>1</is_link>
-        <category>bizmodel</category>
-        <abstract>false</abstract>
-        <key_type>autoincrement</key_type>
-        <db_table>lnkfunctionalcitoservice</db_table>
-        <db_key_field>id</db_key_field>
-        <db_final_class_field/>
-        <naming>
-          <attributes>
-            <attribute id="service_id"/>
-            <attribute id="functionalci_id"/>
-          </attributes>
-        </naming>
-        <display_template/>
-        <icon/>
-        <reconciliation>
-          <attributes>
-            <attribute id="service_id"/>
-            <attribute id="functionalci_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="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="service_id">
-              <rank>10</rank>
-            </item>
-            <item id="functionalci_id">
-              <rank>20</rank>
-            </item>
-          </items>
-        </details>
-        <search>
-          <items>
-            <item id="service_id">
-              <rank>10</rank>
-            </item>
-            <item id="functionalci_id">
-              <rank>20</rank>
-            </item>
-          </items>
-        </search>
-        <list>
-          <items>
-            <item id="service_id">
-              <rank>10</rank>
-            </item>
-            <item id="functionalci_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>
-        <display_template/>
-        <icon>images/service.png</icon>
-        <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>
-        <display_template/>
-        <icon/>
-        <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>
-  </classes>
-  <menus>
-    <menu id="ServiceManagement" xsi:type="MenuGroup" _delta="define">
-      <rank>60</rank>
-    </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>
+				</method>
+			</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="slts_list">
+							<rank>40</rank>
+						</item>
+						<item id="customercontracts_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="name">
+							<rank>10</rank>
+						</item>
+						<item id="org_id">
+							<rank>20</rank>
+						</item>
+					</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>
+				<display_template/>
+				<icon>images/slt.png</icon>
+				<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">1</value>
+						<value id="2">2</value>
+						<value id="3">3</value>
+						<value id="4">4</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">service_request</value>
+						<value id="incident">incident</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">tto</value>
+						<value id="ttr">ttr</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">hours</value>
+						<value id="minutes">minutes</value>
+					</values>
+					<sql>unit</sql>
+					<default_value/>
+					<is_null_allowed>true</is_null_allowed>
+					<display_style>radio_horizontal</display_style>
+				</field>
+			</fields>
+			<methods/>
+			<presentation>
+				<details>
+					<items>
+						<item id="name">
+							<rank>10</rank>
+						</item>
+						<item id="priority">
+							<rank>20</rank>
+						</item>
+						<item id="request_type">
+							<rank>30</rank>
+						</item>
+						<item id="metric">
+							<rank>40</rank>
+						</item>
+						<item id="value">
+							<rank>50</rank>
+						</item>
+						<item id="unit">
+							<rank>60</rank>
+						</item>
+					</items>
+				</details>
+				<search>
+					<items>
+						<item id="name">
+							<rank>10</rank>
+						</item>
+						<item id="priority">
+							<rank>20</rank>
+						</item>
+						<item id="request_type">
+							<rank>30</rank>
+						</item>
+						<item id="metric">
+							<rank>40</rank>
+						</item>
+						<item id="value">
+							<rank>50</rank>
+						</item>
+						<item id="unit">
+							<rank>60</rank>
+						</item>
+					</items>
+				</search>
+				<list>
+					<items>
+						<item id="priority">
+							<rank>10</rank>
+						</item>
+						<item id="request_type">
+							<rank>20</rank>
+						</item>
+						<item id="metric">
+							<rank>30</rank>
+						</item>
+						<item id="value">
+							<rank>40</rank>
+						</item>
+						<item id="unit">
+							<rank>50</rank>
+						</item>
+					</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>
+				<display_template/>
+				<icon/>
+				<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>
+				<display_template/>
+				<icon/>
+				<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>
+				<display_template/>
+				<icon/>
+				<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>
+				<display_template/>
+				<icon>images/service.png</icon>
+				<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>
+				<display_template/>
+				<icon/>
+				<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>
+	</classes>
+	<menus>
+		<menu id="ServiceManagement" xsi:type="MenuGroup" _delta="define">
+			<rank>60</rank>
+		</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-service-mgmt/module.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/module.itop-service-mgmt.php
index 4ca0f7e42..3ce59e497 100755
--- a/datamodels/2.x/itop-service-mgmt/module.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/module.itop-service-mgmt.php
@@ -13,7 +13,6 @@ SetupWebPage::AddModule(
 		// Setup
 		//
 		'dependencies' => array(
-			'itop-config-mgmt/2.2.0',
 			'itop-tickets/2.0.0',
 		),
 		'mandatory' => false,
diff --git a/datamodels/2.x/itop-structure/cs.dict.itop-structure.php b/datamodels/2.x/itop-structure/cs.dict.itop-structure.php
new file mode 100644
index 000000000..ecebf0410
--- /dev/null
+++ b/datamodels/2.x/itop-structure/cs.dict.itop-structure.php
@@ -0,0 +1,362 @@
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+ * Localized data.
+ *
+ * @author      Benjamin Planque <benjamin.planque@combodo.com>
+ * @author      Lukáš Dvořák <lukas.dvorak@itopportal.cz>
+ * @author      Daniel Rokos <daniel.rokos@itopportal.cz>
+ * @copyright   Copyright (C) 2010-2018 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+//////////////////////////////////////////////////////////////////////
+// Relations
+//////////////////////////////////////////////////////////////////////
+//
+
+
+//////////////////////////////////////////////////////////////////////
+// Note: The classes have been grouped by categories: bizmodel
+//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+
+//
+// Class: Organization
+//
+
+Dict::Add('CS CZ', 'Czech', 'Čeština', array(
+	'Class:Organization' => 'Organizace',
+	'Class:Organization+' => '',
+	'Class:Organization/Attribute:name' => 'Název',
+	'Class:Organization/Attribute:name+' => '',
+	'Class:Organization/Attribute:code' => 'Kód',
+	'Class:Organization/Attribute:code+' => 'Kód organizace (IČO, DIČO,...)',
+	'Class:Organization/Attribute:status' => 'Stav',
+	'Class:Organization/Attribute:status+' => '',
+	'Class:Organization/Attribute:status/Value:active' => 'Aktivní',
+	'Class:Organization/Attribute:status/Value:active+' => '',
+	'Class:Organization/Attribute:status/Value:inactive' => 'Neaktivní',
+	'Class:Organization/Attribute:status/Value:inactive+' => '',
+	'Class:Organization/Attribute:parent_id' => 'Mateřská organizace',
+	'Class:Organization/Attribute:parent_id+' => '',
+	'Class:Organization/Attribute:parent_name' => 'Název mateřské organizace',
+	'Class:Organization/Attribute:parent_name+' => '',
+	'Class:Organization/Attribute:deliverymodel_id' => 'Model poskytování služeb',
+	'Class:Organization/Attribute:deliverymodel_id+' => '',
+	'Class:Organization/Attribute:deliverymodel_name' => 'Název modelu poskytování služeb',
+	'Class:Organization/Attribute:deliverymodel_name+' => '',
+	'Class:Organization/Attribute:parent_id_friendlyname' => 'Mateřská organizace',
+	'Class:Organization/Attribute:parent_id_friendlyname+' => '',
+	'Class:Organization/Attribute:overview' => 'Overview~~',
+	'Organization:Overview:FunctionalCIs' => 'Configuration items of this organization~~',
+	'Organization:Overview:FunctionalCIs:subtitle' => 'by type~~',
+	'Organization:Overview:Users' => 'iTop Users within this organization~~',
+));
+
+//
+// Class: Location
+//
+
+Dict::Add('CS CZ', 'Czech', 'Čeština', array(
+	'Class:Location' => 'Umístění',
+	'Class:Location+' => 'Jakékoli umístění: země, okres, město, čtvrť, budova, patro, místnost, rack,...',
+	'Class:Location/Attribute:name' => 'Název',
+	'Class:Location/Attribute:name+' => '',
+	'Class:Location/Attribute:status' => 'Stav',
+	'Class:Location/Attribute:status+' => '',
+	'Class:Location/Attribute:status/Value:active' => 'Aktivní',
+	'Class:Location/Attribute:status/Value:active+' => '',
+	'Class:Location/Attribute:status/Value:inactive' => 'Neaktivní',
+	'Class:Location/Attribute:status/Value:inactive+' => '',
+	'Class:Location/Attribute:org_id' => 'Vlastník (Organizace)',
+	'Class:Location/Attribute:org_id+' => '',
+	'Class:Location/Attribute:org_name' => 'Vlastník (Organizace)',
+	'Class:Location/Attribute:org_name+' => '',
+	'Class:Location/Attribute:address' => 'Adresa',
+	'Class:Location/Attribute:address+' => '',
+	'Class:Location/Attribute:postal_code' => 'PSČ',
+	'Class:Location/Attribute:postal_code+' => 'Poštovní směrovací číslo',
+	'Class:Location/Attribute:city' => 'Město',
+	'Class:Location/Attribute:city+' => '',
+	'Class:Location/Attribute:country' => 'Země',
+	'Class:Location/Attribute:country+' => '',
+	'Class:Location/Attribute:physicaldevice_list' => 'Zařízení',
+	'Class:Location/Attribute:physicaldevice_list+' => 'Všechna zařízení v tomto umístění',
+	'Class:Location/Attribute:person_list' => 'Kontakty',
+	'Class:Location/Attribute:person_list+' => 'Všechny kontakty v tomto umístění',
+));
+
+//
+// Class: Contact
+//
+
+Dict::Add('CS CZ', 'Czech', 'Čeština', array(
+	'Class:Contact' => 'Kontakt',
+	'Class:Contact+' => '',
+	'Class:Contact/Attribute:name' => 'Název',
+	'Class:Contact/Attribute:name+' => '',
+	'Class:Contact/Attribute:status' => 'Stav',
+	'Class:Contact/Attribute:status+' => '',
+	'Class:Contact/Attribute:status/Value:active' => 'Aktivní',
+	'Class:Contact/Attribute:status/Value:active+' => '',
+	'Class:Contact/Attribute:status/Value:inactive' => 'Neaktivní',
+	'Class:Contact/Attribute:status/Value:inactive+' => '',
+	'Class:Contact/Attribute:org_id' => 'Organizace',
+	'Class:Contact/Attribute:org_id+' => '',
+	'Class:Contact/Attribute:org_name' => 'Název organizace',
+	'Class:Contact/Attribute:org_name+' => '',
+	'Class:Contact/Attribute:email' => 'Email',
+	'Class:Contact/Attribute:email+' => '',
+	'Class:Contact/Attribute:phone' => 'Telefon',
+	'Class:Contact/Attribute:phone+' => '',
+	'Class:Contact/Attribute:notify' => 'Upozornění',
+	'Class:Contact/Attribute:notify+' => '',
+	'Class:Contact/Attribute:notify/Value:no' => 'ne',
+	'Class:Contact/Attribute:notify/Value:no+' => '',
+	'Class:Contact/Attribute:notify/Value:yes' => 'ano',
+	'Class:Contact/Attribute:notify/Value:yes+' => '',
+	'Class:Contact/Attribute:function' => 'Funkce',
+	'Class:Contact/Attribute:function+' => '',
+	'Class:Contact/Attribute:cis_list' => 'Konfigurační položky',
+	'Class:Contact/Attribute:cis_list+' => 'Všechny konfigurační položky spojené s tímto kontaktem',
+	'Class:Contact/Attribute:finalclass' => 'Typ kontaktu',
+	'Class:Contact/Attribute:finalclass+' => '',
+));
+
+//
+// Class: Person
+//
+
+Dict::Add('CS CZ', 'Czech', 'Čeština', array(
+	'Class:Person' => 'Osoba',
+	'Class:Person+' => '',
+	'Class:Person/Attribute:name' => 'Příjmení',
+	'Class:Person/Attribute:name+' => '',
+	'Class:Person/Attribute:first_name' => 'Jméno',
+	'Class:Person/Attribute:first_name+' => '',
+	'Class:Person/Attribute:employee_number' => 'Osobní číslo',
+	'Class:Person/Attribute:employee_number+' => '',
+	'Class:Person/Attribute:mobile_phone' => 'Mobilní telefon',
+	'Class:Person/Attribute:mobile_phone+' => '',
+	'Class:Person/Attribute:location_id' => 'Umístění',
+	'Class:Person/Attribute:location_id+' => '',
+	'Class:Person/Attribute:location_name' => 'Umístění',
+	'Class:Person/Attribute:location_name+' => '',
+	'Class:Person/Attribute:manager_id' => 'Vedoucí',
+	'Class:Person/Attribute:manager_id+' => '',
+	'Class:Person/Attribute:manager_name' => 'Vedoucí',
+	'Class:Person/Attribute:manager_name+' => '',
+	'Class:Person/Attribute:team_list' => 'Týmy',
+	'Class:Person/Attribute:team_list+' => 'Všechny týmy, kterých je tato osoba členem',
+	'Class:Person/Attribute:tickets_list' => 'Tikety',
+	'Class:Person/Attribute:tickets_list+' => 'Všechny tikety, které tato osoba zadala',
+	'Class:Person/Attribute:manager_id_friendlyname' => 'Popisný název vedoucího',
+	'Class:Person/Attribute:manager_id_friendlyname+' => '',
+	'Class:Person/Attribute:picture' => 'Picture~~',
+	'Class:Person/Attribute:picture+' => '~~',
+	'Class:Person/UniquenessRule:employee_number+' => 'The employee number must be unique in the organization~~',
+	'Class:Person/UniquenessRule:employee_number' => 'there is already a person in \'$this->org_name$\' organization with the same employee number~~',
+	'Class:Person/UniquenessRule:name+' => 'The employee name should be unique inside its organization~~',
+	'Class:Person/UniquenessRule:name' => 'There is already a person in \'$this->org_name$\' organization with the same name~~',
+));
+
+//
+// Class: Team
+//
+
+Dict::Add('CS CZ', 'Czech', 'Čeština', array(
+	'Class:Team' => 'Tým',
+	'Class:Team+' => '',
+	'Class:Team/Attribute:persons_list' => 'Členové',
+	'Class:Team/Attribute:persons_list+' => 'Všichni členové týmu',
+	'Class:Team/Attribute:tickets_list' => 'Tikety',
+	'Class:Team/Attribute:tickets_list+' => 'Všechny tikety přidělené tomuto týmu',
+));
+
+//
+// Class: Document
+//
+
+Dict::Add('CS CZ', 'Czech', 'Čeština', array(
+	'Class:Document' => 'Dokument',
+	'Class:Document+' => '',
+	'Class:Document/Attribute:name' => 'Název',
+	'Class:Document/Attribute:name+' => '',
+	'Class:Document/Attribute:org_id' => 'Organizace',
+	'Class:Document/Attribute:org_id+' => '',
+	'Class:Document/Attribute:org_name' => 'Název organizace',
+	'Class:Document/Attribute:org_name+' => '',
+	'Class:Document/Attribute:documenttype_id' => 'Typ dokumentu',
+	'Class:Document/Attribute:documenttype_id+' => '',
+	'Class:Document/Attribute:documenttype_name' => 'Název typu dokumentu',
+	'Class:Document/Attribute:documenttype_name+' => '',
+	'Class:Document/Attribute:version' => 'Verze',
+	'Class:Document/Attribute:version+' => '',
+	'Class:Document/Attribute:description' => 'Popis',
+	'Class:Document/Attribute:description+' => '',
+	'Class:Document/Attribute:status' => 'Stav',
+	'Class:Document/Attribute:status+' => '',
+	'Class:Document/Attribute:status/Value:draft' => 'Návrh',
+	'Class:Document/Attribute:status/Value:draft+' => '',
+	'Class:Document/Attribute:status/Value:obsolete' => 'Zastaralý',
+	'Class:Document/Attribute:status/Value:obsolete+' => '',
+	'Class:Document/Attribute:status/Value:published' => 'Publikovaný',
+	'Class:Document/Attribute:status/Value:published+' => '',
+	'Class:Document/Attribute:cis_list' => 'Konfigurační položky',
+	'Class:Document/Attribute:cis_list+' => '',
+	'Class:Document/Attribute:contracts_list' => 'Smlouvy',
+	'Class:Document/Attribute:contracts_list+' => '',
+	'Class:Document/Attribute:services_list' => 'Služby',
+	'Class:Document/Attribute:services_list+' => '',
+	'Class:Document/Attribute:finalclass' => 'Typ dokumentu',
+	'Class:Document/Attribute:finalclass+' => '',
+));
+
+//
+// Class: DocumentFile
+//
+
+Dict::Add('CS CZ', 'Czech', 'Čeština', array(
+	'Class:DocumentFile' => 'Dokument (soubor)',
+	'Class:DocumentFile+' => '',
+	'Class:DocumentFile/Attribute:file' => 'Soubor',
+	'Class:DocumentFile/Attribute:file+' => '',
+));
+
+//
+// Class: DocumentNote
+//
+
+Dict::Add('CS CZ', 'Czech', 'Čeština', array(
+	'Class:DocumentNote' => 'Dokument (poznámka)',
+	'Class:DocumentNote+' => '',
+	'Class:DocumentNote/Attribute:text' => 'Poznámka',
+	'Class:DocumentNote/Attribute:text+' => '',
+));
+
+//
+// Class: DocumentWeb
+//
+
+Dict::Add('CS CZ', 'Czech', 'Čeština', array(
+	'Class:DocumentWeb' => 'Dokument (web)',
+	'Class:DocumentWeb+' => '',
+	'Class:DocumentWeb/Attribute:url' => 'URL',
+	'Class:DocumentWeb/Attribute:url+' => '',
+));
+
+//
+// Class: Typology
+//
+
+Dict::Add('CS CZ', 'Czech', 'Čeština', array(
+	'Class:Typology' => 'Typologie',
+	'Class:Typology+' => '',
+	'Class:Typology/Attribute:name' => 'Název',
+	'Class:Typology/Attribute:name+' => '',
+	'Class:Typology/Attribute:finalclass' => 'Typ',
+	'Class:Typology/Attribute:finalclass+' => '',
+));
+
+//
+// Class: DocumentType
+//
+
+Dict::Add('CS CZ', 'Czech', 'Čeština', array(
+	'Class:DocumentType' => 'Typ dokumentu',
+	'Class:DocumentType+' => '',
+));
+
+//
+// Class: ContactType
+//
+
+Dict::Add('CS CZ', 'Czech', 'Čeština', array(
+	'Class:ContactType' => 'Typ kontaktu',
+	'Class:ContactType+' => '',
+));
+
+//
+// Class: lnkPersonToTeam
+//
+
+Dict::Add('CS CZ', 'Czech', 'Čeština', array(
+	'Class:lnkPersonToTeam' => 'Spojení (Osoba / Tým)',
+	'Class:lnkPersonToTeam+' => '',
+	'Class:lnkPersonToTeam/Attribute:team_id' => 'Tým',
+	'Class:lnkPersonToTeam/Attribute:team_id+' => '',
+	'Class:lnkPersonToTeam/Attribute:team_name' => 'Název týmu',
+	'Class:lnkPersonToTeam/Attribute:team_name+' => '',
+	'Class:lnkPersonToTeam/Attribute:person_id' => 'Osoba',
+	'Class:lnkPersonToTeam/Attribute:person_id+' => '',
+	'Class:lnkPersonToTeam/Attribute:person_name' => 'Název osoby',
+	'Class:lnkPersonToTeam/Attribute:person_name+' => '',
+	'Class:lnkPersonToTeam/Attribute:role_id' => 'Role',
+	'Class:lnkPersonToTeam/Attribute:role_id+' => '',
+	'Class:lnkPersonToTeam/Attribute:role_name' => 'Název role',
+	'Class:lnkPersonToTeam/Attribute:role_name+' => '',
+));
+
+
+//
+// Application Menu
+//
+
+Dict::Add('CS CZ', 'Czech', 'Čeština', array(
+	'Menu:DataAdministration' => 'Správa dat',
+	'Menu:DataAdministration+' => 'Správa dat',
+	'Menu:Catalogs' => 'Katalogy',
+	'Menu:Catalogs+' => 'Datové typy',
+	'Menu:Audit' => 'Audit',
+	'Menu:Audit+' => 'Audit',
+	'Menu:CSVImport' => 'CSV import',
+	'Menu:CSVImport+' => 'Hromadné vytvoření nebo aktualizace',
+	'Menu:Organization' => 'Organizace',
+	'Menu:Organization+' => 'Všechny organizace',
+	'Menu:ConfigManagement' => 'Správa konfigurací',
+	'Menu:ConfigManagement+' => 'Správa konfigurací',
+	'Menu:ConfigManagementOverview' => 'Přehled',
+	'Menu:ConfigManagementOverview+' => 'Přehled',
+	'Menu:Contact' => 'Kontakty',
+	'Menu:Contact+' => 'Kontakty',
+	'Menu:Contact:Count' => '%1$d kontaktů',
+	'Menu:Person' => 'Osoby',
+	'Menu:Person+' => 'Všechny osoby',
+	'Menu:Team' => 'Týmy',
+	'Menu:Team+' => 'Všechny týmy',
+	'Menu:Document' => 'Dokumenty',
+	'Menu:Document+' => 'Všechny dokumenty',
+	'Menu:Location' => 'Umístění',
+	'Menu:Location+' => 'Všechna umístění',
+	'Menu:NewContact' => 'Nový kontakt',
+	'Menu:NewContact+' => 'Nový kontakt',
+	'Menu:SearchContacts' => 'Hledat kontakty',
+	'Menu:SearchContacts+' => 'Hledat kontakty',
+	'Menu:ConfigManagement:Shortcuts' => 'Odkazy',
+	'Menu:ConfigManagement:AllContacts' => 'Všechny kontakty: %1$d',
+	'Menu:Typology' => 'Typologie',
+	'Menu:Typology+' => 'Konfigurace typologie',
+	'UI_WelcomeMenu_AllConfigItems' => 'Souhrn',
+	'Menu:ConfigManagement:Typology' => 'Konfigurace typologie',
+));
+
+?>
\ No newline at end of file
diff --git a/datamodels/2.x/itop-structure/da.dict.itop-structure.php b/datamodels/2.x/itop-structure/da.dict.itop-structure.php
new file mode 100644
index 000000000..f50c316d7
--- /dev/null
+++ b/datamodels/2.x/itop-structure/da.dict.itop-structure.php
@@ -0,0 +1,349 @@
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+ * @author Benjamin Planque <benjamin.planque@combodo.com>
+ * @author	Erik Bøg <erik@boegmoeller.dk>
+ * @copyright   Copyright (C) 2010-2018 Combodo SARL
+ * @licence	http://opensource.org/licenses/AGPL-3.0
+ */
+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+
+//
+// Class: Organization
+//
+
+Dict::Add('DA DA', 'Danish', 'Dansk', array(
+	'Class:Organization' => 'Organisation',
+	'Class:Organization+' => '',
+	'Class:Organization/Attribute:name' => 'Navn',
+	'Class:Organization/Attribute:name+' => 'Almindeligt navn',
+	'Class:Organization/Attribute:code' => 'Kodenummer',
+	'Class:Organization/Attribute:code+' => '',
+	'Class:Organization/Attribute:status' => 'Status',
+	'Class:Organization/Attribute:status+' => '',
+	'Class:Organization/Attribute:status/Value:active' => 'Aktiv',
+	'Class:Organization/Attribute:status/Value:active+' => 'Aktiv',
+	'Class:Organization/Attribute:status/Value:inactive' => 'Inaktiv',
+	'Class:Organization/Attribute:status/Value:inactive+' => 'Inaktiv',
+	'Class:Organization/Attribute:parent_id' => 'Parent id',
+	'Class:Organization/Attribute:parent_id+' => '',
+	'Class:Organization/Attribute:parent_name' => 'Parent name',
+	'Class:Organization/Attribute:parent_name+' => 'Parent name',
+	'Class:Organization/Attribute:deliverymodel_id' => 'Leverings Model Id',
+	'Class:Organization/Attribute:deliverymodel_id+' => '',
+	'Class:Organization/Attribute:deliverymodel_name' => 'Leveringsmodel navn',
+	'Class:Organization/Attribute:deliverymodel_name+' => '',
+	'Class:Organization/Attribute:parent_id_friendlyname' => 'Parent',
+	'Class:Organization/Attribute:parent_id_friendlyname+' => '',
+	'Class:Organization/Attribute:overview' => 'Overview~~',
+	'Organization:Overview:FunctionalCIs' => 'Configuration items of this organization~~',
+	'Organization:Overview:FunctionalCIs:subtitle' => 'by type~~',
+	'Organization:Overview:Users' => 'iTop Users within this organization~~',
+));
+
+//
+// Class: Location
+//
+
+Dict::Add('DA DA', 'Danish', 'Dansk', array(
+	'Class:Location' => 'Placering',
+	'Class:Location+' => 'Enhver type af placering: Region, land, by, bygning, rum rack, ...',
+	'Class:Location/Attribute:name' => 'Navn',
+	'Class:Location/Attribute:name+' => '',
+	'Class:Location/Attribute:status' => 'Status',
+	'Class:Location/Attribute:status+' => '',
+	'Class:Location/Attribute:status/Value:active' => 'Aktiv',
+	'Class:Location/Attribute:status/Value:active+' => 'Aktiv',
+	'Class:Location/Attribute:status/Value:inactive' => 'Inaktiv',
+	'Class:Location/Attribute:status/Value:inactive+' => 'Inaktiv',
+	'Class:Location/Attribute:org_id' => 'Organisation',
+	'Class:Location/Attribute:org_id+' => '',
+	'Class:Location/Attribute:org_name' => 'Organisationsnavn',
+	'Class:Location/Attribute:org_name+' => '',
+	'Class:Location/Attribute:address' => 'Adresse',
+	'Class:Location/Attribute:address+' => 'Postadresse',
+	'Class:Location/Attribute:postal_code' => 'Postnummer',
+	'Class:Location/Attribute:postal_code+' => 'Postnummer',
+	'Class:Location/Attribute:city' => 'By',
+	'Class:Location/Attribute:city+' => '',
+	'Class:Location/Attribute:country' => 'Land',
+	'Class:Location/Attribute:country+' => '',
+	'Class:Location/Attribute:physicaldevice_list' => 'List Fysiske Enheder',
+	'Class:Location/Attribute:physicaldevice_list+' => '',
+	'Class:Location/Attribute:person_list' => 'List Kontakter',
+	'Class:Location/Attribute:person_list+' => '',
+));
+
+//
+// Class: Contact
+//
+
+Dict::Add('DA DA', 'Danish', 'Dansk', array(
+	'Class:Contact' => 'Kontakt',
+	'Class:Contact+' => '',
+	'Class:Contact/Attribute:name' => 'Navn',
+	'Class:Contact/Attribute:name+' => '',
+	'Class:Contact/Attribute:status' => 'Status',
+	'Class:Contact/Attribute:status+' => '',
+	'Class:Contact/Attribute:status/Value:active' => 'Aktiv',
+	'Class:Contact/Attribute:status/Value:active+' => 'Aktiv',
+	'Class:Contact/Attribute:status/Value:inactive' => 'Inaktiv',
+	'Class:Contact/Attribute:status/Value:inactive+' => 'Inaktiv',
+	'Class:Contact/Attribute:org_id' => 'Organisation',
+	'Class:Contact/Attribute:org_id+' => '',
+	'Class:Contact/Attribute:org_name' => 'Organisation',
+	'Class:Contact/Attribute:org_name+' => '',
+	'Class:Contact/Attribute:email' => 'Email',
+	'Class:Contact/Attribute:email+' => '',
+	'Class:Contact/Attribute:phone' => 'Telefonnummer',
+	'Class:Contact/Attribute:phone+' => '',
+	'Class:Contact/Attribute:notify' => 'Underretning',
+	'Class:Contact/Attribute:notify+' => '',
+	'Class:Contact/Attribute:notify/Value:no' => 'Nej',
+	'Class:Contact/Attribute:notify/Value:no+' => '',
+	'Class:Contact/Attribute:notify/Value:yes' => 'Ja',
+	'Class:Contact/Attribute:notify/Value:yes+' => '',
+	'Class:Contact/Attribute:function' => 'Funktion',
+	'Class:Contact/Attribute:function+' => '',
+	'Class:Contact/Attribute:cis_list' => 'CIs',
+	'Class:Contact/Attribute:cis_list+' => '',
+	'Class:Contact/Attribute:finalclass' => 'Type',
+	'Class:Contact/Attribute:finalclass+' => '',
+));
+
+//
+// Class: Person
+//
+
+Dict::Add('DA DA', 'Danish', 'Dansk', array(
+	'Class:Person' => 'Person',
+	'Class:Person+' => '',
+	'Class:Person/Attribute:name' => 'Efternavn',
+	'Class:Person/Attribute:name+' => '~~',
+	'Class:Person/Attribute:first_name' => 'Fornavn',
+	'Class:Person/Attribute:first_name+' => '',
+	'Class:Person/Attribute:employee_number' => 'Personalenummer',
+	'Class:Person/Attribute:employee_number+' => '',
+	'Class:Person/Attribute:mobile_phone' => 'Mobiltelefon',
+	'Class:Person/Attribute:mobile_phone+' => '',
+	'Class:Person/Attribute:location_id' => 'Placering',
+	'Class:Person/Attribute:location_id+' => '',
+	'Class:Person/Attribute:location_name' => 'Placering',
+	'Class:Person/Attribute:location_name+' => '',
+	'Class:Person/Attribute:manager_id' => 'Manager',
+	'Class:Person/Attribute:manager_id+' => '',
+	'Class:Person/Attribute:manager_name' => 'Manager-Navn',
+	'Class:Person/Attribute:manager_name+' => '',
+	'Class:Person/Attribute:team_list' => 'List Teams',
+	'Class:Person/Attribute:team_list+' => '',
+	'Class:Person/Attribute:tickets_list' => 'List Tickets',
+	'Class:Person/Attribute:tickets_list+' => '',
+	'Class:Person/Attribute:manager_id_friendlyname' => 'Manager Friendly Name',
+	'Class:Person/Attribute:manager_id_friendlyname+' => '',
+	'Class:Person/Attribute:picture' => 'Picture~~',
+	'Class:Person/Attribute:picture+' => '~~',
+	'Class:Person/UniquenessRule:employee_number+' => 'The employee number must be unique in the organization~~',
+	'Class:Person/UniquenessRule:employee_number' => 'there is already a person in \'$this->org_name$\' organization with the same employee number~~',
+	'Class:Person/UniquenessRule:name+' => 'The employee name should be unique inside its organization~~',
+	'Class:Person/UniquenessRule:name' => 'There is already a person in \'$this->org_name$\' organization with the same name~~',
+));
+
+//
+// Class: Team
+//
+
+Dict::Add('DA DA', 'Danish', 'Dansk', array(
+	'Class:Team' => 'Team',
+	'Class:Team+' => '',
+	'Class:Team/Attribute:persons_list' => 'List Medlemmer',
+	'Class:Team/Attribute:persons_list+' => '',
+	'Class:Team/Attribute:tickets_list' => 'List Tickets',
+	'Class:Team/Attribute:tickets_list+' => '',
+));
+
+//
+// Class: Document
+//
+
+Dict::Add('DA DA', 'Danish', 'Dansk', array(
+	'Class:Document' => 'Dokument',
+	'Class:Document+' => '',
+	'Class:Document/Attribute:name' => 'Navn',
+	'Class:Document/Attribute:name+' => '',
+	'Class:Document/Attribute:org_id' => 'Organisation',
+	'Class:Document/Attribute:org_id+' => '',
+	'Class:Document/Attribute:org_name' => 'Organisationsnavn',
+	'Class:Document/Attribute:org_name+' => '',
+	'Class:Document/Attribute:documenttype_id' => 'Dokumenttype',
+	'Class:Document/Attribute:documenttype_id+' => '',
+	'Class:Document/Attribute:documenttype_name' => 'Dokumenttypnavn',
+	'Class:Document/Attribute:documenttype_name+' => '',
+	'Class:Document/Attribute:version' => 'Version~~',
+	'Class:Document/Attribute:version+' => '~~',
+	'Class:Document/Attribute:description' => 'Beskrivelse',
+	'Class:Document/Attribute:description+' => '',
+	'Class:Document/Attribute:status' => 'Status',
+	'Class:Document/Attribute:status+' => '',
+	'Class:Document/Attribute:status/Value:draft' => 'Udkast',
+	'Class:Document/Attribute:status/Value:draft+' => '',
+	'Class:Document/Attribute:status/Value:obsolete' => 'Forældet',
+	'Class:Document/Attribute:status/Value:obsolete+' => '',
+	'Class:Document/Attribute:status/Value:published' => 'Offentlig',
+	'Class:Document/Attribute:status/Value:published+' => '',
+	'Class:Document/Attribute:cis_list' => 'CIs',
+	'Class:Document/Attribute:cis_list+' => '',
+	'Class:Document/Attribute:contracts_list' => 'Kontrakter',
+	'Class:Document/Attribute:contracts_list+' => '',
+	'Class:Document/Attribute:services_list' => 'Ydelser',
+	'Class:Document/Attribute:services_list+' => '',
+	'Class:Document/Attribute:finalclass' => 'Dokumenttype',
+	'Class:Document/Attribute:finalclass+' => '',
+));
+
+//
+// Class: DocumentFile
+//
+
+Dict::Add('DA DA', 'Danish', 'Dansk', array(
+	'Class:DocumentFile' => 'Dokument (Data)',
+	'Class:DocumentFile+' => '',
+	'Class:DocumentFile/Attribute:file' => 'Data',
+	'Class:DocumentFile/Attribute:file+' => '',
+));
+
+//
+// Class: DocumentNote
+//
+
+Dict::Add('DA DA', 'Danish', 'Dansk', array(
+	'Class:DocumentNote' => 'Dokument (Noter)',
+	'Class:DocumentNote+' => '',
+	'Class:DocumentNote/Attribute:text' => 'Tekst',
+	'Class:DocumentNote/Attribute:text+' => '',
+));
+
+//
+// Class: DocumentWeb
+//
+
+Dict::Add('DA DA', 'Danish', 'Dansk', array(
+	'Class:DocumentWeb' => 'Dokument (Web)',
+	'Class:DocumentWeb+' => '',
+	'Class:DocumentWeb/Attribute:url' => 'URL',
+	'Class:DocumentWeb/Attribute:url+' => '',
+));
+
+//
+// Class: Typology
+//
+
+Dict::Add('DA DA', 'Danish', 'Dansk', array(
+	'Class:Typology' => 'Typologi',
+	'Class:Typology+' => '',
+	'Class:Typology/Attribute:name' => 'Navn',
+	'Class:Typology/Attribute:name+' => '',
+	'Class:Typology/Attribute:finalclass' => 'Type',
+	'Class:Typology/Attribute:finalclass+' => '',
+));
+
+//
+// Class: DocumentType
+//
+
+Dict::Add('DA DA', 'Danish', 'Dansk', array(
+	'Class:DocumentType' => 'Dokumentype',
+	'Class:DocumentType+' => '',
+));
+
+//
+// Class: ContactType
+//
+
+Dict::Add('DA DA', 'Danish', 'Dansk', array(
+	'Class:ContactType' => 'Kontakttype',
+	'Class:ContactType+' => '',
+));
+
+//
+// Class: lnkPersonToTeam
+//
+
+Dict::Add('DA DA', 'Danish', 'Dansk', array(
+	'Class:lnkPersonToTeam' => 'Sammenhæng Person/Team',
+	'Class:lnkPersonToTeam+' => '',
+	'Class:lnkPersonToTeam/Attribute:team_id' => 'Team',
+	'Class:lnkPersonToTeam/Attribute:team_id+' => '',
+	'Class:lnkPersonToTeam/Attribute:team_name' => 'Team navn',
+	'Class:lnkPersonToTeam/Attribute:team_name+' => '',
+	'Class:lnkPersonToTeam/Attribute:person_id' => 'Person',
+	'Class:lnkPersonToTeam/Attribute:person_id+' => '',
+	'Class:lnkPersonToTeam/Attribute:person_name' => 'Person navn',
+	'Class:lnkPersonToTeam/Attribute:person_name+' => '',
+	'Class:lnkPersonToTeam/Attribute:role_id' => 'Rolle',
+	'Class:lnkPersonToTeam/Attribute:role_id+' => '',
+	'Class:lnkPersonToTeam/Attribute:role_name' => 'Rollen navn',
+	'Class:lnkPersonToTeam/Attribute:role_name+' => '',
+));
+
+//
+// Application Menu
+//
+
+Dict::Add('DA DA', 'Danish', 'Dansk', array(
+	'Menu:DataAdministration' => 'Data administration',
+	'Menu:DataAdministration+' => '',
+	'Menu:Catalogs' => 'Katalog',
+	'Menu:Catalogs+' => 'Datatyper',
+	'Menu:Audit' => 'Audit',
+	'Menu:Audit+' => 'Audit',
+	'Menu:CSVImport' => 'CSV import~~',
+	'Menu:CSVImport+' => 'Bulk creation or update~~',
+	'Menu:Organization' => 'Organisation',
+	'Menu:Organization+' => 'Alle Organisationer',
+	'Menu:ConfigManagement' => 'Configuration Management',
+	'Menu:ConfigManagement+' => 'Configuration Management',
+	'Menu:ConfigManagementOverview' => 'Oversigt',
+	'Menu:ConfigManagementOverview+' => 'Oversigt',
+	'Menu:Contact' => 'Kontakt',
+	'Menu:Contact+' => 'Kontakt',
+	'Menu:Contact:Count' => '%1$d kontakter',
+	'Menu:Person' => 'Person',
+	'Menu:Person+' => 'Alle Personer',
+	'Menu:Team' => 'Teams',
+	'Menu:Team+' => 'Alle Teams',
+	'Menu:Document' => 'Dokument',
+	'Menu:Document+' => 'Alle Dokumenter',
+	'Menu:Location' => 'Placering',
+	'Menu:Location+' => 'Alle Placeringer',
+	'Menu:NewContact' => 'Ny Kontakt',
+	'Menu:NewContact+' => 'Ny Kontakt',
+	'Menu:SearchContacts' => 'Søg efter kontakter',
+	'Menu:SearchContacts+' => 'Søg efter kontakter',
+	'Menu:ConfigManagement:Shortcuts' => 'Genveje',
+	'Menu:ConfigManagement:AllContacts' => 'Alle Kontakter: %1$d',
+	'Menu:Typology' => 'Typologi-Konfiguration',
+	'Menu:Typology+' => '',
+	'UI_WelcomeMenu_AllConfigItems' => 'Sammenfatning',
+	'Menu:ConfigManagement:Typology' => 'Typologi Konfiguration',
+));
+?>
\ No newline at end of file
diff --git a/datamodels/2.x/itop-config-mgmt/data.sample.contactteam.xml b/datamodels/2.x/itop-structure/data.sample.contactteam.xml
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-config-mgmt/data.sample.contactteam.xml
rename to datamodels/2.x/itop-structure/data.sample.contactteam.xml
diff --git a/datamodels/2.x/itop-config-mgmt/data.sample.contacttype.xml b/datamodels/2.x/itop-structure/data.sample.contacttype.xml
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-config-mgmt/data.sample.contacttype.xml
rename to datamodels/2.x/itop-structure/data.sample.contacttype.xml
diff --git a/datamodels/2.x/itop-config-mgmt/data.sample.organizations.xml b/datamodels/2.x/itop-structure/data.sample.organizations.xml
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-config-mgmt/data.sample.organizations.xml
rename to datamodels/2.x/itop-structure/data.sample.organizations.xml
diff --git a/datamodels/2.x/itop-config-mgmt/data.sample.persons.xml b/datamodels/2.x/itop-structure/data.sample.persons.xml
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-config-mgmt/data.sample.persons.xml
rename to datamodels/2.x/itop-structure/data.sample.persons.xml
diff --git a/datamodels/2.x/itop-config-mgmt/data.sample.teams.xml b/datamodels/2.x/itop-structure/data.sample.teams.xml
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-config-mgmt/data.sample.teams.xml
rename to datamodels/2.x/itop-structure/data.sample.teams.xml
diff --git a/datamodels/2.x/itop-structure/datamodel.itop-structure.xml b/datamodels/2.x/itop-structure/datamodel.itop-structure.xml
new file mode 100644
index 000000000..68ec80c47
--- /dev/null
+++ b/datamodels/2.x/itop-structure/datamodel.itop-structure.xml
@@ -0,0 +1,1794 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.6">
+<classes>
+		<class id="Organization" _delta="define">
+			<parent>cmdbAbstractObject</parent>
+			<properties>
+				<comment><![CDATA[/**
+ * Persistent classes for a CMDB
+ *
+ * @copyright   Copyright (C) 2010-2017 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */]]></comment>
+				<category>bizmodel,searchable,structure</category>
+				<abstract>false</abstract>
+				<key_type>autoincrement</key_type>
+				<db_table>organization</db_table>
+				<db_key_field>id</db_key_field>
+				<db_final_class_field/>
+				<naming>
+					<attributes>
+						<attribute id="name"/>
+					</attributes>
+				</naming>
+				<display_template/>
+				<icon>images/building.png</icon>
+				<reconciliation>
+					<attributes>
+						<attribute id="name"/>
+						<attribute id="code"/>
+					</attributes>
+				</reconciliation>
+				<obsolescence>
+					<condition><![CDATA[status = 'inactive']]></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="code" xsi:type="AttributeString">
+					<sql>code</sql>
+					<default_value/>
+					<is_null_allowed>true</is_null_allowed>
+				</field>
+				<field id="status" xsi:type="AttributeEnum">
+					<values>
+						<value id="active">active</value>
+						<value id="inactive">inactive</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="parent_id" xsi:type="AttributeHierarchicalKey">
+					<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="overview" xsi:type="AttributeDashboard">
+					<is_user_editable>true</is_user_editable>
+					<definition>
+						<layout>DashboardLayoutTwoCols</layout>
+						<auto_reload>
+							<enabled>false</enabled>
+							<interval>300</interval>
+						</auto_reload>
+						<cells>
+							<cell id="0">
+								<rank>0</rank>
+								<dashlets>
+									<dashlet id="11" xsi:type="DashletHeaderDynamic">
+										<rank>0</rank>
+										<title>Organization:Overview:FunctionalCIs</title>
+										<icon>itop-config-mgmt/images/server.png</icon>
+										<subtitle>Organization:Overview:FunctionalCIs:subtitle</subtitle>
+										<query>SELECT FunctionalCI WHERE org_id=:this-&gt;id</query>
+										<group_by>finalclass</group_by>
+										<values>NetworkDevice,Server,ApplicationSolution</values>
+									</dashlet>
+								</dashlets>
+							</cell>
+							<cell id="2">
+								<rank>20</rank>
+								<dashlets>
+									<dashlet id="12" xsi:type="DashletObjectList">
+										<rank>0</rank>
+										<title>Organization:Overview:Users</title>
+										<query>SELECT Person AS p JOIN User AS u ON u.contactid=p.id WHERE p.org_id=:this-&gt;id</query>
+										<menu>true</menu>
+									</dashlet>
+								</dashlets>
+							</cell>
+							<cell id="9000">
+								<rank>5</rank>
+								<dashlets>
+									<dashlet id="0" xsi:type="DashletEmptyCell">
+										<rank>0</rank>
+									</dashlet>
+								</dashlets>
+							</cell>
+						</cells>
+					</definition>
+				</field>
+			</fields>
+			<methods/>
+			<presentation>
+				<details>
+					<items>
+						<item id="name">
+							<rank>10</rank>
+						</item>
+						<item id="code">
+							<rank>20</rank>
+						</item>
+						<item id="status">
+							<rank>30</rank>
+						</item>
+						<item id="parent_id">
+							<rank>40</rank>
+						</item>
+						<item id="overview">
+							<rank>50</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>
+						<item id="code">
+							<rank>20</rank>
+						</item>
+						<item id="status">
+							<rank>30</rank>
+						</item>
+						<item id="parent_id">
+							<rank>40</rank>
+						</item>
+					</items>
+				</search>
+				<list>
+					<items>
+						<item id="code">
+							<rank>10</rank>
+						</item>
+						<item id="status">
+							<rank>20</rank>
+						</item>
+						<item id="parent_id">
+							<rank>30</rank>
+						</item>
+					</items>
+				</list>
+			</presentation>
+		</class>
+		<class id="Location" _delta="define">
+			<parent>cmdbAbstractObject</parent>
+			<properties>
+				<category>bizmodel,searchable,structure</category>
+				<abstract>false</abstract>
+				<key_type>autoincrement</key_type>
+				<db_table>location</db_table>
+				<db_key_field>id</db_key_field>
+				<db_final_class_field/>
+				<naming>
+					<attributes>
+						<attribute id="name"/>
+					</attributes>
+				</naming>
+				<display_template/>
+				<icon>images/location.png</icon>
+				<reconciliation>
+					<attributes>
+						<attribute id="name"/>
+						<attribute id="org_id"/>
+						<attribute id="org_name"/>
+					</attributes>
+				</reconciliation>
+				<obsolescence>
+					<condition><![CDATA[status = 'inactive']]></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="active">active</value>
+						<value id="inactive">inactive</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="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="address" xsi:type="AttributeText">
+					<sql>address</sql>
+					<default_value/>
+					<is_null_allowed>true</is_null_allowed>
+				</field>
+				<field id="postal_code" xsi:type="AttributeString">
+					<sql>postal_code</sql>
+					<default_value/>
+					<is_null_allowed>true</is_null_allowed>
+				</field>
+				<field id="city" xsi:type="AttributeString">
+					<sql>city</sql>
+					<default_value/>
+					<is_null_allowed>true</is_null_allowed>
+				</field>
+				<field id="country" xsi:type="AttributeString">
+					<sql>country</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="status">
+							<rank>20</rank>
+						</item>
+						<item id="org_id">
+							<rank>30</rank>
+						</item>
+						<item id="address">
+							<rank>40</rank>
+						</item>
+						<item id="postal_code">
+							<rank>50</rank>
+						</item>
+						<item id="city">
+							<rank>60</rank>
+						</item>
+						<item id="country">
+							<rank>70</rank>
+						</item>
+						<item id="person_list">
+							<rank>80</rank>
+						</item>
+						<item id="physicaldevice_list">
+							<rank>90</rank>
+						</item>
+					</items>
+				</details>
+				<default_search>
+					<items>
+						<item id="name">
+							<rank>10</rank>
+						</item>
+						<item id="country">
+							<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="address">
+							<rank>40</rank>
+						</item>
+						<item id="postal_code">
+							<rank>50</rank>
+						</item>
+						<item id="city">
+							<rank>60</rank>
+						</item>
+						<item id="country">
+							<rank>70</rank>
+						</item>
+					</items>
+				</search>
+				<list>
+					<items>
+						<item id="status">
+							<rank>10</rank>
+						</item>
+						<item id="org_id">
+							<rank>20</rank>
+						</item>
+						<item id="city">
+							<rank>30</rank>
+						</item>
+						<item id="country">
+							<rank>40</rank>
+						</item>
+					</items>
+				</list>
+			</presentation>
+		</class>
+		<class id="Contact" _delta="define">
+			<parent>cmdbAbstractObject</parent>
+			<properties>
+				<category>bizmodel,searchable,structure</category>
+				<abstract>true</abstract>
+				<key_type>autoincrement</key_type>
+				<db_table>contact</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>
+				<display_template/>
+				<icon>images/team.png</icon>
+				<reconciliation>
+					<attributes>
+						<attribute id="name"/>
+						<attribute id="org_id"/>
+						<attribute id="org_name"/>
+						<attribute id="email"/>
+						<attribute id="finalclass"/>
+					</attributes>
+				</reconciliation>
+				<obsolescence>
+					<condition>status='inactive'</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="active">active</value>
+						<value id="inactive">inactive</value>
+					</values>
+					<sql>status</sql>
+					<default_value>active</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="org_name" xsi:type="AttributeExternalField">
+					<extkey_attcode>org_id</extkey_attcode>
+					<target_attcode>name</target_attcode>
+				</field>
+				<field id="email" xsi:type="AttributeEmailAddress">
+					<sql>email</sql>
+					<default_value/>
+					<is_null_allowed>true</is_null_allowed>
+				</field>
+				<field id="phone" xsi:type="AttributePhoneNumber">
+					<sql>phone</sql>
+					<default_value/>
+					<is_null_allowed>true</is_null_allowed>
+				</field>
+				<field id="notify" xsi:type="AttributeEnum">
+					<values>
+						<value id="yes">yes</value>
+						<value id="no">no</value>
+					</values>
+					<sql>notify</sql>
+					<default_value>yes</default_value>
+					<is_null_allowed>true</is_null_allowed>
+					<display_style>radio_horizontal</display_style>
+				</field>
+				<field id="function" xsi:type="AttributeString">
+					<sql>function</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="status">
+							<rank>20</rank>
+						</item>
+						<item id="org_id">
+							<rank>30</rank>
+						</item>
+						<item id="email">
+							<rank>40</rank>
+						</item>
+						<item id="phone">
+							<rank>50</rank>
+						</item>
+						<item id="notify">
+							<rank>60</rank>
+						</item>
+						<item id="function">
+							<rank>70</rank>
+						</item>
+					</items>
+				</details>
+				<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="email">
+							<rank>40</rank>
+						</item>
+						<item id="phone">
+							<rank>50</rank>
+						</item>
+						<item id="notify">
+							<rank>60</rank>
+						</item>
+						<item id="function">
+							<rank>70</rank>
+						</item>
+					</items>
+				</search>
+				<default_search>
+					<items>
+						<item id="friendlyname">
+							<rank>10</rank>
+						</item>
+						<item id="email">
+							<rank>20</rank>
+						</item>
+						<item id="org_id">
+							<rank>30</rank>
+						</item>
+					</items>
+				</default_search>
+				<list>
+					<items>
+						<item id="status">
+							<rank>10</rank>
+						</item>
+						<item id="org_id">
+							<rank>20</rank>
+						</item>
+						<item id="email">
+							<rank>30</rank>
+						</item>
+						<item id="phone">
+							<rank>40</rank>
+						</item>
+						<item id="function">
+							<rank>50</rank>
+						</item>
+					</items>
+				</list>
+			</presentation>
+		</class>
+		<class id="Person" _delta="define">
+			<parent>Contact</parent>
+			<properties>
+				<category>bizmodel,searchable,structure</category>
+				<abstract>false</abstract>
+				<key_type>autoincrement</key_type>
+				<db_table>person</db_table>
+				<db_key_field>id</db_key_field>
+				<db_final_class_field/>
+				<naming>
+					<attributes>
+						<attribute id="first_name"/>
+						<attribute id="name"/>
+					</attributes>
+				</naming>
+				<display_template/>
+				<icon>images/person.png</icon>
+				<reconciliation>
+					<attributes>
+						<attribute id="name"/>
+						<attribute id="first_name"/>
+						<attribute id="org_id"/>
+						<attribute id="org_name"/>
+						<attribute id="email"/>
+						<attribute id="employee_number"/>
+					</attributes>
+				</reconciliation>
+				<uniqueness_rules>
+					<rule id="employee_number">
+						<attributes>
+							<attribute id="org_id"/>
+							<attribute id="employee_number"/>
+						</attributes>
+						<filter><![CDATA[employee_number != '']]></filter>
+						<disabled>false</disabled>
+						<is_blocking>true</is_blocking>
+					</rule>
+					<rule id="name">
+						<attributes>
+							<attribute id="org_id"/>
+							<attribute id="name"/>
+							<attribute id="first_name"/>
+						</attributes>
+						<filter/>
+						<disabled>false</disabled>
+						<is_blocking>false</is_blocking>
+					</rule>
+				</uniqueness_rules>
+			</properties>
+			<fields>
+				<field id="picture" xsi:type="AttributeImage">
+					<display_max_width>96</display_max_width>
+					<display_max_height>96</display_max_height>
+					<storage_max_width>128</storage_max_width>
+					<storage_max_height>128</storage_max_height>
+					<default_image>images/silhouette.png</default_image>
+					<is_null_allowed>true</is_null_allowed>
+				</field>
+				<field id="first_name" xsi:type="AttributeString">
+					<sql>first_name</sql>
+					<default_value/>
+					<is_null_allowed>false</is_null_allowed>
+				</field>
+				<field id="employee_number" xsi:type="AttributeString">
+					<sql>employee_number</sql>
+					<default_value/>
+					<is_null_allowed>true</is_null_allowed>
+				</field>
+				<field id="mobile_phone" xsi:type="AttributePhoneNumber">
+					<sql>mobile_phone</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="manager_id" xsi:type="AttributeExternalKey">
+					<filter><![CDATA[SELECT Person]]></filter>
+					<dependencies>
+						<attribute id="org_id"/>
+					</dependencies>
+					<sql>manager_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="manager_name" xsi:type="AttributeExternalField">
+					<extkey_attcode>manager_id</extkey_attcode>
+					<target_attcode>name</target_attcode>
+				</field>
+				<field id="team_list" xsi:type="AttributeLinkedSetIndirect">
+					<linked_class>lnkPersonToTeam</linked_class>
+					<ext_key_to_me>person_id</ext_key_to_me>
+					<count_min>0</count_min>
+					<count_max>0</count_max>
+					<ext_key_to_remote>team_id</ext_key_to_remote>
+					<duplicates/>
+				</field>
+			</fields>
+			<methods>
+				<method id="CheckToDelete">
+					<static>false</static>
+					<access>public</access>
+					<type>Overload-DBObject</type>
+					<code><![CDATA[  	public function CheckToDelete(&$oDeletionPlan)
+  	{
+  		if (MetaModel::GetConfig()->Get('demo_mode'))
+		{
+			if ($this->HasUserAccount())
+			{
+				// Do not let users change user accounts in demo mode
+				$oDeletionPlan->AddToDelete($this, null);
+				$oDeletionPlan->SetDeletionIssues($this, array('deletion not allowed in demo mode.'), true);
+				$oDeletionPlan->ComputeResults();
+				return false;
+			}
+		}
+		return parent::CheckToDelete($oDeletionPlan);
+  	}
+]]></code>
+				</method>
+				<method id="DBDeleteSingleObject">
+					<static>false</static>
+					<access>public</access>
+					<type>Overload-DBObject</type>
+					<code><![CDATA[  	public function DBDeleteSingleObject()
+	{
+		if (MetaModel::GetConfig()->Get('demo_mode'))
+		{
+			if ($this->HasUserAccount())
+			{
+				// Do not let users change user accounts in demo mode
+				return;
+			}
+		}
+		parent::DBDeleteSingleObject();
+	}
+]]></code>
+				</method>
+				<method id="GetAttributeFlags">
+					<static>false</static>
+					<access>public</access>
+					<type>Overload-DBObject</type>
+					<code><![CDATA[	public function GetAttributeFlags($sAttCode, &$aReasons = array(), $sTargetState = '')
+	{
+		if ( ($sAttCode == 'org_id') && (!$this->IsNew()) )
+		{
+			if (MetaModel::GetConfig()->Get('demo_mode'))
+			{
+				if ($this->HasUserAccount())
+				{
+					// Do not let users change user accounts in demo mode
+					return OPT_ATT_READONLY;
+				}
+			}
+		}
+		return parent::GetAttributeFlags($sAttCode, $aReasons, $sTargetState);
+	}
+]]></code>
+				</method>
+				<method id="HasUserAccount">
+					<static>false</static>
+					<access>public</access>
+					<type>Helper</type>
+					<code><![CDATA[  	public function HasUserAccount()
+  	{
+		static $bHasUserAccount = null;
+		if (is_null($bHasUserAccount))
+		{
+			$oUserSet = new DBObjectSet(DBSearch::FromOQL('SELECT User WHERE contactid = :person', array('person' => $this->GetKey())));
+			$bHasUserAccount = ($oUserSet->Count() > 0);
+		}
+		return $bHasUserAccount;
+  	}
+]]></code>
+				</method>
+			</methods>
+			<presentation>
+				<details>
+					<items>
+						<item id="team_list">
+							<rank>10</rank>
+						</item>
+						<item id="col:col1">
+							<rank>40</rank>
+							<items>
+								<item id="fieldset:Person:info">
+									<rank>10</rank>
+									<items>
+										<item id="name">
+											<rank>10</rank>
+										</item>
+										<item id="first_name">
+											<rank>20</rank>
+										</item>
+										<item id="org_id">
+											<rank>30</rank>
+										</item>
+										<item id="status">
+											<rank>40</rank>
+										</item>
+										<item id="location_id">
+											<rank>50</rank>
+										</item>
+										<item id="function">
+											<rank>60</rank>
+										</item>
+										<item id="manager_id">
+											<rank>70</rank>
+										</item>
+										<item id="employee_number">
+											<rank>80</rank>
+										</item>
+									</items>
+								</item>
+							</items>
+						</item>
+						<item id="col:col2">
+							<rank>50</rank>
+							<items>
+								<item id="fieldset:Person:personal_info">
+									<rank>5</rank>
+									<items>
+										<item id="picture">
+											<rank>10</rank>
+										</item>
+									</items>
+								</item>
+								<item id="fieldset:Person:notifiy">
+									<rank>10</rank>
+									<items>
+										<item id="email">
+											<rank>10</rank>
+										</item>
+										<item id="notify">
+											<rank>20</rank>
+										</item>
+										<item id="phone">
+											<rank>30</rank>
+										</item>
+										<item id="mobile_phone">
+											<rank>40</rank>
+										</item>
+									</items>
+								</item>
+							</items>
+						</item>
+					</items>
+				</details>
+				<search>
+					<items>
+						<item id="name">
+							<rank>10</rank>
+						</item>
+						<item id="first_name">
+							<rank>20</rank>
+						</item>
+						<item id="org_id">
+							<rank>30</rank>
+						</item>
+						<item id="status">
+							<rank>40</rank>
+						</item>
+						<item id="location_id">
+							<rank>50</rank>
+						</item>
+						<item id="email">
+							<rank>60</rank>
+						</item>
+						<item id="phone">
+							<rank>70</rank>
+						</item>
+						<item id="employee_number">
+							<rank>80</rank>
+						</item>
+						<item id="manager_id">
+							<rank>90</rank>
+						</item>
+						<item id="mobile_phone">
+							<rank>100</rank>
+						</item>
+						<item id="notify">
+							<rank>110</rank>
+						</item>
+					</items>
+				</search>
+				<list>
+					<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="location_id">
+							<rank>40</rank>
+						</item>
+						<item id="email">
+							<rank>50</rank>
+						</item>
+						<item id="phone">
+							<rank>60</rank>
+						</item>
+					</items>
+				</list>
+			</presentation>
+		</class>
+		<class id="Team" _delta="define">
+			<parent>Contact</parent>
+			<properties>
+				<category>bizmodel,searchable</category>
+				<abstract>false</abstract>
+				<key_type>autoincrement</key_type>
+				<db_table>team</db_table>
+				<db_key_field>id</db_key_field>
+				<db_final_class_field/>
+				<naming>
+					<attributes>
+						<attribute id="name"/>
+					</attributes>
+				</naming>
+				<display_template/>
+				<icon>images/team.png</icon>
+				<reconciliation>
+					<attributes>
+						<attribute id="name"/>
+						<attribute id="org_id"/>
+						<attribute id="org_name"/>
+						<attribute id="email"/>
+					</attributes>
+				</reconciliation>
+			</properties>
+			<fields>
+				<field id="persons_list" xsi:type="AttributeLinkedSetIndirect">
+					<linked_class>lnkPersonToTeam</linked_class>
+					<ext_key_to_me>team_id</ext_key_to_me>
+					<count_min>0</count_min>
+					<count_max>0</count_max>
+					<ext_key_to_remote>person_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="email">
+							<rank>40</rank>
+						</item>
+						<item id="phone">
+							<rank>50</rank>
+						</item>
+						<item id="notify">
+							<rank>60</rank>
+						</item>
+						<item id="function">
+							<rank>70</rank>
+						</item>
+						<item id="persons_list">
+							<rank>80</rank>
+						</item>
+					</items>
+				</details>
+				<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="email">
+							<rank>40</rank>
+						</item>
+						<item id="phone">
+							<rank>50</rank>
+						</item>
+						<item id="notify">
+							<rank>60</rank>
+						</item>
+						<item id="function">
+							<rank>70</rank>
+						</item>
+					</items>
+				</search>
+				<list>
+					<items>
+						<item id="status">
+							<rank>10</rank>
+						</item>
+						<item id="org_id">
+							<rank>20</rank>
+						</item>
+						<item id="email">
+							<rank>30</rank>
+						</item>
+						<item id="phone">
+							<rank>40</rank>
+						</item>
+					</items>
+				</list>
+			</presentation>
+		</class>
+		<class id="lnkPersonToTeam" _delta="define">
+			<parent>cmdbAbstractObject</parent>
+			<properties>
+				<is_link>1</is_link>
+				<category>bizmodel</category>
+				<abstract>false</abstract>
+				<key_type>autoincrement</key_type>
+				<db_table>lnkpersontoteam</db_table>
+				<db_key_field>id</db_key_field>
+				<db_final_class_field/>
+				<naming>
+					<attributes>
+						<attribute id="team_id"/>
+						<attribute id="person_id"/>
+					</attributes>
+				</naming>
+				<display_template/>
+				<icon/>
+				<reconciliation>
+					<attributes>
+						<attribute id="team_id"/>
+						<attribute id="person_id"/>
+					</attributes>
+				</reconciliation>
+			</properties>
+			<fields>
+				<field id="team_id" xsi:type="AttributeExternalKey">
+					<sql>team_id</sql>
+					<target_class>Team</target_class>
+					<is_null_allowed>false</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>name</target_attcode>
+				</field>
+				<field id="person_id" xsi:type="AttributeExternalKey">
+					<sql>person_id</sql>
+					<target_class>Person</target_class>
+					<is_null_allowed>false</is_null_allowed>
+					<on_target_delete>DEL_AUTO</on_target_delete>
+				</field>
+				<field id="person_name" xsi:type="AttributeExternalField">
+					<extkey_attcode>person_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="team_id">
+							<rank>10</rank>
+						</item>
+						<item id="person_id">
+							<rank>20</rank>
+						</item>
+						<item id="role_id">
+							<rank>30</rank>
+						</item>
+					</items>
+				</details>
+				<search>
+					<items>
+						<item id="team_id">
+							<rank>10</rank>
+						</item>
+						<item id="person_id">
+							<rank>20</rank>
+						</item>
+						<item id="role_id">
+							<rank>30</rank>
+						</item>
+					</items>
+				</search>
+				<list>
+					<items>
+						<item id="team_id">
+							<rank>10</rank>
+						</item>
+						<item id="person_id">
+							<rank>20</rank>
+						</item>
+						<item id="role_id">
+							<rank>30</rank>
+						</item>
+					</items>
+				</list>
+			</presentation>
+		</class>
+		<class id="Typology" _delta="define">
+			<parent>cmdbAbstractObject</parent>
+			<properties>
+				<category>bizmodel,searchable</category>
+				<abstract>true</abstract>
+				<key_type>autoincrement</key_type>
+				<db_table>typology</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>
+				<display_template/>
+				<icon/>
+				<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="finalclass">
+							<rank>10</rank>
+						</item>
+					</items>
+				</list>
+			</presentation>
+		</class>
+		<class id="Document" _delta="define">
+			<parent>cmdbAbstractObject</parent>
+			<properties>
+				<category>bizmodel,searchable</category>
+				<abstract>true</abstract>
+				<key_type>autoincrement</key_type>
+				<db_table>document</db_table>
+				<db_key_field>id</db_key_field>
+				<db_final_class_field>finalclass</db_final_class_field>
+				<naming>
+					<attributes/>
+				</naming>
+				<display_template/>
+				<icon>images/document.png</icon>
+				<reconciliation>
+					<attributes>
+						<attribute id="name"/>
+						<attribute id="org_id"/>
+						<attribute id="org_name"/>
+						<attribute id="finalclass"/>
+					</attributes>
+				</reconciliation>
+				<obsolescence>
+					<condition><![CDATA[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="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="documenttype_id" xsi:type="AttributeExternalKey">
+					<sql>documenttype_id</sql>
+					<target_class>DocumentType</target_class>
+					<is_null_allowed>true</is_null_allowed>
+					<on_target_delete>DEL_MANUAL</on_target_delete>
+				</field>
+				<field id="documenttype_name" xsi:type="AttributeExternalField">
+					<extkey_attcode>documenttype_id</extkey_attcode>
+					<target_attcode>name</target_attcode>
+				</field>
+				<field id="version" xsi:type="AttributeString">
+					<sql>version</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="status" xsi:type="AttributeEnum">
+					<values>
+						<value id="draft">draft</value>
+						<value id="published">published</value>
+						<value id="obsolete">obsolete</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="org_id">
+							<rank>20</rank>
+						</item>
+						<item id="status">
+							<rank>30</rank>
+						</item>
+						<item id="version">
+							<rank>35</rank>
+						</item>
+						<item id="documenttype_id">
+							<rank>40</rank>
+						</item>
+						<item id="description">
+							<rank>50</rank>
+						</item>
+					</items>
+				</details>
+				<default_search>
+					<items>
+						<item id="name">
+							<rank>10</rank>
+						</item>
+						<item id="description">
+							<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="documenttype_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="documenttype_id">
+							<rank>30</rank>
+						</item>
+						<item id="description">
+							<rank>40</rank>
+						</item>
+					</items>
+				</list>
+			</presentation>
+		</class>
+		<class id="DocumentFile" _delta="define">
+			<parent>Document</parent>
+			<properties>
+				<category>bizmodel,searchable</category>
+				<abstract>false</abstract>
+				<key_type>autoincrement</key_type>
+				<db_table>documentfile</db_table>
+				<db_key_field>id</db_key_field>
+				<db_final_class_field/>
+				<naming>
+					<attributes>
+						<attribute id="name"/>
+					</attributes>
+				</naming>
+				<display_template/>
+				<icon>images/document.png</icon>
+				<reconciliation>
+					<attributes>
+						<attribute id="name"/>
+						<attribute id="org_id"/>
+						<attribute id="org_name"/>
+					</attributes>
+				</reconciliation>
+			</properties>
+			<fields>
+				<field id="file" xsi:type="AttributeBlob"/>
+			</fields>
+			<methods>
+				<method id="DisplayBareRelations">
+					<static>false</static>
+					<access>public</access>
+					<type>Overload-cmdbAbstractObject</type>
+					<comment><![CDATA[/**
+	 * Overload the display of the properties to add a tab (the first one)
+	 * with the preview of the document
+	 */
+	]]></comment>
+					<code><![CDATA[public function DisplayBareProperties(WebPage $oPage, $bEditMode = false, $sPrefix = '', $aExtraParams = array())
+	{
+		$aFieldsMap = parent::DisplayBareProperties($oPage, $bEditMode, $sPrefix, $aExtraParams);
+		if (!$bEditMode)
+		{
+			$oPage->add('<fieldset>');
+			$oPage->add('<legend>'.Dict::S('Class:Document:PreviewTab').'</legend>');
+			$oPage->add($this->DisplayDocumentInline($oPage, 'file'));
+			$oPage->add('</fieldset>');
+		}
+		return $aFieldsMap;
+	}]]></code>
+				</method>
+			</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="version">
+							<rank>35</rank>
+						</item>
+						<item id="documenttype_id">
+							<rank>40</rank>
+						</item>
+						<item id="description">
+							<rank>50</rank>
+						</item>
+						<item id="file">
+							<rank>60</rank>
+						</item>
+						<item id="cis_list">
+							<rank>70</rank>
+						</item>
+						<item id="contracts_list">
+							<rank>80</rank>
+						</item>
+						<item id="services_list">
+							<rank>90</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="documenttype_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="documenttype_id">
+							<rank>30</rank>
+						</item>
+						<item id="file">
+							<rank>40</rank>
+						</item>
+					</items>
+				</list>
+			</presentation>
+		</class>
+		<class id="DocumentNote" _delta="define">
+			<parent>Document</parent>
+			<properties>
+				<category>bizmodel,searchable</category>
+				<abstract>false</abstract>
+				<key_type>autoincrement</key_type>
+				<db_table>documentnote</db_table>
+				<db_key_field>id</db_key_field>
+				<db_final_class_field/>
+				<naming>
+					<attributes>
+						<attribute id="name"/>
+					</attributes>
+				</naming>
+				<display_template/>
+				<icon>images/document.png</icon>
+				<reconciliation>
+					<attributes>
+						<attribute id="name"/>
+						<attribute id="org_id"/>
+						<attribute id="org_name"/>
+					</attributes>
+				</reconciliation>
+			</properties>
+			<fields>
+				<field id="text" xsi:type="AttributeHTML">
+					<sql>text</sql>
+					<default_value/>
+					<is_null_allowed>false</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="version">
+							<rank>35</rank>
+						</item>
+						<item id="documenttype_id">
+							<rank>40</rank>
+						</item>
+						<item id="description">
+							<rank>50</rank>
+						</item>
+						<item id="text">
+							<rank>60</rank>
+						</item>
+						<item id="cis_list">
+							<rank>70</rank>
+						</item>
+						<item id="contracts_list">
+							<rank>80</rank>
+						</item>
+						<item id="services_list">
+							<rank>90</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="documenttype_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="documenttype_id">
+							<rank>30</rank>
+						</item>
+						<item id="description">
+							<rank>40</rank>
+						</item>
+					</items>
+				</list>
+			</presentation>
+		</class>
+		<class id="DocumentWeb" _delta="define">
+			<parent>Document</parent>
+			<properties>
+				<category>bizmodel,searchable</category>
+				<abstract>false</abstract>
+				<key_type>autoincrement</key_type>
+				<db_table>documentweb</db_table>
+				<db_key_field>id</db_key_field>
+				<db_final_class_field/>
+				<naming>
+					<attributes>
+						<attribute id="name"/>
+					</attributes>
+				</naming>
+				<display_template/>
+				<icon>images/document.png</icon>
+				<reconciliation>
+					<attributes>
+						<attribute id="name"/>
+						<attribute id="org_id"/>
+						<attribute id="org_name"/>
+					</attributes>
+				</reconciliation>
+			</properties>
+			<fields>
+				<field id="url" xsi:type="AttributeURL">
+					<sql>url</sql>
+					<default_value/>
+					<is_null_allowed>true</is_null_allowed>
+					<target>_blank</target>
+				</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="version">
+							<rank>35</rank>
+						</item>
+						<item id="description">
+							<rank>40</rank>
+						</item>
+						<item id="url">
+							<rank>50</rank>
+						</item>
+						<item id="cis_list">
+							<rank>60</rank>
+						</item>
+						<item id="contracts_list">
+							<rank>70</rank>
+						</item>
+						<item id="services_list">
+							<rank>80</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="description">
+							<rank>40</rank>
+						</item>
+						<item id="url">
+							<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="description">
+							<rank>30</rank>
+						</item>
+						<item id="url">
+							<rank>40</rank>
+						</item>
+					</items>
+				</list>
+			</presentation>
+		</class>
+		<class id="DocumentType" _delta="define">
+			<parent>Typology</parent>
+			<properties>
+				<category>bizmodel,searchable</category>
+				<abstract>false</abstract>
+				<key_type>autoincrement</key_type>
+				<db_table>documenttype</db_table>
+				<db_key_field>id</db_key_field>
+				<db_final_class_field/>
+				<naming>
+					<attributes>
+						<attribute id="name"/>
+					</attributes>
+				</naming>
+				<display_template/>
+				<icon/>
+				<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="ContactType" _delta="define">
+			<parent>Typology</parent>
+			<properties>
+				<category>bizmodel,searchable</category>
+				<abstract>false</abstract>
+				<key_type>autoincrement</key_type>
+				<db_table>contacttype</db_table>
+				<db_key_field>id</db_key_field>
+				<db_final_class_field/>
+				<naming>
+					<attributes>
+						<attribute id="name"/>
+					</attributes>
+				</naming>
+				<display_template/>
+				<icon/>
+				<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>
+</classes><menus>
+			<menu id="DataAdministration" xsi:type="MenuGroup" _delta="define">
+				<rank>70</rank>
+				<enable_class>Organization</enable_class>
+				<enable_action>UR_ACTION_MODIFY</enable_action>
+				<enable_permission>UR_ALLOWED_YES</enable_permission>
+				<enable_stimulus/>
+				<style>
+					<decoration_classes>fas fa-folder</decoration_classes>
+				</style>
+			</menu>
+			<menu id="CSVImport" xsi:type="WebPageMenuNode" _delta="define">
+				<rank>10</rank>
+				<parent>DataAdministration</parent>
+				<url>$pages/csvimport.php</url>
+			</menu>
+			<menu id="Audit" xsi:type="WebPageMenuNode" _delta="define">
+				<rank>33</rank>
+				<parent>DataAdministration</parent>
+				<url>$pages/audit.php</url>
+			</menu>
+			<menu id="Catalogs" xsi:type="TemplateMenuNode" _delta="define">
+				<rank>50</rank>
+				<parent>DataAdministration</parent>
+				<template_file/>
+			</menu>
+			<menu id="Organization" xsi:type="OQLMenuNode" _delta="define">
+				<rank>10</rank>
+				<parent>Catalogs</parent>
+				<oql>SELECT Organization</oql>
+				<do_search>1</do_search>
+			</menu>
+			<menu id="ConfigManagement" xsi:type="MenuGroup" _delta="define">
+				<rank>20</rank>
+				<style>
+					<decoration_classes>fas fa-database</decoration_classes>
+				</style>
+			</menu>
+			<menu id="Contact" xsi:type="DashboardMenuNode" _delta="define">
+				<rank>2</rank>
+				<parent>ConfigManagement</parent>
+				<definition>
+					<layout>DashboardLayoutOneCol</layout>
+					<title/>
+					<cells>
+						<cell id="0">
+							<rank>0</rank>
+							<dashlets>
+								<dashlet id="1" xsi:type="DashletHeaderDynamic">
+									<rank>1</rank>
+									<title>Menu:Contact</title>
+									<icon>itop-structure/images/team.png</icon>
+									<subtitle>Menu:Contact:Count</subtitle>
+									<query>SELECT Contact</query>
+									<group_by>status</group_by>
+									<values>active,inactive</values>
+								</dashlet>
+								<dashlet id="2" xsi:type="DashletBadge">
+									<rank>2</rank>
+									<class>Team</class>
+								</dashlet>
+								<dashlet id="3" xsi:type="DashletBadge">
+									<rank>3</rank>
+									<class>Person</class>
+								</dashlet>
+							</dashlets>
+						</cell>
+					</cells>
+				</definition>
+			</menu>
+			<menu id="NewContact" xsi:type="NewObjectMenuNode" _delta="define">
+				<rank>3</rank>
+				<parent>Contact</parent>
+				<class>Contact</class>
+			</menu>
+			<menu id="SearchContacts" xsi:type="SearchMenuNode" _delta="define">
+				<rank>4</rank>
+				<parent>Contact</parent>
+				<class>Contact</class>
+			</menu>
+			<menu id="Location" xsi:type="OQLMenuNode" _delta="define">
+				<rank>3</rank>
+				<parent>ConfigManagement</parent>
+				<oql>SELECT Location</oql>
+				<do_search>1</do_search>
+			</menu>
+			<menu id="Document" xsi:type="OQLMenuNode" _delta="define">
+				<rank>6</rank>
+				<parent>ConfigManagement</parent>
+				<oql>SELECT Document</oql>
+				<do_search>1</do_search>
+			</menu>
+			<menu id="Typology" xsi:type="DashboardMenuNode" _delta="define">
+				<rank>80</rank>
+				<parent>Catalogs</parent>
+				<definition>
+					<layout>DashboardLayoutOneCol</layout>
+					<title>Menu:ConfigManagement:Typology</title>
+					<cells>
+						<cell id="0">
+							<rank>0</rank>
+							<dashlets>
+								<dashlet id="1" xsi:type="DashletHeaderStatic">
+									<rank>0</rank>
+									<title>Menu:ConfigManagement:Typology</title>
+									<icon>itop-structure/images/typology.png</icon>
+								</dashlet>
+								<dashlet id="9" xsi:type="DashletBadge">
+									<rank>8</rank>
+									<class>ContactType</class>
+								</dashlet>
+								<dashlet id="10" xsi:type="DashletBadge">
+									<rank>9</rank>
+									<class>DocumentType</class>
+								</dashlet>
+							</dashlets>
+						</cell>
+					</cells>
+				</definition>
+			</menu>
+			<menu id="TagAdminMenu" xsi:type="WebPageMenuNode" _delta="define">
+				<rank>100</rank>
+				<parent>Catalogs</parent>
+				<url>$pages/tagadmin.php</url>
+				<enable_class>TagSetFieldData</enable_class>
+				<enable_action>UR_ACTION_MODIFY</enable_action>
+			</menu>
+	</menus>
+</itop_design>
\ No newline at end of file
diff --git a/datamodels/2.x/itop-structure/de.dict.itop-structure.php b/datamodels/2.x/itop-structure/de.dict.itop-structure.php
new file mode 100644
index 000000000..6fdca2673
--- /dev/null
+++ b/datamodels/2.x/itop-structure/de.dict.itop-structure.php
@@ -0,0 +1,361 @@
+<?php
+// Copyright (C) 2010-2014 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses
+/**
+* @author Benjamin Planque <benjamin.planque@combodo.com>
+* @author ITOMIG GmbH <martin.raenker@itomig.de>
+
+* @copyright     Copyright (C) 2017 Combodo SARL
+* @licence	http://opensource.org/licenses/AGPL-3.0
+*
+*/
+
+//////////////////////////////////////////////////////////////////////
+// Relations
+//////////////////////////////////////////////////////////////////////
+//
+
+
+//////////////////////////////////////////////////////////////////////
+// Note: The classes have been grouped by categories: bizmodel
+//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+
+//
+// Class: Organization
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:Organization' => 'Organisation',
+	'Class:Organization+' => '',
+	'Class:Organization/Attribute:name' => 'Name',
+	'Class:Organization/Attribute:name+' => 'Gemeinsamer Name',
+	'Class:Organization/Attribute:code' => 'Kennziffer',
+	'Class:Organization/Attribute:code+' => 'Organisationskennziffer (D-U-N-S, Siret)',
+	'Class:Organization/Attribute:status' => 'Status',
+	'Class:Organization/Attribute:status+' => '',
+	'Class:Organization/Attribute:status/Value:active' => 'Aktiv',
+	'Class:Organization/Attribute:status/Value:active+' => 'Aktiv',
+	'Class:Organization/Attribute:status/Value:inactive' => 'Inaktiv',
+	'Class:Organization/Attribute:status/Value:inactive+' => 'Inaktiv',
+	'Class:Organization/Attribute:parent_id' => 'Mutterfirma',
+	'Class:Organization/Attribute:parent_id+' => 'Dachorganisation',
+	'Class:Organization/Attribute:parent_name' => 'Name der Mutterfirma',
+	'Class:Organization/Attribute:parent_name+' => 'Name der Mutterfirma',
+	'Class:Organization/Attribute:deliverymodel_id' => 'Delivery-Modell',
+	'Class:Organization/Attribute:deliverymodel_id+' => '',
+	'Class:Organization/Attribute:deliverymodel_name' => 'Delivery-Modell-Name',
+	'Class:Organization/Attribute:deliverymodel_name+' => '',
+	'Class:Organization/Attribute:parent_id_friendlyname' => 'Parent',
+	'Class:Organization/Attribute:parent_id_friendlyname+' => '',
+	'Class:Organization/Attribute:overview' => 'Überblick',
+	'Organization:Overview:FunctionalCIs' => 'CIs dieser Organisation',
+	'Organization:Overview:FunctionalCIs:subtitle' => 'nach Typ',
+	'Organization:Overview:Users' => 'iTop Benutzer innerhalb dieser Organisation',
+));
+
+//
+// Class: Location
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:Location' => 'Standort',
+	'Class:Location+' => 'Jeder Typ von Standort: Region, Land, Stadt, Seite, Gebäude, Flur, Raum, Rack,...',
+	'Class:Location/Attribute:name' => 'Name',
+	'Class:Location/Attribute:name+' => '',
+	'Class:Location/Attribute:status' => 'Status',
+	'Class:Location/Attribute:status+' => '',
+	'Class:Location/Attribute:status/Value:active' => 'Aktiv',
+	'Class:Location/Attribute:status/Value:active+' => 'Aktiv',
+	'Class:Location/Attribute:status/Value:inactive' => 'Inaktiv',
+	'Class:Location/Attribute:status/Value:inactive+' => 'Inaktiv',
+	'Class:Location/Attribute:org_id' => 'Organisation',
+	'Class:Location/Attribute:org_id+' => '',
+	'Class:Location/Attribute:org_name' => 'Name der Organisation',
+	'Class:Location/Attribute:org_name+' => '',
+	'Class:Location/Attribute:address' => 'Adresse',
+	'Class:Location/Attribute:address+' => 'Postanschrift',
+	'Class:Location/Attribute:postal_code' => 'Postleitzahl',
+	'Class:Location/Attribute:postal_code+' => 'Postleitzahl',
+	'Class:Location/Attribute:city' => 'Stadt',
+	'Class:Location/Attribute:city+' => '',
+	'Class:Location/Attribute:country' => 'Land',
+	'Class:Location/Attribute:country+' => '',
+	'Class:Location/Attribute:physicaldevice_list' => 'Geräte',
+	'Class:Location/Attribute:physicaldevice_list+' => '',
+	'Class:Location/Attribute:person_list' => 'Kontakte',
+	'Class:Location/Attribute:person_list+' => '',
+));
+
+//
+// Class: Contact
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:Contact' => 'Kontakt',
+	'Class:Contact+' => '',
+	'Class:Contact/Attribute:name' => 'Name',
+	'Class:Contact/Attribute:name+' => '',
+	'Class:Contact/Attribute:status' => 'Status',
+	'Class:Contact/Attribute:status+' => '',
+	'Class:Contact/Attribute:status/Value:active' => 'Aktiv',
+	'Class:Contact/Attribute:status/Value:active+' => 'Aktiv',
+	'Class:Contact/Attribute:status/Value:inactive' => 'Inaktiv',
+	'Class:Contact/Attribute:status/Value:inactive+' => 'Inaktiv',
+	'Class:Contact/Attribute:org_id' => 'Organisation',
+	'Class:Contact/Attribute:org_id+' => '',
+	'Class:Contact/Attribute:org_name' => 'Organisation',
+	'Class:Contact/Attribute:org_name+' => '',
+	'Class:Contact/Attribute:email' => 'Email',
+	'Class:Contact/Attribute:email+' => '',
+	'Class:Contact/Attribute:phone' => 'Telefonnummer',
+	'Class:Contact/Attribute:phone+' => '',
+	'Class:Contact/Attribute:notify' => 'Benachrichtigung',
+	'Class:Contact/Attribute:notify+' => '',
+	'Class:Contact/Attribute:notify/Value:no' => 'Nein',
+	'Class:Contact/Attribute:notify/Value:no+' => '',
+	'Class:Contact/Attribute:notify/Value:yes' => 'Ja',
+	'Class:Contact/Attribute:notify/Value:yes+' => '',
+	'Class:Contact/Attribute:function' => 'Funktion',
+	'Class:Contact/Attribute:function+' => '',
+	'Class:Contact/Attribute:cis_list' => 'CIs',
+	'Class:Contact/Attribute:cis_list+' => '',
+	'Class:Contact/Attribute:finalclass' => 'Typ',
+	'Class:Contact/Attribute:finalclass+' => '',
+));
+
+//
+// Class: Person
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:Person' => 'Person',
+	'Class:Person+' => '',
+	'Class:Person/Attribute:name' => 'Name',
+	'Class:Person/Attribute:name+' => '',
+	'Class:Person/Attribute:first_name' => 'Vorname',
+	'Class:Person/Attribute:first_name+' => '',
+	'Class:Person/Attribute:employee_number' => 'Personalnummer',
+	'Class:Person/Attribute:employee_number+' => '',
+	'Class:Person/Attribute:mobile_phone' => 'Mobiltelefone',
+	'Class:Person/Attribute:mobile_phone+' => '',
+	'Class:Person/Attribute:location_id' => 'Standort',
+	'Class:Person/Attribute:location_id+' => '',
+	'Class:Person/Attribute:location_name' => 'Standortname',
+	'Class:Person/Attribute:location_name+' => '',
+	'Class:Person/Attribute:manager_id' => 'Manager',
+	'Class:Person/Attribute:manager_id+' => '',
+	'Class:Person/Attribute:manager_name' => 'Manager-Name',
+	'Class:Person/Attribute:manager_name+' => '',
+	'Class:Person/Attribute:team_list' => 'Teams',
+	'Class:Person/Attribute:team_list+' => '',
+	'Class:Person/Attribute:tickets_list' => 'Tickets',
+	'Class:Person/Attribute:tickets_list+' => '',
+	'Class:Person/Attribute:manager_id_friendlyname' => 'Manager Friendly Name',
+	'Class:Person/Attribute:manager_id_friendlyname+' => '',
+	'Class:Person/Attribute:picture' => 'Bild',
+	'Class:Person/Attribute:picture+' => '',
+	'Class:Person/UniquenessRule:employee_number+' => 'Die Personalnummer muss innerhalb dieser Organisation eindeutig sein.',
+	'Class:Person/UniquenessRule:employee_number' => 'In der Organisation \'$this->org_name$\' existiert bereits eine Person mit der gleichen Personalnummer',
+	'Class:Person/UniquenessRule:name+' => 'Innerhalb einer Organisation muss der Name einer Person eindeutig sein',
+	'Class:Person/UniquenessRule:name' => 'In der Organisation \'$this->org_name$\' existiert bereits eine Person mit dem gleichen Namen',
+));
+
+//
+// Class: Team
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:Team' => 'Team',
+	'Class:Team+' => '',
+	'Class:Team/Attribute:persons_list' => 'Mitglieder',
+	'Class:Team/Attribute:persons_list+' => '',
+	'Class:Team/Attribute:tickets_list' => 'Tickets',
+	'Class:Team/Attribute:tickets_list+' => '',
+));
+
+//
+// Class: Document
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:Document' => 'Dokument',
+	'Class:Document+' => '',
+	'Class:Document/Attribute:name' => 'Name',
+	'Class:Document/Attribute:name+' => '',
+	'Class:Document/Attribute:org_id' => 'Organisation',
+	'Class:Document/Attribute:org_id+' => '',
+	'Class:Document/Attribute:org_name' => 'Organisationsname',
+	'Class:Document/Attribute:org_name+' => '',
+	'Class:Document/Attribute:documenttype_id' => 'Dokumenttyp',
+	'Class:Document/Attribute:documenttype_id+' => '',
+	'Class:Document/Attribute:documenttype_name' => 'Dokumenttypname',
+	'Class:Document/Attribute:documenttype_name+' => '',
+	'Class:Document/Attribute:version' => 'Version',
+	'Class:Document/Attribute:version+' => '',
+	'Class:Document/Attribute:description' => 'Beschreibung',
+	'Class:Document/Attribute:description+' => '',
+	'Class:Document/Attribute:status' => 'Status',
+	'Class:Document/Attribute:status+' => '',
+	'Class:Document/Attribute:status/Value:draft' => 'Entwurf',
+	'Class:Document/Attribute:status/Value:draft+' => '',
+	'Class:Document/Attribute:status/Value:obsolete' => 'Obsolet (Veraltet)',
+	'Class:Document/Attribute:status/Value:obsolete+' => '',
+	'Class:Document/Attribute:status/Value:published' => 'Veröffentlicht',
+	'Class:Document/Attribute:status/Value:published+' => '',
+	'Class:Document/Attribute:cis_list' => 'CIs',
+	'Class:Document/Attribute:cis_list+' => '',
+	'Class:Document/Attribute:contracts_list' => 'Verträge',
+	'Class:Document/Attribute:contracts_list+' => '',
+	'Class:Document/Attribute:services_list' => 'Services',
+	'Class:Document/Attribute:services_list+' => '',
+	'Class:Document/Attribute:finalclass' => 'Dokumenttyp',
+	'Class:Document/Attribute:finalclass+' => '',
+));
+
+//
+// Class: DocumentFile
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:DocumentFile' => 'Dokument (Datei)',
+	'Class:DocumentFile+' => '',
+	'Class:DocumentFile/Attribute:file' => 'Datei',
+	'Class:DocumentFile/Attribute:file+' => '',
+));
+
+//
+// Class: DocumentNote
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:DocumentNote' => 'Dokument (Notiz)',
+	'Class:DocumentNote+' => '',
+	'Class:DocumentNote/Attribute:text' => 'Text',
+	'Class:DocumentNote/Attribute:text+' => '',
+));
+
+//
+// Class: DocumentWeb
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:DocumentWeb' => 'Dokument (Web)',
+	'Class:DocumentWeb+' => '',
+	'Class:DocumentWeb/Attribute:url' => 'URL',
+	'Class:DocumentWeb/Attribute:url+' => '',
+));
+
+//
+// Class: Typology
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:Typology' => 'Typologie',
+	'Class:Typology+' => '',
+	'Class:Typology/Attribute:name' => 'Name',
+	'Class:Typology/Attribute:name+' => '',
+	'Class:Typology/Attribute:finalclass' => 'Typ',
+	'Class:Typology/Attribute:finalclass+' => '',
+));
+
+//
+// Class: DocumentType
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:DocumentType' => 'Dokumentyp',
+	'Class:DocumentType+' => '',
+));
+
+//
+// Class: ContactType
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:ContactType' => 'Kontakttyp',
+	'Class:ContactType+' => '',
+));
+
+//
+// Class: lnkPersonToTeam
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:lnkPersonToTeam' => 'Verknüpfung Person/Team',
+	'Class:lnkPersonToTeam+' => '',
+	'Class:lnkPersonToTeam/Attribute:team_id' => 'Team',
+	'Class:lnkPersonToTeam/Attribute:team_id+' => '',
+	'Class:lnkPersonToTeam/Attribute:team_name' => 'Teamname',
+	'Class:lnkPersonToTeam/Attribute:team_name+' => '',
+	'Class:lnkPersonToTeam/Attribute:person_id' => 'Person',
+	'Class:lnkPersonToTeam/Attribute:person_id+' => '',
+	'Class:lnkPersonToTeam/Attribute:person_name' => 'Personenname',
+	'Class:lnkPersonToTeam/Attribute:person_name+' => '',
+	'Class:lnkPersonToTeam/Attribute:role_id' => 'Rolle',
+	'Class:lnkPersonToTeam/Attribute:role_id+' => '',
+	'Class:lnkPersonToTeam/Attribute:role_name' => 'Rollenname',
+	'Class:lnkPersonToTeam/Attribute:role_name+' => '',
+));
+
+//
+// Application Menu
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Menu:DataAdministration' => 'Data Management',
+	'Menu:DataAdministration+' => 'Data Management',
+	'Menu:Catalogs' => 'Kataloge',
+	'Menu:Catalogs+' => 'Datentypen',
+	'Menu:Audit' => 'Audit',
+	'Menu:Audit+' => 'Audit',
+	'Menu:CSVImport' => 'CSV-Import',
+	'Menu:CSVImport+' => 'Massenerstellung oder -aktualisierung',
+	'Menu:Organization' => 'Organisationen',
+	'Menu:Organization+' => 'Alle Organisationen',
+	'Menu:ConfigManagement' => 'Configuration Management',
+	'Menu:ConfigManagement+' => 'Configuration Management',
+	'Menu:ConfigManagementOverview' => 'Übersicht',
+	'Menu:ConfigManagementOverview+' => 'Übersicht',
+	'Menu:Contact' => 'Kontakte',
+	'Menu:Contact+' => 'Kontakte',
+	'Menu:Contact:Count' => '%1$d Kontakte',
+	'Menu:Person' => 'Personen',
+	'Menu:Person+' => 'Alle Personen',
+	'Menu:Team' => 'Teams',
+	'Menu:Team+' => 'Alle Teams',
+	'Menu:Document' => 'Dokumente',
+	'Menu:Document+' => 'Alle Dokumente',
+	'Menu:Location' => 'Standorte',
+	'Menu:Location+' => 'Alle Standorte',
+	'Menu:NewContact' => 'Neuer Kontakt',
+	'Menu:NewContact+' => 'Neuer Kontakt',
+	'Menu:SearchContacts' => 'Nach Kontakten suchen',
+	'Menu:SearchContacts+' => 'Nach Kontakten suchen',
+	'Menu:ConfigManagement:Shortcuts' => 'Shortcuts',
+	'Menu:ConfigManagement:AllContacts' => 'Alle Kontakte: %1$d',
+	'Menu:Typology' => 'Typologie-Konfiguration',
+	'Menu:Typology+' => '',
+	'UI_WelcomeMenu_AllConfigItems' => 'Zusammenfassung',
+	'Menu:ConfigManagement:Typology' => 'Typologie-Konfiguration',
+));
+
+?>
\ No newline at end of file
diff --git a/datamodels/2.x/itop-structure/en.dict.itop-structure.php b/datamodels/2.x/itop-structure/en.dict.itop-structure.php
new file mode 100644
index 000000000..f81435ce5
--- /dev/null
+++ b/datamodels/2.x/itop-structure/en.dict.itop-structure.php
@@ -0,0 +1,398 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2018 Combodo SARL
+ * @license    http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with iTop. If not, see <http://www.gnu.org/licenses/>
+ */
+
+//////////////////////////////////////////////////////////////////////
+// Relations
+//////////////////////////////////////////////////////////////////////
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Relation:impacts/Description' => 'Elements impacted by',
+	'Relation:impacts/DownStream' => 'Impacts...',
+	'Relation:impacts/DownStream+' => 'Elements impacted by',
+	'Relation:impacts/UpStream' => 'Depends on......',
+	'Relation:impacts/UpStream+' => 'Elements impacting',
+	// Legacy entries
+	'Relation:depends on/Description' => 'Elements impacting',
+	'Relation:depends on/DownStream' => 'Depends on...',
+	'Relation:depends on/UpStream' => 'Impacts...',
+));
+
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+// Class:<class_name>/UniquenessRule:<rule_code>
+// Class:<class_name>/UniquenessRule:<rule_code>+
+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+// Class:<class_name>/UniquenessRule:<rule_code>
+// Class:<class_name>/UniquenessRule:<rule_code>+
+
+//////////////////////////////////////////////////////////////////////
+// Note: The classes have been grouped by categories: bizmodel
+//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+
+//
+// Class: Organization
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:Organization' => 'Organization',
+	'Class:Organization+' => '',
+	'Class:Organization/Attribute:name' => 'Name',
+	'Class:Organization/Attribute:name+' => 'Common name',
+	'Class:Organization/Attribute:code' => 'Code',
+	'Class:Organization/Attribute:code+' => 'Organization code (Siret, DUNS,...)',
+	'Class:Organization/Attribute:status' => 'Status',
+	'Class:Organization/Attribute:status+' => '',
+	'Class:Organization/Attribute:status/Value:active' => 'Active',
+	'Class:Organization/Attribute:status/Value:active+' => 'Active',
+	'Class:Organization/Attribute:status/Value:inactive' => 'Inactive',
+	'Class:Organization/Attribute:status/Value:inactive+' => 'Inactive',
+	'Class:Organization/Attribute:parent_id' => 'Parent',
+	'Class:Organization/Attribute:parent_id+' => 'Parent organization',
+	'Class:Organization/Attribute:parent_name' => 'Parent name',
+	'Class:Organization/Attribute:parent_name+' => 'Name of the parent organization',
+	'Class:Organization/Attribute:deliverymodel_id' => 'Delivery model',
+	'Class:Organization/Attribute:deliverymodel_id+' => '',
+	'Class:Organization/Attribute:deliverymodel_name' => 'Delivery model name',
+	'Class:Organization/Attribute:deliverymodel_name+' => '',
+	'Class:Organization/Attribute:parent_id_friendlyname' => 'Parent',
+	'Class:Organization/Attribute:parent_id_friendlyname+' => 'Parent organization',
+	'Class:Organization/Attribute:overview' => 'Overview',
+	'Organization:Overview:FunctionalCIs' => 'Configuration items of this organization',
+	'Organization:Overview:FunctionalCIs:subtitle' => 'by type',
+	'Organization:Overview:Users' => 'iTop Users within this organization',
+));
+
+//
+// Class: Location
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:Location' => 'Location',
+	'Class:Location+' => 'Any type of location: Region, Country, City, Site, Building, Floor, Room, Rack,...',
+	'Class:Location/Attribute:name' => 'Name',
+	'Class:Location/Attribute:name+' => '',
+	'Class:Location/Attribute:status' => 'Status',
+	'Class:Location/Attribute:status+' => '',
+	'Class:Location/Attribute:status/Value:active' => 'Active',
+	'Class:Location/Attribute:status/Value:active+' => 'Active',
+	'Class:Location/Attribute:status/Value:inactive' => 'Inactive',
+	'Class:Location/Attribute:status/Value:inactive+' => 'Inactive',
+	'Class:Location/Attribute:org_id' => 'Owner organization',
+	'Class:Location/Attribute:org_id+' => '',
+	'Class:Location/Attribute:org_name' => 'Name of the owner organization',
+	'Class:Location/Attribute:org_name+' => '',
+	'Class:Location/Attribute:address' => 'Address',
+	'Class:Location/Attribute:address+' => 'Postal address',
+	'Class:Location/Attribute:postal_code' => 'Postal code',
+	'Class:Location/Attribute:postal_code+' => 'ZIP/Postal code',
+	'Class:Location/Attribute:city' => 'City',
+	'Class:Location/Attribute:city+' => '',
+	'Class:Location/Attribute:country' => 'Country',
+	'Class:Location/Attribute:country+' => '',
+	'Class:Location/Attribute:physicaldevice_list' => 'Devices',
+	'Class:Location/Attribute:physicaldevice_list+' => 'All the devices in this location',
+	'Class:Location/Attribute:person_list' => 'Contacts',
+	'Class:Location/Attribute:person_list+' => 'All the contacts located on this location',
+));
+
+//
+// Class: Contact
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:Contact' => 'Contact',
+	'Class:Contact+' => '',
+	'Class:Contact/Attribute:name' => 'Name',
+	'Class:Contact/Attribute:name+' => '',
+	'Class:Contact/Attribute:status' => 'Status',
+	'Class:Contact/Attribute:status+' => '',
+	'Class:Contact/Attribute:status/Value:active' => 'Active',
+	'Class:Contact/Attribute:status/Value:active+' => 'Active',
+	'Class:Contact/Attribute:status/Value:inactive' => 'Inactive',
+	'Class:Contact/Attribute:status/Value:inactive+' => 'Inactive',
+	'Class:Contact/Attribute:org_id' => 'Organization',
+	'Class:Contact/Attribute:org_id+' => '',
+	'Class:Contact/Attribute:org_name' => 'Organization name',
+	'Class:Contact/Attribute:org_name+' => '',
+	'Class:Contact/Attribute:email' => 'Email',
+	'Class:Contact/Attribute:email+' => '',
+	'Class:Contact/Attribute:phone' => 'Phone',
+	'Class:Contact/Attribute:phone+' => '',
+	'Class:Contact/Attribute:notify' => 'Notification',
+	'Class:Contact/Attribute:notify+' => '',
+	'Class:Contact/Attribute:notify/Value:no' => 'no',
+	'Class:Contact/Attribute:notify/Value:no+' => 'no',
+	'Class:Contact/Attribute:notify/Value:yes' => 'yes',
+	'Class:Contact/Attribute:notify/Value:yes+' => 'yes',
+	'Class:Contact/Attribute:function' => 'Function',
+	'Class:Contact/Attribute:function+' => '',
+	'Class:Contact/Attribute:cis_list' => 'CIs',
+	'Class:Contact/Attribute:cis_list+' => 'All the configuration items linked to this contact',
+	'Class:Contact/Attribute:finalclass' => 'Contact sub-class',
+	'Class:Contact/Attribute:finalclass+' => 'Name of the final class',
+));
+
+//
+// Class: Person
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:Person' => 'Person',
+	'Class:Person+' => '',
+	'Class:Person/Attribute:name' => 'Last Name',
+	'Class:Person/Attribute:name+' => '',
+	'Class:Person/Attribute:first_name' => 'First Name',
+	'Class:Person/Attribute:first_name+' => '',
+	'Class:Person/Attribute:employee_number' => 'Employee number',
+	'Class:Person/Attribute:employee_number+' => '',
+	'Class:Person/Attribute:mobile_phone' => 'Mobile phone',
+	'Class:Person/Attribute:mobile_phone+' => '',
+	'Class:Person/Attribute:location_id' => 'Location',
+	'Class:Person/Attribute:location_id+' => '',
+	'Class:Person/Attribute:location_name' => 'Location name',
+	'Class:Person/Attribute:location_name+' => '',
+	'Class:Person/Attribute:manager_id' => 'Manager',
+	'Class:Person/Attribute:manager_id+' => '',
+	'Class:Person/Attribute:manager_name' => 'Manager name',
+	'Class:Person/Attribute:manager_name+' => '',
+	'Class:Person/Attribute:team_list' => 'Teams',
+	'Class:Person/Attribute:team_list+' => 'All the teams this person belongs to',
+	'Class:Person/Attribute:tickets_list' => 'Tickets',
+	'Class:Person/Attribute:tickets_list+' => 'All the tickets this person is the caller',
+	'Class:Person/Attribute:manager_id_friendlyname' => 'Manager friendly name',
+	'Class:Person/Attribute:manager_id_friendlyname+' => '',
+	'Class:Person/Attribute:picture' => 'Picture',
+	'Class:Person/Attribute:picture+' => '',
+	'Class:Person/UniquenessRule:employee_number+' => 'The employee number must be unique in the organization',
+	'Class:Person/UniquenessRule:employee_number' => 'there is already a person in \'$this->org_name$\' organization with the same employee number',
+	'Class:Person/UniquenessRule:name+' => 'The employee name should be unique inside its organization',
+	'Class:Person/UniquenessRule:name' => 'There is already a person in \'$this->org_name$\' organization with the same name',
+));
+
+//
+// Class: Team
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:Team' => 'Team',
+	'Class:Team+' => '',
+	'Class:Team/Attribute:persons_list' => 'Members',
+	'Class:Team/Attribute:persons_list+' => 'All the people belonging to this team',
+	'Class:Team/Attribute:tickets_list' => 'Tickets',
+	'Class:Team/Attribute:tickets_list+' => 'All the tickets assigned to this team',
+));
+
+//
+// Class: Document
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:Document' => 'Document',
+	'Class:Document+' => '',
+	'Class:Document/Attribute:name' => 'Name',
+	'Class:Document/Attribute:name+' => '',
+	'Class:Document/Attribute:org_id' => 'Organization',
+	'Class:Document/Attribute:org_id+' => '',
+	'Class:Document/Attribute:org_name' => 'Organization name',
+	'Class:Document/Attribute:org_name+' => '',
+	'Class:Document/Attribute:documenttype_id' => 'Document type',
+	'Class:Document/Attribute:documenttype_id+' => '',
+	'Class:Document/Attribute:documenttype_name' => 'Document type name',
+	'Class:Document/Attribute:documenttype_name+' => '',
+	'Class:Document/Attribute:version' => 'Version',
+	'Class:Document/Attribute:version+' => '',
+	'Class:Document/Attribute:description' => 'Description',
+	'Class:Document/Attribute:description+' => '',
+	'Class:Document/Attribute:status' => 'Status',
+	'Class:Document/Attribute:status+' => '',
+	'Class:Document/Attribute:status/Value:draft' => 'Draft',
+	'Class:Document/Attribute:status/Value:draft+' => '',
+	'Class:Document/Attribute:status/Value:obsolete' => 'Obsolete',
+	'Class:Document/Attribute:status/Value:obsolete+' => '',
+	'Class:Document/Attribute:status/Value:published' => 'Published',
+	'Class:Document/Attribute:status/Value:published+' => '',
+	'Class:Document/Attribute:cis_list' => 'CIs',
+	'Class:Document/Attribute:cis_list+' => 'All the configuration items linked to this document',
+	'Class:Document/Attribute:contracts_list' => 'Contracts',
+	'Class:Document/Attribute:contracts_list+' => 'All the contracts linked to this document',
+	'Class:Document/Attribute:services_list' => 'Services',
+	'Class:Document/Attribute:services_list+' => 'All the services linked to this document',
+	'Class:Document/Attribute:finalclass' => 'Document sub-class',
+	'Class:Document/Attribute:finalclass+' => 'Name of the final class',
+));
+
+//
+// Class: DocumentFile
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:DocumentFile' => 'Document File',
+	'Class:DocumentFile+' => '',
+	'Class:DocumentFile/Attribute:file' => 'File',
+	'Class:DocumentFile/Attribute:file+' => '',
+));
+
+//
+// Class: DocumentNote
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:DocumentNote' => 'Document Note',
+	'Class:DocumentNote+' => '',
+	'Class:DocumentNote/Attribute:text' => 'Text',
+	'Class:DocumentNote/Attribute:text+' => '',
+));
+
+//
+// Class: DocumentWeb
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:DocumentWeb' => 'Document Web',
+	'Class:DocumentWeb+' => '',
+	'Class:DocumentWeb/Attribute:url' => 'URL',
+	'Class:DocumentWeb/Attribute:url+' => '',
+));
+
+//
+// Class: Typology
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:Typology' => 'Typology',
+	'Class:Typology+' => '',
+	'Class:Typology/Attribute:name' => 'Name',
+	'Class:Typology/Attribute:name+' => '',
+	'Class:Typology/Attribute:finalclass' => 'Typology sub-class',
+	'Class:Typology/Attribute:finalclass+' => 'Name of the final class',
+));
+
+//
+// Class: DocumentType
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:DocumentType' => 'Document Type',
+	'Class:DocumentType+' => '',
+));
+
+//
+// Class: ContactType
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:ContactType' => 'Contact Type',
+	'Class:ContactType+' => '',
+));
+
+//
+// Class: lnkPersonToTeam
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:lnkPersonToTeam' => 'Link Person / Team',
+	'Class:lnkPersonToTeam+' => '',
+	'Class:lnkPersonToTeam/Attribute:team_id' => 'Team',
+	'Class:lnkPersonToTeam/Attribute:team_id+' => '',
+	'Class:lnkPersonToTeam/Attribute:team_name' => 'Team name',
+	'Class:lnkPersonToTeam/Attribute:team_name+' => '',
+	'Class:lnkPersonToTeam/Attribute:person_id' => 'Person',
+	'Class:lnkPersonToTeam/Attribute:person_id+' => '',
+	'Class:lnkPersonToTeam/Attribute:person_name' => 'Person name',
+	'Class:lnkPersonToTeam/Attribute:person_name+' => '',
+	'Class:lnkPersonToTeam/Attribute:role_id' => 'Role',
+	'Class:lnkPersonToTeam/Attribute:role_id+' => '',
+	'Class:lnkPersonToTeam/Attribute:role_name' => 'Role name',
+	'Class:lnkPersonToTeam/Attribute:role_name+' => '',
+));
+
+//
+// Application Menu
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Menu:DataAdministration' => 'Data administration',
+	'Menu:DataAdministration+' => 'Data administration',
+	'Menu:Catalogs' => 'Catalogs',
+	'Menu:Catalogs+' => 'Data types',
+	'Menu:Audit' => 'Audit',
+	'Menu:Audit+' => 'Audit',
+	'Menu:CSVImport' => 'CSV import',
+	'Menu:CSVImport+' => 'Bulk creation or update',
+	'Menu:Organization' => 'Organizations',
+	'Menu:Organization+' => 'All organizations',
+	'Menu:ConfigManagement' => 'Configuration Management',
+	'Menu:ConfigManagement+' => 'Configuration Management',
+	'Menu:ConfigManagementOverview' => 'Overview',
+	'Menu:ConfigManagementOverview+' => 'Overview',
+	'Menu:Contact' => 'Contacts',
+	'Menu:Contact+' => 'Contacts',
+	'Menu:Contact:Count' => '%1$d contacts',
+	'Menu:Person' => 'Persons',
+	'Menu:Person+' => 'All persons',
+	'Menu:Team' => 'Teams',
+	'Menu:Team+' => 'All teams',
+	'Menu:Document' => 'Documents',
+	'Menu:Document+' => 'All documents',
+	'Menu:Location' => 'Locations',
+	'Menu:Location+' => 'All locations',
+	'Menu:NewContact' => 'New contact',
+	'Menu:NewContact+' => 'New contact',
+	'Menu:SearchContacts' => 'Search for contacts',
+	'Menu:SearchContacts+' => 'Search for contacts',
+	'Menu:ConfigManagement:Shortcuts' => 'Shortcuts',
+	'Menu:ConfigManagement:AllContacts' => 'All contacts: %1$d',
+	'Menu:Typology' => 'Typology configuration',
+	'Menu:Typology+' => 'Typology configuration',
+	'UI_WelcomeMenu_AllConfigItems' => 'Summary',
+	'Menu:ConfigManagement:Typology' => 'Typology configuration',
+));
+
diff --git a/datamodels/2.x/itop-structure/es_cr.dict.itop-structure.php b/datamodels/2.x/itop-structure/es_cr.dict.itop-structure.php
new file mode 100644
index 000000000..a900d3aad
--- /dev/null
+++ b/datamodels/2.x/itop-structure/es_cr.dict.itop-structure.php
@@ -0,0 +1,355 @@
+<?php
+// Copyright (C) 2010-2013 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+ * Localized data
+ * @author      Benjamin Planque <benjamin.planque@combodo.com>
+ * @copyright   Copyright (C) 2010-2013 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ * @traductor   Miguel Turrubiates <miguel_tf@yahoo.com>
+ */
+
+//////////////////////////////////////////////////////////////////////
+// Note: The classes have been grouped by categories: bizmodel
+//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+
+//
+// Class: Organization
+//
+
+Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+	'Class:Organization' => 'Organización',
+	'Class:Organization+' => 'Organización',
+	'Class:Organization/Attribute:name' => 'Nombre',
+	'Class:Organization/Attribute:name+' => 'Nombre de la Organización',
+	'Class:Organization/Attribute:code' => 'Código',
+	'Class:Organization/Attribute:code+' => 'Código de Organización  (RFC, DUNS, Siret, etc.)',
+	'Class:Organization/Attribute:status' => 'Estatus',
+	'Class:Organization/Attribute:status+' => 'Estatus',
+	'Class:Organization/Attribute:status/Value:active' => 'Activo',
+	'Class:Organization/Attribute:status/Value:active+' => 'Activo',
+	'Class:Organization/Attribute:status/Value:inactive' => 'Inactivo',
+	'Class:Organization/Attribute:status/Value:inactive+' => 'Inactivo',
+	'Class:Organization/Attribute:parent_id' => 'Padre',
+	'Class:Organization/Attribute:parent_id+' => 'Organización Padre',
+	'Class:Organization/Attribute:parent_name' => 'Organización Padre',
+	'Class:Organization/Attribute:parent_name+' => 'Nombre de la Organización Padre',
+	'Class:Organization/Attribute:deliverymodel_id' => 'Modelo de Entrega',
+	'Class:Organization/Attribute:deliverymodel_id+' => 'Modelo de Entrega',
+	'Class:Organization/Attribute:deliverymodel_name' => 'Nombre del Modelo de Entrega',
+	'Class:Organization/Attribute:deliverymodel_name+' => 'Nombre del Modelo de Entrega',
+	'Class:Organization/Attribute:parent_id_friendlyname' => 'Organización Padre',
+	'Class:Organization/Attribute:parent_id_friendlyname+' => 'Organización Padre',
+	'Class:Organization/Attribute:overview' => 'Overview~~',
+	'Organization:Overview:FunctionalCIs' => 'Configuration items of this organization~~',
+	'Organization:Overview:FunctionalCIs:subtitle' => 'by type~~',
+	'Organization:Overview:Users' => 'iTop Users within this organization~~',
+));
+
+//
+// Class: Location
+//
+
+Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+	'Class:Location' => 'Localidad',
+	'Class:Location+' => 'Cualquier Tipo de Localidad: Región, País, Ciudad, Sitio, Edificio, Piso, Cuarto, Rack,...',
+	'Class:Location/Attribute:name' => 'Nombre',
+	'Class:Location/Attribute:name+' => 'Nombre de Localidad',
+	'Class:Location/Attribute:status' => 'Estatus',
+	'Class:Location/Attribute:status+' => 'Estatus de Localidad',
+	'Class:Location/Attribute:status/Value:active' => 'Activo',
+	'Class:Location/Attribute:status/Value:active+' => 'Activo',
+	'Class:Location/Attribute:status/Value:inactive' => 'Inactivo',
+	'Class:Location/Attribute:status/Value:inactive+' => 'Inactivo',
+	'Class:Location/Attribute:org_id' => 'Organización',
+	'Class:Location/Attribute:org_id+' => 'Organización',
+	'Class:Location/Attribute:org_name' => 'Nombre de la Organización',
+	'Class:Location/Attribute:org_name+' => 'Nombre de la Organización',
+	'Class:Location/Attribute:address' => 'Dirección',
+	'Class:Location/Attribute:address+' => 'Dirección Postal',
+	'Class:Location/Attribute:postal_code' => 'Código Postal',
+	'Class:Location/Attribute:postal_code+' => 'ZIP/Código Postal',
+	'Class:Location/Attribute:city' => 'Ciudad',
+	'Class:Location/Attribute:city+' => 'Ciudad',
+	'Class:Location/Attribute:country' => 'País',
+	'Class:Location/Attribute:country+' => 'País',
+	'Class:Location/Attribute:physicaldevice_list' => 'Dispositivos',
+	'Class:Location/Attribute:physicaldevice_list+' => 'Dispositivos',
+	'Class:Location/Attribute:person_list' => 'Contactos',
+	'Class:Location/Attribute:person_list+' => 'Contactos',
+));
+
+//
+// Class: Contact
+//
+
+Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+	'Class:Contact' => 'Contacto',
+	'Class:Contact+' => 'Contacto',
+	'Class:Contact/Attribute:name' => 'Nombre',
+	'Class:Contact/Attribute:name+' => 'Nombre del Contacto',
+	'Class:Contact/Attribute:status' => 'Estatus',
+	'Class:Contact/Attribute:status+' => 'Estatus',
+	'Class:Contact/Attribute:status/Value:active' => 'Activo',
+	'Class:Contact/Attribute:status/Value:active+' => 'Activo',
+	'Class:Contact/Attribute:status/Value:inactive' => 'Inactivo',
+	'Class:Contact/Attribute:status/Value:inactive+' => 'Inactivo',
+	'Class:Contact/Attribute:org_id' => 'Organización',
+	'Class:Contact/Attribute:org_id+' => 'Organización',
+	'Class:Contact/Attribute:org_name' => 'Organización',
+	'Class:Contact/Attribute:org_name+' => 'Organización',
+	'Class:Contact/Attribute:email' => 'Correo Electrónico',
+	'Class:Contact/Attribute:email+' => 'Correo Electrónico',
+	'Class:Contact/Attribute:phone' => 'Teléfono',
+	'Class:Contact/Attribute:phone+' => 'Teléfono',
+	'Class:Contact/Attribute:notify' => 'Notificación',
+	'Class:Contact/Attribute:notify+' => 'Notificación',
+	'Class:Contact/Attribute:notify/Value:no' => 'No',
+	'Class:Contact/Attribute:notify/Value:no+' => 'No',
+	'Class:Contact/Attribute:notify/Value:yes' => 'Si',
+	'Class:Contact/Attribute:notify/Value:yes+' => 'Si',
+	'Class:Contact/Attribute:function' => 'Función',
+	'Class:Contact/Attribute:function+' => 'Función',
+	'Class:Contact/Attribute:cis_list' => 'ECs',
+	'Class:Contact/Attribute:cis_list+' => 'Elementos de Configuración relacionados con el contacto',
+	'Class:Contact/Attribute:finalclass' => 'Clase',
+	'Class:Contact/Attribute:finalclass+' => 'Clase',
+));
+
+//
+// Class: Person
+//
+
+Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+	'Class:Person' => 'Persona',
+	'Class:Person+' => 'Persona',
+	'Class:Person/Attribute:name' => 'Apellidos',
+	'Class:Person/Attribute:name+' => 'Apellidos',
+	'Class:Person/Attribute:first_name' => 'Nombre',
+	'Class:Person/Attribute:first_name+' => 'Nombre de la Persona',
+	'Class:Person/Attribute:employee_number' => 'Número de Empleado',
+	'Class:Person/Attribute:employee_number+' => 'Número de Empleado',
+	'Class:Person/Attribute:mobile_phone' => 'Móvil',
+	'Class:Person/Attribute:mobile_phone+' => 'Móvil',
+	'Class:Person/Attribute:location_id' => 'Localidad',
+	'Class:Person/Attribute:location_id+' => 'Localidad',
+	'Class:Person/Attribute:location_name' => 'Nombre de Localidad',
+	'Class:Person/Attribute:location_name+' => 'Nombre de Localidad',
+	'Class:Person/Attribute:manager_id' => 'Jefe',
+	'Class:Person/Attribute:manager_id+' => 'Jefe',
+	'Class:Person/Attribute:manager_name' => 'Nombre del Jefe',
+	'Class:Person/Attribute:manager_name+' => 'Nombre del Jefe',
+	'Class:Person/Attribute:team_list' => 'Grupos',
+	'Class:Person/Attribute:team_list+' => 'Grupos',
+	'Class:Person/Attribute:tickets_list' => 'Tickets',
+	'Class:Person/Attribute:tickets_list+' => 'Tickets',
+	'Class:Person/Attribute:manager_id_friendlyname' => 'Nombre del Jefe',
+	'Class:Person/Attribute:manager_id_friendlyname+' => 'Nombre del Jefe',
+	'Class:Person/Attribute:picture' => 'Fotografía',
+	'Class:Person/Attribute:picture+' => 'Fotografía',
+	'Class:Person/UniquenessRule:employee_number+' => 'The employee number must be unique in the organization~~',
+	'Class:Person/UniquenessRule:employee_number' => 'there is already a person in \'$this->org_name$\' organization with the same employee number~~',
+	'Class:Person/UniquenessRule:name+' => 'The employee name should be unique inside its organization~~',
+	'Class:Person/UniquenessRule:name' => 'There is already a person in \'$this->org_name$\' organization with the same name~~',
+));
+
+//
+// Class: Team
+//
+
+Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+	'Class:Team' => 'Grupo de Trabajo',
+	'Class:Team+' => 'Grupo de Trabajo',
+	'Class:Team/Attribute:persons_list' => 'Miembros',
+	'Class:Team/Attribute:persons_list+' => 'Miembros',
+	'Class:Team/Attribute:tickets_list' => 'Tickets',
+	'Class:Team/Attribute:tickets_list+' => 'Tickets',
+));
+
+//
+// Class: Document
+//
+
+Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+	'Class:Document' => 'Documento',
+	'Class:Document+' => 'Documento',
+	'Class:Document/Attribute:name' => 'Nombre',
+	'Class:Document/Attribute:name+' => 'Nombre del Documento',
+	'Class:Document/Attribute:org_id' => 'Organización',
+	'Class:Document/Attribute:org_id+' => 'Organización',
+	'Class:Document/Attribute:org_name' => 'Nombre de la Organización',
+	'Class:Document/Attribute:org_name+' => 'Nombre de la Organización',
+	'Class:Document/Attribute:documenttype_id' => 'Tipo de Documento',
+	'Class:Document/Attribute:documenttype_id+' => 'Tipo de Documento',
+	'Class:Document/Attribute:documenttype_name' => 'Tipo de Documento',
+	'Class:Document/Attribute:documenttype_name+' => 'Tipo de Documento',
+	'Class:Document/Attribute:version' => 'Versión',
+	'Class:Document/Attribute:version+' => 'Versión',
+	'Class:Document/Attribute:description' => 'Descripción',
+	'Class:Document/Attribute:description+' => 'Descripción',
+	'Class:Document/Attribute:status' => 'Estatus',
+	'Class:Document/Attribute:status+' => 'Estatus',
+	'Class:Document/Attribute:status/Value:draft' => 'Borrador de Documento',
+	'Class:Document/Attribute:status/Value:draft+' => 'Borrador de Documento',
+	'Class:Document/Attribute:status/Value:obsolete' => 'Obsoleto',
+	'Class:Document/Attribute:status/Value:obsolete+' => 'Obsoleto',
+	'Class:Document/Attribute:status/Value:published' => 'Publicado',
+	'Class:Document/Attribute:status/Value:published+' => 'Publicado',
+	'Class:Document/Attribute:cis_list' => 'ECs',
+	'Class:Document/Attribute:cis_list+' => 'Elementos de Configuración referenciados en este documento',
+	'Class:Document/Attribute:contracts_list' => 'Contratos',
+	'Class:Document/Attribute:contracts_list+' => 'Contratos Referenciados con este Documento',
+	'Class:Document/Attribute:services_list' => 'Servicios',
+	'Class:Document/Attribute:services_list+' => 'Servicios Referenciados con este Documento',
+	'Class:Document/Attribute:finalclass' => 'Tipo de Documento',
+	'Class:Document/Attribute:finalclass+' => 'Tipo de Documento',
+));
+
+//
+// Class: DocumentFile
+//
+
+Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+	'Class:DocumentFile' => 'Documento de Archivo',
+	'Class:DocumentFile+' => '~~',
+	'Class:DocumentFile/Attribute:file' => 'Archivo',
+	'Class:DocumentFile/Attribute:file+' => 'Archivo',
+));
+
+//
+// Class: DocumentNote
+//
+
+Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+	'Class:DocumentNote' => 'Nota',
+	'Class:DocumentNote+' => 'Nota',
+	'Class:DocumentNote/Attribute:text' => 'Texto',
+	'Class:DocumentNote/Attribute:text+' => 'Texto',
+));
+
+//
+// Class: DocumentWeb
+//
+
+Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+	'Class:DocumentWeb' => 'Documento Web',
+	'Class:DocumentWeb+' => 'Documento disponible en otro servidor Web',
+	'Class:DocumentWeb/Attribute:url' => 'URL',
+	'Class:DocumentWeb/Attribute:url+' => 'URL de Internet',
+));
+
+//
+// Class: Typology
+//
+
+Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+	'Class:Typology' => 'Tipología',
+	'Class:Typology+' => 'Tipología',
+	'Class:Typology/Attribute:name' => 'Nombre',
+	'Class:Typology/Attribute:name+' => 'Nombre del Tipo',
+	'Class:Typology/Attribute:finalclass' => 'Clase',
+	'Class:Typology/Attribute:finalclass+' => 'Clase',
+));
+
+//
+// Class: DocumentType
+//
+
+Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+	'Class:DocumentType' => 'Tipo de Documento',
+	'Class:DocumentType+' => 'Tipo de Documento',
+));
+
+//
+// Class: ContactType
+//
+
+Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+	'Class:ContactType' => 'Tipo de Contacto',
+	'Class:ContactType+' => 'Tipo de Contacto',
+));
+
+//
+// Class: lnkPersonToTeam
+//
+
+Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+	'Class:lnkPersonToTeam' => 'Relación Persona y Grupo',
+	'Class:lnkPersonToTeam+' => 'Relación Persona y Grupo',
+	'Class:lnkPersonToTeam/Attribute:team_id' => 'Grupo',
+	'Class:lnkPersonToTeam/Attribute:team_id+' => 'Grupo',
+	'Class:lnkPersonToTeam/Attribute:team_name' => 'Grupo',
+	'Class:lnkPersonToTeam/Attribute:team_name+' => 'Grupo',
+	'Class:lnkPersonToTeam/Attribute:person_id' => 'Persona',
+	'Class:lnkPersonToTeam/Attribute:person_id+' => 'Persona',
+	'Class:lnkPersonToTeam/Attribute:person_name' => 'Persona',
+	'Class:lnkPersonToTeam/Attribute:person_name+' => 'Persona',
+	'Class:lnkPersonToTeam/Attribute:role_id' => 'Rol',
+	'Class:lnkPersonToTeam/Attribute:role_id+' => 'Rol',
+	'Class:lnkPersonToTeam/Attribute:role_name' => 'Rol',
+	'Class:lnkPersonToTeam/Attribute:role_name+' => 'Rol',
+));
+
+
+//
+// Application Menu
+//
+
+Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+	'Menu:DataAdministration' => 'Administración de Datos',
+	'Menu:DataAdministration+' => 'Administración de Datos',
+	'Menu:Catalogs' => 'Catálogos',
+	'Menu:Catalogs+' => 'Tipos de Datos',
+	'Menu:Audit' => 'Auditoría',
+	'Menu:Audit+' => 'Auditoría',
+	'Menu:CSVImport' => 'Importar CSV',
+	'Menu:CSVImport+' => 'Creación o Actualización Másiva',
+	'Menu:Organization' => 'Organizaciones',
+	'Menu:Organization+' => 'Organizaciones',
+	'Menu:ConfigManagement' => 'Administración de la Configuración',
+	'Menu:ConfigManagement+' => 'Administración de la Configuración',
+	'Menu:ConfigManagementOverview' => 'Resumen de Infraestructura',
+	'Menu:ConfigManagementOverview+' => 'Resumen de Infraestructura',
+	'Menu:Contact' => 'Contactos',
+	'Menu:Contact+' => 'Contactos',
+	'Menu:Contact:Count' => '%1$d Contactos',
+	'Menu:Person' => 'Personas',
+	'Menu:Person+' => 'Personas',
+	'Menu:Team' => 'Grupos',
+	'Menu:Team+' => 'Grupos de Trabajo',
+	'Menu:Document' => 'Documentos',
+	'Menu:Document+' => 'Documentos',
+	'Menu:Location' => 'Localidades',
+	'Menu:Location+' => 'Localidades',
+	'Menu:NewContact' => 'Nuevo Contacto',
+	'Menu:NewContact+' => 'Nuevo Contacto',
+	'Menu:SearchContacts' => 'Búsqueda de Contactos',
+	'Menu:SearchContacts+' => 'Búsqueda de Contactos',
+	'Menu:ConfigManagement:Shortcuts' => 'Acceso Rápido',
+	'Menu:ConfigManagement:AllContacts' => 'Contactos: %1$d',
+	'Menu:Typology' => 'Configuración de Tipos',
+	'Menu:Typology+' => 'Configuración de Tipos',
+	'UI_WelcomeMenu_AllConfigItems' => 'Resumen',
+	'Menu:ConfigManagement:Typology' => 'Configuración de Tipos',
+
+));
+
diff --git a/datamodels/2.x/itop-structure/fr.dict.itop-structure.php b/datamodels/2.x/itop-structure/fr.dict.itop-structure.php
new file mode 100644
index 000000000..635a56afb
--- /dev/null
+++ b/datamodels/2.x/itop-structure/fr.dict.itop-structure.php
@@ -0,0 +1,396 @@
+<?php
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+ * @author      Benjamin Planque <benjamin.planque@combodo.com>
+ * @copyright   Copyright (C) 2010-2018 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+//
+// Class: Organization
+//
+Dict::Add('FR FR', 'French', 'Français', array(
+	'Relation:impacts/Description' => 'Eléments impactés par',
+	'Relation:impacts/DownStream' => 'Impacte...',
+	'Relation:impacts/DownStream+' => 'Eléments impactés par',
+	'Relation:impacts/UpStream' => 'Dépend de...',
+	'Relation:impacts/UpStream+' => 'Eléments dont dépend',
+	// Legacy entries
+	'Relation:depends on/Description' => 'Eléments dont dépend',
+	'Relation:depends on/DownStream' => 'Dépend de...',
+	'Relation:depends on/UpStream' => 'Impacte...',
+));
+
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+// Class:<class_name>/UniquenessRule:<rule_code>
+// Class:<class_name>/UniquenessRule:<rule_code>+
+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+// Class:<class_name>/UniquenessRule:<rule_code>
+// Class:<class_name>/UniquenessRule:<rule_code>+
+
+//////////////////////////////////////////////////////////////////////
+// Note: The classes have been grouped by categories: bizmodel
+//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+
+//
+// Class: Organization
+//
+
+Dict::Add('FR FR', 'French', 'Français', array(
+	'Class:Organization' => 'Organisation',
+	'Class:Organization+' => '',
+	'Class:Organization/Attribute:name' => 'Nom organisation',
+	'Class:Organization/Attribute:name+' => 'Nom commun',
+	'Class:Organization/Attribute:code' => 'Code',
+	'Class:Organization/Attribute:code+' => 'Organisation code (Siret, DUNS,...)',
+	'Class:Organization/Attribute:status' => 'Statut',
+	'Class:Organization/Attribute:status+' => '',
+	'Class:Organization/Attribute:status/Value:active' => 'active',
+	'Class:Organization/Attribute:status/Value:active+' => 'active',
+	'Class:Organization/Attribute:status/Value:inactive' => 'inactive',
+	'Class:Organization/Attribute:status/Value:inactive+' => 'Inactive',
+	'Class:Organization/Attribute:parent_id' => 'Organisation Parent',
+	'Class:Organization/Attribute:parent_id+' => 'Organisation parent',
+	'Class:Organization/Attribute:parent_name' => 'Nom du parent',
+	'Class:Organization/Attribute:parent_name+' => 'Nom de l\'organisation parente',
+	'Class:Organization/Attribute:deliverymodel_id' => 'Modèle de support',
+	'Class:Organization/Attribute:deliverymodel_id+' => '~~',
+	'Class:Organization/Attribute:deliverymodel_name' => 'Nom modèle de support',
+	'Class:Organization/Attribute:deliverymodel_name+' => '~~',
+	'Class:Organization/Attribute:parent_id_friendlyname' => 'Nom commun',
+	'Class:Organization/Attribute:parent_id_friendlyname+' => '',
+	'Class:Organization/Attribute:overview' => 'Tableau de bord',
+	'Organization:Overview:FunctionalCIs' => 'Infrastructure de cette organisation',
+	'Organization:Overview:FunctionalCIs:subtitle' => 'par type',
+	'Organization:Overview:Users' => 'Utilisateurs iTop dans cette organisation',
+));
+
+//
+// Class: Location
+//
+
+Dict::Add('FR FR', 'French', 'Français', array(
+	'Class:Location' => 'Lieu',
+	'Class:Location+' => 'Tout type de lieu: Région, Pays, Ville, Site, batiment, Bureau,...',
+	'Class:Location/Attribute:name' => 'Nom',
+	'Class:Location/Attribute:name+' => '',
+	'Class:Location/Attribute:status' => 'Statut',
+	'Class:Location/Attribute:status+' => '',
+	'Class:Location/Attribute:status/Value:active' => 'Actif',
+	'Class:Location/Attribute:status/Value:active+' => 'Actif',
+	'Class:Location/Attribute:status/Value:inactive' => 'Inactif',
+	'Class:Location/Attribute:status/Value:inactive+' => 'Inactif',
+	'Class:Location/Attribute:org_id' => 'Organisation',
+	'Class:Location/Attribute:org_id+' => '',
+	'Class:Location/Attribute:org_name' => 'Nom organisation',
+	'Class:Location/Attribute:org_name+' => '',
+	'Class:Location/Attribute:address' => 'Adresse',
+	'Class:Location/Attribute:address+' => 'Adresse postale',
+	'Class:Location/Attribute:postal_code' => 'Code postal',
+	'Class:Location/Attribute:postal_code+' => 'Code postal',
+	'Class:Location/Attribute:city' => 'Ville',
+	'Class:Location/Attribute:city+' => '',
+	'Class:Location/Attribute:country' => 'Pays',
+	'Class:Location/Attribute:country+' => '',
+	'Class:Location/Attribute:physicaldevice_list' => 'Matériels',
+	'Class:Location/Attribute:physicaldevice_list+' => '',
+	'Class:Location/Attribute:person_list' => 'Contacts',
+	'Class:Location/Attribute:person_list+' => '',
+));
+
+//
+// Class: Contact
+//
+
+Dict::Add('FR FR', 'French', 'Français', array(
+	'Class:Contact' => 'Contact',
+	'Class:Contact+' => '',
+	'Class:Contact/Attribute:name' => 'Nom',
+	'Class:Contact/Attribute:name+' => '',
+	'Class:Contact/Attribute:status' => 'Statut',
+	'Class:Contact/Attribute:status+' => '',
+	'Class:Contact/Attribute:status/Value:active' => 'Actif',
+	'Class:Contact/Attribute:status/Value:active+' => 'Actif',
+	'Class:Contact/Attribute:status/Value:inactive' => 'Inactif',
+	'Class:Contact/Attribute:status/Value:inactive+' => 'Inactif',
+	'Class:Contact/Attribute:org_id' => 'Organisation',
+	'Class:Contact/Attribute:org_id+' => '',
+	'Class:Contact/Attribute:org_name' => 'Nom organisation',
+	'Class:Contact/Attribute:org_name+' => '',
+	'Class:Contact/Attribute:email' => 'Email',
+	'Class:Contact/Attribute:email+' => '',
+	'Class:Contact/Attribute:phone' => 'Téléphone',
+	'Class:Contact/Attribute:phone+' => '',
+	'Class:Contact/Attribute:notify' => 'Notification',
+	'Class:Contact/Attribute:notify+' => '',
+	'Class:Contact/Attribute:notify/Value:no' => 'non',
+	'Class:Contact/Attribute:notify/Value:no+' => 'non',
+	'Class:Contact/Attribute:notify/Value:yes' => 'oui',
+	'Class:Contact/Attribute:notify/Value:yes+' => 'oui',
+	'Class:Contact/Attribute:function' => 'Fonction',
+	'Class:Contact/Attribute:function+' => '',
+	'Class:Contact/Attribute:cis_list' => 'CIs',
+	'Class:Contact/Attribute:cis_list+' => '',
+	'Class:Contact/Attribute:finalclass' => 'Sous-classe de Contact',
+	'Class:Contact/Attribute:finalclass+' => 'Nom de la classe instanciable',
+));
+
+//
+// Class: Person
+//
+
+Dict::Add('FR FR', 'French', 'Français', array(
+	'Class:Person' => 'Personne',
+	'Class:Person+' => '',
+	'Class:Person/Attribute:name' => 'Nom',
+	'Class:Person/Attribute:name+' => '~~',
+	'Class:Person/Attribute:first_name' => 'Prénom',
+	'Class:Person/Attribute:first_name+' => '',
+	'Class:Person/Attribute:employee_number' => 'Numéro d\'employé',
+	'Class:Person/Attribute:employee_number+' => '',
+	'Class:Person/Attribute:mobile_phone' => 'Téléphone mobile',
+	'Class:Person/Attribute:mobile_phone+' => '',
+	'Class:Person/Attribute:location_id' => 'Site',
+	'Class:Person/Attribute:location_id+' => '',
+	'Class:Person/Attribute:location_name' => 'Nom site',
+	'Class:Person/Attribute:location_name+' => '',
+	'Class:Person/Attribute:manager_id' => 'Manager',
+	'Class:Person/Attribute:manager_id+' => '',
+	'Class:Person/Attribute:manager_name' => 'Nom Manager',
+	'Class:Person/Attribute:manager_name+' => '',
+	'Class:Person/Attribute:team_list' => 'Equipes',
+	'Class:Person/Attribute:team_list+' => '',
+	'Class:Person/Attribute:tickets_list' => 'Tickets',
+	'Class:Person/Attribute:tickets_list+' => '',
+	'Class:Person/Attribute:manager_id_friendlyname' => 'Manager friendly name',
+	'Class:Person/Attribute:manager_id_friendlyname+' => '',
+	'Class:Person/Attribute:picture' => 'Photo',
+	'Class:Person/Attribute:picture+' => '',
+	'Class:Person/UniquenessRule:employee_number+' => 'Le numéro d\'employé doit être unique dans l\'organisation',
+	'Class:Person/UniquenessRule:employee_number' => 'il y a déjà une personne avec ce numéro d\'employé dans l\'organisation 
+	\'$this->org_name$\'',
+	'Class:Person/UniquenessRule:name+' => 'Le nom de l\'employé devrait être unique dans l\'organisation',
+	'Class:Person/UniquenessRule:name' => 'Il y a déjà une personne avec ce nom dans l\'organisation \'$this->org_name$\'',
+));
+
+//
+// Class: Team
+//
+
+Dict::Add('FR FR', 'French', 'Français', array(
+	'Class:Team' => 'Equipe',
+	'Class:Team+' => '',
+	'Class:Team/Attribute:persons_list' => 'Membres',
+	'Class:Team/Attribute:persons_list+' => '',
+	'Class:Team/Attribute:tickets_list' => 'Tickets',
+	'Class:Team/Attribute:tickets_list+' => '',
+));
+
+//
+// Class: Document
+//
+
+Dict::Add('FR FR', 'French', 'Français', array(
+	'Class:Document' => 'Document',
+	'Class:Document+' => '',
+	'Class:Document/Attribute:name' => 'Nom',
+	'Class:Document/Attribute:name+' => '',
+	'Class:Document/Attribute:org_id' => 'Organisation',
+	'Class:Document/Attribute:org_id+' => '',
+	'Class:Document/Attribute:org_name' => 'Nom organisation',
+	'Class:Document/Attribute:org_name+' => '',
+	'Class:Document/Attribute:documenttype_id' => 'Type de document',
+	'Class:Document/Attribute:documenttype_id+' => '',
+	'Class:Document/Attribute:documenttype_name' => 'Nom type de document',
+	'Class:Document/Attribute:documenttype_name+' => '',
+	'Class:Document/Attribute:version' => 'Version',
+	'Class:Document/Attribute:version+' => '',
+	'Class:Document/Attribute:description' => 'Description',
+	'Class:Document/Attribute:description+' => '',
+	'Class:Document/Attribute:status' => 'Statut',
+	'Class:Document/Attribute:status+' => '',
+	'Class:Document/Attribute:status/Value:draft' => 'Brouillon',
+	'Class:Document/Attribute:status/Value:draft+' => '',
+	'Class:Document/Attribute:status/Value:obsolete' => 'Obsolète',
+	'Class:Document/Attribute:status/Value:obsolete+' => '',
+	'Class:Document/Attribute:status/Value:published' => 'Publié',
+	'Class:Document/Attribute:status/Value:published+' => '',
+	'Class:Document/Attribute:cis_list' => 'CIs',
+	'Class:Document/Attribute:cis_list+' => '',
+	'Class:Document/Attribute:contracts_list' => 'Contrats',
+	'Class:Document/Attribute:contracts_list+' => '',
+	'Class:Document/Attribute:services_list' => 'Services',
+	'Class:Document/Attribute:services_list+' => '',
+	'Class:Document/Attribute:finalclass' => 'Sous-classe de Document',
+	'Class:Document/Attribute:finalclass+' => 'Nom de la classe instanciable',
+));
+
+//
+// Class: DocumentFile
+//
+
+Dict::Add('FR FR', 'French', 'Français', array(
+	'Class:DocumentFile' => 'Document Fichier',
+	'Class:DocumentFile+' => '',
+	'Class:DocumentFile/Attribute:file' => 'Fichier',
+	'Class:DocumentFile/Attribute:file+' => '',
+));
+
+//
+// Class: DocumentNote
+//
+
+Dict::Add('FR FR', 'French', 'Français', array(
+	'Class:DocumentNote' => 'Document Note',
+	'Class:DocumentNote+' => '',
+	'Class:DocumentNote/Attribute:text' => 'Texte',
+	'Class:DocumentNote/Attribute:text+' => '',
+));
+
+//
+// Class: DocumentWeb
+//
+
+Dict::Add('FR FR', 'French', 'Français', array(
+	'Class:DocumentWeb' => 'Document Web',
+	'Class:DocumentWeb+' => '',
+	'Class:DocumentWeb/Attribute:url' => 'URL',
+	'Class:DocumentWeb/Attribute:url+' => '',
+));
+
+//
+// Class: Typology
+//
+
+Dict::Add('FR FR', 'French', 'Français', array(
+	'Class:Typology' => 'Typologie',
+	'Class:Typology+' => '',
+	'Class:Typology/Attribute:name' => 'Nom',
+	'Class:Typology/Attribute:name+' => '',
+	'Class:Typology/Attribute:finalclass' => 'Sous-classe de Typologie',
+	'Class:Typology/Attribute:finalclass+' => 'Nom de la classe instanciable',
+));
+
+//
+// Class: DocumentType
+//
+
+Dict::Add('FR FR', 'French', 'Français', array(
+	'Class:DocumentType' => 'Type de document',
+	'Class:DocumentType+' => '',
+));
+
+//
+// Class: ContactType
+//
+
+Dict::Add('FR FR', 'French', 'Français', array(
+	'Class:ContactType' => 'Type de contact',
+	'Class:ContactType+' => '',
+));
+
+//
+// Class: lnkPersonToTeam
+//
+
+Dict::Add('FR FR', 'French', 'Français', array(
+	'Class:lnkPersonToTeam' => 'Lien Personne / Equipe',
+	'Class:lnkPersonToTeam+' => '',
+	'Class:lnkPersonToTeam/Attribute:team_id' => 'Equipe',
+	'Class:lnkPersonToTeam/Attribute:team_id+' => '',
+	'Class:lnkPersonToTeam/Attribute:team_name' => 'Nom Equipe',
+	'Class:lnkPersonToTeam/Attribute:team_name+' => '',
+	'Class:lnkPersonToTeam/Attribute:person_id' => 'Personne',
+	'Class:lnkPersonToTeam/Attribute:person_id+' => '',
+	'Class:lnkPersonToTeam/Attribute:person_name' => 'Nom Personne',
+	'Class:lnkPersonToTeam/Attribute:person_name+' => '',
+	'Class:lnkPersonToTeam/Attribute:role_id' => 'Rôle',
+	'Class:lnkPersonToTeam/Attribute:role_id+' => '',
+	'Class:lnkPersonToTeam/Attribute:role_name' => 'Nom Role',
+	'Class:lnkPersonToTeam/Attribute:role_name+' => '',
+));
+
+//
+// Application Menu
+//
+
+Dict::Add('FR FR', 'French', 'Français', array(
+	'Menu:DataAdministration' => 'Administration des données',
+	'Menu:DataAdministration+' => 'Administration des données',
+	'Menu:Catalogs' => 'Catalogues',
+	'Menu:Catalogs+' => 'Types de données',
+	'Menu:Audit' => 'Audit',
+	'Menu:Audit+' => 'Audit',
+	'Menu:CSVImport' => 'Import CSV',
+	'Menu:CSVImport+' => 'Import ou mise à jour en masse',
+	'Menu:Organization' => 'Organisations',
+	'Menu:Organization+' => 'Toutes les organisations',
+	'Menu:ConfigManagement' => 'Gestion des configurations',
+	'Menu:ConfigManagement+' => 'Gestion des configurations',
+	'Menu:ConfigManagementOverview' => 'Tableaux de bord',
+	'Menu:ConfigManagementOverview+' => 'Tableaux de bord',
+	'Menu:Contact' => 'Contacts',
+	'Menu:Contact+' => 'Contacts',
+	'Menu:Contact:Count' => '%1$d contacts',
+	'Menu:Person' => 'Personnes',
+	'Menu:Person+' => 'Toutes les personnes',
+	'Menu:Team' => 'Equipes',
+	'Menu:Team+' => 'Toutes les équipes',
+	'Menu:Document' => 'Documents',
+	'Menu:Document+' => 'Tous les documents',
+	'Menu:Location' => 'Lieux',
+	'Menu:Location+' => 'Tous les lieux',
+	'Menu:NewContact' => 'Nouveau contact',
+	'Menu:NewContact+' => 'Nouveau contact',
+	'Menu:SearchContacts' => 'Rechercher des contacts',
+	'Menu:SearchContacts+' => 'Rechercher des contacts',
+	'Menu:ConfigManagement:Shortcuts' => 'Raccourcis',
+	'Menu:ConfigManagement:AllContacts' => 'Tous les contacts: %1$d',
+	'Menu:Typology' => 'Typologie configuration',
+	'Menu:Typology+' => 'Typologie configuration',
+	'UI_WelcomeMenu_AllConfigItems' => 'Résumé',
+	'Menu:ConfigManagement:Typology' => 'Configuration des typologies',
+));
+
diff --git a/datamodels/2.x/itop-structure/hu.dict.itop-structure.php b/datamodels/2.x/itop-structure/hu.dict.itop-structure.php
new file mode 100644
index 000000000..ca15ab7e5
--- /dev/null
+++ b/datamodels/2.x/itop-structure/hu.dict.itop-structure.php
@@ -0,0 +1,335 @@
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+ * @author      Benjamin Planque <benjamin.planque@combodo.com>
+ * @copyright   Copyright (C) 2010-2018 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+//////////////////////////////////////////////////////////////////////
+// Note: The classes have been grouped by categories: bizmodel
+//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+//
+// Class: Organization
+//
+
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+	'Class:Organization' => 'Szevezeti egység',
+	'Class:Organization+' => '',
+	'Class:Organization/Attribute:name' => 'Név',
+	'Class:Organization/Attribute:name+' => '',
+	'Class:Organization/Attribute:code' => 'Azonosító',
+	'Class:Organization/Attribute:code+' => '',
+	'Class:Organization/Attribute:status' => 'Státusz',
+	'Class:Organization/Attribute:status+' => '',
+	'Class:Organization/Attribute:status/Value:active' => 'Aktív',
+	'Class:Organization/Attribute:status/Value:active+' => '',
+	'Class:Organization/Attribute:status/Value:inactive' => 'Inaktív',
+	'Class:Organization/Attribute:status/Value:inactive+' => '',
+	'Class:Organization/Attribute:parent_id' => 'Felérendelt szervezeti egység',
+	'Class:Organization/Attribute:parent_id+' => '',
+	'Class:Organization/Attribute:parent_name' => 'Felérendelt szervezeti egység neve',
+	'Class:Organization/Attribute:parent_name+' => '',
+	'Class:Organization/Attribute:deliverymodel_id' => 'Delivery model~~',
+	'Class:Organization/Attribute:deliverymodel_id+' => '~~',
+	'Class:Organization/Attribute:deliverymodel_name' => 'Delivery model name~~',
+	'Class:Organization/Attribute:deliverymodel_name+' => '~~',
+	'Class:Organization/Attribute:parent_id_friendlyname' => 'Parent~~',
+	'Class:Organization/Attribute:parent_id_friendlyname+' => 'Parent organization~~',
+	'Class:Organization/Attribute:overview' => 'Overview~~',
+	'Organization:Overview:FunctionalCIs' => 'Configuration items of this organization~~',
+	'Organization:Overview:FunctionalCIs:subtitle' => 'by type~~',
+	'Organization:Overview:Users' => 'iTop Users within this organization~~',
+));
+
+//
+// Class: Location
+//
+
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+	'Class:Location' => 'Helyszín',
+	'Class:Location+' => '',
+	'Class:Location/Attribute:name' => 'Név',
+	'Class:Location/Attribute:name+' => '',
+	'Class:Location/Attribute:status' => 'Státusz',
+	'Class:Location/Attribute:status+' => '',
+	'Class:Location/Attribute:status/Value:active' => 'Aktív',
+	'Class:Location/Attribute:status/Value:active+' => '',
+	'Class:Location/Attribute:status/Value:inactive' => 'Inaktív',
+	'Class:Location/Attribute:status/Value:inactive+' => '',
+	'Class:Location/Attribute:org_id' => 'Tulajdonos szevezeti egység',
+	'Class:Location/Attribute:org_id+' => '',
+	'Class:Location/Attribute:org_name' => 'Tulejdonos szevezeti egység neve',
+	'Class:Location/Attribute:org_name+' => '',
+	'Class:Location/Attribute:address' => 'Cím',
+	'Class:Location/Attribute:address+' => '',
+	'Class:Location/Attribute:postal_code' => 'Irányítószám',
+	'Class:Location/Attribute:postal_code+' => '',
+	'Class:Location/Attribute:city' => 'Város',
+	'Class:Location/Attribute:city+' => '',
+	'Class:Location/Attribute:country' => 'Ország',
+	'Class:Location/Attribute:country+' => '',
+	'Class:Location/Attribute:physicaldevice_list' => 'Devices~~',
+	'Class:Location/Attribute:physicaldevice_list+' => 'All the devices in this location~~',
+	'Class:Location/Attribute:person_list' => 'Contacts~~',
+	'Class:Location/Attribute:person_list+' => 'All the contacts located on this location~~',
+));
+
+//
+// Class: Contact
+//
+
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+	'Class:Contact' => 'Kapcsolattartó',
+	'Class:Contact+' => '',
+	'Class:Contact/Attribute:name' => 'Név',
+	'Class:Contact/Attribute:name+' => '',
+	'Class:Contact/Attribute:status' => 'Státusz',
+	'Class:Contact/Attribute:status+' => '',
+	'Class:Contact/Attribute:status/Value:active' => 'Aktív',
+	'Class:Contact/Attribute:status/Value:active+' => '',
+	'Class:Contact/Attribute:status/Value:inactive' => 'Inaktív',
+	'Class:Contact/Attribute:status/Value:inactive+' => '',
+	'Class:Contact/Attribute:org_id' => 'Szevezeti egység',
+	'Class:Contact/Attribute:org_id+' => '',
+	'Class:Contact/Attribute:org_name' => 'Szevezeti egység',
+	'Class:Contact/Attribute:org_name+' => '',
+	'Class:Contact/Attribute:email' => 'E-mail',
+	'Class:Contact/Attribute:email+' => '',
+	'Class:Contact/Attribute:phone' => 'Telefonszám',
+	'Class:Contact/Attribute:phone+' => '',
+	'Class:Contact/Attribute:notify' => 'Notification~~',
+	'Class:Contact/Attribute:notify+' => '~~',
+	'Class:Contact/Attribute:notify/Value:no' => 'no~~',
+	'Class:Contact/Attribute:notify/Value:no+' => 'no~~',
+	'Class:Contact/Attribute:notify/Value:yes' => 'yes~~',
+	'Class:Contact/Attribute:notify/Value:yes+' => 'yes~~',
+	'Class:Contact/Attribute:function' => 'Function~~',
+	'Class:Contact/Attribute:function+' => '~~',
+	'Class:Contact/Attribute:cis_list' => 'CIs~~',
+	'Class:Contact/Attribute:cis_list+' => 'All the configuration items linked to this contact~~',
+	'Class:Contact/Attribute:finalclass' => 'Típus',
+	'Class:Contact/Attribute:finalclass+' => '',
+));
+
+//
+// Class: Person
+//
+
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+	'Class:Person' => 'Személy',
+	'Class:Person+' => '',
+	'Class:Person/Attribute:name' => 'Last Name~~',
+	'Class:Person/Attribute:name+' => '~~',
+	'Class:Person/Attribute:first_name' => 'Keresztnév',
+	'Class:Person/Attribute:first_name+' => '',
+	'Class:Person/Attribute:employee_number' => 'Employee number~~',
+	'Class:Person/Attribute:employee_number+' => '~~',
+	'Class:Person/Attribute:mobile_phone' => 'Mobile phone~~',
+	'Class:Person/Attribute:mobile_phone+' => '~~',
+	'Class:Person/Attribute:location_id' => 'Location~~',
+	'Class:Person/Attribute:location_id+' => '~~',
+	'Class:Person/Attribute:location_name' => 'Location name~~',
+	'Class:Person/Attribute:location_name+' => '~~',
+	'Class:Person/Attribute:manager_id' => 'Manager~~',
+	'Class:Person/Attribute:manager_id+' => '~~',
+	'Class:Person/Attribute:manager_name' => 'Manager name~~',
+	'Class:Person/Attribute:manager_name+' => '~~',
+	'Class:Person/Attribute:team_list' => 'Teams~~',
+	'Class:Person/Attribute:team_list+' => 'All the teams this person belongs to~~',
+	'Class:Person/Attribute:tickets_list' => 'Tickets~~',
+	'Class:Person/Attribute:tickets_list+' => 'All the tickets this person is the caller~~',
+	'Class:Person/Attribute:manager_id_friendlyname' => 'Manager friendly name~~',
+	'Class:Person/Attribute:manager_id_friendlyname+' => '~~',
+	'Class:Person/Attribute:picture' => 'Picture~~',
+	'Class:Person/Attribute:picture+' => '~~',
+	'Class:Person/UniquenessRule:employee_number+' => 'The employee number must be unique in the organization~~',
+	'Class:Person/UniquenessRule:employee_number' => 'there is already a person in \'$this->org_name$\' organization with the same employee number~~',
+	'Class:Person/UniquenessRule:name+' => 'The employee name should be unique inside its organization~~',
+	'Class:Person/UniquenessRule:name' => 'There is already a person in \'$this->org_name$\' organization with the same name~~',
+));
+
+//
+// Class: Team
+//
+
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+	'Class:Team' => 'Csoport',
+	'Class:Team+' => '',
+	'Class:Team/Attribute:persons_list' => 'Members~~',
+	'Class:Team/Attribute:persons_list+' => 'All the people belonging to this team~~',
+	'Class:Team/Attribute:tickets_list' => 'Tickets~~',
+	'Class:Team/Attribute:tickets_list+' => 'All the tickets assigned to this team~~',
+));
+
+//
+// Class: Document
+//
+
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+	'Class:Document' => 'Dokumentum',
+	'Class:Document+' => '',
+	'Class:Document/Attribute:name' => 'Név',
+	'Class:Document/Attribute:name+' => '',
+	'Class:Document/Attribute:org_id' => 'Szevezeti egység',
+	'Class:Document/Attribute:org_id+' => '~~',
+	'Class:Document/Attribute:org_name' => 'Szervezeti egység neve',
+	'Class:Document/Attribute:org_name+' => '',
+	'Class:Document/Attribute:documenttype_id' => 'Document type~~',
+	'Class:Document/Attribute:documenttype_id+' => '~~',
+	'Class:Document/Attribute:documenttype_name' => 'Document type name~~',
+	'Class:Document/Attribute:documenttype_name+' => '~~',
+	'Class:Document/Attribute:version' => 'Version~~',
+	'Class:Document/Attribute:version+' => '~~',
+	'Class:Document/Attribute:description' => 'Leírás',
+	'Class:Document/Attribute:description+' => '',
+	'Class:Document/Attribute:status' => 'Státusz',
+	'Class:Document/Attribute:status+' => '',
+	'Class:Document/Attribute:status/Value:draft' => 'Munkapéldány',
+	'Class:Document/Attribute:status/Value:draft+' => '',
+	'Class:Document/Attribute:status/Value:obsolete' => 'Elavult',
+	'Class:Document/Attribute:status/Value:obsolete+' => '',
+	'Class:Document/Attribute:status/Value:published' => 'Érvényes',
+	'Class:Document/Attribute:status/Value:published+' => '',
+	'Class:Document/Attribute:cis_list' => 'CIs~~',
+	'Class:Document/Attribute:cis_list+' => 'All the configuration items linked to this document~~',
+	'Class:Document/Attribute:contracts_list' => 'Contracts~~',
+	'Class:Document/Attribute:contracts_list+' => 'All the contracts linked to this document~~',
+	'Class:Document/Attribute:services_list' => 'Services~~',
+	'Class:Document/Attribute:services_list+' => 'All the services linked to this document~~',
+	'Class:Document/Attribute:finalclass' => 'Document Type~~',
+	'Class:Document/Attribute:finalclass+' => 'Name of the final class~~',
+));
+
+//
+// Class: DocumentFile
+//
+
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+	'Class:DocumentFile' => 'Document File~~',
+	'Class:DocumentFile+' => '~~',
+	'Class:DocumentFile/Attribute:file' => 'File~~',
+	'Class:DocumentFile/Attribute:file+' => '~~',
+));
+
+//
+// Class: DocumentNote
+//
+
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+	'Class:DocumentNote' => 'Document Note~~',
+	'Class:DocumentNote+' => '~~',
+	'Class:DocumentNote/Attribute:text' => 'Text~~',
+	'Class:DocumentNote/Attribute:text+' => '~~',
+));
+
+//
+// Class: DocumentWeb
+//
+
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+	'Class:DocumentWeb' => 'Document Web~~',
+	'Class:DocumentWeb+' => '~~',
+	'Class:DocumentWeb/Attribute:url' => 'URL~~',
+	'Class:DocumentWeb/Attribute:url+' => '~~',
+));
+
+
+//
+// Class: Typology
+//
+
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+	'Class:Typology' => 'Typology~~',
+	'Class:Typology+' => '~~',
+	'Class:Typology/Attribute:name' => 'Name~~',
+	'Class:Typology/Attribute:name+' => '~~',
+	'Class:Typology/Attribute:finalclass' => 'Type~~',
+	'Class:Typology/Attribute:finalclass+' => 'Name of the final class~~',
+));
+
+//
+// Class: lnkPersonToTeam
+//
+
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+	'Class:lnkPersonToTeam' => 'Link Person / Team~~',
+	'Class:lnkPersonToTeam+' => '~~',
+	'Class:lnkPersonToTeam/Attribute:team_id' => 'Team~~',
+	'Class:lnkPersonToTeam/Attribute:team_id+' => '~~',
+	'Class:lnkPersonToTeam/Attribute:team_name' => 'Team name~~',
+	'Class:lnkPersonToTeam/Attribute:team_name+' => '~~',
+	'Class:lnkPersonToTeam/Attribute:person_id' => 'Person~~',
+	'Class:lnkPersonToTeam/Attribute:person_id+' => '~~',
+	'Class:lnkPersonToTeam/Attribute:person_name' => 'Person name~~',
+	'Class:lnkPersonToTeam/Attribute:person_name+' => '~~',
+	'Class:lnkPersonToTeam/Attribute:role_id' => 'Role~~',
+	'Class:lnkPersonToTeam/Attribute:role_id+' => '~~',
+	'Class:lnkPersonToTeam/Attribute:role_name' => 'Role name~~',
+	'Class:lnkPersonToTeam/Attribute:role_name+' => '~~',
+));
+
+//
+// Application Menu
+//
+
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+	'Menu:DataAdministration' => 'Adat adminisztráció',
+	'Menu:DataAdministration+' => '',
+	'Menu:Catalogs' => 'Katalógusok',
+	'Menu:Catalogs+' => '',
+	'Menu:Audit' => 'Audit',
+	'Menu:Audit+' => '',
+	'Menu:CSVImport' => 'CSV import',
+	'Menu:CSVImport+' => '',
+	'Menu:Organization' => 'Szervezet',
+	'Menu:Organization+' => '',
+	'Menu:ConfigManagement' => 'Konfiguráció menedzsment',
+	'Menu:ConfigManagement+' => '',
+	'Menu:ConfigManagementOverview' => 'Áttekintő',
+	'Menu:ConfigManagementOverview+' => '',
+	'Menu:Contact' => 'Kapcsolattartók',
+	'Menu:Contact+' => '',
+	'Menu:Contact:Count' => '%1$d',
+	'Menu:Person' => 'Személyek',
+	'Menu:Person+' => '',
+	'Menu:Team' => 'Csoportok',
+	'Menu:Team+' => '',
+	'Menu:Document' => 'Dokumentumok',
+	'Menu:Document+' => '',
+	'Menu:Location' => 'Helyszínek',
+	'Menu:Location+' => '',
+	'Menu:NewContact' => 'Új kapcsolattartó',
+	'Menu:NewContact+' => '',
+	'Menu:SearchContacts' => 'Kapcsolattartó keresés',
+	'Menu:SearchContacts+' => '',
+	'Menu:ConfigManagement:Shortcuts' => 'Gyorsmenük',
+	'Menu:ConfigManagement:AllContacts' => 'Összes kapcsolattartó: %1$d',
+	'Menu:Typology' => 'Typology configuration~~',
+	'Menu:Typology+' => 'Typology configuration~~',
+	'UI_WelcomeMenu_AllConfigItems' => 'Summary~~',
+	'Menu:ConfigManagement:Typology' => 'Typology configuration~~',
+));
+
+?>
\ No newline at end of file
diff --git a/datamodels/2.x/itop-structure/images/application.png b/datamodels/2.x/itop-structure/images/application.png
new file mode 100644
index 0000000000000000000000000000000000000000..f1512d137c7d2def3e0c74e3423309544e55c33f
GIT binary patch
literal 3583
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
FV1mdn&UpX;

literal 0
HcmV?d00001

diff --git a/datamodels/2.x/itop-structure/images/applicationservice.png b/datamodels/2.x/itop-structure/images/applicationservice.png
new file mode 100644
index 0000000000000000000000000000000000000000..62348ebdf71b4cd112bc522392431705f296a124
GIT binary patch
literal 3037
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

literal 0
HcmV?d00001

diff --git a/datamodels/2.x/itop-structure/images/building.png b/datamodels/2.x/itop-structure/images/building.png
new file mode 100644
index 0000000000000000000000000000000000000000..94fdeae829d6fb4a68031d3fe28c664efc050d3e
GIT binary patch
literal 4929
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
JmT5VM{||N%%<%vK

literal 0
HcmV?d00001

diff --git a/datamodels/2.x/itop-structure/images/business-process.png b/datamodels/2.x/itop-structure/images/business-process.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2359860fe8668b11cc152cf2029b19190c92a45
GIT binary patch
literal 3126
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
QasU7T07*qoM6N<$f;)@n3jhEB

literal 0
HcmV?d00001

diff --git a/datamodels/2.x/itop-structure/images/computer.png b/datamodels/2.x/itop-structure/images/computer.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e88eacb3d7935d7b92e7b4bde1aea5517d31129
GIT binary patch
literal 4602
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

literal 0
HcmV?d00001

diff --git a/datamodels/2.x/itop-structure/images/contact.png b/datamodels/2.x/itop-structure/images/contact.png
new file mode 100644
index 0000000000000000000000000000000000000000..0694d18f97544c33e43eb6ea84a32a9659e5761d
GIT binary patch
literal 2742
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

literal 0
HcmV?d00001

diff --git a/datamodels/2.x/itop-structure/images/database-instance.png b/datamodels/2.x/itop-structure/images/database-instance.png
new file mode 100644
index 0000000000000000000000000000000000000000..634895539b1e5e5ad16bd14f84acf01eda908e29
GIT binary patch
literal 2876
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
a*}nir=OkKFD<fP00000<MNUMnLSTXvF?5>%

literal 0
HcmV?d00001

diff --git a/datamodels/2.x/itop-structure/images/database-schema.png b/datamodels/2.x/itop-structure/images/database-schema.png
new file mode 100644
index 0000000000000000000000000000000000000000..415dd78e0d754ed9a5400c8f3814d3c0ba31fbae
GIT binary patch
literal 4140
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

literal 0
HcmV?d00001

diff --git a/datamodels/2.x/itop-structure/images/database.png b/datamodels/2.x/itop-structure/images/database.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c5a2e039b9c9ef4f9ac445896993f60140ef23c
GIT binary patch
literal 3970
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%0AO%SZQ=zIV>zw6V+6@55aj4ZSs?{2eMiWJm
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

literal 0
HcmV?d00001

diff --git a/datamodels/2.x/itop-structure/images/diskarray.png b/datamodels/2.x/itop-structure/images/diskarray.png
new file mode 100644
index 0000000000000000000000000000000000000000..ae6e1d8d7604179e9efea6c5b1dfa3e858835d7e
GIT binary patch
literal 2325
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

literal 0
HcmV?d00001

diff --git a/datamodels/2.x/itop-structure/images/document.png b/datamodels/2.x/itop-structure/images/document.png
new file mode 100644
index 0000000000000000000000000000000000000000..04de88f8fe5d0ec1ccc5046c28ef725a4b909527
GIT binary patch
literal 5158
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
UTtT{5`~Uy|07*qoM6N<$g5xUjy#N3J

literal 0
HcmV?d00001

diff --git a/datamodels/2.x/itop-structure/images/group.png b/datamodels/2.x/itop-structure/images/group.png
new file mode 100644
index 0000000000000000000000000000000000000000..894d1485eaa94576c044ebafdca52d6bcd27c70f
GIT binary patch
literal 3668
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

literal 0
HcmV?d00001

diff --git a/datamodels/2.x/itop-structure/images/incident-escalated.png b/datamodels/2.x/itop-structure/images/incident-escalated.png
new file mode 100644
index 0000000000000000000000000000000000000000..719a12802be37792a4b376ed88c421093c0403ca
GIT binary patch
literal 4182
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

literal 0
HcmV?d00001

diff --git a/datamodels/2.x/itop-structure/images/interface.png b/datamodels/2.x/itop-structure/images/interface.png
new file mode 100644
index 0000000000000000000000000000000000000000..8aa046405b2c59c9b1fe40f5d8d0531cb8d60644
GIT binary patch
literal 5150
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
Z)9uE0-^m*VGW`Byhe8_alp<_`{s&62V+jBN

literal 0
HcmV?d00001

diff --git a/datamodels/2.x/itop-structure/images/licence.png b/datamodels/2.x/itop-structure/images/licence.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd9e4d79aac4b29ad6fa22b527922993faceda7f
GIT binary patch
literal 5899
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

literal 0
HcmV?d00001

diff --git a/datamodels/2.x/itop-structure/images/location.png b/datamodels/2.x/itop-structure/images/location.png
new file mode 100644
index 0000000000000000000000000000000000000000..529a4516ef447bd2db67dd9b89970213ab9adbad
GIT binary patch
literal 4152
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
C#0t>>

literal 0
HcmV?d00001

diff --git a/datamodels/2.x/itop-structure/images/middleware.png b/datamodels/2.x/itop-structure/images/middleware.png
new file mode 100644
index 0000000000000000000000000000000000000000..0a0499e81fe8067cece6d651568d806925874799
GIT binary patch
literal 4507
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

literal 0
HcmV?d00001

diff --git a/datamodels/2.x/itop-structure/images/patch.png b/datamodels/2.x/itop-structure/images/patch.png
new file mode 100644
index 0000000000000000000000000000000000000000..42b38302045ee24ce8644ec8e6436bd6755d0bad
GIT binary patch
literal 3410
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

literal 0
HcmV?d00001

diff --git a/datamodels/2.x/itop-structure/images/person.png b/datamodels/2.x/itop-structure/images/person.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff8313e791301754e04952609e3656b6c3a4c7a5
GIT binary patch
literal 2969
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
P00000NkvXXu0mjft%JTf

literal 0
HcmV?d00001

diff --git a/datamodels/2.x/itop-structure/images/printer.png b/datamodels/2.x/itop-structure/images/printer.png
new file mode 100644
index 0000000000000000000000000000000000000000..24bcb967809421b86763b73108494e97ec3724f1
GIT binary patch
literal 4036
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

literal 0
HcmV?d00001

diff --git a/datamodels/2.x/itop-structure/images/server.png b/datamodels/2.x/itop-structure/images/server.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a70caace7ae21d81bfbf8ac7a734a0f6c3179e3
GIT binary patch
literal 3531
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
A@Bjb+

literal 0
HcmV?d00001

diff --git a/datamodels/2.x/itop-structure/images/silhouette.png b/datamodels/2.x/itop-structure/images/silhouette.png
new file mode 100644
index 0000000000000000000000000000000000000000..5fc2548d964d676cd7ad9b43052f83ed698bd1f0
GIT binary patch
literal 3050
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

literal 0
HcmV?d00001

diff --git a/datamodels/2.x/itop-structure/images/software.png b/datamodels/2.x/itop-structure/images/software.png
new file mode 100644
index 0000000000000000000000000000000000000000..4f629eaf3697e24ef07013827c17efe61645975d
GIT binary patch
literal 4630
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

literal 0
HcmV?d00001

diff --git a/datamodels/2.x/itop-structure/images/solution.png b/datamodels/2.x/itop-structure/images/solution.png
new file mode 100644
index 0000000000000000000000000000000000000000..bc9bc45477c39c0fac59efc1ac661c6383c81b93
GIT binary patch
literal 2892
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

literal 0
HcmV?d00001

diff --git a/datamodels/2.x/itop-structure/images/subnet.png b/datamodels/2.x/itop-structure/images/subnet.png
new file mode 100644
index 0000000000000000000000000000000000000000..9af036d3bf7989cb8f7fe2df52c5a6d4ccd9e81a
GIT binary patch
literal 4594
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

literal 0
HcmV?d00001

diff --git a/datamodels/2.x/itop-structure/images/switch.png b/datamodels/2.x/itop-structure/images/switch.png
new file mode 100644
index 0000000000000000000000000000000000000000..1df637fa98679a73b6f6b29b23c651f9285069a4
GIT binary patch
literal 2376
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
Tc^7BX%)d=AFBCk(`8?})B3;1j

literal 0
HcmV?d00001

diff --git a/datamodels/2.x/itop-structure/images/team.png b/datamodels/2.x/itop-structure/images/team.png
new file mode 100644
index 0000000000000000000000000000000000000000..329be879d3388a4e12b53325be7b4e32aa536942
GIT binary patch
literal 4896
zcmV+*6W{EKP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU^!bwCyRCwC#T4{`3=UINf@2q#fv)bdC
z@pu_K89PqgIB8OFXyP=OkT#%-whC0xmQVpft@u+3sfZ%@L4{O6qNOcG6sZt?R9z^d
z4e8#L#A%bpOWZj2cs9@KxpVK_{p>v7ckU#UwAi8iK$Uu><9p}cbH4K~&-=X3`yGoU
zN$}JBlK3fq{mg;?@0a=Rdk$asBvmJlZDQAsvgj}8Zpzx$eYWe|nkkfbIGLPj7;!V~
zG|q+H<`=qNcxvTp0}IPlG+RET6!3xw58ZzdyGIHL!Wc2v%w`NA^bni<*mLYnaCiSa
z;J1Ja|A^{~k7IsaVCVP*hKCA>;+WUbjyV2N2ZRu>$y0S69eJSHXgyN*{9Ce)J(M4S
zndviNJ2p&NJRY0k4T)F#GoJaipCFihJjy(jl^eWY%QR#x43U2GKV_iX^<I<lh9MrF
znO**9x3OtEGDgXf$oH+n?%x5!G?}4H*>>GGnld@c`~4O#`Qr7~l!h$w+<T;9JOn3u
zJ8Yv587sDAvL1*2%-VW=I-7GI&t$B}f-vg-SO->CE7t>%g255PwBKK=)osUQ`uR_*
z1LV97Se^mXw3q<_%cP^0U9v6X<IMIIDdjVgRi<F{io)aHQ52u7tk*w~D`ii#n@zMA
zUcmC~G>o++<m2){H)-8)=Gi$s{@uApPTqU?U-yp{-sk)A)gKAOy_5adOTe*eqx0F8
z7wyT~1_UjWB7sW?JC=l%&BL@^Iw5%&%oM+4M)>|%v(<S=7)6_&AK{UQZpDG!{ls#F
zAQo>u_006Ai&j(^-M=4R;-Gr9f)}1W4W5e0n+{^n#115(kJIO7v2?YG-}{YYe?K~8
zy*G>#Y!8RAuRn85>q9^IOTX*=g27Bg?0Fg2hQSENTu4IIMU0N;p~)zAI$d;mv^yR@
zdy}3Ye3=f+)iztW<Cbv@59V2jnE2{bbC1qlsqWabe*#ODF0bvNS*ya80gCwyYPB|t
zs{m=**f}zY>ZXU8#rlC8_xFE2jKyLQ32YtabsDiNg_tU2OoXHXpGFTB9rWidRGI<e
zMCcoqhIc_aIaJqH(V`>1*MaYQO`hHjf*6PP4`O7vMC=&2IA3||bLUs~+;!(cTwZLV
z(dz1;6m5aA@e$<mIaD^9s8lw|Ua_h@jM9nI=dTnm&DZZbG}-sGPgZ-W1{B7x@d|`#
zv<<^Sw$zV-youfYCNdcZlfpow6QSvc#D55fbrBZ}gjj&ZMgz^Z|3rVzIj10V!@gl;
zvJN&Io^gJ9^$vB%O0|uPmq`MSMI#MlMzYwka}b$)0l88MOJ^3aI$uH7RVE5-FpJak
z)x$UL?T6<j+a0*(OSyWQ)O~!gT)?f91r%MT&30%|29E163#4yG%8w#+hO)3^7GFEn
z#o0@(OPwHWH@iMoDlIIpH5Co#s+--RfDybnvx3!1ozZu643DxF2ZqVZj*Ie;iGjri
zo;m+R^pzFt64dH#I^8K=t$Jp=qq;)Rf$iz|@f?IN5bqDSYa7nQ=ooemmGw>7$Y9wv
zEXRS9$>>8hJdY51?uBKDD5}2U=H2Kk(jXeK+3;amB=#7VGTf*Nbh}-wGdjZqMNBeF
zeaZm_$7OJiA9wKNv(wDd5-W}8dOk6qh)$P*^0q<f-ETQ`4X##Q7(e*Zw=d5$JHd^+
zb`4=-Vi<{G6EZfPaOnUUh>i%tKnjUYlSSALar2F%6Yn^A#4Y6P?!wg$7B^U!mKj7b
zS_j7p7#b+xhcgwp?C=k~=?IP<y8)TLK~k)Q3<K<++Kq?ab{9VOiGRn`<PLoGzg{G}
z8NQT8B;_^-j!X_+GXsp;d&;HUfq(wW3&dv@Wkw5hz_e(zB6-#Vl8BTSA!d;(Slxa6
z5XSoLcNPknCq2*qxPn;{^W0c=__=Z0kzF`?cpN8V6UT0zU=Pb7$(9hAu5P*s;V9ZI
z+<x06KA8Vi)Hka5=BZ06Xje_!N~~?2*>tn+H60*j1_$;H8^3a&fnq76IarVjwb2YG
zv65;+ky0ungtxurb}Y<Zk#P`s%4w@b$`wi%$=Hx)OY!>s)HqhgMHF}}N(+)~E~Jri
z3j0aa4%llXjvSuA=l*R;_m4u>nN_S7Z9~18&$-uYWZ#P7BslT<2?cpH>kZf%`|Jk_
zIzkCrksd;I3xb@mD3%MgPNVU(RF3gCpIBE1n_cCF=~WmB>o8ys2z)r8o?<Wz;#IAe
z>N93E2p|Vaq+51;L;Cr=d$~*ehvCa9Frz5Eo&)C@meY~fy-hKVq;WBC9>)<Z{;lvY
z88PhuGmwPTI5eQYzxe&2kePEyuS**Ni+GjSDOrN*!pbH-``9@=@Wumh*#ms93(024
z#dHP**Oqjf3I*T$_8ENr8|O$K#f>O2F3l`%{;%f&FAT%?wOgI<1b!EE1c7Q)UK?Jg
zjiA$Eq<Hf<)UXl=;dQ%DvsZu6b*!e%Mkm<0tD9}qc#!pKssVobi)V5E;xapFfS}dn
zI&FmA4i$Er_h>;TKH3zTAN%BExIDX#(b0jqTrM-6%Vn|sFs)=ujj}Zhs|SZyu@UfO
z6a^plz4%T<ENg{*MnAS$2h2tiTbfQKLq=uEbmJq8_9>o;`I$9*=|9hEd7-GV+4AZR
zHC2ZV@ToIPIJ}n%+6WOet2&(O`Z#F9F+<EwU&YKqg|%n1llMKv^621I^4~nOIlyEQ
zdxX+>Jk2!-14hUb8N4i;bmx150_{vT;~sNjWw@o;BH?xVVDuF;#fGuy7IWXxZnL}s
zM)dOB8j1y1W4o=q5F&O6>Qm>|aL3dD_KlSg@}4=aBPj~~ZUe%W_>afWpi=K*bY~fb
zeD>>C7HfF5^f4c`f1mcz0Dlv=2H&PEh+*@%*?S^o1tr)N)`ZwxyW03nq0l{6DrPxR
zIl32U+|!{z6(eQA3umu9N9nz!<bg@GdU>Hr_%zTVJW?qwLpl=MmMQD(7oYp)EZ%na
zI7+21ii8rsC-WtkuXf4(mq|zx1O0^=+VR~WOtdYEmPtxF8Kwg@Cxondrqnz^J#Ro2
z-o|DgLl+(;7DL_5Vsd|{6MS!|&j~wikImTDLe6zl*a;dNva3J;%;lBMN&_<XVCPDx
z1Y{K!x$g%(c2NyG(TX<X7<hiRj$7t8v1i!F>Wb1n7T3*Uak)jIr@FU^d^Y<n-;XM>
zW+{Q;e1xCd+ey{vE2JkOW+W00f4EY*6RUULj?uZ#BVT(SW^I~XGrK|-YgTLBau78%
zvK$(r)MOvCQfJf#i$-;9co@#eA$a#Zf?KCvhwfi|5MTc5zrp~aLT4SJ+6(E(BTaU@
zEo6&13=Edg3LH|jgS_3s@Nh~9G@K09%{_l{#ayrX;fLNmf<wby7JGaxF-HnxgHkY9
zy5XJ31#5V)?=qsb^H<gveps^&Sr%M)qfO}0i9Dz%`C*{sz${zseQ*8%{F@%cX=2te
zGkWAy^Fxvn!jy_*v#T;9lLvqEcg5>}=?HSw@4?BBqCiC}tKY{&=_vl_hTp+w{`Mod
zGC%u<@zL_=$>XDQJE?|~IF0^mP^0ASfRT2Jm^k@|BmL3ZL+3vKr~T-xAw$O5m){Ai
z&<Cf!01>W`2CK*&c=N9fyzW7Ne!cN8q}CawBspg4rr!1A`)KujSxcUq+F@nynJVtS
z=e_ST?eSxf3;P*}Dzj-J9@`7K_kKJeTpTlgfVq`Rt&zdZ<nDdhc~t93x0<}fmd4RH
zKdd(b5~efh&8w;}DU7DGY?84Iaog@p@K1(ezsDZj@8mPYuPagNAHt5&apW8hB?SZd
z(ZeX*^3I{eET351sGVpevJv^6=E38?SkLtpqU?olh9_?tSvq<1VChYVi#P8pce8@f
zEKc2x;_jm`hHgUKHwDpu7)h%I@4KI%lI>vZ;CO$@N!}hcz1JtPA0%FTIgW)M^2NLU
z?n%u;5if{TagoMICa_JppL6a>4(h*5h49A7;e7u7sh!Ak;4qB@j<>?}wFxtuG|IJ{
z5=3ziSF}-K@ts+#Ly{0!u=B!lp5l66F+Td+<JskB-fL!pQM2Td$xIX^qrU4f{Hb3@
zCpX4eMsR~oSXa-($Z^Ill#z7UeZ3lcPm63>L$ERXmC(b(tmnm7JKz|mxW~2R+u3YR
zIIcP2+Dc(kDw7Q+N6NTsas<PL98_{t#+0s8a!9pw>MSg?+b+=olg2C3QDdm;7iyd&
z!4oQ{VJ|(69ko*!4lZatm2f^0yf`WC0>*BFER92yMi`3%4R2_Q2jPjhi-eBEm9y;L
z;UBYK{kgfV+nyxX{|O834#T#j%@Hu4vpGIm$WriSawJ?b&J!z5^mEA08)~3dP^08F
zwv5$`iz2U4e@9WGor{@54aR&C;>f*NJ9sZ%Twlc<=Rbsf8(%}@3_$D{gR$orFW${;
z4sg+2FFI!0NI9xf1!%dVG!s2OkwoHewr1kHtz7m|N~k^+5jDT6&RNJ=aM%%DrrL3&
z-bOKLNy7`#riD2QyPQl18Ji9jd9I;lwbGIaNstaCiH4?r(Fnm>%krqWWt^S-1MEEe
zJhC>s{`esz{7y)Ym=?!Kx4$=3nIs5C-XcsT4UatCVA&5Qx%>f>C%DA%`~4*8Q#W!g
zHLRFv5o4>E6TLg2<`<evogz_C#w&R7OIvMfNul?IB+@LXwE~iZ8W-f&c&8jv-IEUI
zk_Kv-y|^-X0tbx?JV`~GFw+j?Al$(e7m?4e`JKUxNM^yWrr#T4CqGQdAd-9hNZi$G
z`})p8Bw9SE8wovdrEH|ODAjDLcHi<eUO8c;5~Bwr!2yH^e`gKxccH&Cdd_JlMS7^k
z)AbT8^xdiTfcARprpjebXE5Aefid!yo5HG7XFX_5XOSQdnqiV03B7P2QX5q=ovf7n
zRcpx}l`11d&j8mnbO9@8wj48goux8iD2NFy4m}#7M5`s#s3}te`L1Myx|dqt;*_>w
zjlrjIw3Ad2YFQrpEY_+<w+Q_-J7$)KZvg9;flU^5LGM<Ks9lLe5tWe?srHmF$vx5g
zH*FfqXzH(Y_7blY-O3rEv#RMAVI1o%NTH`gnF=s{7SN_%@+0+^%3y-FETfJB2BS_2
z7xnJfU%I<;MmwMidi?^DwOPdVDq<(A+H9XBQ5;NqZ64dj^Q(8Kh1~YMVB0yGPLm$)
zp^Z}$-_};X>^Y`&Eq`y)fmp*uS2gRzMS~6~j)yANfbV{f_rp$aeZHzM0t?RqwRP0j
z8XSN^6|{odTHK``ASilC^dy?@rEERe*h+}z{GOp(ETbkXRjg{mHBcF(2SJ?96Jf90
z%Pl$1qs}3w=||~WYLQqml!;cPCi+%taM<QSyh|&MI+-hJP^!$aUsbM9N!GEj8DpGC
zW2t3K;<2P0Fk`7BqZU^FD4fQTI@B&e#J}ZB2J4Q^-$NR$7(VEMM18M8CSqOOVhf3J
z8u^MBXvY)nJoJ+n<!DC@g+YbPGeqNg0fipIO}(XvkmKdrMH)YYsCpIit6j9%_0=rm
zw_=|eNK6eOy?2wm?1XkCEx0I5or%oUcs)^yEeDd9VT2TF=GLZ|vWwT%8TC4QN6@>E
zHa=2AiMo$OtsbMbIm2-?hh|cP#lDcw=QMdljS7;*3y4=2u)N&BoM(r7CWjZ>o%nGX
zBp)@IemCynS4CbMs*F}QNJn4YQPs08(_;5!PYBii4{t2vbSz5oo?0ABg=;NobUk=<
z-cxl!hKV$^)Mu`zz6)awu=%R2dr!|_S}V%jMwpeB<wQFNirtbc1G8E2tk%^{Z?j!p
zs#_Na#|NH|ZTq=qJD4t0rkjlPMH+lSMOz<<GDv9nMX^X7h_@ofcUEL1)eJ`-NyJMP
zt*$Yc5xwWts~L4&+<WN7>4FZ#y2ex{)OZ-`BaG_q_=i#R{$VZd*i|nUmK|_q5rkP0
z<#|G07~ROUJ8*hay6RWGr#=*%;-N6~-rn`S2Si{ViaX{&<eJ4WV_6;7WK&WjCi$PA
z?VhmHO-lC#sUI!rK7q7TZ>O@b2Sw$4zzi_ki613x&yTBq5HClOd@|1Te}PljH%u+#
z<tq-|{TUe5%|%a^{KzvhMGidWQ<2yCloy6O<7T+mlgSNjQ|x2I-A(Qvv5cf>Su)EZ
zJ!9Ka&Ep)MsYvu}Xz0Qfy*`rOPHi$I9hS7x>@61V8h^c#NMlwS&LvjPG(kAy<Vsyb
zyv%w((R1SMn?HQ5aIsn(Gdf{%k$4>yi5y9yq>tGzB$3SXa3f2agpvwS!nd?Di>(bt
zp|<)sU?wdgWs`=pM3Ys@=|$?YC5Ci~`lO0$K0JNxFY&Yg?C~=P{%^1U7GMC<3RaH5
SH>7R=0000<MNUMnLSTaAiE}If

literal 0
HcmV?d00001

diff --git a/datamodels/2.x/itop-structure/images/typology.png b/datamodels/2.x/itop-structure/images/typology.png
new file mode 100644
index 0000000000000000000000000000000000000000..35bae8187bb5398e47ae78336625b0ee4ba6553d
GIT binary patch
literal 5171
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

literal 0
HcmV?d00001

diff --git a/datamodels/2.x/itop-structure/images/vlan.png b/datamodels/2.x/itop-structure/images/vlan.png
new file mode 100644
index 0000000000000000000000000000000000000000..f690b2f5d365cbe64b6200e7a8381ced3459f563
GIT binary patch
literal 3313
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

literal 0
HcmV?d00001

diff --git a/datamodels/2.x/itop-structure/images/volume.png b/datamodels/2.x/itop-structure/images/volume.png
new file mode 100644
index 0000000000000000000000000000000000000000..cc354091260a5210da2675b4f93608899808da83
GIT binary patch
literal 4685
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
P00000NkvXXu0mjf&e}Fa

literal 0
HcmV?d00001

diff --git a/datamodels/2.x/itop-structure/images/webapp.png b/datamodels/2.x/itop-structure/images/webapp.png
new file mode 100644
index 0000000000000000000000000000000000000000..3506f6c07ae5b7c94797c429e0affdaebd472b81
GIT binary patch
literal 5084
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
J)46f)e*l~}8_oa#

literal 0
HcmV?d00001

diff --git a/datamodels/2.x/itop-structure/images/webserver.png b/datamodels/2.x/itop-structure/images/webserver.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d9cf43dd0e07a99f892cb90cb41dfd3f29df488
GIT binary patch
literal 4874
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
G?f(J3OSNhM

literal 0
HcmV?d00001

diff --git a/datamodels/2.x/itop-structure/it.dict.itop-structure.php b/datamodels/2.x/itop-structure/it.dict.itop-structure.php
new file mode 100644
index 000000000..d343b016d
--- /dev/null
+++ b/datamodels/2.x/itop-structure/it.dict.itop-structure.php
@@ -0,0 +1,351 @@
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+ * @author      Benjamin Planque <benjamin.planque@combodo.com>
+ * @copyright   Copyright (C) 2010-2018 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+//////////////////////////////////////////////////////////////////////
+// Note: The classes have been grouped by categories: bizmodel
+//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+//
+// Class: Organization
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:Organization' => 'Organizzazione',
+	'Class:Organization+' => '',
+	'Class:Organization/Attribute:name' => 'Cognome',
+	'Class:Organization/Attribute:name+' => 'Nome',
+	'Class:Organization/Attribute:code' => 'Codice',
+	'Class:Organization/Attribute:code+' => 'Codice dell\'organizzazione (Siret, DUNS,...)',
+	'Class:Organization/Attribute:status' => 'Stato',
+	'Class:Organization/Attribute:status+' => '',
+	'Class:Organization/Attribute:status/Value:active' => 'Attivo',
+	'Class:Organization/Attribute:status/Value:active+' => 'Attivo',
+	'Class:Organization/Attribute:status/Value:inactive' => 'Inattivo',
+	'Class:Organization/Attribute:status/Value:inactive+' => 'Inattivo',
+	'Class:Organization/Attribute:parent_id' => 'Parent',
+	'Class:Organization/Attribute:parent_id+' => 'Parent organization',
+	'Class:Organization/Attribute:parent_name' => 'Parent name',
+	'Class:Organization/Attribute:parent_name+' => 'Name of the parent organization',
+	'Class:Organization/Attribute:deliverymodel_id' => 'Delivery model~~',
+	'Class:Organization/Attribute:deliverymodel_id+' => '~~',
+	'Class:Organization/Attribute:deliverymodel_name' => 'Delivery model name~~',
+	'Class:Organization/Attribute:deliverymodel_name+' => '~~',
+	'Class:Organization/Attribute:parent_id_friendlyname' => 'Parent~~',
+	'Class:Organization/Attribute:parent_id_friendlyname+' => 'Parent organization~~',
+	'Class:Organization/Attribute:overview' => 'Overview~~',
+	'Organization:Overview:FunctionalCIs' => 'Configuration items of this organization~~',
+	'Organization:Overview:FunctionalCIs:subtitle' => 'by type~~',
+	'Organization:Overview:Users' => 'iTop Users within this organization~~',
+));
+
+//
+// Class: Location
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:Location' => 'Localizzazione',
+	'Class:Location+' => 'Qualsiasi tipo di localizzazione: Regione, Paese, Città, Sito, Edificio, Piano, Stanza, Rack,,...',
+	'Class:Location/Attribute:name' => 'Nome',
+	'Class:Location/Attribute:name+' => '',
+	'Class:Location/Attribute:status' => 'Stato',
+	'Class:Location/Attribute:status+' => '',
+	'Class:Location/Attribute:status/Value:active' => 'Attivo',
+	'Class:Location/Attribute:status/Value:active+' => 'Attivo',
+	'Class:Location/Attribute:status/Value:inactive' => 'Inattivo',
+	'Class:Location/Attribute:status/Value:inactive+' => 'Inattivo',
+	'Class:Location/Attribute:org_id' => 'Organizzazione proprietaria',
+	'Class:Location/Attribute:org_id+' => '',
+	'Class:Location/Attribute:org_name' => 'Nome dell\'organizzazione',
+	'Class:Location/Attribute:org_name+' => '',
+	'Class:Location/Attribute:address' => 'Indirizzo',
+	'Class:Location/Attribute:address+' => 'Indirizzo postale',
+	'Class:Location/Attribute:postal_code' => 'Codice avviamento postale',
+	'Class:Location/Attribute:postal_code+' => 'CAP/codice avviamento postale',
+	'Class:Location/Attribute:city' => 'Città',
+	'Class:Location/Attribute:city+' => '',
+	'Class:Location/Attribute:country' => 'Paese',
+	'Class:Location/Attribute:country+' => '',
+	'Class:Location/Attribute:physicaldevice_list' => 'Devices~~',
+	'Class:Location/Attribute:physicaldevice_list+' => 'All the devices in this location~~',
+	'Class:Location/Attribute:person_list' => 'Contacts~~',
+	'Class:Location/Attribute:person_list+' => 'All the contacts located on this location~~',
+));
+
+//
+// Class: Contact
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:Contact' => 'Contatto',
+	'Class:Contact+' => '',
+	'Class:Contact/Attribute:name' => 'Nome',
+	'Class:Contact/Attribute:name+' => '',
+	'Class:Contact/Attribute:status' => 'Stato',
+	'Class:Contact/Attribute:status+' => '',
+	'Class:Contact/Attribute:status/Value:active' => 'Attivo',
+	'Class:Contact/Attribute:status/Value:active+' => 'Attivo',
+	'Class:Contact/Attribute:status/Value:inactive' => 'Inattivo',
+	'Class:Contact/Attribute:status/Value:inactive+' => 'Inattivo',
+	'Class:Contact/Attribute:org_id' => 'Organizzazione',
+	'Class:Contact/Attribute:org_id+' => '',
+	'Class:Contact/Attribute:org_name' => 'Organizzazione',
+	'Class:Contact/Attribute:org_name+' => '',
+	'Class:Contact/Attribute:email' => 'Email',
+	'Class:Contact/Attribute:email+' => '',
+	'Class:Contact/Attribute:phone' => 'Telefono',
+	'Class:Contact/Attribute:phone+' => '',
+	'Class:Contact/Attribute:notify' => 'Notification~~',
+	'Class:Contact/Attribute:notify+' => '~~',
+	'Class:Contact/Attribute:notify/Value:no' => 'no~~',
+	'Class:Contact/Attribute:notify/Value:no+' => 'no~~',
+	'Class:Contact/Attribute:notify/Value:yes' => 'yes~~',
+	'Class:Contact/Attribute:notify/Value:yes+' => 'yes~~',
+	'Class:Contact/Attribute:function' => 'Function~~',
+	'Class:Contact/Attribute:function+' => '~~',
+	'Class:Contact/Attribute:cis_list' => 'CIs~~',
+	'Class:Contact/Attribute:cis_list+' => 'All the configuration items linked to this contact~~',
+	'Class:Contact/Attribute:finalclass' => 'Tipo',
+	'Class:Contact/Attribute:finalclass+' => '',
+));
+
+//
+// Class: Person
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:Person' => 'Persona',
+	'Class:Person+' => '',
+	'Class:Person/Attribute:name' => 'Last Name~~',
+	'Class:Person/Attribute:name+' => '~~',
+	'Class:Person/Attribute:first_name' => 'Nome',
+	'Class:Person/Attribute:first_name+' => '',
+	'Class:Person/Attribute:employee_number' => 'Employee number~~',
+	'Class:Person/Attribute:employee_number+' => '~~',
+	'Class:Person/Attribute:mobile_phone' => 'Mobile phone~~',
+	'Class:Person/Attribute:mobile_phone+' => '~~',
+	'Class:Person/Attribute:location_id' => 'Location~~',
+	'Class:Person/Attribute:location_id+' => '~~',
+	'Class:Person/Attribute:location_name' => 'Location name~~',
+	'Class:Person/Attribute:location_name+' => '~~',
+	'Class:Person/Attribute:manager_id' => 'Manager~~',
+	'Class:Person/Attribute:manager_id+' => '~~',
+	'Class:Person/Attribute:manager_name' => 'Manager name~~',
+	'Class:Person/Attribute:manager_name+' => '~~',
+	'Class:Person/Attribute:team_list' => 'Teams~~',
+	'Class:Person/Attribute:team_list+' => 'All the teams this person belongs to~~',
+	'Class:Person/Attribute:tickets_list' => 'Tickets~~',
+	'Class:Person/Attribute:tickets_list+' => 'All the tickets this person is the caller~~',
+	'Class:Person/Attribute:manager_id_friendlyname' => 'Manager friendly name~~',
+	'Class:Person/Attribute:manager_id_friendlyname+' => '~~',
+	'Class:Person/Attribute:picture' => 'Picture~~',
+	'Class:Person/Attribute:picture+' => '~~',
+	'Class:Person/UniquenessRule:employee_number+' => 'The employee number must be unique in the organization~~',
+	'Class:Person/UniquenessRule:employee_number' => 'there is already a person in \'$this->org_name$\' organization with the same employee number~~',
+	'Class:Person/UniquenessRule:name+' => 'The employee name should be unique inside its organization~~',
+	'Class:Person/UniquenessRule:name' => 'There is already a person in \'$this->org_name$\' organization with the same name~~',
+));
+
+//
+// Class: Team
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:Team' => 'Squadra',
+	'Class:Team+' => '',
+	'Class:Team/Attribute:persons_list' => 'Members~~',
+	'Class:Team/Attribute:persons_list+' => 'All the people belonging to this team~~',
+	'Class:Team/Attribute:tickets_list' => 'Tickets~~',
+	'Class:Team/Attribute:tickets_list+' => 'All the tickets assigned to this team~~',
+));
+
+//
+// Class: Document
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:Document' => 'Documento',
+	'Class:Document+' => '',
+	'Class:Document/Attribute:name' => 'Nome',
+	'Class:Document/Attribute:name+' => '',
+	'Class:Document/Attribute:org_id' => 'Organizzazione',
+	'Class:Document/Attribute:org_id+' => '~~',
+	'Class:Document/Attribute:org_name' => 'Nome dell\'organizzazione',
+	'Class:Document/Attribute:org_name+' => '',
+	'Class:Document/Attribute:documenttype_id' => 'Document type~~',
+	'Class:Document/Attribute:documenttype_id+' => '~~',
+	'Class:Document/Attribute:documenttype_name' => 'Document type name~~',
+	'Class:Document/Attribute:documenttype_name+' => '~~',
+	'Class:Document/Attribute:version' => 'Version~~',
+	'Class:Document/Attribute:version+' => '~~',
+	'Class:Document/Attribute:description' => 'Descrizione',
+	'Class:Document/Attribute:description+' => '',
+	'Class:Document/Attribute:status' => 'Stato',
+	'Class:Document/Attribute:status+' => '',
+	'Class:Document/Attribute:status/Value:draft' => 'Draft',
+	'Class:Document/Attribute:status/Value:draft+' => '',
+	'Class:Document/Attribute:status/Value:obsolete' => 'Obsoleto',
+	'Class:Document/Attribute:status/Value:obsolete+' => '',
+	'Class:Document/Attribute:status/Value:published' => 'Pubblicato',
+	'Class:Document/Attribute:status/Value:published+' => '',
+	'Class:Document/Attribute:cis_list' => 'CIs~~',
+	'Class:Document/Attribute:cis_list+' => 'All the configuration items linked to this document~~',
+	'Class:Document/Attribute:contracts_list' => 'Contracts~~',
+	'Class:Document/Attribute:contracts_list+' => 'All the contracts linked to this document~~',
+	'Class:Document/Attribute:services_list' => 'Services~~',
+	'Class:Document/Attribute:services_list+' => 'All the services linked to this document~~',
+	'Class:Document/Attribute:finalclass' => 'Document Type~~',
+	'Class:Document/Attribute:finalclass+' => 'Name of the final class~~',
+));
+
+//
+// Class: DocumentFile
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:DocumentFile' => 'Document File~~',
+	'Class:DocumentFile+' => '~~',
+	'Class:DocumentFile/Attribute:file' => 'File~~',
+	'Class:DocumentFile/Attribute:file+' => '~~',
+));
+
+//
+// Class: DocumentNote
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:DocumentNote' => 'Document Note~~',
+	'Class:DocumentNote+' => '~~',
+	'Class:DocumentNote/Attribute:text' => 'Text~~',
+	'Class:DocumentNote/Attribute:text+' => '~~',
+));
+
+//
+// Class: DocumentWeb
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:DocumentWeb' => 'Document Web~~',
+	'Class:DocumentWeb+' => '~~',
+	'Class:DocumentWeb/Attribute:url' => 'URL~~',
+	'Class:DocumentWeb/Attribute:url+' => '~~',
+));
+
+//
+// Class: Typology
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:Typology' => 'Typology~~',
+	'Class:Typology+' => '~~',
+	'Class:Typology/Attribute:name' => 'Name~~',
+	'Class:Typology/Attribute:name+' => '~~',
+	'Class:Typology/Attribute:finalclass' => 'Type~~',
+	'Class:Typology/Attribute:finalclass+' => 'Name of the final class~~',
+));
+
+//
+// Class: DocumentType
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:DocumentType' => 'Document Type~~',
+	'Class:DocumentType+' => '~~',
+));
+
+//
+// Class: ContactType
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:ContactType' => 'Contact Type~~',
+	'Class:ContactType+' => '~~',
+));
+
+//
+// Class: lnkPersonToTeam
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:lnkPersonToTeam' => 'Link Person / Team~~',
+	'Class:lnkPersonToTeam+' => '~~',
+	'Class:lnkPersonToTeam/Attribute:team_id' => 'Team~~',
+	'Class:lnkPersonToTeam/Attribute:team_id+' => '~~',
+	'Class:lnkPersonToTeam/Attribute:team_name' => 'Team name~~',
+	'Class:lnkPersonToTeam/Attribute:team_name+' => '~~',
+	'Class:lnkPersonToTeam/Attribute:person_id' => 'Person~~',
+	'Class:lnkPersonToTeam/Attribute:person_id+' => '~~',
+	'Class:lnkPersonToTeam/Attribute:person_name' => 'Person name~~',
+	'Class:lnkPersonToTeam/Attribute:person_name+' => '~~',
+	'Class:lnkPersonToTeam/Attribute:role_id' => 'Role~~',
+	'Class:lnkPersonToTeam/Attribute:role_id+' => '~~',
+	'Class:lnkPersonToTeam/Attribute:role_name' => 'Role name~~',
+	'Class:lnkPersonToTeam/Attribute:role_name+' => '~~',
+));
+
+//
+// Application Menu
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Menu:DataAdministration' => 'Dati di amministrazione',
+	'Menu:DataAdministration+' => '',
+	'Menu:Catalogs' => 'Cataloghi',
+	'Menu:Catalogs+' => 'Tipi di dato',
+	'Menu:Audit' => 'Audit',
+	'Menu:Audit+' => 'Audit',
+	'Menu:CSVImport' => 'Importazione CSV',
+	'Menu:CSVImport+' => '',
+	'Menu:Organization' => 'Organizzazioni',
+	'Menu:Organization+' => 'Tutte le organizzazioni',
+	'Menu:ConfigManagement' => 'Gestione delle Configurazioni',
+	'Menu:ConfigManagement+' => 'Gestione delle Configurazioni',
+	'Menu:ConfigManagementOverview' => 'Panoramica',
+	'Menu:ConfigManagementOverview+' => 'Panoramica',
+	'Menu:Contact' => 'Contatti',
+	'Menu:Contact+' => 'Contatti',
+	'Menu:Contact:Count' => '%1$d contatti',
+	'Menu:Person' => 'Persone',
+	'Menu:Person+' => 'Tutte le persone',
+	'Menu:Team' => 'Teams',
+	'Menu:Team+' => 'Tutti i Teams',
+	'Menu:Document' => 'Documenti',
+	'Menu:Document+' => 'Tutti i Documenti',
+	'Menu:Location' => 'Posizioni',
+	'Menu:Location+' => 'Tutte le pozisioni',
+	'Menu:NewContact' => 'Nuovo Contatto',
+	'Menu:NewContact+' => 'Nuovo Contatto',
+	'Menu:SearchContacts' => 'Ricerca contatti',
+	'Menu:SearchContacts+' => 'Ricerca contatti',
+	'Menu:ConfigManagement:Shortcuts' => 'Scorciatoie',
+	'Menu:ConfigManagement:AllContacts' => 'Tutti i contatti: %1$d',
+	'Menu:Typology' => 'Typology configuration~~',
+	'Menu:Typology+' => 'Typology configuration~~',
+	'UI_WelcomeMenu_AllConfigItems' => 'Summary~~',
+	'Menu:ConfigManagement:Typology' => 'Typology configuration~~',
+
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-structure/ja.dict.itop-structure.php b/datamodels/2.x/itop-structure/ja.dict.itop-structure.php
new file mode 100644
index 000000000..ee3831f4a
--- /dev/null
+++ b/datamodels/2.x/itop-structure/ja.dict.itop-structure.php
@@ -0,0 +1,351 @@
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+ * @author      Benjamin Planque <benjamin.planque@combodo.com>
+ * @copyright   Copyright (C) 2010-2018 Combodo SARL
+ * @licence	http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+//////////////////////////////////////////////////////////////////////
+// Note: The classes have been grouped by categories: bizmodel
+//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+
+//
+// Class: Organization
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:Organization' => '組織',
+	'Class:Organization+' => '',
+	'Class:Organization/Attribute:name' => '名前',
+	'Class:Organization/Attribute:name+' => '共通名',
+	'Class:Organization/Attribute:code' => 'コード',
+	'Class:Organization/Attribute:code+' => '組織コード(Siret, DUNS, ...)',
+	'Class:Organization/Attribute:status' => '状態',
+	'Class:Organization/Attribute:status+' => '',
+	'Class:Organization/Attribute:status/Value:active' => 'アクティブ',
+	'Class:Organization/Attribute:status/Value:active+' => 'アクティブ',
+	'Class:Organization/Attribute:status/Value:inactive' => '非アクティブ',
+	'Class:Organization/Attribute:status/Value:inactive+' => '非アクティブ',
+	'Class:Organization/Attribute:parent_id' => '親',
+	'Class:Organization/Attribute:parent_id+' => '親組織',
+	'Class:Organization/Attribute:parent_name' => '親名前',
+	'Class:Organization/Attribute:parent_name+' => '親組織の名前',
+	'Class:Organization/Attribute:deliverymodel_id' => '提供モデル',
+	'Class:Organization/Attribute:deliverymodel_id+' => '',
+	'Class:Organization/Attribute:deliverymodel_name' => '提供モデル名',
+	'Class:Organization/Attribute:deliverymodel_name+' => '',
+	'Class:Organization/Attribute:parent_id_friendlyname' => '親',
+	'Class:Organization/Attribute:parent_id_friendlyname+' => '親組織',
+	'Class:Organization/Attribute:overview' => 'Overview~~',
+	'Organization:Overview:FunctionalCIs' => 'Configuration items of this organization~~',
+	'Organization:Overview:FunctionalCIs:subtitle' => 'by type~~',
+	'Organization:Overview:Users' => 'iTop Users within this organization~~',
+));
+
+//
+// Class: Location
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:Location' => '場所',
+	'Class:Location+' => '任意の場所のタイプ: リージョン、国、都市、サイト、ビル、フロア、部屋、ラック、...',
+	'Class:Location/Attribute:name' => '名前',
+	'Class:Location/Attribute:name+' => '',
+	'Class:Location/Attribute:status' => '状態',
+	'Class:Location/Attribute:status+' => '',
+	'Class:Location/Attribute:status/Value:active' => 'アクティブ',
+	'Class:Location/Attribute:status/Value:active+' => 'アクティブ',
+	'Class:Location/Attribute:status/Value:inactive' => '非アクティブ',
+	'Class:Location/Attribute:status/Value:inactive+' => '非アクティブ',
+	'Class:Location/Attribute:org_id' => 'オーナー組織',
+	'Class:Location/Attribute:org_id+' => '',
+	'Class:Location/Attribute:org_name' => 'オーナー組織名前',
+	'Class:Location/Attribute:org_name+' => '',
+	'Class:Location/Attribute:address' => '住所',
+	'Class:Location/Attribute:address+' => '住所',
+	'Class:Location/Attribute:postal_code' => '郵便番号',
+	'Class:Location/Attribute:postal_code+' => 'ZIP/郵便番号',
+	'Class:Location/Attribute:city' => '都市',
+	'Class:Location/Attribute:city+' => '',
+	'Class:Location/Attribute:country' => '国',
+	'Class:Location/Attribute:country+' => '',
+	'Class:Location/Attribute:physicaldevice_list' => 'デバイス',
+	'Class:Location/Attribute:physicaldevice_list+' => '',
+	'Class:Location/Attribute:person_list' => '連絡先',
+	'Class:Location/Attribute:person_list+' => '',
+));
+
+//
+// Class: Contact
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:Contact' => '連絡先',
+	'Class:Contact+' => '',
+	'Class:Contact/Attribute:name' => '名前',
+	'Class:Contact/Attribute:name+' => '',
+	'Class:Contact/Attribute:status' => '状態',
+	'Class:Contact/Attribute:status+' => '',
+	'Class:Contact/Attribute:status/Value:active' => 'アクティブ',
+	'Class:Contact/Attribute:status/Value:active+' => 'アクティブ',
+	'Class:Contact/Attribute:status/Value:inactive' => '非アクティブ',
+	'Class:Contact/Attribute:status/Value:inactive+' => '非アクティブ',
+	'Class:Contact/Attribute:org_id' => '組織',
+	'Class:Contact/Attribute:org_id+' => '',
+	'Class:Contact/Attribute:org_name' => '組織',
+	'Class:Contact/Attribute:org_name+' => '',
+	'Class:Contact/Attribute:email' => 'Eメール',
+	'Class:Contact/Attribute:email+' => '',
+	'Class:Contact/Attribute:phone' => '電話',
+	'Class:Contact/Attribute:phone+' => '',
+	'Class:Contact/Attribute:notify' => '通知',
+	'Class:Contact/Attribute:notify+' => '',
+	'Class:Contact/Attribute:notify/Value:no' => 'いいえ',
+	'Class:Contact/Attribute:notify/Value:no+' => 'いいえ',
+	'Class:Contact/Attribute:notify/Value:yes' => 'はい',
+	'Class:Contact/Attribute:notify/Value:yes+' => 'はい',
+	'Class:Contact/Attribute:function' => '機能',
+	'Class:Contact/Attribute:function+' => '',
+	'Class:Contact/Attribute:cis_list' => 'CI',
+	'Class:Contact/Attribute:cis_list+' => '',
+	'Class:Contact/Attribute:finalclass' => '連絡先タイプ',
+	'Class:Contact/Attribute:finalclass+' => '',
+));
+
+//
+// Class: Person
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:Person' => '人物',
+	'Class:Person+' => '',
+	'Class:Person/Attribute:name' => '姓',
+	'Class:Person/Attribute:name+' => '~~',
+	'Class:Person/Attribute:first_name' => 'ファーストネーム',
+	'Class:Person/Attribute:first_name+' => '',
+	'Class:Person/Attribute:employee_number' => '社員番号',
+	'Class:Person/Attribute:employee_number+' => '',
+	'Class:Person/Attribute:mobile_phone' => '携帯電話',
+	'Class:Person/Attribute:mobile_phone+' => '',
+	'Class:Person/Attribute:location_id' => '場所',
+	'Class:Person/Attribute:location_id+' => '',
+	'Class:Person/Attribute:location_name' => '場所名',
+	'Class:Person/Attribute:location_name+' => '',
+	'Class:Person/Attribute:manager_id' => 'マネージャ',
+	'Class:Person/Attribute:manager_id+' => '',
+	'Class:Person/Attribute:manager_name' => 'マネージャ名',
+	'Class:Person/Attribute:manager_name+' => '',
+	'Class:Person/Attribute:team_list' => 'チーム',
+	'Class:Person/Attribute:team_list+' => '',
+	'Class:Person/Attribute:tickets_list' => 'チケット',
+	'Class:Person/Attribute:tickets_list+' => '',
+	'Class:Person/Attribute:manager_id_friendlyname' => 'マネージャーフレンドリ名',
+	'Class:Person/Attribute:manager_id_friendlyname+' => '',
+	'Class:Person/Attribute:picture' => 'Picture~~',
+	'Class:Person/Attribute:picture+' => '~~',
+	'Class:Person/UniquenessRule:employee_number+' => 'The employee number must be unique in the organization~~',
+	'Class:Person/UniquenessRule:employee_number' => 'there is already a person in \'$this->org_name$\' organization with the same employee number~~',
+	'Class:Person/UniquenessRule:name+' => 'The employee name should be unique inside its organization~~',
+	'Class:Person/UniquenessRule:name' => 'There is already a person in \'$this->org_name$\' organization with the same name~~',
+));
+
+//
+// Class: Team
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:Team' => 'チーム',
+	'Class:Team+' => '',
+	'Class:Team/Attribute:persons_list' => 'メンバー',
+	'Class:Team/Attribute:persons_list+' => '',
+	'Class:Team/Attribute:tickets_list' => 'チケット',
+	'Class:Team/Attribute:tickets_list+' => '',
+));
+
+//
+// Class: Document
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:Document' => '文書',
+	'Class:Document+' => '',
+	'Class:Document/Attribute:name' => '名前',
+	'Class:Document/Attribute:name+' => '',
+	'Class:Document/Attribute:org_id' => '組織',
+	'Class:Document/Attribute:org_id+' => '',
+	'Class:Document/Attribute:org_name' => '組織名',
+	'Class:Document/Attribute:org_name+' => '',
+	'Class:Document/Attribute:documenttype_id' => '文書タイプ',
+	'Class:Document/Attribute:documenttype_id+' => '',
+	'Class:Document/Attribute:documenttype_name' => '文書タイプ名',
+	'Class:Document/Attribute:documenttype_name+' => '',
+	'Class:Document/Attribute:version' => 'Version~~',
+	'Class:Document/Attribute:version+' => '~~',
+	'Class:Document/Attribute:description' => '説明',
+	'Class:Document/Attribute:description+' => '',
+	'Class:Document/Attribute:status' => '状態',
+	'Class:Document/Attribute:status+' => '',
+	'Class:Document/Attribute:status/Value:draft' => '下書き',
+	'Class:Document/Attribute:status/Value:draft+' => '',
+	'Class:Document/Attribute:status/Value:obsolete' => '廃止',
+	'Class:Document/Attribute:status/Value:obsolete+' => '',
+	'Class:Document/Attribute:status/Value:published' => '公開済み',
+	'Class:Document/Attribute:status/Value:published+' => '',
+	'Class:Document/Attribute:cis_list' => 'CI',
+	'Class:Document/Attribute:cis_list+' => '',
+	'Class:Document/Attribute:contracts_list' => '契約',
+	'Class:Document/Attribute:contracts_list+' => '',
+	'Class:Document/Attribute:services_list' => 'サービス',
+	'Class:Document/Attribute:services_list+' => '',
+	'Class:Document/Attribute:finalclass' => '文書タイプ',
+	'Class:Document/Attribute:finalclass+' => '',
+));
+
+//
+// Class: DocumentFile
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:DocumentFile' => '文書ファイル',
+	'Class:DocumentFile+' => '',
+	'Class:DocumentFile/Attribute:file' => 'ファイル',
+	'Class:DocumentFile/Attribute:file+' => '',
+));
+
+//
+// Class: DocumentNote
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:DocumentNote' => '文書ノート',
+	'Class:DocumentNote+' => '',
+	'Class:DocumentNote/Attribute:text' => 'テキスト',
+	'Class:DocumentNote/Attribute:text+' => '',
+));
+
+//
+// Class: DocumentWeb
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:DocumentWeb' => '文書Web',
+	'Class:DocumentWeb+' => '',
+	'Class:DocumentWeb/Attribute:url' => 'URL',
+	'Class:DocumentWeb/Attribute:url+' => '',
+));
+
+//
+// Class: Typology
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:Typology' => '分類',
+	'Class:Typology+' => '',
+	'Class:Typology/Attribute:name' => '名前',
+	'Class:Typology/Attribute:name+' => '',
+	'Class:Typology/Attribute:finalclass' => 'タイプ',
+	'Class:Typology/Attribute:finalclass+' => '',
+));
+
+//
+// Class: DocumentType
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:DocumentType' => '文書タイプ',
+	'Class:DocumentType+' => '',
+));
+
+//
+// Class: ContactType
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:ContactType' => '問い合せ先タイプ',
+	'Class:ContactType+' => '',
+));
+
+//
+// Class: lnkPersonToTeam
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:lnkPersonToTeam' => 'リンク 人物/チーム',
+	'Class:lnkPersonToTeam+' => '',
+	'Class:lnkPersonToTeam/Attribute:team_id' => 'チーム',
+	'Class:lnkPersonToTeam/Attribute:team_id+' => '',
+	'Class:lnkPersonToTeam/Attribute:team_name' => 'チーム名',
+	'Class:lnkPersonToTeam/Attribute:team_name+' => '',
+	'Class:lnkPersonToTeam/Attribute:person_id' => '人物',
+	'Class:lnkPersonToTeam/Attribute:person_id+' => '',
+	'Class:lnkPersonToTeam/Attribute:person_name' => '名前',
+	'Class:lnkPersonToTeam/Attribute:person_name+' => '',
+	'Class:lnkPersonToTeam/Attribute:role_id' => '役割',
+	'Class:lnkPersonToTeam/Attribute:role_id+' => '',
+	'Class:lnkPersonToTeam/Attribute:role_name' => '役割名',
+	'Class:lnkPersonToTeam/Attribute:role_name+' => '',
+));
+
+//
+// Application Menu
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Menu:DataAdministration' => 'データ管理',
+	'Menu:DataAdministration+' => 'データ管理',
+	'Menu:Catalogs' => 'カタログ',
+	'Menu:Catalogs+' => 'データタイプ',
+	'Menu:Audit' => '監査',
+	'Menu:Audit+' => '監査',
+	'Menu:CSVImport' => 'CSV インポート',
+	'Menu:CSVImport+' => '一括作成/一括更新',
+	'Menu:Organization' => '組織',
+	'Menu:Organization+' => '全組織',
+	'Menu:ConfigManagement' => '構成管理',
+	'Menu:ConfigManagement+' => '構成管理',
+	'Menu:ConfigManagementOverview' => '概要',
+	'Menu:ConfigManagementOverview+' => '概要',
+	'Menu:Contact' => '連絡先',
+	'Menu:Contact+' => '連絡先',
+	'Menu:Contact:Count' => '%1$d',
+	'Menu:Person' => '人物',
+	'Menu:Person+' => '全人物',
+	'Menu:Team' => 'チーム',
+	'Menu:Team+' => '全チーム',
+	'Menu:Document' => '文書',
+	'Menu:Document+' => '全文書',
+	'Menu:Location' => '場所',
+	'Menu:Location+' => '全ての場所',
+	'Menu:NewContact' => '新規連絡先',
+	'Menu:NewContact+' => '新規連絡先',
+	'Menu:SearchContacts' => '連絡先検索',
+	'Menu:SearchContacts+' => '連絡先検索',
+	'Menu:ConfigManagement:Shortcuts' => 'ショートカット',
+	'Menu:ConfigManagement:AllContacts' => '全連絡先: %1$d',
+	'Menu:Typology' => 'トポロジー構成',
+	'Menu:Typology+' => 'トポロジー構成',
+	'UI_WelcomeMenu_AllConfigItems' => 'サマリー',
+	'Menu:ConfigManagement:Typology' => '分類構成',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-structure/main.itop-structure.php b/datamodels/2.x/itop-structure/main.itop-structure.php
new file mode 100644
index 000000000..f989da795
--- /dev/null
+++ b/datamodels/2.x/itop-structure/main.itop-structure.php
@@ -0,0 +1,25 @@
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+// Starting with iTop 1.2 you can restrict the list of organizations displayed in the drop-down list
+// by specifying a query as shown below. Note that this is NOT a security settings, since the
+// choice 'All Organizations' will always be available in the menu
+ApplicationMenu::SetFavoriteSiloQuery('SELECT Organization');
+
+?>
diff --git a/datamodels/2.x/itop-structure/module.itop-structure.php b/datamodels/2.x/itop-structure/module.itop-structure.php
new file mode 100644
index 000000000..829e3f693
--- /dev/null
+++ b/datamodels/2.x/itop-structure/module.itop-structure.php
@@ -0,0 +1,99 @@
+<?php
+
+
+SetupWebPage::AddModule(
+	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
+	'itop-structure/2.7.1',
+	array(
+		// Identification
+		//
+		'label' => 'Structure de base iTop',
+		'category' => 'core',
+
+		// Setup
+		//
+		'dependencies' => array(
+		),
+		'mandatory' => true,
+		'visible' => true,
+		'installer' => 'ConfigMgmtInstaller',
+
+		// Components
+		//
+		'datamodel' => array(
+			'main.itop-structure.php',
+			'model.itop-structure.php',
+		),
+		'data.struct' => array(
+		),
+		'data.sample' => array(
+			'data.sample.organizations.xml',
+			'data.sample.persons.xml',
+			'data.sample.teams.xml',
+			'data.sample.contactteam.xml',
+
+		),
+		
+		// Documentation
+		//
+		'doc.manual_setup' => '',
+		'doc.more_information' => '',
+
+		// Default settings
+		//
+		'settings' => array(
+		),
+	)
+);
+
+if (!class_exists('ConfigMgmtInstaller'))
+{
+	// Module installation handler
+	//
+	class ConfigMgmtInstaller extends ModuleInstallerAPI
+	{
+		public static function BeforeWritingConfig(Config $oConfiguration)
+		{
+			// If you want to override/force some configuration values, do it here
+			return $oConfiguration;
+		}
+
+		/**
+		 * Handler called before creating or upgrading the database schema
+		 * @param $oConfiguration Config The new configuration of the application
+		 * @param $sPreviousVersion string PRevious version number of the module (empty string in case of first install)
+		 * @param $sCurrentVersion string Current version number of the module
+		 */
+		public static function BeforeDatabaseCreation(Config $oConfiguration, $sPreviousVersion, $sCurrentVersion)
+		{
+			if (strlen($sPreviousVersion) > 0)
+			{
+				// If you want to migrate data from one format to another, do it here
+				self::RenameEnumValueInDB('Software', 'type', 'DBserver', 'DBServer');
+				self::RenameEnumValueInDB('Software', 'type', 'Webserver', 'WebServer');
+				self::RenameEnumValueInDB('Model', 'type', 'SANswitch', 'SANSwitch');
+				self::RenameEnumValueInDB('Model', 'type', 'IpPhone', 'IPPhone');
+				self::RenameEnumValueInDB('Model', 'type', 'Telephone', 'Phone');
+				self::RenameClassInDB('DBserver', 'DBServer');
+				self::RenameClassInDB('OSfamily', 'OSFamily');
+				self::RenameClassInDB('OSversion', 'OSVersion');
+				self::RenameClassInDB('Webserver', 'WebServer');
+				self::RenameClassInDB('OSpatch', 'OSPatch');
+				self::RenameClassInDB('lnkFunctionalCIToOSpatch', 'lnkFunctionalCIToOSPatch');
+				self::RenameClassInDB('OsLicence', 'OSLicence');
+				self::RenameClassInDB('IOSversion', 'IOSVersion');
+				self::RenameClassInDB('IPinterface', 'IPInterface');
+			}
+		}
+	
+		/**
+		 * Handler called after the creation/update of the database schema
+		 * @param $oConfiguration Config The new configuration of the application
+		 * @param $sPreviousVersion string PRevious version number of the module (empty string in case of first install)
+		 * @param $sCurrentVersion string Current version number of the module
+		 */
+		public static function AfterDatabaseCreation(Config $oConfiguration, $sPreviousVersion, $sCurrentVersion)
+		{
+		}
+	}
+}
diff --git a/datamodels/2.x/itop-structure/nl.dict.itop-structure.php b/datamodels/2.x/itop-structure/nl.dict.itop-structure.php
new file mode 100644
index 000000000..81a2ac216
--- /dev/null
+++ b/datamodels/2.x/itop-structure/nl.dict.itop-structure.php
@@ -0,0 +1,356 @@
+<?php
+// Copyright (C) 2010-2019 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+ * @author  Benjamin Planque <benjamin.planque@combodo.com>
+ * @author	LinProfs <info@linprofs.com>
+ * Linux & Open Source Professionals
+ * http://www.linprofs.com
+ *
+ * @author Hipska (2018, 2019)
+ * @author Jeffrey Bostoen - <jbostoen.itop@outlook.com> (2018 - 2020)
+ *
+ * @copyright   Copyright (C) 2010-2018 Combodo SARL
+ * @licence	http://opensource.org/licenses/AGPL-3.0
+ */
+
+//////////////////////////////////////////////////////////////////////
+// Note: The classes have been grouped by categories: bizmodel
+//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+//
+// Class: Organization
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:Organization' => 'Organisatie',
+	'Class:Organization+' => '',
+	'Class:Organization/Attribute:name' => 'Naam',
+	'Class:Organization/Attribute:name+' => 'Gekende naam voor de organisatie',
+	'Class:Organization/Attribute:code' => 'Code',
+	'Class:Organization/Attribute:code+' => 'Code voor de organisatie',
+	'Class:Organization/Attribute:status' => 'Status',
+	'Class:Organization/Attribute:status+' => '',
+	'Class:Organization/Attribute:status/Value:active' => 'Actief',
+	'Class:Organization/Attribute:status/Value:active+' => 'Actief',
+	'Class:Organization/Attribute:status/Value:inactive' => 'Inactief',
+	'Class:Organization/Attribute:status/Value:inactive+' => 'Inactief',
+	'Class:Organization/Attribute:parent_id' => 'Hoofdorganisatie',
+	'Class:Organization/Attribute:parent_id+' => 'Hoofdorganisatie',
+	'Class:Organization/Attribute:parent_name' => 'Naam hoofdorganisatie',
+	'Class:Organization/Attribute:parent_name+' => 'Naam van de hoofdorganisatie',
+	'Class:Organization/Attribute:deliverymodel_id' => 'Leveringsmodel',
+	'Class:Organization/Attribute:deliverymodel_id+' => '',
+	'Class:Organization/Attribute:deliverymodel_name' => 'Naam leveringsmodel',
+	'Class:Organization/Attribute:deliverymodel_name+' => '',
+	'Class:Organization/Attribute:parent_id_friendlyname' => 'Hoofdorganisatie',
+	'Class:Organization/Attribute:parent_id_friendlyname+' => 'Hoofdorganisatie',
+	'Class:Organization/Attribute:overview' => 'Overzicht',
+	'Organization:Overview:FunctionalCIs' => 'Configuratie-items van deze organisatie',
+	'Organization:Overview:FunctionalCIs:subtitle' => 'per type',
+	'Organization:Overview:Users' => 'iTop-gebruikers in deze organisatie',
+));
+
+//
+// Class: Location
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:Location' => 'Locatie',
+	'Class:Location+' => 'Een locatie zoals: land, regio, gemeente/stad, gebouw, verdieping, kamer, ...',
+	'Class:Location/Attribute:name' => 'Naam',
+	'Class:Location/Attribute:name+' => '',
+	'Class:Location/Attribute:status' => 'Status',
+	'Class:Location/Attribute:status+' => '',
+	'Class:Location/Attribute:status/Value:active' => 'Actief',
+	'Class:Location/Attribute:status/Value:active+' => 'Actief',
+	'Class:Location/Attribute:status/Value:inactive' => 'Inactief',
+	'Class:Location/Attribute:status/Value:inactive+' => 'Inactief',
+	'Class:Location/Attribute:org_id' => 'Organisatie',
+	'Class:Location/Attribute:org_id+' => '',
+	'Class:Location/Attribute:org_name' => 'Naam organisatie',
+	'Class:Location/Attribute:org_name+' => '',
+	'Class:Location/Attribute:address' => 'Adres',
+	'Class:Location/Attribute:address+' => 'Adres van de organisatie',
+	'Class:Location/Attribute:postal_code' => 'Postcode',
+	'Class:Location/Attribute:postal_code+' => 'Postcode van de organisatie',
+	'Class:Location/Attribute:city' => 'Gemeente',
+	'Class:Location/Attribute:city+' => '',
+	'Class:Location/Attribute:country' => 'Land',
+	'Class:Location/Attribute:country+' => '',
+	'Class:Location/Attribute:physicaldevice_list' => 'Apparaten',
+	'Class:Location/Attribute:physicaldevice_list+' => 'Alle apparaten die zich op deze locatie bevinden',
+	'Class:Location/Attribute:person_list' => 'Contacten',
+	'Class:Location/Attribute:person_list+' => 'Alle contacten die zich op deze locatie bevinden',
+));
+
+//
+// Class: Contact
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:Contact' => 'Contact',
+	'Class:Contact+' => '',
+	'Class:Contact/Attribute:name' => 'Naam',
+	'Class:Contact/Attribute:name+' => '',
+	'Class:Contact/Attribute:status' => 'Status',
+	'Class:Contact/Attribute:status+' => '',
+	'Class:Contact/Attribute:status/Value:active' => 'Actief',
+	'Class:Contact/Attribute:status/Value:active+' => 'Actief',
+	'Class:Contact/Attribute:status/Value:inactive' => 'Inactief',
+	'Class:Contact/Attribute:status/Value:inactive+' => 'Inactief',
+	'Class:Contact/Attribute:org_id' => 'Organisatie',
+	'Class:Contact/Attribute:org_id+' => '',
+	'Class:Contact/Attribute:org_name' => 'Naam organisatie',
+	'Class:Contact/Attribute:org_name+' => '',
+	'Class:Contact/Attribute:email' => 'E-mailadres',
+	'Class:Contact/Attribute:email+' => '',
+	'Class:Contact/Attribute:phone' => 'Telefoon',
+	'Class:Contact/Attribute:phone+' => '',
+	'Class:Contact/Attribute:notify' => 'Melding',
+	'Class:Contact/Attribute:notify+' => '',
+	'Class:Contact/Attribute:notify/Value:no' => 'Nee',
+	'Class:Contact/Attribute:notify/Value:no+' => 'Nee',
+	'Class:Contact/Attribute:notify/Value:yes' => 'Ja',
+	'Class:Contact/Attribute:notify/Value:yes+' => 'Ja',
+	'Class:Contact/Attribute:function' => 'Functie',
+	'Class:Contact/Attribute:function+' => '',
+	'Class:Contact/Attribute:cis_list' => 'CI\'s',
+	'Class:Contact/Attribute:cis_list+' => 'Alle configuratie-items die gerelateerd zijn aan dit team',
+	'Class:Contact/Attribute:finalclass' => 'Subklasse contact',
+	'Class:Contact/Attribute:finalclass+' => '',
+));
+
+//
+// Class: Person
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:Person' => 'Persoon',
+	'Class:Person+' => '',
+	'Class:Person/Attribute:name' => 'Achternaam',
+	'Class:Person/Attribute:name+' => '',
+	'Class:Person/Attribute:first_name' => 'Voornaam',
+	'Class:Person/Attribute:first_name+' => '',
+	'Class:Person/Attribute:employee_number' => 'Identificatienummer',
+	'Class:Person/Attribute:employee_number+' => 'Een uniek nummer om de persoon te identificeren (bv. rijksregister, burgerservicenummer, werknemernummer, ...)',
+	'Class:Person/Attribute:mobile_phone' => 'Mobiele telefoon',
+	'Class:Person/Attribute:mobile_phone+' => '',
+	'Class:Person/Attribute:location_id' => 'Locatie',
+	'Class:Person/Attribute:location_id+' => 'Locatie waar de persoon gecontacteerd kan worden',
+	'Class:Person/Attribute:location_name' => 'Naam locatie',
+	'Class:Person/Attribute:location_name+' => '',
+	'Class:Person/Attribute:manager_id' => 'Manager',
+	'Class:Person/Attribute:manager_id+' => '',
+	'Class:Person/Attribute:manager_name' => 'Naam manager',
+	'Class:Person/Attribute:manager_name+' => '',
+	'Class:Person/Attribute:team_list' => 'Teams',
+	'Class:Person/Attribute:team_list+' => 'Alle teams waarvan deze persoon lid is',
+	'Class:Person/Attribute:tickets_list' => 'Tickets',
+	'Class:Person/Attribute:tickets_list+' => 'Alle tickets waarvan deze persoon de aanvrager is',
+	'Class:Person/Attribute:manager_id_friendlyname' => 'Herkenbare naam manager',
+	'Class:Person/Attribute:manager_id_friendlyname+' => '',
+	'Class:Person/Attribute:picture' => 'Foto',
+	'Class:Person/Attribute:picture+' => 'Foto van de contactpersoon',
+	'Class:Person/UniquenessRule:employee_number+' => 'Het identificatienummer moet uniek zijn binnen de organisatie',
+	'Class:Person/UniquenessRule:employee_number' => 'Er is al een persoon in de organisatie \'$this->org_name$\' met hetzelfde identificatienummer',
+	'Class:Person/UniquenessRule:name+' => 'De naam moet uniek zijn binnen een organisatie',
+	'Class:Person/UniquenessRule:name' => 'Er is al een persoon in de organisatie \'$this->org_name$\' met dezelfde naam',
+));
+
+//
+// Class: Team
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:Team' => 'Team',
+	'Class:Team+' => '',
+	'Class:Team/Attribute:persons_list' => 'Leden',
+	'Class:Team/Attribute:persons_list+' => 'Alle personen die lid zijn van dit team',
+	'Class:Team/Attribute:tickets_list' => 'Tickets',
+	'Class:Team/Attribute:tickets_list+' => 'Alle tickets die toegewezen zijn aan dit team',
+));
+
+//
+// Class: Document
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:Document' => 'Document',
+	'Class:Document+' => '',
+	'Class:Document/Attribute:name' => 'Naam',
+	'Class:Document/Attribute:name+' => '',
+	'Class:Document/Attribute:org_id' => 'Organisatie',
+	'Class:Document/Attribute:org_id+' => '',
+	'Class:Document/Attribute:org_name' => 'Naam organisatie',
+	'Class:Document/Attribute:org_name+' => '',
+	'Class:Document/Attribute:documenttype_id' => 'Soort document',
+	'Class:Document/Attribute:documenttype_id+' => '',
+	'Class:Document/Attribute:documenttype_name' => 'Naam van het soort document',
+	'Class:Document/Attribute:documenttype_name+' => '',
+	'Class:Document/Attribute:version' => 'Versie',
+	'Class:Document/Attribute:version+' => '',
+	'Class:Document/Attribute:description' => 'Omschrijving',
+	'Class:Document/Attribute:description+' => '',
+	'Class:Document/Attribute:status' => 'Status',
+	'Class:Document/Attribute:status+' => '',
+	'Class:Document/Attribute:status/Value:draft' => 'Concept',
+	'Class:Document/Attribute:status/Value:draft+' => '',
+	'Class:Document/Attribute:status/Value:obsolete' => 'Verouderd',
+	'Class:Document/Attribute:status/Value:obsolete+' => '',
+	'Class:Document/Attribute:status/Value:published' => 'Gepubliceerd',
+	'Class:Document/Attribute:status/Value:published+' => '',
+	'Class:Document/Attribute:cis_list' => 'CI\'s',
+	'Class:Document/Attribute:cis_list+' => 'Alle configuratie-items gerelateerd aan dit document',
+	'Class:Document/Attribute:contracts_list' => 'Contracten',
+	'Class:Document/Attribute:contracts_list+' => 'Alle contracten gerelateerd aan dit document',
+	'Class:Document/Attribute:services_list' => 'Services',
+	'Class:Document/Attribute:services_list+' => 'Alle services gerelateerd aan dit document.',
+	'Class:Document/Attribute:finalclass' => 'Subklasse document',
+	'Class:Document/Attribute:finalclass+' => '',
+));
+
+//
+// Class: DocumentFile
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:DocumentFile' => 'Document: Bestand',
+	'Class:DocumentFile+' => '',
+	'Class:DocumentFile/Attribute:file' => 'Bestand',
+	'Class:DocumentFile/Attribute:file+' => '',
+));
+
+//
+// Class: DocumentNote
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:DocumentNote' => 'Document: Notitie',
+	'Class:DocumentNote+' => '',
+	'Class:DocumentNote/Attribute:text' => 'Tekst',
+	'Class:DocumentNote/Attribute:text+' => '',
+));
+
+//
+// Class: DocumentWeb
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:DocumentWeb' => 'Document: Web',
+	'Class:DocumentWeb+' => '',
+	'Class:DocumentWeb/Attribute:url' => 'Link (URL)',
+	'Class:DocumentWeb/Attribute:url+' => '',
+));
+
+//
+// Class: Typology
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:Typology' => 'Typologie',
+	'Class:Typology+' => '',
+	'Class:Typology/Attribute:name' => 'Naam',
+	'Class:Typology/Attribute:name+' => '',
+	'Class:Typology/Attribute:finalclass' => 'Subklasse typologie',
+	'Class:Typology/Attribute:finalclass+' => '',
+));
+
+//
+// Class: DocumentType
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:DocumentType' => 'Soort Document',
+	'Class:DocumentType+' => '',
+));
+
+//
+// Class: ContactType
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:ContactType' => 'Soort Contact',
+	'Class:ContactType+' => '',
+));
+
+//
+// Class: lnkPersonToTeam
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:lnkPersonToTeam' => 'Link Persoon / Team',
+	'Class:lnkPersonToTeam+' => '',
+	'Class:lnkPersonToTeam/Attribute:team_id' => 'Team',
+	'Class:lnkPersonToTeam/Attribute:team_id+' => '',
+	'Class:lnkPersonToTeam/Attribute:team_name' => 'Naam team',
+	'Class:lnkPersonToTeam/Attribute:team_name+' => '',
+	'Class:lnkPersonToTeam/Attribute:person_id' => 'Persoon',
+	'Class:lnkPersonToTeam/Attribute:person_id+' => '',
+	'Class:lnkPersonToTeam/Attribute:person_name' => 'Naam persoon',
+	'Class:lnkPersonToTeam/Attribute:person_name+' => '',
+	'Class:lnkPersonToTeam/Attribute:role_id' => 'Rol',
+	'Class:lnkPersonToTeam/Attribute:role_id+' => '',
+	'Class:lnkPersonToTeam/Attribute:role_name' => 'Naam rol',
+	'Class:lnkPersonToTeam/Attribute:role_name+' => '',
+));
+
+//
+// Application Menu
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Menu:DataAdministration' => 'Databeheer',
+	'Menu:DataAdministration+' => 'Databeheer',
+	'Menu:Catalogs' => 'Catalogus',
+	'Menu:Catalogs+' => 'Soorten data',
+	'Menu:Audit' => 'Audit',
+	'Menu:Audit+' => 'Audit',
+	'Menu:CSVImport' => 'CSV-import',
+	'Menu:CSVImport+' => 'Grootschalige aanmaak of update',
+	'Menu:Organization' => 'Organisaties',
+	'Menu:Organization+' => 'Alle organisaties',
+	'Menu:ConfigManagement' => 'Configuratiebeheer',
+	'Menu:ConfigManagement+' => 'Configuratiebeheer',
+	'Menu:ConfigManagementOverview' => 'Overzicht',
+	'Menu:ConfigManagementOverview+' => 'Overzicht',
+	'Menu:Contact' => 'Contacten',
+	'Menu:Contact+' => 'Contacten',
+	'Menu:Contact:Count' => '%1$d contacten',
+	'Menu:Person' => 'Personen',
+	'Menu:Person+' => 'Alle personen',
+	'Menu:Team' => 'Teams',
+	'Menu:Team+' => 'Alle teams',
+	'Menu:Document' => 'Documenten',
+	'Menu:Document+' => 'Alle documenten',
+	'Menu:Location' => 'Locaties',
+	'Menu:Location+' => 'Alle locaties',
+	'Menu:NewContact' => 'Nieuw contact',
+	'Menu:NewContact+' => 'Maak een nieuw contact aan',
+	'Menu:SearchContacts' => 'Zoek naar contacten',
+	'Menu:SearchContacts+' => 'Zoek naar contacten',
+	'Menu:ConfigManagement:Shortcuts' => 'Snelkoppelingen',
+	'Menu:ConfigManagement:AllContacts' => 'Alle contacten: %1$d',
+	'Menu:Typology' => 'Configuratie typologie',
+	'Menu:Typology+' => 'Configuratie van de typologie',
+	'UI_WelcomeMenu_AllConfigItems' => 'Samenvatting',
+	'Menu:ConfigManagement:Typology' => 'Configuratie typologie',
+));
diff --git a/datamodels/2.x/itop-structure/pt_br.dict.itop-structure.php b/datamodels/2.x/itop-structure/pt_br.dict.itop-structure.php
new file mode 100644
index 000000000..440647436
--- /dev/null
+++ b/datamodels/2.x/itop-structure/pt_br.dict.itop-structure.php
@@ -0,0 +1,350 @@
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+ * Localized data
+ * @author      Benjamin Planque <benjamin.planque@combodo.com>
+ * @copyright   Copyright (C) 2010-2018 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+//////////////////////////////////////////////////////////////////////
+// Note: The classes have been grouped by categories: bizmodel
+//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+
+//
+// Class: Organization
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:Organization' => 'Organização',
+	'Class:Organization+' => '',
+	'Class:Organization/Attribute:name' => 'Nome',
+	'Class:Organization/Attribute:name+' => 'Nome comum',
+	'Class:Organization/Attribute:code' => 'Código',
+	'Class:Organization/Attribute:code+' => 'Código organização (Siret, DUNS,...)',
+	'Class:Organization/Attribute:status' => 'Estado',
+	'Class:Organization/Attribute:status+' => '',
+	'Class:Organization/Attribute:status/Value:active' => 'Ativo',
+	'Class:Organization/Attribute:status/Value:active+' => 'Ativo',
+	'Class:Organization/Attribute:status/Value:inactive' => 'Inativo',
+	'Class:Organization/Attribute:status/Value:inactive+' => 'Inativo',
+	'Class:Organization/Attribute:parent_id' => 'Principal',
+	'Class:Organization/Attribute:parent_id+' => 'Organização principal',
+	'Class:Organization/Attribute:parent_name' => 'Nome principal',
+	'Class:Organization/Attribute:parent_name+' => 'Nome da organização principal',
+	'Class:Organization/Attribute:deliverymodel_id' => 'Modelo entrega',
+	'Class:Organization/Attribute:deliverymodel_id+' => '',
+	'Class:Organization/Attribute:deliverymodel_name' => 'Nome modelo entrega',
+	'Class:Organization/Attribute:deliverymodel_name+' => '',
+	'Class:Organization/Attribute:parent_id_friendlyname' => 'Principal',
+	'Class:Organization/Attribute:parent_id_friendlyname+' => 'Organização principal',
+	'Class:Organization/Attribute:overview' => 'Visão geral',
+	'Organization:Overview:FunctionalCIs' => 'Itens de configuração desta organização',
+	'Organization:Overview:FunctionalCIs:subtitle' => 'por tipo',
+	'Organization:Overview:Users' => 'Usuários iTop dentro desta organização',
+));
+
+//
+// Class: Location
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:Location' => 'Localidade',
+	'Class:Location+' => 'Qualquer tipo de localização: Região, País, Cidade, Lugar, Edifício, Andar, Sala, Rack,...',
+	'Class:Location/Attribute:name' => 'Nome',
+	'Class:Location/Attribute:name+' => '',
+	'Class:Location/Attribute:status' => 'Estado',
+	'Class:Location/Attribute:status+' => '',
+	'Class:Location/Attribute:status/Value:active' => 'Ativo',
+	'Class:Location/Attribute:status/Value:active+' => 'Ativo',
+	'Class:Location/Attribute:status/Value:inactive' => 'Inativo',
+	'Class:Location/Attribute:status/Value:inactive+' => 'Inativo',
+	'Class:Location/Attribute:org_id' => 'Organização',
+	'Class:Location/Attribute:org_id+' => '',
+	'Class:Location/Attribute:org_name' => 'Nome organização',
+	'Class:Location/Attribute:org_name+' => '',
+	'Class:Location/Attribute:address' => 'Endereço',
+	'Class:Location/Attribute:address+' => 'Endereço',
+	'Class:Location/Attribute:postal_code' => 'CEP',
+	'Class:Location/Attribute:postal_code+' => 'CEP',
+	'Class:Location/Attribute:city' => 'Cidade',
+	'Class:Location/Attribute:city+' => '',
+	'Class:Location/Attribute:country' => 'País',
+	'Class:Location/Attribute:country+' => '',
+	'Class:Location/Attribute:physicaldevice_list' => 'Dispositivos',
+	'Class:Location/Attribute:physicaldevice_list+' => 'Todos os dispositivos desta localidade',
+	'Class:Location/Attribute:person_list' => 'Contatos',
+	'Class:Location/Attribute:person_list+' => 'Todos os contatos desta localidade',
+));
+
+//
+// Class: Contact
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:Contact' => 'Contato',
+	'Class:Contact+' => '',
+	'Class:Contact/Attribute:name' => 'Nome',
+	'Class:Contact/Attribute:name+' => '',
+	'Class:Contact/Attribute:status' => 'Estado',
+	'Class:Contact/Attribute:status+' => '',
+	'Class:Contact/Attribute:status/Value:active' => 'Ativo',
+	'Class:Contact/Attribute:status/Value:active+' => 'Ativo',
+	'Class:Contact/Attribute:status/Value:inactive' => 'Inativo',
+	'Class:Contact/Attribute:status/Value:inactive+' => 'Inativo',
+	'Class:Contact/Attribute:org_id' => 'Organização',
+	'Class:Contact/Attribute:org_id+' => '',
+	'Class:Contact/Attribute:org_name' => 'Nome organização',
+	'Class:Contact/Attribute:org_name+' => '',
+	'Class:Contact/Attribute:email' => 'Email',
+	'Class:Contact/Attribute:email+' => '',
+	'Class:Contact/Attribute:phone' => 'Telefone',
+	'Class:Contact/Attribute:phone+' => '',
+	'Class:Contact/Attribute:notify' => 'Notificação',
+	'Class:Contact/Attribute:notify+' => '',
+	'Class:Contact/Attribute:notify/Value:no' => 'Não',
+	'Class:Contact/Attribute:notify/Value:no+' => 'Não',
+	'Class:Contact/Attribute:notify/Value:yes' => 'Sim',
+	'Class:Contact/Attribute:notify/Value:yes+' => 'Sim',
+	'Class:Contact/Attribute:function' => 'Função',
+	'Class:Contact/Attribute:function+' => '',
+	'Class:Contact/Attribute:cis_list' => 'CIs',
+	'Class:Contact/Attribute:cis_list+' => 'Todos os itens de configuração vinculado a esse contato',
+	'Class:Contact/Attribute:finalclass' => 'Tipo contato',
+	'Class:Contact/Attribute:finalclass+' => '',
+));
+
+//
+// Class: Person
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:Person' => 'Pessoa',
+	'Class:Person+' => '',
+	'Class:Person/Attribute:name' => 'Último nome',
+	'Class:Person/Attribute:name+' => '',
+	'Class:Person/Attribute:first_name' => 'Primeiro nome',
+	'Class:Person/Attribute:first_name+' => '',
+	'Class:Person/Attribute:employee_number' => 'Número colaborador',
+	'Class:Person/Attribute:employee_number+' => '',
+	'Class:Person/Attribute:mobile_phone' => 'Celular',
+	'Class:Person/Attribute:mobile_phone+' => '',
+	'Class:Person/Attribute:location_id' => 'Localidade',
+	'Class:Person/Attribute:location_id+' => '',
+	'Class:Person/Attribute:location_name' => 'Nome localidade',
+	'Class:Person/Attribute:location_name+' => '',
+	'Class:Person/Attribute:manager_id' => 'Gerente',
+	'Class:Person/Attribute:manager_id+' => '',
+	'Class:Person/Attribute:manager_name' => 'Nome gerente',
+	'Class:Person/Attribute:manager_name+' => '',
+	'Class:Person/Attribute:team_list' => 'Equipes',
+	'Class:Person/Attribute:team_list+' => 'Todas as equipes que essa pessoa pertence',
+	'Class:Person/Attribute:tickets_list' => 'Solicitações',
+	'Class:Person/Attribute:tickets_list+' => 'Todos as solicitações que essa pessoa solicitou',
+	'Class:Person/Attribute:manager_id_friendlyname' => 'Nome amigável gerente',
+	'Class:Person/Attribute:manager_id_friendlyname+' => '',
+	'Class:Person/Attribute:picture' => 'Foto',
+	'Class:Person/Attribute:picture+' => '',
+	'Class:Person/UniquenessRule:employee_number+' => 'O número de funcionário deve ser único na organização',
+	'Class:Person/UniquenessRule:employee_number' => 'Já existe uma pessoa na organização \'$this->org_name$\' com o mesmo número de funcionário',
+	'Class:Person/UniquenessRule:name+' => 'O nome do funcionário deve ser único dentro de sua organização',
+	'Class:Person/UniquenessRule:name' => 'Já existe uma pessoa na organização \'$this->org_name$\' com o mesmo nome',
+));
+
+//
+// Class: Team
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:Team' => 'Equipe',
+	'Class:Team+' => '',
+	'Class:Team/Attribute:persons_list' => 'Membros',
+	'Class:Team/Attribute:persons_list+' => 'Todas as pessoas que pertencem a esta equipe',
+	'Class:Team/Attribute:tickets_list' => 'Solicitações',
+	'Class:Team/Attribute:tickets_list+' => 'Todas as solicitações atribuídas a esta equipe',
+));
+
+//
+// Class: Document
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:Document' => 'Documento',
+	'Class:Document+' => '',
+	'Class:Document/Attribute:name' => 'Nome',
+	'Class:Document/Attribute:name+' => '',
+	'Class:Document/Attribute:org_id' => 'Organização',
+	'Class:Document/Attribute:org_id+' => '',
+	'Class:Document/Attribute:org_name' => 'Nome organização',
+	'Class:Document/Attribute:org_name+' => '',
+	'Class:Document/Attribute:documenttype_id' => 'Tipo documento',
+	'Class:Document/Attribute:documenttype_id+' => '',
+	'Class:Document/Attribute:documenttype_name' => 'Nome tipo documento',
+	'Class:Document/Attribute:documenttype_name+' => '',
+	'Class:Document/Attribute:version' => 'Versão',
+	'Class:Document/Attribute:version+' => '',
+	'Class:Document/Attribute:description' => 'Descrição',
+	'Class:Document/Attribute:description+' => '',
+	'Class:Document/Attribute:status' => 'Estado',
+	'Class:Document/Attribute:status+' => '',
+	'Class:Document/Attribute:status/Value:draft' => 'Rascunho',
+	'Class:Document/Attribute:status/Value:draft+' => '',
+	'Class:Document/Attribute:status/Value:obsolete' => 'Obsoleto',
+	'Class:Document/Attribute:status/Value:obsolete+' => '',
+	'Class:Document/Attribute:status/Value:published' => 'Publicado',
+	'Class:Document/Attribute:status/Value:published+' => '',
+	'Class:Document/Attribute:cis_list' => 'CIs',
+	'Class:Document/Attribute:cis_list+' => 'Todos os itens de configuração vinculados a esse documento',
+	'Class:Document/Attribute:contracts_list' => 'Contratos',
+	'Class:Document/Attribute:contracts_list+' => 'Todos os contratos vinculados com esse documento',
+	'Class:Document/Attribute:services_list' => 'Services',
+	'Class:Document/Attribute:services_list+' => 'Todos os serviços vinculados a esse documento',
+	'Class:Document/Attribute:finalclass' => 'Tipo documento',
+	'Class:Document/Attribute:finalclass+' => '',
+));
+
+//
+// Class: DocumentFile
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:DocumentFile' => 'Arquivo',
+	'Class:DocumentFile+' => '',
+	'Class:DocumentFile/Attribute:file' => 'Arquivo',
+	'Class:DocumentFile/Attribute:file+' => '',
+));
+
+//
+// Class: DocumentNote
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:DocumentNote' => 'Texto',
+	'Class:DocumentNote+' => '',
+	'Class:DocumentNote/Attribute:text' => 'Texto',
+	'Class:DocumentNote/Attribute:text+' => '',
+));
+
+//
+// Class: DocumentWeb
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:DocumentWeb' => 'Web',
+	'Class:DocumentWeb+' => '',
+	'Class:DocumentWeb/Attribute:url' => 'URL',
+	'Class:DocumentWeb/Attribute:url+' => '',
+));
+//
+// Class: Typology
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:Typology' => 'Tipologia',
+	'Class:Typology+' => '',
+	'Class:Typology/Attribute:name' => 'Nome',
+	'Class:Typology/Attribute:name+' => '',
+	'Class:Typology/Attribute:finalclass' => 'Tipo',
+	'Class:Typology/Attribute:finalclass+' => '',
+));
+
+//
+// Class: DocumentType
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:DocumentType' => 'Tipo documento',
+	'Class:DocumentType+' => '',
+));
+
+//
+// Class: ContactType
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:ContactType' => 'Tipo contato',
+	'Class:ContactType+' => '',
+));
+
+//
+// Class: lnkPersonToTeam
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+		'Class:lnkPersonToTeam' => 'Link Pessoa / Equipe',
+		'Class:lnkPersonToTeam+' => '',
+		'Class:lnkPersonToTeam/Attribute:team_id' => 'Equipe',
+		'Class:lnkPersonToTeam/Attribute:team_id+' => '',
+		'Class:lnkPersonToTeam/Attribute:team_name' => 'Nome equipe',
+		'Class:lnkPersonToTeam/Attribute:team_name+' => '',
+		'Class:lnkPersonToTeam/Attribute:person_id' => 'Pessoa',
+		'Class:lnkPersonToTeam/Attribute:person_id+' => '',
+		'Class:lnkPersonToTeam/Attribute:person_name' => 'Nome pessoa',
+		'Class:lnkPersonToTeam/Attribute:person_name+' => '',
+		'Class:lnkPersonToTeam/Attribute:role_id' => 'Função',
+		'Class:lnkPersonToTeam/Attribute:role_id+' => '',
+		'Class:lnkPersonToTeam/Attribute:role_name' => 'Nome função',
+		'Class:lnkPersonToTeam/Attribute:role_name+' => '',
+));
+
+//
+// Application Menu
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Menu:DataAdministration' => 'Administração Dados',
+	'Menu:DataAdministration+' => 'Administração Dados',
+	'Menu:Catalogs' => 'Catálogos',
+	'Menu:Catalogs+' => 'Tipos dados',
+	'Menu:Audit' => 'Auditoria',
+	'Menu:Audit+' => 'Auditoria',
+	'Menu:CSVImport' => 'Importar CSV',
+	'Menu:CSVImport+' => 'Criação ou atualização em massa',
+	'Menu:Organization' => 'Organizações',
+	'Menu:Organization+' => 'Todas organizações',
+	'Menu:ConfigManagement' => 'Gerenciamento Configurações',
+	'Menu:ConfigManagement+' => 'Gerenciamento Configurações',
+	'Menu:ConfigManagementOverview' => 'Visão geral',
+	'Menu:ConfigManagementOverview+' => 'Visão geral',
+	'Menu:Contact' => 'Contatos',
+	'Menu:Contact+' => 'Contatos',
+	'Menu:Contact:Count' => '%1$d contatos',
+	'Menu:Person' => 'Pessoas',
+	'Menu:Person+' => 'Todas pessoas',
+	'Menu:Team' => 'Equipes',
+	'Menu:Team+' => 'Todas equipes',
+	'Menu:Document' => 'Documentos',
+	'Menu:Document+' => 'Todos documentos',
+	'Menu:Location' => 'Localidades',
+	'Menu:Location+' => 'Todas localidades',
+	'Menu:NewContact' => 'Novo contato',
+	'Menu:NewContact+' => 'Novo contato',
+	'Menu:SearchContacts' => 'Pesquisar por contatos',
+	'Menu:SearchContacts+' => 'Pesquisar por contatos',
+	'Menu:ConfigManagement:Shortcuts' => 'Atalhos',
+	'Menu:ConfigManagement:AllContacts' => 'Todos contatos: %1$d',
+	'Menu:Typology' => 'Configuração tipologia',
+	'Menu:Typology+' => 'Configuração tipologia',
+	'UI_WelcomeMenu_AllConfigItems' => 'Índice',
+	'Menu:ConfigManagement:Typology' => 'Configuração tipologia',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-structure/ru.dict.itop-structure.php b/datamodels/2.x/itop-structure/ru.dict.itop-structure.php
new file mode 100644
index 000000000..a7efe8d20
--- /dev/null
+++ b/datamodels/2.x/itop-structure/ru.dict.itop-structure.php
@@ -0,0 +1,336 @@
+<?php
+/**
+ * Локализация интерфейса Combodo iTop подготовлена сообществом iTop по-русски http://community.itop-itsm.ru.
+ * @author      Benjamin Planque <benjamin.planque@combodo.com>
+ * @author      Vladimir Kunin <v.b.kunin@gmail.com>
+ * @link        http://community.itop-itsm.ru  iTop Russian Community
+ * @link        https://github.com/itop-itsm-ru/itop-rus
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ *
+ */
+//////////////////////////////////////////////////////////////////////
+// Note: The classes have been grouped by categories: bizmodel
+//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+//
+// Class: Organization
+//
+
+Dict::Add('RU RU', 'Russian', 'Русский', array(
+	'Class:Organization' => 'Организация',
+	'Class:Organization+' => 'Организация',
+	'Class:Organization/Attribute:name' => 'Название',
+	'Class:Organization/Attribute:name+' => 'Название',
+	'Class:Organization/Attribute:code' => 'Код',
+	'Class:Organization/Attribute:code+' => 'Код в реестре организаций или другой идентификатор',
+	'Class:Organization/Attribute:status' => 'Статус',
+	'Class:Organization/Attribute:status+' => '',
+	'Class:Organization/Attribute:status/Value:active' => 'Активный',
+	'Class:Organization/Attribute:status/Value:active+' => 'Активный',
+	'Class:Organization/Attribute:status/Value:inactive' => 'Неактивный',
+	'Class:Organization/Attribute:status/Value:inactive+' => 'Неактивный',
+	'Class:Organization/Attribute:parent_id' => 'Вышестоящая',
+	'Class:Organization/Attribute:parent_id+' => 'Вышестоящая организация',
+	'Class:Organization/Attribute:parent_name' => 'Вышестоящая',
+	'Class:Organization/Attribute:parent_name+' => 'Вышестоящая организация',
+	'Class:Organization/Attribute:deliverymodel_id' => 'Модель услуг',
+	'Class:Organization/Attribute:deliverymodel_id+' => 'Модель предоставления услуг',
+	'Class:Organization/Attribute:deliverymodel_name' => 'Модель услуг',
+	'Class:Organization/Attribute:deliverymodel_name+' => 'Модель предоставления услуг',
+	'Class:Organization/Attribute:parent_id_friendlyname' => 'Вышестоящая',
+	'Class:Organization/Attribute:parent_id_friendlyname+' => 'Вышестоящая организация',
+	'Class:Organization/Attribute:overview' => 'Обзор',
+	'Organization:Overview:FunctionalCIs' => 'Конфигурационные единицы этой организации',
+	'Organization:Overview:FunctionalCIs:subtitle' => 'по типу',
+	'Organization:Overview:Users' => 'Пользователи iTop этой организации',
+));
+
+//
+// Class: Location
+//
+
+Dict::Add('RU RU', 'Russian', 'Русский', array(
+	'Class:Location' => 'Расположение',
+	'Class:Location+' => 'Типы расположения: Регион, Страна, Город, Сайт, Здание, Этаж, Комната, Стойка и т.п.',
+	'Class:Location/Attribute:name' => 'Название',
+	'Class:Location/Attribute:name+' => '',
+	'Class:Location/Attribute:status' => 'Статус',
+	'Class:Location/Attribute:status+' => '',
+	'Class:Location/Attribute:status/Value:active' => 'Активный',
+	'Class:Location/Attribute:status/Value:active+' => 'Активный',
+	'Class:Location/Attribute:status/Value:inactive' => 'Неактивный',
+	'Class:Location/Attribute:status/Value:inactive+' => 'Неактивный',
+	'Class:Location/Attribute:org_id' => 'Организация',
+	'Class:Location/Attribute:org_id+' => '',
+	'Class:Location/Attribute:org_name' => 'Организация',
+	'Class:Location/Attribute:org_name+' => '',
+	'Class:Location/Attribute:address' => 'Адрес',
+	'Class:Location/Attribute:address+' => 'Почтовый адрес',
+	'Class:Location/Attribute:postal_code' => 'Индекс',
+	'Class:Location/Attribute:postal_code+' => 'Почтовый индекс',
+	'Class:Location/Attribute:city' => 'Город',
+	'Class:Location/Attribute:city+' => '',
+	'Class:Location/Attribute:country' => 'Страна',
+	'Class:Location/Attribute:country+' => '',
+	'Class:Location/Attribute:physicaldevice_list' => 'Устройства',
+	'Class:Location/Attribute:physicaldevice_list+' => 'Устройства в этом расположении',
+	'Class:Location/Attribute:person_list' => 'Контакты',
+	'Class:Location/Attribute:person_list+' => 'Контакты в этом расположении',
+));
+
+//
+// Class: Contact
+//
+
+Dict::Add('RU RU', 'Russian', 'Русский', array(
+	'Class:Contact' => 'Контакт',
+	'Class:Contact+' => 'Контакт',
+	'Class:Contact/Attribute:name' => 'Название',
+	'Class:Contact/Attribute:name+' => '',
+	'Class:Contact/Attribute:status' => 'Статус',
+	'Class:Contact/Attribute:status+' => '',
+	'Class:Contact/Attribute:status/Value:active' => 'Активный',
+	'Class:Contact/Attribute:status/Value:active+' => 'Активный',
+	'Class:Contact/Attribute:status/Value:inactive' => 'Неактивный',
+	'Class:Contact/Attribute:status/Value:inactive+' => 'Неактивный',
+	'Class:Contact/Attribute:org_id' => 'Организация',
+	'Class:Contact/Attribute:org_id+' => '',
+	'Class:Contact/Attribute:org_name' => 'Организация',
+	'Class:Contact/Attribute:org_name+' => '',
+	'Class:Contact/Attribute:email' => 'Email',
+	'Class:Contact/Attribute:email+' => '',
+	'Class:Contact/Attribute:phone' => 'Телефон',
+	'Class:Contact/Attribute:phone+' => '',
+	'Class:Contact/Attribute:notify' => 'Уведомлять',
+	'Class:Contact/Attribute:notify+' => '',
+	'Class:Contact/Attribute:notify/Value:no' => 'нет',
+	'Class:Contact/Attribute:notify/Value:no+' => 'нет',
+	'Class:Contact/Attribute:notify/Value:yes' => 'да',
+	'Class:Contact/Attribute:notify/Value:yes+' => 'да',
+	'Class:Contact/Attribute:function' => 'Функция',
+	'Class:Contact/Attribute:function+' => '',
+	'Class:Contact/Attribute:cis_list' => 'КЕ',
+	'Class:Contact/Attribute:cis_list+' => 'Связанные конфигурационные единицы',
+	'Class:Contact/Attribute:finalclass' => 'Тип контакта',
+	'Class:Contact/Attribute:finalclass+' => '',
+));
+
+//
+// Class: Person
+//
+
+Dict::Add('RU RU', 'Russian', 'Русский', array(
+	'Class:Person' => 'Персона',
+	'Class:Person+' => 'Персона',
+	'Class:Person/Attribute:name' => 'Фамилия',
+	'Class:Person/Attribute:name+' => '',
+	'Class:Person/Attribute:first_name' => 'Имя',
+	'Class:Person/Attribute:first_name+' => '',
+	'Class:Person/Attribute:employee_number' => 'Номер сотрудника',
+	'Class:Person/Attribute:employee_number+' => 'Табельный номер сотрудника или т.п.',
+	'Class:Person/Attribute:mobile_phone' => 'Мобильный телефон',
+	'Class:Person/Attribute:mobile_phone+' => '',
+	'Class:Person/Attribute:location_id' => 'Расположение',
+	'Class:Person/Attribute:location_id+' => '',
+	'Class:Person/Attribute:location_name' => 'Расположение',
+	'Class:Person/Attribute:location_name+' => '',
+	'Class:Person/Attribute:manager_id' => 'Руководитель',
+	'Class:Person/Attribute:manager_id+' => '',
+	'Class:Person/Attribute:manager_name' => 'Руководитель',
+	'Class:Person/Attribute:manager_name+' => '',
+	'Class:Person/Attribute:team_list' => 'Команды',
+	'Class:Person/Attribute:team_list+' => 'Команды с участием персоны',
+	'Class:Person/Attribute:tickets_list' => 'Тикеты',
+	'Class:Person/Attribute:tickets_list+' => 'Связанные тикеты',
+	'Class:Person/Attribute:manager_id_friendlyname' => 'Руководитель',
+	'Class:Person/Attribute:manager_id_friendlyname+' => '',
+	'Class:Person/Attribute:picture' => 'Фотография',
+	'Class:Person/Attribute:picture+' => '',
+	'Class:Person/UniquenessRule:employee_number+' => 'Номер сотрудника должен быть уникальным в организации',
+	'Class:Person/UniquenessRule:employee_number' => 'В организации \'$this->org_name$\' уже есть персона с таким номером сотрудника',
+	'Class:Person/UniquenessRule:name+' => 'Имя сотрудника должно быть уникальным внутри организации',
+	'Class:Person/UniquenessRule:name' => 'В организации \'$this->org_name$\' уже есть персона с таким именем',
+));
+
+//
+// Class: Team
+//
+
+Dict::Add('RU RU', 'Russian', 'Русский', array(
+	'Class:Team' => 'Команда',
+	'Class:Team+' => 'Команда',
+	'Class:Team/Attribute:persons_list' => 'Участники',
+	'Class:Team/Attribute:persons_list+' => 'Участники команды',
+	'Class:Team/Attribute:tickets_list' => 'Тикеты',
+	'Class:Team/Attribute:tickets_list+' => 'Все тикеты, назначенные на команду',
+));
+
+//
+// Class: Document
+//
+
+Dict::Add('RU RU', 'Russian', 'Русский', array(
+	'Class:Document' => 'Документ',
+	'Class:Document+' => 'Документ',
+	'Class:Document/Attribute:name' => 'Название',
+	'Class:Document/Attribute:name+' => '',
+	'Class:Document/Attribute:org_id' => 'Организация',
+	'Class:Document/Attribute:org_id+' => '',
+	'Class:Document/Attribute:org_name' => 'Организация',
+	'Class:Document/Attribute:org_name+' => '',
+	'Class:Document/Attribute:documenttype_id' => 'Тип документа',
+	'Class:Document/Attribute:documenttype_id+' => '',
+	'Class:Document/Attribute:documenttype_name' => 'Тип документа',
+	'Class:Document/Attribute:documenttype_name+' => '',
+	'Class:Document/Attribute:version' => 'Версия',
+	'Class:Document/Attribute:version+' => '',
+	'Class:Document/Attribute:description' => 'Описание',
+	'Class:Document/Attribute:description+' => '',
+	'Class:Document/Attribute:status' => 'Статус',
+	'Class:Document/Attribute:status+' => '',
+	'Class:Document/Attribute:status/Value:draft' => 'Черновик',
+	'Class:Document/Attribute:status/Value:draft+' => '',
+	'Class:Document/Attribute:status/Value:obsolete' => 'Устаревший',
+	'Class:Document/Attribute:status/Value:obsolete+' => '',
+	'Class:Document/Attribute:status/Value:published' => 'Опубликованный',
+	'Class:Document/Attribute:status/Value:published+' => '',
+	'Class:Document/Attribute:cis_list' => 'КЕ',
+	'Class:Document/Attribute:cis_list+' => 'Связанные конфигурационные единицы',
+	'Class:Document/Attribute:contracts_list' => 'Договоры',
+	'Class:Document/Attribute:contracts_list+' => 'Связанные договоры',
+	'Class:Document/Attribute:services_list' => 'Услуги',
+	'Class:Document/Attribute:services_list+' => 'Связанные услуги',
+	'Class:Document/Attribute:finalclass' => 'Тип',
+	'Class:Document/Attribute:finalclass+' => '',
+));
+
+//
+// Class: DocumentFile
+//
+
+Dict::Add('RU RU', 'Russian', 'Русский', array(
+	'Class:DocumentFile' => 'Файл',
+	'Class:DocumentFile+' => 'Файл',
+	'Class:DocumentFile/Attribute:file' => 'Файл',
+	'Class:DocumentFile/Attribute:file+' => '',
+));
+
+//
+// Class: DocumentNote
+//
+
+Dict::Add('RU RU', 'Russian', 'Русский', array(
+	'Class:DocumentNote' => 'Заметка',
+	'Class:DocumentNote+' => 'Заметка',
+	'Class:DocumentNote/Attribute:text' => 'Заметка',
+	'Class:DocumentNote/Attribute:text+' => '',
+));
+
+//
+// Class: DocumentWeb
+//
+
+Dict::Add('RU RU', 'Russian', 'Русский', array(
+	'Class:DocumentWeb' => 'Веб-документ',
+	'Class:DocumentWeb+' => 'Веб-документ',
+	'Class:DocumentWeb/Attribute:url' => 'URL',
+	'Class:DocumentWeb/Attribute:url+' => '',
+));
+
+//
+// Class: Typology
+//
+
+Dict::Add('RU RU', 'Russian', 'Русский', array(
+	'Class:Typology' => 'Типология',
+	'Class:Typology+' => 'Типология',
+	'Class:Typology/Attribute:name' => 'Название',
+	'Class:Typology/Attribute:name+' => '',
+	'Class:Typology/Attribute:finalclass' => 'Тип',
+	'Class:Typology/Attribute:finalclass+' => '',
+));
+
+//
+// Class: DocumentType
+//
+
+Dict::Add('RU RU', 'Russian', 'Русский', array(
+	'Class:DocumentType' => 'Тип документа',
+	'Class:DocumentType+' => '',
+));
+
+//
+// Class: ContactType
+//
+
+Dict::Add('RU RU', 'Russian', 'Русский', array(
+	'Class:ContactType' => 'Тип контакта',
+	'Class:ContactType+' => '',
+));
+
+//
+// Class: lnkPersonToTeam
+//
+
+Dict::Add('RU RU', 'Russian', 'Русский', array(
+	'Class:lnkPersonToTeam' => 'Связь Персона/Команда',
+	'Class:lnkPersonToTeam+' => '',
+	'Class:lnkPersonToTeam/Attribute:team_id' => 'Команда',
+	'Class:lnkPersonToTeam/Attribute:team_id+' => '',
+	'Class:lnkPersonToTeam/Attribute:team_name' => 'Команда',
+	'Class:lnkPersonToTeam/Attribute:team_name+' => '',
+	'Class:lnkPersonToTeam/Attribute:person_id' => 'Персона',
+	'Class:lnkPersonToTeam/Attribute:person_id+' => '',
+	'Class:lnkPersonToTeam/Attribute:person_name' => 'Персона',
+	'Class:lnkPersonToTeam/Attribute:person_name+' => '',
+	'Class:lnkPersonToTeam/Attribute:role_id' => 'Роль',
+	'Class:lnkPersonToTeam/Attribute:role_id+' => '',
+	'Class:lnkPersonToTeam/Attribute:role_name' => 'Роль',
+	'Class:lnkPersonToTeam/Attribute:role_name+' => '',
+));
+
+//
+// Application Menu
+//
+
+Dict::Add('RU RU', 'Russian', 'Русский', array(
+	'Menu:DataAdministration' => 'Администрирование данных',
+	'Menu:DataAdministration+' => 'Администрирование данных',
+	'Menu:Catalogs' => 'Каталоги',
+	'Menu:Catalogs+' => 'Каталоги',
+	'Menu:Audit' => 'Аудит',
+	'Menu:Audit+' => 'Аудит',
+	'Menu:CSVImport' => 'Импорт CSV',
+	'Menu:CSVImport+' => 'Массовое создание или обновление объектов',
+	'Menu:Organization' => 'Организации',
+	'Menu:Organization+' => 'Все организации',
+	'Menu:ConfigManagement' => 'Управление конфигурациями',
+	'Menu:ConfigManagement+' => 'Управление конфигурациями',
+	'Menu:ConfigManagementOverview' => 'Обзор',
+	'Menu:ConfigManagementOverview+' => 'Обзор',
+	'Menu:Contact' => 'Контакты',
+	'Menu:Contact+' => 'Контакты',
+	'Menu:Contact:Count' => '%1$d Контактов',
+	'Menu:Person' => 'Персоны',
+	'Menu:Person+' => 'Все персоны',
+	'Menu:Team' => 'Команды',
+	'Menu:Team+' => 'Все команды',
+	'Menu:Document' => 'Документы',
+	'Menu:Document+' => 'Все документы',
+	'Menu:Location' => 'Расположения',
+	'Menu:Location+' => 'Все расположения',
+	'Menu:NewContact' => 'Новый контакт',
+	'Menu:NewContact+' => 'Новый контакт',
+	'Menu:SearchContacts' => 'Поиск контактов',
+	'Menu:SearchContacts+' => 'Поиск контактов',
+	'Menu:ConfigManagement:Shortcuts' => 'Ярлыки',
+	'Menu:ConfigManagement:AllContacts' => 'Все контакты: %1$d',
+	'Menu:Typology' => 'Типология',
+	'Menu:Typology+' => 'Типология',
+	'UI_WelcomeMenu_AllConfigItems' => 'Все конфигурационные единицы',
+	'Menu:ConfigManagement:Typology' => 'Настройка типологии',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-structure/sk.dict.itop-structure.php b/datamodels/2.x/itop-structure/sk.dict.itop-structure.php
new file mode 100644
index 000000000..f2d42f26a
--- /dev/null
+++ b/datamodels/2.x/itop-structure/sk.dict.itop-structure.php
@@ -0,0 +1,349 @@
+<?php
+/**
+ * Localized data
+ * @author Benjamin Planque <benjamin.planque@combodo.com>
+ * @copyright Copyright (C) 2010-2018 Combodo SARL
+ * @license	http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with iTop. If not, see <http://www.gnu.org/licenses/>
+ */
+
+//////////////////////////////////////////////////////////////////////
+// Note: The classes have been grouped by categories: bizmodel
+//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+//
+// Class: Organization
+//
+
+Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
+	'Class:Organization' => 'Organizácia',
+	'Class:Organization+' => '',
+	'Class:Organization/Attribute:name' => 'Názov',
+	'Class:Organization/Attribute:name+' => '',
+	'Class:Organization/Attribute:code' => 'Kód',
+	'Class:Organization/Attribute:code+' => '',
+	'Class:Organization/Attribute:status' => 'Stav',
+	'Class:Organization/Attribute:status+' => '',
+	'Class:Organization/Attribute:status/Value:active' => 'Aktívna',
+	'Class:Organization/Attribute:status/Value:active+' => '',
+	'Class:Organization/Attribute:status/Value:inactive' => 'Neaktívna',
+	'Class:Organization/Attribute:status/Value:inactive+' => '',
+	'Class:Organization/Attribute:parent_id' => 'Nadradená organizácia',
+	'Class:Organization/Attribute:parent_id+' => '',
+	'Class:Organization/Attribute:parent_name' => 'Nadradená organizácia',
+	'Class:Organization/Attribute:parent_name+' => '',
+	'Class:Organization/Attribute:deliverymodel_id' => 'Model dodávky',
+	'Class:Organization/Attribute:deliverymodel_id+' => '',
+	'Class:Organization/Attribute:deliverymodel_name' => 'Názov modelu dodávky',
+	'Class:Organization/Attribute:deliverymodel_name+' => '',
+	'Class:Organization/Attribute:parent_id_friendlyname' => 'Nadradená organizácia',
+	'Class:Organization/Attribute:parent_id_friendlyname+' => '',
+	'Class:Organization/Attribute:overview' => 'Overview~~',
+	'Organization:Overview:FunctionalCIs' => 'Configuration items of this organization~~',
+	'Organization:Overview:FunctionalCIs:subtitle' => 'by type~~',
+	'Organization:Overview:Users' => 'iTop Users within this organization~~',
+));
+
+//
+// Class: Location
+//
+
+Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
+	'Class:Location' => 'Poloha',
+	'Class:Location+' => '',
+	'Class:Location/Attribute:name' => 'Názov',
+	'Class:Location/Attribute:name+' => '',
+	'Class:Location/Attribute:status' => 'Stav',
+	'Class:Location/Attribute:status+' => '',
+	'Class:Location/Attribute:status/Value:active' => 'Aktívna',
+	'Class:Location/Attribute:status/Value:active+' => '',
+	'Class:Location/Attribute:status/Value:inactive' => 'Neaktívna',
+	'Class:Location/Attribute:status/Value:inactive+' => '',
+	'Class:Location/Attribute:org_id' => 'Organizácia vlastníka',
+	'Class:Location/Attribute:org_id+' => '',
+	'Class:Location/Attribute:org_name' => 'Názov organizácie vlastníka',
+	'Class:Location/Attribute:org_name+' => '',
+	'Class:Location/Attribute:address' => 'Adresa',
+	'Class:Location/Attribute:address+' => '',
+	'Class:Location/Attribute:postal_code' => 'PSČ',
+	'Class:Location/Attribute:postal_code+' => '',
+	'Class:Location/Attribute:city' => 'Mesto',
+	'Class:Location/Attribute:city+' => '',
+	'Class:Location/Attribute:country' => 'Štát',
+	'Class:Location/Attribute:country+' => '',
+	'Class:Location/Attribute:physicaldevice_list' => 'Zariadenia',
+	'Class:Location/Attribute:physicaldevice_list+' => '',
+	'Class:Location/Attribute:person_list' => 'Kontakty',
+	'Class:Location/Attribute:person_list+' => '',
+));
+
+//
+// Class: Contact
+//
+
+Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
+	'Class:Contact' => 'Kontakt',
+	'Class:Contact+' => '',
+	'Class:Contact/Attribute:name' => 'Meno',
+	'Class:Contact/Attribute:name+' => '',
+	'Class:Contact/Attribute:status' => 'Stav',
+	'Class:Contact/Attribute:status+' => '',
+	'Class:Contact/Attribute:status/Value:active' => 'Aktívny',
+	'Class:Contact/Attribute:status/Value:active+' => '',
+	'Class:Contact/Attribute:status/Value:inactive' => 'Neaktívny',
+	'Class:Contact/Attribute:status/Value:inactive+' => '',
+	'Class:Contact/Attribute:org_id' => 'Organizácia',
+	'Class:Contact/Attribute:org_id+' => '',
+	'Class:Contact/Attribute:org_name' => 'Názov Organizácie',
+	'Class:Contact/Attribute:org_name+' => '',
+	'Class:Contact/Attribute:email' => 'Email',
+	'Class:Contact/Attribute:email+' => '',
+	'Class:Contact/Attribute:phone' => 'Telefón',
+	'Class:Contact/Attribute:phone+' => '',
+	'Class:Contact/Attribute:notify' => 'Upozornenie',
+	'Class:Contact/Attribute:notify+' => '',
+	'Class:Contact/Attribute:notify/Value:no' => 'nie',
+	'Class:Contact/Attribute:notify/Value:no+' => '',
+	'Class:Contact/Attribute:notify/Value:yes' => 'áno',
+	'Class:Contact/Attribute:notify/Value:yes+' => '',
+	'Class:Contact/Attribute:function' => 'Funkcia',
+	'Class:Contact/Attribute:function+' => '',
+	'Class:Contact/Attribute:cis_list' => 'Zariadenia',
+	'Class:Contact/Attribute:cis_list+' => '',
+	'Class:Contact/Attribute:finalclass' => 'Typ kontaktu',
+	'Class:Contact/Attribute:finalclass+' => '',
+));
+
+//
+// Class: Person
+//
+
+Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
+	'Class:Person' => 'Osoba',
+	'Class:Person+' => '',
+	'Class:Person/Attribute:name' => 'Priezvisko',
+	'Class:Person/Attribute:name+' => '',
+	'Class:Person/Attribute:first_name' => 'Krstné meno',
+	'Class:Person/Attribute:first_name+' => '',
+	'Class:Person/Attribute:employee_number' => 'Číslo zamestnanca',
+	'Class:Person/Attribute:employee_number+' => '',
+	'Class:Person/Attribute:mobile_phone' => 'Telefónne číslo',
+	'Class:Person/Attribute:mobile_phone+' => '',
+	'Class:Person/Attribute:location_id' => 'Poloha',
+	'Class:Person/Attribute:location_id+' => '',
+	'Class:Person/Attribute:location_name' => 'Názov lokality',
+	'Class:Person/Attribute:location_name+' => '',
+	'Class:Person/Attribute:manager_id' => 'Manažér',
+	'Class:Person/Attribute:manager_id+' => '',
+	'Class:Person/Attribute:manager_name' => 'Meno manažéra',
+	'Class:Person/Attribute:manager_name+' => '',
+	'Class:Person/Attribute:team_list' => 'Tímy',
+	'Class:Person/Attribute:team_list+' => '',
+	'Class:Person/Attribute:tickets_list' => 'Tickety',
+	'Class:Person/Attribute:tickets_list+' => '',
+	'Class:Person/Attribute:manager_id_friendlyname' => 'Ľahko čitateľné meno manažéra',
+	'Class:Person/Attribute:manager_id_friendlyname+' => '',
+	'Class:Person/Attribute:picture' => 'Picture~~',
+	'Class:Person/Attribute:picture+' => '~~',
+	'Class:Person/UniquenessRule:employee_number+' => 'The employee number must be unique in the organization~~',
+	'Class:Person/UniquenessRule:employee_number' => 'there is already a person in \'$this->org_name$\' organization with the same employee number~~',
+	'Class:Person/UniquenessRule:name+' => 'The employee name should be unique inside its organization~~',
+	'Class:Person/UniquenessRule:name' => 'There is already a person in \'$this->org_name$\' organization with the same name~~',
+));
+
+//
+// Class: Team
+//
+
+Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
+	'Class:Team' => 'Tím',
+	'Class:Team+' => '',
+	'Class:Team/Attribute:persons_list' => 'Osoby',
+	'Class:Team/Attribute:persons_list+' => '',
+	'Class:Team/Attribute:tickets_list' => 'Tickety',
+	'Class:Team/Attribute:tickets_list+' => '',
+));
+
+//
+// Class: Document
+//
+
+Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
+	'Class:Document' => 'Dokument',
+	'Class:Document+' => '',
+	'Class:Document/Attribute:name' => 'Názov',
+	'Class:Document/Attribute:name+' => '',
+	'Class:Document/Attribute:org_id' => 'Organizácia',
+	'Class:Document/Attribute:org_id+' => '',
+	'Class:Document/Attribute:org_name' => 'Názov Organizácie',
+	'Class:Document/Attribute:org_name+' => '',
+	'Class:Document/Attribute:documenttype_id' => 'Typ dokumentu',
+	'Class:Document/Attribute:documenttype_id+' => '',
+	'Class:Document/Attribute:documenttype_name' => 'Názov typu dokumentu',
+	'Class:Document/Attribute:documenttype_name+' => '',
+	'Class:Document/Attribute:version' => 'Version~~',
+	'Class:Document/Attribute:version+' => '~~',
+	'Class:Document/Attribute:description' => 'Popis',
+	'Class:Document/Attribute:description+' => '',
+	'Class:Document/Attribute:status' => 'Stav',
+	'Class:Document/Attribute:status+' => '',
+	'Class:Document/Attribute:status/Value:draft' => 'Návrh',
+	'Class:Document/Attribute:status/Value:draft+' => '',
+	'Class:Document/Attribute:status/Value:obsolete' => 'Vyradený',
+	'Class:Document/Attribute:status/Value:obsolete+' => '',
+	'Class:Document/Attribute:status/Value:published' => 'Publikovaný',
+	'Class:Document/Attribute:status/Value:published+' => '',
+	'Class:Document/Attribute:cis_list' => 'Komponenty',
+	'Class:Document/Attribute:cis_list+' => '',
+	'Class:Document/Attribute:contracts_list' => 'Zmluvy',
+	'Class:Document/Attribute:contracts_list+' => '',
+	'Class:Document/Attribute:services_list' => 'Služby',
+	'Class:Document/Attribute:services_list+' => '',
+	'Class:Document/Attribute:finalclass' => 'Typ dokumentu',
+	'Class:Document/Attribute:finalclass+' => '',
+));
+
+//
+// Class: DocumentFile
+//
+
+Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
+	'Class:DocumentFile' => 'Dokumentový súbor',
+	'Class:DocumentFile+' => '',
+	'Class:DocumentFile/Attribute:file' => 'Súbor',
+	'Class:DocumentFile/Attribute:file+' => '',
+));
+
+//
+// Class: DocumentNote
+//
+
+Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
+	'Class:DocumentNote' => 'Poznámka dokumentu',
+	'Class:DocumentNote+' => '',
+	'Class:DocumentNote/Attribute:text' => 'Text',
+	'Class:DocumentNote/Attribute:text+' => '',
+));
+
+//
+// Class: DocumentWeb
+//
+
+Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
+	'Class:DocumentWeb' => 'Web stránka dokumentu',
+	'Class:DocumentWeb+' => '',
+	'Class:DocumentWeb/Attribute:url' => 'URL',
+	'Class:DocumentWeb/Attribute:url+' => '',
+));
+
+//
+// Class: Typology
+//
+
+Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
+	'Class:Typology' => 'Typológia',
+	'Class:Typology+' => '',
+	'Class:Typology/Attribute:name' => 'Názov',
+	'Class:Typology/Attribute:name+' => '',
+	'Class:Typology/Attribute:finalclass' => 'Typ',
+	'Class:Typology/Attribute:finalclass+' => '',
+));
+
+//
+// Class: DocumentType
+//
+
+Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
+	'Class:DocumentType' => 'Typ dokumentu',
+	'Class:DocumentType+' => '',
+));
+
+//
+// Class: ContactType
+//
+
+Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
+	'Class:ContactType' => 'Typ kontaktu',
+	'Class:ContactType+' => '',
+));
+
+//
+// Class: lnkPersonToTeam
+//
+
+Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
+	'Class:lnkPersonToTeam' => 'väzba - Osoba / Tím',
+	'Class:lnkPersonToTeam+' => '',
+	'Class:lnkPersonToTeam/Attribute:team_id' => 'Tím',
+	'Class:lnkPersonToTeam/Attribute:team_id+' => '',
+	'Class:lnkPersonToTeam/Attribute:team_name' => 'Názov tímu',
+	'Class:lnkPersonToTeam/Attribute:team_name+' => '',
+	'Class:lnkPersonToTeam/Attribute:person_id' => 'Osoba',
+	'Class:lnkPersonToTeam/Attribute:person_id+' => '',
+	'Class:lnkPersonToTeam/Attribute:person_name' => 'Meno osoby',
+	'Class:lnkPersonToTeam/Attribute:person_name+' => '',
+	'Class:lnkPersonToTeam/Attribute:role_id' => 'Rola',
+	'Class:lnkPersonToTeam/Attribute:role_id+' => '',
+	'Class:lnkPersonToTeam/Attribute:role_name' => 'Názov role',
+	'Class:lnkPersonToTeam/Attribute:role_name+' => '',
+));
+
+//
+// Application Menu
+//
+
+Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
+	'Menu:DataAdministration' => 'Dátová administrácia',
+	'Menu:DataAdministration+' => '',
+	'Menu:Catalogs' => 'Katalógy',
+	'Menu:Catalogs+' => '',
+	'Menu:Audit' => 'Audity',
+	'Menu:Audit+' => '',
+	'Menu:CSVImport' => 'CSV import~~',
+	'Menu:CSVImport+' => 'Bulk creation or update~~',
+	'Menu:Organization' => 'Organizácia',
+	'Menu:Organization+' => '',
+	'Menu:ConfigManagement' => 'Manažment konfigurácie',
+	'Menu:ConfigManagement+' => '',
+	'Menu:ConfigManagementOverview' => 'Prehľad',
+	'Menu:ConfigManagementOverview+' => '',
+	'Menu:Contact' => 'Kontakty',
+	'Menu:Contact+' => '',
+	'Menu:Contact:Count' => '%1$d kontakt/y/ov',
+	'Menu:Person' => 'Osoby',
+	'Menu:Person+' => '',
+	'Menu:Team' => 'Tímy',
+	'Menu:Team+' => '',
+	'Menu:Document' => 'Dokumenty',
+	'Menu:Document+' => '',
+	'Menu:Location' => 'Poloha',
+	'Menu:Location+' => '',
+	'Menu:NewContact' => 'Nový kontakt',
+	'Menu:NewContact+' => '',
+	'Menu:SearchContacts' => 'Vyhľadať kontakty',
+	'Menu:SearchContacts+' => '',
+	'Menu:ConfigManagement:Shortcuts' => 'Skratky',
+	'Menu:ConfigManagement:AllContacts' => 'Všetky kontakty: %1$d',
+	'Menu:Typology' => 'Konfiguračná typológia',
+	'Menu:Typology+' => '',
+	'UI_WelcomeMenu_AllConfigItems' => 'Zhrnutie',
+	'Menu:ConfigManagement:Typology' => 'Konfiguračná typológia',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-structure/tr.dict.itop-structure.php b/datamodels/2.x/itop-structure/tr.dict.itop-structure.php
new file mode 100644
index 000000000..4ac08ddd3
--- /dev/null
+++ b/datamodels/2.x/itop-structure/tr.dict.itop-structure.php
@@ -0,0 +1,351 @@
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+ * Localized data
+ * @author      Benjamin Planque <benjamin.planque@combodo.com>
+ * @author      Izzet Sirin <izzet.sirin@htr.com.tr>
+ * @copyright   Copyright (C) 2010-2018 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+//////////////////////////////////////////////////////////////////////
+// Note: The classes have been grouped by categories: bizmodel
+//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+//
+// Class: Organization
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:Organization' => 'Kurum',
+	'Class:Organization+' => '',
+	'Class:Organization/Attribute:name' => 'Adı',
+	'Class:Organization/Attribute:name+' => 'Kullanılan adı',
+	'Class:Organization/Attribute:code' => 'Kodu',
+	'Class:Organization/Attribute:code+' => 'Kurumu kodu (Siret, DUNS,...)',
+	'Class:Organization/Attribute:status' => 'Durumu',
+	'Class:Organization/Attribute:status+' => '',
+	'Class:Organization/Attribute:status/Value:active' => 'Etkin',
+	'Class:Organization/Attribute:status/Value:active+' => 'Etkin',
+	'Class:Organization/Attribute:status/Value:inactive' => 'Etkin değil',
+	'Class:Organization/Attribute:status/Value:inactive+' => 'Etkin değil',
+	'Class:Organization/Attribute:parent_id' => 'Bağlı olduğu kurum',
+	'Class:Organization/Attribute:parent_id+' => 'Bağlı olduğu kurum',
+	'Class:Organization/Attribute:parent_name' => 'Bağlı olduğu kurumun adı',
+	'Class:Organization/Attribute:parent_name+' => 'Bağlı olduğu kurumun adı',
+	'Class:Organization/Attribute:deliverymodel_id' => 'Delivery model~~',
+	'Class:Organization/Attribute:deliverymodel_id+' => '~~',
+	'Class:Organization/Attribute:deliverymodel_name' => 'Delivery model name~~',
+	'Class:Organization/Attribute:deliverymodel_name+' => '~~',
+	'Class:Organization/Attribute:parent_id_friendlyname' => 'Parent~~',
+	'Class:Organization/Attribute:parent_id_friendlyname+' => 'Parent organization~~',
+	'Class:Organization/Attribute:overview' => 'Overview~~',
+	'Organization:Overview:FunctionalCIs' => 'Configuration items of this organization~~',
+	'Organization:Overview:FunctionalCIs:subtitle' => 'by type~~',
+	'Organization:Overview:Users' => 'iTop Users within this organization~~',
+));
+
+//
+// Class: Location
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:Location' => 'Yerleşke',
+	'Class:Location+' => 'Yerleşke : Bölge, Ülke, Şehir, Yerleşke, Bina, Kat, Oda, kabin,...',
+	'Class:Location/Attribute:name' => 'Adı',
+	'Class:Location/Attribute:name+' => '',
+	'Class:Location/Attribute:status' => 'Durumu',
+	'Class:Location/Attribute:status+' => '',
+	'Class:Location/Attribute:status/Value:active' => 'Etkin',
+	'Class:Location/Attribute:status/Value:active+' => 'Etkin',
+	'Class:Location/Attribute:status/Value:inactive' => 'Etkin değil',
+	'Class:Location/Attribute:status/Value:inactive+' => 'Etkin değil',
+	'Class:Location/Attribute:org_id' => 'Kurumun sahibi',
+	'Class:Location/Attribute:org_id+' => '',
+	'Class:Location/Attribute:org_name' => 'Kurumun sahibinin adı',
+	'Class:Location/Attribute:org_name+' => '',
+	'Class:Location/Attribute:address' => 'Adres',
+	'Class:Location/Attribute:address+' => 'Posta adresi',
+	'Class:Location/Attribute:postal_code' => 'Posta kodu',
+	'Class:Location/Attribute:postal_code+' => 'Posta kodu',
+	'Class:Location/Attribute:city' => 'Şehir',
+	'Class:Location/Attribute:city+' => '',
+	'Class:Location/Attribute:country' => 'Ülke',
+	'Class:Location/Attribute:country+' => '',
+	'Class:Location/Attribute:physicaldevice_list' => 'Devices~~',
+	'Class:Location/Attribute:physicaldevice_list+' => 'All the devices in this location~~',
+	'Class:Location/Attribute:person_list' => 'Contacts~~',
+	'Class:Location/Attribute:person_list+' => 'All the contacts located on this location~~',
+));
+
+//
+// Class: Contact
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:Contact' => 'İrtibat',
+	'Class:Contact+' => '',
+	'Class:Contact/Attribute:name' => 'Adı',
+	'Class:Contact/Attribute:name+' => '',
+	'Class:Contact/Attribute:status' => 'Durumu',
+	'Class:Contact/Attribute:status+' => '',
+	'Class:Contact/Attribute:status/Value:active' => 'Etkin',
+	'Class:Contact/Attribute:status/Value:active+' => 'Etkin',
+	'Class:Contact/Attribute:status/Value:inactive' => 'Etkin değil',
+	'Class:Contact/Attribute:status/Value:inactive+' => 'Etkin değil',
+	'Class:Contact/Attribute:org_id' => 'Kurum',
+	'Class:Contact/Attribute:org_id+' => '',
+	'Class:Contact/Attribute:org_name' => 'Kurum',
+	'Class:Contact/Attribute:org_name+' => '',
+	'Class:Contact/Attribute:email' => 'E-posta',
+	'Class:Contact/Attribute:email+' => '',
+	'Class:Contact/Attribute:phone' => 'Telefon',
+	'Class:Contact/Attribute:phone+' => '',
+	'Class:Contact/Attribute:notify' => 'Notification~~',
+	'Class:Contact/Attribute:notify+' => '~~',
+	'Class:Contact/Attribute:notify/Value:no' => 'no~~',
+	'Class:Contact/Attribute:notify/Value:no+' => 'no~~',
+	'Class:Contact/Attribute:notify/Value:yes' => 'yes~~',
+	'Class:Contact/Attribute:notify/Value:yes+' => 'yes~~',
+	'Class:Contact/Attribute:function' => 'Function~~',
+	'Class:Contact/Attribute:function+' => '~~',
+	'Class:Contact/Attribute:cis_list' => 'CIs~~',
+	'Class:Contact/Attribute:cis_list+' => 'All the configuration items linked to this contact~~',
+	'Class:Contact/Attribute:finalclass' => 'Tip',
+	'Class:Contact/Attribute:finalclass+' => '',
+));
+
+//
+// Class: Person
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:Person' => 'Kişi',
+	'Class:Person+' => '',
+	'Class:Person/Attribute:name' => 'Last Name~~',
+	'Class:Person/Attribute:name+' => '~~',
+	'Class:Person/Attribute:first_name' => 'Adı',
+	'Class:Person/Attribute:first_name+' => '',
+	'Class:Person/Attribute:employee_number' => 'Employee number~~',
+	'Class:Person/Attribute:employee_number+' => '~~',
+	'Class:Person/Attribute:mobile_phone' => 'Mobile phone~~',
+	'Class:Person/Attribute:mobile_phone+' => '~~',
+	'Class:Person/Attribute:location_id' => 'Location~~',
+	'Class:Person/Attribute:location_id+' => '~~',
+	'Class:Person/Attribute:location_name' => 'Location name~~',
+	'Class:Person/Attribute:location_name+' => '~~',
+	'Class:Person/Attribute:manager_id' => 'Manager~~',
+	'Class:Person/Attribute:manager_id+' => '~~',
+	'Class:Person/Attribute:manager_name' => 'Manager name~~',
+	'Class:Person/Attribute:manager_name+' => '~~',
+	'Class:Person/Attribute:team_list' => 'Teams~~',
+	'Class:Person/Attribute:team_list+' => 'All the teams this person belongs to~~',
+	'Class:Person/Attribute:tickets_list' => 'Tickets~~',
+	'Class:Person/Attribute:tickets_list+' => 'All the tickets this person is the caller~~',
+	'Class:Person/Attribute:manager_id_friendlyname' => 'Manager friendly name~~',
+	'Class:Person/Attribute:manager_id_friendlyname+' => '~~',
+	'Class:Person/Attribute:picture' => 'Picture~~',
+	'Class:Person/Attribute:picture+' => '~~',
+	'Class:Person/UniquenessRule:employee_number+' => 'The employee number must be unique in the organization~~',
+	'Class:Person/UniquenessRule:employee_number' => 'there is already a person in \'$this->org_name$\' organization with the same employee number~~',
+	'Class:Person/UniquenessRule:name+' => 'The employee name should be unique inside its organization~~',
+	'Class:Person/UniquenessRule:name' => 'There is already a person in \'$this->org_name$\' organization with the same name~~',
+));
+
+//
+// Class: Team
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:Team' => 'Ekip',
+	'Class:Team+' => '',
+	'Class:Team/Attribute:persons_list' => 'Members~~',
+	'Class:Team/Attribute:persons_list+' => 'All the people belonging to this team~~',
+	'Class:Team/Attribute:tickets_list' => 'Tickets~~',
+	'Class:Team/Attribute:tickets_list+' => 'All the tickets assigned to this team~~',
+));
+
+//
+// Class: Document
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:Document' => 'Doküman',
+	'Class:Document+' => '',
+	'Class:Document/Attribute:name' => 'Adı',
+	'Class:Document/Attribute:name+' => '',
+	'Class:Document/Attribute:org_id' => 'Kurum',
+	'Class:Document/Attribute:org_id+' => '~~',
+	'Class:Document/Attribute:org_name' => 'Kurum Adı',
+	'Class:Document/Attribute:org_name+' => '',
+	'Class:Document/Attribute:documenttype_id' => 'Document type~~',
+	'Class:Document/Attribute:documenttype_id+' => '~~',
+	'Class:Document/Attribute:documenttype_name' => 'Document type name~~',
+	'Class:Document/Attribute:documenttype_name+' => '~~',
+	'Class:Document/Attribute:version' => 'Version~~',
+	'Class:Document/Attribute:version+' => '~~',
+	'Class:Document/Attribute:description' => 'Tanımlama',
+	'Class:Document/Attribute:description+' => '',
+	'Class:Document/Attribute:status' => 'Durumu',
+	'Class:Document/Attribute:status+' => '',
+	'Class:Document/Attribute:status/Value:draft' => 'Taslak',
+	'Class:Document/Attribute:status/Value:draft+' => '',
+	'Class:Document/Attribute:status/Value:obsolete' => 'Geçersiz',
+	'Class:Document/Attribute:status/Value:obsolete+' => '',
+	'Class:Document/Attribute:status/Value:published' => 'Yayınlanan',
+	'Class:Document/Attribute:status/Value:published+' => '',
+	'Class:Document/Attribute:cis_list' => 'CIs~~',
+	'Class:Document/Attribute:cis_list+' => 'All the configuration items linked to this document~~',
+	'Class:Document/Attribute:contracts_list' => 'Contracts~~',
+	'Class:Document/Attribute:contracts_list+' => 'All the contracts linked to this document~~',
+	'Class:Document/Attribute:services_list' => 'Services~~',
+	'Class:Document/Attribute:services_list+' => 'All the services linked to this document~~',
+	'Class:Document/Attribute:finalclass' => 'Document Type~~',
+	'Class:Document/Attribute:finalclass+' => 'Name of the final class~~',
+));
+
+//
+// Class: DocumentFile
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:DocumentFile' => 'Document File~~',
+	'Class:DocumentFile+' => '~~',
+	'Class:DocumentFile/Attribute:file' => 'File~~',
+	'Class:DocumentFile/Attribute:file+' => '~~',
+));
+
+//
+// Class: DocumentNote
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:DocumentNote' => 'Document Note~~',
+	'Class:DocumentNote+' => '~~',
+	'Class:DocumentNote/Attribute:text' => 'Text~~',
+	'Class:DocumentNote/Attribute:text+' => '~~',
+));
+
+//
+// Class: DocumentWeb
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:DocumentWeb' => 'Document Web~~',
+	'Class:DocumentWeb+' => '~~',
+	'Class:DocumentWeb/Attribute:url' => 'URL~~',
+	'Class:DocumentWeb/Attribute:url+' => '~~',
+));
+
+//
+// Class: Typology
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:Typology' => 'Typology~~',
+	'Class:Typology+' => '~~',
+	'Class:Typology/Attribute:name' => 'Name~~',
+	'Class:Typology/Attribute:name+' => '~~',
+	'Class:Typology/Attribute:finalclass' => 'Type~~',
+	'Class:Typology/Attribute:finalclass+' => 'Name of the final class~~',
+));
+
+//
+// Class: DocumentType
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:DocumentType' => 'Document Type~~',
+	'Class:DocumentType+' => '~~',
+));
+
+//
+// Class: ContactType
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:ContactType' => 'Contact Type~~',
+	'Class:ContactType+' => '~~',
+));
+
+//
+// Class: lnkPersonToTeam
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:lnkPersonToTeam' => 'Link Person / Team~~',
+	'Class:lnkPersonToTeam+' => '~~',
+	'Class:lnkPersonToTeam/Attribute:team_id' => 'Team~~',
+	'Class:lnkPersonToTeam/Attribute:team_id+' => '~~',
+	'Class:lnkPersonToTeam/Attribute:team_name' => 'Team name~~',
+	'Class:lnkPersonToTeam/Attribute:team_name+' => '~~',
+	'Class:lnkPersonToTeam/Attribute:person_id' => 'Person~~',
+	'Class:lnkPersonToTeam/Attribute:person_id+' => '~~',
+	'Class:lnkPersonToTeam/Attribute:person_name' => 'Person name~~',
+	'Class:lnkPersonToTeam/Attribute:person_name+' => '~~',
+	'Class:lnkPersonToTeam/Attribute:role_id' => 'Role~~',
+	'Class:lnkPersonToTeam/Attribute:role_id+' => '~~',
+	'Class:lnkPersonToTeam/Attribute:role_name' => 'Role name~~',
+	'Class:lnkPersonToTeam/Attribute:role_name+' => '~~',
+));
+
+//
+// Application Menu
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Menu:DataAdministration' => 'Veri Yönetimi',
+	'Menu:DataAdministration+' => 'Veri Yönetimi',
+	'Menu:Catalogs' => 'Kataloglar',
+	'Menu:Catalogs+' => 'Veri tipleri',
+	'Menu:Audit' => 'Denetleme',
+	'Menu:Audit+' => 'Denetleme',
+	'Menu:CSVImport' => 'CSV dışardan al',
+	'Menu:CSVImport+' => 'Çoklu yaratım veya güncelleme',
+	'Menu:Organization' => 'Kurumlar',
+	'Menu:Organization+' => 'Tüm Kurumlar',
+	'Menu:ConfigManagement' => 'Konfigürasyon Yönetimi',
+	'Menu:ConfigManagement+' => 'Konfigürasyon Yönetimi',
+	'Menu:ConfigManagementOverview' => 'Özet',
+	'Menu:ConfigManagementOverview+' => 'Özet',
+	'Menu:Contact' => 'İrtibatlar',
+	'Menu:Contact+' => 'İrtibatlar',
+	'Menu:Contact:Count' => '%1$d',
+	'Menu:Person' => 'Kişiler',
+	'Menu:Person+' => 'Tüm Kişiler',
+	'Menu:Team' => 'Ekipler',
+	'Menu:Team+' => 'Tüm ekipler',
+	'Menu:Document' => 'Dokümanlar',
+	'Menu:Document+' => 'Tüm dokümanlar',
+	'Menu:Location' => 'Yerleşkeler',
+	'Menu:Location+' => 'Tüm Yerleşkeler',
+	'Menu:NewContact' => 'Yeni İrtibat',
+	'Menu:NewContact+' => 'Yeni İrtibat',
+	'Menu:SearchContacts' => 'İrtibat ara',
+	'Menu:SearchContacts+' => 'İrtibat ara',
+	'Menu:ConfigManagement:Shortcuts' => 'Kısalyollar',
+	'Menu:ConfigManagement:AllContacts' => 'Tüm irtibatlar: %1$d',
+	'Menu:Typology' => 'Typology configuration~~',
+	'Menu:Typology+' => 'Typology configuration~~',
+	'UI_WelcomeMenu_AllConfigItems' => 'Summary~~',
+	'Menu:ConfigManagement:Typology' => 'Typology configuration~~',
+));
diff --git a/datamodels/2.x/itop-structure/zh_cn.dict.itop-structure.php b/datamodels/2.x/itop-structure/zh_cn.dict.itop-structure.php
new file mode 100644
index 000000000..a8dc21e29
--- /dev/null
+++ b/datamodels/2.x/itop-structure/zh_cn.dict.itop-structure.php
@@ -0,0 +1,349 @@
+<?php
+/**
+ * Localized data
+ * @author      Benjamin Planque <benjamin.planque@combodo.com>
+ * @copyright Copyright (C) 2010-2018 Combodo SARL
+ * @license	http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with iTop. If not, see <http://www.gnu.org/licenses/>
+ */
+
+//////////////////////////////////////////////////////////////////////
+// Note: The classes have been grouped by categories: bizmodel
+//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+//
+// Class: Organization
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:Organization' => '组织',
+	'Class:Organization+' => '',
+	'Class:Organization/Attribute:name' => '名称',
+	'Class:Organization/Attribute:name+' => '常用名称',
+	'Class:Organization/Attribute:code' => '编码',
+	'Class:Organization/Attribute:code+' => '组织编码(Siret, DUNS,...)',
+	'Class:Organization/Attribute:status' => '状态',
+	'Class:Organization/Attribute:status+' => '',
+	'Class:Organization/Attribute:status/Value:active' => '启用',
+	'Class:Organization/Attribute:status/Value:active+' => '启用',
+	'Class:Organization/Attribute:status/Value:inactive' => '停用',
+	'Class:Organization/Attribute:status/Value:inactive+' => '停用',
+	'Class:Organization/Attribute:parent_id' => '父级',
+	'Class:Organization/Attribute:parent_id+' => '父级组织',
+	'Class:Organization/Attribute:parent_name' => '父级名称',
+	'Class:Organization/Attribute:parent_name+' => '父级组织名称',
+	'Class:Organization/Attribute:deliverymodel_id' => '交付模式',
+	'Class:Organization/Attribute:deliverymodel_id+' => '',
+	'Class:Organization/Attribute:deliverymodel_name' => '交付模式名称',
+	'Class:Organization/Attribute:deliverymodel_name+' => '',
+	'Class:Organization/Attribute:parent_id_friendlyname' => '上级组织',
+	'Class:Organization/Attribute:parent_id_friendlyname+' => '上级组织',
+	'Class:Organization/Attribute:overview' => '概览',
+	'Organization:Overview:FunctionalCIs' => '该组织的所有配置项',
+	'Organization:Overview:FunctionalCIs:subtitle' => '按类型',
+	'Organization:Overview:Users' => '该组织里所有的iTop 用户',
+));
+
+//
+// Class: Location
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:Location' => '地理位置',
+	'Class:Location+' => '任何类型的地理位置: 区域, 国家, 城市, 位置, 建筑, 楼层, 房间, 机架,...',
+	'Class:Location/Attribute:name' => '名称',
+	'Class:Location/Attribute:name+' => '',
+	'Class:Location/Attribute:status' => '状态',
+	'Class:Location/Attribute:status+' => '',
+	'Class:Location/Attribute:status/Value:active' => '启用',
+	'Class:Location/Attribute:status/Value:active+' => '启用',
+	'Class:Location/Attribute:status/Value:inactive' => '停用',
+	'Class:Location/Attribute:status/Value:inactive+' => '停用',
+	'Class:Location/Attribute:org_id' => '拥有者组织',
+	'Class:Location/Attribute:org_id+' => '',
+	'Class:Location/Attribute:org_name' => '拥有者组织名称',
+	'Class:Location/Attribute:org_name+' => '',
+	'Class:Location/Attribute:address' => '地址',
+	'Class:Location/Attribute:address+' => '门户地址',
+	'Class:Location/Attribute:postal_code' => '邮编',
+	'Class:Location/Attribute:postal_code+' => 'ZIP/邮政编码',
+	'Class:Location/Attribute:city' => '城市',
+	'Class:Location/Attribute:city+' => '',
+	'Class:Location/Attribute:country' => '国家',
+	'Class:Location/Attribute:country+' => '',
+	'Class:Location/Attribute:physicaldevice_list' => '设备',
+	'Class:Location/Attribute:physicaldevice_list+' => '该位置的所有设备',
+	'Class:Location/Attribute:person_list' => '联系人',
+	'Class:Location/Attribute:person_list+' => '该位置的所有联系人',
+));
+
+//
+// Class: Contact
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:Contact' => '联系人',
+	'Class:Contact+' => '',
+	'Class:Contact/Attribute:name' => '名称',
+	'Class:Contact/Attribute:name+' => '',
+	'Class:Contact/Attribute:status' => '状态',
+	'Class:Contact/Attribute:status+' => '',
+	'Class:Contact/Attribute:status/Value:active' => '启用',
+	'Class:Contact/Attribute:status/Value:active+' => '启用',
+	'Class:Contact/Attribute:status/Value:inactive' => '停用',
+	'Class:Contact/Attribute:status/Value:inactive+' => '停用',
+	'Class:Contact/Attribute:org_id' => '组织',
+	'Class:Contact/Attribute:org_id+' => '',
+	'Class:Contact/Attribute:org_name' => '组织',
+	'Class:Contact/Attribute:org_name+' => '',
+	'Class:Contact/Attribute:email' => 'Email',
+	'Class:Contact/Attribute:email+' => '',
+	'Class:Contact/Attribute:phone' => '电话',
+	'Class:Contact/Attribute:phone+' => '',
+	'Class:Contact/Attribute:notify' => '通知',
+	'Class:Contact/Attribute:notify+' => '',
+	'Class:Contact/Attribute:notify/Value:no' => '否',
+	'Class:Contact/Attribute:notify/Value:no+' => '否',
+	'Class:Contact/Attribute:notify/Value:yes' => '是',
+	'Class:Contact/Attribute:notify/Value:yes+' => '是',
+	'Class:Contact/Attribute:function' => '职责',
+	'Class:Contact/Attribute:function+' => '',
+	'Class:Contact/Attribute:cis_list' => '配置项',
+	'Class:Contact/Attribute:cis_list+' => '该联系人关联的所有配置项',
+	'Class:Contact/Attribute:finalclass' => '联系人子类别',
+	'Class:Contact/Attribute:finalclass+' => 'Name of the final class',
+));
+
+//
+// Class: Person
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:Person' => '个人',
+	'Class:Person+' => '',
+	'Class:Person/Attribute:name' => '姓',
+	'Class:Person/Attribute:name+' => '',
+	'Class:Person/Attribute:first_name' => '名',
+	'Class:Person/Attribute:first_name+' => '',
+	'Class:Person/Attribute:employee_number' => '员工编号',
+	'Class:Person/Attribute:employee_number+' => '',
+	'Class:Person/Attribute:mobile_phone' => '移动电话',
+	'Class:Person/Attribute:mobile_phone+' => '',
+	'Class:Person/Attribute:location_id' => '地理位置',
+	'Class:Person/Attribute:location_id+' => '',
+	'Class:Person/Attribute:location_name' => '名称',
+	'Class:Person/Attribute:location_name+' => '',
+	'Class:Person/Attribute:manager_id' => '经理',
+	'Class:Person/Attribute:manager_id+' => '',
+	'Class:Person/Attribute:manager_name' => '名称',
+	'Class:Person/Attribute:manager_name+' => '',
+	'Class:Person/Attribute:team_list' => '团队',
+	'Class:Person/Attribute:team_list+' => '这个人归属的所有团队',
+	'Class:Person/Attribute:tickets_list' => '工单',
+	'Class:Person/Attribute:tickets_list+' => '这个人发起的所有工单',
+	'Class:Person/Attribute:manager_id_friendlyname' => '经理姓名',
+	'Class:Person/Attribute:manager_id_friendlyname+' => '',
+	'Class:Person/Attribute:picture' => '头像',
+	'Class:Person/Attribute:picture+' => '',
+	'Class:Person/UniquenessRule:employee_number+' => '同一组织内的员工号必须唯一',
+	'Class:Person/UniquenessRule:employee_number' => '\'$this->org_name$\' 内已经有人占用了这个员工号',
+	'Class:Person/UniquenessRule:name+' => '同一组织内的员工姓名必须唯一',
+	'Class:Person/UniquenessRule:name' => '\'$this->org_name$\' 内已经有人叫这个名字',
+));
+
+//
+// Class: Team
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:Team' => '团队',
+	'Class:Team+' => '',
+	'Class:Team/Attribute:persons_list' => '成员',
+	'Class:Team/Attribute:persons_list+' => '该团队包含的所有成员',
+	'Class:Team/Attribute:tickets_list' => '工单',
+	'Class:Team/Attribute:tickets_list+' => '该团队的所有工单',
+));
+
+//
+// Class: Document
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:Document' => '文档',
+	'Class:Document+' => '',
+	'Class:Document/Attribute:name' => '名称',
+	'Class:Document/Attribute:name+' => '',
+	'Class:Document/Attribute:org_id' => '组织',
+	'Class:Document/Attribute:org_id+' => '',
+	'Class:Document/Attribute:org_name' => '组织名称',
+	'Class:Document/Attribute:org_name+' => '',
+	'Class:Document/Attribute:documenttype_id' => '文档类型',
+	'Class:Document/Attribute:documenttype_id+' => '',
+	'Class:Document/Attribute:documenttype_name' => '文档类型名称',
+	'Class:Document/Attribute:documenttype_name+' => '',
+	'Class:Document/Attribute:version' => '版本',
+	'Class:Document/Attribute:version+' => '',
+	'Class:Document/Attribute:description' => '描述',
+	'Class:Document/Attribute:description+' => '',
+	'Class:Document/Attribute:status' => '状态',
+	'Class:Document/Attribute:status+' => '',
+	'Class:Document/Attribute:status/Value:draft' => '草稿',
+	'Class:Document/Attribute:status/Value:draft+' => '',
+	'Class:Document/Attribute:status/Value:obsolete' => '废弃',
+	'Class:Document/Attribute:status/Value:obsolete+' => '',
+	'Class:Document/Attribute:status/Value:published' => '已发布',
+	'Class:Document/Attribute:status/Value:published+' => '',
+	'Class:Document/Attribute:cis_list' => '配置项',
+	'Class:Document/Attribute:cis_list+' => '该文档关联的所有配置项',
+	'Class:Document/Attribute:contracts_list' => '合同',
+	'Class:Document/Attribute:contracts_list+' => '该文档关联的所有合同',
+	'Class:Document/Attribute:services_list' => '服务',
+	'Class:Document/Attribute:services_list+' => '该文档关联的所有服务',
+	'Class:Document/Attribute:finalclass' => '文档子类别',
+	'Class:Document/Attribute:finalclass+' => 'Name of the final class',
+));
+
+//
+// Class: DocumentFile
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:DocumentFile' => '文档文件',
+	'Class:DocumentFile+' => '',
+	'Class:DocumentFile/Attribute:file' => '文件',
+	'Class:DocumentFile/Attribute:file+' => '',
+));
+
+//
+// Class: DocumentNote
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:DocumentNote' => '文档笔记',
+	'Class:DocumentNote+' => '',
+	'Class:DocumentNote/Attribute:text' => '文本',
+	'Class:DocumentNote/Attribute:text+' => '',
+));
+
+//
+// Class: DocumentWeb
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:DocumentWeb' => '文档网页',
+	'Class:DocumentWeb+' => '',
+	'Class:DocumentWeb/Attribute:url' => 'URL',
+	'Class:DocumentWeb/Attribute:url+' => '',
+));
+
+//
+// Class: Typology
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:Typology' => '类型',
+	'Class:Typology+' => '',
+	'Class:Typology/Attribute:name' => '名称',
+	'Class:Typology/Attribute:name+' => '',
+	'Class:Typology/Attribute:finalclass' => '类型',
+	'Class:Typology/Attribute:finalclass+' => 'Name of the final class',
+));
+
+//
+// Class: DocumentType
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:DocumentType' => '文档类型',
+	'Class:DocumentType+' => '',
+));
+
+//
+// Class: ContactType
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:ContactType' => '联系人类型',
+	'Class:ContactType+' => '',
+));
+
+//
+// Class: lnkPersonToTeam
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:lnkPersonToTeam' => '链接 个体 / 团队',
+	'Class:lnkPersonToTeam+' => '',
+	'Class:lnkPersonToTeam/Attribute:team_id' => '团队',
+	'Class:lnkPersonToTeam/Attribute:team_id+' => '',
+	'Class:lnkPersonToTeam/Attribute:team_name' => '团队名称',
+	'Class:lnkPersonToTeam/Attribute:team_name+' => '',
+	'Class:lnkPersonToTeam/Attribute:person_id' => '个体',
+	'Class:lnkPersonToTeam/Attribute:person_id+' => '',
+	'Class:lnkPersonToTeam/Attribute:person_name' => '姓名',
+	'Class:lnkPersonToTeam/Attribute:person_name+' => '',
+	'Class:lnkPersonToTeam/Attribute:role_id' => '角色',
+	'Class:lnkPersonToTeam/Attribute:role_id+' => '',
+	'Class:lnkPersonToTeam/Attribute:role_name' => '角色名称',
+	'Class:lnkPersonToTeam/Attribute:role_name+' => '',
+));
+
+//
+// Application Menu
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Menu:DataAdministration' => '数据管理',
+	'Menu:DataAdministration+' => '数据管理',
+	'Menu:Catalogs' => '类别',
+	'Menu:Catalogs+' => '数据类型',
+	'Menu:Audit' => '审计',
+	'Menu:Audit+' => '审计',
+	'Menu:CSVImport' => 'CSV 导入',
+	'Menu:CSVImport+' => '批量创建或更新',
+	'Menu:Organization' => '组织',
+	'Menu:Organization+' => '所有组织',
+	'Menu:ConfigManagement' => '配置管理',
+	'Menu:ConfigManagement+' => '配置管理',
+	'Menu:ConfigManagementOverview' => '概览',
+	'Menu:ConfigManagementOverview+' => '概览',
+	'Menu:Contact' => '联系人',
+	'Menu:Contact+' => '联系人',
+	'Menu:Contact:Count' => '%1$d 个联系人',
+	'Menu:Person' => '个体',
+	'Menu:Person+' => '所有个体',
+	'Menu:Team' => '团队',
+	'Menu:Team+' => '所有团队',
+	'Menu:Document' => '文档',
+	'Menu:Document+' => '所有文档',
+	'Menu:Location' => '地理位置',
+	'Menu:Location+' => '所有位置',
+	'Menu:NewContact' => '新建联系人',
+	'Menu:NewContact+' => '新建联系人',
+	'Menu:SearchContacts' => '搜索联系人',
+	'Menu:SearchContacts+' => '搜索联系人',
+	'Menu:ConfigManagement:Shortcuts' => '快捷方式',
+	'Menu:ConfigManagement:AllContacts' => '所有联系人: %1$d',
+	'Menu:Typology' => '类型配置',
+	'Menu:Typology+' => '类型配置',
+	'UI_WelcomeMenu_AllConfigItems' => '摘要',
+	'Menu:ConfigManagement:Typology' => '类型配置',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-tickets/cs.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/cs.dict.itop-tickets.php
index b3e7199af..3d11e9998 100755
--- a/datamodels/2.x/itop-tickets/cs.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/cs.dict.itop-tickets.php
@@ -113,32 +113,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:lnkContactToTicket/Attribute:role_code/Value:do_not_notify' => 'Neupozorňovat',
 ));
 
-//
-// Class: lnkFunctionalCIToTicket
-//
-
-Dict::Add('CS CZ', 'Czech', 'Čeština', array(
-	'Class:lnkFunctionalCIToTicket' => 'Spojení (Funkční konfigurační položka / Tiket)',
-	'Class:lnkFunctionalCIToTicket+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Tiket',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'ID',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title' => 'Ticket title~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title+' => '~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id' => 'Konfigurační položka',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name' => 'Název konfigurační položky',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact' => 'Dopad (text)',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code' => 'Dopad',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Přidán manuálně',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Automaticky',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Není zasažen',
-));
-
-
 //
 // Class: WorkOrder
 //
@@ -195,7 +169,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'WorkOrder:Details' => 'Detaily',
 	'WorkOrder:Moreinfo' => 'Více informací',
 	'Tickets:ResolvedFrom' => 'Vyřešeno automaticky na základě %1$s',
-
 	'Class:cmdbAbstractObject/Method:Set' => 'Set',
 	'Class:cmdbAbstractObject/Method:Set+' => 'Set a field with a static value',
 	'Class:cmdbAbstractObject/Method:Set/Param:1' => 'Target Field',
@@ -240,15 +213,4 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:ResponseTicketTTO/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTO',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTR',
-
-	'portal:itop-portal' => 'Standardní portál', // This is the portal name that will be displayed in portal dispatcher (eg. URL in menus)
-	'Page:DefaultTitle' => '%1$s - Uživatelský portál',
-	'Brick:Portal:UserProfile:Title' => 'Můj profil',
-	'Brick:Portal:NewRequest:Title' => 'Nový požadavek',
-	'Brick:Portal:NewRequest:Title+' => '<p>Potřebujete pomoci?</p><p>Vyberte z katalogu služeb a vytvořte nový požadavek.</p>',
-	'Brick:Portal:OngoingRequests:Title' => 'Otevřené požadavky',
-	'Brick:Portal:OngoingRequests:Title+' => '<p>Sledujte své otevřené požadavky.</p><p>Zkontrolujte stav, přidejte komentář, přiložte dokumenty, potvrďte řešení.</p>',
-	'Brick:Portal:OngoingRequests:Tab:OnGoing' => 'Probíhající',
-	'Brick:Portal:OngoingRequests:Tab:Resolved' => 'Vyřešené',
-	'Brick:Portal:ClosedRequests:Title' => 'Uzavřené požadavky',
 ));
diff --git a/datamodels/2.x/itop-tickets/da.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/da.dict.itop-tickets.php
index ee24f1095..ba24dbf84 100644
--- a/datamodels/2.x/itop-tickets/da.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/da.dict.itop-tickets.php
@@ -98,32 +98,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:lnkContactToTicket/Attribute:role_code/Value:do_not_notify' => 'Do not notify~~',
 ));
 
-//
-// Class: lnkFunctionalCIToTicket
-//
-
-Dict::Add('DA DA', 'Danish', 'Dansk', array(
-	'Class:lnkFunctionalCIToTicket' => 'Sammenhæng FunctionalCI/Ticket',
-	'Class:lnkFunctionalCIToTicket+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Ticket',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'Reference',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title' => 'Ticket title~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title+' => '~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id' => 'CI',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name' => 'CI Navn',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact' => 'Påvirkning',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code' => 'Impact~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Added manually~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Computed~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Not impacted~~',
-));
-
-
 //
 // Class: WorkOrder
 //
@@ -225,15 +199,4 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:ResponseTicketTTO/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTO~~',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve~~',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTR~~',
-
-	'portal:itop-portal' => 'Standard portal~~', // This is the portal name that will be displayed in portal dispatcher (eg. URL in menus)
-	'Page:DefaultTitle' => '%1$s - User portal~~',
-	'Brick:Portal:UserProfile:Title' => 'My profile~~',
-	'Brick:Portal:NewRequest:Title' => 'New request~~',
-	'Brick:Portal:NewRequest:Title+' => '<p>Need help?</p><p>Pick from the services catalog and submit your request to our support teams.</p>~~',
-	'Brick:Portal:OngoingRequests:Title' => 'Ongoing requests~~',
-	'Brick:Portal:OngoingRequests:Title+' => '<p>Follow up with your ongoing requests.</p><p>Check the progress, add comments, attach documents, acknowledge the solution.</p>~~',
-	'Brick:Portal:OngoingRequests:Tab:OnGoing' => 'Open~~',
-	'Brick:Portal:OngoingRequests:Tab:Resolved' => 'Resolved~~',
-	'Brick:Portal:ClosedRequests:Title' => 'Closed requests~~',
 ));
diff --git a/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml b/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
index 98cbc3ab6..04f299cbe 100755
--- a/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
+++ b/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
@@ -278,9 +278,6 @@
 						<item id="contacts_list">
 							<rank>130</rank>
 						</item>
-						<item id="functionalcis_list">
-							<rank>140</rank>
-						</item>
 						<item id="workorders_list">
 							<rank>150</rank>
 						</item>
@@ -466,116 +463,6 @@
 				</list>
 			</presentation>
 		</class>
-		<class id="lnkFunctionalCIToTicket" _delta="define">
-			<parent>cmdbAbstractObject</parent>
-			<properties>
-				<is_link>1</is_link>
-				<category>bizmodel</category>
-				<abstract>false</abstract>
-				<key_type>autoincrement</key_type>
-				<db_table>lnkfunctionalcitoticket</db_table>
-				<db_key_field>id</db_key_field>
-				<db_final_class_field/>
-				<naming>
-					<attributes>
-						<attribute id="ticket_id"/>
-						<attribute id="functionalci_id"/>
-					</attributes>
-				</naming>
-				<display_template/>
-				<icon/>
-				<reconciliation>
-					<attributes>
-						<attribute id="ticket_id"/>
-						<attribute id="functionalci_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="ticket_title" xsi:type="AttributeExternalField">
-					<extkey_attcode>ticket_id</extkey_attcode>
-					<target_attcode>title</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>
-				<field id="impact" xsi:type="AttributeString">
-					<sql>impact</sql>
-					<default_value/>
-					<is_null_allowed>true</is_null_allowed>
-				</field>
-				<field id="impact_code" xsi:type="AttributeEnum">
-					<values>
-						<value id="manual">manual</value>
-						<value id="computed">computed</value>
-						<value id="not_impacted">not_impacted</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="functionalci_id">
-							<rank>20</rank>
-						</item>
-						<item id="impact_code">
-							<rank>30</rank>
-						</item>
-					</items>
-				</details>
-				<search>
-					<items>
-						<item id="ticket_id">
-							<rank>10</rank>
-						</item>
-						<item id="functionalci_id">
-							<rank>20</rank>
-						</item>
-						<item id="impact_code">
-							<rank>30</rank>
-						</item>
-					</items>
-				</search>
-				<list>
-					<items>
-						<item id="ticket_id">
-							<rank>10</rank>
-						</item>
-						<item id="functionalci_id">
-							<rank>20</rank>
-						</item>
-						<item id="impact_code">
-							<rank>30</rank>
-						</item>
-					</items>
-				</list>
-			</presentation>
-		</class>
 		<class id="WorkOrder" _delta="define">
 			<parent>cmdbAbstractObject</parent>
 			<properties>
@@ -803,6 +690,39 @@
 				</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>
 	</classes>
 	<meta>
 		<classes>
@@ -819,77 +739,9 @@
 		</classes>
 	</meta>
 	<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>
+		<module_design id="itop-portal" xsi:type="portal" >
 			<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>
-							<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>
-							<div class="form_field" data-field-id="phone">
-							</div>
-							<div class="form_field" data-field-id="location_id">
-							</div>
-							<div class="form_field" data-field-id="function">
-							</div>
-							<div class="form_field" data-field-id="manager_id" data-field-flags="read_only">
-							</div>
-						</twig>
-					</form>
-				</brick>
-				<brick id="services" xsi:type="Combodo\iTop\Portal\Brick\BrowseBrick">
+				<brick id="services" xsi:type="Combodo\iTop\Portal\Brick\BrowseBrick" _delta="define">
 					<active>true</active>
 					<width>6</width>
 					<rank>
@@ -982,7 +834,7 @@
 					<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">
+				<brick id="ongoing-tickets-for-portal-user" xsi:type="Combodo\iTop\Portal\Brick\ManageBrick" _delta="define">
 					<active>true</active>
 					<rank>
 						<default>20</default>
@@ -993,16 +845,16 @@
 					</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>-->
+					<!-- 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>
@@ -1055,10 +907,10 @@
 					<!-- <default_list_length>20</default_list_length> -->
 					<data_loading>full</data_loading>
 					<export>
-            			<export_default_fields>true</export_default_fields>
-          			</export>
+						<export_default_fields>true</export_default_fields>
+					</export>
 				</brick>
-				<brick id="closed-tickets-for-portal-user" xsi:type="Combodo\iTop\Portal\Brick\ManageBrick">
+				<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>
@@ -1102,12 +954,12 @@
 					</grouping>
 					<data_loading>auto</data_loading>
 					<export>
-            			<export_default_fields>true</export_default_fields>
-          			</export>
+						<export_default_fields>true</export_default_fields>
+					</export>
 				</brick>
 			</bricks>
 			<forms>
-				<form id="service-view">
+				<form id="service-view" _delta="define">
 					<class>Service</class>
 					<fields></fields>
 					<twig>
@@ -1132,7 +984,7 @@
 						<mode id="view" />
 					</modes>
 				</form>
-				<form id="servicesubcategory">
+				<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 />
@@ -1162,7 +1014,7 @@
 						</div>
 					</twig>
 				</form>
-				<form id="ticket-create">
+				<form id="ticket-create" _delta="define">
 					<class>Ticket</class>
 					<properties>
 						<navigation_rules>
@@ -1209,7 +1061,7 @@
 						<mode id="create"/>
 					</modes>
 				</form>
-				<form id="ticket-edit">
+				<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
@@ -1220,10 +1072,10 @@
 						<!--<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>
+							<submit>
+								<default>go-to-open-requests</default>
+							</submit>
+						</navigation_rules>
 					</properties>
 					<fields></fields>
 					<twig>
@@ -1279,14 +1131,14 @@
 						<mode id="view"/>
 					</modes>
 				</form>
-				<form id="ticket-reopen">
+				<form id="ticket-reopen" _delta="define">
 					<class>Ticket</class>
 					<properties>
 						<navigation_rules>
-              <submit>
-                <default>go-to-open-requests</default>
-              </submit>
-            </navigation_rules>
+							<submit>
+								<default>go-to-open-requests</default>
+							</submit>
+						</navigation_rules>
 					</properties>
 					<fields />
 					<twig>
@@ -1299,19 +1151,19 @@
 					<modes>
 						<mode id="apply_stimulus">
 							<stimuli>
-        						<stimulus id="ev_reopen"/>
-	      					</stimuli>
-	      				</mode>
+								<stimulus id="ev_reopen"/>
+							</stimuli>
+						</mode>
 					</modes>
 				</form>
-				<form id="ticket-apply-stimulus">
+				<form id="ticket-apply-stimulus" _delta="define">
 					<class>Ticket</class>
 					<properties>
 						<navigation_rules>
-              <submit>
-                <default>go-to-open-requests</default>
-              </submit>
-            </navigation_rules>
+							<submit>
+								<default>go-to-open-requests</default>
+							</submit>
+						</navigation_rules>
 					</properties>
 					<fields />
 					<twig />
@@ -1319,7 +1171,7 @@
 						<mode id="apply_stimulus"/>
 					</modes>
 				</form>
-				<form id="person-view">
+				<form id="person-view" _delta="define">
 					<class>Person</class>
 					<fields />
 					<twig>
@@ -1350,64 +1202,7 @@
 			</forms>
 			<classes>
 				<!-- Note : A class (or one of its ancestors) MUST be declared here to be displayed in the portal -->
-				<class id="User">
-					<!-- 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">
-					<scopes>
-						<scope id="all">
-							<oql_view><![CDATA[SELECT Organization WHERE id = :current_contact->org_id]]></oql_view>
-						</scope>
-					</scopes>
-				</class>
-				<class id="Location">
-					<scopes>
-						<scope id="all">
-							<oql_view><![CDATA[SELECT Location WHERE org_id = :current_contact->org_id]]></oql_view>
-						</scope>
-					</scopes>
-				</class>
-				<class id="Contact">
-					<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>
-				<class id="ServiceFamily">
+				<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>
@@ -1415,7 +1210,7 @@
 						</scope>
 					</scopes>
 				</class>
-				<class id="Service">
+				<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>
@@ -1423,7 +1218,7 @@
 						</scope>
 					</scopes>
 				</class>
-				<class id="ServiceSubcategory">
+				<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>
@@ -1431,7 +1226,7 @@
 						</scope>
 					</scopes>
 				</class>
-				<class id="Ticket">
+				<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>
@@ -1448,7 +1243,7 @@
 				</class>
 			</classes>
 			<action_rules>
-				<action_rule id="contact-to-userrequest">
+				<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>
@@ -1459,13 +1254,13 @@
 					</presets>
 					<retrofits/>
 				</action_rule>
-				<action_rule id="service-to-userrequest">
+				<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">
+				<action_rule id="servicesubcategory-to-userrequest" _delta="define">
 					<source_class>ServiceSubcategory</source_class>
 					<presets>
 						<preset id="1">copy(id, servicesubcategory_id)</preset>
@@ -1473,7 +1268,7 @@
 					</presets>
 				</action_rule>
 				<!-- Deprecated, will be removed in iTop 2.8 -->
-				<action_rule id="go-to-open-request-on-submit">
+				<action_rule id="go-to-open-request-on-submit" _delta="define">
 					<submit xsi:type="goto">
 						<brick>ongoing-tickets-for-portal-user</brick>
 					</submit>
@@ -1481,11 +1276,11 @@
 			</action_rules>
 			<navigation_rules>
 				<!-- Close form (either the modal or the whole page) -->
-				<navigation_rule id="close-form" xsi:type="close" />
+				<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" />
+				<navigation_rule id="go-to-homepage" xsi:type="go-to-homepage" _delta="define"/>
 				<!-- Open a manage brick (simple method) -->
-				<navigation_rule id="go-to-open-requests" xsi:type="go-to-manage-brick">
+				<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) -->
@@ -1496,31 +1291,31 @@
 					<!-- <filter>:this->caller_id_friendlyname</filter> -->
 				</navigation_rule>
 				<!-- Open a browse brick -->
-				<navigation_rule id="go-to-services" xsi:type="go-to-browse-brick">
-				 <!-- 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 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> -->
+				<!-- <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>
-<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  -->
+			</navigation_rules>
+		</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  -->
 		</parameters>
 	</module_parameters>
 </itop_design>
diff --git a/datamodels/2.x/itop-tickets/de.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/de.dict.itop-tickets.php
index 0af7b8b1b..94fed4080 100755
--- a/datamodels/2.x/itop-tickets/de.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/de.dict.itop-tickets.php
@@ -100,32 +100,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkContactToTicket/Attribute:role_code/Value:do_not_notify' => 'Nicht ändern',
 ));
 
-//
-// Class: lnkFunctionalCIToTicket
-//
-
-Dict::Add('DE DE', 'German', 'Deutsch', array(
-	'Class:lnkFunctionalCIToTicket' => 'Verknüpfung FunctionalCI/Ticket',
-	'Class:lnkFunctionalCIToTicket+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Ticket',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'Referenz',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title' => 'Tickettitel',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id' => 'CI',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name' => 'CI-Name',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact' => 'Auswirkung (Text)',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code' => 'Auswirkung',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Manuell hinzugefügt',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Berechnet',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Nicht betroffen',
-));
-
-
 //
 // Class: WorkOrder
 //
@@ -227,15 +201,4 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:ResponseTicketTTO/Interface:iMetricComputer+' => 'Zielvorgabe (SLT) vom Typ TTO',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve (Erstlösungszeit)',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Zielvorgabe (SLT) vom Typ TTR',
-
-	'portal:itop-portal' => 'Standard Portal', // This is the portal name that will be displayed in portal dispatcher (eg. URL in menus)
-	'Page:DefaultTitle' => '%1$s - Benutzer Portal',
-	'Brick:Portal:UserProfile:Title' => 'Mein Profile',
-	'Brick:Portal:NewRequest:Title' => 'Neue Störung/Anfrage',
-	'Brick:Portal:NewRequest:Title+' => '<p>Hilfe?</p><p>Wählen Sie einen Service aus und senden Sie Ihre Anfrage zum Service Desk.</p>',
-	'Brick:Portal:OngoingRequests:Title' => 'Offene Störungen/Anfragen',
-	'Brick:Portal:OngoingRequests:Title+' => '<p>Hier können Sie Ihre laufenden Anfragen und Störungsmeldungen ansehen,</p><p>den Verlauf verfolgen, Kommentare und Anhänge hinzufügen und gelöste Anfragen schließen.</p>',
-	'Brick:Portal:OngoingRequests:Tab:OnGoing' => 'Offen',
-	'Brick:Portal:OngoingRequests:Tab:Resolved' => 'Gelöst',
-	'Brick:Portal:ClosedRequests:Title' => 'Geschlossene Störungen/Anfragen',
 ));
diff --git a/datamodels/2.x/itop-tickets/en.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/en.dict.itop-tickets.php
index 006c67e3a..0f6357482 100755
--- a/datamodels/2.x/itop-tickets/en.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/en.dict.itop-tickets.php
@@ -114,32 +114,6 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:lnkContactToTicket/Attribute:role_code/Value:do_not_notify' => 'Do not notify',
 ));
 
-//
-// Class: lnkFunctionalCIToTicket
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:lnkFunctionalCIToTicket' => 'Link FunctionalCI / Ticket',
-	'Class:lnkFunctionalCIToTicket+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Ticket',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'Ref',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title' => 'Ticket title',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id' => 'CI',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name' => 'CI Name',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact' => 'Impact (text)',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code' => 'Impact',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Added manually',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Computed',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Not impacted',
-));
-
-
 //
 // Class: WorkOrder
 //
@@ -241,15 +215,4 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:ResponseTicketTTO/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTO',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTR',
-
-	'portal:itop-portal' => 'Standard portal', // This is the portal name that will be displayed in portal dispatcher (eg. URL in menus)
-	'Page:DefaultTitle' => '%1$s - User portal',
-	'Brick:Portal:UserProfile:Title' => 'My profile',
-	'Brick:Portal:NewRequest:Title' => 'New request',
-	'Brick:Portal:NewRequest:Title+' => '<p>Need help?</p><p>Pick from the services catalog and submit your request to our support teams.</p>',
-	'Brick:Portal:OngoingRequests:Title' => 'Ongoing requests',
-	'Brick:Portal:OngoingRequests:Title+' => '<p>Follow up with your ongoing requests.</p><p>Check the progress, add comments, attach documents, acknowledge the solution.</p>',
-	'Brick:Portal:OngoingRequests:Tab:OnGoing' => 'Open',
-	'Brick:Portal:OngoingRequests:Tab:Resolved' => 'Resolved',
-	'Brick:Portal:ClosedRequests:Title' => 'Closed requests',
 ));
diff --git a/datamodels/2.x/itop-tickets/es_cr.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/es_cr.dict.itop-tickets.php
index 41e3016f5..76d6b0d88 100755
--- a/datamodels/2.x/itop-tickets/es_cr.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/es_cr.dict.itop-tickets.php
@@ -112,32 +112,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'Class:lnkContactToTicket/Attribute:role_code/Value:do_not_notify' => 'No notificar',
 ));
 
-//
-// Class: lnkFunctionalCIToTicket
-//
-
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
-	'Class:lnkFunctionalCIToTicket' => 'Relación EC Funcional y Ticket',
-	'Class:lnkFunctionalCIToTicket+' => 'Relación EC Funcional y Ticket',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Ticket',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => 'Ticket',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'Ref.',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref+' => 'Ref.',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title' => 'Ticket title~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title+' => '~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id' => 'EC',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id+' => 'Elemanto de Configuración',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name' => 'Elemanto de Configuración',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name+' => 'Elemanto de Configuración',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact' => 'Impacto',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact+' => 'Impacto',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code' => 'Impacto',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Agregado Manualmente',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Calculado',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'No impactado',
-));
-
-
 //
 // Class: WorkOrder
 //
@@ -239,15 +213,4 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'Class:ResponseTicketTTO/Interface:iMetricComputer+' => 'Objetivo basado en SLT de tipo TTO',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Tiempo a Resolución',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Objetivo basado en SLT de tipo TTR',
-
-	'portal:itop-portal' => 'Portal de Usuario', // This is the portal name that will be displayed in portal dispatcher (eg. URL in menus)
-	'Page:DefaultTitle' => 'ITop - Portal de Usuario',
-	'Brick:Portal:UserProfile:Title' => 'Mi perfil',
-	'Brick:Portal:NewRequest:Title' => 'Nuevo Requerimiento',
-	'Brick:Portal:NewRequest:Title+' => '¿Necesita ayuda? Elija del catálogo de servicios y envíe su requerimiento a nuestros equipos de soporte.',
-	'Brick:Portal:OngoingRequests:Title' => 'Requerimientos en Proceso',
-	'Brick:Portal:OngoingRequests:Title+' => 'Revise sus requerimientos en proceso. Compruebe el progreso, agregue comentarios, adjunte documentos, entienda la solución. </ P>',
-	'Brick:Portal:OngoingRequests:Tab:OnGoing' => 'En proceso',
-	'Brick:Portal:OngoingRequests:Tab:Resolved' => 'Solucionado',
-	'Brick:Portal:ClosedRequests:Title' => 'Requerimientos Cerrados',
 ));
diff --git a/datamodels/2.x/itop-tickets/fr.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/fr.dict.itop-tickets.php
index 0ed6db14f..500f6f64f 100755
--- a/datamodels/2.x/itop-tickets/fr.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/fr.dict.itop-tickets.php
@@ -100,32 +100,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:lnkContactToTicket/Attribute:role_code/Value:do_not_notify' => 'Ne pas notifier',
 ));
 
-//
-// Class: lnkFunctionalCIToTicket
-//
-
-Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:lnkFunctionalCIToTicket' => 'Lien CI / Ticket',
-	'Class:lnkFunctionalCIToTicket+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Ticket',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'Référence',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title' => 'Titre Ticket',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id' => 'CI',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name' => 'Nom CI',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact' => 'Impact (texte)',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code' => 'Impact',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Ajouté manuellement',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Calculé',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Non impacté',
-));
-
-
 //
 // Class: WorkOrder
 //
@@ -182,7 +156,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'WorkOrder:Details' => 'Détails',
 	'WorkOrder:Moreinfo' => 'Informations complémentaires',
 	'Tickets:ResolvedFrom' => 'Résolu via %1$s',
-
 	'Class:cmdbAbstractObject/Method:Set' => 'Set (initialiser)',
 	'Class:cmdbAbstractObject/Method:Set+' => 'Initialiser un champ avec une valeur statique',
 	'Class:cmdbAbstractObject/Method:Set/Param:1' => 'Champ Cible',
@@ -227,15 +200,4 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:ResponseTicketTTO/Interface:iMetricComputer+' => 'Objectif calculé à partir d\'un SLT de type TTO',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Temps de Résolution (TTR)',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Objectif calculé à partir d\'un SLT de type TTR',
-
-	'portal:itop-portal' => 'Portail standard', // This is the portal name that will be displayed in portal dispatcher (eg. URL in menus)
-	'Page:DefaultTitle' => '%1$s - Portail utilisateur',
-	'Brick:Portal:UserProfile:Title' => 'Mon profil',
-	'Brick:Portal:NewRequest:Title' => 'Nouvelle requête',
-	'Brick:Portal:NewRequest:Title+' => '<p>Besoin d\'assistance&nbsp;?</p><p>Choisissez un service (assistance ou dépannage) et soumettez votre requête à nos équipes de support.</p>',
-	'Brick:Portal:OngoingRequests:Title' => 'Requêtes en cours',
-	'Brick:Portal:OngoingRequests:Title+' => '<p>Suivez vos requêtes en cours.</p><p>Consultez l\'avancement, ajoutez des commentaires ou des pièces jointes, validez la solution.</p>',
-	'Brick:Portal:OngoingRequests:Tab:OnGoing' => 'Ouvertes',
-	'Brick:Portal:OngoingRequests:Tab:Resolved' => 'Résolues',
-	'Brick:Portal:ClosedRequests:Title' => 'Requêtes fermées',
 ));
diff --git a/datamodels/2.x/itop-tickets/hu.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/hu.dict.itop-tickets.php
index ced75222f..c9d69327e 100755
--- a/datamodels/2.x/itop-tickets/hu.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/hu.dict.itop-tickets.php
@@ -97,32 +97,6 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:lnkContactToTicket/Attribute:role_code/Value:do_not_notify' => 'Do not notify~~',
 ));
 
-//
-// Class: lnkFunctionalCIToTicket
-//
-
-Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'Class:lnkFunctionalCIToTicket' => 'Link FunctionalCI / Ticket~~',
-	'Class:lnkFunctionalCIToTicket+' => '~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Ticket~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'Ref~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref+' => '~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title' => 'Ticket title~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title+' => '~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id' => 'CI~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id+' => '~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name' => 'CI Name~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name+' => '~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact' => 'Impact (text)~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact+' => '~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code' => 'Impact~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Added manually~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Computed~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Not impacted~~',
-));
-
-
 //
 // Class: WorkOrder
 //
@@ -224,15 +198,4 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:ResponseTicketTTO/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTO~~',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve~~',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTR~~',
-
-	'portal:itop-portal' => 'Standard portal~~', // This is the portal name that will be displayed in portal dispatcher (eg. URL in menus)
-	'Page:DefaultTitle' => '%1$s - User portal~~',
-	'Brick:Portal:UserProfile:Title' => 'My profile~~',
-	'Brick:Portal:NewRequest:Title' => 'New request~~',
-	'Brick:Portal:NewRequest:Title+' => '<p>Need help?</p><p>Pick from the services catalog and submit your request to our support teams.</p>~~',
-	'Brick:Portal:OngoingRequests:Title' => 'Ongoing requests~~',
-	'Brick:Portal:OngoingRequests:Title+' => '<p>Follow up with your ongoing requests.</p><p>Check the progress, add comments, attach documents, acknowledge the solution.</p>~~',
-	'Brick:Portal:OngoingRequests:Tab:OnGoing' => 'Open~~',
-	'Brick:Portal:OngoingRequests:Tab:Resolved' => 'Resolved~~',
-	'Brick:Portal:ClosedRequests:Title' => 'Closed requests~~',
 ));
diff --git a/datamodels/2.x/itop-tickets/it.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/it.dict.itop-tickets.php
index d71680576..d3073512d 100755
--- a/datamodels/2.x/itop-tickets/it.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/it.dict.itop-tickets.php
@@ -97,32 +97,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:lnkContactToTicket/Attribute:role_code/Value:do_not_notify' => 'Do not notify~~',
 ));
 
-//
-// Class: lnkFunctionalCIToTicket
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:lnkFunctionalCIToTicket' => 'Link FunctionalCI / Ticket~~',
-	'Class:lnkFunctionalCIToTicket+' => '~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Ticket~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'Ref~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref+' => '~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title' => 'Ticket title~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title+' => '~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id' => 'CI~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id+' => '~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name' => 'CI Name~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name+' => '~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact' => 'Impact (text)~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact+' => '~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code' => 'Impact~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Added manually~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Computed~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Not impacted~~',
-));
-
-
 //
 // Class: WorkOrder
 //
@@ -224,15 +198,4 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:ResponseTicketTTO/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTO~~',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve~~',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTR~~',
-
-	'portal:itop-portal' => 'Standard portal~~', // This is the portal name that will be displayed in portal dispatcher (eg. URL in menus)
-	'Page:DefaultTitle' => '%1$s - User portal~~',
-	'Brick:Portal:UserProfile:Title' => 'Il Mio Profilo',
-	'Brick:Portal:NewRequest:Title' => 'Nuova Richiesta',
-	'Brick:Portal:NewRequest:Title+' => '<p>Hai bisogno di aiuto?</p><p>Cerca nel catalogo dei servizi e inviaci una richiesta al nostro supporto.</p>',
-	'Brick:Portal:OngoingRequests:Title' => 'Richieste in corso',
-	'Brick:Portal:OngoingRequests:Title+' => '<p>Segui le tue richieste in corso.</p><p>Verifica i progressi, aggiungi dei commenti, allega i documenti, scopri la soluzione.</p>',
-	'Brick:Portal:OngoingRequests:Tab:OnGoing' => 'Aperte',
-	'Brick:Portal:OngoingRequests:Tab:Resolved' => 'Risolte',
-	'Brick:Portal:ClosedRequests:Title' => 'Richieste Chiuse',
 ));
diff --git a/datamodels/2.x/itop-tickets/ja.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/ja.dict.itop-tickets.php
index 229df77d2..139244563 100755
--- a/datamodels/2.x/itop-tickets/ja.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/ja.dict.itop-tickets.php
@@ -97,32 +97,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkContactToTicket/Attribute:role_code/Value:do_not_notify' => 'Do not notify~~',
 ));
 
-//
-// Class: lnkFunctionalCIToTicket
-//
-
-Dict::Add('JA JP', 'Japanese', '日本語', array(
-	'Class:lnkFunctionalCIToTicket' => 'リンク 機能的CI/チケット',
-	'Class:lnkFunctionalCIToTicket+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'チケット',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => '参照',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title' => 'Ticket title~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title+' => '~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id' => 'CI',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name' => 'CI名',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact' => 'インパクト',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code' => 'Impact~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Added manually~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Computed~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Not impacted~~',
-));
-
-
 //
 // Class: WorkOrder
 //
@@ -224,15 +198,4 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:ResponseTicketTTO/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTO~~',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve~~',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTR~~',
-
-	'portal:itop-portal' => 'Standard portal~~', // This is the portal name that will be displayed in portal dispatcher (eg. URL in menus)
-	'Page:DefaultTitle' => '%1$s - User portal~~',
-	'Brick:Portal:UserProfile:Title' => 'My profile~~',
-	'Brick:Portal:NewRequest:Title' => 'New request~~',
-	'Brick:Portal:NewRequest:Title+' => '<p>Need help?</p><p>Pick from the services catalog and submit your request to our support teams.</p>~~',
-	'Brick:Portal:OngoingRequests:Title' => 'Ongoing requests~~',
-	'Brick:Portal:OngoingRequests:Title+' => '<p>Follow up with your ongoing requests.</p><p>Check the progress, add comments, attach documents, acknowledge the solution.</p>~~',
-	'Brick:Portal:OngoingRequests:Tab:OnGoing' => 'Open~~',
-	'Brick:Portal:OngoingRequests:Tab:Resolved' => 'Resolved~~',
-	'Brick:Portal:ClosedRequests:Title' => 'Closed requests~~',
 ));
diff --git a/datamodels/2.x/itop-tickets/main.itop-tickets.php b/datamodels/2.x/itop-tickets/main.itop-tickets.php
index 612aea5bf..d4003bf42 100755
--- a/datamodels/2.x/itop-tickets/main.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/main.itop-tickets.php
@@ -134,29 +134,31 @@ class _Ticket extends cmdbAbstractObject
 	public function UpdateImpactedItems()
 	{
 		require_once(APPROOT.'core/displayablegraph.class.inc.php');
-
 		/** @var ormLinkSet $oContactsSet */
 		$oContactsSet = $this->Get('contacts_list');
-		/** @var ormLinkSet $oCIsSet */
-		$oCIsSet = $this->Get('functionalcis_list');
-
 		$aCIsToImpactCode = array();
 		$aSources = array();
 		$aExcluded = array();
-    	foreach ($oCIsSet as $oLink)
+		if (MetaModel::IsValidClass('FunctionalCI'))
 		{
-			$iKey = $oLink->Get('functionalci_id');
-			$aCIsToImpactCode[$iKey] = array('link' => $oLink->GetKey(), 'code' => $oLink->Get('impact_code'));
-			if ($oLink->Get('impact_code') == 'manual')
+			/** @var ormLinkSet $oCIsSet */
+			$oCIsSet = $this->Get('functionalcis_list');
+			foreach ($oCIsSet as $oLink)
 			{
-				$oObj = MetaModel::GetObject('FunctionalCI', $iKey);
-				$aSources[$iKey] = $oObj;
-			}
-			else if ($oLink->Get('impact_code') == 'not_impacted')
-			{
-				$oObj = MetaModel::GetObject('FunctionalCI', $iKey);
-				$aExcluded[] = $oObj;
+				$iKey = $oLink->Get('functionalci_id');
+				$aCIsToImpactCode[$iKey] = array('link' => $oLink->GetKey(), 'code' => $oLink->Get('impact_code'));
+				if ($oLink->Get('impact_code') == 'manual')
+				{
+					$oObj = MetaModel::GetObject('FunctionalCI', $iKey);
+					$aSources[$iKey] = $oObj;
+				}
+				else if ($oLink->Get('impact_code') == 'not_impacted')
+				{
+					$oObj = MetaModel::GetObject('FunctionalCI', $iKey);
+					$aExcluded[] = $oObj;
+				}
 			}
+
 		}
 
 		$aContactsToRoleCode = array();
@@ -258,7 +260,10 @@ class _Ticket extends cmdbAbstractObject
 				break;
 			}
 		}
-		$this->Set('functionalcis_list', $oCIsSet);
+		if (MetaModel::IsValidClass('FunctionalCI'))
+		{
+			$this->Set('functionalcis_list', $oCIsSet);
+		}
 		$this->Set('contacts_list', $oContactsSet);
 	}
 
diff --git a/datamodels/2.x/itop-tickets/module.itop-tickets.php b/datamodels/2.x/itop-tickets/module.itop-tickets.php
index c6fe4c42f..478b6e0e7 100755
--- a/datamodels/2.x/itop-tickets/module.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/module.itop-tickets.php
@@ -13,10 +13,10 @@ SetupWebPage::AddModule(
 		// Setup
 		//
 		'dependencies' => array(
-			'itop-config-mgmt/2.4.0',
+			'itop-structure/2.7.1',
 		),
-		'mandatory' => true,
-		'visible' => false,
+		'mandatory' => false,
+		'visible' => true,
 		'installer' => 'TicketsInstaller',
 
 		// Components
diff --git a/datamodels/2.x/itop-tickets/nl.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/nl.dict.itop-tickets.php
index 6d5a17e2d..7489ac59d 100644
--- a/datamodels/2.x/itop-tickets/nl.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/nl.dict.itop-tickets.php
@@ -116,32 +116,6 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:lnkContactToTicket/Attribute:role_code/Value:do_not_notify' => 'Niet verwittigen',
 ));
 
-//
-// Class: lnkFunctionalCIToTicket
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:lnkFunctionalCIToTicket' => 'Link Functioneel CI / Ticket',
-	'Class:lnkFunctionalCIToTicket+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Ticket',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'Referentie',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title' => 'Titel ticket',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id' => 'CI',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name' => 'Naam CI',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact' => 'Impact',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code' => 'Impact',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Manueel toegevoegd',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Automatisch afgeleid',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Niet geïmpacteerd',
-));
-
-
 //
 // Class: WorkOrder
 //
@@ -243,15 +217,4 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:ResponseTicketTTO/Interface:iMetricComputer+' => 'Doel gebaseerd op een SLT (TTO)',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Doel gebaseerd op een SLT (TTR)',
-
-	'portal:itop-portal' => 'Standaard portaal', // This is the portal name that will be displayed in portal dispatcher (eg. URL in menus)
-	'Page:DefaultTitle' => '%1$s - Gebruikersportaal',
-	'Brick:Portal:UserProfile:Title' => 'Mijn profiel',
-	'Brick:Portal:NewRequest:Title' => 'Nieuw verzoek',
-	'Brick:Portal:NewRequest:Title+' => '<p>Hulp nodig?</p><p>Selecteer de categorie uit de servicecatalogus en verstuur jouw verzoek naar onze supportteams.</p>',
-	'Brick:Portal:OngoingRequests:Title' => 'Lopende verzoeken',
-	'Brick:Portal:OngoingRequests:Title+' => '<p>Verder gaan met jouw openstaande verzoeken.</p><p>Controleer de voortgang, voeg commentaar of documenten toe, bevestig de geboden oplossing.</p>',
-	'Brick:Portal:OngoingRequests:Tab:OnGoing' => 'Openstaand',
-	'Brick:Portal:OngoingRequests:Tab:Resolved' => 'Opgelost',
-	'Brick:Portal:ClosedRequests:Title' => 'Gesloten verzoeken',
 ));
diff --git a/datamodels/2.x/itop-tickets/pt_br.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/pt_br.dict.itop-tickets.php
index 5841d5cdc..4268dd030 100755
--- a/datamodels/2.x/itop-tickets/pt_br.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/pt_br.dict.itop-tickets.php
@@ -111,32 +111,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkContactToTicket/Attribute:role_code/Value:do_not_notify' => 'Não notificar',
 ));
 
-//
-// Class: lnkFunctionalCIToTicket
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkFunctionalCIToTicket' => 'Link CI / Solicitação',
-	'Class:lnkFunctionalCIToTicket+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Solicitação',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'Ref',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title' => 'Título do bilhete',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id' => 'CIs',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name' => 'Nome CI',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact' => 'Impacto',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code' => 'Impacto',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Adicionado manualmente',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Computado',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Não impactado',
-));
-
-
 //
 // Class: WorkOrder
 //
@@ -238,15 +212,4 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:ResponseTicketTTO/Interface:iMetricComputer+' => 'Objetivo baseado em um SLT do tipo TTO',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve~~',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Objetivo baseado em um SLT do tipo TTR',
-
-	'portal:itop-portal' => 'Standard portal~~', // This is the portal name that will be displayed in portal dispatcher (eg. URL in menus)
-	'Page:DefaultTitle' => 'iTop - Portal do Usuário',
-	'Brick:Portal:UserProfile:Title' => 'Meu Perfil',
-	'Brick:Portal:NewRequest:Title' => 'Nova Solicitação',
-	'Brick:Portal:NewRequest:Title+' => '<p>Precisa de ajuda?</p><p>Escolha no Catálogo de Serviços e envie sua solicitação para nossas equipes de suporte.</p>',
-	'Brick:Portal:OngoingRequests:Title' => 'Em andamento',
-	'Brick:Portal:OngoingRequests:Title+' => '<p>Acompanhar suas solicitações em andamento, adicionar comentários, anexar documentos e confirmar a solução.</p>',
-	'Brick:Portal:OngoingRequests:Tab:OnGoing' => 'Abrir',
-	'Brick:Portal:OngoingRequests:Tab:Resolved' => 'Resolvido',
-	'Brick:Portal:ClosedRequests:Title' => 'Fechar solicitações',
 ));
diff --git a/datamodels/2.x/itop-tickets/ru.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/ru.dict.itop-tickets.php
index 0d5db2aed..880c221bd 100755
--- a/datamodels/2.x/itop-tickets/ru.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/ru.dict.itop-tickets.php
@@ -89,32 +89,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkContactToTicket/Attribute:role_code/Value:do_not_notify' => 'Не уведомлять',
 ));
 
-//
-// Class: lnkFunctionalCIToTicket
-//
-
-Dict::Add('RU RU', 'Russian', 'Русский', array(
-	'Class:lnkFunctionalCIToTicket' => 'Связь Функциональная КЕ/Тикет',
-	'Class:lnkFunctionalCIToTicket+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Тикет',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'Тикет',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title' => 'Название тикета',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id' => 'КЕ',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name' => 'КЕ',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact' => 'Влияние (текст)',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code' => 'Влияние',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Добавлено вручную',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Вычислено',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Не влияет',
-));
-
-
 //
 // Class: WorkOrder
 //
@@ -216,15 +190,4 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:ResponseTicketTTO/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTO~~',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve~~',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTR~~',
-
-	'portal:itop-portal' => 'Пользовательский портал', // This is the portal name that will be displayed in portal dispatcher (eg. URL in menus)
-	'Page:DefaultTitle' => '%1$s - Пользовательский портал',
-	'Brick:Portal:UserProfile:Title' => 'Мой профиль',
-	'Brick:Portal:NewRequest:Title' => 'Новый запрос',
-	'Brick:Portal:NewRequest:Title+' => '<p>Нужна помощь?</p><p>Выберите услугу из&nbsp;каталога и&nbsp;отправьте свой запрос команде поддержки.</p>',
-	'Brick:Portal:OngoingRequests:Title' => 'Текущие запросы',
-	'Brick:Portal:OngoingRequests:Title+' => '<p>Следите за&nbsp;открытыми запросами.</p><p>Проверяйте ход решения, добавляйте комментарии и&nbsp;вложения, подтверждайте решение.</p>',
-	'Brick:Portal:OngoingRequests:Tab:OnGoing' => 'В работе',
-	'Brick:Portal:OngoingRequests:Tab:Resolved' => 'Решенные',
-	'Brick:Portal:ClosedRequests:Title' => 'Закрытые запросы',
 ));
diff --git a/datamodels/2.x/itop-tickets/sk.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/sk.dict.itop-tickets.php
index cb217cb6c..58dec2f99 100644
--- a/datamodels/2.x/itop-tickets/sk.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/sk.dict.itop-tickets.php
@@ -110,32 +110,6 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:lnkContactToTicket/Attribute:role_code/Value:do_not_notify' => 'Do not notify~~',
 ));
 
-//
-// Class: lnkFunctionalCIToTicket
-//
-
-Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
-	'Class:lnkFunctionalCIToTicket' => 'väzba - Komponent / Ticket',
-	'Class:lnkFunctionalCIToTicket+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Ticket',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'Referencia na Ticket',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title' => 'Ticket title~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title+' => '~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id' => 'Komponent',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name' => 'Názov CI',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact' => 'Dopad',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code' => 'Impact~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Added manually~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Computed~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Not impacted~~',
-));
-
-
 //
 // Class: WorkOrder
 //
@@ -237,15 +211,4 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:ResponseTicketTTO/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTO~~',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve~~',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTR~~',
-
-	'portal:itop-portal' => 'Standard portal~~', // This is the portal name that will be displayed in portal dispatcher (eg. URL in menus)
-	'Page:DefaultTitle' => '%1$s - User portal~~',
-	'Brick:Portal:UserProfile:Title' => 'My profile~~',
-	'Brick:Portal:NewRequest:Title' => 'New request~~',
-	'Brick:Portal:NewRequest:Title+' => '<p>Need help?</p><p>Pick from the services catalog and submit your request to our support teams.</p>~~',
-	'Brick:Portal:OngoingRequests:Title' => 'Ongoing requests~~',
-	'Brick:Portal:OngoingRequests:Title+' => '<p>Follow up with your ongoing requests.</p><p>Check the progress, add comments, attach documents, acknowledge the solution.</p>~~',
-	'Brick:Portal:OngoingRequests:Tab:OnGoing' => 'Open~~',
-	'Brick:Portal:OngoingRequests:Tab:Resolved' => 'Resolved~~',
-	'Brick:Portal:ClosedRequests:Title' => 'Closed requests~~',
 ));
diff --git a/datamodels/2.x/itop-tickets/tr.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/tr.dict.itop-tickets.php
index b3ac9341e..0624b8b8f 100755
--- a/datamodels/2.x/itop-tickets/tr.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/tr.dict.itop-tickets.php
@@ -115,32 +115,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:lnkContactToTicket/Attribute:role_code/Value:do_not_notify' => 'Do not notify~~',
 ));
 
-//
-// Class: lnkFunctionalCIToTicket
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:lnkFunctionalCIToTicket' => 'Link FunctionalCI / Ticket~~',
-	'Class:lnkFunctionalCIToTicket+' => '~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Ticket~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'Ref~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref+' => '~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title' => 'Ticket title~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title+' => '~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id' => 'CI~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id+' => '~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name' => 'CI Name~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name+' => '~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact' => 'Impact (text)~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact+' => '~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code' => 'Impact~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Added manually~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Computed~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Not impacted~~',
-));
-
-
 //
 // Class: WorkOrder
 //
@@ -242,15 +216,4 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:ResponseTicketTTO/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTO~~',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve~~',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTR~~',
-
-	'portal:itop-portal' => 'Standard portal~~', // This is the portal name that will be displayed in portal dispatcher (eg. URL in menus)
-	'Page:DefaultTitle' => '%1$s - User portal~~',
-	'Brick:Portal:UserProfile:Title' => 'My profile~~',
-	'Brick:Portal:NewRequest:Title' => 'New request~~',
-	'Brick:Portal:NewRequest:Title+' => '<p>Need help?</p><p>Pick from the services catalog and submit your request to our support teams.</p>~~',
-	'Brick:Portal:OngoingRequests:Title' => 'Ongoing requests~~',
-	'Brick:Portal:OngoingRequests:Title+' => '<p>Follow up with your ongoing requests.</p><p>Check the progress, add comments, attach documents, acknowledge the solution.</p>~~',
-	'Brick:Portal:OngoingRequests:Tab:OnGoing' => 'Open~~',
-	'Brick:Portal:OngoingRequests:Tab:Resolved' => 'Resolved~~',
-	'Brick:Portal:ClosedRequests:Title' => 'Closed requests~~',
 ));
diff --git a/datamodels/2.x/itop-tickets/zh_cn.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/zh_cn.dict.itop-tickets.php
index 3773b449c..24dfda27d 100755
--- a/datamodels/2.x/itop-tickets/zh_cn.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/zh_cn.dict.itop-tickets.php
@@ -110,32 +110,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:lnkContactToTicket/Attribute:role_code/Value:do_not_notify' => '不通知',
 ));
 
-//
-// Class: lnkFunctionalCIToTicket
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:lnkFunctionalCIToTicket' => '关联 功能配置项/工单',
-	'Class:lnkFunctionalCIToTicket+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => '工单',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => '工单编号',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title' => 'Ticket title~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title+' => '~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id' => '配置项',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name' => '配置项名称',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact' => '影响 (文本)',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code' => '影响',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => '手动添加',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => '自动添加',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => '不通知',
-));
-
-
 //
 // Class: WorkOrder
 //
@@ -237,15 +211,4 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:ResponseTicketTTO/Interface:iMetricComputer+' => 'SLT 的响应时间',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer' => '解决时间',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'SLT 的解决时间',
-
-	'portal:itop-portal' => '标准门户', // This is the portal name that will be displayed in portal dispatcher (eg. URL in menus)
-	'Page:DefaultTitle' => 'iTop - 用户门户',
-	'Brick:Portal:UserProfile:Title' => '我的资料',
-	'Brick:Portal:NewRequest:Title' => '新建工单',
-	'Brick:Portal:NewRequest:Title+' => '<p>需要帮助?</p><p>选择子服务,然后提交工单给我们的支持团队.</p>',
-	'Brick:Portal:OngoingRequests:Title' => '正在处理的工单',
-	'Brick:Portal:OngoingRequests:Title+' => '<p>跟踪正在处理的工单.</p><p>查询进度, 添加留言, 添加附件, 确认解决方案.</p>',
-	'Brick:Portal:OngoingRequests:Tab:OnGoing' => '正在处理',
-	'Brick:Portal:OngoingRequests:Tab:Resolved' => '已解决',
-	'Brick:Portal:ClosedRequests:Title' => '已关闭的工单',
 ));
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 85e69f6e6..4585195d3 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,19 +11,11 @@
           <cell id="0">
             <rank>0</rank>
             <dashlets>
-              <dashlet id="1" xsi:type="DashletHeaderStatic">
-                <rank>0</rank>
-                <title>Menu:ConfigManagementCI</title>
-                <icon>itop-welcome-itil/images/database.png</icon>
-              </dashlet>
-              <dashlet id="2" xsi:type="DashletBadge">
-                <rank>1</rank>
-                <class>BusinessProcess</class>
-              </dashlet>
-              <dashlet id="3" xsi:type="DashletBadge">
-                <rank>2</rank>
-                <class>ApplicationSolution</class>
-              </dashlet>
+	            <dashlet id="1" xsi:type="DashletHeaderStatic">
+		            <rank>0</rank>
+		            <title>Menu:ConfigManagementCI</title>
+		            <icon>itop-welcome-itil/images/database.png</icon>
+	            </dashlet>
               <dashlet id="4" xsi:type="DashletBadge">
                 <rank>3</rank>
                 <class>Contact</class>
@@ -32,18 +24,6 @@
                 <rank>4</rank>
                 <class>Location</class>
               </dashlet>
-              <dashlet id="6" xsi:type="DashletBadge">
-                <rank>5</rank>
-                <class>Contract</class>
-              </dashlet>
-              <dashlet id="7" xsi:type="DashletBadge">
-                <rank>6</rank>
-                <class>Server</class>
-              </dashlet>
-              <dashlet id="8" xsi:type="DashletBadge">
-                <rank>7</rank>
-                <class>NetworkDevice</class>
-              </dashlet>
             </dashlets>
           </cell>
         </cells>
diff --git a/dictionaries/en.dictionary.itop.core.php b/dictionaries/en.dictionary.itop.core.php
index efda67374..98f4a352a 100644
--- a/dictionaries/en.dictionary.itop.core.php
+++ b/dictionaries/en.dictionary.itop.core.php
@@ -1082,3 +1082,6 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:ResourceSystemMenu' => 'Resource System Menu',
 	'Class:ResourceSystemMenu+' => '',
 ));
+
+
+
diff --git a/dictionaries/fr.dictionary.itop.core.php b/dictionaries/fr.dictionary.itop.core.php
index 11170e532..8b4567930 100644
--- a/dictionaries/fr.dictionary.itop.core.php
+++ b/dictionaries/fr.dictionary.itop.core.php
@@ -1090,3 +1090,5 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:ResourceSystemMenu' => 'Menu System',
 	'Class:ResourceSystemMenu+' => '',
 ));
+
+
diff --git a/setup/compiler.class.inc.php b/setup/compiler.class.inc.php
index 30f339d80..216b0664c 100644
--- a/setup/compiler.class.inc.php
+++ b/setup/compiler.class.inc.php
@@ -1554,7 +1554,7 @@ EOF
 						$oRootNode = $oXMLDoc->createElement('dashboard'); // make sure that the document is not empty
 						$oRootNode->setAttribute('xmlns:xsi', "http://www.w3.org/2001/XMLSchema-instance");
 						$oXMLDoc->appendChild($oRootNode);
-						foreach($oDashboardDefinition->childNodes as $oNode)
+						foreach ($oDashboardDefinition->childNodes as $oNode)
 						{
 							$oDefNode = $oXMLDoc->importNode($oNode, true); // layout, cells, etc Nodes and below
 							$oRootNode->appendChild($oDefNode);
@@ -2128,7 +2128,7 @@ EOF
 				$oRootNode = $oXMLDoc->createElement('dashboard'); // make sure that the document is not empty
 				$oRootNode->setAttribute('xmlns:xsi', "http://www.w3.org/2001/XMLSchema-instance");
 				$oXMLDoc->appendChild($oRootNode);
-				foreach($oDashboardDefinition->childNodes as $oNode)
+				foreach ($oDashboardDefinition->childNodes as $oNode)
 				{
 					$oDefNode = $oXMLDoc->importNode($oNode, true); // layout, cells, etc Nodes and below
 					$oRootNode->appendChild($oDefNode);

From 7c3659d5ba9a81ae63b36bd7bbea48603d150890 Mon Sep 17 00:00:00 2001
From: Pierre Goiffon <pierre.goiffon@combodo.com>
Date: Fri, 18 Sep 2020 18:26:31 +0200
Subject: [PATCH 02/43] :wrench: Remove versionned PHPStorm files Those files
 were duplicates of the .editorconfig file

.editorconfig was pushed with ecd8f40c0f1c692f94e2f79d11be842e2d41eec4 for 2.7.0 and should be the only source of the IDE / editor configuration

This generic format is implemented in PHPStorm since v2019.2 (see https://blog.jetbrains.com/idea/2019/06/managing-code-style-on-a-directory-level-with-editorconfig/)
To check if your IDE / editor supports it, check https://editorconfig.org/
---
 .gitignore                                    |   5 -
 .idea/codeStyles/Project.xml                  |  74 --------
 .idea/codeStyles/codeStyleConfig.xml          |   5 -
 .idea/encodings.xml                           |   6 -
 .idea/inspectionProfiles/Combodo.xml          | 171 ------------------
 .idea/inspectionProfiles/Project_Default.xml  |  19 --
 .../inspectionProfiles/profiles_settings.xml  |   6 -
 7 files changed, 286 deletions(-)
 delete mode 100644 .idea/codeStyles/Project.xml
 delete mode 100644 .idea/codeStyles/codeStyleConfig.xml
 delete mode 100644 .idea/encodings.xml
 delete mode 100644 .idea/inspectionProfiles/Combodo.xml
 delete mode 100644 .idea/inspectionProfiles/Project_Default.xml
 delete mode 100644 .idea/inspectionProfiles/profiles_settings.xml

diff --git a/.gitignore b/.gitignore
index 3f995a7f3..92eb71a34 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,11 +40,6 @@ test/vendor/*
 
 # Jetbrains
 /.idea/**
-!/.idea/encodings.xml
-!/.idea/codeStyles
-!/.idea/codeStyles/*
-!/.idea/inspectionProfiles
-!/.idea/inspectionProfiles/*
 
 # doc. generation
 /.doc/vendor
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index 6af43b87d..000000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <option name="LINE_SEPARATOR" value="&#10;" />
-    <option name="RIGHT_MARGIN" value="140" />
-    <option name="WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN" value="true" />
-    <option name="SOFT_MARGINS" value="140" />
-    <HTMLCodeStyleSettings>
-      <option name="HTML_DO_NOT_INDENT_CHILDREN_OF" value="html,body,thead,tbody,tfoot,style,script,head" />
-    </HTMLCodeStyleSettings>
-    <JSCodeStyleSettings version="0">
-      <option name="USE_CHAINED_CALLS_GROUP_INDENTS" value="true" />
-    </JSCodeStyleSettings>
-    <PHPCodeStyleSettings>
-      <option name="CONCAT_SPACES" value="false" />
-      <option name="COMMA_AFTER_LAST_ARRAY_ELEMENT" value="true" />
-      <option name="PHPDOC_BLANK_LINE_BEFORE_TAGS" value="true" />
-      <option name="PHPDOC_BLANK_LINES_AROUND_PARAMETERS" value="true" />
-      <option name="PHPDOC_WRAP_LONG_LINES" value="true" />
-      <option name="THROWS_WEIGHT" value="6" />
-      <option name="PARAM_WEIGHT" value="4" />
-      <option name="RETURN_WEIGHT" value="5" />
-      <option name="AUTHOR_WEIGHT" value="7" />
-      <option name="INTERNAL_WEIGHT" value="0" />
-      <option name="API_WEIGHT" value="1" />
-      <option name="EXAMPLE_WEIGHT" value="3" />
-      <option name="SEE_WEIGHT" value="2" />
-      <option name="LOWER_CASE_BOOLEAN_CONST" value="true" />
-      <option name="LOWER_CASE_NULL_CONST" value="true" />
-      <option name="BLANK_LINES_BEFORE_RETURN_STATEMENT" value="1" />
-      <option name="KEEP_RPAREN_AND_LBRACE_ON_ONE_LINE" value="true" />
-      <option name="PHPDOC_USE_FQCN" value="true" />
-    </PHPCodeStyleSettings>
-    <XML>
-      <option name="XML_TEXT_WRAP" value="0" />
-      <option name="XML_KEEP_LINE_BREAKS" value="false" />
-      <option name="XML_KEEP_WHITE_SPACES_INSIDE_CDATA" value="true" />
-    </XML>
-    <codeStyleSettings language="JavaScript">
-      <option name="BRACE_STYLE" value="2" />
-      <option name="ELSE_ON_NEW_LINE" value="true" />
-      <option name="SPACE_AROUND_ADDITIVE_OPERATORS" value="false" />
-      <option name="IF_BRACE_FORCE" value="3" />
-      <indentOptions>
-        <option name="USE_TAB_CHARACTER" value="true" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="PHP">
-      <option name="BLANK_LINES_AFTER_PACKAGE" value="1" />
-      <option name="BRACE_STYLE" value="2" />
-      <option name="ELSE_ON_NEW_LINE" value="true" />
-      <option name="CATCH_ON_NEW_LINE" value="true" />
-      <option name="FINALLY_ON_NEW_LINE" value="true" />
-      <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
-      <option name="CALL_PARAMETERS_WRAP" value="1" />
-      <option name="METHOD_PARAMETERS_WRAP" value="1" />
-      <option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
-      <option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
-      <option name="ARRAY_INITIALIZER_WRAP" value="5" />
-      <option name="ARRAY_INITIALIZER_LBRACE_ON_NEXT_LINE" value="true" />
-      <option name="ARRAY_INITIALIZER_RBRACE_ON_NEXT_LINE" value="true" />
-      <option name="IF_BRACE_FORCE" value="3" />
-      <option name="DOWHILE_BRACE_FORCE" value="3" />
-      <option name="WHILE_BRACE_FORCE" value="3" />
-      <option name="FOR_BRACE_FORCE" value="3" />
-      <indentOptions>
-        <option name="USE_TAB_CHARACTER" value="true" />
-        <option name="SMART_TABS" value="true" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="XML">
-      <option name="WRAP_ON_TYPING" value="1" />
-    </codeStyleSettings>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index d68e1e434..000000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Combodo" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
deleted file mode 100644
index c2bae49d7..000000000
--- a/.idea/encodings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" defaultCharsetForPropertiesFiles="UTF-8">
-    <file url="PROJECT" charset="UTF-8" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Combodo.xml b/.idea/inspectionProfiles/Combodo.xml
deleted file mode 100644
index 763f7a53d..000000000
--- a/.idea/inspectionProfiles/Combodo.xml
+++ /dev/null
@@ -1,171 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Combodo" />
-    <inspection_tool class="CascadeStringReplacementInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="ForgottenDebugOutputInspection" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="configuration">
-        <list>
-          <option value="\Codeception\Util\Debug::debug" />
-          <option value="\Codeception\Util\Debug::pause" />
-          <option value="\Doctrine\Common\Util\Debug::dump" />
-          <option value="\Doctrine\Common\Util\Debug::export" />
-          <option value="\Illuminate\Support\Debug\Dumper::dump" />
-          <option value="\Symfony\Component\Debug\Debug::enable" />
-          <option value="\Symfony\Component\Debug\DebugClassLoader::enable" />
-          <option value="\Symfony\Component\Debug\ErrorHandler::register" />
-          <option value="\Symfony\Component\Debug\ExceptionHandler::register" />
-          <option value="\TYPO3\CMS\Core\Utility\DebugUtility::debug" />
-          <option value="\Zend\Debug\Debug::dump" />
-          <option value="\Zend\Di\Display\Console::export" />
-          <option value="dd" />
-          <option value="debug_print_backtrace" />
-          <option value="debug_zval_dump" />
-          <option value="dpm" />
-          <option value="dpq" />
-          <option value="dsm" />
-          <option value="dump" />
-          <option value="dvm" />
-          <option value="error_log" />
-          <option value="kpr" />
-          <option value="phpinfo" />
-          <option value="print_r" />
-          <option value="var_dump" />
-          <option value="var_export" />
-          <option value="xdebug_break" />
-          <option value="xdebug_call_class" />
-          <option value="xdebug_call_file" />
-          <option value="xdebug_call_function" />
-          <option value="xdebug_call_line" />
-          <option value="xdebug_code_coverage_started" />
-          <option value="xdebug_debug_zval" />
-          <option value="xdebug_debug_zval_stdout" />
-          <option value="xdebug_dump_superglobals" />
-          <option value="xdebug_enable" />
-          <option value="xdebug_get_code_coverage" />
-          <option value="xdebug_get_collected_errors" />
-          <option value="xdebug_get_declared_vars" />
-          <option value="xdebug_get_function_stack" />
-          <option value="xdebug_get_headers" />
-          <option value="xdebug_get_monitored_functions" />
-          <option value="xdebug_get_profiler_filename" />
-          <option value="xdebug_get_stack_depth" />
-          <option value="xdebug_get_tracefile_name" />
-          <option value="xdebug_is_enabled" />
-          <option value="xdebug_memory_usage" />
-          <option value="xdebug_peak_memory_usage" />
-          <option value="xdebug_print_function_stack" />
-          <option value="xdebug_start_code_coverage" />
-          <option value="xdebug_start_error_collection" />
-          <option value="xdebug_start_function_monitor" />
-          <option value="xdebug_start_trace" />
-          <option value="xdebug_stop_code_coverage" />
-          <option value="xdebug_stop_error_collection" />
-          <option value="xdebug_stop_function_monitor" />
-          <option value="xdebug_stop_trace" />
-          <option value="xdebug_time_index" />
-          <option value="xdebug_var_dump" />
-        </list>
-      </option>
-      <option name="migratedIntoUserSpace" value="true" />
-    </inspection_tool>
-    <inspection_tool class="HtmlRequiredAltAttribute" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
-    <inspection_tool class="HtmlRequiredLangAttribute" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
-    <inspection_tool class="InconsistentLineSeparators" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="IsNullFunctionUsageInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="MysqlParsingInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="PhpComposerExtensionStubsInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="PhpIncludeInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
-    <inspection_tool class="PhpMethodParametersCountMismatchInspection" enabled="true" level="ERROR" enabled_by_default="true" />
-    <inspection_tool class="PhpShortOpenTagInspection" enabled="true" level="ERROR" enabled_by_default="true" />
-    <inspection_tool class="PhpTooManyParametersInspection" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="limit" value="7" />
-    </inspection_tool>
-    <inspection_tool class="PhpUndefinedClassInspection" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="DONT_REPORT_MULTI_RESOLVE" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PhpUndefinedMethodInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
-    <inspection_tool class="PhpUnhandledExceptionInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
-    <inspection_tool class="PhpUnusedLocalVariableInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true">
-      <option name="DONT_REPORT_INSIDE_LIST" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PhpUnusedParameterInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true">
-      <option name="DONT_REPORT_ABSTRACT_CLASS" value="true" />
-    </inspection_tool>
-    <inspection_tool class="SecurityAdvisoriesInspection" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="optionConfiguration">
-        <list>
-          <option value="barryvdh/laravel-debugbar" />
-          <option value="behat/behat" />
-          <option value="brianium/paratest" />
-          <option value="codeception/codeception" />
-          <option value="codedungeon/phpunit-result-printer" />
-          <option value="composer/composer" />
-          <option value="doctrine/coding-standard" />
-          <option value="filp/whoops" />
-          <option value="friendsofphp/php-cs-fixer" />
-          <option value="humbug/humbug" />
-          <option value="infection/infection" />
-          <option value="jakub-onderka/php-parallel-lint" />
-          <option value="johnkary/phpunit-speedtrap" />
-          <option value="kalessil/production-dependencies-guard" />
-          <option value="mikey179/vfsStream" />
-          <option value="mockery/mockery" />
-          <option value="mybuilder/phpunit-accelerator" />
-          <option value="orchestra/testbench" />
-          <option value="pdepend/pdepend" />
-          <option value="phan/phan" />
-          <option value="phing/phing" />
-          <option value="phpcompatibility/php-compatibility" />
-          <option value="phpmd/phpmd" />
-          <option value="phpro/grumphp" />
-          <option value="phpspec/phpspec" />
-          <option value="phpspec/prophecy" />
-          <option value="phpstan/phpstan" />
-          <option value="phpunit/phpunit" />
-          <option value="povils/phpmnd" />
-          <option value="roave/security-advisories" />
-          <option value="satooshi/php-coveralls" />
-          <option value="sebastian/phpcpd" />
-          <option value="slevomat/coding-standard" />
-          <option value="spatie/phpunit-watcher" />
-          <option value="squizlabs/php_codesniffer" />
-          <option value="sstalle/php7cc" />
-          <option value="symfony/debug" />
-          <option value="symfony/maker-bundle" />
-          <option value="symfony/phpunit-bridge" />
-          <option value="symfony/var-dumper" />
-          <option value="vimeo/psalm" />
-          <option value="wimg/php-compatibility" />
-          <option value="wp-coding-standards/wpcs" />
-          <option value="yiisoft/yii2-coding-standards" />
-          <option value="yiisoft/yii2-debug" />
-          <option value="yiisoft/yii2-gii" />
-          <option value="zendframework/zend-coding-standard" />
-          <option value="zendframework/zend-debug" />
-          <option value="zendframework/zend-test" />
-        </list>
-      </option>
-    </inspection_tool>
-    <inspection_tool class="SqlAddNotNullColumnInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlAmbiguousColumnInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlAutoIncrementDuplicateInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlCheckUsingColumnsInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlConstantConditionInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlDeprecateTypeInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlDerivedTableAliasInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlDialectInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlDropIndexedColumnInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlIdentifierInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlInsertValuesInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlNoDataSourceInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlNullComparisonInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlPostgresqlSelectFromProcedureInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlResolveInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlShouldBeInGroupByInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlSideEffectsInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlSignatureInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlStorageInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlTypeInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="SqlUnusedVariableInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index b9013fdbd..000000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="InconsistentLineSeparators" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="PhpIncludeInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
-    <inspection_tool class="PhpMethodParametersCountMismatchInspection" enabled="true" level="ERROR" enabled_by_default="true" />
-    <inspection_tool class="PhpTooManyParametersInspection" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="limit" value="7" />
-    </inspection_tool>
-    <inspection_tool class="PhpUndefinedClassInspection" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="DONT_REPORT_MULTI_RESOLVE" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PhpUnhandledExceptionInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
-    <inspection_tool class="PhpUnusedParameterInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true">
-      <option name="DONT_REPORT_ABSTRACT_CLASS" value="true" />
-    </inspection_tool>
-    <inspection_tool class="SqlNoDataSourceInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
deleted file mode 100644
index 7f3af8c75..000000000
--- a/.idea/inspectionProfiles/profiles_settings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="PROJECT_PROFILE" value="Combodo" />
-    <version value="1.0" />
-  </settings>
-</component>
\ No newline at end of file

From c6df0b6d7dd7d0e2888201526ee4370926eeb4f1 Mon Sep 17 00:00:00 2001
From: Eric <eric.espie@combodo.com>
Date: Tue, 22 Sep 2020 11:03:59 +0200
Subject: [PATCH 03/43] =?UTF-8?q?N=C2=B03311=20-=20Stop=20capturing=20outp?=
 =?UTF-8?q?ut=20before=20sending=20backup=20file=20(avoid=20memory=20probl?=
 =?UTF-8?q?em)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 datamodels/2.x/itop-backup/ajax.backup.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/datamodels/2.x/itop-backup/ajax.backup.php b/datamodels/2.x/itop-backup/ajax.backup.php
index 7196242c3..528a48916 100644
--- a/datamodels/2.x/itop-backup/ajax.backup.php
+++ b/datamodels/2.x/itop-backup/ajax.backup.php
@@ -213,6 +213,9 @@ JS
 			break;
 
 		case 'download':
+			while (ob_get_level() > 0) {
+				ob_end_clean();
+			}
 			$sFile = utils::ReadParam('file', '', false, 'raw_data');
 			$oBackup = new DBBackupScheduled();
 			$sBackupDir = APPROOT.'data/backups/';

From 1453558f3e761b02d559247395e58172096b7d48 Mon Sep 17 00:00:00 2001
From: Eric <eric.espie@combodo.com>
Date: Tue, 22 Sep 2020 11:39:19 +0200
Subject: [PATCH 04/43] =?UTF-8?q?N=C2=B03317=20-=20Add=20http=20headers?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/ajaxwebpage.class.inc.php                    | 4 +++-
 application/csvpage.class.inc.php                        | 4 +++-
 application/itopwebpage.class.inc.php                    | 4 +++-
 application/loginwebpage.class.inc.php                   | 4 +++-
 application/webpage.class.inc.php                        | 5 +++--
 application/xmlpage.class.inc.php                        | 4 +++-
 .../itop-hub-connector/hubconnectorpage.class.inc.php    | 6 ++++--
 pages/UI.php                                             | 1 +
 pages/UniversalSearch.php                                | 1 +
 pages/run_query.php                                      | 1 +
 pages/schema.php                                         | 1 +
 webservices/export-v2.php                                | 9 +++++++++
 12 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/application/ajaxwebpage.class.inc.php b/application/ajaxwebpage.class.inc.php
index 82ddaf0d1..ce991285f 100644
--- a/application/ajaxwebpage.class.inc.php
+++ b/application/ajaxwebpage.class.inc.php
@@ -41,7 +41,9 @@ class ajax_page extends WebPage implements iTabbedPage
         parent::__construct($s_title, $bPrintable);
         $this->m_sReadyScript = "";
 		//$this->add_header("Content-type: text/html; charset=utf-8");
-		$this->add_header("Cache-control: no-cache");
+		$this->add_header('Cache-control: no-cache, no-store, must-revalidate');
+	    $this->add_header('Pragma: no-cache');
+	    $this->add_header('Expires: 0');
 		$this->m_oTabs = new TabManager();
 		$this->sContentType = 'text/html';
 		$this->sContentDisposition = 'inline';
diff --git a/application/csvpage.class.inc.php b/application/csvpage.class.inc.php
index 8ff526b77..0924cc38b 100644
--- a/application/csvpage.class.inc.php
+++ b/application/csvpage.class.inc.php
@@ -33,7 +33,9 @@ class CSVPage extends WebPage
     {
         parent::__construct($s_title);
 	    $this->add_header("Content-type: text/plain; charset=".self::PAGES_CHARSET);
-		$this->add_header("Cache-control: no-cache");
+	    $this->add_header('Cache-control: no-cache, no-store, must-revalidate');
+	    $this->add_header('Pragma: no-cache');
+	    $this->add_header('Expires: 0');
 		//$this->add_header("Content-Transfer-Encoding: binary");
     }	
 
diff --git a/application/itopwebpage.class.inc.php b/application/itopwebpage.class.inc.php
index 576779140..030b0cbbb 100644
--- a/application/itopwebpage.class.inc.php
+++ b/application/itopwebpage.class.inc.php
@@ -71,7 +71,9 @@ class iTopWebPage extends NiceWebPage implements iTabbedPage
 		$this->m_aMessages = array();
 		$this->SetRootUrl(utils::GetAbsoluteUrlAppRoot());
 		$this->add_header("Content-type: text/html; charset=".self::PAGES_CHARSET);
-		$this->add_header("Cache-control: no-cache");
+		$this->add_header('Cache-control: no-cache, no-store, must-revalidate');
+		$this->add_header('Pragma: no-cache');
+		$this->add_header('Expires: 0');
 		$this->add_linked_stylesheet("../css/jquery.treeview.css");
 		$this->add_linked_stylesheet("../css/jquery.autocomplete.css");
 		$this->add_linked_stylesheet("../css/jquery-ui-timepicker-addon.css");
diff --git a/application/loginwebpage.class.inc.php b/application/loginwebpage.class.inc.php
index 363406000..8294a153e 100644
--- a/application/loginwebpage.class.inc.php
+++ b/application/loginwebpage.class.inc.php
@@ -85,7 +85,9 @@ class LoginWebPage extends NiceWebPage
 
 		parent::__construct($sTitle);
 		$this->SetStyleSheet();
-		$this->add_header("Cache-control: no-cache");
+		$this->add_header('Cache-control: no-cache, no-store, must-revalidate');
+		$this->add_header('Pragma: no-cache');
+		$this->add_header('Expires: 0');
 	}
 	
 	public function SetStyleSheet()
diff --git a/application/webpage.class.inc.php b/application/webpage.class.inc.php
index d6bb972de..746ba9083 100644
--- a/application/webpage.class.inc.php
+++ b/application/webpage.class.inc.php
@@ -487,8 +487,9 @@ class WebPage implements Page
 	 */
 	public function no_cache()
 	{
-		$this->add_header("Cache-Control: no-cache, must-revalidate");  // HTTP/1.1
-		$this->add_header("Expires: Fri, 17 Jul 1970 05:00:00 GMT");    // Date in the past
+		$this->add_header('Cache-control: no-cache, no-store, must-revalidate');
+		$this->add_header('Pragma: no-cache');
+		$this->add_header('Expires: 0');
 	}
 
 	/**
diff --git a/application/xmlpage.class.inc.php b/application/xmlpage.class.inc.php
index 3e08316a4..3d81c5b49 100644
--- a/application/xmlpage.class.inc.php
+++ b/application/xmlpage.class.inc.php
@@ -43,7 +43,9 @@ class XMLPage extends WebPage
 		$this->m_bPassThrough = $bPassThrough;
 		$this->m_bHeaderSent = false;
 		$this->add_header("Content-type: text/xml; charset=".self::PAGES_CHARSET);
-		$this->add_header("Cache-control: no-cache");
+		$this->add_header('Cache-control: no-cache, no-store, must-revalidate');
+		$this->add_header('Pragma: no-cache');
+		$this->add_header('Expires: 0');
 		$this->add_header("Content-location: export.xml");
 	}	
 
diff --git a/datamodels/2.x/itop-hub-connector/hubconnectorpage.class.inc.php b/datamodels/2.x/itop-hub-connector/hubconnectorpage.class.inc.php
index f1782e9e6..e068d01d0 100644
--- a/datamodels/2.x/itop-hub-connector/hubconnectorpage.class.inc.php
+++ b/datamodels/2.x/itop-hub-connector/hubconnectorpage.class.inc.php
@@ -5,8 +5,10 @@ class HubConnectorPage extends NiceWebPage
     public function __construct($sTitle)
     {
         parent::__construct($sTitle);
-        
-        $this->add_header("Cache-control: no-cache");
+
+	    $this->add_header('Cache-control: no-cache, no-store, must-revalidate');
+	    $this->add_header('Pragma: no-cache');
+	    $this->add_header('Expires: 0');
         
         $sImagesDir = utils::GetAbsoluteUrlAppRoot().'images';
         $sModuleImagesDir = utils::GetAbsoluteUrlModulesRoot().'itop-hub-connector/images';
diff --git a/pages/UI.php b/pages/UI.php
index 96222f666..3c908983c 100644
--- a/pages/UI.php
+++ b/pages/UI.php
@@ -1962,6 +1962,7 @@ EOF
 		///////////////////////////////////////////////////////////////////////////////////////////
 
 		default: // Menu node rendering (templates)
+		$oP->add_header('X-Frame-Options: deny');
 		ApplicationMenu::LoadAdditionalMenus();
 		$oMenuNode = ApplicationMenu::GetMenuNode(ApplicationMenu::GetMenuIndexById(ApplicationMenu::GetActiveNodeId()));
 		if (is_object($oMenuNode))
diff --git a/pages/UniversalSearch.php b/pages/UniversalSearch.php
index cfcacc935..2232fa510 100644
--- a/pages/UniversalSearch.php
+++ b/pages/UniversalSearch.php
@@ -31,6 +31,7 @@ ApplicationMenu::CheckMenuIdEnabled('UniversalSearchMenu');
 $oAppContext = new ApplicationContext();
 
 $oP = new iTopWebPage(Dict::S('UI:UniversalSearchTitle'));
+$oP->add_header('X-Frame-Options: deny');
 $oP->add_linked_script("../js/json.js");
 $oP->add_linked_script("../js/forms-json-utils.js");
 $oP->add_linked_script("../js/wizardhelper.js");
diff --git a/pages/run_query.php b/pages/run_query.php
index a8154c242..174ab5150 100644
--- a/pages/run_query.php
+++ b/pages/run_query.php
@@ -93,6 +93,7 @@ $oAppContext = new ApplicationContext();
 
 $oP = new iTopWebPage(Dict::S('UI:RunQuery:Title'));
 $oP->SetBreadCrumbEntry('ui-tool-runquery', Dict::S('Menu:RunQueriesMenu'), Dict::S('Menu:RunQueriesMenu+'), '', utils::GetAbsoluteUrlAppRoot().'images/wrench.png');
+$oP->add_header('X-Frame-Options: deny');
 
 // Main program
 $sExpression = utils::ReadParam('expression', '', false, 'raw_data');
diff --git a/pages/schema.php b/pages/schema.php
index 0254e86af..db2927fc1 100644
--- a/pages/schema.php
+++ b/pages/schema.php
@@ -1119,6 +1119,7 @@ $operation = utils::ReadParam('operation', '');
 
 $oPage = new iTopWebPage(Dict::S('UI:Schema:Title'));
 $oPage->no_cache();
+$oPage->add_header('X-Frame-Options: deny');
 
 $oPage->SetBreadCrumbEntry('ui-tool-datamodel', Dict::S('Menu:DataModelMenu'), Dict::S('Menu:DataModelMenu+'), '',
 	utils::GetAbsoluteUrlAppRoot().'images/wrench.png');
diff --git a/webservices/export-v2.php b/webservices/export-v2.php
index 1fd7d6f01..af116e231 100644
--- a/webservices/export-v2.php
+++ b/webservices/export-v2.php
@@ -44,6 +44,7 @@ function ReportErrorAndExit($sErrorMessage)
 	else
 	{
 		$oP = new WebPage("iTop - Export");
+		$oP->add_header('X-Frame-Options: deny');
 		$oP->p('ERROR: '.$sErrorMessage);
 		$oP->output();
 		exit(-1);
@@ -63,6 +64,7 @@ function ReportErrorAndUsage($sErrorMessage)
 	else
 	{
 		$oP = new WebPage("iTop - Export");
+		$oP->add_header('X-Frame-Options: deny');
 		$oP->p('ERROR: '.$sErrorMessage);
 		Usage($oP);
 		$oP->output();
@@ -344,6 +346,7 @@ function InteractiveShell($sExpression, $sQueryId, $sFormat, $sFileName, $sMode)
 	if ($sMode == 'dialog')
 	{
 		$oP = new ajax_page('');
+		$oP->add_header('X-Frame-Options: deny');
 		$oP->add('<div id="interactive_export_dlg">');
 		$sExportBtnLabel = json_encode(Dict::S('UI:Button:Export'));
 		$sJSTitle = json_encode(htmlentities(utils::ReadParam('dialog_title', '', false, 'raw_data'), ENT_QUOTES, 'UTF-8'));
@@ -369,6 +372,7 @@ EOF
 	else
 	{
 		$oP = new iTopWebPage('iTop Export');
+		$oP->add_header('X-Frame-Options: deny');
 		$oP->SetBreadCrumbEntry('ui-tool-export', Dict::S('Menu:ExportMenu'), Dict::S('Menu:ExportMenu+'), '', utils::GetAbsoluteUrlAppRoot().'images/wrench.png');
 	}
 	
@@ -729,6 +733,7 @@ try
 			if($oExporter instanceof HTMLBulkExport)
 			{
 				$oP = new NiceWebPage('iTop export');
+				$oP->add_header('X-Frame-Options: deny');
 				$oP->add_ready_script("$('table.listResults').tablesorter({widgets: ['MyZebra']});");
 				$oP->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/font-awesome/css/all.min.css');
 				$oP->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/font-awesome/css/v4-shims.min.css');
@@ -736,6 +741,7 @@ try
 			else
 			{
 				$oP = new WebPage('iTop export');
+				$oP->add_header('X-Frame-Options: deny');
                 $oP->add_style("table br { mso-data-placement:same-cell; }"); // Trick for Excel: keep line breaks inside the same cell !
 			}
 			$oP->add_style("body { overflow: auto; }");
@@ -743,6 +749,7 @@ try
 		else
 		{
 			$oP = new ajax_page('iTop export');
+			$oP->add_header('X-Frame-Options: deny');
 			$oP->SetContentType($oExporter->GetMimeType());
 		}
 		DoExport($oP, $oExporter, false);
@@ -752,6 +759,7 @@ try
 catch (BulkExportMissingParameterException $e)
 {
 	$oP = new ajax_page('iTop Export');
+	$oP->add_header('X-Frame-Options: deny');
 	$oP->add($e->getMessage());
 	Usage($oP);
 	$oP->output();
@@ -759,6 +767,7 @@ catch (BulkExportMissingParameterException $e)
 catch (Exception $e)
 {
 	$oP = new WebPage('iTop Export');
+	$oP->add_header('X-Frame-Options: deny');
 	$oP->add('Error: '.$e->getMessage());
 	IssueLog::Error($e->getMessage()."\n".$e->getTraceAsString());
 	$oP->output();

From 58961cd4ec0429f4038e13d46b26c368d6c4089c Mon Sep 17 00:00:00 2001
From: Eric <eric.espie@combodo.com>
Date: Tue, 22 Sep 2020 11:57:43 +0200
Subject: [PATCH 05/43] =?UTF-8?q?N=C2=B03318=20-=20don't=20display=20error?=
 =?UTF-8?q?=20details?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../portal/src/EventListener/ExceptionListener.php              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/datamodels/2.x/itop-portal-base/portal/src/EventListener/ExceptionListener.php b/datamodels/2.x/itop-portal-base/portal/src/EventListener/ExceptionListener.php
index 0dd8638bd..633acea61 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/EventListener/ExceptionListener.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/EventListener/ExceptionListener.php
@@ -93,7 +93,7 @@ class ExceptionListener implements ContainerAwareInterface
 			'exception' => $oFlattenException,
 			'code' => $iStatusCode,
 			'error_title' => $sErrorTitle,
-			'error_message' => $sErrorMessage,
+			'error_message' => '',
 		);
 
 		// Generate the response

From 0c90b701ea1f34457517aa7d1ec953bdf34eb23b Mon Sep 17 00:00:00 2001
From: Eric <eric.espie@combodo.com>
Date: Tue, 22 Sep 2020 12:45:19 +0200
Subject: [PATCH 06/43] =?UTF-8?q?N=C2=B03283=20-=20Spelling=20mistake?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr.dict.itop-change-mgmt-itil.php         | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/datamodels/2.x/itop-change-mgmt-itil/fr.dict.itop-change-mgmt-itil.php b/datamodels/2.x/itop-change-mgmt-itil/fr.dict.itop-change-mgmt-itil.php
index 4008350df..68c09c732 100755
--- a/datamodels/2.x/itop-change-mgmt-itil/fr.dict.itop-change-mgmt-itil.php
+++ b/datamodels/2.x/itop-change-mgmt-itil/fr.dict.itop-change-mgmt-itil.php
@@ -146,11 +146,11 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:Change/Stimulus:ev_assign+' => '',
 	'Class:Change/Stimulus:ev_reopen' => 'Réouvrir',
 	'Class:Change/Stimulus:ev_reopen+' => '',
-	'Class:Change/Stimulus:ev_plan' => 'Plannifier',
+	'Class:Change/Stimulus:ev_plan' => 'Planifier',
 	'Class:Change/Stimulus:ev_plan+' => '',
 	'Class:Change/Stimulus:ev_approve' => 'Approuver',
 	'Class:Change/Stimulus:ev_approve+' => '',
-	'Class:Change/Stimulus:ev_replan' => 'Replannifier',
+	'Class:Change/Stimulus:ev_replan' => 'Replanifier',
 	'Class:Change/Stimulus:ev_replan+' => '',
 	'Class:Change/Stimulus:ev_notapprove' => 'Ne pas approuver',
 	'Class:Change/Stimulus:ev_notapprove+' => '',
@@ -177,11 +177,11 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:RoutineChange/Stimulus:ev_assign+' => '',
 	'Class:RoutineChange/Stimulus:ev_reopen' => 'Réouvrir',
 	'Class:RoutineChange/Stimulus:ev_reopen+' => '',
-	'Class:RoutineChange/Stimulus:ev_plan' => 'Plannifier',
+	'Class:RoutineChange/Stimulus:ev_plan' => 'Planifier',
 	'Class:RoutineChange/Stimulus:ev_plan+' => '',
 	'Class:RoutineChange/Stimulus:ev_approve' => 'Approver',
 	'Class:RoutineChange/Stimulus:ev_approve+' => '',
-	'Class:RoutineChange/Stimulus:ev_replan' => 'Replannifier',
+	'Class:RoutineChange/Stimulus:ev_replan' => 'Replanifier',
 	'Class:RoutineChange/Stimulus:ev_replan+' => '',
 	'Class:RoutineChange/Stimulus:ev_notapprove' => 'Ne pas approver',
 	'Class:RoutineChange/Stimulus:ev_notapprove+' => '',
@@ -212,11 +212,11 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:ApprovedChange/Stimulus:ev_assign+' => '',
 	'Class:ApprovedChange/Stimulus:ev_reopen' => 'Réouvrir',
 	'Class:ApprovedChange/Stimulus:ev_reopen+' => '',
-	'Class:ApprovedChange/Stimulus:ev_plan' => 'Plannifier',
+	'Class:ApprovedChange/Stimulus:ev_plan' => 'Planifier',
 	'Class:ApprovedChange/Stimulus:ev_plan+' => '',
 	'Class:ApprovedChange/Stimulus:ev_approve' => 'Approuver',
 	'Class:ApprovedChange/Stimulus:ev_approve+' => '',
-	'Class:ApprovedChange/Stimulus:ev_replan' => 'Replannifier',
+	'Class:ApprovedChange/Stimulus:ev_replan' => 'Replanifier',
 	'Class:ApprovedChange/Stimulus:ev_replan+' => '',
 	'Class:ApprovedChange/Stimulus:ev_notapprove' => 'Ne pas approuver',
 	'Class:ApprovedChange/Stimulus:ev_notapprove+' => '',
@@ -247,11 +247,11 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:NormalChange/Stimulus:ev_assign+' => '',
 	'Class:NormalChange/Stimulus:ev_reopen' => 'Réouvrir',
 	'Class:NormalChange/Stimulus:ev_reopen+' => '',
-	'Class:NormalChange/Stimulus:ev_plan' => 'Plannifier',
+	'Class:NormalChange/Stimulus:ev_plan' => 'Planifier',
 	'Class:NormalChange/Stimulus:ev_plan+' => '',
 	'Class:NormalChange/Stimulus:ev_approve' => 'Approuver',
 	'Class:NormalChange/Stimulus:ev_approve+' => '',
-	'Class:NormalChange/Stimulus:ev_replan' => 'Replannifier',
+	'Class:NormalChange/Stimulus:ev_replan' => 'Replanifier',
 	'Class:NormalChange/Stimulus:ev_replan+' => '',
 	'Class:NormalChange/Stimulus:ev_notapprove' => 'Ne pas approuver',
 	'Class:NormalChange/Stimulus:ev_notapprove+' => '',
@@ -278,11 +278,11 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:EmergencyChange/Stimulus:ev_assign+' => '',
 	'Class:EmergencyChange/Stimulus:ev_reopen' => 'Réouvrir',
 	'Class:EmergencyChange/Stimulus:ev_reopen+' => '',
-	'Class:EmergencyChange/Stimulus:ev_plan' => 'Plannifier',
+	'Class:EmergencyChange/Stimulus:ev_plan' => 'Planifier',
 	'Class:EmergencyChange/Stimulus:ev_plan+' => '',
 	'Class:EmergencyChange/Stimulus:ev_approve' => 'Approuver',
 	'Class:EmergencyChange/Stimulus:ev_approve+' => '',
-	'Class:EmergencyChange/Stimulus:ev_replan' => 'Replannifier',
+	'Class:EmergencyChange/Stimulus:ev_replan' => 'Replanifier',
 	'Class:EmergencyChange/Stimulus:ev_replan+' => '',
 	'Class:EmergencyChange/Stimulus:ev_notapprove' => 'Ne pas approuver',
 	'Class:EmergencyChange/Stimulus:ev_notapprove+' => '',

From 94b9a9bb75900fdfe0281105338f381aa0f23969 Mon Sep 17 00:00:00 2001
From: Eric <eric.espie@combodo.com>
Date: Tue, 22 Sep 2020 12:51:43 +0200
Subject: [PATCH 07/43] =?UTF-8?q?N=C2=B03309=20-=20Spelling=20mistake?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dictionaries/fr.dictionary.itop.ui.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dictionaries/fr.dictionary.itop.ui.php b/dictionaries/fr.dictionary.itop.ui.php
index 1e3faa91b..3b1dba5b4 100644
--- a/dictionaries/fr.dictionary.itop.ui.php
+++ b/dictionaries/fr.dictionary.itop.ui.php
@@ -339,7 +339,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 
 	'UI:WelcomeMenu:LeftBlock' => '<p>iTop est un portail opérationnel complet et libre pour gérer votre SI.</p>
 <ul>il contient:
-<li>Une base de gestion des configuration (CMDB - Configuration management database) pour documenter et gérer votre parc informatique.</li>
+<li>Une base de gestion des configurations (CMDB - Configuration management database) pour documenter et gérer votre parc informatique.</li>
 <li>Un module de gestion des incidents pour suivre les incidents d\'exploitation et gérer la communication à propos de ces incidents.</li>
 <li>Un module de gestion des changements pour planifier et suivre les modifications de votre SI.</li>
 <li>Une base des erreurs connues, pour accélérer la résolution des incidents.</li>
@@ -355,7 +355,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 <li>Améliorer la satisfaction client et fournir aux responsables des vues sur la performance interne du SI.</li>
 </ul>
 </p>
-<p>iTop est complètement ouvert pour s\'intéger avec votre environnement informatique.</p>
+<p>iTop est complètement ouvert pour s\'intégrer avec votre environnement informatique.</p>
 <p>
 <ul>Grâce à ce portail opérationnel de nouvelle génération:
 <li>Gérez un environnement informatique de plus en plus complexe.</li>

From 98789f28bbf5000dc00b507861aa8b22db56743a Mon Sep 17 00:00:00 2001
From: Pierre Goiffon <pierre.goiffon@combodo.com>
Date: Tue, 22 Sep 2020 12:07:05 +0200
Subject: [PATCH 08/43] =?UTF-8?q?N=C2=B03198=20Relations=20Table=20Mode=20?=
 =?UTF-8?q?:=20control=20duplicates=20server=20side?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/attributedef.class.inc.php          | 17 ++---
 core/dbobject.class.php                  | 86 +++++++++++++++++++-----
 dictionaries/en.dictionary.itop.core.php |  2 +
 dictionaries/fr.dictionary.itop.core.php |  2 +
 4 files changed, 79 insertions(+), 28 deletions(-)

diff --git a/core/attributedef.class.inc.php b/core/attributedef.class.inc.php
index 731ac9688..9bacfd819 100644
--- a/core/attributedef.class.inc.php
+++ b/core/attributedef.class.inc.php
@@ -295,7 +295,7 @@ abstract class AttributeDefinition
 	 * @param \DBObject $oHostObject
 	 * @param $value Object error if any, null otherwise
 	 *
-	 * @return bool
+	 * @return bool|string true for no errors, false or error message otherwise
 	 */
 	public function CheckValue(DBObject $oHostObject, $value)
 	{
@@ -2273,22 +2273,17 @@ class AttributeLinkedSetIndirect extends AttributeLinkedSet
 		/** @var \AttributeExternalKey $oExtKeyToRemote */
 		$oExtKeyToRemote = MetaModel::GetAttributeDef($this->GetLinkedClass(), $this->GetExtKeyToRemote());
 		$sRemoteClass = $oExtKeyToRemote->GetTargetClass();
-		foreach(MetaModel::ListAttributeDefs($sRemoteClass) as $sRemoteAttCode => $oRemoteAttDef)
-		{
-			if (!$oRemoteAttDef instanceof AttributeLinkedSetIndirect)
-			{
+		foreach(MetaModel::ListAttributeDefs($sRemoteClass) as $sRemoteAttCode => $oRemoteAttDef) {
+			if (!$oRemoteAttDef instanceof AttributeLinkedSetIndirect) {
 				continue;
 			}
-			if ($oRemoteAttDef->GetLinkedClass() != $this->GetLinkedClass())
-			{
+			if ($oRemoteAttDef->GetLinkedClass() != $this->GetLinkedClass()) {
 				continue;
 			}
-			if ($oRemoteAttDef->GetExtKeyToMe() != $this->GetExtKeyToRemote())
-			{
+			if ($oRemoteAttDef->GetExtKeyToMe() != $this->GetExtKeyToRemote()) {
 				continue;
 			}
-			if ($oRemoteAttDef->GetExtKeyToRemote() != $this->GetExtKeyToMe())
-			{
+			if ($oRemoteAttDef->GetExtKeyToRemote() != $this->GetExtKeyToMe()) {
 				continue;
 			}
 			$oRet = $oRemoteAttDef;
diff --git a/core/dbobject.class.php b/core/dbobject.class.php
index 1f0c0877f..a12a0882e 100644
--- a/core/dbobject.class.php
+++ b/core/dbobject.class.php
@@ -1822,13 +1822,13 @@ abstract class DBObject implements iDisplay
 	/**
 	 * Check if the given (or current) value is suitable for the attribute
 	 *
-     * @api
-     * @api-advanced
-     *
-	 * @param string $sAttCode
-	 * @param boolean|string $value true if successful, the error description otherwise
+	 * @api
+	 * @api-advanced
 	 *
-	 * @return bool|string
+	 * @param string $sAttCode
+	 * @param mixed $value if not passed, then will get value using Get method
+	 *
+	 * @return bool|string true if successful, the error description otherwise
 	 * @throws \ArchivedObjectException
 	 * @throws \CoreException
 	 * @throws \OQLException
@@ -2108,23 +2108,75 @@ abstract class DBObject implements iDisplay
 		}
 
 		$aChildClassesWithRuleDisabled = MetaModel::GetChildClassesWithDisabledUniquenessRule($sRuleRootClass, $sUniquenessRuleId);
-		if (!empty($aChildClassesWithRuleDisabled))
-		{
+		if (!empty($aChildClassesWithRuleDisabled)) {
 			$oUniquenessQuery->AddConditionForInOperatorUsingParam('finalclass', $aChildClassesWithRuleDisabled, false);
 		}
 
 		return $oUniquenessQuery;
 	}
 
+	/**
+	 * @param string $sAttCode
+	 * @param mixed $value
+	 *
+	 * @uses m_aCheckWarnings to log to user duplicates found
+	 *
+	 * @since 2.8.0 N°3198 check duplicates if necessary :<br>
+	 *     Before we could only add or remove lnk using the uilinks widget. This widget has a filter based on existing values, and so
+	 *     forbids to add duplicates.<br>
+	 *     Now we can modify existing entries using the extkey widget, and the widget doesn't have (yet !) such
+	 *     a filter. The widget will be updated later on, but as a first step we're checking for duplicates server side. This is a non
+	 *     blocking warning, as it was already possible to add duplicates by other means.
+	 */
+	protected function DoCheckLinkedSetDuplicates($sAttCode, $value)
+	{
+		$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
+
+		if (!($oAttDef instanceof AttributeLinkedSetIndirect)) {
+			return;
+		}
+
+		if ($oAttDef->DuplicatesAllowed()) {
+			return true;
+		}
+
+		/** @var \ormLinkSet $value */
+		$aModifiedLnk = $value->ListModifiedLinks();
+		$sExtKeyToRemote = $oAttDef->GetExtKeyToRemote();
+		$aExistingRemotesId = $value->GetColumnAsArray($sExtKeyToRemote, true);
+		$aExistingRemotesFriendlyName = $value->GetColumnAsArray($sExtKeyToRemote.'_friendlyname', true);
+		$aDuplicatesFields = [];
+		foreach ($aModifiedLnk as $oModifiedLnk) {
+			$iModifiedLnkId = $oModifiedLnk->GetKey();
+			$iModifiedLnkRemoteId = $oModifiedLnk->Get($sExtKeyToRemote);
+			$aExistingRemotesIdToCheck = array_filter($aExistingRemotesId, function ($iLnkKey) use ($iModifiedLnkId) {
+				return ($iLnkKey != $iModifiedLnkId);
+			}, ARRAY_FILTER_USE_KEY);
+
+			if (!in_array($iModifiedLnkRemoteId, $aExistingRemotesIdToCheck, true)) {
+				continue;
+			}
+
+			$iLnkId = $oModifiedLnk->GetKey();
+			$aDuplicatesFields[] = $aExistingRemotesFriendlyName[$iLnkId];
+		}
+
+		if (!empty($aDuplicatesFields)) {
+			$this->m_aCheckWarnings[] = Dict::Format('Core:AttributeLinkedSetDuplicatesFound',
+				$oAttDef->GetLabel(),
+				implode(', ', $aDuplicatesFields));
+		}
+	}
+
 	/**
 	 * Check integrity rules (before inserting or updating the object)
 	 *
-     * **This method is not meant to be called directly, use DBObject::CheckToWrite()!**
+	 * **This method is not meant to be called directly, use DBObject::CheckToWrite()!**
 	 * Errors should be inserted in $m_aCheckIssues and $m_aCheckWarnings arrays
-     *
-     * @overwritable-hook You can extend this method in order to provide your own logic.
-     * @see CheckToWrite()
-     * @see $m_aCheckIssues
+	 *
+	 * @overwritable-hook You can extend this method in order to provide your own logic.
+	 * @see CheckToWrite()
+	 * @see $m_aCheckIssues
      * @see $m_aCheckWarnings
      *
 	 * @throws \ArchivedObjectException
@@ -2140,14 +2192,14 @@ abstract class DBObject implements iDisplay
 
 		$aChanges = $this->ListChanges();
 
-		foreach($aChanges as $sAttCode => $value)
-		{
+		foreach($aChanges as $sAttCode => $value) {
 			$res = $this->CheckValue($sAttCode);
-			if ($res !== true)
-			{
+			if ($res !== true) {
 				// $res contains the error description
 				$this->m_aCheckIssues[] = "Unexpected value for attribute '$sAttCode': $res";
 			}
+
+			$this->DoCheckLinkedSetDuplicates($sAttCode, $value);
 		}
 		if (count($this->m_aCheckIssues) > 0)
 		{
diff --git a/dictionaries/en.dictionary.itop.core.php b/dictionaries/en.dictionary.itop.core.php
index 7c7ef2973..c320f1a4f 100644
--- a/dictionaries/en.dictionary.itop.core.php
+++ b/dictionaries/en.dictionary.itop.core.php
@@ -33,6 +33,8 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Core:AttributeLinkedSet' => 'Array of objects',
 	'Core:AttributeLinkedSet+' => 'Any kind of objects of the same class or subclass',
 
+	'Core:AttributeLinkedSetDuplicatesFound' => 'Duplicates in the \'%1$s\' field : %2$s',
+
 	'Core:AttributeDashboard' => 'Dashboard',
 	'Core:AttributeDashboard+' => '',
 
diff --git a/dictionaries/fr.dictionary.itop.core.php b/dictionaries/fr.dictionary.itop.core.php
index 0bea1b975..54146e648 100644
--- a/dictionaries/fr.dictionary.itop.core.php
+++ b/dictionaries/fr.dictionary.itop.core.php
@@ -31,6 +31,8 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Core:AttributeLinkedSet' => 'Objets liés (1-n)',
 	'Core:AttributeLinkedSet+' => 'Liste d\'objets d\'une classe donnée et pointant sur l\'objet courant',
 
+	'Core:AttributeLinkedSetDuplicatesFound' => 'Des doublons sont présents dans le champ \'%1$s\' : %2$s',
+
 	'Core:AttributeDashboard' => 'Tableau de bord',
 	'Core:AttributeDashboard+' => '',
 

From 9e9b192b3c285322e945f0c2558dd5ef7dcf9490 Mon Sep 17 00:00:00 2001
From: Pierre Goiffon <pierre.goiffon@combodo.com>
Date: Tue, 22 Sep 2020 15:35:13 +0200
Subject: [PATCH 09/43] =?UTF-8?q?N=C2=B02214=20Blocks=20execution=20for=20?=
 =?UTF-8?q?PHP=20<=207.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As older PHP version can cause multiple problems, and we still use lots of requires that can generate PARSE_ERROR on such version, we chose to add this very low-level control. Therefore user will get a clear error message, and oldest PHP version will be blocked in the whole application.
---
 bootstrap.inc.php | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/bootstrap.inc.php b/bootstrap.inc.php
index abbc1a877..f61a88ed1 100644
--- a/bootstrap.inc.php
+++ b/bootstrap.inc.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright (C) 2013-2019 Combodo SARL
+ * Copyright (C) 2013-2020 Combodo SARL
  *
  * This file is part of iTop.
  *
@@ -18,16 +18,31 @@
  * You should have received a copy of the GNU Affero General Public License
  */
 
+
+/**
+ * Checks PHP version
+ *
+ * This is a hard-coded check that limits errors : we are stopping for anything < PHP 7.0.0
+ * The "real one" will be done in {@link \SetupUtils::CheckPhpVersion()}
+ *
+ * @since 2.8.0 N°2214
+ */
+$bIsValidPhpVersion = false;
+if (PHP_MAJOR_VERSION >= 7) {
+	$bIsValidPhpVersion = true;
+} else {
+	echo 'Your PHP version ('.PHP_VERSION.') isn\'t supported.';
+	exit(-1);
+}
+
+
 define('ITOP_DEFAULT_ENV', 'production');
 define('MAINTENANCE_MODE_FILE', APPROOT.'data/.maintenance');
 define('READONLY_MODE_FILE', APPROOT.'data/.readonly');
 
-if (function_exists('microtime'))
-{
+if (function_exists('microtime')) {
 	$fItopStarted = microtime(true);
-}
-else
-{
+} else {
 	$fItopStarted = 1000 * time();
 }
 

From 1e634a8bba0ab88f1d2911d4d23ef374c25d52b1 Mon Sep 17 00:00:00 2001
From: Pierre Goiffon <pierre.goiffon@combodo.com>
Date: Wed, 23 Sep 2020 17:17:05 +0200
Subject: [PATCH 10/43] =?UTF-8?q?N=C2=B03332=20Security=20hardening?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 js/breadcrumb.js | 27 ++++++++++++++-------------
 js/utils.js      | 20 ++++++++++++++++++--
 2 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/js/breadcrumb.js b/js/breadcrumb.js
index e8fc88a6f..ab0941d86 100644
--- a/js/breadcrumb.js
+++ b/js/breadcrumb.js
@@ -59,24 +59,25 @@ $(function()
 					var oEntry = aBreadCrumb[iEntry];
 					if (oEntry['label'].length > 0)
 					{
-                        var sIconSpec = '';
-                        if (oEntry['icon'].length > 0)
-                        {
-                            sIconSpec = '<span class="icon"><img src="'+oEntry['icon']+'"/></span>';
-                        }
-						var sTitle = oEntry['description'];
+						var sIconSpec = '';
+						if (oEntry['icon'].length > 0) {
+							sIconSpec = '<span class="icon"><img src="'+oEntry['icon']+'"/></span>';
+						}
+
+						var sTitle = oEntry['description'],
+							sLabel = oEntry['label'];
 						if (sTitle.length == 0) {
 							sTitle = oEntry['label'];
 						}
-						if ((this.options.new_entry !== null) && (iEntry == aBreadCrumb.length - 1))
-						{
+						sTitle = SanitizeHtml(sTitle);
+						sLabel = SanitizeHtml(sLabel);
+
+						if ((this.options.new_entry !== null) && (iEntry == aBreadCrumb.length-1)) {
 							// Last entry is the current page
-							sBreadCrumbHtml += '<div class="breadcrumb-item breadcrumb-current" breadcrumb-entry="'+iEntry+'" title="'+sTitle+'">'+sIconSpec+'<span class="truncate">'+oEntry['label']+'</span></div>';
-						}
-						else
-						{
+							sBreadCrumbHtml += '<div class="breadcrumb-item breadcrumb-current" breadcrumb-entry="'+iEntry+'" title="'+sTitle+'">'+sIconSpec+'<span class="truncate">'+sLabel+'</span></div>';
+						} else {
 							var sSanitizedUrl = StripArchiveArgument(oEntry['url']);
-							sBreadCrumbHtml += '<div class="breadcrumb-item"><a class="breadcrumb-link" breadcrumb-entry="'+iEntry+'" href="'+sSanitizedUrl+'" title="'+sTitle+'">'+sIconSpec+'<span class="truncate">'+oEntry['label']+'</span></a></div>';
+							sBreadCrumbHtml += '<div class="breadcrumb-item"><a class="breadcrumb-link" breadcrumb-entry="'+iEntry+'" href="'+sSanitizedUrl+'" title="'+sTitle+'">'+sIconSpec+'<span class="truncate">'+sLabel+'</span></a></div>';
 						}
 					}
 				}
diff --git a/js/utils.js b/js/utils.js
index be52a81d2..52f446a4c 100644
--- a/js/utils.js
+++ b/js/utils.js
@@ -669,6 +669,23 @@ function DisplayHistory(sSelector, sFilter, iCount, iStart) {
 	);
 }
 
+/**
+ * @param sValue value to escape
+ * @returns {string} sanitized value, ready to insert in the DOM without XSS risk
+ *
+ * @since 2.6.5, 2.7.2, 2.8.0 N°3332
+ * @see https://cheatsheetseries.owasp.org/cheatsheets/Cross_Site_Scripting_Prevention_Cheat_Sheet.html#rule-1-html-encode-before-inserting-untrusted-data-into-html-element-content
+ */
+function SanitizeHtml(sValue) {
+	return (sValue+'')
+		.replace(/&/g, '&amp;')
+		.replace(/</g, '&lt;')
+		.replace(/>/g, '&gt;')
+		.replace(/"/g, '&quot;')
+		.replace(/'/g, '&#x27;')
+		.replace(/\//g, '&#x2F;');
+}
+
 // Very simple equivalent to format: placeholders are %1$s %2$d ...
 function Format() {
 	var args = [];
@@ -676,8 +693,7 @@ function Format() {
 	if (arguments[0] instanceof Array) {
 		str = arguments[0][0].toString();
 		args = arguments[0];
-	}
-	else {
+	} else {
 		str = arguments[0].toString();
 		if (arguments.length > 1) {
 			var t = typeof arguments[1];

From 9eac12bd9ce5bed40dfb8aa31678917fbec5bb99 Mon Sep 17 00:00:00 2001
From: Pierre Goiffon <pierre.goiffon@combodo.com>
Date: Thu, 24 Sep 2020 12:16:22 +0200
Subject: [PATCH 11/43] Fix CSS precompilation signature check on non Linux OS
 * fix images paths comparison * fix MD5

Were depending on platform : \ThemeHandlerTest::testGetIncludedImages test passed on Linux, not on Windows due to different DIRECTORY_SEPARATOR
---
 application/themehandler.class.inc.php        | 31 +++++++++++--------
 test/application/ThemeHandlerTest.php         | 25 +++++++--------
 .../themes/basque-red/main_imagemodified.css  |  2 +-
 .../themes/basque-red/main_importmodified.css |  2 +-
 .../themes/basque-red/main_stylesheet.css     |  2 +-
 .../themes/basque-red/main_varchanged.css     |  2 +-
 6 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/application/themehandler.class.inc.php b/application/themehandler.class.inc.php
index 6c377fd31..fe85a3440 100644
--- a/application/themehandler.class.inc.php
+++ b/application/themehandler.class.inc.php
@@ -28,6 +28,12 @@ class ThemeHandler
 	const IMAGE_EXTENSIONS = ['png', 'gif', 'jpg', 'jpeg'];
 
 	private static $oCompileCSSService;
+
+	public static function GetAppRootWithSlashes()
+	{
+		return str_replace('\\', '/', APPROOT);
+	}
+
 	/**
 	 * Return default theme name and parameters
 	 *
@@ -314,9 +320,8 @@ CSS;
 		}
 		foreach ($aIncludedImages as $sImage)
 		{
-			if (is_file($sImage))
-			{
-				$sUri = str_replace(APPROOT, '', $sImage);
+			if (is_file($sImage)) {
+				$sUri = str_replace(self::GetAppRootWithSlashes(), '', $sImage);
 				$aSignature['images'][$sUri] = md5_file($sImage);
 			}
 		}
@@ -329,9 +334,9 @@ CSS;
 	 *
 	 * @param array $aThemeParametersVariables
 	 * @param array $aStylesheetFiles
-	 * @param string $sThemeId: used only for logging purpose
+	 * @param string $sThemeId : used only for logging purpose
 	 *
-	 * @return array
+	 * @return array complete path of the images, but with slashes as dir separator instead of DIRECTORY_SEPARATOR
 	 * @since 2.8.0
 	 */
 	public static function GetIncludedImages($aThemeParametersVariables, $aStylesheetFiles, $sThemeId)
@@ -377,17 +382,17 @@ CSS;
 				&& ! array_key_exists($sImg, $aImages))
 			{
 				$sFilePath = realpath($sImg);
-				if ($sFilePath!==false)
-				{
-					$aImages[$sImg]=$sFilePath;
+				if ($sFilePath !== false) {
+					$sFilePathWithSlashes = str_replace('\\', '/', $sFilePath);
+					$aImages[$sImg] = $sFilePathWithSlashes;
 					continue;
 				}
 
-				$sCanonicalPath = static::CanonicalizePath($sTargetThemeFolderPath.DIRECTORY_SEPARATOR.$sImg);
-				$sFilePath=realpath($sCanonicalPath);
-				if ($sFilePath!==false)
-				{
-					$aImages[$sImg]=$sFilePath;
+				$sCanonicalPath = static::CanonicalizePath($sTargetThemeFolderPath.'/'.$sImg);
+				$sFilePath = realpath($sCanonicalPath);
+				if ($sFilePath !== false) {
+					$sFilePathWithSlashes = str_replace('\\', '/', $sFilePath);
+					$aImages[$sImg] = $sFilePathWithSlashes;
 					continue;
 				}
 
diff --git a/test/application/ThemeHandlerTest.php b/test/application/ThemeHandlerTest.php
index 4b01caf65..07dc8e43e 100644
--- a/test/application/ThemeHandlerTest.php
+++ b/test/application/ThemeHandlerTest.php
@@ -372,26 +372,24 @@ JSON;
 		$sAfterReplacementCssVariableMd5sum='';
 		if (is_file($this->sTmpDir.'/'.$sFileToTest))
 		{
-			$sFileToTest=$this->sTmpDir.'/'.$sFileToTest;
-		}
-		else
-		{
-			$sFileToTest=APPROOT.'/'.$sFileToTest;
+			$sFileToTest = $this->sTmpDir.'/'.$sFileToTest;
+		} else {
+			$sFileToTest = APPROOT.'/'.$sFileToTest;
 		}
 
 		//copy images in test dir
-		$sAbsoluteImagePath = APPROOT .'test/application/theme-handler/copied/testimages/';
+		$sAbsoluteImagePath = APPROOT.'test/application/theme-handler/copied/testimages/';
 		$this->recurseMkdir($sAbsoluteImagePath);
-		$aDirsToCleanup[] = dirname($sAbsoluteImagePath);
-		$this->recurse_copy(APPROOT .'test/application/theme-handler/expected/testimages/', $sAbsoluteImagePath);
+		$this->aDirsToCleanup[] = dirname($sAbsoluteImagePath);
+		$this->recurse_copy(APPROOT.'test/application/theme-handler/expected/testimages/', $sAbsoluteImagePath);
 
 		//change approot-relative in css-variable to use absolute path
 		$sCssVarPath = $this->sTmpDir."/branding/css/css-variables.scss";
 		$sBeforeReplacementCssVariableMd5sum = md5_file($sCssVarPath);
-		echo 'BEFORE :' . $sBeforeReplacementCssVariableMd5sum  .' ' . $sCssVarPath . ' ';
+		echo 'BEFORE :'.$sBeforeReplacementCssVariableMd5sum.' '.$sCssVarPath.' ';
 		$sCssVariableContent = file_get_contents($sCssVarPath);
 		$sLine = '$approot-relative: "'.$sAbsoluteImagePath.'" !default;';
-		$sCssVariableContent=preg_replace("/\\\$approot-relative: \"(.*)\"/", $sLine, $sCssVariableContent);
+		$sCssVariableContent = preg_replace("/\\\$approot-relative: \"(.*)\"/", $sLine, $sCssVariableContent);
 		file_put_contents($sCssVarPath, $sCssVariableContent);
 		if ($bMissingFile)
 		{
@@ -448,15 +446,16 @@ JSON;
 		if ($iCompileCSSFromSASSCount==1)
 		{
 			$sExpectedMainCssFile = APPROOT.$sExpectedMainCssPath;
-			if (!is_file($sExpectedMainCssFile))
-			{
+			if (!is_file($sExpectedMainCssFile)) {
 				$this->assertTrue(false, "Cannot find expected main css file $sExpectedMainCssFile");
 			}
 
 			$aPatterns = [static::PATTERN, '/'.$sBeforeReplacementCssVariableMd5sum.'/'];
 			$aPatterns[] = "/8100523d2e76a70266f3e7110e2fe5fb/";
+			$aPatterns[] = '/MD5SUM/';
 			$aReplacements = [$sReplacement, $sAfterReplacementCssVariableMd5sum];
 			$aReplacements[] = md5(json_encode($aThemeParameters['variables']));
+			$aReplacements[] = $sAfterReplacementCssVariableMd5sum;
 			var_dump($aReplacements);
 			$this->DoInnerJsonValidation($sExpectedMainCssFile, $cssPath, $aPatterns, $aReplacements);
 		}
@@ -596,7 +595,7 @@ SCSS;
 		$aExpectedImages = [];
 		foreach ($aExpectedUris as $sExpectedUri)
 		{
-			$aExpectedImages[] = APPROOT . $sExpectedUri;
+			$aExpectedImages[] = ThemeHandler::GetAppRootWithSlashes().$sExpectedUri;
 		}
 
 		$this->assertEquals($aExpectedImages, $aIncludedImages);
diff --git a/test/application/theme-handler/expected/themes/basque-red/main_imagemodified.css b/test/application/theme-handler/expected/themes/basque-red/main_imagemodified.css
index ed9b0ad8c..bf1c2a216 100644
--- a/test/application/theme-handler/expected/themes/basque-red/main_imagemodified.css
+++ b/test/application/theme-handler/expected/themes/basque-red/main_imagemodified.css
@@ -1,6 +1,6 @@
 /*
 === SIGNATURE BEGIN ===
-{"variables":"37c31105548fce44fecca5cb34e455c9","stylesheets":{"css-variables":"3cfd1f47ff8d26ef555ba2bc861f89ed","jqueryui":"78cfafc3524dac98e61fc2460918d4e5","main":"52d8a7c5530ceb3a4d777364fa4e1eea"},"imports":[],"images":{"test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_222222_256x240.png":"3a3c5468f484f07ac4a320d9e22acb8c","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-bg_diagonals-thick_20_666666_40x40.png":"4429d568c67d8dfeb9040273ea0fb8c4","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_E87C1E_256x240.png":"7003dd36cb2aa032c8ec871ce4d4e03d","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_1c94c4_256x240.png":"dbd693dc8e0ef04e90a2f7ac7b390086","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_F26522_256x240.png":"16278ec0c07270be571f4c2e97fcc10c","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-bg_diagonals-thick_18_b81900_40x40.png":"e460a66d4b3e093fc651e62a236267cb","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_ffffff_256x240.png":"41612b0f4a034424f8321c9f824a94da","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_ffd27a_256x240.png":"dda1b6f694b0d196aefc66a1d6d758f6","test\/application\/theme-handler\/copied\/testimages\/images\/actions_right.png":"31c8906bd25d27b83a0a2466bf903462","test\/application\/theme-handler\/copied\/testimages\/images\/ac-background.gif":"76135f3697b41a15aed787cfd77776c7","test\/application\/theme-handler\/copied\/testimages\/images\/green-square.gif":"16ea9a497d72f5e66e4e8ea9ae08024e","test\/application\/theme-handler\/copied\/testimages\/images\/tv-item.gif":"719fe2d4566108e73162fb8868d3778c","test\/application\/theme-handler\/copied\/testimages\/images\/tv-collapsable.gif":"63a3351ea0d580797c9b8c386aa4f48b","test\/application\/theme-handler\/copied\/testimages\/images\/tv-expandable.gif":"a2d1af4128e4a798a7f3390b12a28574","test\/application\/theme-handler\/copied\/testimages\/images\/tv-item-last.gif":"2ae7e1d9972ce71e5caa65a086bc5b7e","test\/application\/theme-handler\/copied\/testimages\/images\/tv-collapsable-last.gif":"71acaa9d7c2616e9e8b7131a75ca65da","test\/application\/theme-handler\/copied\/testimages\/images\/tv-expandable-last.gif":"9d51036b3a8102742709da66789fd0f7","test\/application\/theme-handler\/copied\/testimages\/images\/red-header.gif":"c73b8765f0c8c3c183cb6a0c2bb0ec69","test\/application\/theme-handler\/copied\/testimages\/images\/green-header.gif":"06886d405efe86b85023ef64c4349095","test\/application\/theme-handler\/copied\/testimages\/images\/orange-header.gif":"ce1f93f0af64431771b4cbd6c99c567b","test\/application\/theme-handler\/copied\/testimages\/images\/calendar.png":"ab56e59af3c96ca661821257d376465e","test\/application\/theme-handler\/copied\/testimages\/images\/truncated.png":"c6f91108afe8159d417b4dc556cd3b2a","test\/application\/theme-handler\/copied\/testimages\/images\/plus.gif":"f00e1e6e1161f48608bb2bbc79b9948c","test\/application\/theme-handler\/copied\/testimages\/images\/minus.gif":"6d77c0c0c2f86b6995d1cdf78274eaab","test\/application\/theme-handler\/copied\/testimages\/images\/full-screen.png":"b541fadd3f1563856a4b44aeebd9d563","test\/application\/theme-handler\/copied\/testimages\/images\/indicator.gif":"03ce3dcc84af110e9da8699a841e5200","test\/application\/theme-handler\/copied\/testimages\/images\/delete.png":"93c047549c31a270a037840277cf59d3","test\/application\/theme-handler\/copied\/testimages\/images\/bg.gif":"a315146ab814c73632480136576cd271","test\/application\/theme-handler\/copied\/testimages\/images\/desc.gif":"0f58b33929095ea17795dd53bbced5d9","test\/application\/theme-handler\/copied\/testimages\/images\/info-mini.png":"445c090ed777c5e6a08ac390fa896193","test\/application\/theme-handler\/copied\/testimages\/images\/ok.png":"f6973773335fd83d8d2875f9a3c925af","test\/application\/theme-handler\/copied\/testimages\/images\/error.png":"1af8a1041016f67669c5fd22dc88c82e","test\/application\/theme-handler\/copied\/testimages\/images\/eye-open-555.png":"9940f4e5b1248042c238e1924359fd5e","test\/application\/theme-handler\/copied\/testimages\/images\/eye-closed-555.png":"6ad3b0bae791bf61addc9d8ca80a642d","test\/application\/theme-handler\/copied\/testimages\/images\/eye-open-fff.png":"b7db2402d4d5c72314c25790a66150d4","test\/application\/theme-handler\/copied\/testimages\/images\/eye-closed-fff.png":"f9be7454dbb47b0e0bca3aa370ae7db5","test\/application\/theme-handler\/copied\/testimages\/images\/breadcrumb-separator.png":"1e7e50a8f573e230cf1e0f0399c516e8"}}
+{"variables":"37c31105548fce44fecca5cb34e455c9","stylesheets":{"css-variables":"MD5SUM","jqueryui":"78cfafc3524dac98e61fc2460918d4e5","main":"52d8a7c5530ceb3a4d777364fa4e1eea"},"imports":[],"images":{"test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_222222_256x240.png":"3a3c5468f484f07ac4a320d9e22acb8c","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-bg_diagonals-thick_20_666666_40x40.png":"4429d568c67d8dfeb9040273ea0fb8c4","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_E87C1E_256x240.png":"7003dd36cb2aa032c8ec871ce4d4e03d","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_1c94c4_256x240.png":"dbd693dc8e0ef04e90a2f7ac7b390086","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_F26522_256x240.png":"16278ec0c07270be571f4c2e97fcc10c","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-bg_diagonals-thick_18_b81900_40x40.png":"e460a66d4b3e093fc651e62a236267cb","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_ffffff_256x240.png":"41612b0f4a034424f8321c9f824a94da","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_ffd27a_256x240.png":"dda1b6f694b0d196aefc66a1d6d758f6","test\/application\/theme-handler\/copied\/testimages\/images\/actions_right.png":"31c8906bd25d27b83a0a2466bf903462","test\/application\/theme-handler\/copied\/testimages\/images\/ac-background.gif":"76135f3697b41a15aed787cfd77776c7","test\/application\/theme-handler\/copied\/testimages\/images\/green-square.gif":"16ea9a497d72f5e66e4e8ea9ae08024e","test\/application\/theme-handler\/copied\/testimages\/images\/tv-item.gif":"719fe2d4566108e73162fb8868d3778c","test\/application\/theme-handler\/copied\/testimages\/images\/tv-collapsable.gif":"63a3351ea0d580797c9b8c386aa4f48b","test\/application\/theme-handler\/copied\/testimages\/images\/tv-expandable.gif":"a2d1af4128e4a798a7f3390b12a28574","test\/application\/theme-handler\/copied\/testimages\/images\/tv-item-last.gif":"2ae7e1d9972ce71e5caa65a086bc5b7e","test\/application\/theme-handler\/copied\/testimages\/images\/tv-collapsable-last.gif":"71acaa9d7c2616e9e8b7131a75ca65da","test\/application\/theme-handler\/copied\/testimages\/images\/tv-expandable-last.gif":"9d51036b3a8102742709da66789fd0f7","test\/application\/theme-handler\/copied\/testimages\/images\/red-header.gif":"c73b8765f0c8c3c183cb6a0c2bb0ec69","test\/application\/theme-handler\/copied\/testimages\/images\/green-header.gif":"06886d405efe86b85023ef64c4349095","test\/application\/theme-handler\/copied\/testimages\/images\/orange-header.gif":"ce1f93f0af64431771b4cbd6c99c567b","test\/application\/theme-handler\/copied\/testimages\/images\/calendar.png":"ab56e59af3c96ca661821257d376465e","test\/application\/theme-handler\/copied\/testimages\/images\/truncated.png":"c6f91108afe8159d417b4dc556cd3b2a","test\/application\/theme-handler\/copied\/testimages\/images\/plus.gif":"f00e1e6e1161f48608bb2bbc79b9948c","test\/application\/theme-handler\/copied\/testimages\/images\/minus.gif":"6d77c0c0c2f86b6995d1cdf78274eaab","test\/application\/theme-handler\/copied\/testimages\/images\/full-screen.png":"b541fadd3f1563856a4b44aeebd9d563","test\/application\/theme-handler\/copied\/testimages\/images\/indicator.gif":"03ce3dcc84af110e9da8699a841e5200","test\/application\/theme-handler\/copied\/testimages\/images\/delete.png":"93c047549c31a270a037840277cf59d3","test\/application\/theme-handler\/copied\/testimages\/images\/bg.gif":"a315146ab814c73632480136576cd271","test\/application\/theme-handler\/copied\/testimages\/images\/desc.gif":"0f58b33929095ea17795dd53bbced5d9","test\/application\/theme-handler\/copied\/testimages\/images\/info-mini.png":"445c090ed777c5e6a08ac390fa896193","test\/application\/theme-handler\/copied\/testimages\/images\/ok.png":"f6973773335fd83d8d2875f9a3c925af","test\/application\/theme-handler\/copied\/testimages\/images\/error.png":"1af8a1041016f67669c5fd22dc88c82e","test\/application\/theme-handler\/copied\/testimages\/images\/eye-open-555.png":"9940f4e5b1248042c238e1924359fd5e","test\/application\/theme-handler\/copied\/testimages\/images\/eye-closed-555.png":"6ad3b0bae791bf61addc9d8ca80a642d","test\/application\/theme-handler\/copied\/testimages\/images\/eye-open-fff.png":"b7db2402d4d5c72314c25790a66150d4","test\/application\/theme-handler\/copied\/testimages\/images\/eye-closed-fff.png":"f9be7454dbb47b0e0bca3aa370ae7db5","test\/application\/theme-handler\/copied\/testimages\/images\/breadcrumb-separator.png":"1e7e50a8f573e230cf1e0f0399c516e8"}}
 === SIGNATURE END ===
 */
 ====CSSCOMPILEDCONTENT====
\ No newline at end of file
diff --git a/test/application/theme-handler/expected/themes/basque-red/main_importmodified.css b/test/application/theme-handler/expected/themes/basque-red/main_importmodified.css
index 63dc182c0..e8fc3dbc0 100644
--- a/test/application/theme-handler/expected/themes/basque-red/main_importmodified.css
+++ b/test/application/theme-handler/expected/themes/basque-red/main_importmodified.css
@@ -1,6 +1,6 @@
 /*
 === SIGNATURE BEGIN ===
-{"variables":"37c31105548fce44fecca5cb34e455c9","stylesheets":{"css-variables":"8811855899754d05cfd472f839d24342","jqueryui":"78cfafc3524dac98e61fc2460918d4e5","main":"52d8a7c5530ceb3a4d777364fa4e1eea"},"imports":[],"images":{"test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_222222_256x240.png":"3a3c5468f484f07ac4a320d9e22acb8c","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-bg_diagonals-thick_20_666666_40x40.png":"4429d568c67d8dfeb9040273ea0fb8c4","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_E87C1E_256x240.png":"7003dd36cb2aa032c8ec871ce4d4e03d","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_1c94c4_256x240.png":"dbd693dc8e0ef04e90a2f7ac7b390086","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_F26522_256x240.png":"16278ec0c07270be571f4c2e97fcc10c","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-bg_diagonals-thick_18_b81900_40x40.png":"e460a66d4b3e093fc651e62a236267cb","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_ffffff_256x240.png":"41612b0f4a034424f8321c9f824a94da","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_ffd27a_256x240.png":"dda1b6f694b0d196aefc66a1d6d758f6","test\/application\/theme-handler\/copied\/testimages\/images\/actions_right.png":"31c8906bd25d27b83a0a2466bf903462","test\/application\/theme-handler\/copied\/testimages\/images\/ac-background.gif":"76135f3697b41a15aed787cfd77776c7","test\/application\/theme-handler\/copied\/testimages\/images\/green-square.gif":"16ea9a497d72f5e66e4e8ea9ae08024e","test\/application\/theme-handler\/copied\/testimages\/images\/tv-item.gif":"719fe2d4566108e73162fb8868d3778c","test\/application\/theme-handler\/copied\/testimages\/images\/tv-collapsable.gif":"63a3351ea0d580797c9b8c386aa4f48b","test\/application\/theme-handler\/copied\/testimages\/images\/tv-expandable.gif":"a2d1af4128e4a798a7f3390b12a28574","test\/application\/theme-handler\/copied\/testimages\/images\/tv-item-last.gif":"2ae7e1d9972ce71e5caa65a086bc5b7e","test\/application\/theme-handler\/copied\/testimages\/images\/tv-collapsable-last.gif":"71acaa9d7c2616e9e8b7131a75ca65da","test\/application\/theme-handler\/copied\/testimages\/images\/tv-expandable-last.gif":"9d51036b3a8102742709da66789fd0f7","test\/application\/theme-handler\/copied\/testimages\/images\/red-header.gif":"c73b8765f0c8c3c183cb6a0c2bb0ec69","test\/application\/theme-handler\/copied\/testimages\/images\/green-header.gif":"0e22a09bb8051b2a274b3427ede62e82","test\/application\/theme-handler\/copied\/testimages\/images\/orange-header.gif":"ce1f93f0af64431771b4cbd6c99c567b","test\/application\/theme-handler\/copied\/testimages\/images\/calendar.png":"ab56e59af3c96ca661821257d376465e","test\/application\/theme-handler\/copied\/testimages\/images\/truncated.png":"c6f91108afe8159d417b4dc556cd3b2a","test\/application\/theme-handler\/copied\/testimages\/images\/plus.gif":"f00e1e6e1161f48608bb2bbc79b9948c","test\/application\/theme-handler\/copied\/testimages\/images\/minus.gif":"6d77c0c0c2f86b6995d1cdf78274eaab","test\/application\/theme-handler\/copied\/testimages\/images\/full-screen.png":"b541fadd3f1563856a4b44aeebd9d563","test\/application\/theme-handler\/copied\/testimages\/images\/indicator.gif":"03ce3dcc84af110e9da8699a841e5200","test\/application\/theme-handler\/copied\/testimages\/images\/delete.png":"93c047549c31a270a037840277cf59d3","test\/application\/theme-handler\/copied\/testimages\/images\/bg.gif":"a315146ab814c73632480136576cd271","test\/application\/theme-handler\/copied\/testimages\/images\/desc.gif":"0f58b33929095ea17795dd53bbced5d9","test\/application\/theme-handler\/copied\/testimages\/images\/info-mini.png":"445c090ed777c5e6a08ac390fa896193","test\/application\/theme-handler\/copied\/testimages\/images\/ok.png":"f6973773335fd83d8d2875f9a3c925af","test\/application\/theme-handler\/copied\/testimages\/images\/error.png":"1af8a1041016f67669c5fd22dc88c82e","test\/application\/theme-handler\/copied\/testimages\/images\/eye-open-555.png":"9940f4e5b1248042c238e1924359fd5e","test\/application\/theme-handler\/copied\/testimages\/images\/eye-closed-555.png":"6ad3b0bae791bf61addc9d8ca80a642d","test\/application\/theme-handler\/copied\/testimages\/images\/eye-open-fff.png":"b7db2402d4d5c72314c25790a66150d4","test\/application\/theme-handler\/copied\/testimages\/images\/eye-closed-fff.png":"f9be7454dbb47b0e0bca3aa370ae7db5","test\/application\/theme-handler\/copied\/testimages\/images\/breadcrumb-separator.png":"1e7e50a8f573e230cf1e0f0399c516e8"}}
+{"variables":"37c31105548fce44fecca5cb34e455c9","stylesheets":{"css-variables":"MD5SUM","jqueryui":"78cfafc3524dac98e61fc2460918d4e5","main":"52d8a7c5530ceb3a4d777364fa4e1eea"},"imports":[],"images":{"test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_222222_256x240.png":"3a3c5468f484f07ac4a320d9e22acb8c","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-bg_diagonals-thick_20_666666_40x40.png":"4429d568c67d8dfeb9040273ea0fb8c4","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_E87C1E_256x240.png":"7003dd36cb2aa032c8ec871ce4d4e03d","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_1c94c4_256x240.png":"dbd693dc8e0ef04e90a2f7ac7b390086","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_F26522_256x240.png":"16278ec0c07270be571f4c2e97fcc10c","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-bg_diagonals-thick_18_b81900_40x40.png":"e460a66d4b3e093fc651e62a236267cb","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_ffffff_256x240.png":"41612b0f4a034424f8321c9f824a94da","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_ffd27a_256x240.png":"dda1b6f694b0d196aefc66a1d6d758f6","test\/application\/theme-handler\/copied\/testimages\/images\/actions_right.png":"31c8906bd25d27b83a0a2466bf903462","test\/application\/theme-handler\/copied\/testimages\/images\/ac-background.gif":"76135f3697b41a15aed787cfd77776c7","test\/application\/theme-handler\/copied\/testimages\/images\/green-square.gif":"16ea9a497d72f5e66e4e8ea9ae08024e","test\/application\/theme-handler\/copied\/testimages\/images\/tv-item.gif":"719fe2d4566108e73162fb8868d3778c","test\/application\/theme-handler\/copied\/testimages\/images\/tv-collapsable.gif":"63a3351ea0d580797c9b8c386aa4f48b","test\/application\/theme-handler\/copied\/testimages\/images\/tv-expandable.gif":"a2d1af4128e4a798a7f3390b12a28574","test\/application\/theme-handler\/copied\/testimages\/images\/tv-item-last.gif":"2ae7e1d9972ce71e5caa65a086bc5b7e","test\/application\/theme-handler\/copied\/testimages\/images\/tv-collapsable-last.gif":"71acaa9d7c2616e9e8b7131a75ca65da","test\/application\/theme-handler\/copied\/testimages\/images\/tv-expandable-last.gif":"9d51036b3a8102742709da66789fd0f7","test\/application\/theme-handler\/copied\/testimages\/images\/red-header.gif":"c73b8765f0c8c3c183cb6a0c2bb0ec69","test\/application\/theme-handler\/copied\/testimages\/images\/green-header.gif":"0e22a09bb8051b2a274b3427ede62e82","test\/application\/theme-handler\/copied\/testimages\/images\/orange-header.gif":"ce1f93f0af64431771b4cbd6c99c567b","test\/application\/theme-handler\/copied\/testimages\/images\/calendar.png":"ab56e59af3c96ca661821257d376465e","test\/application\/theme-handler\/copied\/testimages\/images\/truncated.png":"c6f91108afe8159d417b4dc556cd3b2a","test\/application\/theme-handler\/copied\/testimages\/images\/plus.gif":"f00e1e6e1161f48608bb2bbc79b9948c","test\/application\/theme-handler\/copied\/testimages\/images\/minus.gif":"6d77c0c0c2f86b6995d1cdf78274eaab","test\/application\/theme-handler\/copied\/testimages\/images\/full-screen.png":"b541fadd3f1563856a4b44aeebd9d563","test\/application\/theme-handler\/copied\/testimages\/images\/indicator.gif":"03ce3dcc84af110e9da8699a841e5200","test\/application\/theme-handler\/copied\/testimages\/images\/delete.png":"93c047549c31a270a037840277cf59d3","test\/application\/theme-handler\/copied\/testimages\/images\/bg.gif":"a315146ab814c73632480136576cd271","test\/application\/theme-handler\/copied\/testimages\/images\/desc.gif":"0f58b33929095ea17795dd53bbced5d9","test\/application\/theme-handler\/copied\/testimages\/images\/info-mini.png":"445c090ed777c5e6a08ac390fa896193","test\/application\/theme-handler\/copied\/testimages\/images\/ok.png":"f6973773335fd83d8d2875f9a3c925af","test\/application\/theme-handler\/copied\/testimages\/images\/error.png":"1af8a1041016f67669c5fd22dc88c82e","test\/application\/theme-handler\/copied\/testimages\/images\/eye-open-555.png":"9940f4e5b1248042c238e1924359fd5e","test\/application\/theme-handler\/copied\/testimages\/images\/eye-closed-555.png":"6ad3b0bae791bf61addc9d8ca80a642d","test\/application\/theme-handler\/copied\/testimages\/images\/eye-open-fff.png":"b7db2402d4d5c72314c25790a66150d4","test\/application\/theme-handler\/copied\/testimages\/images\/eye-closed-fff.png":"f9be7454dbb47b0e0bca3aa370ae7db5","test\/application\/theme-handler\/copied\/testimages\/images\/breadcrumb-separator.png":"1e7e50a8f573e230cf1e0f0399c516e8"}}
 === SIGNATURE END ===
 */
 ====CSSCOMPILEDCONTENT====
\ No newline at end of file
diff --git a/test/application/theme-handler/expected/themes/basque-red/main_stylesheet.css b/test/application/theme-handler/expected/themes/basque-red/main_stylesheet.css
index 37d3e27fa..932099d44 100644
--- a/test/application/theme-handler/expected/themes/basque-red/main_stylesheet.css
+++ b/test/application/theme-handler/expected/themes/basque-red/main_stylesheet.css
@@ -1,6 +1,6 @@
 /*
 === SIGNATURE BEGIN ===
-{"variables":"37c31105548fce44fecca5cb34e455c9","stylesheets":{"css-variables":"3cfd1f47ff8d26ef555ba2bc861f89ed","jqueryui":"78cfafc3524dac98e61fc2460918d4e5","main":"63ba7dfe2a2eba40c2596ebb2a405f0b"},"imports":[],"images":{"test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_222222_256x240.png":"3a3c5468f484f07ac4a320d9e22acb8c","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-bg_diagonals-thick_20_666666_40x40.png":"4429d568c67d8dfeb9040273ea0fb8c4","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_E87C1E_256x240.png":"7003dd36cb2aa032c8ec871ce4d4e03d","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_1c94c4_256x240.png":"dbd693dc8e0ef04e90a2f7ac7b390086","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_F26522_256x240.png":"16278ec0c07270be571f4c2e97fcc10c","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-bg_diagonals-thick_18_b81900_40x40.png":"e460a66d4b3e093fc651e62a236267cb","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_ffffff_256x240.png":"41612b0f4a034424f8321c9f824a94da","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_ffd27a_256x240.png":"dda1b6f694b0d196aefc66a1d6d758f6","test\/application\/theme-handler\/copied\/testimages\/images\/actions_right.png":"31c8906bd25d27b83a0a2466bf903462","test\/application\/theme-handler\/copied\/testimages\/images\/ac-background.gif":"76135f3697b41a15aed787cfd77776c7","test\/application\/theme-handler\/copied\/testimages\/images\/green-square.gif":"16ea9a497d72f5e66e4e8ea9ae08024e","test\/application\/theme-handler\/copied\/testimages\/images\/tv-item.gif":"719fe2d4566108e73162fb8868d3778c","test\/application\/theme-handler\/copied\/testimages\/images\/tv-collapsable.gif":"63a3351ea0d580797c9b8c386aa4f48b","test\/application\/theme-handler\/copied\/testimages\/images\/tv-expandable.gif":"a2d1af4128e4a798a7f3390b12a28574","test\/application\/theme-handler\/copied\/testimages\/images\/tv-item-last.gif":"2ae7e1d9972ce71e5caa65a086bc5b7e","test\/application\/theme-handler\/copied\/testimages\/images\/tv-collapsable-last.gif":"71acaa9d7c2616e9e8b7131a75ca65da","test\/application\/theme-handler\/copied\/testimages\/images\/tv-expandable-last.gif":"9d51036b3a8102742709da66789fd0f7","test\/application\/theme-handler\/copied\/testimages\/images\/red-header.gif":"c73b8765f0c8c3c183cb6a0c2bb0ec69","test\/application\/theme-handler\/copied\/testimages\/images\/green-header.gif":"0e22a09bb8051b2a274b3427ede62e82","test\/application\/theme-handler\/copied\/testimages\/images\/orange-header.gif":"ce1f93f0af64431771b4cbd6c99c567b","test\/application\/theme-handler\/copied\/testimages\/images\/calendar.png":"ab56e59af3c96ca661821257d376465e","test\/application\/theme-handler\/copied\/testimages\/images\/truncated.png":"c6f91108afe8159d417b4dc556cd3b2a","test\/application\/theme-handler\/copied\/testimages\/images\/plus.gif":"f00e1e6e1161f48608bb2bbc79b9948c","test\/application\/theme-handler\/copied\/testimages\/images\/minus.gif":"6d77c0c0c2f86b6995d1cdf78274eaab","test\/application\/theme-handler\/copied\/testimages\/images\/full-screen.png":"b541fadd3f1563856a4b44aeebd9d563","test\/application\/theme-handler\/copied\/testimages\/images\/indicator.gif":"03ce3dcc84af110e9da8699a841e5200","test\/application\/theme-handler\/copied\/testimages\/images\/delete.png":"93c047549c31a270a037840277cf59d3","test\/application\/theme-handler\/copied\/testimages\/images\/bg.gif":"a315146ab814c73632480136576cd271","test\/application\/theme-handler\/copied\/testimages\/images\/desc.gif":"0f58b33929095ea17795dd53bbced5d9","test\/application\/theme-handler\/copied\/testimages\/images\/info-mini.png":"445c090ed777c5e6a08ac390fa896193","test\/application\/theme-handler\/copied\/testimages\/images\/ok.png":"f6973773335fd83d8d2875f9a3c925af","test\/application\/theme-handler\/copied\/testimages\/images\/error.png":"1af8a1041016f67669c5fd22dc88c82e","test\/application\/theme-handler\/copied\/testimages\/images\/eye-open-555.png":"9940f4e5b1248042c238e1924359fd5e","test\/application\/theme-handler\/copied\/testimages\/images\/eye-closed-555.png":"6ad3b0bae791bf61addc9d8ca80a642d","test\/application\/theme-handler\/copied\/testimages\/images\/eye-open-fff.png":"b7db2402d4d5c72314c25790a66150d4","test\/application\/theme-handler\/copied\/testimages\/images\/eye-closed-fff.png":"f9be7454dbb47b0e0bca3aa370ae7db5","test\/application\/theme-handler\/copied\/testimages\/images\/breadcrumb-separator.png":"1e7e50a8f573e230cf1e0f0399c516e8"}}
+{"variables":"37c31105548fce44fecca5cb34e455c9","stylesheets":{"css-variables":"MD5SUM","jqueryui":"78cfafc3524dac98e61fc2460918d4e5","main":"63ba7dfe2a2eba40c2596ebb2a405f0b"},"imports":[],"images":{"test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_222222_256x240.png":"3a3c5468f484f07ac4a320d9e22acb8c","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-bg_diagonals-thick_20_666666_40x40.png":"4429d568c67d8dfeb9040273ea0fb8c4","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_E87C1E_256x240.png":"7003dd36cb2aa032c8ec871ce4d4e03d","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_1c94c4_256x240.png":"dbd693dc8e0ef04e90a2f7ac7b390086","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_F26522_256x240.png":"16278ec0c07270be571f4c2e97fcc10c","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-bg_diagonals-thick_18_b81900_40x40.png":"e460a66d4b3e093fc651e62a236267cb","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_ffffff_256x240.png":"41612b0f4a034424f8321c9f824a94da","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_ffd27a_256x240.png":"dda1b6f694b0d196aefc66a1d6d758f6","test\/application\/theme-handler\/copied\/testimages\/images\/actions_right.png":"31c8906bd25d27b83a0a2466bf903462","test\/application\/theme-handler\/copied\/testimages\/images\/ac-background.gif":"76135f3697b41a15aed787cfd77776c7","test\/application\/theme-handler\/copied\/testimages\/images\/green-square.gif":"16ea9a497d72f5e66e4e8ea9ae08024e","test\/application\/theme-handler\/copied\/testimages\/images\/tv-item.gif":"719fe2d4566108e73162fb8868d3778c","test\/application\/theme-handler\/copied\/testimages\/images\/tv-collapsable.gif":"63a3351ea0d580797c9b8c386aa4f48b","test\/application\/theme-handler\/copied\/testimages\/images\/tv-expandable.gif":"a2d1af4128e4a798a7f3390b12a28574","test\/application\/theme-handler\/copied\/testimages\/images\/tv-item-last.gif":"2ae7e1d9972ce71e5caa65a086bc5b7e","test\/application\/theme-handler\/copied\/testimages\/images\/tv-collapsable-last.gif":"71acaa9d7c2616e9e8b7131a75ca65da","test\/application\/theme-handler\/copied\/testimages\/images\/tv-expandable-last.gif":"9d51036b3a8102742709da66789fd0f7","test\/application\/theme-handler\/copied\/testimages\/images\/red-header.gif":"c73b8765f0c8c3c183cb6a0c2bb0ec69","test\/application\/theme-handler\/copied\/testimages\/images\/green-header.gif":"0e22a09bb8051b2a274b3427ede62e82","test\/application\/theme-handler\/copied\/testimages\/images\/orange-header.gif":"ce1f93f0af64431771b4cbd6c99c567b","test\/application\/theme-handler\/copied\/testimages\/images\/calendar.png":"ab56e59af3c96ca661821257d376465e","test\/application\/theme-handler\/copied\/testimages\/images\/truncated.png":"c6f91108afe8159d417b4dc556cd3b2a","test\/application\/theme-handler\/copied\/testimages\/images\/plus.gif":"f00e1e6e1161f48608bb2bbc79b9948c","test\/application\/theme-handler\/copied\/testimages\/images\/minus.gif":"6d77c0c0c2f86b6995d1cdf78274eaab","test\/application\/theme-handler\/copied\/testimages\/images\/full-screen.png":"b541fadd3f1563856a4b44aeebd9d563","test\/application\/theme-handler\/copied\/testimages\/images\/indicator.gif":"03ce3dcc84af110e9da8699a841e5200","test\/application\/theme-handler\/copied\/testimages\/images\/delete.png":"93c047549c31a270a037840277cf59d3","test\/application\/theme-handler\/copied\/testimages\/images\/bg.gif":"a315146ab814c73632480136576cd271","test\/application\/theme-handler\/copied\/testimages\/images\/desc.gif":"0f58b33929095ea17795dd53bbced5d9","test\/application\/theme-handler\/copied\/testimages\/images\/info-mini.png":"445c090ed777c5e6a08ac390fa896193","test\/application\/theme-handler\/copied\/testimages\/images\/ok.png":"f6973773335fd83d8d2875f9a3c925af","test\/application\/theme-handler\/copied\/testimages\/images\/error.png":"1af8a1041016f67669c5fd22dc88c82e","test\/application\/theme-handler\/copied\/testimages\/images\/eye-open-555.png":"9940f4e5b1248042c238e1924359fd5e","test\/application\/theme-handler\/copied\/testimages\/images\/eye-closed-555.png":"6ad3b0bae791bf61addc9d8ca80a642d","test\/application\/theme-handler\/copied\/testimages\/images\/eye-open-fff.png":"b7db2402d4d5c72314c25790a66150d4","test\/application\/theme-handler\/copied\/testimages\/images\/eye-closed-fff.png":"f9be7454dbb47b0e0bca3aa370ae7db5","test\/application\/theme-handler\/copied\/testimages\/images\/breadcrumb-separator.png":"1e7e50a8f573e230cf1e0f0399c516e8"}}
 === SIGNATURE END ===
 */
 ====CSSCOMPILEDCONTENT====
\ No newline at end of file
diff --git a/test/application/theme-handler/expected/themes/basque-red/main_varchanged.css b/test/application/theme-handler/expected/themes/basque-red/main_varchanged.css
index aa65db6ad..0c0873c60 100644
--- a/test/application/theme-handler/expected/themes/basque-red/main_varchanged.css
+++ b/test/application/theme-handler/expected/themes/basque-red/main_varchanged.css
@@ -1,6 +1,6 @@
 /*
 === SIGNATURE BEGIN ===
-{"variables":"8100523d2e76a70266f3e7110e2fe5fb","stylesheets":{"css-variables":"3cfd1f47ff8d26ef555ba2bc861f89ed","jqueryui":"78cfafc3524dac98e61fc2460918d4e5","main":"52d8a7c5530ceb3a4d777364fa4e1eea"},"imports":[],"images":{"test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_222222_256x240.png":"3a3c5468f484f07ac4a320d9e22acb8c","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-bg_diagonals-thick_20_666666_40x40.png":"4429d568c67d8dfeb9040273ea0fb8c4","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_E87C1E_256x240.png":"7003dd36cb2aa032c8ec871ce4d4e03d","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_1c94c4_256x240.png":"dbd693dc8e0ef04e90a2f7ac7b390086","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_F26522_256x240.png":"16278ec0c07270be571f4c2e97fcc10c","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-bg_diagonals-thick_18_b81900_40x40.png":"e460a66d4b3e093fc651e62a236267cb","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_ffffff_256x240.png":"41612b0f4a034424f8321c9f824a94da","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_ffd27a_256x240.png":"dda1b6f694b0d196aefc66a1d6d758f6","test\/application\/theme-handler\/copied\/testimages\/images\/actions_right.png":"31c8906bd25d27b83a0a2466bf903462","test\/application\/theme-handler\/copied\/testimages\/images\/ac-background.gif":"76135f3697b41a15aed787cfd77776c7","test\/application\/theme-handler\/copied\/testimages\/images\/green-square.gif":"16ea9a497d72f5e66e4e8ea9ae08024e","test\/application\/theme-handler\/copied\/testimages\/images\/tv-item.gif":"719fe2d4566108e73162fb8868d3778c","test\/application\/theme-handler\/copied\/testimages\/images\/tv-collapsable.gif":"63a3351ea0d580797c9b8c386aa4f48b","test\/application\/theme-handler\/copied\/testimages\/images\/tv-expandable.gif":"a2d1af4128e4a798a7f3390b12a28574","test\/application\/theme-handler\/copied\/testimages\/images\/tv-item-last.gif":"2ae7e1d9972ce71e5caa65a086bc5b7e","test\/application\/theme-handler\/copied\/testimages\/images\/tv-collapsable-last.gif":"71acaa9d7c2616e9e8b7131a75ca65da","test\/application\/theme-handler\/copied\/testimages\/images\/tv-expandable-last.gif":"9d51036b3a8102742709da66789fd0f7","test\/application\/theme-handler\/copied\/testimages\/images\/red-header.gif":"c73b8765f0c8c3c183cb6a0c2bb0ec69","test\/application\/theme-handler\/copied\/testimages\/images\/green-header.gif":"0e22a09bb8051b2a274b3427ede62e82","test\/application\/theme-handler\/copied\/testimages\/images\/orange-header.gif":"ce1f93f0af64431771b4cbd6c99c567b","test\/application\/theme-handler\/copied\/testimages\/images\/calendar.png":"ab56e59af3c96ca661821257d376465e","test\/application\/theme-handler\/copied\/testimages\/images\/truncated.png":"c6f91108afe8159d417b4dc556cd3b2a","test\/application\/theme-handler\/copied\/testimages\/images\/plus.gif":"f00e1e6e1161f48608bb2bbc79b9948c","test\/application\/theme-handler\/copied\/testimages\/images\/minus.gif":"6d77c0c0c2f86b6995d1cdf78274eaab","test\/application\/theme-handler\/copied\/testimages\/images\/full-screen.png":"b541fadd3f1563856a4b44aeebd9d563","test\/application\/theme-handler\/copied\/testimages\/images\/indicator.gif":"03ce3dcc84af110e9da8699a841e5200","test\/application\/theme-handler\/copied\/testimages\/images\/delete.png":"93c047549c31a270a037840277cf59d3","test\/application\/theme-handler\/copied\/testimages\/images\/bg.gif":"a315146ab814c73632480136576cd271","test\/application\/theme-handler\/copied\/testimages\/images\/desc.gif":"0f58b33929095ea17795dd53bbced5d9","test\/application\/theme-handler\/copied\/testimages\/images\/info-mini.png":"445c090ed777c5e6a08ac390fa896193","test\/application\/theme-handler\/copied\/testimages\/images\/ok.png":"f6973773335fd83d8d2875f9a3c925af","test\/application\/theme-handler\/copied\/testimages\/images\/error.png":"1af8a1041016f67669c5fd22dc88c82e","test\/application\/theme-handler\/copied\/testimages\/images\/eye-open-555.png":"9940f4e5b1248042c238e1924359fd5e","test\/application\/theme-handler\/copied\/testimages\/images\/eye-closed-555.png":"6ad3b0bae791bf61addc9d8ca80a642d","test\/application\/theme-handler\/copied\/testimages\/images\/eye-open-fff.png":"b7db2402d4d5c72314c25790a66150d4","test\/application\/theme-handler\/copied\/testimages\/images\/eye-closed-fff.png":"f9be7454dbb47b0e0bca3aa370ae7db5","test\/application\/theme-handler\/copied\/testimages\/images\/breadcrumb-separator.png":"1e7e50a8f573e230cf1e0f0399c516e8"}}
+{"variables":"8100523d2e76a70266f3e7110e2fe5fb","stylesheets":{"css-variables":"MD5SUM","jqueryui":"78cfafc3524dac98e61fc2460918d4e5","main":"52d8a7c5530ceb3a4d777364fa4e1eea"},"imports":[],"images":{"test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_222222_256x240.png":"3a3c5468f484f07ac4a320d9e22acb8c","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-bg_diagonals-thick_20_666666_40x40.png":"4429d568c67d8dfeb9040273ea0fb8c4","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_E87C1E_256x240.png":"7003dd36cb2aa032c8ec871ce4d4e03d","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_1c94c4_256x240.png":"dbd693dc8e0ef04e90a2f7ac7b390086","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_F26522_256x240.png":"16278ec0c07270be571f4c2e97fcc10c","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-bg_diagonals-thick_18_b81900_40x40.png":"e460a66d4b3e093fc651e62a236267cb","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_ffffff_256x240.png":"41612b0f4a034424f8321c9f824a94da","test\/application\/theme-handler\/copied\/testimages\/css\/ui-lightness\/images\/ui-icons_ffd27a_256x240.png":"dda1b6f694b0d196aefc66a1d6d758f6","test\/application\/theme-handler\/copied\/testimages\/images\/actions_right.png":"31c8906bd25d27b83a0a2466bf903462","test\/application\/theme-handler\/copied\/testimages\/images\/ac-background.gif":"76135f3697b41a15aed787cfd77776c7","test\/application\/theme-handler\/copied\/testimages\/images\/green-square.gif":"16ea9a497d72f5e66e4e8ea9ae08024e","test\/application\/theme-handler\/copied\/testimages\/images\/tv-item.gif":"719fe2d4566108e73162fb8868d3778c","test\/application\/theme-handler\/copied\/testimages\/images\/tv-collapsable.gif":"63a3351ea0d580797c9b8c386aa4f48b","test\/application\/theme-handler\/copied\/testimages\/images\/tv-expandable.gif":"a2d1af4128e4a798a7f3390b12a28574","test\/application\/theme-handler\/copied\/testimages\/images\/tv-item-last.gif":"2ae7e1d9972ce71e5caa65a086bc5b7e","test\/application\/theme-handler\/copied\/testimages\/images\/tv-collapsable-last.gif":"71acaa9d7c2616e9e8b7131a75ca65da","test\/application\/theme-handler\/copied\/testimages\/images\/tv-expandable-last.gif":"9d51036b3a8102742709da66789fd0f7","test\/application\/theme-handler\/copied\/testimages\/images\/red-header.gif":"c73b8765f0c8c3c183cb6a0c2bb0ec69","test\/application\/theme-handler\/copied\/testimages\/images\/green-header.gif":"0e22a09bb8051b2a274b3427ede62e82","test\/application\/theme-handler\/copied\/testimages\/images\/orange-header.gif":"ce1f93f0af64431771b4cbd6c99c567b","test\/application\/theme-handler\/copied\/testimages\/images\/calendar.png":"ab56e59af3c96ca661821257d376465e","test\/application\/theme-handler\/copied\/testimages\/images\/truncated.png":"c6f91108afe8159d417b4dc556cd3b2a","test\/application\/theme-handler\/copied\/testimages\/images\/plus.gif":"f00e1e6e1161f48608bb2bbc79b9948c","test\/application\/theme-handler\/copied\/testimages\/images\/minus.gif":"6d77c0c0c2f86b6995d1cdf78274eaab","test\/application\/theme-handler\/copied\/testimages\/images\/full-screen.png":"b541fadd3f1563856a4b44aeebd9d563","test\/application\/theme-handler\/copied\/testimages\/images\/indicator.gif":"03ce3dcc84af110e9da8699a841e5200","test\/application\/theme-handler\/copied\/testimages\/images\/delete.png":"93c047549c31a270a037840277cf59d3","test\/application\/theme-handler\/copied\/testimages\/images\/bg.gif":"a315146ab814c73632480136576cd271","test\/application\/theme-handler\/copied\/testimages\/images\/desc.gif":"0f58b33929095ea17795dd53bbced5d9","test\/application\/theme-handler\/copied\/testimages\/images\/info-mini.png":"445c090ed777c5e6a08ac390fa896193","test\/application\/theme-handler\/copied\/testimages\/images\/ok.png":"f6973773335fd83d8d2875f9a3c925af","test\/application\/theme-handler\/copied\/testimages\/images\/error.png":"1af8a1041016f67669c5fd22dc88c82e","test\/application\/theme-handler\/copied\/testimages\/images\/eye-open-555.png":"9940f4e5b1248042c238e1924359fd5e","test\/application\/theme-handler\/copied\/testimages\/images\/eye-closed-555.png":"6ad3b0bae791bf61addc9d8ca80a642d","test\/application\/theme-handler\/copied\/testimages\/images\/eye-open-fff.png":"b7db2402d4d5c72314c25790a66150d4","test\/application\/theme-handler\/copied\/testimages\/images\/eye-closed-fff.png":"f9be7454dbb47b0e0bca3aa370ae7db5","test\/application\/theme-handler\/copied\/testimages\/images\/breadcrumb-separator.png":"1e7e50a8f573e230cf1e0f0399c516e8"}}
 === SIGNATURE END ===
 */
 ====CSSCOMPILEDCONTENT====
\ No newline at end of file

From 661d84fc7785d6a330a94b347b6027233f8ebd0d Mon Sep 17 00:00:00 2001
From: Pierre Goiffon <pierre.goiffon@combodo.com>
Date: Thu, 24 Sep 2020 14:17:08 +0200
Subject: [PATCH 12/43] :white_check_mark: ThemeHandlerTest : fix tmp dir clean
 up

---
 test/application/ThemeHandlerTest.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/application/ThemeHandlerTest.php b/test/application/ThemeHandlerTest.php
index 07dc8e43e..ab28856b1 100644
--- a/test/application/ThemeHandlerTest.php
+++ b/test/application/ThemeHandlerTest.php
@@ -27,12 +27,12 @@ class ThemeHandlerTest extends ItopTestCase
 		$this->oCompileCSSServiceMock = $this->createMock('CompileCSSService');
 		ThemeHandler::mockCompileCSSService($this->oCompileCSSServiceMock);
 
-		$this->sTmpDir=$this->tmpdir();
-		$aDirsToCleanup[] = $this->sTmpDir;
+		$this->sTmpDir = $this->tmpdir();
+		$this->aDirsToCleanup[] = $this->sTmpDir;
 
 		$this->recurseMkdir($this->sTmpDir."/branding/themes/basque-red");
-		$this->sCssPath = $this->sTmpDir . '/branding/themes/basque-red/main.css';
-		$this->sJsonThemeParamFile = $this->sTmpDir . '/branding/themes/basque-red/theme-parameters.json';
+		$this->sCssPath = $this->sTmpDir.'/branding/themes/basque-red/main.css';
+		$this->sJsonThemeParamFile = $this->sTmpDir.'/branding/themes/basque-red/theme-parameters.json';
 		$this->recurse_copy(APPROOT."/test/application/theme-handler/expected/css", $this->sTmpDir."/branding/css");
 	}
 

From 45e366745d641c8e7e28f51028ff16a24f858e19 Mon Sep 17 00:00:00 2001
From: Pierre Goiffon <pierre.goiffon@combodo.com>
Date: Thu, 24 Sep 2020 17:34:57 +0200
Subject: [PATCH 13/43] =?UTF-8?q?N=C2=B03333=20Security=20hardening?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/userrights.class.inc.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/core/userrights.class.inc.php b/core/userrights.class.inc.php
index 5c746bbb1..12a936787 100644
--- a/core/userrights.class.inc.php
+++ b/core/userrights.class.inc.php
@@ -1343,9 +1343,8 @@ class UserRights
 			// The bug has been fixed in PHP 7.2, but in case session_regenerate_id()
 			// fails we just silently ignore the error and keep the same session id...
 			$old_error_handler = set_error_handler(array(__CLASS__, 'VoidErrorHandler'));
-			session_regenerate_id();
-			if ($old_error_handler !== null)
-			{
+			session_regenerate_id(true);
+			if ($old_error_handler !== null) {
 				set_error_handler($old_error_handler);
 			}
 		}

From 4e0eed6e13ac316eb56f49a3f28f76bdb46e0de8 Mon Sep 17 00:00:00 2001
From: odain <olivier.dain@combodo.com>
Date: Fri, 21 Aug 2020 18:10:48 +0200
Subject: [PATCH 14/43] =?UTF-8?q?N=C2=B03270=20Notify=20on=20expiration=20?=
 =?UTF-8?q?not=20sending=20notification=20(trigger=20exception)=20=09add?=
 =?UTF-8?q?=20boilerplate=20function=20and=20use=20it=20to=20intercept/enr?=
 =?UTF-8?q?ich=20trigger=20exception=20loops?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/utils.inc.php                     | 22 ++++++
 core/coreexception.class.inc.php              | 14 +++-
 core/dbobject.class.php                       | 44 +++++++++--
 core/ormstopwatch.class.inc.php               |  9 ++-
 .../portal/src/Form/ObjectFormManager.php     |  9 ++-
 .../2.x/itop-tickets/module.itop-tickets.php  | 11 ++-
 pages/UI.php                                  |  4 +-
 test/core/TriggerTest.php                     | 73 +++++++++++++++++++
 8 files changed, 173 insertions(+), 13 deletions(-)

diff --git a/application/utils.inc.php b/application/utils.inc.php
index 5d6754b8e..ec5b43ab5 100644
--- a/application/utils.inc.php
+++ b/application/utils.inc.php
@@ -2315,4 +2315,26 @@ class utils
 	{
 		return str_replace(' ', '', ucwords(strtr($sInput, '_-', '  ')));
 	}
+
+	/**
+	 * @param \cmdbAbstractObject $oCmdbAbstract
+	 * @param \Exception $oException
+	 *
+	 * @throws \Exception
+	 * @since 2.7.2/ 2.8.0
+	 */
+	public static function EnrichRaisedException($oCmdbAbstract, $oException)
+	{
+		if (is_null($oCmdbAbstract) ||
+			! is_a($oCmdbAbstract, \cmdbAbstractObject::class))
+		{
+			throw $oException;
+		}
+
+		$sCmdbAbstractInfo = str_replace("\n", '', "" . $oCmdbAbstract);
+		$sMessage = $oException->getMessage() . " (" . $sCmdbAbstractInfo . ")";
+
+		$e = new CoreException($sMessage, null, '', $oException);
+		throw $e;
+	}
 }
diff --git a/core/coreexception.class.inc.php b/core/coreexception.class.inc.php
index 81ba9efef..7188446c7 100644
--- a/core/coreexception.class.inc.php
+++ b/core/coreexception.class.inc.php
@@ -28,7 +28,7 @@
 
 class CoreException extends Exception
 {
-	public function __construct($sIssue, $aContextData = null, $sImpact = '')
+	public function __construct($sIssue, $aContextData = null, $sImpact = '', $oPrevious = null)
 	{
 		$this->m_sIssue = $sIssue;
 		$this->m_sImpact = $sImpact;
@@ -66,7 +66,7 @@ class CoreException extends Exception
 			}
 			$sMessage .= implode(', ', $aContextItems);
 		}
-		parent::__construct($sMessage, 0);
+		parent::__construct($sMessage, 0, $oPrevious);
 	}
 
 	/**
@@ -81,6 +81,16 @@ class CoreException extends Exception
 		return $this->getMessage();
 	}
 
+	/**
+	 * getTraceAsString() cannot be overrided and it is limited as only current exception stack is returned.
+	 * we need stack of all previous exceptions
+	 * @uses __tostring() already does the work.
+	 * @since 2.7.2/ 2.8.0
+	 */
+	public function getFullStackTraceAsString(){
+		return "" . $this;
+	}
+
 	public function getTraceAsHtml()
 	{
 		$aBackTrace = $this->getTrace();
diff --git a/core/dbobject.class.php b/core/dbobject.class.php
index fae884d1e..aba3b5a25 100644
--- a/core/dbobject.class.php
+++ b/core/dbobject.class.php
@@ -2805,7 +2805,14 @@ abstract class DBObject implements iDisplay
 		while ($oTrigger = $oSet->Fetch())
 		{
 			/** @var \Trigger $oTrigger */
-			$oTrigger->DoActivate($this->ToArgs('this'));
+			try
+			{
+				$oTrigger->DoActivate($this->ToArgs('this'));
+			}
+			catch(Exception $e)
+			{
+				utils::EnrichRaisedException($oTrigger, $e);
+			}
 		}
 
 		$this->RecordObjCreation();
@@ -3117,7 +3124,14 @@ abstract class DBObject implements iDisplay
 			while ($oTrigger = $oSet->Fetch())
 			{
 				/** @var \Trigger $oTrigger */
-				$oTrigger->DoActivate($this->ToArgs('this'));
+				try
+				{
+					$oTrigger->DoActivate($this->ToArgs('this'));
+				}
+				catch(Exception $e)
+				{
+					utils::EnrichRaisedException($oTrigger, $e);
+				}
 			}
 
 			$bHasANewExternalKeyValue = false;
@@ -3433,7 +3447,14 @@ abstract class DBObject implements iDisplay
 		while ($oTrigger = $oSet->Fetch())
 		{
 			/** @var \Trigger $oTrigger */
-			$oTrigger->DoActivate($this->ToArgs('this'));
+			try
+			{
+				$oTrigger->DoActivate($this->ToArgs('this'));
+			}
+			catch(Exception $e)
+			{
+				utils::EnrichRaisedException($oTrigger, $e);
+			}
 		}
 
 		$this->RecordObjDeletion($this->m_iKey); // May cause a reload for storing history information
@@ -3837,14 +3858,27 @@ abstract class DBObject implements iDisplay
 			while ($oTrigger = $oSet->Fetch())
 			{
 				/** @var \Trigger $oTrigger */
-				$oTrigger->DoActivate($this->ToArgs('this'));
+				try
+				{
+					$oTrigger->DoActivate($this->ToArgs('this'));
+				}
+				catch(Exception $e)
+				{
+					utils::EnrichRaisedException($oTrigger, $e);
+				}
 			}
 
 			$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT TriggerOnStateEnter AS t WHERE t.target_class IN (:class_list) AND t.state=:new_state"), array(), $aParams);
 			while ($oTrigger = $oSet->Fetch())
 			{
 				/** @var \Trigger $oTrigger */
-				$oTrigger->DoActivate($this->ToArgs('this'));
+				try{
+					$oTrigger->DoActivate($this->ToArgs('this'));
+				}
+				catch(Exception $e)
+				{
+					utils::EnrichRaisedException($oTrigger, $e);
+				}
 			}
 		}
 		else
diff --git a/core/ormstopwatch.class.inc.php b/core/ormstopwatch.class.inc.php
index 3af604e2c..1913a36c4 100644
--- a/core/ormstopwatch.class.inc.php
+++ b/core/ormstopwatch.class.inc.php
@@ -614,7 +614,14 @@ class CheckStopWatchThresholds implements iBackgroundProcess
 							);
 							while ($oTrigger = $oTriggerSet->Fetch())
 							{
-								$oTrigger->DoActivate($oObj->ToArgs('this'));
+								try
+								{
+									$oTrigger->DoActivate($oObj->ToArgs('this'));
+								}
+								catch(Exception $e)
+								{
+									utils::EnrichRaisedException($oTrigger, $e);
+								}
 							}
 						}
 					}
diff --git a/datamodels/2.x/itop-portal-base/portal/src/Form/ObjectFormManager.php b/datamodels/2.x/itop-portal-base/portal/src/Form/ObjectFormManager.php
index 835099838..11c9f3995 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/Form/ObjectFormManager.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/Form/ObjectFormManager.php
@@ -1139,7 +1139,14 @@ class ObjectFormManager extends FormManager
 						/** @var \Trigger $oTrigger */
 						while ($oTrigger = $oTriggerSet->Fetch())
 						{
-							$oTrigger->DoActivate($this->oObject->ToArgs('this'));
+							try
+							{
+								$oTrigger->DoActivate($this->oObject->ToArgs('this'));
+							}
+							catch(Exception $e)
+							{
+								utils::EnrichRaisedException($oTrigger, $e);
+							}
 						}
 					}
 				}
diff --git a/datamodels/2.x/itop-tickets/module.itop-tickets.php b/datamodels/2.x/itop-tickets/module.itop-tickets.php
index 4be3a3d22..0830d1917 100755
--- a/datamodels/2.x/itop-tickets/module.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/module.itop-tickets.php
@@ -55,9 +55,16 @@ class TicketsInstaller extends ModuleInstallerAPI
 		$oSet = new DBObjectSet($oSearch);
 		while($oTrigger = $oSet->Fetch())
 		{
-			if (!MetaModel::IsValidClass($oTrigger->Get('target_class')))
+			try
 			{
-				$oTrigger->DBDelete();
+				if (!MetaModel::IsValidClass($oTrigger->Get('target_class')))
+				{
+					$oTrigger->DBDelete();
+				}
+			}
+			catch(Exception $e)
+			{
+				utils::EnrichRaisedException($oTrigger, $e);
 			}
 		}
 	}
diff --git a/pages/UI.php b/pages/UI.php
index 3c908983c..f931e9121 100644
--- a/pages/UI.php
+++ b/pages/UI.php
@@ -2004,7 +2004,7 @@ catch(CoreException $e)
 				$oLog->Set('userinfo', '');
 				$oLog->Set('issue', $e->GetIssue());
 				$oLog->Set('impact', 'Page could not be displayed');
-				$oLog->Set('callstack', $e->getTrace());
+				$oLog->Set('callstack', $e->getFullStackTraceAsString());
 				$oLog->Set('data', $e->getContextData());
 				$oLog->DBInsertNoReload();
 			}
@@ -2014,7 +2014,7 @@ catch(CoreException $e)
 			}
 		}
 
-		IssueLog::Error('UI.php operation='.$operation.', error='.$e->getMessage()."\n".$e->getTraceAsString());
+		IssueLog::Error('UI.php operation='.$operation.', error='.$e->getMessage()."\n".$e->getFullStackTraceAsString());
 	}
 
 	// For debugging only
diff --git a/test/core/TriggerTest.php b/test/core/TriggerTest.php
index e9c703cec..b2547b0e9 100644
--- a/test/core/TriggerTest.php
+++ b/test/core/TriggerTest.php
@@ -5,6 +5,7 @@ namespace Combodo\iTop\Test\UnitTest\Core;
 use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
 use ContextTag;
 use MetaModel;
+use PHPUnit\Exception;
 use TriggerOnObjectCreate;
 
 /**
@@ -14,10 +15,21 @@ use TriggerOnObjectCreate;
  *
  * @runTestsInSeparateProcesses
  */
+
+//define('APPROOT', dirname(__FILE__).'/../../');
+//define('APPCONF', APPROOT.'conf/');
+
 class TriggerTest extends ItopDataTestCase
 {
 	const USE_TRANSACTION = false;
 
+
+	protected function setUp()
+	{
+		//@include_once APPROOT . 'approot.inc.php';
+		parent::setUp();
+	}
+
 	public function testIsContextValid()
 	{
 		/** @var TriggerOnObjectCreate $oTrigger */
@@ -29,4 +41,65 @@ class TriggerTest extends ItopDataTestCase
 		ContextTag::AddContext(ContextTag::TAG_CRON);
 		$this->assertTrue($oTrigger->IsContextValid());
 	}
+
+	public function testEnrichRaisedException_Trigger()
+	{
+		$oTrigger = MetaModel::NewObject('TriggerOnObjectCreate');
+		$sStackTrace = "";
+		try
+		{
+			try
+			{
+				MetaModel::NewObject('Toto');
+			}
+			catch (\Exception $e)
+			{
+				$sStackTrace = $e->getTraceAsString();
+				\utils::EnrichRaisedException($oTrigger, $e);
+			}
+			$this->assertTrue(false, "An exception should have been thrown");
+		}
+		catch(\CoreException $e1)
+		{
+			$this->assertEquals('CoreException', get_class($e1));
+			$this->assertEquals('Unknown class \'Toto\' (<b title="Trigger">TriggerOnObjectCreate</b>::-1 ()<br/>)', $e1->getMessage());
+
+			$fullStackTraceAsString = $e1->getFullStackTraceAsString();
+			$this->assertContains("MetaModel::NewObject", $fullStackTraceAsString,"new enriched exception should contain root cause method: " . $fullStackTraceAsString);
+		}
+	}
+
+	public function NoEnrichmentProvider()
+	{
+		return [
+			[ null ],
+			[ new \PHPUnit\Runner\Exception() ],
+		]	;
+	}
+
+	/**
+	 * @param $oCmdbAbstract
+	 * @dataProvider NoEnrichmentProvider
+	 */
+	public function testEnrichRaisedException_NoEnrichment($oCmdbAbstract)
+	{
+		$sStackTrace = "";
+		try
+		{
+			try
+			{
+				MetaModel::NewObject('CoreException');
+			}
+			catch (\Exception $e)
+			{
+				$sStackTrace = $e->getTraceAsString();
+				\utils::EnrichRaisedException($oCmdbAbstract, $e);
+			}
+			$this->assertTrue(false, "An exception should have been thrown");
+		}
+		catch(\Exception $e1)
+		{
+			$this->assertEquals($e, $e1);
+		}
+	}
 }

From 9520d2794fe27f3719dbef111f029ea168a5d3f1 Mon Sep 17 00:00:00 2001
From: odain <olivier.dain@combodo.com>
Date: Fri, 25 Sep 2020 10:29:38 +0200
Subject: [PATCH 15/43] :green_heart: fix ci Serialization of 'ReflectionClass'
 is not allowed

---
 test/core/TriggerTest.php | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/test/core/TriggerTest.php b/test/core/TriggerTest.php
index b2547b0e9..768f1fb3b 100644
--- a/test/core/TriggerTest.php
+++ b/test/core/TriggerTest.php
@@ -2,6 +2,7 @@
 
 namespace Combodo\iTop\Test\UnitTest\Core;
 
+use Combodo\iTop\Portal\Controller\ObjectController;
 use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
 use ContextTag;
 use MetaModel;
@@ -16,9 +17,6 @@ use TriggerOnObjectCreate;
  * @runTestsInSeparateProcesses
  */
 
-//define('APPROOT', dirname(__FILE__).'/../../');
-//define('APPCONF', APPROOT.'conf/');
-
 class TriggerTest extends ItopDataTestCase
 {
 	const USE_TRANSACTION = false;
@@ -26,7 +24,6 @@ class TriggerTest extends ItopDataTestCase
 
 	protected function setUp()
 	{
-		//@include_once APPROOT . 'approot.inc.php';
 		parent::setUp();
 	}
 
@@ -45,7 +42,6 @@ class TriggerTest extends ItopDataTestCase
 	public function testEnrichRaisedException_Trigger()
 	{
 		$oTrigger = MetaModel::NewObject('TriggerOnObjectCreate');
-		$sStackTrace = "";
 		try
 		{
 			try
@@ -54,7 +50,6 @@ class TriggerTest extends ItopDataTestCase
 			}
 			catch (\Exception $e)
 			{
-				$sStackTrace = $e->getTraceAsString();
 				\utils::EnrichRaisedException($oTrigger, $e);
 			}
 			$this->assertTrue(false, "An exception should have been thrown");
@@ -73,7 +68,7 @@ class TriggerTest extends ItopDataTestCase
 	{
 		return [
 			[ null ],
-			[ new \PHPUnit\Runner\Exception() ],
+			[ new NonCmdbAbstractObject() ],
 		]	;
 	}
 
@@ -83,7 +78,6 @@ class TriggerTest extends ItopDataTestCase
 	 */
 	public function testEnrichRaisedException_NoEnrichment($oCmdbAbstract)
 	{
-		$sStackTrace = "";
 		try
 		{
 			try
@@ -92,7 +86,6 @@ class TriggerTest extends ItopDataTestCase
 			}
 			catch (\Exception $e)
 			{
-				$sStackTrace = $e->getTraceAsString();
 				\utils::EnrichRaisedException($oCmdbAbstract, $e);
 			}
 			$this->assertTrue(false, "An exception should have been thrown");
@@ -103,3 +96,7 @@ class TriggerTest extends ItopDataTestCase
 		}
 	}
 }
+
+class NonCmdbAbstractObject{
+
+}

From 0948e80060733e6bc48632f07e15d0f66de3b471 Mon Sep 17 00:00:00 2001
From: Molkobain <lajarige.guillaume@free.fr>
Date: Mon, 28 Sep 2020 14:10:19 +0200
Subject: [PATCH 16/43] =?UTF-8?q?N=C2=B03320=20-=20Fix=20empty=20tabs=20be?=
 =?UTF-8?q?ing=20displayed=20(misuse=20of=20the=20API=20or=20user=20rights?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/cmdbabstract.class.inc.php | 9 +++------
 application/webpage.class.inc.php      | 6 ++++++
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php
index a39bd69d9..61777fe51 100644
--- a/application/cmdbabstract.class.inc.php
+++ b/application/cmdbabstract.class.inc.php
@@ -558,12 +558,6 @@ EOF
 			$oLinkSet = $oOrmLinkSet->ToDBObjectSet(utils::ShowObsoleteData());
 
 			$iCount = $oLinkSet->Count();
-			$sCount = '';
-			if ($iCount != 0)
-			{
-				$sCount = " ($iCount)";
-			}
-			$oPage->SetCurrentTab('Class:'.$sClass.'/Attribute:'.$sAttCode, $oAttDef->GetLabel().$sCount);
 			if ($this->IsNew())
 			{
 				$iFlags = $this->GetInitialStateAttributeFlags($sAttCode);
@@ -609,6 +603,9 @@ EOF
 				continue;
 			}
 
+			$sCount = ($iCount != 0) ? " ($iCount)" : "";
+			$oPage->SetCurrentTab('Class:'.$sClass.'/Attribute:'.$sAttCode, $oAttDef->GetLabel().$sCount);
+
 			$aArgs = array('this' => $this);
 			$bReadOnly = ($iFlags & (OPT_ATT_READONLY | OPT_ATT_SLAVE));
 			if ($bEditMode && (!$bReadOnly))
diff --git a/application/webpage.class.inc.php b/application/webpage.class.inc.php
index 746ba9083..efd63088f 100644
--- a/application/webpage.class.inc.php
+++ b/application/webpage.class.inc.php
@@ -1547,6 +1547,12 @@ class TabManager
 					{
 						unset($aTabs['tabs'][$sTabCode]);
 					}
+
+					// N°3320: Do not display empty tabs
+					if (empty($aTabData['html']))
+					{
+						unset($aTabs['tabs'][$sTabCode]);
+					}
 				}
 
 				// Render tabs

From 389b61d3a8df3f623bff8daf4fb5037a405646ba Mon Sep 17 00:00:00 2001
From: Molkobain <lajarige.guillaume@free.fr>
Date: Mon, 28 Sep 2020 14:29:51 +0200
Subject: [PATCH 17/43] Fix missing author information in composer.json for
 TCPDF lib.

---
 composer.lock                   |  8 ++++----
 lib/combodo/tcpdf/composer.json |  7 ++++++-
 lib/composer/autoload_real.php  |  3 ---
 lib/composer/installed.json     | 23 +++++++++++------------
 4 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/composer.lock b/composer.lock
index 3a08b7f7d..82f6bcf10 100644
--- a/composer.lock
+++ b/composer.lock
@@ -12,12 +12,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/combodo-itop-libs/TCPDF.git",
-                "reference": "abbfedb8ca59843dec11c97ca3f308742265c3fc"
+                "reference": "aedd4b7b8cf7fcc24e617c405c9d3304150f4b94"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/combodo-itop-libs/TCPDF/zipball/abbfedb8ca59843dec11c97ca3f308742265c3fc",
-                "reference": "abbfedb8ca59843dec11c97ca3f308742265c3fc",
+                "url": "https://api.github.com/repos/combodo-itop-libs/TCPDF/zipball/aedd4b7b8cf7fcc24e617c405c9d3304150f4b94",
+                "reference": "aedd4b7b8cf7fcc24e617c405c9d3304150f4b94",
                 "shasum": ""
             },
             "require": {
@@ -64,7 +64,7 @@
             ],
             "description": "TCPDF fork adding requirements for iTop: Specific fonts.",
             "homepage": "https://github.com/combodo-itop-libs/TCPDF",
-            "time": "2020-06-05T13:06:44+00:00"
+            "time": "2020-09-28T12:19:09+00:00"
         },
         {
             "name": "nikic/php-parser",
diff --git a/lib/combodo/tcpdf/composer.json b/lib/combodo/tcpdf/composer.json
index d9ac48435..fe90ae9eb 100644
--- a/lib/combodo/tcpdf/composer.json
+++ b/lib/combodo/tcpdf/composer.json
@@ -6,8 +6,13 @@
   "homepage": "https://github.com/combodo-itop-libs/TCPDF",
   "type": "library",
   "description": "TCPDF fork adding requirements for iTop: Specific fonts.",
-  "license": "LGPL-3.0",
+  "license": "LGPL-3.0-only",
   "authors": [
+    {
+      "name": "Nicola Asuni",
+      "email": "info@tecnick.com",
+      "role": "lead"
+    },
     {
       "name": "Combodo",
       "email": "contact@combodo.com"
diff --git a/lib/composer/autoload_real.php b/lib/composer/autoload_real.php
index ac16a9508..e8c595bf1 100644
--- a/lib/composer/autoload_real.php
+++ b/lib/composer/autoload_real.php
@@ -13,9 +13,6 @@ class ComposerAutoloaderInit0018331147de7601e7552f7da8e3bb8b
         }
     }
 
-    /**
-     * @return \Composer\Autoload\ClassLoader
-     */
     public static function getLoader()
     {
         if (null !== self::$loader) {
diff --git a/lib/composer/installed.json b/lib/composer/installed.json
index 1ec9d2a9a..d201d4b99 100644
--- a/lib/composer/installed.json
+++ b/lib/composer/installed.json
@@ -6,12 +6,12 @@
         "source": {
             "type": "git",
             "url": "https://github.com/combodo-itop-libs/TCPDF.git",
-            "reference": "abbfedb8ca59843dec11c97ca3f308742265c3fc"
+            "reference": "aedd4b7b8cf7fcc24e617c405c9d3304150f4b94"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/combodo-itop-libs/TCPDF/zipball/abbfedb8ca59843dec11c97ca3f308742265c3fc",
-            "reference": "abbfedb8ca59843dec11c97ca3f308742265c3fc",
+            "url": "https://api.github.com/repos/combodo-itop-libs/TCPDF/zipball/aedd4b7b8cf7fcc24e617c405c9d3304150f4b94",
+            "reference": "aedd4b7b8cf7fcc24e617c405c9d3304150f4b94",
             "shasum": ""
         },
         "require": {
@@ -20,7 +20,7 @@
         "replace": {
             "tecnickcom/tcpdf": "self.version"
         },
-        "time": "2020-06-05T13:06:44+00:00",
+        "time": "2020-09-28T12:19:09+00:00",
         "type": "library",
         "installation-source": "dist",
         "autoload": {
@@ -45,22 +45,21 @@
         },
         "notification-url": "https://packagist.org/downloads/",
         "license": [
-            "LGPL-3.0"
+            "LGPL-3.0-only"
         ],
         "authors": [
+            {
+                "name": "Nicola Asuni",
+                "email": "info@tecnick.com",
+                "role": "lead"
+            },
             {
                 "name": "Combodo",
                 "email": "contact@combodo.com"
             }
         ],
         "description": "TCPDF fork adding requirements for iTop: Specific fonts.",
-        "homepage": "https://github.com/combodo-itop-libs/TCPDF",
-        "funding": [
-            {
-                "url": "https://www.paypal.com/cgi-bin/webscr?cmd=_donations&currency_code=GBP&business=paypal@tecnick.com&item_name=donation%20for%20tcpdf%20project",
-                "type": "custom"
-            }
-        ]
+        "homepage": "https://github.com/combodo-itop-libs/TCPDF"
     },
     {
         "name": "nikic/php-parser",

From 794d4f1e0e39ab8e0678ce2576cf06e7ede7ae98 Mon Sep 17 00:00:00 2001
From: Molkobain <lajarige.guillaume@free.fr>
Date: Mon, 28 Sep 2020 14:31:36 +0200
Subject: [PATCH 18/43] =?UTF-8?q?N=C2=B03310=20-=20Fix=20corrupted=20backu?=
 =?UTF-8?q?ps=20when=20a=20file=20has=20a=20size=20which=20is=20a=20multip?=
 =?UTF-8?q?le=20of=20512=20bytes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 composer.json                        |  2 +-
 composer.lock                        | 12 ++++++------
 lib/composer/installed.json          | 12 ++++++------
 lib/pear/archive_tar/.gitignore      |  5 +++++
 lib/pear/archive_tar/.travis.yml     | 18 +++++-------------
 lib/pear/archive_tar/Archive/Tar.php | 13 +++++++++----
 lib/pear/archive_tar/package.xml     | 24 ++++++++++++++++++++----
 7 files changed, 52 insertions(+), 34 deletions(-)

diff --git a/composer.json b/composer.json
index e363d44da..8b9321e99 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
     "ext-soap": "*",
     "combodo/tcpdf": "6.3.5",
     "nikic/php-parser": "^3.1",
-    "pear/archive_tar": "1.4.9",
+    "pear/archive_tar": "1.4.10",
     "pelago/emogrifier": "2.1.0",
     "scssphp/scssphp": "1.0.6",
     "swiftmailer/swiftmailer": "5.4.12",
diff --git a/composer.lock b/composer.lock
index 82f6bcf10..2aef21e81 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "ad359769d05acd25a9fc31d69acbe43a",
+    "content-hash": "27af144ea2acf2c138f587052a4ceddc",
     "packages": [
         {
             "name": "combodo/tcpdf",
@@ -168,16 +168,16 @@
         },
         {
             "name": "pear/archive_tar",
-            "version": "1.4.9",
+            "version": "1.4.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pear/Archive_Tar.git",
-                "reference": "c5b00053770e1d72128252c62c2c1a12c26639f0"
+                "reference": "bbb4f10f71a1da2715ec6d9a683f4f23c507a49b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pear/Archive_Tar/zipball/c5b00053770e1d72128252c62c2c1a12c26639f0",
-                "reference": "c5b00053770e1d72128252c62c2c1a12c26639f0",
+                "url": "https://api.github.com/repos/pear/Archive_Tar/zipball/bbb4f10f71a1da2715ec6d9a683f4f23c507a49b",
+                "reference": "bbb4f10f71a1da2715ec6d9a683f4f23c507a49b",
                 "shasum": ""
             },
             "require": {
@@ -230,7 +230,7 @@
                 "archive",
                 "tar"
             ],
-            "time": "2019-12-04T10:17:28+00:00"
+            "time": "2020-09-15T14:13:23+00:00"
         },
         {
             "name": "pear/console_getopt",
diff --git a/lib/composer/installed.json b/lib/composer/installed.json
index d201d4b99..508b402a5 100644
--- a/lib/composer/installed.json
+++ b/lib/composer/installed.json
@@ -167,17 +167,17 @@
     },
     {
         "name": "pear/archive_tar",
-        "version": "1.4.9",
-        "version_normalized": "1.4.9.0",
+        "version": "1.4.10",
+        "version_normalized": "1.4.10.0",
         "source": {
             "type": "git",
             "url": "https://github.com/pear/Archive_Tar.git",
-            "reference": "c5b00053770e1d72128252c62c2c1a12c26639f0"
+            "reference": "bbb4f10f71a1da2715ec6d9a683f4f23c507a49b"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/pear/Archive_Tar/zipball/c5b00053770e1d72128252c62c2c1a12c26639f0",
-            "reference": "c5b00053770e1d72128252c62c2c1a12c26639f0",
+            "url": "https://api.github.com/repos/pear/Archive_Tar/zipball/bbb4f10f71a1da2715ec6d9a683f4f23c507a49b",
+            "reference": "bbb4f10f71a1da2715ec6d9a683f4f23c507a49b",
             "shasum": ""
         },
         "require": {
@@ -192,7 +192,7 @@
             "ext-xz": "Lzma2 compression support.",
             "ext-zlib": "Gzip compression support."
         },
-        "time": "2019-12-04T10:17:28+00:00",
+        "time": "2020-09-15T14:13:23+00:00",
         "type": "library",
         "extra": {
             "branch-alias": {
diff --git a/lib/pear/archive_tar/.gitignore b/lib/pear/archive_tar/.gitignore
index c32ccd7cc..c703991e8 100644
--- a/lib/pear/archive_tar/.gitignore
+++ b/lib/pear/archive_tar/.gitignore
@@ -8,3 +8,8 @@ vendor
 .buildpath
 .project
 .settings
+# pear
+.tarballs
+*.tgz
+# phpunit
+build
diff --git a/lib/pear/archive_tar/.travis.yml b/lib/pear/archive_tar/.travis.yml
index b841f4efc..f103381b1 100644
--- a/lib/pear/archive_tar/.travis.yml
+++ b/lib/pear/archive_tar/.travis.yml
@@ -1,6 +1,9 @@
 sudo: false
 language: php
 matrix:
+  fast_finish: true
+  allow_failures:
+    - php: nightly
   include:
   - php: 5.2
     dist: precise
@@ -11,23 +14,12 @@ matrix:
   - php: 5.5
     dist: trusty
   - php: 5.6
-    dist: trusty
   - php: 7.0
-    dist: trusty
   - php: 7.1
-    dist: trusty
   - php: 7.2
-    dist: trusty
   - php: 7.3
-    dist: trusty
-  - php: 7.4snapshot
-  - php: master
-
-jobs:
-  allow_failures:
-    - php: 7.4snapshot
-    - php: master
-
+  - php: 7.4
+  - php: nightly
 install:
 #  - pear upgrade --force --alldeps pear/pear
   - pear install -f package.xml
diff --git a/lib/pear/archive_tar/Archive/Tar.php b/lib/pear/archive_tar/Archive/Tar.php
index 2f328c227..5a52ce818 100644
--- a/lib/pear/archive_tar/Archive/Tar.php
+++ b/lib/pear/archive_tar/Archive/Tar.php
@@ -731,7 +731,7 @@ class Archive_Tar extends PEAR
      */
     public function setIgnoreList($list)
     {
-        $regexp = str_replace(array('#', '.', '^', '$'), array('\#', '\.', '\^', '\$'), $list);
+        $list = str_replace(array('#', '.', '^', '$'), array('\#', '\.', '\^', '\$'), $list);
         $regexp = '#/' . join('$|/', $list) . '#';
         $this->setIgnoreRegexp($regexp);
     }
@@ -1273,7 +1273,7 @@ class Archive_Tar extends PEAR
             while (($v_buffer = fread($v_file, $this->buffer_length)) != '') {
                 $buffer_length = strlen("$v_buffer");
                 if ($buffer_length != $this->buffer_length) {
-                    $pack_size = ((int)($buffer_length / 512) + 1) * 512;
+                    $pack_size = ((int)($buffer_length / 512) + ($buffer_length % 512 !== 0 ? 1 : 0)) * 512;
                     $pack_format = sprintf('a%d', $pack_size);
                 } else {
                     $pack_format = sprintf('a%d', $this->buffer_length);
@@ -1515,8 +1515,13 @@ class Archive_Tar extends PEAR
             $userinfo = posix_getpwuid($p_uid);
             $groupinfo = posix_getgrgid($p_gid);
 
-            $v_uname = $userinfo['name'];
-            $v_gname = $groupinfo['name'];
+            if ($userinfo === false || $groupinfo === false) {
+                $v_uname = '';
+                $v_gname = '';
+            } else {
+                $v_uname = $userinfo['name'];
+                $v_gname = $groupinfo['name'];
+            }
         } else {
             $v_uname = '';
             $v_gname = '';
diff --git a/lib/pear/archive_tar/package.xml b/lib/pear/archive_tar/package.xml
index 683493951..f1f8040b2 100644
--- a/lib/pear/archive_tar/package.xml
+++ b/lib/pear/archive_tar/package.xml
@@ -32,10 +32,10 @@ Also Lzma2 compressed archives are supported with xz extension.</description>
   <email>stig@php.net</email>
   <active>no</active>
  </helper>
- <date>2019-12-04</date>
- <time>09:25:16</time>
+ <date>2020-09-15</date>
+ <time>14:03:45</time>
  <version>
-  <release>1.4.9</release>
+  <release>1.4.10</release>
   <api>1.4.0</api>
  </version>
  <stability>
@@ -44,7 +44,8 @@ Also Lzma2 compressed archives are supported with xz extension.</description>
  </stability>
  <license uri="http://www.opensource.org/licenses/bsd-license.php">New BSD License</license>
  <notes>
-* Implement Feature #23861: Add option to disallow symlinks [mrook]
+* Fix block padding when the file buffer length is a multiple of 512 and smaller than Archive_Tar buffer length
+* Don't try to copy username/groupname in chroot jail
  </notes>
  <contents>
   <dir name="/">
@@ -74,6 +75,21 @@ Also Lzma2 compressed archives are supported with xz extension.</description>
  </dependencies>
  <phprelease />
  <changelog>
+  <release>
+   <version>
+    <release>1.4.9</release>
+    <api>1.4.0</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <date>2019-12-04</date>
+   <license uri="http://www.opensource.org/licenses/bsd-license.php">New BSD License</license>
+   <notes>
+* Implement Feature #23861: Add option to disallow symlinks [mrook]
+   </notes>
+  </release>
   <release>
    <version>
     <release>1.4.8</release>

From 54eb86a16b4cfcaf485f74059a6936f096a86928 Mon Sep 17 00:00:00 2001
From: odain <olivier.dain@combodo.com>
Date: Wed, 9 Sep 2020 11:09:52 +0200
Subject: [PATCH 19/43] =?UTF-8?q?N=C2=B03117=20Refactor=20of=20datamodel?=
 =?UTF-8?q?=20and=20dictionnaries=20for=20the=20sake=20of=20modularity=20?=
 =?UTF-8?q?=09-=20New=20module=20itop-bridge-cmdb-ticket=20to=20cope=20wit?=
 =?UTF-8?q?h=20the=20need=20to=20install=20only=20the=20CMDB=20or/and=20ti?=
 =?UTF-8?q?cketing=20=09-=20New=20module=20itop-structure=20to=20hold=20de?=
 =?UTF-8?q?clarations=20required=20by=20iTop=20independently=20from=20ITIL?=
 =?UTF-8?q?.=20Note=20that=20these=20declarations=20should=20ideally=20be?=
 =?UTF-8?q?=20moved=20to=20application/datamodel.application.xml=20or=20co?=
 =?UTF-8?q?re/datamodel.core.xml.=20Anyhow,=20the=20compiler=20suffers=20a?=
 =?UTF-8?q?=20few=20limitations=20and=20it=20has=20been=20decided=20to=20c?=
 =?UTF-8?q?reate=20this=20module=20as=20a=20workaround.=20=09-=20Split=20o?=
 =?UTF-8?q?f=20known-error=20module=20into=20itop-faq-light=20and=20itop-k?=
 =?UTF-8?q?nownerror-light?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 datamodels/2.x/installation.xml               |   7 +-
 .../cs.dict.itop-bridge-cmdb-ticket.php       |  65 +++-
 .../da.dict.itop-bridge-cmdb-ticket.php       |  60 +++-
 .../datamodel.itop-bridge-cmdb-ticket.xml     |  91 +----
 .../de.dict.itop-bridge-cmdb-ticket.php       |  63 +++-
 .../en.dict.itop-bridge-cmdb-ticket.php       |  64 +++-
 .../es_cr.dict.itop-bridge-cmdb-ticket.php    |  64 +++-
 .../fr.dict.itop-bridge-cmdb-ticket.php       |  64 +++-
 .../hu.dict.itop-bridge-cmdb-ticket.php       |  64 +++-
 .../it.dict.itop-bridge-cmdb-ticket.php       |  64 +++-
 .../ja.dict.itop-bridge-cmdb-ticket.php       |  64 +++-
 .../module.itop-bridge-cmdb-ticket.php        |   2 +-
 .../nl.dict.itop-bridge-cmdb-ticket.php       |  64 +++-
 .../pt_br.dict.itop-bridge-cmdb-ticket.php    |  64 +++-
 .../ru.dict.itop-bridge-cmdb-ticket.php       |  65 +++-
 .../sk.dict.itop-bridge-cmdb-ticket.php       |  66 +++-
 .../tr.dict.itop-bridge-cmdb-ticket.php       |  64 +++-
 .../zh_cn.dict.itop-bridge-cmdb-ticket.php    |  65 +++-
 .../datamodel.itop-config-mgmt.xml            |  89 +++++
 .../dictionaries/cs.dict.itop-config-mgmt.php |  23 +-
 .../dictionaries/da.dict.itop-config-mgmt.php |  22 +-
 .../dictionaries/de.dict.itop-config-mgmt.php |  23 +-
 .../dictionaries/en.dict.itop-config-mgmt.php |  23 +-
 .../es_cr.dict.itop-config-mgmt.php           |  23 +-
 .../dictionaries/fr.dict.itop-config-mgmt.php |  23 +-
 .../dictionaries/hu.dict.itop-config-mgmt.php |  41 +--
 .../dictionaries/it.dict.itop-config-mgmt.php |  23 +-
 .../dictionaries/ja.dict.itop-config-mgmt.php |  23 +-
 .../dictionaries/nl.dict.itop-config-mgmt.php |  23 +-
 .../pt_br.dict.itop-config-mgmt.php           |  23 +-
 .../dictionaries/ru.dict.itop-config-mgmt.php |  23 +-
 .../dictionaries/sk.dict.itop-config-mgmt.php |  23 +-
 .../dictionaries/tr.dict.itop-config-mgmt.php |  23 +-
 .../zh_cn.dict.itop-config-mgmt.php           |  23 +-
 .../dictionaries/fr.dict.itop-core-update.php |  13 +-
 .../data.sample.faq-domains.xml               |   0
 .../datamodel.itop-faq-light.xml              | 338 ++++++++++++++++++
 .../dictionaries/cs.dict.itop-faq-light.php   |  95 +++++
 .../dictionaries/da.dict.itop-faq-light.php   |  70 ++++
 .../dictionaries/de.dict.itop-faq-light.php   |  72 ++++
 .../dictionaries/en.dict.itop-faq-light.php   |  96 +++++
 .../es_cr.dict.itop-faq-light.php             |  94 +++++
 .../dictionaries/fr.dict.itop-faq-light.php   |  71 ++++
 .../dictionaries/hu.dict.itop-faq-light.php   |  71 ++++
 .../dictionaries/it.dict.itop-faq-light.php   |  94 +++++
 .../dictionaries/ja.dict.itop-faq-light.php   |  71 ++++
 .../dictionaries/nl.dict.itop-faq-light.php   | 100 ++++++
 .../pt_br.dict.itop-faq-light.php             |  95 +++++
 .../dictionaries/ru.dict.itop-faq-light.php   |  60 ++++
 .../dictionaries/sk.dict.itop-faq-light.php   |  94 +++++
 .../dictionaries/tr.dict.itop-faq-light.php   |  96 +++++
 .../zh_cn.dict.itop-faq-light.php             |  94 +++++
 .../images/faq.png                            | Bin
 .../module.itop-faq-light.php}                |   9 +-
 .../datamodel.itop-knownerror-light.xml}      | 323 -----------------
 .../cs.dict.itop-knownerror-light.php}        |  44 ---
 .../da.dict.itop-knownerror-light.php}        |  44 ---
 .../de.dict.itop-knownerror-light.php}        |  44 ---
 .../en.dict.itop-knownerror-light.php}        |  44 ---
 .../es_cr.dict.itop-knownerror-light.php}     |  44 ---
 .../fr.dict.itop-knownerror-light.php}        |  44 ---
 .../hu.dict.itop-knownerror-light.php}        |  44 ---
 .../it.dict.itop-knownerror-light.php}        |  44 ---
 .../ja.dict.itop-knownerror-light.php}        |  44 ---
 .../nl.dict.itop-knownerror-light.php}        |  44 ---
 .../pt_br.dict.itop-knownerror-light.php}     |  44 ---
 .../ru.dict.itop-knownerror-light.php}        |  44 ---
 .../sk.dict.itop-knownerror-light.php}        |  44 ---
 .../tr.dict.itop-knownerror-light.php}        |  44 ---
 .../zh_cn.dict.itop-knownerror-light.php}     |  44 ---
 .../images/known-error.png                    | Bin
 .../module.itop-knownerror-light.php          |  43 +++
 .../2.x/itop-portal/fr.dict.itop-portal.php   |   2 +-
 .../cs.dict.itop-service-mgmt.php             |  35 --
 .../da.dict.itop-service-mgmt.php             |  35 --
 .../de.dict.itop-service-mgmt.php             |  35 --
 .../en.dict.itop-service-mgmt.php             |  35 --
 .../es_cr.dict.itop-service-mgmt.php          |  35 --
 .../fr.dict.itop-service-mgmt.php             |  35 --
 .../hu.dict.itop-service-mgmt.php             |  35 --
 .../it.dict.itop-service-mgmt.php             |  35 --
 .../ja.dict.itop-service-mgmt.php             |  35 --
 .../nl.dict.itop-service-mgmt.php             |  35 --
 .../pt_br.dict.itop-service-mgmt.php          |  35 --
 .../ru.dict.itop-service-mgmt.php             |  35 --
 .../sk.dict.itop-service-mgmt.php             |  35 --
 .../tr.dict.itop-service-mgmt.php             |  35 --
 .../zh_cn.dict.itop-service-mgmt.php          |  35 --
 .../itop-structure/cs.dict.itop-structure.php |   4 -
 .../itop-structure/da.dict.itop-structure.php |   4 -
 .../data.sample.locations.xml                 |   0
 .../datamodel.itop-structure.xml              |   5 +-
 .../itop-structure/de.dict.itop-structure.php |   4 -
 .../itop-structure/en.dict.itop-structure.php |  19 -
 .../es_cr.dict.itop-structure.php             |   4 -
 .../itop-structure/fr.dict.itop-structure.php |  16 +-
 .../itop-structure/hu.dict.itop-structure.php |  23 +-
 .../itop-structure/it.dict.itop-structure.php |   5 -
 .../itop-structure/ja.dict.itop-structure.php |   4 -
 .../itop-structure/module.itop-structure.php  |   5 +-
 .../itop-structure/nl.dict.itop-structure.php |   4 -
 .../pt_br.dict.itop-structure.php             |   4 -
 .../itop-structure/ru.dict.itop-structure.php |   4 -
 .../itop-structure/sk.dict.itop-structure.php |   4 -
 .../itop-structure/tr.dict.itop-structure.php |   4 -
 .../zh_cn.dict.itop-structure.php             |   4 -
 .../dictionaries/cs.dict.itop-tickets.php     |  12 +
 .../dictionaries/da.dict.itop-tickets.php     |   8 +-
 .../dictionaries/de.dict.itop-tickets.php     |  13 +-
 .../dictionaries/en.dict.itop-tickets.php     |  13 +-
 .../dictionaries/es_cr.dict.itop-tickets.php  |  11 +
 .../dictionaries/fr.dict.itop-tickets.php     |  12 +-
 .../dictionaries/hu.dict.itop-tickets.php     |  11 +
 .../dictionaries/it.dict.itop-tickets.php     |  11 +
 .../dictionaries/ja.dict.itop-tickets.php     |  11 +
 .../dictionaries/nl.dict.itop-tickets.php     |  11 +
 .../dictionaries/pt_br.dict.itop-tickets.php  |  37 +-
 .../dictionaries/ru.dict.itop-tickets.php     |  11 +
 .../dictionaries/sk.dict.itop-tickets.php     |  11 +
 .../dictionaries/tr.dict.itop-tickets.php     |  11 +
 .../dictionaries/zh_cn.dict.itop-tickets.php  |  11 +
 .../iTopModulesPhpVersionChecklistTest.php    |   2 +-
 test/setup_params/default-params.xml          | 145 ++++----
 123 files changed, 2974 insertions(+), 2181 deletions(-)
 rename datamodels/2.x/{itop-knownerror-mgmt => itop-faq-light}/data.sample.faq-domains.xml (100%)
 create mode 100755 datamodels/2.x/itop-faq-light/datamodel.itop-faq-light.xml
 create mode 100644 datamodels/2.x/itop-faq-light/dictionaries/cs.dict.itop-faq-light.php
 create mode 100644 datamodels/2.x/itop-faq-light/dictionaries/da.dict.itop-faq-light.php
 create mode 100644 datamodels/2.x/itop-faq-light/dictionaries/de.dict.itop-faq-light.php
 create mode 100644 datamodels/2.x/itop-faq-light/dictionaries/en.dict.itop-faq-light.php
 create mode 100644 datamodels/2.x/itop-faq-light/dictionaries/es_cr.dict.itop-faq-light.php
 create mode 100644 datamodels/2.x/itop-faq-light/dictionaries/fr.dict.itop-faq-light.php
 create mode 100644 datamodels/2.x/itop-faq-light/dictionaries/hu.dict.itop-faq-light.php
 create mode 100644 datamodels/2.x/itop-faq-light/dictionaries/it.dict.itop-faq-light.php
 create mode 100644 datamodels/2.x/itop-faq-light/dictionaries/ja.dict.itop-faq-light.php
 create mode 100644 datamodels/2.x/itop-faq-light/dictionaries/nl.dict.itop-faq-light.php
 create mode 100644 datamodels/2.x/itop-faq-light/dictionaries/pt_br.dict.itop-faq-light.php
 create mode 100644 datamodels/2.x/itop-faq-light/dictionaries/ru.dict.itop-faq-light.php
 create mode 100644 datamodels/2.x/itop-faq-light/dictionaries/sk.dict.itop-faq-light.php
 create mode 100644 datamodels/2.x/itop-faq-light/dictionaries/tr.dict.itop-faq-light.php
 create mode 100644 datamodels/2.x/itop-faq-light/dictionaries/zh_cn.dict.itop-faq-light.php
 rename datamodels/2.x/{itop-knownerror-mgmt => itop-faq-light}/images/faq.png (100%)
 rename datamodels/2.x/{itop-knownerror-mgmt/module.itop-knownerror-mgmt.php => itop-faq-light/module.itop-faq-light.php} (93%)
 rename datamodels/2.x/{itop-knownerror-mgmt/datamodel.itop-knownerror-mgmt.xml => itop-knownerror-light/datamodel.itop-knownerror-light.xml} (58%)
 rename datamodels/2.x/{itop-knownerror-mgmt/dictionaries/cs.dict.itop-knownerror-mgmt.php => itop-knownerror-light/dictionaries/cs.dict.itop-knownerror-light.php} (80%)
 rename datamodels/2.x/{itop-knownerror-mgmt/dictionaries/da.dict.itop-knownerror-mgmt.php => itop-knownerror-light/dictionaries/da.dict.itop-knownerror-light.php} (77%)
 rename datamodels/2.x/{itop-knownerror-mgmt/dictionaries/de.dict.itop-knownerror-mgmt.php => itop-knownerror-light/dictionaries/de.dict.itop-knownerror-light.php} (77%)
 rename datamodels/2.x/{itop-knownerror-mgmt/dictionaries/en.dict.itop-knownerror-mgmt.php => itop-knownerror-light/dictionaries/en.dict.itop-knownerror-light.php} (79%)
 rename datamodels/2.x/{itop-knownerror-mgmt/dictionaries/es_cr.dict.itop-knownerror-mgmt.php => itop-knownerror-light/dictionaries/es_cr.dict.itop-knownerror-light.php} (78%)
 rename datamodels/2.x/{itop-knownerror-mgmt/dictionaries/fr.dict.itop-knownerror-mgmt.php => itop-knownerror-light/dictionaries/fr.dict.itop-knownerror-light.php} (76%)
 rename datamodels/2.x/{itop-knownerror-mgmt/dictionaries/hu.dict.itop-knownerror-mgmt.php => itop-knownerror-light/dictionaries/hu.dict.itop-knownerror-light.php} (75%)
 rename datamodels/2.x/{itop-knownerror-mgmt/dictionaries/it.dict.itop-knownerror-mgmt.php => itop-knownerror-light/dictionaries/it.dict.itop-knownerror-light.php} (80%)
 rename datamodels/2.x/{itop-knownerror-mgmt/dictionaries/ja.dict.itop-knownerror-mgmt.php => itop-knownerror-light/dictionaries/ja.dict.itop-knownerror-light.php} (77%)
 rename datamodels/2.x/{itop-knownerror-mgmt/dictionaries/nl.dict.itop-knownerror-mgmt.php => itop-knownerror-light/dictionaries/nl.dict.itop-knownerror-light.php} (80%)
 rename datamodels/2.x/{itop-knownerror-mgmt/dictionaries/pt_br.dict.itop-knownerror-mgmt.php => itop-knownerror-light/dictionaries/pt_br.dict.itop-knownerror-light.php} (79%)
 rename datamodels/2.x/{itop-knownerror-mgmt/dictionaries/ru.dict.itop-knownerror-mgmt.php => itop-knownerror-light/dictionaries/ru.dict.itop-knownerror-light.php} (75%)
 rename datamodels/2.x/{itop-knownerror-mgmt/dictionaries/sk.dict.itop-knownerror-mgmt.php => itop-knownerror-light/dictionaries/sk.dict.itop-knownerror-light.php} (79%)
 rename datamodels/2.x/{itop-knownerror-mgmt/dictionaries/tr.dict.itop-knownerror-mgmt.php => itop-knownerror-light/dictionaries/tr.dict.itop-knownerror-light.php} (79%)
 rename datamodels/2.x/{itop-knownerror-mgmt/dictionaries/zh_cn.dict.itop-knownerror-mgmt.php => itop-knownerror-light/dictionaries/zh_cn.dict.itop-knownerror-light.php} (80%)
 rename datamodels/2.x/{itop-knownerror-mgmt => itop-knownerror-light}/images/known-error.png (100%)
 create mode 100755 datamodels/2.x/itop-knownerror-light/module.itop-knownerror-light.php
 rename datamodels/2.x/{itop-config-mgmt => itop-structure}/data.sample.locations.xml (100%)
 mode change 100755 => 100644

diff --git a/datamodels/2.x/installation.xml b/datamodels/2.x/installation.xml
index 9609bcdc2..5f48a3cb2 100755
--- a/datamodels/2.x/installation.xml
+++ b/datamodels/2.x/installation.xml
@@ -192,14 +192,15 @@
 		<step>
 			<title>Additional ITIL tickets</title>
 			<description><![CDATA[<h2>Pick from the list below the additional ITIL processes that are to be implemented in iTop.</h2>]]></description>
-			<banner>./itop-knownerror-mgmt/images/known-error.png</banner>
+			<banner>./itop-knownerror-light/images/known-error.png</banner>
 			<options type="array">
 				<choice>
 					<extension_code>itop-kown-error-mgmt</extension_code>
-					<title>Known Errors Management</title>
+					<title>Known Errors Management and FAQ</title>
 					<description>Select this option to track "Known Errors" and FAQs in iTop.</description>
 					<modules type="array">
-						<module>itop-knownerror-mgmt</module>
+						<module>itop-faq-light</module>
+						<module>itop-knownerror-light</module>
 					</modules>
 				</choice>
 				<choice>
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/cs.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/cs.dict.itop-bridge-cmdb-ticket.php
index 44559732a..461d8757a 100644
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/cs.dict.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/cs.dict.itop-bridge-cmdb-ticket.php
@@ -29,23 +29,6 @@
 //////////////////////////////////////////////////////////////////////
 //
 
-//
-// Class: lnkContactToFunctionalCI
-//
-
-Dict::Add('CS CZ', 'Czech', 'Čeština', array(
-	'Class:lnkContactToFunctionalCI' => 'Spojení (Kontakt / Funkční konfigurační položka)',
-	'Class:lnkContactToFunctionalCI+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Funkční konfigurační položka',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Název funkční konfigurační položky',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Kontakt',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Název kontaktu',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
-));
-
 //
 // Class: lnkFunctionalCIToTicket
 //
@@ -70,3 +53,51 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Automaticky',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Není zasažen',
 ));
+
+//
+// Class: lnkFunctionalCIToProviderContract
+//
+
+Dict::Add('CS CZ', 'Czech', 'Čeština', array(
+	'Class:lnkFunctionalCIToProviderContract' => 'Spojení (Funkční konfigurační položka / Smlouva s poskytovatelem)',
+	'Class:lnkFunctionalCIToProviderContract+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Smlouva s poskytovatelem',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Název smlouvy s poskytovatelem',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'Konfigurační položka',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'Název konfigurační položky',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
+));
+
+
+//
+// Class: lnkFunctionalCIToService
+//
+
+Dict::Add('CS CZ', 'Czech', 'Čeština', array(
+	'Class:lnkFunctionalCIToService' => 'Spojení (Funkční konfigurační položka / Služba)',
+	'Class:lnkFunctionalCIToService+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Služba',
+	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Název služby',
+	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'Konfigurační položka',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'Název konfigurační položky',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: FunctionalCI
+//
+
+Dict::Add('CS CZ', 'Czech', 'Čeština', array(
+	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Smlouvy s poskytovateli',
+	'Class:FunctionalCI/Attribute:providercontracts_list+' => '',
+	'Class:FunctionalCI/Attribute:services_list' => 'Služby',
+	'Class:FunctionalCI/Attribute:services_list+' => '',
+	'Class:FunctionalCI/Attribute:tickets_list' => 'Tikety',
+	'Class:FunctionalCI/Attribute:tickets_list+' => '',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/da.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/da.dict.itop-bridge-cmdb-ticket.php
index 504a12cc4..a0283195f 100644
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/da.dict.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/da.dict.itop-bridge-cmdb-ticket.php
@@ -29,23 +29,6 @@
 //////////////////////////////////////////////////////////////////////
 //
 
-//
-// Class: lnkContactToFunctionalCI
-//
-
-Dict::Add('DA DA', 'Danish', 'Dansk', array(
-	'Class:lnkContactToFunctionalCI' => 'Sammenhæng Kontakt/FunctionalCI',
-	'Class:lnkContactToFunctionalCI+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'FunctionalCI',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'FunctionalCI navn',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Kontakt',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Kontakt navn',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
-));
-
 //
 // Class: lnkFunctionalCIToTicket
 //
@@ -70,3 +53,46 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Computed~~',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Not impacted~~',
 ));
+
+//
+// Class: lnkFunctionalCIToProviderContract
+//
+
+Dict::Add('DA DA', 'Danish', 'Dansk', array(
+	'Class:lnkFunctionalCIToProviderContract' => 'Sammenhæng FunctionalCI/Leverandør Kontrakt',
+	'Class:lnkFunctionalCIToProviderContract+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Leverandør kontrakt',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Leverandør kontrakt navn',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'CI navn',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: lnkFunctionalCIToService
+//
+
+Dict::Add('DA DA', 'Danish', 'Dansk', array(
+	'Class:lnkFunctionalCIToService' => 'Sammenhæng FunctionalCI/Ydelse',
+	'Class:lnkFunctionalCIToService+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Ydelse',
+	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Ydelses navn',
+	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'CI',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'CI navn',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '',
+));
+
+Dict::Add('DA DA', 'Danish', 'Dansk', array(
+	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Leverandør kontrakter',
+	'Class:FunctionalCI/Attribute:providercontracts_list+' => '',
+	'Class:FunctionalCI/Attribute:services_list' => 'Ydelser',
+	'Class:FunctionalCI/Attribute:services_list+' => '',
+	'Class:FunctionalCI/Attribute:tickets_list' => 'Tickets',
+	'Class:FunctionalCI/Attribute:tickets_list+' => '',
+));
\ No newline at end of file
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 0933160cc..954603d76 100644
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/datamodel.itop-bridge-cmdb-ticket.xml
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/datamodel.itop-bridge-cmdb-ticket.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.6">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.7">
 	<constants>
 	</constants>
 	<classes>
@@ -275,87 +275,6 @@
 				</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>
-				<display_template/>
-				<icon/>
-				<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="FunctionalCI" _delta="must_exist">
 			<fields>
 				<field id="providercontracts_list" xsi:type="AttributeLinkedSetIndirect" _delta="define">
@@ -366,14 +285,6 @@
 					<ext_key_to_remote>providercontract_id</ext_key_to_remote>
 					<duplicates/>
 				</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="services_list" xsi:type="AttributeLinkedSetIndirect" _delta="define">
 					<linked_class>lnkFunctionalCIToService</linked_class>
 					<ext_key_to_me>functionalci_id</ext_key_to_me>
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/de.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/de.dict.itop-bridge-cmdb-ticket.php
index c50943797..caff17b42 100644
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/de.dict.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/de.dict.itop-bridge-cmdb-ticket.php
@@ -29,23 +29,6 @@
 //////////////////////////////////////////////////////////////////////
 //
 
-//
-// Class: lnkContactToFunctionalCI
-//
-
-Dict::Add('DE DE', 'German', 'Deutsch', array(
-	'Class:lnkContactToFunctionalCI' => 'Verknüpfung Kontakt/FunctionalCI',
-	'Class:lnkContactToFunctionalCI+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'FunctionalCI',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'FunctionalCI-Name',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Kontakt',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Kontakt-Name',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
-));
-
 //
 // Class: lnkFunctionalCIToTicket
 //
@@ -69,4 +52,50 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Manuell hinzugefügt',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Berechnet',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Nicht betroffen',
+));
+
+//
+// Class: lnkFunctionalCIToProviderContract
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:lnkFunctionalCIToProviderContract' => 'Verknüpfung FunctionalCI/Provider-Vertrag',
+	'Class:lnkFunctionalCIToProviderContract+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Provider-Vertrag',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Providervertrags-Name',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'CI-Name',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: lnkFunctionalCIToService
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:lnkFunctionalCIToService' => 'Verknüpfung FunctionalCI/Service',
+	'Class:lnkFunctionalCIToService+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Service',
+	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Service-Name',
+	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'CI',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'CI-Name',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: Functional
+//
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Provider-Verträge',
+	'Class:FunctionalCI/Attribute:providercontracts_list+' => '',
+	'Class:FunctionalCI/Attribute:services_list' => 'Services',
+	'Class:FunctionalCI/Attribute:services_list+' => '',
+	'Class:FunctionalCI/Attribute:tickets_list' => 'Tickets',
+	'Class:FunctionalCI/Attribute:tickets_list+' => '',
 ));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/en.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/en.dict.itop-bridge-cmdb-ticket.php
index cad9a3573..a434fd6cd 100644
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/en.dict.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/en.dict.itop-bridge-cmdb-ticket.php
@@ -29,23 +29,6 @@
 //////////////////////////////////////////////////////////////////////
 //
 
-//
-// Class: lnkContactToFunctionalCI
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:lnkContactToFunctionalCI' => 'Link Contact / FunctionalCI',
-	'Class:lnkContactToFunctionalCI+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Functionalci',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contact',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Contact name',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
-));
-
 //
 // Class: lnkFunctionalCIToTicket
 //
@@ -69,4 +52,51 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Added manually',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Computed',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Not impacted',
+));
+
+//
+// Class: lnkFunctionalCIToProviderContract
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:lnkFunctionalCIToProviderContract' => 'Link FunctionalCI / ProviderContract',
+	'Class:lnkFunctionalCIToProviderContract+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Provider contract',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Provider contract Name',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'CI Name',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: lnkFunctionalCIToService
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:lnkFunctionalCIToService' => 'Link FunctionalCI / Service',
+	'Class:lnkFunctionalCIToService+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Service',
+	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Service Name',
+	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'CI',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'CI Name',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: FunctionalCI
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Provider contracts',
+	'Class:FunctionalCI/Attribute:providercontracts_list+' => 'All the provider contracts for this configuration item',
+	'Class:FunctionalCI/Attribute:services_list' => 'Services',
+	'Class:FunctionalCI/Attribute:services_list+' => 'All the services impacted by this configuration item',
+	'Class:FunctionalCI/Attribute:tickets_list' => 'Tickets',
+	'Class:FunctionalCI/Attribute:tickets_list+' => 'All the tickets for this configuration item',
 ));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/es_cr.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/es_cr.dict.itop-bridge-cmdb-ticket.php
index 9bea448eb..945f71850 100644
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/es_cr.dict.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/es_cr.dict.itop-bridge-cmdb-ticket.php
@@ -29,23 +29,6 @@
 //////////////////////////////////////////////////////////////////////
 //
 
-//
-// Class: lnkContactToFunctionalCI
-//
-
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
-	'Class:lnkContactToFunctionalCI' => 'Relación Contacto y  EC Funcional',
-	'Class:lnkContactToFunctionalCI+' => 'Relación Contacto y  EC Funcional',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'EC Funcional',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => 'EC Funcional',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'EC Funcional',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => 'EC Funcional',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contacto',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => 'Contacto',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Contacto',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => 'Contacto',
-));
-
 //
 // Class: lnkFunctionalCIToTicket
 //
@@ -70,3 +53,50 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Calculado',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'No impactado',
 ));
+
+//
+// Class: lnkFunctionalCIToProviderContract
+//
+
+Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+	'Class:lnkFunctionalCIToProviderContract' => 'Relación EC Funcional y Contrato con Proveedor',
+	'Class:lnkFunctionalCIToProviderContract+' => 'Relación EC Funcional y Contrato con Proveedor',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Contrato con Proveedor',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => 'Contrato con Proveedor',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Contrato con Proveedor',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => 'Contrato con Proveedor',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'EC',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => 'Elemento de Configuración',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'Elemento de Configuración',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => 'Elemento de Configuración',
+));
+
+//
+// Class: lnkFunctionalCIToService
+//
+
+Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+	'Class:lnkFunctionalCIToService' => 'Relación EC Funcional y Servicio',
+	'Class:lnkFunctionalCIToService+' => 'Relación EC Funcional y Servicio',
+	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Servicio',
+	'Class:lnkFunctionalCIToService/Attribute:service_id+' => 'Servicio',
+	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Servicio',
+	'Class:lnkFunctionalCIToService/Attribute:service_name+' => 'Servicio',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'EC',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => 'Elemento de Configuración',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'EC',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => 'Elemento de Configuración',
+));
+
+//
+// Class: FunctionalCI
+//
+
+Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Contratos',
+	'Class:FunctionalCI/Attribute:providercontracts_list+' => 'Contratos',
+	'Class:FunctionalCI/Attribute:services_list' => 'Servicios',
+	'Class:FunctionalCI/Attribute:services_list+' => 'Servicios',
+	'Class:FunctionalCI/Attribute:tickets_list' => 'Tickets',
+	'Class:FunctionalCI/Attribute:tickets_list+' => 'Tickets relacionados con este EC',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/fr.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/fr.dict.itop-bridge-cmdb-ticket.php
index 4d4134214..e526b2208 100644
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/fr.dict.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/fr.dict.itop-bridge-cmdb-ticket.php
@@ -29,23 +29,6 @@
 //////////////////////////////////////////////////////////////////////
 //
 
-//
-// Class: lnkContactToFunctionalCI
-//
-
-Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:lnkContactToFunctionalCI' => 'Lien Contact / CI Fonctionel',
-	'Class:lnkContactToFunctionalCI+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'CI',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Nom CI',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contact',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Nom contact',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
-));
-
 //
 // Class: lnkFunctionalCIToTicket
 //
@@ -69,4 +52,51 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Ajouté manuellement',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Calculé',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Non impacté',
+));
+
+//
+// Class: lnkFunctionalCIToProviderContract
+//
+
+Dict::Add('FR FR', 'French', 'Français', array(
+	'Class:lnkFunctionalCIToProviderContract' => 'Lien CI / Contrat fournisseur',
+	'Class:lnkFunctionalCIToProviderContract+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Contrat fournisseur',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Nom contrat fournisseur',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'Nom CI',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: lnkFunctionalCIToService
+//
+
+Dict::Add('FR FR', 'French', 'Français', array(
+	'Class:lnkFunctionalCIToService' => 'Lien CI / Service',
+	'Class:lnkFunctionalCIToService+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Service',
+	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Nom service',
+	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'CI',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'Nom CI',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: FunctionalCI
+//
+
+Dict::Add('FR FR', 'French', 'Français', array(
+	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Contrats fournisseur',
+	'Class:FunctionalCI/Attribute:providercontracts_list+' => '',
+	'Class:FunctionalCI/Attribute:services_list' => 'Services',
+	'Class:FunctionalCI/Attribute:services_list+' => '',
+	'Class:FunctionalCI/Attribute:tickets_list' => 'Tickets',
+	'Class:FunctionalCI/Attribute:tickets_list+' => '',
 ));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/hu.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/hu.dict.itop-bridge-cmdb-ticket.php
index db9810ef9..7f2a08829 100644
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/hu.dict.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/hu.dict.itop-bridge-cmdb-ticket.php
@@ -29,23 +29,6 @@
 //////////////////////////////////////////////////////////////////////
 //
 
-//
-// Class: lnkContactToFunctionalCI
-//
-
-Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'Class:lnkContactToFunctionalCI' => 'Link Contact / FunctionalCI~~',
-	'Class:lnkContactToFunctionalCI+' => '~~',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Functionalci~~',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '~~',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name~~',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '~~',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contact~~',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '~~',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Contact name~~',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '~~',
-));
-
 //
 // Class: lnkFunctionalCIToTicket
 //
@@ -69,4 +52,51 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Added manually~~',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Computed~~',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Not impacted~~',
+));
+
+//
+// Class: lnkFunctionalCIToProviderContract
+//
+
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+	'Class:lnkFunctionalCIToProviderContract' => 'Link FunctionalCI / ProviderContract~~',
+	'Class:lnkFunctionalCIToProviderContract+' => '~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Provider contract~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Provider contract Name~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'CI Name~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '~~',
+));
+
+//
+// Class: lnkFunctionalCIToService
+//
+
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+	'Class:lnkFunctionalCIToService' => 'Link FunctionalCI / Service~~',
+	'Class:lnkFunctionalCIToService+' => '~~',
+	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Service~~',
+	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '~~',
+	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Service Name~~',
+	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '~~',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'CI~~',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '~~',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'CI Name~~',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '~~',
+));
+
+//
+// Class: FunctionalCI
+//
+
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Provider contracts~~',
+	'Class:FunctionalCI/Attribute:providercontracts_list+' => 'All the provider contracts for this configuration item~~',
+	'Class:FunctionalCI/Attribute:services_list' => 'Services~~',
+	'Class:FunctionalCI/Attribute:services_list+' => 'All the services impacted by this configuration item~~',
+	'Class:FunctionalCI/Attribute:tickets_list' => 'Tickets~~',
+	'Class:FunctionalCI/Attribute:tickets_list+' => 'All the tickets for this configuration item~~',
 ));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/it.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/it.dict.itop-bridge-cmdb-ticket.php
index 019133220..d0e1b9faf 100644
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/it.dict.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/it.dict.itop-bridge-cmdb-ticket.php
@@ -29,23 +29,6 @@
 //////////////////////////////////////////////////////////////////////
 //
 
-//
-// Class: lnkContactToFunctionalCI
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:lnkContactToFunctionalCI' => 'Link Contact / FunctionalCI~~',
-	'Class:lnkContactToFunctionalCI+' => '~~',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Functionalci~~',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '~~',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name~~',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '~~',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contact~~',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '~~',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Contact name~~',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '~~',
-));
-
 //
 // Class: lnkFunctionalCIToTicket
 //
@@ -69,4 +52,51 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Added manually~~',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Computed~~',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Not impacted~~',
+));
+
+//
+// Class: lnkFunctionalCIToProviderContract
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:lnkFunctionalCIToProviderContract' => 'Link FunctionalCI / ProviderContract~~',
+	'Class:lnkFunctionalCIToProviderContract+' => '~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Provider contract~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Provider contract Name~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'CI Name~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '~~',
+));
+
+//
+// Class: lnkFunctionalCIToService
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:lnkFunctionalCIToService' => 'Link FunctionalCI / Service~~',
+	'Class:lnkFunctionalCIToService+' => '~~',
+	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Service~~',
+	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '~~',
+	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Service Name~~',
+	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '~~',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'CI~~',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '~~',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'CI Name~~',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '~~',
+));
+
+//
+// Class: FunctionalCI
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Provider contracts~~',
+	'Class:FunctionalCI/Attribute:providercontracts_list+' => 'All the provider contracts for this configuration item~~',
+	'Class:FunctionalCI/Attribute:services_list' => 'Services~~',
+	'Class:FunctionalCI/Attribute:services_list+' => 'All the services impacted by this configuration item~~',
+	'Class:FunctionalCI/Attribute:tickets_list' => 'Tickets~~',
+	'Class:FunctionalCI/Attribute:tickets_list+' => 'All the tickets for this configuration item~~',
 ));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/ja.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/ja.dict.itop-bridge-cmdb-ticket.php
index e5151e667..ac8ea7bca 100644
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/ja.dict.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/ja.dict.itop-bridge-cmdb-ticket.php
@@ -29,23 +29,6 @@
 //////////////////////////////////////////////////////////////////////
 //
 
-//
-// Class: lnkContactToFunctionalCI
-//
-
-Dict::Add('JA JP', 'Japanese', '日本語', array(
-	'Class:lnkContactToFunctionalCI' => 'リンク 連絡先/機能的CI',
-	'Class:lnkContactToFunctionalCI+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => '機能的ci',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => '機能的ci名',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => '連絡先',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => '連絡先名',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
-));
-
 //
 // Class: lnkFunctionalCIToTicket
 //
@@ -70,3 +53,50 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Computed~~',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Not impacted~~',
 ));
+
+//
+// Class: lnkFunctionalCIToProviderContract
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:lnkFunctionalCIToProviderContract' => 'リンク 機能的CI/プロバイダー契約',
+	'Class:lnkFunctionalCIToProviderContract+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'プロバイダー契約',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'プロバイダー契約名',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'CI名',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: lnkFunctionalCIToService
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:lnkFunctionalCIToService' => 'リンク 機能的CI/サービス',
+	'Class:lnkFunctionalCIToService+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'サービス',
+	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'サービス名',
+	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'CI',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'CI名',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: FunctionalCI
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:FunctionalCI/Attribute:providercontracts_list' => 'プロバイダー契約',
+	'Class:FunctionalCI/Attribute:providercontracts_list+' => '',
+	'Class:FunctionalCI/Attribute:services_list' => 'サービス',
+	'Class:FunctionalCI/Attribute:services_list+' => '',
+	'Class:FunctionalCI/Attribute:tickets_list' => 'チケット',
+	'Class:FunctionalCI/Attribute:tickets_list+' => '',
+));
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/module.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/module.itop-bridge-cmdb-ticket.php
index 396df73f3..6cd6061d9 100644
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/module.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/module.itop-bridge-cmdb-ticket.php
@@ -5,7 +5,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-bridge-cmdb-ticket/1.0.0',
+	'itop-bridge-cmdb-ticket/2.8.0',
 	array(
 		// Identification
 		//
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/nl.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/nl.dict.itop-bridge-cmdb-ticket.php
index 643d1b054..fe3d343bd 100644
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/nl.dict.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/nl.dict.itop-bridge-cmdb-ticket.php
@@ -29,23 +29,6 @@
 //////////////////////////////////////////////////////////////////////
 //
 
-//
-// Class: lnkContactToFunctionalCI
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:lnkContactToFunctionalCI' => 'Link Contact / Functioneel CI',
-	'Class:lnkContactToFunctionalCI+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Functioneel CI',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Naam functioneel CI',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contact',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Naam contact',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
-));
-
 //
 // Class: lnkFunctionalCIToTicket
 //
@@ -69,4 +52,51 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Manueel toegevoegd',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Automatisch afgeleid',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Niet geïmpacteerd',
+));
+
+//
+// Class: lnkFunctionalCIToProviderContract
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:lnkFunctionalCIToProviderContract' => 'Link Functioneel CI / Leverancierscontract',
+	'Class:lnkFunctionalCIToProviderContract+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Leverancierscontract',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Naam leverancierscontract',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'Naam CI',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: lnkFunctionalCIToService
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:lnkFunctionalCIToService' => 'Link Functioneel CI / Service',
+	'Class:lnkFunctionalCIToService+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Service',
+	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Naam service',
+	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'CI',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'Naam CI',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: FunctionalCI
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Leverancierscontracten',
+	'Class:FunctionalCI/Attribute:providercontracts_list+' => 'Alle leverancierscontracten voor dit configuratie-item',
+	'Class:FunctionalCI/Attribute:services_list' => 'Services',
+	'Class:FunctionalCI/Attribute:services_list+' => 'Alle services die impact hebben op dit configuratie-item',
+	'Class:FunctionalCI/Attribute:tickets_list' => 'Tickets',
+	'Class:FunctionalCI/Attribute:tickets_list+' => 'Alle tickets voor dit configuratie-item',
 ));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/pt_br.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/pt_br.dict.itop-bridge-cmdb-ticket.php
index 0e0464944..0ce14ca90 100644
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/pt_br.dict.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/pt_br.dict.itop-bridge-cmdb-ticket.php
@@ -29,23 +29,6 @@
 //////////////////////////////////////////////////////////////////////
 //
 
-//
-// Class: lnkContactToFunctionalCI
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkContactToFunctionalCI' => 'Link Contato / CI',
-	'Class:lnkContactToFunctionalCI+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'CIs',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Nome CI',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contato',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Nome contato',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
-));
-
 //
 // Class: lnkFunctionalCIToTicket
 //
@@ -69,4 +52,51 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Adicionado manualmente',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Computado',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Não impactado',
+));
+
+//
+// Class: lnkFunctionalCIToProviderContract
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:lnkFunctionalCIToProviderContract' => 'Link CI / Contrato provedor(a)',
+	'Class:lnkFunctionalCIToProviderContract+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Contrato provedor(a)',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Nome contrato provedor(a)',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CIs',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'Nome CI',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: lnkFunctionalCIToService
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:lnkFunctionalCIToService' => 'Link CI / Serviço',
+	'Class:lnkFunctionalCIToService+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Serviço',
+	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Nome serviço',
+	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'CIs',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'Nome CI',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: FunctionalCI
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Contrato provedor(a)',
+	'Class:FunctionalCI/Attribute:providercontracts_list+' => 'Todos os contratos para esse item de configuração',
+	'Class:FunctionalCI/Attribute:services_list' => 'Serviços',
+	'Class:FunctionalCI/Attribute:services_list+' => 'Todos os serviços impactados por esse item de configuração',
+	'Class:FunctionalCI/Attribute:tickets_list' => 'Solicitações',
+	'Class:FunctionalCI/Attribute:tickets_list+' => 'Todos as solicitações para este item de configuração',
 ));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/ru.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/ru.dict.itop-bridge-cmdb-ticket.php
index 2e6c22e8a..a42fffee0 100644
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/ru.dict.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/ru.dict.itop-bridge-cmdb-ticket.php
@@ -29,23 +29,6 @@
 //////////////////////////////////////////////////////////////////////
 //
 
-//
-// Class: lnkContactToFunctionalCI
-//
-
-Dict::Add('RU RU', 'Russian', 'Русский', array(
-	'Class:lnkContactToFunctionalCI' => 'Связь Контакт/Функциональная КЕ',
-	'Class:lnkContactToFunctionalCI+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Функциональная КЕ',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Функциональная КЕ',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Контакт',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Контакт',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
-));
-
 //
 // Class: lnkFunctionalCIToTicket
 //
@@ -70,3 +53,51 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Вычислено',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Не влияет',
 ));
+
+//
+// Class: lnkFunctionalCIToProviderContract
+//
+
+Dict::Add('RU RU', 'Russian', 'Русский', array(
+	'Class:lnkFunctionalCIToProviderContract' => 'Связь Функциональная КЕ/Договор с поставщиком',
+	'Class:lnkFunctionalCIToProviderContract+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Договор с поставщиком',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Договор с поставщиком',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'КЕ',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'КЕ',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: lnkFunctionalCIToService
+//
+
+Dict::Add('RU RU', 'Russian', 'Русский', array(
+	'Class:lnkFunctionalCIToService' => 'Связь Функциональная КЕ/Услуга',
+	'Class:lnkFunctionalCIToService+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Услуга',
+	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Услуга',
+	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'КЕ',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'КЕ',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: FunctionalCI
+//
+
+Dict::Add('RU RU', 'Russian', 'Русский', array(
+	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Договоры',
+	'Class:FunctionalCI/Attribute:providercontracts_list+' => 'Связанные договоры',
+	'Class:FunctionalCI/Attribute:services_list' => 'Услуги',
+	'Class:FunctionalCI/Attribute:services_list+' => 'Связанные услуги',
+	'Class:FunctionalCI/Attribute:tickets_list' => 'Тикеты',
+	'Class:FunctionalCI/Attribute:tickets_list+' => 'Связанные тикеты',
+));
+
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/sk.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/sk.dict.itop-bridge-cmdb-ticket.php
index 0852cc116..6602b8955 100644
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/sk.dict.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/sk.dict.itop-bridge-cmdb-ticket.php
@@ -29,23 +29,6 @@
 //////////////////////////////////////////////////////////////////////
 //
 
-//
-// Class: lnkContactToFunctionalCI
-//
-
-Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
-	'Class:lnkContactToFunctionalCI' => 'väzba - Kontakt / Komponent',
-	'Class:lnkContactToFunctionalCI+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Komponent',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Názov funkčných CI',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Kontakt',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Názov kontaktu',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
-));
-
 //
 // Class: lnkFunctionalCIToTicket
 //
@@ -69,4 +52,51 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Added manually~~',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Computed~~',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Not impacted~~',
-));
\ No newline at end of file
+));
+
+//
+// Class: lnkFunctionalCIToProviderContract
+//
+
+Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
+	'Class:lnkFunctionalCIToProviderContract' => 'väzba - Komponent / Poskytovateľská zmluva',
+	'Class:lnkFunctionalCIToProviderContract+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Poskytovateľská zmluva',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Názov poskytovateľského zmluvy',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'Zariadenie',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'Názov CI',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: lnkFunctionalCIToService
+//
+
+Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
+	'Class:lnkFunctionalCIToService' => 'väzba - Komponent / Služba',
+	'Class:lnkFunctionalCIToService+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Služba',
+	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Názov služby',
+	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'Zariadenie',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'Názov CI',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: FunctionalCI
+//
+
+Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
+	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Poskytovateľské zmluvy',
+	'Class:FunctionalCI/Attribute:providercontracts_list+' => '',
+	'Class:FunctionalCI/Attribute:services_list' => 'Služby',
+	'Class:FunctionalCI/Attribute:services_list+' => '',
+	'Class:FunctionalCI/Attribute:tickets_list' => 'Tickety',
+	'Class:FunctionalCI/Attribute:tickets_list+' => '',
+));
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/tr.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/tr.dict.itop-bridge-cmdb-ticket.php
index b706e8ae3..fb82240bd 100644
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/tr.dict.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/tr.dict.itop-bridge-cmdb-ticket.php
@@ -29,23 +29,6 @@
 //////////////////////////////////////////////////////////////////////
 //
 
-//
-// Class: lnkContactToFunctionalCI
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:lnkContactToFunctionalCI' => 'Link Contact / FunctionalCI~~',
-	'Class:lnkContactToFunctionalCI+' => '~~',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Functionalci~~',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '~~',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name~~',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '~~',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contact~~',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '~~',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Contact name~~',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '~~',
-));
-
 //
 // Class: lnkFunctionalCIToTicket
 //
@@ -69,4 +52,51 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Added manually~~',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Computed~~',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Not impacted~~',
+));
+
+//
+// Class: lnkFunctionalCIToProviderContract
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:lnkFunctionalCIToProviderContract' => 'Link FunctionalCI / ProviderContract~~',
+	'Class:lnkFunctionalCIToProviderContract+' => '~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Provider contract~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Provider contract Name~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'CI Name~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '~~',
+));
+
+//
+// Class: lnkFunctionalCIToService
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:lnkFunctionalCIToService' => 'Link FunctionalCI / Service~~',
+	'Class:lnkFunctionalCIToService+' => '~~',
+	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Service~~',
+	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '~~',
+	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Service Name~~',
+	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '~~',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'CI~~',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '~~',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'CI Name~~',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '~~',
+));
+
+//
+// Class: FunctionalCI
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Provider contracts~~',
+	'Class:FunctionalCI/Attribute:providercontracts_list+' => 'All the provider contracts for this configuration item~~',
+	'Class:FunctionalCI/Attribute:services_list' => 'Services~~',
+	'Class:FunctionalCI/Attribute:services_list+' => 'All the services impacted by this configuration item~~',
+	'Class:FunctionalCI/Attribute:tickets_list' => 'Tickets~~',
+	'Class:FunctionalCI/Attribute:tickets_list+' => 'All the tickets for this configuration item~~',
 ));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/zh_cn.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/zh_cn.dict.itop-bridge-cmdb-ticket.php
index dd51cd28d..6648a5ce4 100644
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/zh_cn.dict.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/zh_cn.dict.itop-bridge-cmdb-ticket.php
@@ -29,24 +29,6 @@
 //////////////////////////////////////////////////////////////////////
 //
 
-//
-// Class: lnkContactToFunctionalCI
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:lnkContactToFunctionalCI' => '链接 联系人 / 功能项',
-	'Class:lnkContactToFunctionalCI+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => '功能项',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => '功能项名称',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => '联系人',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => '联系人名称',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
-));
-
-
 //
 // Class: lnkFunctionalCIToTicket
 //
@@ -70,4 +52,51 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => '手动添加',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => '自动添加',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => '不通知',
+));
+
+//
+// Class: lnkFunctionalCIToProviderContract
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:lnkFunctionalCIToProviderContract' => '关联 功能配置项/供应商合同',
+	'Class:lnkFunctionalCIToProviderContract+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => '供应商合同',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => '供应商合同名称',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => '配置项',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => '配置项名称',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: lnkFunctionalCIToService
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:lnkFunctionalCIToService' => '关联 功能配置项/服务',
+	'Class:lnkFunctionalCIToService+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:service_id' => '服务',
+	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:service_name' => '服务名称',
+	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => '配置项',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => '配置项名称',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: FunctionalCI
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:FunctionalCI/Attribute:providercontracts_list' => '供应商合同',
+	'Class:FunctionalCI/Attribute:providercontracts_list+' => '该配置项的所有供应商合同',
+	'Class:FunctionalCI/Attribute:services_list' => '服务',
+	'Class:FunctionalCI/Attribute:services_list+' => '该配置项影响的所有服务',
+	'Class:FunctionalCI/Attribute:tickets_list' => '工单',
+	'Class:FunctionalCI/Attribute:tickets_list+' => '该配置项包含的所有工单',
 ));
\ No newline at end of file
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 e61aba1dc..47d3e84ee 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
@@ -63,6 +63,14 @@
 					<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>
@@ -4276,6 +4284,87 @@
 				</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>
+				<display_template/>
+				<icon/>
+				<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>
diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/cs.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/cs.dict.itop-config-mgmt.php
index e616d14ea..a0946bc93 100644
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/cs.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/cs.dict.itop-config-mgmt.php
@@ -77,6 +77,23 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 //////////////////////////////////////////////////////////////////////
 //
 
+//
+// Class: lnkContactToFunctionalCI
+//
+
+Dict::Add('CS CZ', 'Czech', 'Čeština', array(
+	'Class:lnkContactToFunctionalCI' => 'Spojení (Kontakt / Funkční konfigurační položka)',
+	'Class:lnkContactToFunctionalCI+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Funkční konfigurační položka',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Název funkční konfigurační položky',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Kontakt',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Název kontaktu',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
+));
+
 //
 // Class: FunctionalCI
 //
@@ -108,14 +125,8 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:FunctionalCI/Attribute:documents_list+' => '',
 	'Class:FunctionalCI/Attribute:applicationsolution_list' => 'Aplikační řešení',
 	'Class:FunctionalCI/Attribute:applicationsolution_list+' => 'Všechna aplikační řešení závisející na této konfigurační položce',
-	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Smlouvy s poskytovateli',
-	'Class:FunctionalCI/Attribute:providercontracts_list+' => '',
-	'Class:FunctionalCI/Attribute:services_list' => 'Služby',
-	'Class:FunctionalCI/Attribute:services_list+' => '',
 	'Class:FunctionalCI/Attribute:softwares_list' => 'Software',
 	'Class:FunctionalCI/Attribute:softwares_list+' => '',
-	'Class:FunctionalCI/Attribute:tickets_list' => 'Tikety',
-	'Class:FunctionalCI/Attribute:tickets_list+' => '',
 	'Class:FunctionalCI/Attribute:finalclass' => 'Typ konfigurační položky',
 	'Class:FunctionalCI/Attribute:finalclass+' => '',
 	'Class:FunctionalCI/Tab:OpenedTickets' => 'Aktivní tikety',
diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/da.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/da.dict.itop-config-mgmt.php
index e5d05ef71..427970038 100644
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/da.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/da.dict.itop-config-mgmt.php
@@ -70,6 +70,22 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 //////////////////////////////////////////////////////////////////////
 //
 
+//
+// Class: lnkContactToFunctionalCI
+//
+
+Dict::Add('DA DA', 'Danish', 'Dansk', array(
+	'Class:lnkContactToFunctionalCI' => 'Sammenhæng Kontakt/FunctionalCI',
+	'Class:lnkContactToFunctionalCI+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'FunctionalCI',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'FunctionalCI navn',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Kontakt',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Kontakt navn',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
+));
 
 //
 // Class: FunctionalCI
@@ -102,14 +118,8 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:FunctionalCI/Attribute:documents_list+' => '',
 	'Class:FunctionalCI/Attribute:applicationsolution_list' => 'Applikations løsning',
 	'Class:FunctionalCI/Attribute:applicationsolution_list+' => '',
-	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Leverandør kontrakter',
-	'Class:FunctionalCI/Attribute:providercontracts_list+' => '',
-	'Class:FunctionalCI/Attribute:services_list' => 'Ydelser',
-	'Class:FunctionalCI/Attribute:services_list+' => '',
 	'Class:FunctionalCI/Attribute:softwares_list' => 'Software',
 	'Class:FunctionalCI/Attribute:softwares_list+' => '',
-	'Class:FunctionalCI/Attribute:tickets_list' => 'Tickets',
-	'Class:FunctionalCI/Attribute:tickets_list+' => '',
 	'Class:FunctionalCI/Attribute:finalclass' => 'Type',
 	'Class:FunctionalCI/Attribute:finalclass+' => '',
 	'Class:FunctionalCI/Tab:OpenedTickets' => 'Active Tickets~~',
diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/de.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/de.dict.itop-config-mgmt.php
index 2e7ce51fa..6f2484a47 100644
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/de.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/de.dict.itop-config-mgmt.php
@@ -72,6 +72,23 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 //////////////////////////////////////////////////////////////////////
 //
 
+//
+// Class: lnkContactToFunctionalCI
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:lnkContactToFunctionalCI' => 'Verknüpfung Kontakt/FunctionalCI',
+	'Class:lnkContactToFunctionalCI+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'FunctionalCI',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'FunctionalCI-Name',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Kontakt',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Kontakt-Name',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
+));
+
 //
 // Class: FunctionalCI
 //
@@ -103,14 +120,8 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:FunctionalCI/Attribute:documents_list+' => '',
 	'Class:FunctionalCI/Attribute:applicationsolution_list' => 'Anwendungslösungen',
 	'Class:FunctionalCI/Attribute:applicationsolution_list+' => '',
-	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Provider-Verträge',
-	'Class:FunctionalCI/Attribute:providercontracts_list+' => '',
-	'Class:FunctionalCI/Attribute:services_list' => 'Services',
-	'Class:FunctionalCI/Attribute:services_list+' => '',
 	'Class:FunctionalCI/Attribute:softwares_list' => 'Software',
 	'Class:FunctionalCI/Attribute:softwares_list+' => '',
-	'Class:FunctionalCI/Attribute:tickets_list' => 'Tickets',
-	'Class:FunctionalCI/Attribute:tickets_list+' => '',
 	'Class:FunctionalCI/Attribute:finalclass' => 'Typ',
 	'Class:FunctionalCI/Attribute:finalclass+' => '',
 	'Class:FunctionalCI/Tab:OpenedTickets' => 'Offene Tickets',
diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/en.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/en.dict.itop-config-mgmt.php
index 1970354c1..6881afec2 100644
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/en.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/en.dict.itop-config-mgmt.php
@@ -76,6 +76,23 @@ Dict::Add('EN US', 'English', 'English', array(
 //////////////////////////////////////////////////////////////////////
 //
 
+//
+// Class: lnkContactToFunctionalCI
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:lnkContactToFunctionalCI' => 'Link Contact / FunctionalCI',
+	'Class:lnkContactToFunctionalCI+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Functionalci',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contact',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Contact name',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
+));
+
 //
 // Class: FunctionalCI
 //
@@ -107,14 +124,8 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:FunctionalCI/Attribute:documents_list+' => 'All the documents linked to this configuration item',
 	'Class:FunctionalCI/Attribute:applicationsolution_list' => 'Application solutions',
 	'Class:FunctionalCI/Attribute:applicationsolution_list+' => 'All the application solutions depending on this configuration item',
-	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Provider contracts',
-	'Class:FunctionalCI/Attribute:providercontracts_list+' => 'All the provider contracts for this configuration item',
-	'Class:FunctionalCI/Attribute:services_list' => 'Services',
-	'Class:FunctionalCI/Attribute:services_list+' => 'All the services impacted by this configuration item',
 	'Class:FunctionalCI/Attribute:softwares_list' => 'Softwares',
 	'Class:FunctionalCI/Attribute:softwares_list+' => 'All the softwares installed on this configuration item',
-	'Class:FunctionalCI/Attribute:tickets_list' => 'Tickets',
-	'Class:FunctionalCI/Attribute:tickets_list+' => 'All the tickets for this configuration item',
 	'Class:FunctionalCI/Attribute:finalclass' => 'CI sub-class',
 	'Class:FunctionalCI/Attribute:finalclass+' => 'Name of the final class',
 	'Class:FunctionalCI/Tab:OpenedTickets' => 'Active Tickets',
diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/es_cr.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/es_cr.dict.itop-config-mgmt.php
index 26e080246..922618be8 100644
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/es_cr.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/es_cr.dict.itop-config-mgmt.php
@@ -76,6 +76,23 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 //////////////////////////////////////////////////////////////////////
 //
 
+//
+// Class: lnkContactToFunctionalCI
+//
+
+Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+	'Class:lnkContactToFunctionalCI' => 'Relación Contacto y  EC Funcional',
+	'Class:lnkContactToFunctionalCI+' => 'Relación Contacto y  EC Funcional',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'EC Funcional',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => 'EC Funcional',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'EC Funcional',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => 'EC Funcional',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contacto',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => 'Contacto',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Contacto',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => 'Contacto',
+));
+
 //
 // Class: FunctionalCI
 //
@@ -107,14 +124,8 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'Class:FunctionalCI/Attribute:documents_list+' => 'Documentación para este EC',
 	'Class:FunctionalCI/Attribute:applicationsolution_list' => 'Soluciones Aplicativa',
 	'Class:FunctionalCI/Attribute:applicationsolution_list+' => 'Soluciones Aplicativa',
-	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Contratos',
-	'Class:FunctionalCI/Attribute:providercontracts_list+' => 'Contratos',
-	'Class:FunctionalCI/Attribute:services_list' => 'Servicios',
-	'Class:FunctionalCI/Attribute:services_list+' => 'Servicios',
 	'Class:FunctionalCI/Attribute:softwares_list' => 'Software',
 	'Class:FunctionalCI/Attribute:softwares_list+' => 'Software',
-	'Class:FunctionalCI/Attribute:tickets_list' => 'Tickets',
-	'Class:FunctionalCI/Attribute:tickets_list+' => 'Tickets relacionados con este EC',
 	'Class:FunctionalCI/Attribute:finalclass' => 'Clase',
 	'Class:FunctionalCI/Attribute:finalclass+' => 'Clase',
 	'Class:FunctionalCI/Tab:OpenedTickets' => 'Tickets Activos',
diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/fr.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/fr.dict.itop-config-mgmt.php
index f371005e8..934ab8e17 100644
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/fr.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/fr.dict.itop-config-mgmt.php
@@ -72,6 +72,23 @@ Dict::Add('FR FR', 'French', 'Français', array(
 //////////////////////////////////////////////////////////////////////
 //
 
+//
+// Class: lnkContactToFunctionalCI
+//
+
+Dict::Add('FR FR', 'French', 'Français', array(
+	'Class:lnkContactToFunctionalCI' => 'Lien Contact / CI Fonctionel',
+	'Class:lnkContactToFunctionalCI+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'CI',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Nom CI',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contact',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Nom contact',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
+));
+
 //
 // Class: FunctionalCI
 //
@@ -103,14 +120,8 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:FunctionalCI/Attribute:documents_list+' => '',
 	'Class:FunctionalCI/Attribute:applicationsolution_list' => 'Solutions applicatives',
 	'Class:FunctionalCI/Attribute:applicationsolution_list+' => '',
-	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Contrats fournisseur',
-	'Class:FunctionalCI/Attribute:providercontracts_list+' => '',
-	'Class:FunctionalCI/Attribute:services_list' => 'Services',
-	'Class:FunctionalCI/Attribute:services_list+' => '',
 	'Class:FunctionalCI/Attribute:softwares_list' => 'Logiciels',
 	'Class:FunctionalCI/Attribute:softwares_list+' => '',
-	'Class:FunctionalCI/Attribute:tickets_list' => 'Tickets',
-	'Class:FunctionalCI/Attribute:tickets_list+' => '',
 	'Class:FunctionalCI/Attribute:finalclass' => 'Sous-classe de CI',
 	'Class:FunctionalCI/Attribute:finalclass+' => 'Nom de la classe instanciable',
 	'Class:FunctionalCI/Tab:OpenedTickets' => 'Tickets en cours',
diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/hu.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/hu.dict.itop-config-mgmt.php
index 5932a7bb8..2e3c4d7d5 100644
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/hu.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/hu.dict.itop-config-mgmt.php
@@ -69,6 +69,23 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //////////////////////////////////////////////////////////////////////
 //
 
+//
+// Class: lnkContactToFunctionalCI
+//
+
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+	'Class:lnkContactToFunctionalCI' => 'Link Contact / FunctionalCI~~',
+	'Class:lnkContactToFunctionalCI+' => '~~',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Functionalci~~',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '~~',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name~~',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '~~',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contact~~',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '~~',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Contact name~~',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '~~',
+));
+
 //
 // Class: FunctionalCI
 //
@@ -100,14 +117,8 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:FunctionalCI/Attribute:documents_list+' => 'All the documents linked to this configuration item~~',
 	'Class:FunctionalCI/Attribute:applicationsolution_list' => 'Application solutions~~',
 	'Class:FunctionalCI/Attribute:applicationsolution_list+' => 'All the application solutions depending on this configuration item~~',
-	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Provider contracts~~',
-	'Class:FunctionalCI/Attribute:providercontracts_list+' => 'All the provider contracts for this configuration item~~',
-	'Class:FunctionalCI/Attribute:services_list' => 'Services~~',
-	'Class:FunctionalCI/Attribute:services_list+' => 'All the services impacted by this configuration item~~',
 	'Class:FunctionalCI/Attribute:softwares_list' => 'Softwares~~',
 	'Class:FunctionalCI/Attribute:softwares_list+' => 'All the softwares installed on this configuration item~~',
-	'Class:FunctionalCI/Attribute:tickets_list' => 'Tickets~~',
-	'Class:FunctionalCI/Attribute:tickets_list+' => 'All the tickets for this configuration item~~',
 	'Class:FunctionalCI/Attribute:finalclass' => 'Típus',
 	'Class:FunctionalCI/Attribute:finalclass+' => '',
 	'Class:FunctionalCI/Tab:OpenedTickets' => 'Active Tickets~~',
@@ -1033,24 +1044,6 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:OSFamily+' => '~~',
 ));
 
-//
-// Class: DocumentType
-//
-
-Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'Class:DocumentType' => 'Document Type~~',
-	'Class:DocumentType+' => '~~',
-));
-
-//
-// Class: ContactType
-//
-
-Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'Class:ContactType' => 'Contact Type~~',
-	'Class:ContactType+' => '~~',
-));
-
 //
 // Class: Brand
 //
diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/it.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/it.dict.itop-config-mgmt.php
index 4dbf4d215..2448f35ff 100644
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/it.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/it.dict.itop-config-mgmt.php
@@ -69,6 +69,23 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 //////////////////////////////////////////////////////////////////////
 //
 
+//
+// Class: lnkContactToFunctionalCI
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:lnkContactToFunctionalCI' => 'Link Contact / FunctionalCI~~',
+	'Class:lnkContactToFunctionalCI+' => '~~',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Functionalci~~',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '~~',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name~~',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '~~',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contact~~',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '~~',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Contact name~~',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '~~',
+));
+
 //
 // Class: FunctionalCI
 //
@@ -100,14 +117,8 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:FunctionalCI/Attribute:documents_list+' => 'All the documents linked to this configuration item~~',
 	'Class:FunctionalCI/Attribute:applicationsolution_list' => 'Application solutions~~',
 	'Class:FunctionalCI/Attribute:applicationsolution_list+' => 'All the application solutions depending on this configuration item~~',
-	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Provider contracts~~',
-	'Class:FunctionalCI/Attribute:providercontracts_list+' => 'All the provider contracts for this configuration item~~',
-	'Class:FunctionalCI/Attribute:services_list' => 'Services~~',
-	'Class:FunctionalCI/Attribute:services_list+' => 'All the services impacted by this configuration item~~',
 	'Class:FunctionalCI/Attribute:softwares_list' => 'Softwares~~',
 	'Class:FunctionalCI/Attribute:softwares_list+' => 'All the softwares installed on this configuration item~~',
-	'Class:FunctionalCI/Attribute:tickets_list' => 'Tickets~~',
-	'Class:FunctionalCI/Attribute:tickets_list+' => 'All the tickets for this configuration item~~',
 	'Class:FunctionalCI/Attribute:finalclass' => 'Tipo',
 	'Class:FunctionalCI/Attribute:finalclass+' => '',
 	'Class:FunctionalCI/Tab:OpenedTickets' => 'Active Tickets~~',
diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/ja.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/ja.dict.itop-config-mgmt.php
index 9ab8eabee..21c13f464 100644
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/ja.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/ja.dict.itop-config-mgmt.php
@@ -69,6 +69,23 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 //////////////////////////////////////////////////////////////////////
 //
 
+//
+// Class: lnkContactToFunctionalCI
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:lnkContactToFunctionalCI' => 'リンク 連絡先/機能的CI',
+	'Class:lnkContactToFunctionalCI+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => '機能的ci',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => '機能的ci名',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => '連絡先',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => '連絡先名',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
+));
+
 //
 // Class: FunctionalCI
 //
@@ -100,14 +117,8 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:FunctionalCI/Attribute:documents_list+' => '',
 	'Class:FunctionalCI/Attribute:applicationsolution_list' => 'アプリケーションソリューション',
 	'Class:FunctionalCI/Attribute:applicationsolution_list+' => '',
-	'Class:FunctionalCI/Attribute:providercontracts_list' => 'プロバイダー契約',
-	'Class:FunctionalCI/Attribute:providercontracts_list+' => '',
-	'Class:FunctionalCI/Attribute:services_list' => 'サービス',
-	'Class:FunctionalCI/Attribute:services_list+' => '',
 	'Class:FunctionalCI/Attribute:softwares_list' => 'ソフトウエア',
 	'Class:FunctionalCI/Attribute:softwares_list+' => '',
-	'Class:FunctionalCI/Attribute:tickets_list' => 'チケット',
-	'Class:FunctionalCI/Attribute:tickets_list+' => '',
 	'Class:FunctionalCI/Attribute:finalclass' => 'CIタイプ',
 	'Class:FunctionalCI/Attribute:finalclass+' => '',
 	'Class:FunctionalCI/Tab:OpenedTickets' => 'Active Tickets~~',
diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/nl.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/nl.dict.itop-config-mgmt.php
index fea5f6b17..2872461e9 100644
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/nl.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/nl.dict.itop-config-mgmt.php
@@ -81,6 +81,23 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 //////////////////////////////////////////////////////////////////////
 //
 
+//
+// Class: lnkContactToFunctionalCI
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:lnkContactToFunctionalCI' => 'Link Contact / Functioneel CI',
+	'Class:lnkContactToFunctionalCI+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Functioneel CI',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Naam functioneel CI',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contact',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Naam contact',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
+));
+
 //
 // Class: FunctionalCI
 //
@@ -112,14 +129,8 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:FunctionalCI/Attribute:documents_list+' => 'Alle documenten gelinkt aan dit configuratie-item.',
 	'Class:FunctionalCI/Attribute:applicationsolution_list' => 'Applicatieoplossingen',
 	'Class:FunctionalCI/Attribute:applicationsolution_list+' => 'Alle applicatieoplossingen die afhankelijk zijn van dit configuratie-item',
-	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Leverancierscontracten',
-	'Class:FunctionalCI/Attribute:providercontracts_list+' => 'Alle leverancierscontracten voor dit configuratie-item',
-	'Class:FunctionalCI/Attribute:services_list' => 'Services',
-	'Class:FunctionalCI/Attribute:services_list+' => 'Alle services die impact hebben op dit configuratie-item',
 	'Class:FunctionalCI/Attribute:softwares_list' => 'Software',
 	'Class:FunctionalCI/Attribute:softwares_list+' => 'Alle software geïnstalleerd op dit configuratie-item',
-	'Class:FunctionalCI/Attribute:tickets_list' => 'Tickets',
-	'Class:FunctionalCI/Attribute:tickets_list+' => 'Alle tickets voor dit configuratie-item',
 	'Class:FunctionalCI/Attribute:finalclass' => 'Subklasse CI',
 	'Class:FunctionalCI/Attribute:finalclass+' => '',
 	'Class:FunctionalCI/Tab:OpenedTickets' => 'Actieve tickets',
diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/pt_br.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/pt_br.dict.itop-config-mgmt.php
index 0fb98b843..265939d00 100644
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/pt_br.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/pt_br.dict.itop-config-mgmt.php
@@ -75,6 +75,23 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //////////////////////////////////////////////////////////////////////
 //
 
+//
+// Class: lnkContactToFunctionalCI
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:lnkContactToFunctionalCI' => 'Link Contato / CI',
+	'Class:lnkContactToFunctionalCI+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'CIs',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Nome CI',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contato',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Nome contato',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
+));
+
 //
 // Class: FunctionalCI
 //
@@ -106,14 +123,8 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:FunctionalCI/Attribute:documents_list+' => 'Todos os documentos vinculados a este item de configuração',
 	'Class:FunctionalCI/Attribute:applicationsolution_list' => 'Soluções de aplicações',
 	'Class:FunctionalCI/Attribute:applicationsolution_list+' => 'Todas as soluções de aplicação, dependente desse item de configuração',
-	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Contrato provedor(a)',
-	'Class:FunctionalCI/Attribute:providercontracts_list+' => 'Todos os contratos para esse item de configuração',
-	'Class:FunctionalCI/Attribute:services_list' => 'Serviços',
-	'Class:FunctionalCI/Attribute:services_list+' => 'Todos os serviços impactados por esse item de configuração',
 	'Class:FunctionalCI/Attribute:softwares_list' => 'Softwares',
 	'Class:FunctionalCI/Attribute:softwares_list+' => 'Todos os softwares instalados neste item de configuração',
-	'Class:FunctionalCI/Attribute:tickets_list' => 'Solicitações',
-	'Class:FunctionalCI/Attribute:tickets_list+' => 'Todos as solicitações para este item de configuração',
 	'Class:FunctionalCI/Attribute:finalclass' => 'Tipo CI',
 	'Class:FunctionalCI/Attribute:finalclass+' => '',
 	'Class:FunctionalCI/Tab:OpenedTickets' => 'Ingressos Ativos',
diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/ru.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/ru.dict.itop-config-mgmt.php
index 981f58443..4036c40d5 100644
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/ru.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/ru.dict.itop-config-mgmt.php
@@ -62,6 +62,23 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 //////////////////////////////////////////////////////////////////////
 //
 
+//
+// Class: lnkContactToFunctionalCI
+//
+
+Dict::Add('RU RU', 'Russian', 'Русский', array(
+	'Class:lnkContactToFunctionalCI' => 'Связь Контакт/Функциональная КЕ',
+	'Class:lnkContactToFunctionalCI+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Функциональная КЕ',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Функциональная КЕ',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Контакт',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Контакт',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
+));
+
 //
 // Class: FunctionalCI
 //
@@ -93,14 +110,8 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:FunctionalCI/Attribute:documents_list+' => 'Связанные документы',
 	'Class:FunctionalCI/Attribute:applicationsolution_list' => 'Прикладные решения',
 	'Class:FunctionalCI/Attribute:applicationsolution_list+' => 'Связанные прикладные решения',
-	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Договоры',
-	'Class:FunctionalCI/Attribute:providercontracts_list+' => 'Связанные договоры',
-	'Class:FunctionalCI/Attribute:services_list' => 'Услуги',
-	'Class:FunctionalCI/Attribute:services_list+' => 'Связанные услуги',
 	'Class:FunctionalCI/Attribute:softwares_list' => 'ПО',
 	'Class:FunctionalCI/Attribute:softwares_list+' => 'Связанное программное обеспечение',
-	'Class:FunctionalCI/Attribute:tickets_list' => 'Тикеты',
-	'Class:FunctionalCI/Attribute:tickets_list+' => 'Связанные тикеты',
 	'Class:FunctionalCI/Attribute:finalclass' => 'Тип',
 	'Class:FunctionalCI/Attribute:finalclass+' => '',
 	'Class:FunctionalCI/Tab:OpenedTickets' => 'Активные тикеты',
diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/sk.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/sk.dict.itop-config-mgmt.php
index aa93b864f..d9c72bfac 100644
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/sk.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/sk.dict.itop-config-mgmt.php
@@ -74,6 +74,23 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 //////////////////////////////////////////////////////////////////////
 //
 
+//
+// Class: lnkContactToFunctionalCI
+//
+
+Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
+	'Class:lnkContactToFunctionalCI' => 'väzba - Kontakt / Komponent',
+	'Class:lnkContactToFunctionalCI+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Komponent',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Názov funkčných CI',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Kontakt',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Názov kontaktu',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
+));
+
 //
 // Class: FunctionalCI
 //
@@ -105,14 +122,8 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:FunctionalCI/Attribute:documents_list+' => '',
 	'Class:FunctionalCI/Attribute:applicationsolution_list' => 'Zoznam aplikačných riešení',
 	'Class:FunctionalCI/Attribute:applicationsolution_list+' => '',
-	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Poskytovateľské zmluvy',
-	'Class:FunctionalCI/Attribute:providercontracts_list+' => '',
-	'Class:FunctionalCI/Attribute:services_list' => 'Služby',
-	'Class:FunctionalCI/Attribute:services_list+' => '',
 	'Class:FunctionalCI/Attribute:softwares_list' => 'Softvér',
 	'Class:FunctionalCI/Attribute:softwares_list+' => '',
-	'Class:FunctionalCI/Attribute:tickets_list' => 'Tickety',
-	'Class:FunctionalCI/Attribute:tickets_list+' => '',
 	'Class:FunctionalCI/Attribute:finalclass' => 'Typ komponentu',
 	'Class:FunctionalCI/Attribute:finalclass+' => '',
 	'Class:FunctionalCI/Tab:OpenedTickets' => 'Active Tickets~~',
diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/tr.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/tr.dict.itop-config-mgmt.php
index f169debc7..80e924f6b 100644
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/tr.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/tr.dict.itop-config-mgmt.php
@@ -76,6 +76,23 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 //////////////////////////////////////////////////////////////////////
 //
 
+//
+// Class: lnkContactToFunctionalCI
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:lnkContactToFunctionalCI' => 'Link Contact / FunctionalCI~~',
+	'Class:lnkContactToFunctionalCI+' => '~~',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Functionalci~~',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '~~',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name~~',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '~~',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contact~~',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '~~',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Contact name~~',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '~~',
+));
+
 //
 // Class: FunctionalCI
 //
@@ -107,14 +124,8 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:FunctionalCI/Attribute:documents_list+' => 'All the documents linked to this configuration item~~',
 	'Class:FunctionalCI/Attribute:applicationsolution_list' => 'Application solutions~~',
 	'Class:FunctionalCI/Attribute:applicationsolution_list+' => 'All the application solutions depending on this configuration item~~',
-	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Provider contracts~~',
-	'Class:FunctionalCI/Attribute:providercontracts_list+' => 'All the provider contracts for this configuration item~~',
-	'Class:FunctionalCI/Attribute:services_list' => 'Services~~',
-	'Class:FunctionalCI/Attribute:services_list+' => 'All the services impacted by this configuration item~~',
 	'Class:FunctionalCI/Attribute:softwares_list' => 'Softwares~~',
 	'Class:FunctionalCI/Attribute:softwares_list+' => 'All the softwares installed on this configuration item~~',
-	'Class:FunctionalCI/Attribute:tickets_list' => 'Tickets~~',
-	'Class:FunctionalCI/Attribute:tickets_list+' => 'All the tickets for this configuration item~~',
 	'Class:FunctionalCI/Attribute:finalclass' => 'Tip',
 	'Class:FunctionalCI/Attribute:finalclass+' => '',
 	'Class:FunctionalCI/Tab:OpenedTickets' => 'Active Tickets~~',
diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/zh_cn.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/zh_cn.dict.itop-config-mgmt.php
index e34ffd22c..62cf53969 100644
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/zh_cn.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/zh_cn.dict.itop-config-mgmt.php
@@ -74,6 +74,23 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 //////////////////////////////////////////////////////////////////////
 //
 
+//
+// Class: lnkContactToFunctionalCI
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:lnkContactToFunctionalCI' => '链接 联系人 / 功能项',
+	'Class:lnkContactToFunctionalCI+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => '功能项',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => '功能项名称',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => '联系人',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => '联系人名称',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
+));
+
 //
 // Class: FunctionalCI
 //
@@ -105,14 +122,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:FunctionalCI/Attribute:documents_list+' => '该配置项关联的所有文档',
 	'Class:FunctionalCI/Attribute:applicationsolution_list' => '应用方案',
 	'Class:FunctionalCI/Attribute:applicationsolution_list+' => '该配置项依赖的所有应用方案',
-	'Class:FunctionalCI/Attribute:providercontracts_list' => '供应商合同',
-	'Class:FunctionalCI/Attribute:providercontracts_list+' => '该配置项的所有供应商合同',
-	'Class:FunctionalCI/Attribute:services_list' => '服务',
-	'Class:FunctionalCI/Attribute:services_list+' => '该配置项影响的所有服务',
 	'Class:FunctionalCI/Attribute:softwares_list' => '软件',
 	'Class:FunctionalCI/Attribute:softwares_list+' => '该配置项上已安装的所有软件',
-	'Class:FunctionalCI/Attribute:tickets_list' => '工单',
-	'Class:FunctionalCI/Attribute:tickets_list+' => '该配置项包含的所有工单',
 	'Class:FunctionalCI/Attribute:finalclass' => '二级配置项',
 	'Class:FunctionalCI/Attribute:finalclass+' => 'Name of the final class',
 	'Class:FunctionalCI/Tab:OpenedTickets' => '活跃的工单',
diff --git a/datamodels/2.x/itop-core-update/dictionaries/fr.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/dictionaries/fr.dict.itop-core-update.php
index 8dae6b928..fde558df6 100644
--- a/datamodels/2.x/itop-core-update/dictionaries/fr.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/dictionaries/fr.dict.itop-core-update.php
@@ -113,15 +113,4 @@ Dict::Add('FR FR', 'French', 'Français', array(
     'Class:ModuleInstallation/Attribute:name' => 'Nom',
     'Class:ModuleInstallation/Attribute:version' => 'Version',
     'Class:ModuleInstallation/Attribute:comment' => 'Commentaire',
-));
-
-
-
-// Additional language entries not present in English dict
-Dict::Add('FR FR', 'French', 'Français', array(
- 'iTopUpdate:UI:DoBackup' => 'Faire une sauvegarde des fichiers et de la base',
- 'iTopUpdate:UI:WithBackup' => 'Avec sauvegarde de l\'application, l\'archive sera dans \'%1$s\'',
- 'iTopUpdate:UI:InstallationCanBeUpdated' => 'L\'application peut être mise à jour',
- 'iTopUpdate:UI:InstallationCanNotBeUpdated' => 'L\'application ne peut pas être mise à jour',
- 'iTopUpdate:Error:NoUpdate' => 'La mise à jour n\'a pas été effectuée',
-));
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-knownerror-mgmt/data.sample.faq-domains.xml b/datamodels/2.x/itop-faq-light/data.sample.faq-domains.xml
similarity index 100%
rename from datamodels/2.x/itop-knownerror-mgmt/data.sample.faq-domains.xml
rename to datamodels/2.x/itop-faq-light/data.sample.faq-domains.xml
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
new file mode 100755
index 000000000..cc53f3af3
--- /dev/null
+++ b/datamodels/2.x/itop-faq-light/datamodel.itop-faq-light.xml
@@ -0,0 +1,338 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.7">
+  <classes>
+    <class id="FAQ" _delta="define">
+      <parent>cmdbAbstractObject</parent>
+      <properties>
+        <category>bizmodel,searchable,knownerrormgmt</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>faq</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="title"/>
+          </attributes>
+        </naming>
+        <display_template/>
+        <icon>images/faq.png</icon>
+        <reconciliation>
+          <attributes>
+            <attribute id="title"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
+        <field id="title" xsi:type="AttributeString">
+          <sql>title</sql>
+          <default_value/>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
+        <field id="summary" xsi:type="AttributeText">
+          <sql>summary</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="description" xsi:type="AttributeHTML">
+          <sql>description</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="category_id" xsi:type="AttributeExternalKey">
+          <sql>category_id</sql>
+          <target_class>FAQCategory</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+        </field>
+        <field id="category_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>category_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="error_code" xsi:type="AttributeString">
+          <sql>error_code</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="key_words" xsi:type="AttributeString">
+          <sql>key_words</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="domains" xsi:type="AttributeTagSet">
+          <sql>domains</sql>
+          <is_null_allowed>true</is_null_allowed>
+          <tracking_level>all</tracking_level>
+          <max_items>12</max_items>
+        </field>
+      </fields>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="category_id">
+              <rank>10</rank>
+            </item>
+            <item id="title">
+              <rank>20</rank>
+            </item>
+            <item id="error_code">
+              <rank>30</rank>
+            </item>
+            <item id="key_words">
+              <rank>40</rank>
+            </item>
+            <item id="domains">
+              <rank>50</rank>
+            </item>
+            <item id="summary">
+              <rank>60</rank>
+            </item>
+            <item id="description">
+              <rank>70</rank>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="category_id">
+              <rank>10</rank>
+            </item>
+            <item id="title">
+              <rank>20</rank>
+            </item>
+            <item id="summary">
+              <rank>30</rank>
+            </item>
+            <item id="error_code">
+              <rank>40</rank>
+            </item>
+            <item id="domains">
+              <rank>50</rank>
+            </item>
+          </items>
+        </search>
+        <default_search>
+          <items>
+            <item id="title">
+              <rank>10</rank>
+            </item>
+            <item id="summary">
+              <rank>20</rank>
+            </item>
+            <item id="category_id">
+              <rank>30</rank>
+            </item>
+          </items>
+        </default_search>
+        <list>
+          <items>
+            <item id="category_id">
+              <rank>10</rank>
+            </item>
+            <item id="error_code">
+              <rank>20</rank>
+            </item>
+            <item id="domains">
+              <rank>30</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="FAQCategory" _delta="define">
+      <parent>cmdbAbstractObject</parent>
+      <properties>
+        <category>bizmodel,searchable,knownerrormgmt</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>faqcategory</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="name"/>
+          </attributes>
+        </naming>
+        <display_template/>
+        <icon/>
+        <reconciliation>
+          <attributes>
+            <attribute id="name"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
+        <field id="name" xsi:type="AttributeString">
+          <sql>nam</sql>
+          <default_value/>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
+        <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>
+          <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="faq_list">
+              <rank>20</rank>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+          </items>
+        </search>
+        <default_search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+          </items>
+        </default_search>
+      </presentation>
+    </class>
+  </classes>
+  <menus>
+    <menu id="ProblemManagement" xsi:type="MenuGroup" _delta="define_if_not_exists">
+      <rank>42</rank>
+    </menu>
+    <menu id="Problem:Shortcuts" xsi:type="TemplateMenuNode" _delta="define_if_not_exists">
+      <rank>5</rank>
+      <parent>ProblemManagement</parent>
+      <template_file/>
+    </menu>
+    <menu id="FAQCategory" xsi:type="OQLMenuNode" _delta="define">
+      <rank>4.5</rank>
+      <parent>Problem:Shortcuts</parent>
+      <oql>SELECT FAQCategory</oql>
+      <do_search>1</do_search>
+    </menu>
+    <menu id="FAQ" xsi:type="OQLMenuNode" _delta="define">
+      <rank>6</rank>
+      <parent>Problem:Shortcuts</parent>
+      <oql>SELECT FAQ</oql>
+      <do_search>1</do_search>
+    </menu>
+  </menus>
+  <module_designs>
+    <module_design id="itop-portal" xsi:type="portal">
+      <bricks>
+        <brick id="faq" xsi:type="Combodo\iTop\Portal\Brick\BrowseBrick" _delta="define">
+          <active>true</active>
+          <rank>
+			  <default>40</default>
+		  </rank>
+          <width>12</width>
+			<title>
+              <navigation_menu>Brick:Portal:FAQ:Menu</navigation_menu>
+			  <home>Brick:Portal:FAQ:Title</home>
+			</title>
+			<description>Brick:Portal:FAQ:Title+</description>
+			<decoration_class>
+				<default>fc fc-life-saver fc-2x</default>
+			</decoration_class>
+          <levels>
+            <level id="1">
+              <class>FAQCategory</class>
+              <parent_att/>
+              <name_att/>
+              <tooltip_att/>
+              <title>Class:FAQCategory</title>
+              <actions/>
+              <levels>
+                <level id="1">
+                  <class>FAQ</class>
+                  <parent_att>category_id</parent_att>
+                  <name_att>title</name_att>
+                  <tooltip_att>summary</tooltip_att>
+                  <title>Class:FAQ</title>
+                  <fields>
+                    <field id="error_code"/>
+					<field id="domains"/>
+					<field id="key_words">
+						<hidden>true</hidden>
+					</field>
+                  </fields>
+                  <actions>
+                    <action id="view" xsi:type="view"/>
+                  </actions>
+                  <levels/>
+                </level>
+              </levels>
+            </level>
+          </levels>
+          <browse_modes>
+            <availables>
+              <mode id="list"/>
+              <mode id="tree"/>
+            </availables>
+            <default>list</default>
+          </browse_modes>
+          <data_loading>full</data_loading>
+        </brick>
+      </bricks>
+      <forms>
+        <form id="faq" _delta="define">
+          <class>FAQ</class>
+          <!-- fields tag is optional. If not specified, attributes from zlist "details" will be choose as default -->
+          <fields>
+            <field id="category_name"/>
+            <field id="title"/>
+            <field id="error_code"/>
+            <field id="key_words"/>
+            <field id="domains"/>
+            <field id="summary"/>
+            <field id="description"/>
+          </fields>
+          <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>
+              <div class="col-sm-8">
+                <div class="form_field" data-field-id="description"></div>
+              </div>
+            </div>
+          </twig>
+          <modes>
+            <mode id="view"/>
+          </modes>
+        </form>
+      </forms>
+      <classes>
+        <class id="FAQCategory" _delta="define">
+          <scopes>
+            <scope id="all">
+              <oql_view><![CDATA[SELECT FAQCategory]]></oql_view>
+            </scope>
+          </scopes>
+        </class>
+        <class id="FAQ" _delta="define">
+          <scopes>
+            <scope id="all">
+              <oql_view><![CDATA[SELECT FAQ]]></oql_view>
+            </scope>
+          </scopes>
+        </class>
+      </classes>
+    </module_design>
+  </module_designs>
+</itop_design>
diff --git a/datamodels/2.x/itop-faq-light/dictionaries/cs.dict.itop-faq-light.php b/datamodels/2.x/itop-faq-light/dictionaries/cs.dict.itop-faq-light.php
new file mode 100644
index 000000000..6877cb299
--- /dev/null
+++ b/datamodels/2.x/itop-faq-light/dictionaries/cs.dict.itop-faq-light.php
@@ -0,0 +1,95 @@
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+ * Localized data.
+ *
+ * @author      Lukáš Dvořák <lukas.dvorak@itopportal.cz>
+ * @author      Daniel Rokos <daniel.rokos@itopportal.cz>
+ * @copyright   Copyright (C) 2010-2014 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+//
+// Class: FAQ
+//
+
+Dict::Add('CS CZ', 'Czech', 'Čeština', array(
+	'Class:FAQ' => 'FAQ',
+	'Class:FAQ+' => 'Často kladené dotazy',
+	'Class:FAQ/Attribute:title' => 'Název',
+	'Class:FAQ/Attribute:title+' => '',
+	'Class:FAQ/Attribute:summary' => 'Shrnutí',
+	'Class:FAQ/Attribute:summary+' => '',
+	'Class:FAQ/Attribute:description' => 'Popis',
+	'Class:FAQ/Attribute:description+' => '',
+	'Class:FAQ/Attribute:category_id' => 'Kategorie',
+	'Class:FAQ/Attribute:category_id+' => '',
+	'Class:FAQ/Attribute:category_name' => 'Název kategorie',
+	'Class:FAQ/Attribute:category_name+' => '',
+	'Class:FAQ/Attribute:error_code' => 'Kód chyby',
+	'Class:FAQ/Attribute:error_code+' => '',
+	'Class:FAQ/Attribute:key_words' => 'Klíčová slova',
+	'Class:FAQ/Attribute:key_words+' => '',
+	'Class:FAQ/Attribute:domains' => 'Domains~~',
+));
+
+//
+// Class: FAQCategory
+//
+
+Dict::Add('CS CZ', 'Czech', 'Čeština', array(
+	'Class:FAQCategory' => 'Kategorie FAQ',
+	'Class:FAQCategory+' => 'Kategorie pro FAQ',
+	'Class:FAQCategory/Attribute:name' => 'Název',
+	'Class:FAQCategory/Attribute:name+' => '',
+	'Class:FAQCategory/Attribute:faq_list' => 'FAQ',
+	'Class:FAQCategory/Attribute:faq_list+' => 'Všechny často kladené dotazy v této kategorii',
+));
+Dict::Add('CS CZ', 'Czech', 'Čeština', array(
+	'Menu:ProblemManagement' => 'Správa problémů',
+	'Menu:ProblemManagement+' => 'Správa problémů',
+	'Menu:Problem:Shortcuts' => 'Odkazy',
+	'Menu:FAQCategory' => 'Kategorie FAQ',
+	'Menu:FAQCategory+' => '',
+	'Menu:FAQ' => 'FAQ',
+	'Menu:FAQ+' => 'FAQ - Často kladené dotazy',
+	'Brick:Portal:FAQ:Menu' => 'FAQ',
+	'Brick:Portal:FAQ:Title' => 'Často kladené dotazy (FAQ)',
+	'Brick:Portal:FAQ:Title+' => '<p>Spěcháte?</p><p>Podívejte se na seznam nejčastějších otázek a (možná) najdete hledanou odpověď ihned.</p>',
+));
diff --git a/datamodels/2.x/itop-faq-light/dictionaries/da.dict.itop-faq-light.php b/datamodels/2.x/itop-faq-light/dictionaries/da.dict.itop-faq-light.php
new file mode 100644
index 000000000..593e7dbbf
--- /dev/null
+++ b/datamodels/2.x/itop-faq-light/dictionaries/da.dict.itop-faq-light.php
@@ -0,0 +1,70 @@
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+ * @author	Erik Bøg <erik@boegmoeller.dk>
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @licence	http://opensource.org/licenses/AGPL-3.0
+ */
+//
+// Class: FAQ
+//
+
+Dict::Add('DA DA', 'Danish', 'Dansk', array(
+	'Class:FAQ' => 'FAQ',
+	'Class:FAQ+' => '',
+	'Class:FAQ/Attribute:title' => 'Titel',
+	'Class:FAQ/Attribute:title+' => '',
+	'Class:FAQ/Attribute:summary' => 'Sammenfatning',
+	'Class:FAQ/Attribute:summary+' => '',
+	'Class:FAQ/Attribute:description' => 'Beskrivelse',
+	'Class:FAQ/Attribute:description+' => '',
+	'Class:FAQ/Attribute:category_id' => 'Kategori',
+	'Class:FAQ/Attribute:category_id+' => '',
+	'Class:FAQ/Attribute:category_name' => 'Kategorinavn',
+	'Class:FAQ/Attribute:category_name+' => '',
+	'Class:FAQ/Attribute:error_code' => 'Fejlkode',
+	'Class:FAQ/Attribute:error_code+' => '',
+	'Class:FAQ/Attribute:key_words' => 'Nøgleord',
+	'Class:FAQ/Attribute:key_words+' => '',
+	'Class:FAQ/Attribute:domains' => 'Domains~~',
+));
+
+//
+// Class: FAQCategory
+//
+
+Dict::Add('DA DA', 'Danish', 'Dansk', array(
+	'Class:FAQCategory' => 'FAQ-Kategori',
+	'Class:FAQCategory+' => '',
+	'Class:FAQCategory/Attribute:name' => 'Navn',
+	'Class:FAQCategory/Attribute:name+' => '',
+	'Class:FAQCategory/Attribute:faq_list' => 'FAQs',
+	'Class:FAQCategory/Attribute:faq_list+' => '',
+));
+Dict::Add('DA DA', 'Danish', 'Dansk', array(
+	'Menu:ProblemManagement' => 'Problem Management',
+	'Menu:ProblemManagement+' => 'Problem Management',
+	'Menu:Problem:Shortcuts' => 'Genvej',
+	'Menu:FAQCategory' => 'FAQ-Kategorier',
+	'Menu:FAQCategory+' => '',
+	'Menu:FAQ' => 'FAQs',
+	'Menu:FAQ+' => '',
+	'Brick:Portal:FAQ:Menu' => 'FAQ~~',
+	'Brick:Portal:FAQ:Title' => 'Frequently Asked Questions~~',
+	'Brick:Portal:FAQ:Title+' => '<p>In a hurry?</p><p>Check out the list of most common questions and (maybe) find the expected answer right away.</p>~~',
+));
diff --git a/datamodels/2.x/itop-faq-light/dictionaries/de.dict.itop-faq-light.php b/datamodels/2.x/itop-faq-light/dictionaries/de.dict.itop-faq-light.php
new file mode 100644
index 000000000..5c688d808
--- /dev/null
+++ b/datamodels/2.x/itop-faq-light/dictionaries/de.dict.itop-faq-light.php
@@ -0,0 +1,72 @@
+<?php
+// Copyright (C) 2010-2014 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/*
+* @author ITOMIG GmbH <martin.raenker@itomig.de>
+
+* @copyright     Copyright (C) 2017 Combodo SARL
+* @licence	http://opensource.org/licenses/AGPL-3.0
+*		
+*/
+//
+// Class: FAQ
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:FAQ' => 'FAQ',
+	'Class:FAQ+' => '',
+	'Class:FAQ/Attribute:title' => 'Titel',
+	'Class:FAQ/Attribute:title+' => '',
+	'Class:FAQ/Attribute:summary' => 'Zusammenfassung',
+	'Class:FAQ/Attribute:summary+' => '',
+	'Class:FAQ/Attribute:description' => 'Beschreibung',
+	'Class:FAQ/Attribute:description+' => '',
+	'Class:FAQ/Attribute:category_id' => 'Kategorie',
+	'Class:FAQ/Attribute:category_id+' => '',
+	'Class:FAQ/Attribute:category_name' => 'Kategoriename',
+	'Class:FAQ/Attribute:category_name+' => '',
+	'Class:FAQ/Attribute:error_code' => 'Fehlercode',
+	'Class:FAQ/Attribute:error_code+' => '',
+	'Class:FAQ/Attribute:key_words' => 'Schlüsselwörter',
+	'Class:FAQ/Attribute:key_words+' => '',
+	'Class:FAQ/Attribute:domains' => 'Domäne',
+));
+
+//
+// Class: FAQCategory
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:FAQCategory' => 'FAQ-Kategorie',
+	'Class:FAQCategory+' => '',
+	'Class:FAQCategory/Attribute:name' => 'Name',
+	'Class:FAQCategory/Attribute:name+' => '',
+	'Class:FAQCategory/Attribute:faq_list' => 'FAQs',
+	'Class:FAQCategory/Attribute:faq_list+' => '',
+));
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Menu:ProblemManagement' => 'Problem Management',
+	'Menu:ProblemManagement+' => 'Problem Management',
+	'Menu:Problem:Shortcuts' => 'Shortcuts',
+	'Menu:FAQCategory' => 'FAQ-Kategorien',
+	'Menu:FAQCategory+' => '',
+	'Menu:FAQ' => 'FAQs',
+	'Menu:FAQ+' => '',
+	'Brick:Portal:FAQ:Menu' => 'FAQ',
+	'Brick:Portal:FAQ:Title' => 'Oft gestellte Fragen (FAQs)',
+	'Brick:Portal:FAQ:Title+' => '<p>In Eile?</p><p>Sehen Sie sich die meistgestellten Fragen an (FAQs) und finden Sie (eventuell) die Antwort direkt dort.</p>',
+));
diff --git a/datamodels/2.x/itop-faq-light/dictionaries/en.dict.itop-faq-light.php b/datamodels/2.x/itop-faq-light/dictionaries/en.dict.itop-faq-light.php
new file mode 100644
index 000000000..45531ab51
--- /dev/null
+++ b/datamodels/2.x/itop-faq-light/dictionaries/en.dict.itop-faq-light.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2018 Combodo SARL
+ * @license    http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with iTop. If not, see <http://www.gnu.org/licenses/>
+ */
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//
+// Class: FAQ
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:FAQ' => 'FAQ',
+	'Class:FAQ+' => 'Frequently asked questions',
+	'Class:FAQ/Attribute:title' => 'Title',
+	'Class:FAQ/Attribute:title+' => '',
+	'Class:FAQ/Attribute:summary' => 'Summary',
+	'Class:FAQ/Attribute:summary+' => '',
+	'Class:FAQ/Attribute:description' => 'Description',
+	'Class:FAQ/Attribute:description+' => '',
+	'Class:FAQ/Attribute:category_id' => 'Category',
+	'Class:FAQ/Attribute:category_id+' => '',
+	'Class:FAQ/Attribute:category_name' => 'Category name',
+	'Class:FAQ/Attribute:category_name+' => '',
+	'Class:FAQ/Attribute:error_code' => 'Error code',
+	'Class:FAQ/Attribute:error_code+' => '',
+	'Class:FAQ/Attribute:key_words' => 'Key words',
+	'Class:FAQ/Attribute:key_words+' => '',
+	'Class:FAQ/Attribute:domains' => 'Domains',
+));
+
+//
+// Class: FAQCategory
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:FAQCategory' => 'FAQ Category',
+	'Class:FAQCategory+' => 'Category for FAQ',
+	'Class:FAQCategory/Attribute:name' => 'Name',
+	'Class:FAQCategory/Attribute:name+' => '',
+	'Class:FAQCategory/Attribute:faq_list' => 'FAQs',
+	'Class:FAQCategory/Attribute:faq_list+' => 'All the frequently asked questions related to this category',
+));
+Dict::Add('EN US', 'English', 'English', array(
+	'Menu:ProblemManagement' => 'Problem Management',
+	'Menu:ProblemManagement+' => 'Problem Management',
+	'Menu:Problem:Shortcuts' => 'Shortcuts',
+	'Menu:FAQCategory' => 'FAQ categories',
+	'Menu:FAQCategory+' => 'All FAQ categories',
+	'Menu:FAQ' => 'FAQs',
+	'Menu:FAQ+' => 'All FAQs',
+	'Brick:Portal:FAQ:Menu' => 'FAQ',
+	'Brick:Portal:FAQ:Title' => 'Frequently Asked Questions',
+	'Brick:Portal:FAQ:Title+' => '<p>In a hurry?</p><p>Check out the list of most common questions and (maybe) find the expected answer right away.</p>',
+));
diff --git a/datamodels/2.x/itop-faq-light/dictionaries/es_cr.dict.itop-faq-light.php b/datamodels/2.x/itop-faq-light/dictionaries/es_cr.dict.itop-faq-light.php
new file mode 100644
index 000000000..a4fbb2162
--- /dev/null
+++ b/datamodels/2.x/itop-faq-light/dictionaries/es_cr.dict.itop-faq-light.php
@@ -0,0 +1,94 @@
+<?php
+// Copyright (C) 2010-2013 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2013 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ * @traductor   Miguel Turrubiates <miguel_tf@yahoo.com> 
+ */
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+//
+// Class: FAQ
+//
+
+Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+	'Class:FAQ' => 'Preguntas y Respuestas Frecuentes',
+	'Class:FAQ+' => 'Preguntas y Respuestas Frecuentes',
+	'Class:FAQ/Attribute:title' => 'Asunto',
+	'Class:FAQ/Attribute:title+' => 'Asunto',
+	'Class:FAQ/Attribute:summary' => 'Resumen',
+	'Class:FAQ/Attribute:summary+' => 'Resumen',
+	'Class:FAQ/Attribute:description' => 'Descripción',
+	'Class:FAQ/Attribute:description+' => 'Descripción',
+	'Class:FAQ/Attribute:category_id' => 'Categoría',
+	'Class:FAQ/Attribute:category_id+' => 'Categoría',
+	'Class:FAQ/Attribute:category_name' => 'Categoría',
+	'Class:FAQ/Attribute:category_name+' => 'Categoría',
+	'Class:FAQ/Attribute:error_code' => 'Código de Error',
+	'Class:FAQ/Attribute:error_code+' => 'Código de Error',
+	'Class:FAQ/Attribute:key_words' => 'Palabras Clave',
+	'Class:FAQ/Attribute:key_words+' => 'Palabras Clave',
+	'Class:FAQ/Attribute:domains' => 'Domains~~',
+));
+
+//
+// Class: FAQCategory
+//
+
+Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+	'Class:FAQCategory' => 'Categoría de Preguntas y Respuesta Frecuentes',
+	'Class:FAQCategory+' => 'Categoría de Preguntas y Respuesta Frecuentes',
+	'Class:FAQCategory/Attribute:name' => 'Nombre',
+	'Class:FAQCategory/Attribute:name+' => 'Nombre de Categoría de Preguntas y Respuestas Frecuentes',
+	'Class:FAQCategory/Attribute:faq_list' => 'FAQs',
+	'Class:FAQCategory/Attribute:faq_list+' => 'FAQs',
+));
+Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+	'Menu:ProblemManagement' => 'Gestión de problemas',
+	'Menu:ProblemManagement+' => 'Gestión de problemas',
+	'Menu:Problem:Shortcuts' => 'Acceso Rápido',
+	'Menu:FAQCategory' => 'Categorías de FAQ',
+	'Menu:FAQCategory+' => 'Categorías FAQ',
+	'Menu:FAQ' => 'Preguntas y Respuestas Frecuentes',
+	'Menu:FAQ+' => 'Preguntas y Respuestas Frecuentes',
+	'Brick:Portal:FAQ:Menu' => 'Preguntas y Respuestas',
+	'Brick:Portal:FAQ:Title' => 'Preguntas y Respuestas Frecuentes',
+	'Brick:Portal:FAQ:Title+' => '<p>¿En una prisa?</p><p>Vea la lista de las preguntas más comunes y encontrará (tal vez) la respuesta inmediata a sus necesidades.</p>',
+));
diff --git a/datamodels/2.x/itop-faq-light/dictionaries/fr.dict.itop-faq-light.php b/datamodels/2.x/itop-faq-light/dictionaries/fr.dict.itop-faq-light.php
new file mode 100644
index 000000000..e68561a95
--- /dev/null
+++ b/datamodels/2.x/itop-faq-light/dictionaries/fr.dict.itop-faq-light.php
@@ -0,0 +1,71 @@
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+//
+// Class: FAQ
+//
+
+Dict::Add('FR FR', 'French', 'Français', array(
+	'Class:FAQ' => 'FAQ',
+	'Class:FAQ+' => 'Question fréquement posée',
+	'Class:FAQ/Attribute:title' => 'Titre',
+	'Class:FAQ/Attribute:title+' => '',
+	'Class:FAQ/Attribute:summary' => 'Résumé',
+	'Class:FAQ/Attribute:summary+' => '',
+	'Class:FAQ/Attribute:description' => 'Description',
+	'Class:FAQ/Attribute:description+' => '',
+	'Class:FAQ/Attribute:category_id' => 'Categorie',
+	'Class:FAQ/Attribute:category_id+' => '',
+	'Class:FAQ/Attribute:category_name' => 'Nom catégorie',
+	'Class:FAQ/Attribute:category_name+' => '',
+	'Class:FAQ/Attribute:error_code' => 'Code d\'erreur',
+	'Class:FAQ/Attribute:error_code+' => '',
+	'Class:FAQ/Attribute:key_words' => 'Mots clés',
+	'Class:FAQ/Attribute:key_words+' => '',
+	'Class:FAQ/Attribute:domains' => 'Domaines',
+));
+
+//
+// Class: FAQCategory
+//
+
+Dict::Add('FR FR', 'French', 'Français', array(
+	'Class:FAQCategory' => 'Catégorie de FAQ',
+	'Class:FAQCategory+' => 'Catégorie de FAQ',
+	'Class:FAQCategory/Attribute:name' => 'Nom',
+	'Class:FAQCategory/Attribute:name+' => '',
+	'Class:FAQCategory/Attribute:faq_list' => 'FAQs',
+	'Class:FAQCategory/Attribute:faq_list+' => '',
+));
+
+Dict::Add('FR FR', 'French', 'Français', array(
+	'Menu:ProblemManagement' => 'Gestion des problèmes',
+	'Menu:ProblemManagement+' => 'Gestion des problèmes',
+	'Menu:Problem:Shortcuts' => 'Raccourcis',
+	'Menu:FAQCategory' => 'Catégories de FAQ',
+	'Menu:FAQCategory+' => 'Toutes les catégories de FAQ',
+	'Menu:FAQ' => 'FAQs',
+	'Menu:FAQ+' => 'Toutes les  FAQs',
+	'Brick:Portal:FAQ:Menu' => 'FAQ',
+	'Brick:Portal:FAQ:Title' => 'Foire Aux Questions',
+	'Brick:Portal:FAQ:Title+' => '<p>Vous êtes pressé&nbsp;?</p><p>Consultez la liste des questions les plus fréquentes et vous trouverez (peut-être) immédiatement la réponse à votre besoin.</p>',
+));
diff --git a/datamodels/2.x/itop-faq-light/dictionaries/hu.dict.itop-faq-light.php b/datamodels/2.x/itop-faq-light/dictionaries/hu.dict.itop-faq-light.php
new file mode 100644
index 000000000..b177c4de9
--- /dev/null
+++ b/datamodels/2.x/itop-faq-light/dictionaries/hu.dict.itop-faq-light.php
@@ -0,0 +1,71 @@
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+//
+// Class: FAQ
+//
+
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+	'Class:FAQ' => 'FAQ~~',
+	'Class:FAQ+' => 'Frequently asked questions~~',
+	'Class:FAQ/Attribute:title' => 'Title~~',
+	'Class:FAQ/Attribute:title+' => '~~',
+	'Class:FAQ/Attribute:summary' => 'Summary~~',
+	'Class:FAQ/Attribute:summary+' => '~~',
+	'Class:FAQ/Attribute:description' => 'Description~~',
+	'Class:FAQ/Attribute:description+' => '~~',
+	'Class:FAQ/Attribute:category_id' => 'Category~~',
+	'Class:FAQ/Attribute:category_id+' => '~~',
+	'Class:FAQ/Attribute:category_name' => 'Category name~~',
+	'Class:FAQ/Attribute:category_name+' => '~~',
+	'Class:FAQ/Attribute:error_code' => 'Error code~~',
+	'Class:FAQ/Attribute:error_code+' => '~~',
+	'Class:FAQ/Attribute:key_words' => 'Key words~~',
+	'Class:FAQ/Attribute:key_words+' => '~~',
+	'Class:FAQ/Attribute:domains' => 'Domains~~',
+));
+
+//
+// Class: FAQCategory
+//
+
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+	'Class:FAQCategory' => 'FAQ Category~~',
+	'Class:FAQCategory+' => 'Category for FAQ~~',
+	'Class:FAQCategory/Attribute:name' => 'Name~~',
+	'Class:FAQCategory/Attribute:name+' => '~~',
+	'Class:FAQCategory/Attribute:faq_list' => 'FAQs~~',
+	'Class:FAQCategory/Attribute:faq_list+' => 'All the frequently asked questions related to this category~~',
+));
+
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+	'Menu:ProblemManagement' => 'Probléma menedzsment',
+	'Menu:ProblemManagement+' => '',
+	'Menu:Problem:Shortcuts' => 'Gyorsmenü',
+	'Menu:FAQCategory' => 'FAQ categories~~',
+	'Menu:FAQCategory+' => 'All FAQ categories~~',
+	'Menu:FAQ' => 'FAQs~~',
+	'Menu:FAQ+' => 'All FAQs~~',
+	'Brick:Portal:FAQ:Menu' => 'FAQ~~',
+	'Brick:Portal:FAQ:Title' => 'Frequently Asked Questions~~',
+	'Brick:Portal:FAQ:Title+' => '<p>In a hurry?</p><p>Check out the list of most common questions and (maybe) find the expected answer right away.</p>~~',
+));
diff --git a/datamodels/2.x/itop-faq-light/dictionaries/it.dict.itop-faq-light.php b/datamodels/2.x/itop-faq-light/dictionaries/it.dict.itop-faq-light.php
new file mode 100644
index 000000000..d6021053d
--- /dev/null
+++ b/datamodels/2.x/itop-faq-light/dictionaries/it.dict.itop-faq-light.php
@@ -0,0 +1,94 @@
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//
+// Class: FAQ
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:FAQ' => 'FAQ',
+	'Class:FAQ+' => 'Domande frequenti',
+	'Class:FAQ/Attribute:title' => 'Titolo',
+	'Class:FAQ/Attribute:title+' => '~~',
+	'Class:FAQ/Attribute:summary' => 'Riepilogo',
+	'Class:FAQ/Attribute:summary+' => '~~',
+	'Class:FAQ/Attribute:description' => 'Descrizione',
+	'Class:FAQ/Attribute:description+' => '~~',
+	'Class:FAQ/Attribute:category_id' => 'Categoria',
+	'Class:FAQ/Attribute:category_id+' => '~~',
+	'Class:FAQ/Attribute:category_name' => 'Nome della Categoria',
+	'Class:FAQ/Attribute:category_name+' => '~~',
+	'Class:FAQ/Attribute:error_code' => 'Codice errore',
+	'Class:FAQ/Attribute:error_code+' => '~~',
+	'Class:FAQ/Attribute:key_words' => 'Parola Chiave',
+	'Class:FAQ/Attribute:key_words+' => '~~',
+	'Class:FAQ/Attribute:domains' => 'Dominio',
+));
+
+//
+// Class: FAQCategory
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:FAQCategory' => 'Fategoria FAQ',
+	'Class:FAQCategory+' => 'Categoria per FAQ',
+	'Class:FAQCategory/Attribute:name' => 'Nome',
+	'Class:FAQCategory/Attribute:name+' => '~~',
+	'Class:FAQCategory/Attribute:faq_list' => 'FAQs',
+	'Class:FAQCategory/Attribute:faq_list+' => 'Tutte le faq legate a questa categoria',
+));
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Menu:ProblemManagement' => 'Gestione dei Problemi',
+	'Menu:ProblemManagement+' => 'Gestione dei Problemi',
+	'Menu:Problem:Shortcuts' => 'Scorciatoia',
+	'Menu:FAQCategory' => 'Categoria FAQ',
+	'Menu:FAQCategory+' => 'Tutte le categorie FAQ',
+	'Menu:FAQ' => 'FAQs',
+	'Menu:FAQ+' => 'Tutte le FAQs',
+	'Brick:Portal:FAQ:Menu' => 'FAQ',
+	'Brick:Portal:FAQ:Title' => 'Domande frequenti',
+	'Brick:Portal:FAQ:Title+' => '<p>Sei di fretta?</p><p>Verifica nella lista delle FAQ se trovi la risposta al tuo problema.</p>',
+));
diff --git a/datamodels/2.x/itop-faq-light/dictionaries/ja.dict.itop-faq-light.php b/datamodels/2.x/itop-faq-light/dictionaries/ja.dict.itop-faq-light.php
new file mode 100644
index 000000000..aefcb2303
--- /dev/null
+++ b/datamodels/2.x/itop-faq-light/dictionaries/ja.dict.itop-faq-light.php
@@ -0,0 +1,71 @@
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @licence	http://opensource.org/licenses/AGPL-3.0
+ */
+
+//
+// Class: FAQ
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:FAQ' => 'FAQ',
+	'Class:FAQ+' => 'よくある質問',
+	'Class:FAQ/Attribute:title' => 'タイトル',
+	'Class:FAQ/Attribute:title+' => '',
+	'Class:FAQ/Attribute:summary' => '要約',
+	'Class:FAQ/Attribute:summary+' => '',
+	'Class:FAQ/Attribute:description' => '説明',
+	'Class:FAQ/Attribute:description+' => '',
+	'Class:FAQ/Attribute:category_id' => 'カテゴリ',
+	'Class:FAQ/Attribute:category_id+' => '',
+	'Class:FAQ/Attribute:category_name' => 'カテゴリ名',
+	'Class:FAQ/Attribute:category_name+' => '',
+	'Class:FAQ/Attribute:error_code' => 'エラーコード',
+	'Class:FAQ/Attribute:error_code+' => '',
+	'Class:FAQ/Attribute:key_words' => 'キーワード',
+	'Class:FAQ/Attribute:key_words+' => '',
+	'Class:FAQ/Attribute:domains' => 'Domains~~',
+));
+
+//
+// Class: FAQCategory
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:FAQCategory' => 'FAQカテゴリ',
+	'Class:FAQCategory+' => 'FAQのためのカテゴリ',
+	'Class:FAQCategory/Attribute:name' => '名前',
+	'Class:FAQCategory/Attribute:name+' => '',
+	'Class:FAQCategory/Attribute:faq_list' => 'FAQ',
+	'Class:FAQCategory/Attribute:faq_list+' => '',
+));
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Menu:ProblemManagement' => '問題管理',
+	'Menu:ProblemManagement+' => '問題管理',
+	'Menu:Problem:Shortcuts' => 'ショートカット',
+	'Menu:FAQCategory' => 'FAQカテゴリ',
+	'Menu:FAQCategory+' => '全てのFAQカテゴリ',
+	'Menu:FAQ' => 'FAQ',
+	'Menu:FAQ+' => '全FAQ',
+	'Brick:Portal:FAQ:Menu' => 'FAQ~~',
+	'Brick:Portal:FAQ:Title' => 'Frequently Asked Questions~~',
+	'Brick:Portal:FAQ:Title+' => '<p>In a hurry?</p><p>Check out the list of most common questions and (maybe) find the expected answer right away.</p>~~',
+));
diff --git a/datamodels/2.x/itop-faq-light/dictionaries/nl.dict.itop-faq-light.php b/datamodels/2.x/itop-faq-light/dictionaries/nl.dict.itop-faq-light.php
new file mode 100644
index 000000000..1d77c6c33
--- /dev/null
+++ b/datamodels/2.x/itop-faq-light/dictionaries/nl.dict.itop-faq-light.php
@@ -0,0 +1,100 @@
+<?php
+// Copyright (C) 2010-2019 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+ * @author	LinProfs <info@linprofs.com>
+ * 
+ * Linux & Open Source Professionals
+ * http://www.linprofs.com
+ *
+ * @author Jeffrey Bostoen - <jbostoen.itop@outlook.com> (2018 - 2020)
+ * 
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @licence	http://opensource.org/licenses/AGPL-3.0
+ */
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//
+// Class: FAQ
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:FAQ' => 'FAQ',
+	'Class:FAQ+' => 'Veelgestelde vragen',
+	'Class:FAQ/Attribute:title' => 'Titel',
+	'Class:FAQ/Attribute:title+' => '',
+	'Class:FAQ/Attribute:summary' => 'Samenvatting',
+	'Class:FAQ/Attribute:summary+' => '',
+	'Class:FAQ/Attribute:description' => 'Omschrijving',
+	'Class:FAQ/Attribute:description+' => '',
+	'Class:FAQ/Attribute:category_id' => 'Categorie',
+	'Class:FAQ/Attribute:category_id+' => '',
+	'Class:FAQ/Attribute:category_name' => 'Naam categorie',
+	'Class:FAQ/Attribute:category_name+' => '',
+	'Class:FAQ/Attribute:error_code' => 'Foutcode',
+	'Class:FAQ/Attribute:error_code+' => '',
+	'Class:FAQ/Attribute:key_words' => 'Zoektermen',
+	'Class:FAQ/Attribute:key_words+' => '',
+	'Class:FAQ/Attribute:domains' => 'Domeinen',
+));
+
+//
+// Class: FAQCategory
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:FAQCategory' => 'FAQ-categorie',
+	'Class:FAQCategory+' => 'Categorie voor de FAQ',
+	'Class:FAQCategory/Attribute:name' => 'Naam',
+	'Class:FAQCategory/Attribute:name+' => '',
+	'Class:FAQCategory/Attribute:faq_list' => 'FAQ\'s',
+	'Class:FAQCategory/Attribute:faq_list+' => 'Alle veelgestelde vragen gerelateerd aan deze categorie',
+));
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Menu:ProblemManagement' => 'Probleem Management',
+	'Menu:ProblemManagement+' => 'Probleem Management',
+	'Menu:Problem:Shortcuts' => 'Snelkoppelingen',
+	'Menu:FAQCategory' => 'FAQ-categorieën',
+	'Menu:FAQCategory+' => 'Alle FAQ-categorieën',
+	'Menu:FAQ' => 'FAQ\'s',
+	'Menu:FAQ+' => 'Alle FAQ\'s',
+	'Brick:Portal:FAQ:Menu' => 'FAQ',
+	'Brick:Portal:FAQ:Title' => 'Veelgestelde vragen',
+	'Brick:Portal:FAQ:Title+' => '<p>Gehaast?</p><p>Bekijk deze lijst van veelgestelde vragen. Misschien staat er al een antwoord tussen.</p>',
+));
diff --git a/datamodels/2.x/itop-faq-light/dictionaries/pt_br.dict.itop-faq-light.php b/datamodels/2.x/itop-faq-light/dictionaries/pt_br.dict.itop-faq-light.php
new file mode 100644
index 000000000..0bafbdd58
--- /dev/null
+++ b/datamodels/2.x/itop-faq-light/dictionaries/pt_br.dict.itop-faq-light.php
@@ -0,0 +1,95 @@
+<?php
+// Copyright (C) 2010-2018 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2018 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//
+// Class: FAQ
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:FAQ' => 'FAQ',
+	'Class:FAQ+' => 'Perguntas mais frequentes',
+	'Class:FAQ/Attribute:title' => 'Título',
+	'Class:FAQ/Attribute:title+' => '',
+	'Class:FAQ/Attribute:summary' => 'Índice',
+	'Class:FAQ/Attribute:summary+' => '',
+	'Class:FAQ/Attribute:description' => 'Descrição',
+	'Class:FAQ/Attribute:description+' => '',
+	'Class:FAQ/Attribute:category_id' => 'Categoria',
+	'Class:FAQ/Attribute:category_id+' => '',
+	'Class:FAQ/Attribute:category_name' => 'Nome categoria',
+	'Class:FAQ/Attribute:category_name+' => '',
+	'Class:FAQ/Attribute:error_code' => 'Código erro',
+	'Class:FAQ/Attribute:error_code+' => '',
+	'Class:FAQ/Attribute:key_words' => 'Palavras-chaves',
+	'Class:FAQ/Attribute:key_words+' => '',
+	'Class:FAQ/Attribute:domains' => 'Domínios',
+));
+
+//
+// Class: FAQCategory
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:FAQCategory' => 'Categoria FAQ',
+	'Class:FAQCategory+' => 'Categoria por FAQ',
+	'Class:FAQCategory/Attribute:name' => 'Nome',
+	'Class:FAQCategory/Attribute:name+' => '',
+	'Class:FAQCategory/Attribute:faq_list' => 'FAQs',
+	'Class:FAQCategory/Attribute:faq_list+' => 'Todas as perguntas mais frequentes vinculadas a essa categoria',
+));
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Menu:ProblemManagement' => 'Gerencimento Problemas',
+	'Menu:ProblemManagement+' => 'Gerencimento Problemas',
+	'Menu:Problem:Shortcuts' => 'Atalho',
+	'Menu:FAQCategory' => 'Categorias FAQ',
+	'Menu:FAQCategory+' => 'Todas categorias FAQ',
+	'Menu:FAQ' => 'FAQs',
+	'Menu:FAQ+' => 'Todas FAQs',
+	'Brick:Portal:FAQ:Menu' => 'FAQ',
+	'Brick:Portal:FAQ:Title' => 'Perguntes frequentes (FAQ)',
+	'Brick:Portal:FAQ:Title+' => '<p>Com pressa?</p><p>Confira a lista de perguntas mais comuns e (talvez) encontre a resposta esperada imediatamente.</p>',
+));
diff --git a/datamodels/2.x/itop-faq-light/dictionaries/ru.dict.itop-faq-light.php b/datamodels/2.x/itop-faq-light/dictionaries/ru.dict.itop-faq-light.php
new file mode 100644
index 000000000..43055b352
--- /dev/null
+++ b/datamodels/2.x/itop-faq-light/dictionaries/ru.dict.itop-faq-light.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Локализация интерфейса Combodo iTop подготовлена сообществом iTop по-русски http://community.itop-itsm.ru.
+ *
+ * @author      Vladimir Kunin <v.b.kunin@gmail.com>
+ * @link        http://community.itop-itsm.ru  iTop Russian Community
+ * @link        https://github.com/itop-itsm-ru/itop-rus
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ *
+ */
+
+//
+// Class: FAQ
+//
+
+Dict::Add('RU RU', 'Russian', 'Русский', array(
+	'Class:FAQ' => 'FAQ',
+	'Class:FAQ+' => 'Часто задаваемые вопросы',
+	'Class:FAQ/Attribute:title' => 'Название',
+	'Class:FAQ/Attribute:title+' => '',
+	'Class:FAQ/Attribute:summary' => 'Краткое содержание',
+	'Class:FAQ/Attribute:summary+' => '',
+	'Class:FAQ/Attribute:description' => 'Описание',
+	'Class:FAQ/Attribute:description+' => '',
+	'Class:FAQ/Attribute:category_id' => 'Категория',
+	'Class:FAQ/Attribute:category_id+' => '',
+	'Class:FAQ/Attribute:category_name' => 'Категория',
+	'Class:FAQ/Attribute:category_name+' => '',
+	'Class:FAQ/Attribute:error_code' => 'Код ошибки',
+	'Class:FAQ/Attribute:error_code+' => '',
+	'Class:FAQ/Attribute:key_words' => 'Ключевые слова',
+	'Class:FAQ/Attribute:key_words+' => '',
+	'Class:FAQ/Attribute:domains' => 'Домены',
+));
+
+//
+// Class: FAQCategory
+//
+
+Dict::Add('RU RU', 'Russian', 'Русский', array(
+	'Class:FAQCategory' => 'Категории FAQ',
+	'Class:FAQCategory+' => 'Категории FAQ',
+	'Class:FAQCategory/Attribute:name' => 'Название',
+	'Class:FAQCategory/Attribute:name+' => '',
+	'Class:FAQCategory/Attribute:faq_list' => 'FAQ',
+	'Class:FAQCategory/Attribute:faq_list+' => 'Связанные FAQ',
+));
+
+Dict::Add('RU RU', 'Russian', 'Русский', array(
+	'Menu:ProblemManagement' => 'Управление проблемами',
+	'Menu:ProblemManagement+' => 'Управление проблемами',
+	'Menu:Problem:Shortcuts' => 'Ярлыки',
+	'Menu:FAQCategory' => 'Категории FAQ',
+	'Menu:FAQCategory+' => 'Категории FAQ',
+	'Menu:FAQ' => 'FAQ',
+	'Menu:FAQ+' => 'Часто задаваемые вопросы',
+	'Brick:Portal:FAQ:Menu' => 'FAQ',
+	'Brick:Portal:FAQ:Title' => 'Часто задаваемые вопросы',
+	'Brick:Portal:FAQ:Title+' => '<p>Торопитесь?</p><p>Проверьте список часто задаваемых вопросов, возможно, ответ уже есть.</p>',
+));
diff --git a/datamodels/2.x/itop-faq-light/dictionaries/sk.dict.itop-faq-light.php b/datamodels/2.x/itop-faq-light/dictionaries/sk.dict.itop-faq-light.php
new file mode 100644
index 000000000..686fa511a
--- /dev/null
+++ b/datamodels/2.x/itop-faq-light/dictionaries/sk.dict.itop-faq-light.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2018 Combodo SARL
+ * @license	http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with iTop. If not, see <http://www.gnu.org/licenses/>
+ */
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//
+// Class: FAQ
+//
+
+Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
+	'Class:FAQ' => 'FAQ~~',
+	'Class:FAQ+' => 'Frequently asked questions~~',
+	'Class:FAQ/Attribute:title' => 'Title~~',
+	'Class:FAQ/Attribute:title+' => '~~',
+	'Class:FAQ/Attribute:summary' => 'Summary~~',
+	'Class:FAQ/Attribute:summary+' => '~~',
+	'Class:FAQ/Attribute:description' => 'Description~~',
+	'Class:FAQ/Attribute:description+' => '~~',
+	'Class:FAQ/Attribute:category_id' => 'Category~~',
+	'Class:FAQ/Attribute:category_id+' => '~~',
+	'Class:FAQ/Attribute:category_name' => 'Category name~~',
+	'Class:FAQ/Attribute:category_name+' => '~~',
+	'Class:FAQ/Attribute:error_code' => 'Error code~~',
+	'Class:FAQ/Attribute:error_code+' => '~~',
+	'Class:FAQ/Attribute:key_words' => 'Key words~~',
+	'Class:FAQ/Attribute:key_words+' => '~~',
+	'Class:FAQ/Attribute:domains' => 'Domains~~',
+));
+
+//
+// Class: FAQCategory
+//
+
+Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
+	'Class:FAQCategory' => 'FAQ Category~~',
+	'Class:FAQCategory+' => 'Category for FAQ~~',
+	'Class:FAQCategory/Attribute:name' => 'Name~~',
+	'Class:FAQCategory/Attribute:name+' => '~~',
+	'Class:FAQCategory/Attribute:faq_list' => 'FAQs~~',
+	'Class:FAQCategory/Attribute:faq_list+' => 'All the frequently asked questions related to this category~~',
+));
+
+Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
+	'Menu:ProblemManagement' => 'Problem Management~~',
+	'Menu:ProblemManagement+' => 'Problem Management~~',
+	'Menu:Problem:Shortcuts' => 'Shortcuts~~',
+	'Menu:FAQCategory' => 'FAQ categories~~',
+	'Menu:FAQCategory+' => 'All FAQ categories~~',
+	'Menu:FAQ' => 'FAQs~~',
+	'Menu:FAQ+' => 'All FAQs~~',
+	'Brick:Portal:FAQ:Menu' => 'FAQ~~',
+	'Brick:Portal:FAQ:Title' => 'Frequently Asked Questions~~',
+	'Brick:Portal:FAQ:Title+' => '<p>In a hurry?</p><p>Check out the list of most common questions and (maybe) find the expected answer right away.</p>~~',
+));
diff --git a/datamodels/2.x/itop-faq-light/dictionaries/tr.dict.itop-faq-light.php b/datamodels/2.x/itop-faq-light/dictionaries/tr.dict.itop-faq-light.php
new file mode 100644
index 000000000..1289b4374
--- /dev/null
+++ b/datamodels/2.x/itop-faq-light/dictionaries/tr.dict.itop-faq-light.php
@@ -0,0 +1,96 @@
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+ * Localized data
+ *
+ * @author      Izzet Sirin <izzet.sirin@htr.com.tr>
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//
+// Class: FAQ
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:FAQ' => 'FAQ~~',
+	'Class:FAQ+' => 'Frequently asked questions~~',
+	'Class:FAQ/Attribute:title' => 'Title~~',
+	'Class:FAQ/Attribute:title+' => '~~',
+	'Class:FAQ/Attribute:summary' => 'Summary~~',
+	'Class:FAQ/Attribute:summary+' => '~~',
+	'Class:FAQ/Attribute:description' => 'Description~~',
+	'Class:FAQ/Attribute:description+' => '~~',
+	'Class:FAQ/Attribute:category_id' => 'Category~~',
+	'Class:FAQ/Attribute:category_id+' => '~~',
+	'Class:FAQ/Attribute:category_name' => 'Category name~~',
+	'Class:FAQ/Attribute:category_name+' => '~~',
+	'Class:FAQ/Attribute:error_code' => 'Error code~~',
+	'Class:FAQ/Attribute:error_code+' => '~~',
+	'Class:FAQ/Attribute:key_words' => 'Key words~~',
+	'Class:FAQ/Attribute:key_words+' => '~~',
+	'Class:FAQ/Attribute:domains' => 'Domains~~',
+));
+
+//
+// Class: FAQCategory
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:FAQCategory' => 'FAQ Category~~',
+	'Class:FAQCategory+' => 'Category for FAQ~~',
+	'Class:FAQCategory/Attribute:name' => 'Name~~',
+	'Class:FAQCategory/Attribute:name+' => '~~',
+	'Class:FAQCategory/Attribute:faq_list' => 'FAQs~~',
+	'Class:FAQCategory/Attribute:faq_list+' => 'All the frequently asked questions related to this category~~',
+));
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Menu:ProblemManagement' => 'Problem Yönetimi',
+	'Menu:ProblemManagement+' => 'Problem Yönetimi',
+	'Menu:Problem:Shortcuts' => 'Kısayollar',
+	'Menu:FAQCategory' => 'FAQ categories~~',
+	'Menu:FAQCategory+' => 'All FAQ categories~~',
+	'Menu:FAQ' => 'FAQs~~',
+	'Menu:FAQ+' => 'All FAQs~~',
+	'Brick:Portal:FAQ:Menu' => 'FAQ~~',
+	'Brick:Portal:FAQ:Title' => 'Frequently Asked Questions~~',
+	'Brick:Portal:FAQ:Title+' => '<p>In a hurry?</p><p>Check out the list of most common questions and (maybe) find the expected answer right away.</p>~~',
+));
diff --git a/datamodels/2.x/itop-faq-light/dictionaries/zh_cn.dict.itop-faq-light.php b/datamodels/2.x/itop-faq-light/dictionaries/zh_cn.dict.itop-faq-light.php
new file mode 100644
index 000000000..4de29fc63
--- /dev/null
+++ b/datamodels/2.x/itop-faq-light/dictionaries/zh_cn.dict.itop-faq-light.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2018 Combodo SARL
+ * @license    http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with iTop. If not, see <http://www.gnu.org/licenses/>
+ */
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//
+// Class: FAQ
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:FAQ' => 'FAQ',
+	'Class:FAQ+' => 'FAQ',
+	'Class:FAQ/Attribute:title' => '标题',
+	'Class:FAQ/Attribute:title+' => '',
+	'Class:FAQ/Attribute:summary' => '概要',
+	'Class:FAQ/Attribute:summary+' => '',
+	'Class:FAQ/Attribute:description' => '描述',
+	'Class:FAQ/Attribute:description+' => '',
+	'Class:FAQ/Attribute:category_id' => '类别',
+	'Class:FAQ/Attribute:category_id+' => '',
+	'Class:FAQ/Attribute:category_name' => '类别名称',
+	'Class:FAQ/Attribute:category_name+' => '',
+	'Class:FAQ/Attribute:error_code' => '错误代码',
+	'Class:FAQ/Attribute:error_code+' => '',
+	'Class:FAQ/Attribute:key_words' => '关键字',
+	'Class:FAQ/Attribute:key_words+' => '',
+	'Class:FAQ/Attribute:domains' => 'Domains~~',
+));
+
+//
+// Class: FAQCategory
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:FAQCategory' => 'FAQ 类别',
+	'Class:FAQCategory+' => 'FAQ 类别',
+	'Class:FAQCategory/Attribute:name' => '名称',
+	'Class:FAQCategory/Attribute:name+' => '',
+	'Class:FAQCategory/Attribute:faq_list' => 'FAQ',
+	'Class:FAQCategory/Attribute:faq_list+' => '该类别FAQ 相关的所有常见问题',
+));
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Menu:ProblemManagement' => '问题管理',
+	'Menu:ProblemManagement+' => '问题管理',
+	'Menu:Problem:Shortcuts' => '快捷方式',
+	'Menu:FAQCategory' => 'FAQ 类别',
+	'Menu:FAQCategory+' => '所有FAQ 类别',
+	'Menu:FAQ' => 'FAQ',
+	'Menu:FAQ+' => '所有FAQ',
+	'Brick:Portal:FAQ:Menu' => 'FAQ',
+	'Brick:Portal:FAQ:Title' => 'FAQ',
+	'Brick:Portal:FAQ:Title+' => '<p>需要帮助?</p><p>查阅列表中的常见问题,或许可以立即找到令您满意的答案.</p>',
+));
diff --git a/datamodels/2.x/itop-knownerror-mgmt/images/faq.png b/datamodels/2.x/itop-faq-light/images/faq.png
similarity index 100%
rename from datamodels/2.x/itop-knownerror-mgmt/images/faq.png
rename to datamodels/2.x/itop-faq-light/images/faq.png
diff --git a/datamodels/2.x/itop-knownerror-mgmt/module.itop-knownerror-mgmt.php b/datamodels/2.x/itop-faq-light/module.itop-faq-light.php
similarity index 93%
rename from datamodels/2.x/itop-knownerror-mgmt/module.itop-knownerror-mgmt.php
rename to datamodels/2.x/itop-faq-light/module.itop-faq-light.php
index 1c8217a0f..5b27be69c 100755
--- a/datamodels/2.x/itop-knownerror-mgmt/module.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-faq-light/module.itop-faq-light.php
@@ -3,18 +3,17 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-knownerror-mgmt/2.8.0',
+	'itop-faq-light/2.8.0',
 	array(
 		// Identification
 		//
-		'label' => 'Known Errors Database',
+		'label' => 'Frequently Asked Questions Database',
 		'category' => 'business',
 
 		// Setup
 		//
 		'dependencies' => array(
-			'itop-config-mgmt/2.2.0',
-			'itop-tickets/2.3.0',
+			'itop-structure/2.7.0',
 		),
 		'mandatory' => false,
 		'visible' => true,
@@ -23,7 +22,7 @@ SetupWebPage::AddModule(
 		// Components
 		//
 		'datamodel' => array(
-			'model.itop-knownerror-mgmt.php',
+			'model.itop-faq-light.php',
 		),
 		'data.struct' => array(
 			//'data.struct.itop-knownerror-mgmt.xml',
diff --git a/datamodels/2.x/itop-knownerror-mgmt/datamodel.itop-knownerror-mgmt.xml b/datamodels/2.x/itop-knownerror-light/datamodel.itop-knownerror-light.xml
similarity index 58%
rename from datamodels/2.x/itop-knownerror-mgmt/datamodel.itop-knownerror-mgmt.xml
rename to datamodels/2.x/itop-knownerror-light/datamodel.itop-knownerror-light.xml
index 956a2b88c..e93b98a2a 100755
--- a/datamodels/2.x/itop-knownerror-mgmt/datamodel.itop-knownerror-mgmt.xml
+++ b/datamodels/2.x/itop-knownerror-light/datamodel.itop-knownerror-light.xml
@@ -399,209 +399,6 @@
         </list>
       </presentation>
     </class>
-    <class id="FAQ" _delta="define">
-      <parent>cmdbAbstractObject</parent>
-      <properties>
-        <category>bizmodel,searchable,knownerrormgmt</category>
-        <abstract>false</abstract>
-        <key_type>autoincrement</key_type>
-        <db_table>faq</db_table>
-        <db_key_field>id</db_key_field>
-        <db_final_class_field/>
-        <naming>
-          <attributes>
-            <attribute id="title"/>
-          </attributes>
-        </naming>
-        <display_template/>
-        <icon>images/faq.png</icon>
-        <reconciliation>
-          <attributes>
-            <attribute id="title"/>
-          </attributes>
-        </reconciliation>
-      </properties>
-      <fields>
-        <field id="title" xsi:type="AttributeString">
-          <sql>title</sql>
-          <default_value/>
-          <is_null_allowed>false</is_null_allowed>
-        </field>
-        <field id="summary" xsi:type="AttributeText">
-          <sql>summary</sql>
-          <default_value/>
-          <is_null_allowed>true</is_null_allowed>
-        </field>
-        <field id="description" xsi:type="AttributeHTML">
-          <sql>description</sql>
-          <default_value/>
-          <is_null_allowed>true</is_null_allowed>
-        </field>
-        <field id="category_id" xsi:type="AttributeExternalKey">
-          <sql>category_id</sql>
-          <target_class>FAQCategory</target_class>
-          <is_null_allowed>false</is_null_allowed>
-          <on_target_delete>DEL_MANUAL</on_target_delete>
-        </field>
-        <field id="category_name" xsi:type="AttributeExternalField">
-          <extkey_attcode>category_id</extkey_attcode>
-          <target_attcode>name</target_attcode>
-        </field>
-        <field id="error_code" xsi:type="AttributeString">
-          <sql>error_code</sql>
-          <default_value/>
-          <is_null_allowed>true</is_null_allowed>
-        </field>
-        <field id="key_words" xsi:type="AttributeString">
-          <sql>key_words</sql>
-          <default_value/>
-          <is_null_allowed>true</is_null_allowed>
-        </field>
-        <field id="domains" xsi:type="AttributeTagSet">
-          <sql>domains</sql>
-          <is_null_allowed>true</is_null_allowed>
-          <tracking_level>all</tracking_level>
-          <max_items>12</max_items>
-        </field>
-      </fields>
-      <methods/>
-      <presentation>
-        <details>
-          <items>
-            <item id="category_id">
-              <rank>10</rank>
-            </item>
-            <item id="title">
-              <rank>20</rank>
-            </item>
-            <item id="error_code">
-              <rank>30</rank>
-            </item>
-            <item id="key_words">
-              <rank>40</rank>
-            </item>
-            <item id="domains">
-              <rank>50</rank>
-            </item>
-            <item id="summary">
-              <rank>60</rank>
-            </item>
-            <item id="description">
-              <rank>70</rank>
-            </item>
-          </items>
-        </details>
-        <search>
-          <items>
-            <item id="category_id">
-              <rank>10</rank>
-            </item>
-            <item id="title">
-              <rank>20</rank>
-            </item>
-            <item id="summary">
-              <rank>30</rank>
-            </item>
-            <item id="error_code">
-              <rank>40</rank>
-            </item>
-            <item id="domains">
-              <rank>50</rank>
-            </item>
-          </items>
-        </search>
-        <default_search>
-          <items>
-            <item id="title">
-              <rank>10</rank>
-            </item>
-            <item id="summary">
-              <rank>20</rank>
-            </item>
-            <item id="category_id">
-              <rank>30</rank>
-            </item>
-          </items>
-        </default_search>
-        <list>
-          <items>
-            <item id="category_id">
-              <rank>10</rank>
-            </item>
-            <item id="error_code">
-              <rank>20</rank>
-            </item>
-            <item id="domains">
-              <rank>30</rank>
-            </item>
-          </items>
-        </list>
-      </presentation>
-    </class>
-    <class id="FAQCategory" _delta="define">
-      <parent>cmdbAbstractObject</parent>
-      <properties>
-        <category>bizmodel,searchable,knownerrormgmt</category>
-        <abstract>false</abstract>
-        <key_type>autoincrement</key_type>
-        <db_table>faqcategory</db_table>
-        <db_key_field>id</db_key_field>
-        <db_final_class_field/>
-        <naming>
-          <attributes>
-            <attribute id="name"/>
-          </attributes>
-        </naming>
-        <display_template/>
-        <icon/>
-        <reconciliation>
-          <attributes>
-            <attribute id="name"/>
-          </attributes>
-        </reconciliation>
-      </properties>
-      <fields>
-        <field id="name" xsi:type="AttributeString">
-          <sql>nam</sql>
-          <default_value/>
-          <is_null_allowed>false</is_null_allowed>
-        </field>
-        <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>
-          <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="faq_list">
-              <rank>20</rank>
-            </item>
-          </items>
-        </details>
-        <search>
-          <items>
-            <item id="name">
-              <rank>10</rank>
-            </item>
-          </items>
-        </search>
-        <default_search>
-          <items>
-            <item id="name">
-              <rank>10</rank>
-            </item>
-          </items>
-        </default_search>
-      </presentation>
-    </class>
   </classes>
   <menus>
     <menu id="ProblemManagement" xsi:type="MenuGroup" _delta="define_if_not_exists">
@@ -628,125 +425,5 @@
       <oql>SELECT KnownError</oql>
       <do_search>1</do_search>
     </menu>
-    <menu id="FAQCategory" xsi:type="OQLMenuNode" _delta="define">
-      <rank>4.5</rank>
-      <parent>Problem:Shortcuts</parent>
-      <oql>SELECT FAQCategory</oql>
-      <do_search>1</do_search>
-    </menu>
-    <menu id="FAQ" xsi:type="OQLMenuNode" _delta="define">
-      <rank>6</rank>
-      <parent>Problem:Shortcuts</parent>
-      <oql>SELECT FAQ</oql>
-      <do_search>1</do_search>
-    </menu>
   </menus>
-  <module_designs>
-    <module_design id="itop-portal" xsi:type="portal">
-      <bricks>
-        <brick id="faq" xsi:type="Combodo\iTop\Portal\Brick\BrowseBrick" _delta="define">
-          <active>true</active>
-          <rank>
-			  <default>40</default>
-		  </rank>
-          <width>12</width>
-			<title>
-              <navigation_menu>Brick:Portal:FAQ:Menu</navigation_menu>
-			  <home>Brick:Portal:FAQ:Title</home>
-			</title>
-			<description>Brick:Portal:FAQ:Title+</description>
-			<decoration_class>
-				<default>fc fc-life-saver fc-2x</default>
-			</decoration_class>
-          <levels>
-            <level id="1">
-              <class>FAQCategory</class>
-              <parent_att/>
-              <name_att/>
-              <tooltip_att/>
-              <title>Class:FAQCategory</title>
-              <actions/>
-              <levels>
-                <level id="1">
-                  <class>FAQ</class>
-                  <parent_att>category_id</parent_att>
-                  <name_att>title</name_att>
-                  <tooltip_att>summary</tooltip_att>
-                  <title>Class:FAQ</title>
-                  <fields>
-                    <field id="error_code"/>
-					<field id="domains"/>
-					<field id="key_words">
-						<hidden>true</hidden>
-					</field>
-                  </fields>
-                  <actions>
-                    <action id="view" xsi:type="view"/>
-                  </actions>
-                  <levels/>
-                </level>
-              </levels>
-            </level>
-          </levels>
-          <browse_modes>
-            <availables>
-              <mode id="list"/>
-              <mode id="tree"/>
-            </availables>
-            <default>list</default>
-          </browse_modes>
-          <data_loading>full</data_loading>
-        </brick>
-      </bricks>
-      <forms>
-        <form id="faq" _delta="define">
-          <class>FAQ</class>
-          <!-- fields tag is optional. If not specified, attributes from zlist "details" will be choose as default -->
-          <fields>
-            <field id="category_name"/>
-            <field id="title"/>
-            <field id="error_code"/>
-            <field id="key_words"/>
-            <field id="domains"/>
-            <field id="summary"/>
-            <field id="description"/>
-          </fields>
-          <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>
-              <div class="col-sm-8">
-                <div class="form_field" data-field-id="description"></div>
-              </div>
-            </div>
-          </twig>
-          <modes>
-            <mode id="view"/>
-          </modes>
-        </form>
-      </forms>
-      <classes>
-        <class id="FAQCategory" _delta="define">
-          <scopes>
-            <scope id="all">
-              <oql_view><![CDATA[SELECT FAQCategory]]></oql_view>
-            </scope>
-          </scopes>
-        </class>
-        <class id="FAQ" _delta="define">
-          <scopes>
-            <scope id="all">
-              <oql_view><![CDATA[SELECT FAQ]]></oql_view>
-            </scope>
-          </scopes>
-        </class>
-      </classes>
-    </module_design>
-  </module_designs>
 </itop_design>
diff --git a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/cs.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-light/dictionaries/cs.dict.itop-knownerror-light.php
similarity index 80%
rename from datamodels/2.x/itop-knownerror-mgmt/dictionaries/cs.dict.itop-knownerror-mgmt.php
rename to datamodels/2.x/itop-knownerror-light/dictionaries/cs.dict.itop-knownerror-light.php
index 2023a8807..8e2fd0e48 100644
--- a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/cs.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-light/dictionaries/cs.dict.itop-knownerror-light.php
@@ -131,42 +131,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:lnkDocumentToError/Attribute:link_type+' => '',
 ));
 
-//
-// Class: FAQ
-//
-
-Dict::Add('CS CZ', 'Czech', 'Čeština', array(
-	'Class:FAQ' => 'FAQ',
-	'Class:FAQ+' => 'Často kladené dotazy',
-	'Class:FAQ/Attribute:title' => 'Název',
-	'Class:FAQ/Attribute:title+' => '',
-	'Class:FAQ/Attribute:summary' => 'Shrnutí',
-	'Class:FAQ/Attribute:summary+' => '',
-	'Class:FAQ/Attribute:description' => 'Popis',
-	'Class:FAQ/Attribute:description+' => '',
-	'Class:FAQ/Attribute:category_id' => 'Kategorie',
-	'Class:FAQ/Attribute:category_id+' => '',
-	'Class:FAQ/Attribute:category_name' => 'Název kategorie',
-	'Class:FAQ/Attribute:category_name+' => '',
-	'Class:FAQ/Attribute:error_code' => 'Kód chyby',
-	'Class:FAQ/Attribute:error_code+' => '',
-	'Class:FAQ/Attribute:key_words' => 'Klíčová slova',
-	'Class:FAQ/Attribute:key_words+' => '',
-	'Class:FAQ/Attribute:domains' => 'Domains~~',
-));
-
-//
-// Class: FAQCategory
-//
-
-Dict::Add('CS CZ', 'Czech', 'Čeština', array(
-	'Class:FAQCategory' => 'Kategorie FAQ',
-	'Class:FAQCategory+' => 'Kategorie pro FAQ',
-	'Class:FAQCategory/Attribute:name' => 'Název',
-	'Class:FAQCategory/Attribute:name+' => '',
-	'Class:FAQCategory/Attribute:faq_list' => 'FAQ',
-	'Class:FAQCategory/Attribute:faq_list+' => 'Všechny často kladené dotazy v této kategorii',
-));
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Menu:ProblemManagement' => 'Správa problémů',
 	'Menu:ProblemManagement+' => 'Správa problémů',
@@ -177,12 +141,4 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Menu:SearchError+' => 'Hledat známé chyby',
 	'Menu:Problem:KnownErrors' => 'Všechny známé chyby',
 	'Menu:Problem:KnownErrors+' => 'Všechny známé chyby',
-	'Menu:FAQCategory' => 'Kategorie FAQ',
-	'Menu:FAQCategory+' => '',
-	'Menu:FAQ' => 'FAQ',
-	'Menu:FAQ+' => 'FAQ - Často kladené dotazy',
-
-	'Brick:Portal:FAQ:Menu' => 'FAQ',
-	'Brick:Portal:FAQ:Title' => 'Často kladené dotazy (FAQ)',
-	'Brick:Portal:FAQ:Title+' => '<p>Spěcháte?</p><p>Podívejte se na seznam nejčastějších otázek a (možná) najdete hledanou odpověď ihned.</p>',
 ));
diff --git a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/da.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-light/dictionaries/da.dict.itop-knownerror-light.php
similarity index 77%
rename from datamodels/2.x/itop-knownerror-mgmt/dictionaries/da.dict.itop-knownerror-mgmt.php
rename to datamodels/2.x/itop-knownerror-light/dictionaries/da.dict.itop-knownerror-light.php
index ea5e3871b..1b8cead5d 100644
--- a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/da.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-light/dictionaries/da.dict.itop-knownerror-light.php
@@ -103,42 +103,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:lnkDocumentToError/Attribute:link_type+' => '',
 ));
 
-//
-// Class: FAQ
-//
-
-Dict::Add('DA DA', 'Danish', 'Dansk', array(
-	'Class:FAQ' => 'FAQ',
-	'Class:FAQ+' => '',
-	'Class:FAQ/Attribute:title' => 'Titel',
-	'Class:FAQ/Attribute:title+' => '',
-	'Class:FAQ/Attribute:summary' => 'Sammenfatning',
-	'Class:FAQ/Attribute:summary+' => '',
-	'Class:FAQ/Attribute:description' => 'Beskrivelse',
-	'Class:FAQ/Attribute:description+' => '',
-	'Class:FAQ/Attribute:category_id' => 'Kategori',
-	'Class:FAQ/Attribute:category_id+' => '',
-	'Class:FAQ/Attribute:category_name' => 'Kategorinavn',
-	'Class:FAQ/Attribute:category_name+' => '',
-	'Class:FAQ/Attribute:error_code' => 'Fejlkode',
-	'Class:FAQ/Attribute:error_code+' => '',
-	'Class:FAQ/Attribute:key_words' => 'Nøgleord',
-	'Class:FAQ/Attribute:key_words+' => '',
-	'Class:FAQ/Attribute:domains' => 'Domains~~',
-));
-
-//
-// Class: FAQCategory
-//
-
-Dict::Add('DA DA', 'Danish', 'Dansk', array(
-	'Class:FAQCategory' => 'FAQ-Kategori',
-	'Class:FAQCategory+' => '',
-	'Class:FAQCategory/Attribute:name' => 'Navn',
-	'Class:FAQCategory/Attribute:name+' => '',
-	'Class:FAQCategory/Attribute:faq_list' => 'FAQs',
-	'Class:FAQCategory/Attribute:faq_list+' => '',
-));
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Menu:ProblemManagement' => 'Problem Management',
 	'Menu:ProblemManagement+' => 'Problem Management',
@@ -149,12 +113,4 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Menu:SearchError+' => '',
 	'Menu:Problem:KnownErrors' => 'Alle kendte Fejl',
 	'Menu:Problem:KnownErrors+' => 'Alle kendte Fejl',
-	'Menu:FAQCategory' => 'FAQ-Kategorier',
-	'Menu:FAQCategory+' => '',
-	'Menu:FAQ' => 'FAQs',
-	'Menu:FAQ+' => '',
-
-	'Brick:Portal:FAQ:Menu' => 'FAQ~~',
-	'Brick:Portal:FAQ:Title' => 'Frequently Asked Questions~~',
-	'Brick:Portal:FAQ:Title+' => '<p>In a hurry?</p><p>Check out the list of most common questions and (maybe) find the expected answer right away.</p>~~',
 ));
diff --git a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/de.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-light/dictionaries/de.dict.itop-knownerror-light.php
similarity index 77%
rename from datamodels/2.x/itop-knownerror-mgmt/dictionaries/de.dict.itop-knownerror-mgmt.php
rename to datamodels/2.x/itop-knownerror-light/dictionaries/de.dict.itop-knownerror-light.php
index 746080013..33fd5a659 100644
--- a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/de.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-light/dictionaries/de.dict.itop-knownerror-light.php
@@ -105,42 +105,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkDocumentToError/Attribute:link_type+' => '',
 ));
 
-//
-// Class: FAQ
-//
-
-Dict::Add('DE DE', 'German', 'Deutsch', array(
-	'Class:FAQ' => 'FAQ',
-	'Class:FAQ+' => '',
-	'Class:FAQ/Attribute:title' => 'Titel',
-	'Class:FAQ/Attribute:title+' => '',
-	'Class:FAQ/Attribute:summary' => 'Zusammenfassung',
-	'Class:FAQ/Attribute:summary+' => '',
-	'Class:FAQ/Attribute:description' => 'Beschreibung',
-	'Class:FAQ/Attribute:description+' => '',
-	'Class:FAQ/Attribute:category_id' => 'Kategorie',
-	'Class:FAQ/Attribute:category_id+' => '',
-	'Class:FAQ/Attribute:category_name' => 'Kategoriename',
-	'Class:FAQ/Attribute:category_name+' => '',
-	'Class:FAQ/Attribute:error_code' => 'Fehlercode',
-	'Class:FAQ/Attribute:error_code+' => '',
-	'Class:FAQ/Attribute:key_words' => 'Schlüsselwörter',
-	'Class:FAQ/Attribute:key_words+' => '',
-	'Class:FAQ/Attribute:domains' => 'Domäne',
-));
-
-//
-// Class: FAQCategory
-//
-
-Dict::Add('DE DE', 'German', 'Deutsch', array(
-	'Class:FAQCategory' => 'FAQ-Kategorie',
-	'Class:FAQCategory+' => '',
-	'Class:FAQCategory/Attribute:name' => 'Name',
-	'Class:FAQCategory/Attribute:name+' => '',
-	'Class:FAQCategory/Attribute:faq_list' => 'FAQs',
-	'Class:FAQCategory/Attribute:faq_list+' => '',
-));
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Menu:ProblemManagement' => 'Problem Management',
 	'Menu:ProblemManagement+' => 'Problem Management',
@@ -151,12 +115,4 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Menu:SearchError+' => '',
 	'Menu:Problem:KnownErrors' => 'Alle Known Errors',
 	'Menu:Problem:KnownErrors+' => 'Alle Known Errors',
-	'Menu:FAQCategory' => 'FAQ-Kategorien',
-	'Menu:FAQCategory+' => '',
-	'Menu:FAQ' => 'FAQs',
-	'Menu:FAQ+' => '',
-
-	'Brick:Portal:FAQ:Menu' => 'FAQ',
-	'Brick:Portal:FAQ:Title' => 'Oft gestellte Fragen (FAQs)',
-	'Brick:Portal:FAQ:Title+' => '<p>In Eile?</p><p>Sehen Sie sich die meistgestellten Fragen an (FAQs) und finden Sie (eventuell) die Antwort direkt dort.</p>',
 ));
diff --git a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/en.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-light/dictionaries/en.dict.itop-knownerror-light.php
similarity index 79%
rename from datamodels/2.x/itop-knownerror-mgmt/dictionaries/en.dict.itop-knownerror-mgmt.php
rename to datamodels/2.x/itop-knownerror-light/dictionaries/en.dict.itop-knownerror-light.php
index 64fc0b15c..7f44bdd45 100644
--- a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/en.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-light/dictionaries/en.dict.itop-knownerror-light.php
@@ -133,42 +133,6 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:lnkDocumentToError/Attribute:link_type+' => '',
 ));
 
-//
-// Class: FAQ
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:FAQ' => 'FAQ',
-	'Class:FAQ+' => 'Frequently asked questions',
-	'Class:FAQ/Attribute:title' => 'Title',
-	'Class:FAQ/Attribute:title+' => '',
-	'Class:FAQ/Attribute:summary' => 'Summary',
-	'Class:FAQ/Attribute:summary+' => '',
-	'Class:FAQ/Attribute:description' => 'Description',
-	'Class:FAQ/Attribute:description+' => '',
-	'Class:FAQ/Attribute:category_id' => 'Category',
-	'Class:FAQ/Attribute:category_id+' => '',
-	'Class:FAQ/Attribute:category_name' => 'Category name',
-	'Class:FAQ/Attribute:category_name+' => '',
-	'Class:FAQ/Attribute:error_code' => 'Error code',
-	'Class:FAQ/Attribute:error_code+' => '',
-	'Class:FAQ/Attribute:key_words' => 'Key words',
-	'Class:FAQ/Attribute:key_words+' => '',
-	'Class:FAQ/Attribute:domains' => 'Domains',
-));
-
-//
-// Class: FAQCategory
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:FAQCategory' => 'FAQ Category',
-	'Class:FAQCategory+' => 'Category for FAQ',
-	'Class:FAQCategory/Attribute:name' => 'Name',
-	'Class:FAQCategory/Attribute:name+' => '',
-	'Class:FAQCategory/Attribute:faq_list' => 'FAQs',
-	'Class:FAQCategory/Attribute:faq_list+' => 'All the frequently asked questions related to this category',
-));
 Dict::Add('EN US', 'English', 'English', array(
 	'Menu:ProblemManagement' => 'Problem Management',
 	'Menu:ProblemManagement+' => 'Problem Management',
@@ -179,12 +143,4 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Menu:SearchError+' => 'Search for known errors',
 	'Menu:Problem:KnownErrors' => 'All known errors',
 	'Menu:Problem:KnownErrors+' => 'All known errors',
-	'Menu:FAQCategory' => 'FAQ categories',
-	'Menu:FAQCategory+' => 'All FAQ categories',
-	'Menu:FAQ' => 'FAQs',
-	'Menu:FAQ+' => 'All FAQs',
-
-	'Brick:Portal:FAQ:Menu' => 'FAQ',
-	'Brick:Portal:FAQ:Title' => 'Frequently Asked Questions',
-	'Brick:Portal:FAQ:Title+' => '<p>In a hurry?</p><p>Check out the list of most common questions and (maybe) find the expected answer right away.</p>',
 ));
diff --git a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/es_cr.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-light/dictionaries/es_cr.dict.itop-knownerror-light.php
similarity index 78%
rename from datamodels/2.x/itop-knownerror-mgmt/dictionaries/es_cr.dict.itop-knownerror-mgmt.php
rename to datamodels/2.x/itop-knownerror-light/dictionaries/es_cr.dict.itop-knownerror-light.php
index bedde5d2b..d362a9add 100644
--- a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/es_cr.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-light/dictionaries/es_cr.dict.itop-knownerror-light.php
@@ -130,42 +130,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'Class:lnkDocumentToError/Attribute:link_type+' => 'Tipo',
 ));
 
-//
-// Class: FAQ
-//
-
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
-	'Class:FAQ' => 'Preguntas y Respuestas Frecuentes',
-	'Class:FAQ+' => 'Preguntas y Respuestas Frecuentes',
-	'Class:FAQ/Attribute:title' => 'Asunto',
-	'Class:FAQ/Attribute:title+' => 'Asunto',
-	'Class:FAQ/Attribute:summary' => 'Resumen',
-	'Class:FAQ/Attribute:summary+' => 'Resumen',
-	'Class:FAQ/Attribute:description' => 'Descripción',
-	'Class:FAQ/Attribute:description+' => 'Descripción',
-	'Class:FAQ/Attribute:category_id' => 'Categoría',
-	'Class:FAQ/Attribute:category_id+' => 'Categoría',
-	'Class:FAQ/Attribute:category_name' => 'Categoría',
-	'Class:FAQ/Attribute:category_name+' => 'Categoría',
-	'Class:FAQ/Attribute:error_code' => 'Código de Error',
-	'Class:FAQ/Attribute:error_code+' => 'Código de Error',
-	'Class:FAQ/Attribute:key_words' => 'Palabras Clave',
-	'Class:FAQ/Attribute:key_words+' => 'Palabras Clave',
-	'Class:FAQ/Attribute:domains' => 'Domains~~',
-));
-
-//
-// Class: FAQCategory
-//
-
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
-	'Class:FAQCategory' => 'Categoría de Preguntas y Respuesta Frecuentes',
-	'Class:FAQCategory+' => 'Categoría de Preguntas y Respuesta Frecuentes',
-	'Class:FAQCategory/Attribute:name' => 'Nombre',
-	'Class:FAQCategory/Attribute:name+' => 'Nombre de Categoría de Preguntas y Respuestas Frecuentes',
-	'Class:FAQCategory/Attribute:faq_list' => 'FAQs',
-	'Class:FAQCategory/Attribute:faq_list+' => 'FAQs',
-));
 Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'Menu:ProblemManagement' => 'Gestión de problemas',
 	'Menu:ProblemManagement+' => 'Gestión de problemas',
@@ -176,12 +140,4 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'Menu:SearchError+' => 'Búsqueda de Errores Conocidos',
 	'Menu:Problem:KnownErrors' => 'Errores Conocidos',
 	'Menu:Problem:KnownErrors+' => 'Errores Conocidos',
-	'Menu:FAQCategory' => 'Categorías de FAQ',
-	'Menu:FAQCategory+' => 'Categorías FAQ',
-	'Menu:FAQ' => 'Preguntas y Respuestas Frecuentes',
-	'Menu:FAQ+' => 'Preguntas y Respuestas Frecuentes',
-
-	'Brick:Portal:FAQ:Menu' => 'Preguntas y Respuestas',
-	'Brick:Portal:FAQ:Title' => 'Preguntas y Respuestas Frecuentes',
-	'Brick:Portal:FAQ:Title+' => '<p>¿En una prisa?</p><p>Vea la lista de las preguntas más comunes y encontrará (tal vez) la respuesta inmediata a sus necesidades.</p>',
 ));
diff --git a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/fr.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-light/dictionaries/fr.dict.itop-knownerror-light.php
similarity index 76%
rename from datamodels/2.x/itop-knownerror-mgmt/dictionaries/fr.dict.itop-knownerror-mgmt.php
rename to datamodels/2.x/itop-knownerror-light/dictionaries/fr.dict.itop-knownerror-light.php
index e45929d70..59145fb96 100644
--- a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/fr.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-light/dictionaries/fr.dict.itop-knownerror-light.php
@@ -105,42 +105,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:lnkDocumentToError/Attribute:link_type+' => '',
 ));
 
-//
-// Class: FAQ
-//
-
-Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:FAQ' => 'FAQ',
-	'Class:FAQ+' => 'Question fréquement posée',
-	'Class:FAQ/Attribute:title' => 'Titre',
-	'Class:FAQ/Attribute:title+' => '',
-	'Class:FAQ/Attribute:summary' => 'Résumé',
-	'Class:FAQ/Attribute:summary+' => '',
-	'Class:FAQ/Attribute:description' => 'Description',
-	'Class:FAQ/Attribute:description+' => '',
-	'Class:FAQ/Attribute:category_id' => 'Categorie',
-	'Class:FAQ/Attribute:category_id+' => '',
-	'Class:FAQ/Attribute:category_name' => 'Nom catégorie',
-	'Class:FAQ/Attribute:category_name+' => '',
-	'Class:FAQ/Attribute:error_code' => 'Code d\'erreur',
-	'Class:FAQ/Attribute:error_code+' => '',
-	'Class:FAQ/Attribute:key_words' => 'Mots clés',
-	'Class:FAQ/Attribute:key_words+' => '',
-	'Class:FAQ/Attribute:domains' => 'Domaines',
-));
-
-//
-// Class: FAQCategory
-//
-
-Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:FAQCategory' => 'Catégorie de FAQ',
-	'Class:FAQCategory+' => 'Catégorie de FAQ',
-	'Class:FAQCategory/Attribute:name' => 'Nom',
-	'Class:FAQCategory/Attribute:name+' => '',
-	'Class:FAQCategory/Attribute:faq_list' => 'FAQs',
-	'Class:FAQCategory/Attribute:faq_list+' => '',
-));
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Menu:ProblemManagement' => 'Gestion des problèmes',
 	'Menu:ProblemManagement+' => 'Gestion des problèmes',
@@ -151,12 +115,4 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Menu:SearchError+' => 'Rechercher une erreur connue',
 	'Menu:Problem:KnownErrors' => 'Toutes les erreurs connues',
 	'Menu:Problem:KnownErrors+' => 'Toutes les erreurs connues',
-	'Menu:FAQCategory' => 'Catégories de FAQ',
-	'Menu:FAQCategory+' => 'Toutes les catégories de FAQ',
-	'Menu:FAQ' => 'FAQs',
-	'Menu:FAQ+' => 'Toutes les  FAQs',
-
-	'Brick:Portal:FAQ:Menu' => 'FAQ',
-	'Brick:Portal:FAQ:Title' => 'Foire Aux Questions',
-	'Brick:Portal:FAQ:Title+' => '<p>Vous êtes pressé&nbsp;?</p><p>Consultez la liste des questions les plus fréquentes et vous trouverez (peut-être) immédiatement la réponse à votre besoin.</p>',
 ));
diff --git a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/hu.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-light/dictionaries/hu.dict.itop-knownerror-light.php
similarity index 75%
rename from datamodels/2.x/itop-knownerror-mgmt/dictionaries/hu.dict.itop-knownerror-mgmt.php
rename to datamodels/2.x/itop-knownerror-light/dictionaries/hu.dict.itop-knownerror-light.php
index 282b248f9..ea9c0beb1 100644
--- a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/hu.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-light/dictionaries/hu.dict.itop-knownerror-light.php
@@ -102,42 +102,6 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:lnkDocumentToError/Attribute:link_type+' => '~~',
 ));
 
-//
-// Class: FAQ
-//
-
-Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'Class:FAQ' => 'FAQ~~',
-	'Class:FAQ+' => 'Frequently asked questions~~',
-	'Class:FAQ/Attribute:title' => 'Title~~',
-	'Class:FAQ/Attribute:title+' => '~~',
-	'Class:FAQ/Attribute:summary' => 'Summary~~',
-	'Class:FAQ/Attribute:summary+' => '~~',
-	'Class:FAQ/Attribute:description' => 'Description~~',
-	'Class:FAQ/Attribute:description+' => '~~',
-	'Class:FAQ/Attribute:category_id' => 'Category~~',
-	'Class:FAQ/Attribute:category_id+' => '~~',
-	'Class:FAQ/Attribute:category_name' => 'Category name~~',
-	'Class:FAQ/Attribute:category_name+' => '~~',
-	'Class:FAQ/Attribute:error_code' => 'Error code~~',
-	'Class:FAQ/Attribute:error_code+' => '~~',
-	'Class:FAQ/Attribute:key_words' => 'Key words~~',
-	'Class:FAQ/Attribute:key_words+' => '~~',
-	'Class:FAQ/Attribute:domains' => 'Domains~~',
-));
-
-//
-// Class: FAQCategory
-//
-
-Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'Class:FAQCategory' => 'FAQ Category~~',
-	'Class:FAQCategory+' => 'Category for FAQ~~',
-	'Class:FAQCategory/Attribute:name' => 'Name~~',
-	'Class:FAQCategory/Attribute:name+' => '~~',
-	'Class:FAQCategory/Attribute:faq_list' => 'FAQs~~',
-	'Class:FAQCategory/Attribute:faq_list+' => 'All the frequently asked questions related to this category~~',
-));
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Menu:ProblemManagement' => 'Probléma menedzsment',
 	'Menu:ProblemManagement+' => '',
@@ -148,12 +112,4 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Menu:SearchError+' => '',
 	'Menu:Problem:KnownErrors' => 'Összes ismert hiba',
 	'Menu:Problem:KnownErrors+' => '',
-	'Menu:FAQCategory' => 'FAQ categories~~',
-	'Menu:FAQCategory+' => 'All FAQ categories~~',
-	'Menu:FAQ' => 'FAQs~~',
-	'Menu:FAQ+' => 'All FAQs~~',
-
-	'Brick:Portal:FAQ:Menu' => 'FAQ~~',
-	'Brick:Portal:FAQ:Title' => 'Frequently Asked Questions~~',
-	'Brick:Portal:FAQ:Title+' => '<p>In a hurry?</p><p>Check out the list of most common questions and (maybe) find the expected answer right away.</p>~~',
 ));
diff --git a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/it.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-light/dictionaries/it.dict.itop-knownerror-light.php
similarity index 80%
rename from datamodels/2.x/itop-knownerror-mgmt/dictionaries/it.dict.itop-knownerror-mgmt.php
rename to datamodels/2.x/itop-knownerror-light/dictionaries/it.dict.itop-knownerror-light.php
index 21b7457c9..fb78d450e 100644
--- a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/it.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-light/dictionaries/it.dict.itop-knownerror-light.php
@@ -129,42 +129,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:lnkDocumentToError/Attribute:link_type+' => '~~',
 ));
 
-//
-// Class: FAQ
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:FAQ' => 'FAQ',
-	'Class:FAQ+' => 'Domande frequenti',
-	'Class:FAQ/Attribute:title' => 'Titolo',
-	'Class:FAQ/Attribute:title+' => '~~',
-	'Class:FAQ/Attribute:summary' => 'Riepilogo',
-	'Class:FAQ/Attribute:summary+' => '~~',
-	'Class:FAQ/Attribute:description' => 'Descrizione',
-	'Class:FAQ/Attribute:description+' => '~~',
-	'Class:FAQ/Attribute:category_id' => 'Categoria',
-	'Class:FAQ/Attribute:category_id+' => '~~',
-	'Class:FAQ/Attribute:category_name' => 'Nome della Categoria',
-	'Class:FAQ/Attribute:category_name+' => '~~',
-	'Class:FAQ/Attribute:error_code' => 'Codice errore',
-	'Class:FAQ/Attribute:error_code+' => '~~',
-	'Class:FAQ/Attribute:key_words' => 'Parola Chiave',
-	'Class:FAQ/Attribute:key_words+' => '~~',
-	'Class:FAQ/Attribute:domains' => 'Dominio',
-));
-
-//
-// Class: FAQCategory
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:FAQCategory' => 'Fategoria FAQ',
-	'Class:FAQCategory+' => 'Categoria per FAQ',
-	'Class:FAQCategory/Attribute:name' => 'Nome',
-	'Class:FAQCategory/Attribute:name+' => '~~',
-	'Class:FAQCategory/Attribute:faq_list' => 'FAQs',
-	'Class:FAQCategory/Attribute:faq_list+' => 'Tutte le faq legate a questa categoria',
-));
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Menu:ProblemManagement' => 'Gestione dei Problemi',
 	'Menu:ProblemManagement+' => 'Gestione dei Problemi',
@@ -175,12 +139,4 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Menu:SearchError+' => 'Ricerca per Errori Conosciuti',
 	'Menu:Problem:KnownErrors' => 'Tutti gli errori conosciuti',
 	'Menu:Problem:KnownErrors+' => 'Tutti gli errori conosciuti',
-	'Menu:FAQCategory' => 'Categoria FAQ',
-	'Menu:FAQCategory+' => 'Tutte le categorie FAQ',
-	'Menu:FAQ' => 'FAQs',
-	'Menu:FAQ+' => 'Tutte le FAQs',
-
-	'Brick:Portal:FAQ:Menu' => 'FAQ',
-	'Brick:Portal:FAQ:Title' => 'Domande frequenti',
-	'Brick:Portal:FAQ:Title+' => '<p>Sei di fretta?</p><p>Verifica nella lista delle FAQ se trovi la risposta al tuo problema.</p>',
 ));
diff --git a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/ja.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-light/dictionaries/ja.dict.itop-knownerror-light.php
similarity index 77%
rename from datamodels/2.x/itop-knownerror-mgmt/dictionaries/ja.dict.itop-knownerror-mgmt.php
rename to datamodels/2.x/itop-knownerror-light/dictionaries/ja.dict.itop-knownerror-light.php
index ae8a04ff8..092e256e9 100644
--- a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/ja.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-light/dictionaries/ja.dict.itop-knownerror-light.php
@@ -102,42 +102,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkDocumentToError/Attribute:link_type+' => '',
 ));
 
-//
-// Class: FAQ
-//
-
-Dict::Add('JA JP', 'Japanese', '日本語', array(
-	'Class:FAQ' => 'FAQ',
-	'Class:FAQ+' => 'よくある質問',
-	'Class:FAQ/Attribute:title' => 'タイトル',
-	'Class:FAQ/Attribute:title+' => '',
-	'Class:FAQ/Attribute:summary' => '要約',
-	'Class:FAQ/Attribute:summary+' => '',
-	'Class:FAQ/Attribute:description' => '説明',
-	'Class:FAQ/Attribute:description+' => '',
-	'Class:FAQ/Attribute:category_id' => 'カテゴリ',
-	'Class:FAQ/Attribute:category_id+' => '',
-	'Class:FAQ/Attribute:category_name' => 'カテゴリ名',
-	'Class:FAQ/Attribute:category_name+' => '',
-	'Class:FAQ/Attribute:error_code' => 'エラーコード',
-	'Class:FAQ/Attribute:error_code+' => '',
-	'Class:FAQ/Attribute:key_words' => 'キーワード',
-	'Class:FAQ/Attribute:key_words+' => '',
-	'Class:FAQ/Attribute:domains' => 'Domains~~',
-));
-
-//
-// Class: FAQCategory
-//
-
-Dict::Add('JA JP', 'Japanese', '日本語', array(
-	'Class:FAQCategory' => 'FAQカテゴリ',
-	'Class:FAQCategory+' => 'FAQのためのカテゴリ',
-	'Class:FAQCategory/Attribute:name' => '名前',
-	'Class:FAQCategory/Attribute:name+' => '',
-	'Class:FAQCategory/Attribute:faq_list' => 'FAQ',
-	'Class:FAQCategory/Attribute:faq_list+' => '',
-));
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Menu:ProblemManagement' => '問題管理',
 	'Menu:ProblemManagement+' => '問題管理',
@@ -148,12 +112,4 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Menu:SearchError+' => '既知のエラー検索',
 	'Menu:Problem:KnownErrors' => '全ての既知のエラー',
 	'Menu:Problem:KnownErrors+' => '全ての既知のエラー',
-	'Menu:FAQCategory' => 'FAQカテゴリ',
-	'Menu:FAQCategory+' => '全てのFAQカテゴリ',
-	'Menu:FAQ' => 'FAQ',
-	'Menu:FAQ+' => '全FAQ',
-
-	'Brick:Portal:FAQ:Menu' => 'FAQ~~',
-	'Brick:Portal:FAQ:Title' => 'Frequently Asked Questions~~',
-	'Brick:Portal:FAQ:Title+' => '<p>In a hurry?</p><p>Check out the list of most common questions and (maybe) find the expected answer right away.</p>~~',
 ));
diff --git a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/nl.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-light/dictionaries/nl.dict.itop-knownerror-light.php
similarity index 80%
rename from datamodels/2.x/itop-knownerror-mgmt/dictionaries/nl.dict.itop-knownerror-mgmt.php
rename to datamodels/2.x/itop-knownerror-light/dictionaries/nl.dict.itop-knownerror-light.php
index 94b31ae9c..f095a5fad 100644
--- a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/nl.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-light/dictionaries/nl.dict.itop-knownerror-light.php
@@ -134,42 +134,6 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:lnkDocumentToError/Attribute:link_type+' => '',
 ));
 
-//
-// Class: FAQ
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:FAQ' => 'FAQ',
-	'Class:FAQ+' => 'Veelgestelde vragen',
-	'Class:FAQ/Attribute:title' => 'Titel',
-	'Class:FAQ/Attribute:title+' => '',
-	'Class:FAQ/Attribute:summary' => 'Samenvatting',
-	'Class:FAQ/Attribute:summary+' => '',
-	'Class:FAQ/Attribute:description' => 'Omschrijving',
-	'Class:FAQ/Attribute:description+' => '',
-	'Class:FAQ/Attribute:category_id' => 'Categorie',
-	'Class:FAQ/Attribute:category_id+' => '',
-	'Class:FAQ/Attribute:category_name' => 'Naam categorie',
-	'Class:FAQ/Attribute:category_name+' => '',
-	'Class:FAQ/Attribute:error_code' => 'Foutcode',
-	'Class:FAQ/Attribute:error_code+' => '',
-	'Class:FAQ/Attribute:key_words' => 'Zoektermen',
-	'Class:FAQ/Attribute:key_words+' => '',
-	'Class:FAQ/Attribute:domains' => 'Domeinen',
-));
-
-//
-// Class: FAQCategory
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:FAQCategory' => 'FAQ-categorie',
-	'Class:FAQCategory+' => 'Categorie voor de FAQ',
-	'Class:FAQCategory/Attribute:name' => 'Naam',
-	'Class:FAQCategory/Attribute:name+' => '',
-	'Class:FAQCategory/Attribute:faq_list' => 'FAQ\'s',
-	'Class:FAQCategory/Attribute:faq_list+' => 'Alle veelgestelde vragen gerelateerd aan deze categorie',
-));
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Menu:ProblemManagement' => 'Probleem Management',
 	'Menu:ProblemManagement+' => 'Probleem Management',
@@ -180,12 +144,4 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Menu:SearchError+' => 'Zoek naar gekende fouten',
 	'Menu:Problem:KnownErrors' => 'Alle gekende fouten',
 	'Menu:Problem:KnownErrors+' => 'Alle gekende fouten',
-	'Menu:FAQCategory' => 'FAQ-categorieën',
-	'Menu:FAQCategory+' => 'Alle FAQ-categorieën',
-	'Menu:FAQ' => 'FAQ\'s',
-	'Menu:FAQ+' => 'Alle FAQ\'s',
-
-	'Brick:Portal:FAQ:Menu' => 'FAQ',
-	'Brick:Portal:FAQ:Title' => 'Veelgestelde vragen',
-	'Brick:Portal:FAQ:Title+' => '<p>Gehaast?</p><p>Bekijk deze lijst van veelgestelde vragen. Misschien staat er al een antwoord tussen.</p>',
 ));
diff --git a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/pt_br.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-light/dictionaries/pt_br.dict.itop-knownerror-light.php
similarity index 79%
rename from datamodels/2.x/itop-knownerror-mgmt/dictionaries/pt_br.dict.itop-knownerror-mgmt.php
rename to datamodels/2.x/itop-knownerror-light/dictionaries/pt_br.dict.itop-knownerror-light.php
index 9123f5528..30d5603cd 100644
--- a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/pt_br.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-light/dictionaries/pt_br.dict.itop-knownerror-light.php
@@ -129,42 +129,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkDocumentToError/Attribute:link_type+' => '',
 ));
 
-//
-// Class: FAQ
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:FAQ' => 'FAQ',
-	'Class:FAQ+' => 'Perguntas mais frequentes',
-	'Class:FAQ/Attribute:title' => 'Título',
-	'Class:FAQ/Attribute:title+' => '',
-	'Class:FAQ/Attribute:summary' => 'Índice',
-	'Class:FAQ/Attribute:summary+' => '',
-	'Class:FAQ/Attribute:description' => 'Descrição',
-	'Class:FAQ/Attribute:description+' => '',
-	'Class:FAQ/Attribute:category_id' => 'Categoria',
-	'Class:FAQ/Attribute:category_id+' => '',
-	'Class:FAQ/Attribute:category_name' => 'Nome categoria',
-	'Class:FAQ/Attribute:category_name+' => '',
-	'Class:FAQ/Attribute:error_code' => 'Código erro',
-	'Class:FAQ/Attribute:error_code+' => '',
-	'Class:FAQ/Attribute:key_words' => 'Palavras-chaves',
-	'Class:FAQ/Attribute:key_words+' => '',
-	'Class:FAQ/Attribute:domains' => 'Domínios',
-));
-
-//
-// Class: FAQCategory
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:FAQCategory' => 'Categoria FAQ',
-	'Class:FAQCategory+' => 'Categoria por FAQ',
-	'Class:FAQCategory/Attribute:name' => 'Nome',
-	'Class:FAQCategory/Attribute:name+' => '',
-	'Class:FAQCategory/Attribute:faq_list' => 'FAQs',
-	'Class:FAQCategory/Attribute:faq_list+' => 'Todas as perguntas mais frequentes vinculadas a essa categoria',
-));
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Menu:ProblemManagement' => 'Gerencimento Problemas',
 	'Menu:ProblemManagement+' => 'Gerencimento Problemas',
@@ -175,12 +139,4 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Menu:SearchError+' => 'Pesquisar por erros conhecidos',
 	'Menu:Problem:KnownErrors' => 'Todos erros conhecidos',
 	'Menu:Problem:KnownErrors+' => 'Todos erros conhecidos',
-	'Menu:FAQCategory' => 'Categorias FAQ',
-	'Menu:FAQCategory+' => 'Todas categorias FAQ',
-	'Menu:FAQ' => 'FAQs',
-	'Menu:FAQ+' => 'Todas FAQs',
-
-	'Brick:Portal:FAQ:Menu' => 'FAQ',
-	'Brick:Portal:FAQ:Title' => 'Perguntes frequentes (FAQ)',
-	'Brick:Portal:FAQ:Title+' => '<p>Com pressa?</p><p>Confira a lista de perguntas mais comuns e (talvez) encontre a resposta esperada imediatamente.</p>',
 ));
diff --git a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/ru.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-light/dictionaries/ru.dict.itop-knownerror-light.php
similarity index 75%
rename from datamodels/2.x/itop-knownerror-mgmt/dictionaries/ru.dict.itop-knownerror-mgmt.php
rename to datamodels/2.x/itop-knownerror-light/dictionaries/ru.dict.itop-knownerror-light.php
index 14c1b6c52..9de919e7c 100644
--- a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/ru.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-light/dictionaries/ru.dict.itop-knownerror-light.php
@@ -94,42 +94,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkDocumentToError/Attribute:link_type+' => '',
 ));
 
-//
-// Class: FAQ
-//
-
-Dict::Add('RU RU', 'Russian', 'Русский', array(
-	'Class:FAQ' => 'FAQ',
-	'Class:FAQ+' => 'Часто задаваемые вопросы',
-	'Class:FAQ/Attribute:title' => 'Название',
-	'Class:FAQ/Attribute:title+' => '',
-	'Class:FAQ/Attribute:summary' => 'Краткое содержание',
-	'Class:FAQ/Attribute:summary+' => '',
-	'Class:FAQ/Attribute:description' => 'Описание',
-	'Class:FAQ/Attribute:description+' => '',
-	'Class:FAQ/Attribute:category_id' => 'Категория',
-	'Class:FAQ/Attribute:category_id+' => '',
-	'Class:FAQ/Attribute:category_name' => 'Категория',
-	'Class:FAQ/Attribute:category_name+' => '',
-	'Class:FAQ/Attribute:error_code' => 'Код ошибки',
-	'Class:FAQ/Attribute:error_code+' => '',
-	'Class:FAQ/Attribute:key_words' => 'Ключевые слова',
-	'Class:FAQ/Attribute:key_words+' => '',
-	'Class:FAQ/Attribute:domains' => 'Домены',
-));
-
-//
-// Class: FAQCategory
-//
-
-Dict::Add('RU RU', 'Russian', 'Русский', array(
-	'Class:FAQCategory' => 'Категории FAQ',
-	'Class:FAQCategory+' => 'Категории FAQ',
-	'Class:FAQCategory/Attribute:name' => 'Название',
-	'Class:FAQCategory/Attribute:name+' => '',
-	'Class:FAQCategory/Attribute:faq_list' => 'FAQ',
-	'Class:FAQCategory/Attribute:faq_list+' => 'Связанные FAQ',
-));
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Menu:ProblemManagement' => 'Управление проблемами',
 	'Menu:ProblemManagement+' => 'Управление проблемами',
@@ -140,12 +104,4 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Menu:SearchError+' => 'Поиск известных ошибок',
 	'Menu:Problem:KnownErrors' => 'Известные ошибки',
 	'Menu:Problem:KnownErrors+' => 'База известных ошибок',
-	'Menu:FAQCategory' => 'Категории FAQ',
-	'Menu:FAQCategory+' => 'Категории FAQ',
-	'Menu:FAQ' => 'FAQ',
-	'Menu:FAQ+' => 'Часто задаваемые вопросы',
-
-	'Brick:Portal:FAQ:Menu' => 'FAQ',
-	'Brick:Portal:FAQ:Title' => 'Часто задаваемые вопросы',
-	'Brick:Portal:FAQ:Title+' => '<p>Торопитесь?</p><p>Проверьте список часто задаваемых вопросов, возможно, ответ уже есть.</p>',
 ));
diff --git a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/sk.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-light/dictionaries/sk.dict.itop-knownerror-light.php
similarity index 79%
rename from datamodels/2.x/itop-knownerror-mgmt/dictionaries/sk.dict.itop-knownerror-mgmt.php
rename to datamodels/2.x/itop-knownerror-light/dictionaries/sk.dict.itop-knownerror-light.php
index ff95560c1..a140c4c4a 100644
--- a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/sk.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-light/dictionaries/sk.dict.itop-knownerror-light.php
@@ -128,42 +128,6 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:lnkDocumentToError/Attribute:link_type+' => '~~',
 ));
 
-//
-// Class: FAQ
-//
-
-Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
-	'Class:FAQ' => 'FAQ~~',
-	'Class:FAQ+' => 'Frequently asked questions~~',
-	'Class:FAQ/Attribute:title' => 'Title~~',
-	'Class:FAQ/Attribute:title+' => '~~',
-	'Class:FAQ/Attribute:summary' => 'Summary~~',
-	'Class:FAQ/Attribute:summary+' => '~~',
-	'Class:FAQ/Attribute:description' => 'Description~~',
-	'Class:FAQ/Attribute:description+' => '~~',
-	'Class:FAQ/Attribute:category_id' => 'Category~~',
-	'Class:FAQ/Attribute:category_id+' => '~~',
-	'Class:FAQ/Attribute:category_name' => 'Category name~~',
-	'Class:FAQ/Attribute:category_name+' => '~~',
-	'Class:FAQ/Attribute:error_code' => 'Error code~~',
-	'Class:FAQ/Attribute:error_code+' => '~~',
-	'Class:FAQ/Attribute:key_words' => 'Key words~~',
-	'Class:FAQ/Attribute:key_words+' => '~~',
-	'Class:FAQ/Attribute:domains' => 'Domains~~',
-));
-
-//
-// Class: FAQCategory
-//
-
-Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
-	'Class:FAQCategory' => 'FAQ Category~~',
-	'Class:FAQCategory+' => 'Category for FAQ~~',
-	'Class:FAQCategory/Attribute:name' => 'Name~~',
-	'Class:FAQCategory/Attribute:name+' => '~~',
-	'Class:FAQCategory/Attribute:faq_list' => 'FAQs~~',
-	'Class:FAQCategory/Attribute:faq_list+' => 'All the frequently asked questions related to this category~~',
-));
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Menu:ProblemManagement' => 'Problem Management~~',
 	'Menu:ProblemManagement+' => 'Problem Management~~',
@@ -174,12 +138,4 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Menu:SearchError+' => 'Search for known errors~~',
 	'Menu:Problem:KnownErrors' => 'All known errors~~',
 	'Menu:Problem:KnownErrors+' => 'All known errors~~',
-	'Menu:FAQCategory' => 'FAQ categories~~',
-	'Menu:FAQCategory+' => 'All FAQ categories~~',
-	'Menu:FAQ' => 'FAQs~~',
-	'Menu:FAQ+' => 'All FAQs~~',
-
-	'Brick:Portal:FAQ:Menu' => 'FAQ~~',
-	'Brick:Portal:FAQ:Title' => 'Frequently Asked Questions~~',
-	'Brick:Portal:FAQ:Title+' => '<p>In a hurry?</p><p>Check out the list of most common questions and (maybe) find the expected answer right away.</p>~~',
 ));
diff --git a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/tr.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-light/dictionaries/tr.dict.itop-knownerror-light.php
similarity index 79%
rename from datamodels/2.x/itop-knownerror-mgmt/dictionaries/tr.dict.itop-knownerror-mgmt.php
rename to datamodels/2.x/itop-knownerror-light/dictionaries/tr.dict.itop-knownerror-light.php
index 8cac08887..5743e54d9 100644
--- a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/tr.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-light/dictionaries/tr.dict.itop-knownerror-light.php
@@ -130,42 +130,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:lnkDocumentToError/Attribute:link_type+' => '~~',
 ));
 
-//
-// Class: FAQ
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:FAQ' => 'FAQ~~',
-	'Class:FAQ+' => 'Frequently asked questions~~',
-	'Class:FAQ/Attribute:title' => 'Title~~',
-	'Class:FAQ/Attribute:title+' => '~~',
-	'Class:FAQ/Attribute:summary' => 'Summary~~',
-	'Class:FAQ/Attribute:summary+' => '~~',
-	'Class:FAQ/Attribute:description' => 'Description~~',
-	'Class:FAQ/Attribute:description+' => '~~',
-	'Class:FAQ/Attribute:category_id' => 'Category~~',
-	'Class:FAQ/Attribute:category_id+' => '~~',
-	'Class:FAQ/Attribute:category_name' => 'Category name~~',
-	'Class:FAQ/Attribute:category_name+' => '~~',
-	'Class:FAQ/Attribute:error_code' => 'Error code~~',
-	'Class:FAQ/Attribute:error_code+' => '~~',
-	'Class:FAQ/Attribute:key_words' => 'Key words~~',
-	'Class:FAQ/Attribute:key_words+' => '~~',
-	'Class:FAQ/Attribute:domains' => 'Domains~~',
-));
-
-//
-// Class: FAQCategory
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:FAQCategory' => 'FAQ Category~~',
-	'Class:FAQCategory+' => 'Category for FAQ~~',
-	'Class:FAQCategory/Attribute:name' => 'Name~~',
-	'Class:FAQCategory/Attribute:name+' => '~~',
-	'Class:FAQCategory/Attribute:faq_list' => 'FAQs~~',
-	'Class:FAQCategory/Attribute:faq_list+' => 'All the frequently asked questions related to this category~~',
-));
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Menu:ProblemManagement' => 'Problem Yönetimi',
 	'Menu:ProblemManagement+' => 'Problem Yönetimi',
@@ -176,12 +140,4 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Menu:SearchError+' => 'Bilinen hataları ara',
 	'Menu:Problem:KnownErrors' => 'Tüm bilinen hatalar',
 	'Menu:Problem:KnownErrors+' => 'Tüm bilinen hatalar',
-	'Menu:FAQCategory' => 'FAQ categories~~',
-	'Menu:FAQCategory+' => 'All FAQ categories~~',
-	'Menu:FAQ' => 'FAQs~~',
-	'Menu:FAQ+' => 'All FAQs~~',
-
-	'Brick:Portal:FAQ:Menu' => 'FAQ~~',
-	'Brick:Portal:FAQ:Title' => 'Frequently Asked Questions~~',
-	'Brick:Portal:FAQ:Title+' => '<p>In a hurry?</p><p>Check out the list of most common questions and (maybe) find the expected answer right away.</p>~~',
 ));
diff --git a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/zh_cn.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-light/dictionaries/zh_cn.dict.itop-knownerror-light.php
similarity index 80%
rename from datamodels/2.x/itop-knownerror-mgmt/dictionaries/zh_cn.dict.itop-knownerror-mgmt.php
rename to datamodels/2.x/itop-knownerror-light/dictionaries/zh_cn.dict.itop-knownerror-light.php
index 7ad085aa1..133cb62cb 100644
--- a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/zh_cn.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-light/dictionaries/zh_cn.dict.itop-knownerror-light.php
@@ -128,42 +128,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:lnkDocumentToError/Attribute:link_type+' => '',
 ));
 
-//
-// Class: FAQ
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:FAQ' => 'FAQ',
-	'Class:FAQ+' => 'FAQ',
-	'Class:FAQ/Attribute:title' => '标题',
-	'Class:FAQ/Attribute:title+' => '',
-	'Class:FAQ/Attribute:summary' => '概要',
-	'Class:FAQ/Attribute:summary+' => '',
-	'Class:FAQ/Attribute:description' => '描述',
-	'Class:FAQ/Attribute:description+' => '',
-	'Class:FAQ/Attribute:category_id' => '类别',
-	'Class:FAQ/Attribute:category_id+' => '',
-	'Class:FAQ/Attribute:category_name' => '类别名称',
-	'Class:FAQ/Attribute:category_name+' => '',
-	'Class:FAQ/Attribute:error_code' => '错误代码',
-	'Class:FAQ/Attribute:error_code+' => '',
-	'Class:FAQ/Attribute:key_words' => '关键字',
-	'Class:FAQ/Attribute:key_words+' => '',
-	'Class:FAQ/Attribute:domains' => 'Domains~~',
-));
-
-//
-// Class: FAQCategory
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:FAQCategory' => 'FAQ 类别',
-	'Class:FAQCategory+' => 'FAQ 类别',
-	'Class:FAQCategory/Attribute:name' => '名称',
-	'Class:FAQCategory/Attribute:name+' => '',
-	'Class:FAQCategory/Attribute:faq_list' => 'FAQ',
-	'Class:FAQCategory/Attribute:faq_list+' => '该类别FAQ 相关的所有常见问题',
-));
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Menu:ProblemManagement' => '问题管理',
 	'Menu:ProblemManagement+' => '问题管理',
@@ -174,12 +138,4 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Menu:SearchError+' => '搜索已知问题',
 	'Menu:Problem:KnownErrors' => '所有已知错误',
 	'Menu:Problem:KnownErrors+' => '所有已知错误',
-	'Menu:FAQCategory' => 'FAQ 类别',
-	'Menu:FAQCategory+' => '所有FAQ 类别',
-	'Menu:FAQ' => 'FAQ',
-	'Menu:FAQ+' => '所有FAQ',
-
-	'Brick:Portal:FAQ:Menu' => 'FAQ',
-	'Brick:Portal:FAQ:Title' => 'FAQ',
-	'Brick:Portal:FAQ:Title+' => '<p>需要帮助?</p><p>查阅列表中的常见问题,或许可以立即找到令您满意的答案.</p>',
 ));
diff --git a/datamodels/2.x/itop-knownerror-mgmt/images/known-error.png b/datamodels/2.x/itop-knownerror-light/images/known-error.png
similarity index 100%
rename from datamodels/2.x/itop-knownerror-mgmt/images/known-error.png
rename to datamodels/2.x/itop-knownerror-light/images/known-error.png
diff --git a/datamodels/2.x/itop-knownerror-light/module.itop-knownerror-light.php b/datamodels/2.x/itop-knownerror-light/module.itop-knownerror-light.php
new file mode 100755
index 000000000..76ea04922
--- /dev/null
+++ b/datamodels/2.x/itop-knownerror-light/module.itop-knownerror-light.php
@@ -0,0 +1,43 @@
+<?php
+
+
+SetupWebPage::AddModule(
+	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
+	'itop-knownerror-light/2.8.0',
+	array(
+		// Identification
+		//
+		'label' => 'Known Errors Database',
+		'category' => 'business',
+
+		// Setup
+		//
+		'dependencies' => array(
+			'itop-config-mgmt/2.2.0',
+			'itop-portal/2.7.0',
+		),
+		'mandatory' => false,
+		'visible' => true,
+
+		// Components
+		//
+		'datamodel' => array(
+			'model.itop-knownerror-light.php',
+		),
+		'data.struct' => array(
+			//'data.struct.itop-knownerror-mgmt.xml',
+		),
+		'data.sample' => array(
+		),
+		
+		// Documentation
+		//
+		'doc.manual_setup' => '', // No manual installation instructions
+		'doc.more_information' => '',
+
+		// Default settings
+		//
+		'settings' => array(
+		),
+	)
+);
diff --git a/datamodels/2.x/itop-portal/fr.dict.itop-portal.php b/datamodels/2.x/itop-portal/fr.dict.itop-portal.php
index 04bf15e78..f46974e08 100644
--- a/datamodels/2.x/itop-portal/fr.dict.itop-portal.php
+++ b/datamodels/2.x/itop-portal/fr.dict.itop-portal.php
@@ -29,7 +29,7 @@
 //////////////////////////////////////////////////////////////////////
 //
 
-Dict::Add('FR FR', 'French', 'Francais', array(
+Dict::Add('FR FR', 'French', 'Français', array(
 	'portal:itop-portal' => 'Portail standard', // This is the portal name that will be displayed in portal dispatcher (eg. URL in menus)
 	'Page:DefaultTitle' => '%1$s - Portail utilisateur',
 	'Brick:Portal:UserProfile:Title' => 'Mon profil',
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/cs.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/cs.dict.itop-service-mgmt.php
index 687513852..d66bd36b7 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/cs.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/cs.dict.itop-service-mgmt.php
@@ -40,7 +40,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Smlouvy podle úrovně služeb',
 	'UI-ServiceManagementMenu-ContractsByStatus' => 'Smlouvy podle stavu',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Smlouvy končící během 30 dní',
-
 	'Menu:ProviderContract' => 'Smlouvy s poskytovateli',
 	'Menu:ProviderContract+' => 'Smlouvy s poskytovateli',
 	'Menu:CustomerContract' => 'Smlouvy se zákazníky',
@@ -201,23 +200,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:lnkContractToDocument/Attribute:document_name+' => '',
 ));
 
-//
-// Class: lnkFunctionalCIToProviderContract
-//
-
-Dict::Add('CS CZ', 'Czech', 'Čeština', array(
-	'Class:lnkFunctionalCIToProviderContract' => 'Spojení (Funkční konfigurační položka / Smlouva s poskytovatelem)',
-	'Class:lnkFunctionalCIToProviderContract+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Smlouva s poskytovatelem',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Název smlouvy s poskytovatelem',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'Konfigurační položka',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'Název konfigurační položky',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
-));
-
 //
 // Class: ServiceFamily
 //
@@ -469,23 +451,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:lnkProviderContractToService/Attribute:providercontract_name+' => '',
 ));
 
-//
-// Class: lnkFunctionalCIToService
-//
-
-Dict::Add('CS CZ', 'Czech', 'Čeština', array(
-	'Class:lnkFunctionalCIToService' => 'Spojení (Funkční konfigurační položka / Služba)',
-	'Class:lnkFunctionalCIToService+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Služba',
-	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Název služby',
-	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'Konfigurační položka',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'Název konfigurační položky',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '',
-));
-
 //
 // Class: DeliveryModel
 //
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/da.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/da.dict.itop-service-mgmt.php
index 38e9142ae..e8f505f66 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/da.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/da.dict.itop-service-mgmt.php
@@ -28,7 +28,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Kontrakt(er) efter Service Level',
 	'UI-ServiceManagementMenu-ContractsByStatus' => 'Kontrakter efter status',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Kontrakt(er), der udløber om mindre end 30 dage',
-
 	'Menu:ProviderContract' => 'Leverandør kontrakter',
 	'Menu:ProviderContract+' => 'Leverandør kontrakter',
 	'Menu:CustomerContract' => 'Kunde kontrakter',
@@ -189,23 +188,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:lnkContractToDocument/Attribute:document_name+' => '',
 ));
 
-//
-// Class: lnkFunctionalCIToProviderContract
-//
-
-Dict::Add('DA DA', 'Danish', 'Dansk', array(
-	'Class:lnkFunctionalCIToProviderContract' => 'Sammenhæng FunctionalCI/Leverandør Kontrakt',
-	'Class:lnkFunctionalCIToProviderContract+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Leverandør kontrakt',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Leverandør kontrakt navn',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'CI navn',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
-));
-
 //
 // Class: ServiceFamily
 //
@@ -457,23 +439,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:lnkProviderContractToService/Attribute:providercontract_name+' => '',
 ));
 
-//
-// Class: lnkFunctionalCIToService
-//
-
-Dict::Add('DA DA', 'Danish', 'Dansk', array(
-	'Class:lnkFunctionalCIToService' => 'Sammenhæng FunctionalCI/Ydelse',
-	'Class:lnkFunctionalCIToService+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Ydelse',
-	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Ydelses navn',
-	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'CI',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'CI navn',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '',
-));
-
 //
 // Class: DeliveryModel
 //
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/de.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/de.dict.itop-service-mgmt.php
index a1af52d22..b9c0f0c35 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/de.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/de.dict.itop-service-mgmt.php
@@ -30,7 +30,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Verträge nach Service Level',
 	'UI-ServiceManagementMenu-ContractsByStatus' => 'Verträge nach Status',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Verträge, die in weniger als 30 Tagen enden',
-
 	'Menu:ProviderContract' => 'Provider-Verträge',
 	'Menu:ProviderContract+' => 'Provider-Verträge',
 	'Menu:CustomerContract' => 'Kundenverträge',
@@ -191,23 +190,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkContractToDocument/Attribute:document_name+' => '',
 ));
 
-//
-// Class: lnkFunctionalCIToProviderContract
-//
-
-Dict::Add('DE DE', 'German', 'Deutsch', array(
-	'Class:lnkFunctionalCIToProviderContract' => 'Verknüpfung FunctionalCI/Provider-Vertrag',
-	'Class:lnkFunctionalCIToProviderContract+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Provider-Vertrag',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Providervertrags-Name',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'CI-Name',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
-));
-
 //
 // Class: ServiceFamily
 //
@@ -459,23 +441,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkProviderContractToService/Attribute:providercontract_name+' => '',
 ));
 
-//
-// Class: lnkFunctionalCIToService
-//
-
-Dict::Add('DE DE', 'German', 'Deutsch', array(
-	'Class:lnkFunctionalCIToService' => 'Verknüpfung FunctionalCI/Service',
-	'Class:lnkFunctionalCIToService+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Service',
-	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Service-Name',
-	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'CI',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'CI-Name',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '',
-));
-
 //
 // Class: DeliveryModel
 //
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/en.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/en.dict.itop-service-mgmt.php
index 478eb9357..a138818d7 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/en.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/en.dict.itop-service-mgmt.php
@@ -40,7 +40,6 @@ Dict::Add('EN US', 'English', 'English', array(
 	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contracts by service level',
 	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contracts by status',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contracts ending in less then 30 days',
-
 	'Menu:ProviderContract' => 'Provider contracts',
 	'Menu:ProviderContract+' => 'Provider contracts',
 	'Menu:CustomerContract' => 'Customer contracts',
@@ -201,23 +200,6 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:lnkContractToDocument/Attribute:document_name+' => '',
 ));
 
-//
-// Class: lnkFunctionalCIToProviderContract
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:lnkFunctionalCIToProviderContract' => 'Link FunctionalCI / ProviderContract',
-	'Class:lnkFunctionalCIToProviderContract+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Provider contract',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Provider contract Name',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'CI Name',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
-));
-
 //
 // Class: ServiceFamily
 //
@@ -469,23 +451,6 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:lnkProviderContractToService/Attribute:providercontract_name+' => '',
 ));
 
-//
-// Class: lnkFunctionalCIToService
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:lnkFunctionalCIToService' => 'Link FunctionalCI / Service',
-	'Class:lnkFunctionalCIToService+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Service',
-	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Service Name',
-	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'CI',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'CI Name',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '',
-));
-
 //
 // Class: DeliveryModel
 //
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/es_cr.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/es_cr.dict.itop-service-mgmt.php
index af6a1f187..86c89c390 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/es_cr.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/es_cr.dict.itop-service-mgmt.php
@@ -39,7 +39,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contratos por Nivel de Servicio',
 	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contratos por Estatus',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contratos Finalizando en menos de 30 días',
-
 	'Menu:ProviderContract' => 'Contratos con Proveedores',
 	'Menu:ProviderContract+' => 'Contratos con Proveedores',
 	'Menu:CustomerContract' => 'Acuerdos con Clientes',
@@ -200,23 +199,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'Class:lnkContractToDocument/Attribute:document_name+' => 'Documento',
 ));
 
-//
-// Class: lnkFunctionalCIToProviderContract
-//
-
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
-	'Class:lnkFunctionalCIToProviderContract' => 'Relación EC Funcional y Contrato con Proveedor',
-	'Class:lnkFunctionalCIToProviderContract+' => 'Relación EC Funcional y Contrato con Proveedor',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Contrato con Proveedor',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => 'Contrato con Proveedor',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Contrato con Proveedor',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => 'Contrato con Proveedor',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'EC',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => 'Elemento de Configuración',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'Elemento de Configuración',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => 'Elemento de Configuración',
-));
-
 //
 // Class: ServiceFamily
 //
@@ -468,23 +450,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'Class:lnkProviderContractToService/Attribute:providercontract_name+' => 'Contrato con Proveedor',
 ));
 
-//
-// Class: lnkFunctionalCIToService
-//
-
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
-	'Class:lnkFunctionalCIToService' => 'Relación EC Funcional y Servicio',
-	'Class:lnkFunctionalCIToService+' => 'Relación EC Funcional y Servicio',
-	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Servicio',
-	'Class:lnkFunctionalCIToService/Attribute:service_id+' => 'Servicio',
-	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Servicio',
-	'Class:lnkFunctionalCIToService/Attribute:service_name+' => 'Servicio',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'EC',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => 'Elemento de Configuración',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'EC',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => 'Elemento de Configuración',
-));
-
 //
 // Class: DeliveryModel
 //
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/fr.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/fr.dict.itop-service-mgmt.php
index 99bd14b07..01d47871b 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/fr.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/fr.dict.itop-service-mgmt.php
@@ -30,7 +30,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contrats, par niveau de service',
 	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contrats, par état',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contrats se terminant dans moins d\'un mois',
-
 	'Menu:ProviderContract' => 'Contrats fournisseurs',
 	'Menu:ProviderContract+' => 'Contrats fournisseurs',
 	'Menu:CustomerContract' => 'Contrats clients',
@@ -191,23 +190,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:lnkContractToDocument/Attribute:document_name+' => '',
 ));
 
-//
-// Class: lnkFunctionalCIToProviderContract
-//
-
-Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:lnkFunctionalCIToProviderContract' => 'Lien CI / Contrat fournisseur',
-	'Class:lnkFunctionalCIToProviderContract+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Contrat fournisseur',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Nom contrat fournisseur',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'Nom CI',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
-));
-
 //
 // Class: ServiceFamily
 //
@@ -459,23 +441,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:lnkProviderContractToService/Attribute:providercontract_name+' => '',
 ));
 
-//
-// Class: lnkFunctionalCIToService
-//
-
-Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:lnkFunctionalCIToService' => 'Lien CI / Service',
-	'Class:lnkFunctionalCIToService+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Service',
-	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Nom service',
-	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'CI',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'Nom CI',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '',
-));
-
 //
 // Class: DeliveryModel
 //
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/hu.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/hu.dict.itop-service-mgmt.php
index 104f885c6..65f1d0063 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/hu.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/hu.dict.itop-service-mgmt.php
@@ -27,7 +27,6 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Szerződések szolgáltatás szintenként',
 	'UI-ServiceManagementMenu-ContractsByStatus' => 'Szerződések státuszonként',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => '30 napon belül lejáró szerződések',
-
 	'Menu:ProviderContract' => 'Szállítói szerződés',
 	'Menu:ProviderContract+' => '',
 	'Menu:CustomerContract' => 'Ügyfél szerződés',
@@ -188,23 +187,6 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:lnkContractToDocument/Attribute:document_name+' => '~~',
 ));
 
-//
-// Class: lnkFunctionalCIToProviderContract
-//
-
-Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'Class:lnkFunctionalCIToProviderContract' => 'Link FunctionalCI / ProviderContract~~',
-	'Class:lnkFunctionalCIToProviderContract+' => '~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Provider contract~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Provider contract Name~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'CI Name~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '~~',
-));
-
 //
 // Class: ServiceFamily
 //
@@ -456,23 +438,6 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:lnkProviderContractToService/Attribute:providercontract_name+' => '~~',
 ));
 
-//
-// Class: lnkFunctionalCIToService
-//
-
-Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'Class:lnkFunctionalCIToService' => 'Link FunctionalCI / Service~~',
-	'Class:lnkFunctionalCIToService+' => '~~',
-	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Service~~',
-	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '~~',
-	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Service Name~~',
-	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '~~',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'CI~~',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '~~',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'CI Name~~',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '~~',
-));
-
 //
 // Class: DeliveryModel
 //
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/it.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/it.dict.itop-service-mgmt.php
index a05f3f34d..d343b1cfb 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/it.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/it.dict.itop-service-mgmt.php
@@ -38,7 +38,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contratti per livello di servizio',
 	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contratti per stato',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contratti che terminano in meno di 30 giorni',
-
 	'Menu:ProviderContract' => 'Contratti con Provider',
 	'Menu:ProviderContract+' => 'Contratti con Provider',
 	'Menu:CustomerContract' => 'Contratti con Clienti',
@@ -199,23 +198,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:lnkContractToDocument/Attribute:document_name+' => '~~',
 ));
 
-//
-// Class: lnkFunctionalCIToProviderContract
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:lnkFunctionalCIToProviderContract' => 'Link FunctionalCI / ProviderContract~~',
-	'Class:lnkFunctionalCIToProviderContract+' => '~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Provider contract~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Provider contract Name~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'CI Name~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '~~',
-));
-
 //
 // Class: ServiceFamily
 //
@@ -467,23 +449,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:lnkProviderContractToService/Attribute:providercontract_name+' => '~~',
 ));
 
-//
-// Class: lnkFunctionalCIToService
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:lnkFunctionalCIToService' => 'Link FunctionalCI / Service~~',
-	'Class:lnkFunctionalCIToService+' => '~~',
-	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Service~~',
-	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '~~',
-	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Service Name~~',
-	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '~~',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'CI~~',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '~~',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'CI Name~~',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '~~',
-));
-
 //
 // Class: DeliveryModel
 //
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/ja.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/ja.dict.itop-service-mgmt.php
index cc3f652dc..92c1d7d9c 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/ja.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/ja.dict.itop-service-mgmt.php
@@ -27,7 +27,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'サービスレベル別契約',
 	'UI-ServiceManagementMenu-ContractsByStatus' => 'ステータス別契約',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => '30日以内に終了する契約',
-
 	'Menu:ProviderContract' => 'プロバイダー契約',
 	'Menu:ProviderContract+' => 'プロバイダー契約',
 	'Menu:CustomerContract' => '顧客契約',
@@ -188,23 +187,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkContractToDocument/Attribute:document_name+' => '',
 ));
 
-//
-// Class: lnkFunctionalCIToProviderContract
-//
-
-Dict::Add('JA JP', 'Japanese', '日本語', array(
-	'Class:lnkFunctionalCIToProviderContract' => 'リンク 機能的CI/プロバイダー契約',
-	'Class:lnkFunctionalCIToProviderContract+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'プロバイダー契約',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'プロバイダー契約名',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'CI名',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
-));
-
 //
 // Class: ServiceFamily
 //
@@ -456,23 +438,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkProviderContractToService/Attribute:providercontract_name+' => '',
 ));
 
-//
-// Class: lnkFunctionalCIToService
-//
-
-Dict::Add('JA JP', 'Japanese', '日本語', array(
-	'Class:lnkFunctionalCIToService' => 'リンク 機能的CI/サービス',
-	'Class:lnkFunctionalCIToService+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'サービス',
-	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'サービス名',
-	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'CI',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'CI名',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '',
-));
-
 //
 // Class: DeliveryModel
 //
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/nl.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/nl.dict.itop-service-mgmt.php
index fc7db7ee8..ddf13b1fd 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/nl.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/nl.dict.itop-service-mgmt.php
@@ -42,7 +42,6 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contracten per servicelevel',
 	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contracten per status',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contracten die in minder dan 30 dagen verlopen',
-
 	'Menu:ProviderContract' => 'Leverancierscontracten',
 	'Menu:ProviderContract+' => 'Leverancierscontracten',
 	'Menu:CustomerContract' => 'Klantencontracten',
@@ -203,23 +202,6 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:lnkContractToDocument/Attribute:document_name+' => '',
 ));
 
-//
-// Class: lnkFunctionalCIToProviderContract
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:lnkFunctionalCIToProviderContract' => 'Link Functioneel CI / Leverancierscontract',
-	'Class:lnkFunctionalCIToProviderContract+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Leverancierscontract',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Naam leverancierscontract',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'Naam CI',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
-));
-
 //
 // Class: ServiceFamily
 //
@@ -471,23 +453,6 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:lnkProviderContractToService/Attribute:providercontract_name+' => '',
 ));
 
-//
-// Class: lnkFunctionalCIToService
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:lnkFunctionalCIToService' => 'Link Functioneel CI / Service',
-	'Class:lnkFunctionalCIToService+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Service',
-	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Naam service',
-	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'CI',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'Naam CI',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '',
-));
-
 //
 // Class: DeliveryModel
 //
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/pt_br.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/pt_br.dict.itop-service-mgmt.php
index 852062ed5..2581a590f 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/pt_br.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/pt_br.dict.itop-service-mgmt.php
@@ -38,7 +38,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contratos por nível serviço',
 	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contratos por estado',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contratos finalizando em menos de 30 dias',
-
 	'Menu:ProviderContract' => 'Contratos Provedor(as)',
 	'Menu:ProviderContract+' => 'Contratos Provedor(as)',
 	'Menu:CustomerContract' => 'Contratos Clientes',
@@ -199,23 +198,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkContractToDocument/Attribute:document_name+' => '',
 ));
 
-//
-// Class: lnkFunctionalCIToProviderContract
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkFunctionalCIToProviderContract' => 'Link CI / Contrato provedor(a)',
-	'Class:lnkFunctionalCIToProviderContract+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Contrato provedor(a)',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Nome contrato provedor(a)',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CIs',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'Nome CI',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
-));
-
 //
 // Class: ServiceFamily
 //
@@ -467,23 +449,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkProviderContractToService/Attribute:providercontract_name+' => '',
 ));
 
-//
-// Class: lnkFunctionalCIToService
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkFunctionalCIToService' => 'Link CI / Serviço',
-	'Class:lnkFunctionalCIToService+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Serviço',
-	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Nome serviço',
-	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'CIs',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'Nome CI',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '',
-));
-
 //
 // Class: DeliveryModel
 //
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/ru.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/ru.dict.itop-service-mgmt.php
index bdb29ee52..062938292 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/ru.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/ru.dict.itop-service-mgmt.php
@@ -16,7 +16,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Договоры по уровню услуг',
 	'UI-ServiceManagementMenu-ContractsByStatus' => 'Договоры по статусу',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Договоры, оканчивающиеся в течение 30-ти дней',
-
 	'Menu:ProviderContract' => 'Договоры с поставщиками',
 	'Menu:ProviderContract+' => 'Договоры с поставщиками',
 	'Menu:CustomerContract' => 'Договоры с заказчиками',
@@ -177,23 +176,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkContractToDocument/Attribute:document_name+' => '',
 ));
 
-//
-// Class: lnkFunctionalCIToProviderContract
-//
-
-Dict::Add('RU RU', 'Russian', 'Русский', array(
-	'Class:lnkFunctionalCIToProviderContract' => 'Связь Функциональная КЕ/Договор с поставщиком',
-	'Class:lnkFunctionalCIToProviderContract+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Договор с поставщиком',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Договор с поставщиком',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'КЕ',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'КЕ',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
-));
-
 //
 // Class: ServiceFamily
 //
@@ -445,23 +427,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkProviderContractToService/Attribute:providercontract_name+' => '',
 ));
 
-//
-// Class: lnkFunctionalCIToService
-//
-
-Dict::Add('RU RU', 'Russian', 'Русский', array(
-	'Class:lnkFunctionalCIToService' => 'Связь Функциональная КЕ/Услуга',
-	'Class:lnkFunctionalCIToService+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Услуга',
-	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Услуга',
-	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'КЕ',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'КЕ',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '',
-));
-
 //
 // Class: DeliveryModel
 //
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/sk.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/sk.dict.itop-service-mgmt.php
index 668d43566..e4f02177e 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/sk.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/sk.dict.itop-service-mgmt.php
@@ -37,7 +37,6 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'zmluvy podľa úrovne služby',
 	'UI-ServiceManagementMenu-ContractsByStatus' => 'zmluvy podla stavu',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'zmluvy končiace za menej ako 30 dní',
-
 	'Menu:ProviderContract' => 'Poskytovateľské zmluvy',
 	'Menu:ProviderContract+' => '',
 	'Menu:CustomerContract' => 'Zákaznícke zmluvy',
@@ -198,23 +197,6 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:lnkContractToDocument/Attribute:document_name+' => '',
 ));
 
-//
-// Class: lnkFunctionalCIToProviderContract
-//
-
-Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
-	'Class:lnkFunctionalCIToProviderContract' => 'väzba - Komponent / Poskytovateľská zmluva',
-	'Class:lnkFunctionalCIToProviderContract+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Poskytovateľská zmluva',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Názov poskytovateľského zmluvy',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'Zariadenie',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'Názov CI',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
-));
-
 //
 // Class: ServiceFamily
 //
@@ -466,23 +448,6 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:lnkProviderContractToService/Attribute:providercontract_name+' => '',
 ));
 
-//
-// Class: lnkFunctionalCIToService
-//
-
-Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
-	'Class:lnkFunctionalCIToService' => 'väzba - Komponent / Služba',
-	'Class:lnkFunctionalCIToService+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Služba',
-	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Názov služby',
-	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'Zariadenie',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'Názov CI',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '',
-));
-
 //
 // Class: DeliveryModel
 //
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/tr.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/tr.dict.itop-service-mgmt.php
index a9f5ae313..7de05a913 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/tr.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/tr.dict.itop-service-mgmt.php
@@ -39,7 +39,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Hizmet seviyesine göre sözleşmeler',
 	'UI-ServiceManagementMenu-ContractsByStatus' => 'Durumuna göre sözleşmeler',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => '30 gün çinde biten sözleşmeler',
-
 	'Menu:ProviderContract' => 'Tedarikçi Sözleşmeleri',
 	'Menu:ProviderContract+' => 'Tedarikçi Sözleşmeleri',
 	'Menu:CustomerContract' => 'Müşteri Sözleşmeleri',
@@ -200,23 +199,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:lnkContractToDocument/Attribute:document_name+' => '~~',
 ));
 
-//
-// Class: lnkFunctionalCIToProviderContract
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:lnkFunctionalCIToProviderContract' => 'Link FunctionalCI / ProviderContract~~',
-	'Class:lnkFunctionalCIToProviderContract+' => '~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Provider contract~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Provider contract Name~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'CI Name~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '~~',
-));
-
 //
 // Class: ServiceFamily
 //
@@ -468,23 +450,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:lnkProviderContractToService/Attribute:providercontract_name+' => '~~',
 ));
 
-//
-// Class: lnkFunctionalCIToService
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:lnkFunctionalCIToService' => 'Link FunctionalCI / Service~~',
-	'Class:lnkFunctionalCIToService+' => '~~',
-	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Service~~',
-	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '~~',
-	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Service Name~~',
-	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '~~',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'CI~~',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '~~',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'CI Name~~',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '~~',
-));
-
 //
 // Class: DeliveryModel
 //
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/zh_cn.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/zh_cn.dict.itop-service-mgmt.php
index b0562e714..b5ef4b3cb 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/zh_cn.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/zh_cn.dict.itop-service-mgmt.php
@@ -37,7 +37,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI-ServiceManagementMenu-ContractsBySrvLevel' => '合同(按服务等级)',
 	'UI-ServiceManagementMenu-ContractsByStatus' => '合同(按状态)',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contracts ending in less then 30 days',
-
 	'Menu:ProviderContract' => '供应商合同',
 	'Menu:ProviderContract+' => '供应商合同',
 	'Menu:CustomerContract' => '客户合同',
@@ -198,23 +197,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:lnkContractToDocument/Attribute:document_name+' => '',
 ));
 
-//
-// Class: lnkFunctionalCIToProviderContract
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:lnkFunctionalCIToProviderContract' => '关联 功能配置项/供应商合同',
-	'Class:lnkFunctionalCIToProviderContract+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => '供应商合同',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => '供应商合同名称',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => '配置项',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => '配置项名称',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
-));
-
 //
 // Class: ServiceFamily
 //
@@ -466,23 +448,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:lnkProviderContractToService/Attribute:providercontract_name+' => '',
 ));
 
-//
-// Class: lnkFunctionalCIToService
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:lnkFunctionalCIToService' => '关联 功能配置项/服务',
-	'Class:lnkFunctionalCIToService+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:service_id' => '服务',
-	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:service_name' => '服务名称',
-	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => '配置项',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => '配置项名称',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '',
-));
-
 //
 // Class: DeliveryModel
 //
diff --git a/datamodels/2.x/itop-structure/cs.dict.itop-structure.php b/datamodels/2.x/itop-structure/cs.dict.itop-structure.php
index ecebf0410..38bf8b3f4 100644
--- a/datamodels/2.x/itop-structure/cs.dict.itop-structure.php
+++ b/datamodels/2.x/itop-structure/cs.dict.itop-structure.php
@@ -223,10 +223,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:Document/Attribute:status/Value:published+' => '',
 	'Class:Document/Attribute:cis_list' => 'Konfigurační položky',
 	'Class:Document/Attribute:cis_list+' => '',
-	'Class:Document/Attribute:contracts_list' => 'Smlouvy',
-	'Class:Document/Attribute:contracts_list+' => '',
-	'Class:Document/Attribute:services_list' => 'Služby',
-	'Class:Document/Attribute:services_list+' => '',
 	'Class:Document/Attribute:finalclass' => 'Typ dokumentu',
 	'Class:Document/Attribute:finalclass+' => '',
 ));
diff --git a/datamodels/2.x/itop-structure/da.dict.itop-structure.php b/datamodels/2.x/itop-structure/da.dict.itop-structure.php
index f50c316d7..a4f4e045a 100644
--- a/datamodels/2.x/itop-structure/da.dict.itop-structure.php
+++ b/datamodels/2.x/itop-structure/da.dict.itop-structure.php
@@ -212,10 +212,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:Document/Attribute:status/Value:published+' => '',
 	'Class:Document/Attribute:cis_list' => 'CIs',
 	'Class:Document/Attribute:cis_list+' => '',
-	'Class:Document/Attribute:contracts_list' => 'Kontrakter',
-	'Class:Document/Attribute:contracts_list+' => '',
-	'Class:Document/Attribute:services_list' => 'Ydelser',
-	'Class:Document/Attribute:services_list+' => '',
 	'Class:Document/Attribute:finalclass' => 'Dokumenttype',
 	'Class:Document/Attribute:finalclass+' => '',
 ));
diff --git a/datamodels/2.x/itop-config-mgmt/data.sample.locations.xml b/datamodels/2.x/itop-structure/data.sample.locations.xml
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-config-mgmt/data.sample.locations.xml
rename to datamodels/2.x/itop-structure/data.sample.locations.xml
diff --git a/datamodels/2.x/itop-structure/datamodel.itop-structure.xml b/datamodels/2.x/itop-structure/datamodel.itop-structure.xml
index 68ec80c47..607816f9f 100644
--- a/datamodels/2.x/itop-structure/datamodel.itop-structure.xml
+++ b/datamodels/2.x/itop-structure/datamodel.itop-structure.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.6">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.7">
 <classes>
 		<class id="Organization" _delta="define">
 			<parent>cmdbAbstractObject</parent>
@@ -588,9 +588,6 @@
 				</field>
 				<field id="manager_id" xsi:type="AttributeExternalKey">
 					<filter><![CDATA[SELECT Person]]></filter>
-					<dependencies>
-						<attribute id="org_id"/>
-					</dependencies>
 					<sql>manager_id</sql>
 					<target_class>Person</target_class>
 					<is_null_allowed>true</is_null_allowed>
diff --git a/datamodels/2.x/itop-structure/de.dict.itop-structure.php b/datamodels/2.x/itop-structure/de.dict.itop-structure.php
index 6fdca2673..0f3051340 100644
--- a/datamodels/2.x/itop-structure/de.dict.itop-structure.php
+++ b/datamodels/2.x/itop-structure/de.dict.itop-structure.php
@@ -223,10 +223,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Document/Attribute:status/Value:published+' => '',
 	'Class:Document/Attribute:cis_list' => 'CIs',
 	'Class:Document/Attribute:cis_list+' => '',
-	'Class:Document/Attribute:contracts_list' => 'Verträge',
-	'Class:Document/Attribute:contracts_list+' => '',
-	'Class:Document/Attribute:services_list' => 'Services',
-	'Class:Document/Attribute:services_list+' => '',
 	'Class:Document/Attribute:finalclass' => 'Dokumenttyp',
 	'Class:Document/Attribute:finalclass+' => '',
 ));
diff --git a/datamodels/2.x/itop-structure/en.dict.itop-structure.php b/datamodels/2.x/itop-structure/en.dict.itop-structure.php
index f81435ce5..70db940f2 100644
--- a/datamodels/2.x/itop-structure/en.dict.itop-structure.php
+++ b/datamodels/2.x/itop-structure/en.dict.itop-structure.php
@@ -21,22 +21,7 @@
  * along with iTop. If not, see <http://www.gnu.org/licenses/>
  */
 
-//////////////////////////////////////////////////////////////////////
-// Relations
-//////////////////////////////////////////////////////////////////////
-//
 
-Dict::Add('EN US', 'English', 'English', array(
-	'Relation:impacts/Description' => 'Elements impacted by',
-	'Relation:impacts/DownStream' => 'Impacts...',
-	'Relation:impacts/DownStream+' => 'Elements impacted by',
-	'Relation:impacts/UpStream' => 'Depends on......',
-	'Relation:impacts/UpStream+' => 'Elements impacting',
-	// Legacy entries
-	'Relation:depends on/Description' => 'Elements impacting',
-	'Relation:depends on/DownStream' => 'Depends on...',
-	'Relation:depends on/UpStream' => 'Impacts...',
-));
 
 
 // Dictionnay conventions
@@ -261,10 +246,6 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:Document/Attribute:status/Value:published+' => '',
 	'Class:Document/Attribute:cis_list' => 'CIs',
 	'Class:Document/Attribute:cis_list+' => 'All the configuration items linked to this document',
-	'Class:Document/Attribute:contracts_list' => 'Contracts',
-	'Class:Document/Attribute:contracts_list+' => 'All the contracts linked to this document',
-	'Class:Document/Attribute:services_list' => 'Services',
-	'Class:Document/Attribute:services_list+' => 'All the services linked to this document',
 	'Class:Document/Attribute:finalclass' => 'Document sub-class',
 	'Class:Document/Attribute:finalclass+' => 'Name of the final class',
 ));
diff --git a/datamodels/2.x/itop-structure/es_cr.dict.itop-structure.php b/datamodels/2.x/itop-structure/es_cr.dict.itop-structure.php
index a900d3aad..5e3b60d6c 100644
--- a/datamodels/2.x/itop-structure/es_cr.dict.itop-structure.php
+++ b/datamodels/2.x/itop-structure/es_cr.dict.itop-structure.php
@@ -216,10 +216,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'Class:Document/Attribute:status/Value:published+' => 'Publicado',
 	'Class:Document/Attribute:cis_list' => 'ECs',
 	'Class:Document/Attribute:cis_list+' => 'Elementos de Configuración referenciados en este documento',
-	'Class:Document/Attribute:contracts_list' => 'Contratos',
-	'Class:Document/Attribute:contracts_list+' => 'Contratos Referenciados con este Documento',
-	'Class:Document/Attribute:services_list' => 'Servicios',
-	'Class:Document/Attribute:services_list+' => 'Servicios Referenciados con este Documento',
 	'Class:Document/Attribute:finalclass' => 'Tipo de Documento',
 	'Class:Document/Attribute:finalclass+' => 'Tipo de Documento',
 ));
diff --git a/datamodels/2.x/itop-structure/fr.dict.itop-structure.php b/datamodels/2.x/itop-structure/fr.dict.itop-structure.php
index 635a56afb..a67010afa 100644
--- a/datamodels/2.x/itop-structure/fr.dict.itop-structure.php
+++ b/datamodels/2.x/itop-structure/fr.dict.itop-structure.php
@@ -23,17 +23,7 @@
 //
 // Class: Organization
 //
-Dict::Add('FR FR', 'French', 'Français', array(
-	'Relation:impacts/Description' => 'Eléments impactés par',
-	'Relation:impacts/DownStream' => 'Impacte...',
-	'Relation:impacts/DownStream+' => 'Eléments impactés par',
-	'Relation:impacts/UpStream' => 'Dépend de...',
-	'Relation:impacts/UpStream+' => 'Eléments dont dépend',
-	// Legacy entries
-	'Relation:depends on/Description' => 'Eléments dont dépend',
-	'Relation:depends on/DownStream' => 'Dépend de...',
-	'Relation:depends on/UpStream' => 'Impacte...',
-));
+
 
 
 // Dictionnay conventions
@@ -259,10 +249,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:Document/Attribute:status/Value:published+' => '',
 	'Class:Document/Attribute:cis_list' => 'CIs',
 	'Class:Document/Attribute:cis_list+' => '',
-	'Class:Document/Attribute:contracts_list' => 'Contrats',
-	'Class:Document/Attribute:contracts_list+' => '',
-	'Class:Document/Attribute:services_list' => 'Services',
-	'Class:Document/Attribute:services_list+' => '',
 	'Class:Document/Attribute:finalclass' => 'Sous-classe de Document',
 	'Class:Document/Attribute:finalclass+' => 'Nom de la classe instanciable',
 ));
diff --git a/datamodels/2.x/itop-structure/hu.dict.itop-structure.php b/datamodels/2.x/itop-structure/hu.dict.itop-structure.php
index ca15ab7e5..f19bed7d4 100644
--- a/datamodels/2.x/itop-structure/hu.dict.itop-structure.php
+++ b/datamodels/2.x/itop-structure/hu.dict.itop-structure.php
@@ -214,10 +214,6 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:Document/Attribute:status/Value:published+' => '',
 	'Class:Document/Attribute:cis_list' => 'CIs~~',
 	'Class:Document/Attribute:cis_list+' => 'All the configuration items linked to this document~~',
-	'Class:Document/Attribute:contracts_list' => 'Contracts~~',
-	'Class:Document/Attribute:contracts_list+' => 'All the contracts linked to this document~~',
-	'Class:Document/Attribute:services_list' => 'Services~~',
-	'Class:Document/Attribute:services_list+' => 'All the services linked to this document~~',
 	'Class:Document/Attribute:finalclass' => 'Document Type~~',
 	'Class:Document/Attribute:finalclass+' => 'Name of the final class~~',
 ));
@@ -269,6 +265,24 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:Typology/Attribute:finalclass+' => 'Name of the final class~~',
 ));
 
+//
+// Class: DocumentType
+//
+
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+	'Class:DocumentType' => 'Document Type~~',
+	'Class:DocumentType+' => '~~',
+));
+
+//
+// Class: ContactType
+//
+
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+	'Class:ContactType' => 'Contact Type~~',
+	'Class:ContactType+' => '~~',
+));
+
 //
 // Class: lnkPersonToTeam
 //
@@ -331,5 +345,4 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'UI_WelcomeMenu_AllConfigItems' => 'Summary~~',
 	'Menu:ConfigManagement:Typology' => 'Typology configuration~~',
 ));
-
 ?>
\ No newline at end of file
diff --git a/datamodels/2.x/itop-structure/it.dict.itop-structure.php b/datamodels/2.x/itop-structure/it.dict.itop-structure.php
index d343b016d..2ea205c8f 100644
--- a/datamodels/2.x/itop-structure/it.dict.itop-structure.php
+++ b/datamodels/2.x/itop-structure/it.dict.itop-structure.php
@@ -214,10 +214,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:Document/Attribute:status/Value:published+' => '',
 	'Class:Document/Attribute:cis_list' => 'CIs~~',
 	'Class:Document/Attribute:cis_list+' => 'All the configuration items linked to this document~~',
-	'Class:Document/Attribute:contracts_list' => 'Contracts~~',
-	'Class:Document/Attribute:contracts_list+' => 'All the contracts linked to this document~~',
-	'Class:Document/Attribute:services_list' => 'Services~~',
-	'Class:Document/Attribute:services_list+' => 'All the services linked to this document~~',
 	'Class:Document/Attribute:finalclass' => 'Document Type~~',
 	'Class:Document/Attribute:finalclass+' => 'Name of the final class~~',
 ));
@@ -347,5 +343,4 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Menu:Typology+' => 'Typology configuration~~',
 	'UI_WelcomeMenu_AllConfigItems' => 'Summary~~',
 	'Menu:ConfigManagement:Typology' => 'Typology configuration~~',
-
 ));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-structure/ja.dict.itop-structure.php b/datamodels/2.x/itop-structure/ja.dict.itop-structure.php
index ee3831f4a..b36f971dd 100644
--- a/datamodels/2.x/itop-structure/ja.dict.itop-structure.php
+++ b/datamodels/2.x/itop-structure/ja.dict.itop-structure.php
@@ -215,10 +215,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:Document/Attribute:status/Value:published+' => '',
 	'Class:Document/Attribute:cis_list' => 'CI',
 	'Class:Document/Attribute:cis_list+' => '',
-	'Class:Document/Attribute:contracts_list' => '契約',
-	'Class:Document/Attribute:contracts_list+' => '',
-	'Class:Document/Attribute:services_list' => 'サービス',
-	'Class:Document/Attribute:services_list+' => '',
 	'Class:Document/Attribute:finalclass' => '文書タイプ',
 	'Class:Document/Attribute:finalclass+' => '',
 ));
diff --git a/datamodels/2.x/itop-structure/module.itop-structure.php b/datamodels/2.x/itop-structure/module.itop-structure.php
index 829e3f693..0ffe6ba92 100644
--- a/datamodels/2.x/itop-structure/module.itop-structure.php
+++ b/datamodels/2.x/itop-structure/module.itop-structure.php
@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-structure/2.7.1',
+	'itop-structure/2.8.0',
 	array(
 		// Identification
 		//
@@ -28,10 +28,11 @@ SetupWebPage::AddModule(
 		),
 		'data.sample' => array(
 			'data.sample.organizations.xml',
+			'data.sample.locations.xml',
 			'data.sample.persons.xml',
 			'data.sample.teams.xml',
 			'data.sample.contactteam.xml',
-
+			'data.sample.contacttype.xml',
 		),
 		
 		// Documentation
diff --git a/datamodels/2.x/itop-structure/nl.dict.itop-structure.php b/datamodels/2.x/itop-structure/nl.dict.itop-structure.php
index 81a2ac216..7604691ff 100644
--- a/datamodels/2.x/itop-structure/nl.dict.itop-structure.php
+++ b/datamodels/2.x/itop-structure/nl.dict.itop-structure.php
@@ -220,10 +220,6 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:Document/Attribute:status/Value:published+' => '',
 	'Class:Document/Attribute:cis_list' => 'CI\'s',
 	'Class:Document/Attribute:cis_list+' => 'Alle configuratie-items gerelateerd aan dit document',
-	'Class:Document/Attribute:contracts_list' => 'Contracten',
-	'Class:Document/Attribute:contracts_list+' => 'Alle contracten gerelateerd aan dit document',
-	'Class:Document/Attribute:services_list' => 'Services',
-	'Class:Document/Attribute:services_list+' => 'Alle services gerelateerd aan dit document.',
 	'Class:Document/Attribute:finalclass' => 'Subklasse document',
 	'Class:Document/Attribute:finalclass+' => '',
 ));
diff --git a/datamodels/2.x/itop-structure/pt_br.dict.itop-structure.php b/datamodels/2.x/itop-structure/pt_br.dict.itop-structure.php
index 440647436..763b8ab90 100644
--- a/datamodels/2.x/itop-structure/pt_br.dict.itop-structure.php
+++ b/datamodels/2.x/itop-structure/pt_br.dict.itop-structure.php
@@ -215,10 +215,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:Document/Attribute:status/Value:published+' => '',
 	'Class:Document/Attribute:cis_list' => 'CIs',
 	'Class:Document/Attribute:cis_list+' => 'Todos os itens de configuração vinculados a esse documento',
-	'Class:Document/Attribute:contracts_list' => 'Contratos',
-	'Class:Document/Attribute:contracts_list+' => 'Todos os contratos vinculados com esse documento',
-	'Class:Document/Attribute:services_list' => 'Services',
-	'Class:Document/Attribute:services_list+' => 'Todos os serviços vinculados a esse documento',
 	'Class:Document/Attribute:finalclass' => 'Tipo documento',
 	'Class:Document/Attribute:finalclass+' => '',
 ));
diff --git a/datamodels/2.x/itop-structure/ru.dict.itop-structure.php b/datamodels/2.x/itop-structure/ru.dict.itop-structure.php
index a7efe8d20..4df99bded 100644
--- a/datamodels/2.x/itop-structure/ru.dict.itop-structure.php
+++ b/datamodels/2.x/itop-structure/ru.dict.itop-structure.php
@@ -200,10 +200,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:Document/Attribute:status/Value:published+' => '',
 	'Class:Document/Attribute:cis_list' => 'КЕ',
 	'Class:Document/Attribute:cis_list+' => 'Связанные конфигурационные единицы',
-	'Class:Document/Attribute:contracts_list' => 'Договоры',
-	'Class:Document/Attribute:contracts_list+' => 'Связанные договоры',
-	'Class:Document/Attribute:services_list' => 'Услуги',
-	'Class:Document/Attribute:services_list+' => 'Связанные услуги',
 	'Class:Document/Attribute:finalclass' => 'Тип',
 	'Class:Document/Attribute:finalclass+' => '',
 ));
diff --git a/datamodels/2.x/itop-structure/sk.dict.itop-structure.php b/datamodels/2.x/itop-structure/sk.dict.itop-structure.php
index f2d42f26a..13b9ac83f 100644
--- a/datamodels/2.x/itop-structure/sk.dict.itop-structure.php
+++ b/datamodels/2.x/itop-structure/sk.dict.itop-structure.php
@@ -213,10 +213,6 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:Document/Attribute:status/Value:published+' => '',
 	'Class:Document/Attribute:cis_list' => 'Komponenty',
 	'Class:Document/Attribute:cis_list+' => '',
-	'Class:Document/Attribute:contracts_list' => 'Zmluvy',
-	'Class:Document/Attribute:contracts_list+' => '',
-	'Class:Document/Attribute:services_list' => 'Služby',
-	'Class:Document/Attribute:services_list+' => '',
 	'Class:Document/Attribute:finalclass' => 'Typ dokumentu',
 	'Class:Document/Attribute:finalclass+' => '',
 ));
diff --git a/datamodels/2.x/itop-structure/tr.dict.itop-structure.php b/datamodels/2.x/itop-structure/tr.dict.itop-structure.php
index 4ac08ddd3..4f9843630 100644
--- a/datamodels/2.x/itop-structure/tr.dict.itop-structure.php
+++ b/datamodels/2.x/itop-structure/tr.dict.itop-structure.php
@@ -215,10 +215,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:Document/Attribute:status/Value:published+' => '',
 	'Class:Document/Attribute:cis_list' => 'CIs~~',
 	'Class:Document/Attribute:cis_list+' => 'All the configuration items linked to this document~~',
-	'Class:Document/Attribute:contracts_list' => 'Contracts~~',
-	'Class:Document/Attribute:contracts_list+' => 'All the contracts linked to this document~~',
-	'Class:Document/Attribute:services_list' => 'Services~~',
-	'Class:Document/Attribute:services_list+' => 'All the services linked to this document~~',
 	'Class:Document/Attribute:finalclass' => 'Document Type~~',
 	'Class:Document/Attribute:finalclass+' => 'Name of the final class~~',
 ));
diff --git a/datamodels/2.x/itop-structure/zh_cn.dict.itop-structure.php b/datamodels/2.x/itop-structure/zh_cn.dict.itop-structure.php
index a8dc21e29..9afd2f100 100644
--- a/datamodels/2.x/itop-structure/zh_cn.dict.itop-structure.php
+++ b/datamodels/2.x/itop-structure/zh_cn.dict.itop-structure.php
@@ -213,10 +213,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:Document/Attribute:status/Value:published+' => '',
 	'Class:Document/Attribute:cis_list' => '配置项',
 	'Class:Document/Attribute:cis_list+' => '该文档关联的所有配置项',
-	'Class:Document/Attribute:contracts_list' => '合同',
-	'Class:Document/Attribute:contracts_list+' => '该文档关联的所有合同',
-	'Class:Document/Attribute:services_list' => '服务',
-	'Class:Document/Attribute:services_list+' => '该文档关联的所有服务',
 	'Class:Document/Attribute:finalclass' => '文档子类别',
 	'Class:Document/Attribute:finalclass+' => 'Name of the final class',
 ));
diff --git a/datamodels/2.x/itop-tickets/dictionaries/cs.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/cs.dict.itop-tickets.php
index 3d11e9998..6ae8d97e7 100644
--- a/datamodels/2.x/itop-tickets/dictionaries/cs.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/dictionaries/cs.dict.itop-tickets.php
@@ -214,3 +214,15 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTR',
 ));
+
+//
+// Class: Document
+//
+
+Dict::Add('CS CZ', 'Czech', 'Čeština', array(
+	'Class:Document/Attribute:contracts_list' => 'Smlouvy',
+	'Class:Document/Attribute:contracts_list+' => '',
+	'Class:Document/Attribute:services_list' => 'Služby',
+	'Class:Document/Attribute:services_list+' => '',
+));
+
diff --git a/datamodels/2.x/itop-tickets/dictionaries/da.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/da.dict.itop-tickets.php
index ba24dbf84..77e80e10a 100644
--- a/datamodels/2.x/itop-tickets/dictionaries/da.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/dictionaries/da.dict.itop-tickets.php
@@ -154,7 +154,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'WorkOrder:Details' => 'Detaljer',
 	'WorkOrder:Moreinfo' => 'Yderligere information',
 	'Tickets:ResolvedFrom' => 'Automatically resolved from %1$s~~',
-
 	'Class:cmdbAbstractObject/Method:Set' => 'Set~~',
 	'Class:cmdbAbstractObject/Method:Set+' => 'Set a field with a static value~~',
 	'Class:cmdbAbstractObject/Method:Set/Param:1' => 'Target Field~~',
@@ -200,3 +199,10 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve~~',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTR~~',
 ));
+
+Dict::Add('DA DA', 'Danish', 'Dansk', array(
+	'Class:Document/Attribute:contracts_list' => 'Kontrakter',
+	'Class:Document/Attribute:contracts_list+' => '',
+	'Class:Document/Attribute:services_list' => 'Ydelser',
+	'Class:Document/Attribute:services_list+' => '',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-tickets/dictionaries/de.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/de.dict.itop-tickets.php
index 94fed4080..17de83453 100644
--- a/datamodels/2.x/itop-tickets/dictionaries/de.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/dictionaries/de.dict.itop-tickets.php
@@ -142,7 +142,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 
 // Fieldset translation
 Dict::Add('DE DE', 'German', 'Deutsch', array(
-
 	'Ticket:baseinfo' => 'Allgemeine Informationen',
 	'Ticket:date' => 'Daten',
 	'Ticket:contact' => 'Kontakte',
@@ -156,7 +155,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'WorkOrder:Details' => 'Details',
 	'WorkOrder:Moreinfo' => 'Weitere Informationen',
 	'Tickets:ResolvedFrom' => 'Automatisch durch %1$s gelöst',
-
 	'Class:cmdbAbstractObject/Method:Set' => 'Set',
 	'Class:cmdbAbstractObject/Method:Set+' => 'Ein Attribut (Feld) mit einem statischen Wert beschreiben',
 	'Class:cmdbAbstractObject/Method:Set/Param:1' => 'Zielfeld',
@@ -202,3 +200,14 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve (Erstlösungszeit)',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Zielvorgabe (SLT) vom Typ TTR',
 ));
+
+//
+// Class: Document
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:Document/Attribute:contracts_list' => 'Verträge',
+	'Class:Document/Attribute:contracts_list+' => '',
+	'Class:Document/Attribute:services_list' => 'Services',
+	'Class:Document/Attribute:services_list+' => '',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-tickets/dictionaries/en.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/en.dict.itop-tickets.php
index 0f6357482..1ae80e023 100644
--- a/datamodels/2.x/itop-tickets/dictionaries/en.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/dictionaries/en.dict.itop-tickets.php
@@ -156,7 +156,6 @@ Dict::Add('EN US', 'English', 'English', array(
 
 // Fieldset translation
 Dict::Add('EN US', 'English', 'English', array(
-
 	'Ticket:baseinfo' => 'General Information',
 	'Ticket:date' => 'Dates',
 	'Ticket:contact' => 'Contacts',
@@ -170,7 +169,6 @@ Dict::Add('EN US', 'English', 'English', array(
 	'WorkOrder:Details' => 'Details',
 	'WorkOrder:Moreinfo' => 'More information',
 	'Tickets:ResolvedFrom' => 'Automatically resolved from %1$s',
-
 	'Class:cmdbAbstractObject/Method:Set' => 'Set',
 	'Class:cmdbAbstractObject/Method:Set+' => 'Set a field with a static value',
 	'Class:cmdbAbstractObject/Method:Set/Param:1' => 'Target Field',
@@ -216,3 +214,14 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTR',
 ));
+
+//
+// Class: Document
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:Document/Attribute:contracts_list' => 'Contracts',
+	'Class:Document/Attribute:contracts_list+' => 'All the contracts linked to this document',
+	'Class:Document/Attribute:services_list' => 'Services',
+	'Class:Document/Attribute:services_list+' => 'All the services linked to this document',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-tickets/dictionaries/es_cr.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/es_cr.dict.itop-tickets.php
index 76d6b0d88..b7ded5b05 100644
--- a/datamodels/2.x/itop-tickets/dictionaries/es_cr.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/dictionaries/es_cr.dict.itop-tickets.php
@@ -214,3 +214,14 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Tiempo a Resolución',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Objetivo basado en SLT de tipo TTR',
 ));
+
+//
+// Class: Document
+//
+
+Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+	'Class:Document/Attribute:contracts_list' => 'Contratos',
+	'Class:Document/Attribute:contracts_list+' => 'Contratos Referenciados con este Documento',
+	'Class:Document/Attribute:services_list' => 'Servicios',
+	'Class:Document/Attribute:services_list+' => 'Servicios Referenciados con este Documento',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-tickets/dictionaries/fr.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/fr.dict.itop-tickets.php
index 500f6f64f..c62e3199b 100644
--- a/datamodels/2.x/itop-tickets/dictionaries/fr.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/dictionaries/fr.dict.itop-tickets.php
@@ -142,7 +142,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 
 // Fieldset translation
 Dict::Add('FR FR', 'French', 'Français', array(
-
 	'Ticket:baseinfo' => 'Informations générales',
 	'Ticket:date' => 'Dates',
 	'Ticket:contact' => 'Contacts',
@@ -201,3 +200,14 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Temps de Résolution (TTR)',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Objectif calculé à partir d\'un SLT de type TTR',
 ));
+
+//
+// Class: Document
+//
+
+Dict::Add('FR FR', 'French', 'Français', array(
+	'Class:Document/Attribute:contracts_list' => 'Contrats',
+	'Class:Document/Attribute:contracts_list+' => '',
+	'Class:Document/Attribute:services_list' => 'Services',
+	'Class:Document/Attribute:services_list+' => '',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-tickets/dictionaries/hu.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/hu.dict.itop-tickets.php
index c9d69327e..2441637de 100644
--- a/datamodels/2.x/itop-tickets/dictionaries/hu.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/dictionaries/hu.dict.itop-tickets.php
@@ -199,3 +199,14 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve~~',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTR~~',
 ));
+
+//
+// Class: Document
+//
+
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+	'Class:Document/Attribute:contracts_list' => 'Contracts~~',
+	'Class:Document/Attribute:contracts_list+' => 'All the contracts linked to this document~~',
+	'Class:Document/Attribute:services_list' => 'Services~~',
+	'Class:Document/Attribute:services_list+' => 'All the services linked to this document~~',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-tickets/dictionaries/it.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/it.dict.itop-tickets.php
index d3073512d..89f40dd9f 100644
--- a/datamodels/2.x/itop-tickets/dictionaries/it.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/dictionaries/it.dict.itop-tickets.php
@@ -199,3 +199,14 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve~~',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTR~~',
 ));
+
+//
+// Class: Document
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:Document/Attribute:contracts_list' => 'Contracts~~',
+	'Class:Document/Attribute:contracts_list+' => 'All the contracts linked to this document~~',
+	'Class:Document/Attribute:services_list' => 'Services~~',
+	'Class:Document/Attribute:services_list+' => 'All the services linked to this document~~',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-tickets/dictionaries/ja.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/ja.dict.itop-tickets.php
index 139244563..4757e6a89 100644
--- a/datamodels/2.x/itop-tickets/dictionaries/ja.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/dictionaries/ja.dict.itop-tickets.php
@@ -199,3 +199,14 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve~~',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTR~~',
 ));
+
+//
+// Class: Document
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:Document/Attribute:contracts_list' => '契約',
+	'Class:Document/Attribute:contracts_list+' => '',
+	'Class:Document/Attribute:services_list' => 'サービス',
+	'Class:Document/Attribute:services_list+' => '',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-tickets/dictionaries/nl.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/nl.dict.itop-tickets.php
index 7489ac59d..1740ccbb8 100644
--- a/datamodels/2.x/itop-tickets/dictionaries/nl.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/dictionaries/nl.dict.itop-tickets.php
@@ -218,3 +218,14 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Doel gebaseerd op een SLT (TTR)',
 ));
+
+//
+// Class: Document
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:Document/Attribute:contracts_list' => 'Contracten',
+	'Class:Document/Attribute:contracts_list+' => 'Alle contracten gerelateerd aan dit document',
+	'Class:Document/Attribute:services_list' => 'Services',
+	'Class:Document/Attribute:services_list+' => 'Alle services gerelateerd aan dit document.',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-tickets/dictionaries/pt_br.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/pt_br.dict.itop-tickets.php
index f58b703cb..8da1b4463 100755
--- a/datamodels/2.x/itop-tickets/dictionaries/pt_br.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/dictionaries/pt_br.dict.itop-tickets.php
@@ -111,32 +111,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkContactToTicket/Attribute:role_code/Value:do_not_notify' => 'Não notificar',
 ));
 
-//
-// Class: lnkFunctionalCIToTicket
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkFunctionalCIToTicket' => 'Link CI / Solicitação',
-	'Class:lnkFunctionalCIToTicket+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Solicitação',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'Ref',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title' => 'Título do bilhete',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id' => 'CIs',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name' => 'Nome CI',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact' => 'Impacto',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code' => 'Impacto',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Adicionado manualmente',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Computado',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Não impactado',
-));
-
-
 //
 // Class: WorkOrder
 //
@@ -239,3 +213,14 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Objetivo baseado em um SLT do tipo TTR',
 ));
+
+//
+// Class: Document
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:Document/Attribute:contracts_list' => 'Contratos',
+	'Class:Document/Attribute:contracts_list+' => 'Todos os contratos vinculados com esse documento',
+	'Class:Document/Attribute:services_list' => 'Services',
+	'Class:Document/Attribute:services_list+' => 'Todos os serviços vinculados a esse documento',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-tickets/dictionaries/ru.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/ru.dict.itop-tickets.php
index 880c221bd..8bc3a3652 100644
--- a/datamodels/2.x/itop-tickets/dictionaries/ru.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/dictionaries/ru.dict.itop-tickets.php
@@ -191,3 +191,14 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve~~',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTR~~',
 ));
+
+//
+// Class: Document
+//
+
+Dict::Add('RU RU', 'Russian', 'Русский', array(
+	'Class:Document/Attribute:contracts_list' => 'Договоры',
+	'Class:Document/Attribute:contracts_list+' => 'Связанные договоры',
+	'Class:Document/Attribute:services_list' => 'Услуги',
+	'Class:Document/Attribute:services_list+' => 'Связанные услуги',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-tickets/dictionaries/sk.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/sk.dict.itop-tickets.php
index 58dec2f99..a0437796b 100644
--- a/datamodels/2.x/itop-tickets/dictionaries/sk.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/dictionaries/sk.dict.itop-tickets.php
@@ -212,3 +212,14 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve~~',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTR~~',
 ));
+
+//
+// Class: Document
+//
+
+Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
+	'Class:Document/Attribute:contracts_list' => 'Zmluvy',
+	'Class:Document/Attribute:contracts_list+' => '',
+	'Class:Document/Attribute:services_list' => 'Služby',
+	'Class:Document/Attribute:services_list+' => '',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-tickets/dictionaries/tr.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/tr.dict.itop-tickets.php
index 0624b8b8f..566b14982 100644
--- a/datamodels/2.x/itop-tickets/dictionaries/tr.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/dictionaries/tr.dict.itop-tickets.php
@@ -217,3 +217,14 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve~~',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTR~~',
 ));
+
+//
+// Class: Document
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:Document/Attribute:contracts_list' => 'Contracts~~',
+	'Class:Document/Attribute:contracts_list+' => 'All the contracts linked to this document~~',
+	'Class:Document/Attribute:services_list' => 'Services~~',
+	'Class:Document/Attribute:services_list+' => 'All the services linked to this document~~',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-tickets/dictionaries/zh_cn.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/zh_cn.dict.itop-tickets.php
index 24dfda27d..cb8a02bee 100644
--- a/datamodels/2.x/itop-tickets/dictionaries/zh_cn.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/dictionaries/zh_cn.dict.itop-tickets.php
@@ -212,3 +212,14 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:ResponseTicketTTR/Interface:iMetricComputer' => '解决时间',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'SLT 的解决时间',
 ));
+
+//
+// Class: Document
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:Document/Attribute:contracts_list' => '合同',
+	'Class:Document/Attribute:contracts_list+' => '该文档关联的所有合同',
+	'Class:Document/Attribute:services_list' => '服务',
+	'Class:Document/Attribute:services_list+' => '该文档关联的所有服务',
+));
\ No newline at end of file
diff --git a/test/integration/iTopModulesPhpVersionChecklistTest.php b/test/integration/iTopModulesPhpVersionChecklistTest.php
index c71316265..c5bfd00f8 100644
--- a/test/integration/iTopModulesPhpVersionChecklistTest.php
+++ b/test/integration/iTopModulesPhpVersionChecklistTest.php
@@ -57,7 +57,7 @@ class iTopModulesPhpVersionIntegrationTest extends ItopTestCase
 			$matches
 		);
 
-		$this->assertRegExp("#$sExpectedVersion#", $matches[1], "$sPhpFile file refer does not refer to current itop version ($sModuleName/$matches[1] does not match regexp $sModuleName/$sExpectedVersion)");
+		$this->assertRegExp("#$sExpectedVersion#", $matches[1], " $sPhpFile:2 file refer does not refer to current itop version ($sModuleName/$matches[1] does not match regexp $sModuleName/$sExpectedVersion)");
 
 	}
 
diff --git a/test/setup_params/default-params.xml b/test/setup_params/default-params.xml
index a4c34e769..63ec13a2e 100644
--- a/test/setup_params/default-params.xml
+++ b/test/setup_params/default-params.xml
@@ -1,72 +1,79 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <installation>
-<!-- On manual installs, this file is generated in setup/install-*.xml -->
-    <mode>install</mode>
-    <preinstall>
-        <copies type="array"/>
-    </preinstall>
-    <source_dir>datamodels/2.x/</source_dir>
-    <datamodel_version>2.5.0</datamodel_version>
-    <previous_configuration_file>default-config-itop.php</previous_configuration_file>
-    <extensions_dir>extensions</extensions_dir>
-    <target_env>production</target_env>
-    <workspace_dir></workspace_dir>
-    <database>
-        <server></server>
-        <user>jenkins_itop</user>
-        <pwd>IKnowYouSeeMeInJenkinsConf</pwd>
-        <name>itop_ci</name>
-        <db_tls_enabled></db_tls_enabled>
-        <db_tls_ca></db_tls_ca>
-        <prefix></prefix>
-    </database>
-    <url>http://localhost/iTop/</url>
-    <graphviz_path>/usr/bin/dot</graphviz_path>
-    <admin_account>
-        <user>admin</user>
-        <pwd>admin</pwd>
-        <language>EN US</language>
-    </admin_account>
-    <language>EN US</language>
-    <selected_modules type="array">
-      <item>authent-external</item>
-      <item>authent-local</item>
-      <item>itop-backup</item>
-      <item>itop-config</item>
-      <item>itop-profiles-itil</item>
-      <item>itop-sla-computation</item>
-      <item>itop-tickets</item>
-      <item>itop-welcome-itil</item>
-      <item>itop-config-mgmt</item>
-      <item>itop-attachments</item>
-      <item>itop-datacenter-mgmt</item>
-      <item>itop-endusers-devices</item>
-      <item>itop-storage-mgmt</item>
-      <item>itop-virtualization-mgmt</item>
-      <item>itop-bridge-virtualization-storage</item>
-      <item>itop-service-mgmt</item>
-      <item>itop-request-mgmt</item>
-      <item>itop-portal</item>
-      <item>itop-portal-base</item>
-      <item>itop-change-mgmt</item>
-      <item>itop-knownerror-mgmt</item>
-    </selected_modules>
-    <selected_extensions type="array">
-      <item>itop-config-mgmt-core</item>
-      <item>itop-config-mgmt-datacenter</item>
-      <item>itop-config-mgmt-end-user</item>
-      <item>itop-config-mgmt-storage</item>
-      <item>itop-config-mgmt-virtualization</item>
-      <item>itop-service-mgmt-enterprise</item>
-      <item>itop-ticket-mgmt-simple-ticket</item>
-      <item>itop-ticket-mgmt-simple-ticket-enhanced-portal</item>
-      <item>itop-change-mgmt-simple</item>
-      <item>itop-kown-error-mgmt</item>
-    </selected_extensions>
-    <sample_data>1</sample_data>
-    <old_addon></old_addon>
-    <options>
-        <generate_config>1</generate_config>
-    </options>
-    <mysql_bindir></mysql_bindir>
+	<!-- On manual installs, this file is generated in setup/install-*.xml -->
+	<mode>install</mode>
+	<preinstall>
+		<copies type="array"/>
+	</preinstall>
+	<source_dir>datamodels/2.x/</source_dir>
+	<datamodel_version>2.5.0</datamodel_version>
+	<previous_configuration_file>default-config-itop.php</previous_configuration_file>
+	<extensions_dir>extensions</extensions_dir>
+	<target_env>production</target_env>
+	<workspace_dir></workspace_dir>
+	<database>
+		<server></server>
+		<user>jenkins_itop</user>
+		<pwd>IKnowYouSeeMeInJenkinsConf</pwd>
+		<name>itop_ci</name>
+		<db_tls_enabled></db_tls_enabled>
+		<db_tls_ca></db_tls_ca>
+		<prefix></prefix>
+	</database>
+	<url>http://localhost/iTop/</url>
+	<graphviz_path>/usr/bin/dot</graphviz_path>
+	<admin_account>
+		<user>admin</user>
+		<pwd>admin</pwd>
+		<language>EN US</language>
+	</admin_account>
+	<language>EN US</language>
+	<selected_modules type="array">
+		<item>authent-cas</item>
+		<item>authent-external</item>
+		<item>authent-ldap</item>
+		<item>authent-local</item>
+		<item>itop-backup</item>
+		<item>itop-config</item>
+		<item>itop-files-information</item>
+		<item>itop-portal-base</item>
+		<item>itop-profiles-itil</item>
+		<item>itop-sla-computation</item>
+		<item>itop-welcome-itil</item>
+		<item>itop-structure</item>
+		<item>itop-config-mgmt</item>
+		<item>itop-attachments</item>
+		<item>itop-tickets</item>
+		<item>combodo-db-tools</item>
+		<item>itop-core-update</item>
+		<item>itop-hub-connector</item>
+		<item>itop-datacenter-mgmt</item>
+		<item>itop-endusers-devices</item>
+		<item>itop-storage-mgmt</item>
+		<item>itop-virtualization-mgmt</item>
+		<item>itop-bridge-virtualization-storage</item>
+		<item>itop-service-mgmt</item>
+		<item>itop-bridge-cmdb-ticket</item>
+		<item>itop-request-mgmt</item>
+		<item>itop-portal</item>
+		<item>itop-change-mgmt</item>
+	</selected_modules>
+	<selected_extensions type="array">
+		<item>itop-config-mgmt-core</item>
+		<item>itop-config-mgmt-datacenter</item>
+		<item>itop-config-mgmt-end-user</item>
+		<item>itop-config-mgmt-storage</item>
+		<item>itop-config-mgmt-virtualization</item>
+		<item>itop-service-mgmt-enterprise</item>
+		<item>itop-ticket-mgmt-simple-ticket</item>
+		<item>itop-ticket-mgmt-simple-ticket-enhanced-portal</item>
+		<item>itop-change-mgmt-simple</item>
+		<item>itop-kown-error-mgmt</item>
+	</selected_extensions>
+	<sample_data>1</sample_data>
+	<old_addon></old_addon>
+	<options>
+		<generate_config>1</generate_config>
+	</options>
+	<mysql_bindir></mysql_bindir>
 </installation>

From 97380fd5f4614121a5f9b9c24648a2b2899a987d Mon Sep 17 00:00:00 2001
From: odain <olivier.dain@combodo.com>
Date: Wed, 9 Sep 2020 11:09:52 +0200
Subject: [PATCH 20/43] =?UTF-8?q?N=C2=B03117=20Refactor=20of=20datamodel?=
 =?UTF-8?q?=20and=20dictionnaries=20for=20the=20sake=20of=20modularity=20?=
 =?UTF-8?q?=09-=20New=20module=20itop-bridge-cmdb-ticket=20to=20cope=20wit?=
 =?UTF-8?q?h=20the=20need=20to=20install=20only=20the=20CMDB=20or/and=20ti?=
 =?UTF-8?q?cketing=20=09-=20New=20module=20itop-structure=20to=20hold=20de?=
 =?UTF-8?q?clarations=20required=20by=20iTop=20independently=20from=20ITIL?=
 =?UTF-8?q?.=20Note=20that=20these=20declarations=20should=20ideally=20be?=
 =?UTF-8?q?=20moved=20to=20application/datamodel.application.xml=20or=20co?=
 =?UTF-8?q?re/datamodel.core.xml.=20Anyhow,=20the=20compiler=20suffers=20a?=
 =?UTF-8?q?=20few=20limitations=20and=20it=20has=20been=20decided=20to=20c?=
 =?UTF-8?q?reate=20this=20module=20as=20a=20workaround.=20=09-=20Split=20o?=
 =?UTF-8?q?f=20known-error=20module=20into=20itop-faq-light=20and=20itop-k?=
 =?UTF-8?q?nownerror-light?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 datamodels/2.x/installation.xml               |   7 +-
 .../cs.dict.itop-bridge-cmdb-ticket.php       |  65 +++-
 .../da.dict.itop-bridge-cmdb-ticket.php       |  60 +++-
 .../datamodel.itop-bridge-cmdb-ticket.xml     |  91 +----
 .../de.dict.itop-bridge-cmdb-ticket.php       |  63 +++-
 .../en.dict.itop-bridge-cmdb-ticket.php       |  64 +++-
 .../es_cr.dict.itop-bridge-cmdb-ticket.php    |  64 +++-
 .../fr.dict.itop-bridge-cmdb-ticket.php       |  64 +++-
 .../hu.dict.itop-bridge-cmdb-ticket.php       |  64 +++-
 .../it.dict.itop-bridge-cmdb-ticket.php       |  64 +++-
 .../ja.dict.itop-bridge-cmdb-ticket.php       |  64 +++-
 .../module.itop-bridge-cmdb-ticket.php        |   2 +-
 .../nl.dict.itop-bridge-cmdb-ticket.php       |  64 +++-
 .../pt_br.dict.itop-bridge-cmdb-ticket.php    |  64 +++-
 .../ru.dict.itop-bridge-cmdb-ticket.php       |  65 +++-
 .../sk.dict.itop-bridge-cmdb-ticket.php       |  66 +++-
 .../tr.dict.itop-bridge-cmdb-ticket.php       |  64 +++-
 .../zh_cn.dict.itop-bridge-cmdb-ticket.php    |  65 +++-
 .../datamodel.itop-config-mgmt.xml            |  89 +++++
 .../dictionaries/cs.dict.itop-config-mgmt.php |  23 +-
 .../dictionaries/da.dict.itop-config-mgmt.php |  22 +-
 .../dictionaries/de.dict.itop-config-mgmt.php |  23 +-
 .../dictionaries/en.dict.itop-config-mgmt.php |  23 +-
 .../es_cr.dict.itop-config-mgmt.php           |  23 +-
 .../dictionaries/fr.dict.itop-config-mgmt.php |  23 +-
 .../dictionaries/hu.dict.itop-config-mgmt.php |  41 +--
 .../dictionaries/it.dict.itop-config-mgmt.php |  23 +-
 .../dictionaries/ja.dict.itop-config-mgmt.php |  23 +-
 .../dictionaries/nl.dict.itop-config-mgmt.php |  23 +-
 .../pt_br.dict.itop-config-mgmt.php           |  23 +-
 .../dictionaries/ru.dict.itop-config-mgmt.php |  23 +-
 .../dictionaries/sk.dict.itop-config-mgmt.php |  23 +-
 .../dictionaries/tr.dict.itop-config-mgmt.php |  23 +-
 .../zh_cn.dict.itop-config-mgmt.php           |  23 +-
 .../dictionaries/fr.dict.itop-core-update.php |  13 +-
 .../data.sample.faq-domains.xml               |   0
 .../datamodel.itop-faq-light.xml              | 338 ++++++++++++++++++
 .../dictionaries/cs.dict.itop-faq-light.php   |  95 +++++
 .../dictionaries/da.dict.itop-faq-light.php   |  70 ++++
 .../dictionaries/de.dict.itop-faq-light.php   |  72 ++++
 .../dictionaries/en.dict.itop-faq-light.php   |  96 +++++
 .../es_cr.dict.itop-faq-light.php             |  94 +++++
 .../dictionaries/fr.dict.itop-faq-light.php   |  71 ++++
 .../dictionaries/hu.dict.itop-faq-light.php   |  71 ++++
 .../dictionaries/it.dict.itop-faq-light.php   |  94 +++++
 .../dictionaries/ja.dict.itop-faq-light.php   |  71 ++++
 .../dictionaries/nl.dict.itop-faq-light.php   | 100 ++++++
 .../pt_br.dict.itop-faq-light.php             |  95 +++++
 .../dictionaries/ru.dict.itop-faq-light.php   |  60 ++++
 .../dictionaries/sk.dict.itop-faq-light.php   |  94 +++++
 .../dictionaries/tr.dict.itop-faq-light.php   |  96 +++++
 .../zh_cn.dict.itop-faq-light.php             |  94 +++++
 .../images/faq.png                            | Bin
 .../module.itop-faq-light.php}                |   9 +-
 .../datamodel.itop-knownerror-light.xml}      | 323 -----------------
 .../cs.dict.itop-knownerror-light.php}        |  44 ---
 .../da.dict.itop-knownerror-light.php}        |  44 ---
 .../de.dict.itop-knownerror-light.php}        |  44 ---
 .../en.dict.itop-knownerror-light.php}        |  44 ---
 .../es_cr.dict.itop-knownerror-light.php}     |  44 ---
 .../fr.dict.itop-knownerror-light.php}        |  44 ---
 .../hu.dict.itop-knownerror-light.php}        |  44 ---
 .../it.dict.itop-knownerror-light.php}        |  44 ---
 .../ja.dict.itop-knownerror-light.php}        |  44 ---
 .../nl.dict.itop-knownerror-light.php}        |  44 ---
 .../pt_br.dict.itop-knownerror-light.php}     |  44 ---
 .../ru.dict.itop-knownerror-light.php}        |  44 ---
 .../sk.dict.itop-knownerror-light.php}        |  44 ---
 .../tr.dict.itop-knownerror-light.php}        |  44 ---
 .../zh_cn.dict.itop-knownerror-light.php}     |  44 ---
 .../images/known-error.png                    | Bin
 .../module.itop-knownerror-light.php          |  43 +++
 .../2.x/itop-portal/fr.dict.itop-portal.php   |   2 +-
 .../cs.dict.itop-service-mgmt.php             |  35 --
 .../da.dict.itop-service-mgmt.php             |  35 --
 .../de.dict.itop-service-mgmt.php             |  35 --
 .../en.dict.itop-service-mgmt.php             |  35 --
 .../es_cr.dict.itop-service-mgmt.php          |  35 --
 .../fr.dict.itop-service-mgmt.php             |  35 --
 .../hu.dict.itop-service-mgmt.php             |  35 --
 .../it.dict.itop-service-mgmt.php             |  35 --
 .../ja.dict.itop-service-mgmt.php             |  35 --
 .../nl.dict.itop-service-mgmt.php             |  35 --
 .../pt_br.dict.itop-service-mgmt.php          |  35 --
 .../ru.dict.itop-service-mgmt.php             |  35 --
 .../sk.dict.itop-service-mgmt.php             |  35 --
 .../tr.dict.itop-service-mgmt.php             |  35 --
 .../zh_cn.dict.itop-service-mgmt.php          |  35 --
 .../itop-structure/cs.dict.itop-structure.php |   4 -
 .../itop-structure/da.dict.itop-structure.php |   4 -
 .../data.sample.locations.xml                 |   0
 .../datamodel.itop-structure.xml              |   5 +-
 .../itop-structure/de.dict.itop-structure.php |   4 -
 .../itop-structure/en.dict.itop-structure.php |  19 -
 .../es_cr.dict.itop-structure.php             |   4 -
 .../itop-structure/fr.dict.itop-structure.php |  16 +-
 .../itop-structure/hu.dict.itop-structure.php |  23 +-
 .../itop-structure/it.dict.itop-structure.php |   5 -
 .../itop-structure/ja.dict.itop-structure.php |   4 -
 .../itop-structure/module.itop-structure.php  |   5 +-
 .../itop-structure/nl.dict.itop-structure.php |   4 -
 .../pt_br.dict.itop-structure.php             |   4 -
 .../itop-structure/ru.dict.itop-structure.php |   4 -
 .../itop-structure/sk.dict.itop-structure.php |   4 -
 .../itop-structure/tr.dict.itop-structure.php |   4 -
 .../zh_cn.dict.itop-structure.php             |   4 -
 .../dictionaries/cs.dict.itop-tickets.php     |  12 +
 .../dictionaries/da.dict.itop-tickets.php     |   8 +-
 .../dictionaries/de.dict.itop-tickets.php     |  13 +-
 .../dictionaries/en.dict.itop-tickets.php     |  13 +-
 .../dictionaries/es_cr.dict.itop-tickets.php  |  11 +
 .../dictionaries/fr.dict.itop-tickets.php     |  12 +-
 .../dictionaries/hu.dict.itop-tickets.php     |  11 +
 .../dictionaries/it.dict.itop-tickets.php     |  11 +
 .../dictionaries/ja.dict.itop-tickets.php     |  11 +
 .../dictionaries/nl.dict.itop-tickets.php     |  11 +
 .../dictionaries/pt_br.dict.itop-tickets.php  |  37 +-
 .../dictionaries/ru.dict.itop-tickets.php     |  11 +
 .../dictionaries/sk.dict.itop-tickets.php     |  11 +
 .../dictionaries/tr.dict.itop-tickets.php     |  11 +
 .../dictionaries/zh_cn.dict.itop-tickets.php  |  11 +
 .../iTopModulesPhpVersionChecklistTest.php    |   2 +-
 test/setup_params/default-params.xml          | 147 ++++----
 123 files changed, 2976 insertions(+), 2181 deletions(-)
 rename datamodels/2.x/{itop-knownerror-mgmt => itop-faq-light}/data.sample.faq-domains.xml (100%)
 create mode 100755 datamodels/2.x/itop-faq-light/datamodel.itop-faq-light.xml
 create mode 100644 datamodels/2.x/itop-faq-light/dictionaries/cs.dict.itop-faq-light.php
 create mode 100644 datamodels/2.x/itop-faq-light/dictionaries/da.dict.itop-faq-light.php
 create mode 100644 datamodels/2.x/itop-faq-light/dictionaries/de.dict.itop-faq-light.php
 create mode 100644 datamodels/2.x/itop-faq-light/dictionaries/en.dict.itop-faq-light.php
 create mode 100644 datamodels/2.x/itop-faq-light/dictionaries/es_cr.dict.itop-faq-light.php
 create mode 100644 datamodels/2.x/itop-faq-light/dictionaries/fr.dict.itop-faq-light.php
 create mode 100644 datamodels/2.x/itop-faq-light/dictionaries/hu.dict.itop-faq-light.php
 create mode 100644 datamodels/2.x/itop-faq-light/dictionaries/it.dict.itop-faq-light.php
 create mode 100644 datamodels/2.x/itop-faq-light/dictionaries/ja.dict.itop-faq-light.php
 create mode 100644 datamodels/2.x/itop-faq-light/dictionaries/nl.dict.itop-faq-light.php
 create mode 100644 datamodels/2.x/itop-faq-light/dictionaries/pt_br.dict.itop-faq-light.php
 create mode 100644 datamodels/2.x/itop-faq-light/dictionaries/ru.dict.itop-faq-light.php
 create mode 100644 datamodels/2.x/itop-faq-light/dictionaries/sk.dict.itop-faq-light.php
 create mode 100644 datamodels/2.x/itop-faq-light/dictionaries/tr.dict.itop-faq-light.php
 create mode 100644 datamodels/2.x/itop-faq-light/dictionaries/zh_cn.dict.itop-faq-light.php
 rename datamodels/2.x/{itop-knownerror-mgmt => itop-faq-light}/images/faq.png (100%)
 rename datamodels/2.x/{itop-knownerror-mgmt/module.itop-knownerror-mgmt.php => itop-faq-light/module.itop-faq-light.php} (93%)
 rename datamodels/2.x/{itop-knownerror-mgmt/datamodel.itop-knownerror-mgmt.xml => itop-knownerror-light/datamodel.itop-knownerror-light.xml} (58%)
 rename datamodels/2.x/{itop-knownerror-mgmt/dictionaries/cs.dict.itop-knownerror-mgmt.php => itop-knownerror-light/dictionaries/cs.dict.itop-knownerror-light.php} (80%)
 rename datamodels/2.x/{itop-knownerror-mgmt/dictionaries/da.dict.itop-knownerror-mgmt.php => itop-knownerror-light/dictionaries/da.dict.itop-knownerror-light.php} (77%)
 rename datamodels/2.x/{itop-knownerror-mgmt/dictionaries/de.dict.itop-knownerror-mgmt.php => itop-knownerror-light/dictionaries/de.dict.itop-knownerror-light.php} (77%)
 rename datamodels/2.x/{itop-knownerror-mgmt/dictionaries/en.dict.itop-knownerror-mgmt.php => itop-knownerror-light/dictionaries/en.dict.itop-knownerror-light.php} (79%)
 rename datamodels/2.x/{itop-knownerror-mgmt/dictionaries/es_cr.dict.itop-knownerror-mgmt.php => itop-knownerror-light/dictionaries/es_cr.dict.itop-knownerror-light.php} (78%)
 rename datamodels/2.x/{itop-knownerror-mgmt/dictionaries/fr.dict.itop-knownerror-mgmt.php => itop-knownerror-light/dictionaries/fr.dict.itop-knownerror-light.php} (76%)
 rename datamodels/2.x/{itop-knownerror-mgmt/dictionaries/hu.dict.itop-knownerror-mgmt.php => itop-knownerror-light/dictionaries/hu.dict.itop-knownerror-light.php} (75%)
 rename datamodels/2.x/{itop-knownerror-mgmt/dictionaries/it.dict.itop-knownerror-mgmt.php => itop-knownerror-light/dictionaries/it.dict.itop-knownerror-light.php} (80%)
 rename datamodels/2.x/{itop-knownerror-mgmt/dictionaries/ja.dict.itop-knownerror-mgmt.php => itop-knownerror-light/dictionaries/ja.dict.itop-knownerror-light.php} (77%)
 rename datamodels/2.x/{itop-knownerror-mgmt/dictionaries/nl.dict.itop-knownerror-mgmt.php => itop-knownerror-light/dictionaries/nl.dict.itop-knownerror-light.php} (80%)
 rename datamodels/2.x/{itop-knownerror-mgmt/dictionaries/pt_br.dict.itop-knownerror-mgmt.php => itop-knownerror-light/dictionaries/pt_br.dict.itop-knownerror-light.php} (79%)
 rename datamodels/2.x/{itop-knownerror-mgmt/dictionaries/ru.dict.itop-knownerror-mgmt.php => itop-knownerror-light/dictionaries/ru.dict.itop-knownerror-light.php} (75%)
 rename datamodels/2.x/{itop-knownerror-mgmt/dictionaries/sk.dict.itop-knownerror-mgmt.php => itop-knownerror-light/dictionaries/sk.dict.itop-knownerror-light.php} (79%)
 rename datamodels/2.x/{itop-knownerror-mgmt/dictionaries/tr.dict.itop-knownerror-mgmt.php => itop-knownerror-light/dictionaries/tr.dict.itop-knownerror-light.php} (79%)
 rename datamodels/2.x/{itop-knownerror-mgmt/dictionaries/zh_cn.dict.itop-knownerror-mgmt.php => itop-knownerror-light/dictionaries/zh_cn.dict.itop-knownerror-light.php} (80%)
 rename datamodels/2.x/{itop-knownerror-mgmt => itop-knownerror-light}/images/known-error.png (100%)
 create mode 100755 datamodels/2.x/itop-knownerror-light/module.itop-knownerror-light.php
 rename datamodels/2.x/{itop-config-mgmt => itop-structure}/data.sample.locations.xml (100%)
 mode change 100755 => 100644

diff --git a/datamodels/2.x/installation.xml b/datamodels/2.x/installation.xml
index 9609bcdc2..5f48a3cb2 100755
--- a/datamodels/2.x/installation.xml
+++ b/datamodels/2.x/installation.xml
@@ -192,14 +192,15 @@
 		<step>
 			<title>Additional ITIL tickets</title>
 			<description><![CDATA[<h2>Pick from the list below the additional ITIL processes that are to be implemented in iTop.</h2>]]></description>
-			<banner>./itop-knownerror-mgmt/images/known-error.png</banner>
+			<banner>./itop-knownerror-light/images/known-error.png</banner>
 			<options type="array">
 				<choice>
 					<extension_code>itop-kown-error-mgmt</extension_code>
-					<title>Known Errors Management</title>
+					<title>Known Errors Management and FAQ</title>
 					<description>Select this option to track "Known Errors" and FAQs in iTop.</description>
 					<modules type="array">
-						<module>itop-knownerror-mgmt</module>
+						<module>itop-faq-light</module>
+						<module>itop-knownerror-light</module>
 					</modules>
 				</choice>
 				<choice>
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/cs.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/cs.dict.itop-bridge-cmdb-ticket.php
index 44559732a..461d8757a 100644
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/cs.dict.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/cs.dict.itop-bridge-cmdb-ticket.php
@@ -29,23 +29,6 @@
 //////////////////////////////////////////////////////////////////////
 //
 
-//
-// Class: lnkContactToFunctionalCI
-//
-
-Dict::Add('CS CZ', 'Czech', 'Čeština', array(
-	'Class:lnkContactToFunctionalCI' => 'Spojení (Kontakt / Funkční konfigurační položka)',
-	'Class:lnkContactToFunctionalCI+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Funkční konfigurační položka',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Název funkční konfigurační položky',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Kontakt',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Název kontaktu',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
-));
-
 //
 // Class: lnkFunctionalCIToTicket
 //
@@ -70,3 +53,51 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Automaticky',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Není zasažen',
 ));
+
+//
+// Class: lnkFunctionalCIToProviderContract
+//
+
+Dict::Add('CS CZ', 'Czech', 'Čeština', array(
+	'Class:lnkFunctionalCIToProviderContract' => 'Spojení (Funkční konfigurační položka / Smlouva s poskytovatelem)',
+	'Class:lnkFunctionalCIToProviderContract+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Smlouva s poskytovatelem',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Název smlouvy s poskytovatelem',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'Konfigurační položka',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'Název konfigurační položky',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
+));
+
+
+//
+// Class: lnkFunctionalCIToService
+//
+
+Dict::Add('CS CZ', 'Czech', 'Čeština', array(
+	'Class:lnkFunctionalCIToService' => 'Spojení (Funkční konfigurační položka / Služba)',
+	'Class:lnkFunctionalCIToService+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Služba',
+	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Název služby',
+	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'Konfigurační položka',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'Název konfigurační položky',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: FunctionalCI
+//
+
+Dict::Add('CS CZ', 'Czech', 'Čeština', array(
+	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Smlouvy s poskytovateli',
+	'Class:FunctionalCI/Attribute:providercontracts_list+' => '',
+	'Class:FunctionalCI/Attribute:services_list' => 'Služby',
+	'Class:FunctionalCI/Attribute:services_list+' => '',
+	'Class:FunctionalCI/Attribute:tickets_list' => 'Tikety',
+	'Class:FunctionalCI/Attribute:tickets_list+' => '',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/da.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/da.dict.itop-bridge-cmdb-ticket.php
index 504a12cc4..a0283195f 100644
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/da.dict.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/da.dict.itop-bridge-cmdb-ticket.php
@@ -29,23 +29,6 @@
 //////////////////////////////////////////////////////////////////////
 //
 
-//
-// Class: lnkContactToFunctionalCI
-//
-
-Dict::Add('DA DA', 'Danish', 'Dansk', array(
-	'Class:lnkContactToFunctionalCI' => 'Sammenhæng Kontakt/FunctionalCI',
-	'Class:lnkContactToFunctionalCI+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'FunctionalCI',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'FunctionalCI navn',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Kontakt',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Kontakt navn',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
-));
-
 //
 // Class: lnkFunctionalCIToTicket
 //
@@ -70,3 +53,46 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Computed~~',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Not impacted~~',
 ));
+
+//
+// Class: lnkFunctionalCIToProviderContract
+//
+
+Dict::Add('DA DA', 'Danish', 'Dansk', array(
+	'Class:lnkFunctionalCIToProviderContract' => 'Sammenhæng FunctionalCI/Leverandør Kontrakt',
+	'Class:lnkFunctionalCIToProviderContract+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Leverandør kontrakt',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Leverandør kontrakt navn',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'CI navn',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: lnkFunctionalCIToService
+//
+
+Dict::Add('DA DA', 'Danish', 'Dansk', array(
+	'Class:lnkFunctionalCIToService' => 'Sammenhæng FunctionalCI/Ydelse',
+	'Class:lnkFunctionalCIToService+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Ydelse',
+	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Ydelses navn',
+	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'CI',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'CI navn',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '',
+));
+
+Dict::Add('DA DA', 'Danish', 'Dansk', array(
+	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Leverandør kontrakter',
+	'Class:FunctionalCI/Attribute:providercontracts_list+' => '',
+	'Class:FunctionalCI/Attribute:services_list' => 'Ydelser',
+	'Class:FunctionalCI/Attribute:services_list+' => '',
+	'Class:FunctionalCI/Attribute:tickets_list' => 'Tickets',
+	'Class:FunctionalCI/Attribute:tickets_list+' => '',
+));
\ No newline at end of file
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 0933160cc..954603d76 100644
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/datamodel.itop-bridge-cmdb-ticket.xml
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/datamodel.itop-bridge-cmdb-ticket.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.6">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.7">
 	<constants>
 	</constants>
 	<classes>
@@ -275,87 +275,6 @@
 				</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>
-				<display_template/>
-				<icon/>
-				<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="FunctionalCI" _delta="must_exist">
 			<fields>
 				<field id="providercontracts_list" xsi:type="AttributeLinkedSetIndirect" _delta="define">
@@ -366,14 +285,6 @@
 					<ext_key_to_remote>providercontract_id</ext_key_to_remote>
 					<duplicates/>
 				</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="services_list" xsi:type="AttributeLinkedSetIndirect" _delta="define">
 					<linked_class>lnkFunctionalCIToService</linked_class>
 					<ext_key_to_me>functionalci_id</ext_key_to_me>
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/de.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/de.dict.itop-bridge-cmdb-ticket.php
index c50943797..caff17b42 100644
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/de.dict.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/de.dict.itop-bridge-cmdb-ticket.php
@@ -29,23 +29,6 @@
 //////////////////////////////////////////////////////////////////////
 //
 
-//
-// Class: lnkContactToFunctionalCI
-//
-
-Dict::Add('DE DE', 'German', 'Deutsch', array(
-	'Class:lnkContactToFunctionalCI' => 'Verknüpfung Kontakt/FunctionalCI',
-	'Class:lnkContactToFunctionalCI+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'FunctionalCI',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'FunctionalCI-Name',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Kontakt',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Kontakt-Name',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
-));
-
 //
 // Class: lnkFunctionalCIToTicket
 //
@@ -69,4 +52,50 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Manuell hinzugefügt',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Berechnet',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Nicht betroffen',
+));
+
+//
+// Class: lnkFunctionalCIToProviderContract
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:lnkFunctionalCIToProviderContract' => 'Verknüpfung FunctionalCI/Provider-Vertrag',
+	'Class:lnkFunctionalCIToProviderContract+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Provider-Vertrag',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Providervertrags-Name',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'CI-Name',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: lnkFunctionalCIToService
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:lnkFunctionalCIToService' => 'Verknüpfung FunctionalCI/Service',
+	'Class:lnkFunctionalCIToService+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Service',
+	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Service-Name',
+	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'CI',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'CI-Name',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: Functional
+//
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Provider-Verträge',
+	'Class:FunctionalCI/Attribute:providercontracts_list+' => '',
+	'Class:FunctionalCI/Attribute:services_list' => 'Services',
+	'Class:FunctionalCI/Attribute:services_list+' => '',
+	'Class:FunctionalCI/Attribute:tickets_list' => 'Tickets',
+	'Class:FunctionalCI/Attribute:tickets_list+' => '',
 ));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/en.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/en.dict.itop-bridge-cmdb-ticket.php
index cad9a3573..a434fd6cd 100644
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/en.dict.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/en.dict.itop-bridge-cmdb-ticket.php
@@ -29,23 +29,6 @@
 //////////////////////////////////////////////////////////////////////
 //
 
-//
-// Class: lnkContactToFunctionalCI
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:lnkContactToFunctionalCI' => 'Link Contact / FunctionalCI',
-	'Class:lnkContactToFunctionalCI+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Functionalci',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contact',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Contact name',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
-));
-
 //
 // Class: lnkFunctionalCIToTicket
 //
@@ -69,4 +52,51 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Added manually',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Computed',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Not impacted',
+));
+
+//
+// Class: lnkFunctionalCIToProviderContract
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:lnkFunctionalCIToProviderContract' => 'Link FunctionalCI / ProviderContract',
+	'Class:lnkFunctionalCIToProviderContract+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Provider contract',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Provider contract Name',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'CI Name',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: lnkFunctionalCIToService
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:lnkFunctionalCIToService' => 'Link FunctionalCI / Service',
+	'Class:lnkFunctionalCIToService+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Service',
+	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Service Name',
+	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'CI',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'CI Name',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: FunctionalCI
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Provider contracts',
+	'Class:FunctionalCI/Attribute:providercontracts_list+' => 'All the provider contracts for this configuration item',
+	'Class:FunctionalCI/Attribute:services_list' => 'Services',
+	'Class:FunctionalCI/Attribute:services_list+' => 'All the services impacted by this configuration item',
+	'Class:FunctionalCI/Attribute:tickets_list' => 'Tickets',
+	'Class:FunctionalCI/Attribute:tickets_list+' => 'All the tickets for this configuration item',
 ));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/es_cr.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/es_cr.dict.itop-bridge-cmdb-ticket.php
index 9bea448eb..945f71850 100644
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/es_cr.dict.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/es_cr.dict.itop-bridge-cmdb-ticket.php
@@ -29,23 +29,6 @@
 //////////////////////////////////////////////////////////////////////
 //
 
-//
-// Class: lnkContactToFunctionalCI
-//
-
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
-	'Class:lnkContactToFunctionalCI' => 'Relación Contacto y  EC Funcional',
-	'Class:lnkContactToFunctionalCI+' => 'Relación Contacto y  EC Funcional',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'EC Funcional',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => 'EC Funcional',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'EC Funcional',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => 'EC Funcional',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contacto',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => 'Contacto',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Contacto',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => 'Contacto',
-));
-
 //
 // Class: lnkFunctionalCIToTicket
 //
@@ -70,3 +53,50 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Calculado',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'No impactado',
 ));
+
+//
+// Class: lnkFunctionalCIToProviderContract
+//
+
+Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+	'Class:lnkFunctionalCIToProviderContract' => 'Relación EC Funcional y Contrato con Proveedor',
+	'Class:lnkFunctionalCIToProviderContract+' => 'Relación EC Funcional y Contrato con Proveedor',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Contrato con Proveedor',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => 'Contrato con Proveedor',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Contrato con Proveedor',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => 'Contrato con Proveedor',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'EC',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => 'Elemento de Configuración',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'Elemento de Configuración',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => 'Elemento de Configuración',
+));
+
+//
+// Class: lnkFunctionalCIToService
+//
+
+Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+	'Class:lnkFunctionalCIToService' => 'Relación EC Funcional y Servicio',
+	'Class:lnkFunctionalCIToService+' => 'Relación EC Funcional y Servicio',
+	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Servicio',
+	'Class:lnkFunctionalCIToService/Attribute:service_id+' => 'Servicio',
+	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Servicio',
+	'Class:lnkFunctionalCIToService/Attribute:service_name+' => 'Servicio',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'EC',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => 'Elemento de Configuración',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'EC',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => 'Elemento de Configuración',
+));
+
+//
+// Class: FunctionalCI
+//
+
+Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Contratos',
+	'Class:FunctionalCI/Attribute:providercontracts_list+' => 'Contratos',
+	'Class:FunctionalCI/Attribute:services_list' => 'Servicios',
+	'Class:FunctionalCI/Attribute:services_list+' => 'Servicios',
+	'Class:FunctionalCI/Attribute:tickets_list' => 'Tickets',
+	'Class:FunctionalCI/Attribute:tickets_list+' => 'Tickets relacionados con este EC',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/fr.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/fr.dict.itop-bridge-cmdb-ticket.php
index 4d4134214..e526b2208 100644
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/fr.dict.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/fr.dict.itop-bridge-cmdb-ticket.php
@@ -29,23 +29,6 @@
 //////////////////////////////////////////////////////////////////////
 //
 
-//
-// Class: lnkContactToFunctionalCI
-//
-
-Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:lnkContactToFunctionalCI' => 'Lien Contact / CI Fonctionel',
-	'Class:lnkContactToFunctionalCI+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'CI',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Nom CI',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contact',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Nom contact',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
-));
-
 //
 // Class: lnkFunctionalCIToTicket
 //
@@ -69,4 +52,51 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Ajouté manuellement',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Calculé',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Non impacté',
+));
+
+//
+// Class: lnkFunctionalCIToProviderContract
+//
+
+Dict::Add('FR FR', 'French', 'Français', array(
+	'Class:lnkFunctionalCIToProviderContract' => 'Lien CI / Contrat fournisseur',
+	'Class:lnkFunctionalCIToProviderContract+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Contrat fournisseur',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Nom contrat fournisseur',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'Nom CI',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: lnkFunctionalCIToService
+//
+
+Dict::Add('FR FR', 'French', 'Français', array(
+	'Class:lnkFunctionalCIToService' => 'Lien CI / Service',
+	'Class:lnkFunctionalCIToService+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Service',
+	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Nom service',
+	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'CI',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'Nom CI',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: FunctionalCI
+//
+
+Dict::Add('FR FR', 'French', 'Français', array(
+	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Contrats fournisseur',
+	'Class:FunctionalCI/Attribute:providercontracts_list+' => '',
+	'Class:FunctionalCI/Attribute:services_list' => 'Services',
+	'Class:FunctionalCI/Attribute:services_list+' => '',
+	'Class:FunctionalCI/Attribute:tickets_list' => 'Tickets',
+	'Class:FunctionalCI/Attribute:tickets_list+' => '',
 ));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/hu.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/hu.dict.itop-bridge-cmdb-ticket.php
index db9810ef9..7f2a08829 100644
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/hu.dict.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/hu.dict.itop-bridge-cmdb-ticket.php
@@ -29,23 +29,6 @@
 //////////////////////////////////////////////////////////////////////
 //
 
-//
-// Class: lnkContactToFunctionalCI
-//
-
-Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'Class:lnkContactToFunctionalCI' => 'Link Contact / FunctionalCI~~',
-	'Class:lnkContactToFunctionalCI+' => '~~',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Functionalci~~',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '~~',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name~~',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '~~',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contact~~',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '~~',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Contact name~~',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '~~',
-));
-
 //
 // Class: lnkFunctionalCIToTicket
 //
@@ -69,4 +52,51 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Added manually~~',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Computed~~',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Not impacted~~',
+));
+
+//
+// Class: lnkFunctionalCIToProviderContract
+//
+
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+	'Class:lnkFunctionalCIToProviderContract' => 'Link FunctionalCI / ProviderContract~~',
+	'Class:lnkFunctionalCIToProviderContract+' => '~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Provider contract~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Provider contract Name~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'CI Name~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '~~',
+));
+
+//
+// Class: lnkFunctionalCIToService
+//
+
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+	'Class:lnkFunctionalCIToService' => 'Link FunctionalCI / Service~~',
+	'Class:lnkFunctionalCIToService+' => '~~',
+	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Service~~',
+	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '~~',
+	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Service Name~~',
+	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '~~',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'CI~~',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '~~',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'CI Name~~',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '~~',
+));
+
+//
+// Class: FunctionalCI
+//
+
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Provider contracts~~',
+	'Class:FunctionalCI/Attribute:providercontracts_list+' => 'All the provider contracts for this configuration item~~',
+	'Class:FunctionalCI/Attribute:services_list' => 'Services~~',
+	'Class:FunctionalCI/Attribute:services_list+' => 'All the services impacted by this configuration item~~',
+	'Class:FunctionalCI/Attribute:tickets_list' => 'Tickets~~',
+	'Class:FunctionalCI/Attribute:tickets_list+' => 'All the tickets for this configuration item~~',
 ));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/it.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/it.dict.itop-bridge-cmdb-ticket.php
index 019133220..d0e1b9faf 100644
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/it.dict.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/it.dict.itop-bridge-cmdb-ticket.php
@@ -29,23 +29,6 @@
 //////////////////////////////////////////////////////////////////////
 //
 
-//
-// Class: lnkContactToFunctionalCI
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:lnkContactToFunctionalCI' => 'Link Contact / FunctionalCI~~',
-	'Class:lnkContactToFunctionalCI+' => '~~',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Functionalci~~',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '~~',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name~~',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '~~',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contact~~',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '~~',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Contact name~~',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '~~',
-));
-
 //
 // Class: lnkFunctionalCIToTicket
 //
@@ -69,4 +52,51 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Added manually~~',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Computed~~',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Not impacted~~',
+));
+
+//
+// Class: lnkFunctionalCIToProviderContract
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:lnkFunctionalCIToProviderContract' => 'Link FunctionalCI / ProviderContract~~',
+	'Class:lnkFunctionalCIToProviderContract+' => '~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Provider contract~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Provider contract Name~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'CI Name~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '~~',
+));
+
+//
+// Class: lnkFunctionalCIToService
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:lnkFunctionalCIToService' => 'Link FunctionalCI / Service~~',
+	'Class:lnkFunctionalCIToService+' => '~~',
+	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Service~~',
+	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '~~',
+	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Service Name~~',
+	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '~~',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'CI~~',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '~~',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'CI Name~~',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '~~',
+));
+
+//
+// Class: FunctionalCI
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Provider contracts~~',
+	'Class:FunctionalCI/Attribute:providercontracts_list+' => 'All the provider contracts for this configuration item~~',
+	'Class:FunctionalCI/Attribute:services_list' => 'Services~~',
+	'Class:FunctionalCI/Attribute:services_list+' => 'All the services impacted by this configuration item~~',
+	'Class:FunctionalCI/Attribute:tickets_list' => 'Tickets~~',
+	'Class:FunctionalCI/Attribute:tickets_list+' => 'All the tickets for this configuration item~~',
 ));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/ja.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/ja.dict.itop-bridge-cmdb-ticket.php
index e5151e667..ac8ea7bca 100644
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/ja.dict.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/ja.dict.itop-bridge-cmdb-ticket.php
@@ -29,23 +29,6 @@
 //////////////////////////////////////////////////////////////////////
 //
 
-//
-// Class: lnkContactToFunctionalCI
-//
-
-Dict::Add('JA JP', 'Japanese', '日本語', array(
-	'Class:lnkContactToFunctionalCI' => 'リンク 連絡先/機能的CI',
-	'Class:lnkContactToFunctionalCI+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => '機能的ci',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => '機能的ci名',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => '連絡先',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => '連絡先名',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
-));
-
 //
 // Class: lnkFunctionalCIToTicket
 //
@@ -70,3 +53,50 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Computed~~',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Not impacted~~',
 ));
+
+//
+// Class: lnkFunctionalCIToProviderContract
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:lnkFunctionalCIToProviderContract' => 'リンク 機能的CI/プロバイダー契約',
+	'Class:lnkFunctionalCIToProviderContract+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'プロバイダー契約',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'プロバイダー契約名',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'CI名',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: lnkFunctionalCIToService
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:lnkFunctionalCIToService' => 'リンク 機能的CI/サービス',
+	'Class:lnkFunctionalCIToService+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'サービス',
+	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'サービス名',
+	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'CI',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'CI名',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: FunctionalCI
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:FunctionalCI/Attribute:providercontracts_list' => 'プロバイダー契約',
+	'Class:FunctionalCI/Attribute:providercontracts_list+' => '',
+	'Class:FunctionalCI/Attribute:services_list' => 'サービス',
+	'Class:FunctionalCI/Attribute:services_list+' => '',
+	'Class:FunctionalCI/Attribute:tickets_list' => 'チケット',
+	'Class:FunctionalCI/Attribute:tickets_list+' => '',
+));
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/module.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/module.itop-bridge-cmdb-ticket.php
index 396df73f3..6cd6061d9 100644
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/module.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/module.itop-bridge-cmdb-ticket.php
@@ -5,7 +5,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-bridge-cmdb-ticket/1.0.0',
+	'itop-bridge-cmdb-ticket/2.8.0',
 	array(
 		// Identification
 		//
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/nl.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/nl.dict.itop-bridge-cmdb-ticket.php
index 643d1b054..fe3d343bd 100644
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/nl.dict.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/nl.dict.itop-bridge-cmdb-ticket.php
@@ -29,23 +29,6 @@
 //////////////////////////////////////////////////////////////////////
 //
 
-//
-// Class: lnkContactToFunctionalCI
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:lnkContactToFunctionalCI' => 'Link Contact / Functioneel CI',
-	'Class:lnkContactToFunctionalCI+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Functioneel CI',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Naam functioneel CI',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contact',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Naam contact',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
-));
-
 //
 // Class: lnkFunctionalCIToTicket
 //
@@ -69,4 +52,51 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Manueel toegevoegd',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Automatisch afgeleid',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Niet geïmpacteerd',
+));
+
+//
+// Class: lnkFunctionalCIToProviderContract
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:lnkFunctionalCIToProviderContract' => 'Link Functioneel CI / Leverancierscontract',
+	'Class:lnkFunctionalCIToProviderContract+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Leverancierscontract',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Naam leverancierscontract',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'Naam CI',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: lnkFunctionalCIToService
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:lnkFunctionalCIToService' => 'Link Functioneel CI / Service',
+	'Class:lnkFunctionalCIToService+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Service',
+	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Naam service',
+	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'CI',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'Naam CI',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: FunctionalCI
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Leverancierscontracten',
+	'Class:FunctionalCI/Attribute:providercontracts_list+' => 'Alle leverancierscontracten voor dit configuratie-item',
+	'Class:FunctionalCI/Attribute:services_list' => 'Services',
+	'Class:FunctionalCI/Attribute:services_list+' => 'Alle services die impact hebben op dit configuratie-item',
+	'Class:FunctionalCI/Attribute:tickets_list' => 'Tickets',
+	'Class:FunctionalCI/Attribute:tickets_list+' => 'Alle tickets voor dit configuratie-item',
 ));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/pt_br.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/pt_br.dict.itop-bridge-cmdb-ticket.php
index 0e0464944..0ce14ca90 100644
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/pt_br.dict.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/pt_br.dict.itop-bridge-cmdb-ticket.php
@@ -29,23 +29,6 @@
 //////////////////////////////////////////////////////////////////////
 //
 
-//
-// Class: lnkContactToFunctionalCI
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkContactToFunctionalCI' => 'Link Contato / CI',
-	'Class:lnkContactToFunctionalCI+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'CIs',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Nome CI',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contato',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Nome contato',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
-));
-
 //
 // Class: lnkFunctionalCIToTicket
 //
@@ -69,4 +52,51 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Adicionado manualmente',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Computado',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Não impactado',
+));
+
+//
+// Class: lnkFunctionalCIToProviderContract
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:lnkFunctionalCIToProviderContract' => 'Link CI / Contrato provedor(a)',
+	'Class:lnkFunctionalCIToProviderContract+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Contrato provedor(a)',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Nome contrato provedor(a)',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CIs',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'Nome CI',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: lnkFunctionalCIToService
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:lnkFunctionalCIToService' => 'Link CI / Serviço',
+	'Class:lnkFunctionalCIToService+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Serviço',
+	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Nome serviço',
+	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'CIs',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'Nome CI',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: FunctionalCI
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Contrato provedor(a)',
+	'Class:FunctionalCI/Attribute:providercontracts_list+' => 'Todos os contratos para esse item de configuração',
+	'Class:FunctionalCI/Attribute:services_list' => 'Serviços',
+	'Class:FunctionalCI/Attribute:services_list+' => 'Todos os serviços impactados por esse item de configuração',
+	'Class:FunctionalCI/Attribute:tickets_list' => 'Solicitações',
+	'Class:FunctionalCI/Attribute:tickets_list+' => 'Todos as solicitações para este item de configuração',
 ));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/ru.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/ru.dict.itop-bridge-cmdb-ticket.php
index 2e6c22e8a..a42fffee0 100644
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/ru.dict.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/ru.dict.itop-bridge-cmdb-ticket.php
@@ -29,23 +29,6 @@
 //////////////////////////////////////////////////////////////////////
 //
 
-//
-// Class: lnkContactToFunctionalCI
-//
-
-Dict::Add('RU RU', 'Russian', 'Русский', array(
-	'Class:lnkContactToFunctionalCI' => 'Связь Контакт/Функциональная КЕ',
-	'Class:lnkContactToFunctionalCI+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Функциональная КЕ',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Функциональная КЕ',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Контакт',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Контакт',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
-));
-
 //
 // Class: lnkFunctionalCIToTicket
 //
@@ -70,3 +53,51 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Вычислено',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Не влияет',
 ));
+
+//
+// Class: lnkFunctionalCIToProviderContract
+//
+
+Dict::Add('RU RU', 'Russian', 'Русский', array(
+	'Class:lnkFunctionalCIToProviderContract' => 'Связь Функциональная КЕ/Договор с поставщиком',
+	'Class:lnkFunctionalCIToProviderContract+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Договор с поставщиком',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Договор с поставщиком',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'КЕ',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'КЕ',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: lnkFunctionalCIToService
+//
+
+Dict::Add('RU RU', 'Russian', 'Русский', array(
+	'Class:lnkFunctionalCIToService' => 'Связь Функциональная КЕ/Услуга',
+	'Class:lnkFunctionalCIToService+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Услуга',
+	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Услуга',
+	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'КЕ',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'КЕ',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: FunctionalCI
+//
+
+Dict::Add('RU RU', 'Russian', 'Русский', array(
+	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Договоры',
+	'Class:FunctionalCI/Attribute:providercontracts_list+' => 'Связанные договоры',
+	'Class:FunctionalCI/Attribute:services_list' => 'Услуги',
+	'Class:FunctionalCI/Attribute:services_list+' => 'Связанные услуги',
+	'Class:FunctionalCI/Attribute:tickets_list' => 'Тикеты',
+	'Class:FunctionalCI/Attribute:tickets_list+' => 'Связанные тикеты',
+));
+
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/sk.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/sk.dict.itop-bridge-cmdb-ticket.php
index 0852cc116..6602b8955 100644
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/sk.dict.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/sk.dict.itop-bridge-cmdb-ticket.php
@@ -29,23 +29,6 @@
 //////////////////////////////////////////////////////////////////////
 //
 
-//
-// Class: lnkContactToFunctionalCI
-//
-
-Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
-	'Class:lnkContactToFunctionalCI' => 'väzba - Kontakt / Komponent',
-	'Class:lnkContactToFunctionalCI+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Komponent',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Názov funkčných CI',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Kontakt',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Názov kontaktu',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
-));
-
 //
 // Class: lnkFunctionalCIToTicket
 //
@@ -69,4 +52,51 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Added manually~~',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Computed~~',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Not impacted~~',
-));
\ No newline at end of file
+));
+
+//
+// Class: lnkFunctionalCIToProviderContract
+//
+
+Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
+	'Class:lnkFunctionalCIToProviderContract' => 'väzba - Komponent / Poskytovateľská zmluva',
+	'Class:lnkFunctionalCIToProviderContract+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Poskytovateľská zmluva',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Názov poskytovateľského zmluvy',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'Zariadenie',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'Názov CI',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: lnkFunctionalCIToService
+//
+
+Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
+	'Class:lnkFunctionalCIToService' => 'väzba - Komponent / Služba',
+	'Class:lnkFunctionalCIToService+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Služba',
+	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Názov služby',
+	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'Zariadenie',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'Názov CI',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: FunctionalCI
+//
+
+Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
+	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Poskytovateľské zmluvy',
+	'Class:FunctionalCI/Attribute:providercontracts_list+' => '',
+	'Class:FunctionalCI/Attribute:services_list' => 'Služby',
+	'Class:FunctionalCI/Attribute:services_list+' => '',
+	'Class:FunctionalCI/Attribute:tickets_list' => 'Tickety',
+	'Class:FunctionalCI/Attribute:tickets_list+' => '',
+));
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/tr.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/tr.dict.itop-bridge-cmdb-ticket.php
index b706e8ae3..fb82240bd 100644
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/tr.dict.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/tr.dict.itop-bridge-cmdb-ticket.php
@@ -29,23 +29,6 @@
 //////////////////////////////////////////////////////////////////////
 //
 
-//
-// Class: lnkContactToFunctionalCI
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:lnkContactToFunctionalCI' => 'Link Contact / FunctionalCI~~',
-	'Class:lnkContactToFunctionalCI+' => '~~',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Functionalci~~',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '~~',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name~~',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '~~',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contact~~',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '~~',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Contact name~~',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '~~',
-));
-
 //
 // Class: lnkFunctionalCIToTicket
 //
@@ -69,4 +52,51 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Added manually~~',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Computed~~',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Not impacted~~',
+));
+
+//
+// Class: lnkFunctionalCIToProviderContract
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:lnkFunctionalCIToProviderContract' => 'Link FunctionalCI / ProviderContract~~',
+	'Class:lnkFunctionalCIToProviderContract+' => '~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Provider contract~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Provider contract Name~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'CI Name~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '~~',
+));
+
+//
+// Class: lnkFunctionalCIToService
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:lnkFunctionalCIToService' => 'Link FunctionalCI / Service~~',
+	'Class:lnkFunctionalCIToService+' => '~~',
+	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Service~~',
+	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '~~',
+	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Service Name~~',
+	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '~~',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'CI~~',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '~~',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'CI Name~~',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '~~',
+));
+
+//
+// Class: FunctionalCI
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Provider contracts~~',
+	'Class:FunctionalCI/Attribute:providercontracts_list+' => 'All the provider contracts for this configuration item~~',
+	'Class:FunctionalCI/Attribute:services_list' => 'Services~~',
+	'Class:FunctionalCI/Attribute:services_list+' => 'All the services impacted by this configuration item~~',
+	'Class:FunctionalCI/Attribute:tickets_list' => 'Tickets~~',
+	'Class:FunctionalCI/Attribute:tickets_list+' => 'All the tickets for this configuration item~~',
 ));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/zh_cn.dict.itop-bridge-cmdb-ticket.php b/datamodels/2.x/itop-bridge-cmdb-ticket/zh_cn.dict.itop-bridge-cmdb-ticket.php
index dd51cd28d..6648a5ce4 100644
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/zh_cn.dict.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/zh_cn.dict.itop-bridge-cmdb-ticket.php
@@ -29,24 +29,6 @@
 //////////////////////////////////////////////////////////////////////
 //
 
-//
-// Class: lnkContactToFunctionalCI
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:lnkContactToFunctionalCI' => '链接 联系人 / 功能项',
-	'Class:lnkContactToFunctionalCI+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => '功能项',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => '功能项名称',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => '联系人',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => '联系人名称',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
-));
-
-
 //
 // Class: lnkFunctionalCIToTicket
 //
@@ -70,4 +52,51 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => '手动添加',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => '自动添加',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => '不通知',
+));
+
+//
+// Class: lnkFunctionalCIToProviderContract
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:lnkFunctionalCIToProviderContract' => '关联 功能配置项/供应商合同',
+	'Class:lnkFunctionalCIToProviderContract+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => '供应商合同',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => '供应商合同名称',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => '配置项',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => '配置项名称',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: lnkFunctionalCIToService
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:lnkFunctionalCIToService' => '关联 功能配置项/服务',
+	'Class:lnkFunctionalCIToService+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:service_id' => '服务',
+	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:service_name' => '服务名称',
+	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => '配置项',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => '配置项名称',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: FunctionalCI
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:FunctionalCI/Attribute:providercontracts_list' => '供应商合同',
+	'Class:FunctionalCI/Attribute:providercontracts_list+' => '该配置项的所有供应商合同',
+	'Class:FunctionalCI/Attribute:services_list' => '服务',
+	'Class:FunctionalCI/Attribute:services_list+' => '该配置项影响的所有服务',
+	'Class:FunctionalCI/Attribute:tickets_list' => '工单',
+	'Class:FunctionalCI/Attribute:tickets_list+' => '该配置项包含的所有工单',
 ));
\ No newline at end of file
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 e61aba1dc..47d3e84ee 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
@@ -63,6 +63,14 @@
 					<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>
@@ -4276,6 +4284,87 @@
 				</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>
+				<display_template/>
+				<icon/>
+				<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>
diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/cs.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/cs.dict.itop-config-mgmt.php
index e616d14ea..a0946bc93 100644
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/cs.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/cs.dict.itop-config-mgmt.php
@@ -77,6 +77,23 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 //////////////////////////////////////////////////////////////////////
 //
 
+//
+// Class: lnkContactToFunctionalCI
+//
+
+Dict::Add('CS CZ', 'Czech', 'Čeština', array(
+	'Class:lnkContactToFunctionalCI' => 'Spojení (Kontakt / Funkční konfigurační položka)',
+	'Class:lnkContactToFunctionalCI+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Funkční konfigurační položka',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Název funkční konfigurační položky',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Kontakt',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Název kontaktu',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
+));
+
 //
 // Class: FunctionalCI
 //
@@ -108,14 +125,8 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:FunctionalCI/Attribute:documents_list+' => '',
 	'Class:FunctionalCI/Attribute:applicationsolution_list' => 'Aplikační řešení',
 	'Class:FunctionalCI/Attribute:applicationsolution_list+' => 'Všechna aplikační řešení závisející na této konfigurační položce',
-	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Smlouvy s poskytovateli',
-	'Class:FunctionalCI/Attribute:providercontracts_list+' => '',
-	'Class:FunctionalCI/Attribute:services_list' => 'Služby',
-	'Class:FunctionalCI/Attribute:services_list+' => '',
 	'Class:FunctionalCI/Attribute:softwares_list' => 'Software',
 	'Class:FunctionalCI/Attribute:softwares_list+' => '',
-	'Class:FunctionalCI/Attribute:tickets_list' => 'Tikety',
-	'Class:FunctionalCI/Attribute:tickets_list+' => '',
 	'Class:FunctionalCI/Attribute:finalclass' => 'Typ konfigurační položky',
 	'Class:FunctionalCI/Attribute:finalclass+' => '',
 	'Class:FunctionalCI/Tab:OpenedTickets' => 'Aktivní tikety',
diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/da.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/da.dict.itop-config-mgmt.php
index e5d05ef71..427970038 100644
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/da.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/da.dict.itop-config-mgmt.php
@@ -70,6 +70,22 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 //////////////////////////////////////////////////////////////////////
 //
 
+//
+// Class: lnkContactToFunctionalCI
+//
+
+Dict::Add('DA DA', 'Danish', 'Dansk', array(
+	'Class:lnkContactToFunctionalCI' => 'Sammenhæng Kontakt/FunctionalCI',
+	'Class:lnkContactToFunctionalCI+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'FunctionalCI',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'FunctionalCI navn',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Kontakt',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Kontakt navn',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
+));
 
 //
 // Class: FunctionalCI
@@ -102,14 +118,8 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:FunctionalCI/Attribute:documents_list+' => '',
 	'Class:FunctionalCI/Attribute:applicationsolution_list' => 'Applikations løsning',
 	'Class:FunctionalCI/Attribute:applicationsolution_list+' => '',
-	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Leverandør kontrakter',
-	'Class:FunctionalCI/Attribute:providercontracts_list+' => '',
-	'Class:FunctionalCI/Attribute:services_list' => 'Ydelser',
-	'Class:FunctionalCI/Attribute:services_list+' => '',
 	'Class:FunctionalCI/Attribute:softwares_list' => 'Software',
 	'Class:FunctionalCI/Attribute:softwares_list+' => '',
-	'Class:FunctionalCI/Attribute:tickets_list' => 'Tickets',
-	'Class:FunctionalCI/Attribute:tickets_list+' => '',
 	'Class:FunctionalCI/Attribute:finalclass' => 'Type',
 	'Class:FunctionalCI/Attribute:finalclass+' => '',
 	'Class:FunctionalCI/Tab:OpenedTickets' => 'Active Tickets~~',
diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/de.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/de.dict.itop-config-mgmt.php
index 2e7ce51fa..6f2484a47 100644
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/de.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/de.dict.itop-config-mgmt.php
@@ -72,6 +72,23 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 //////////////////////////////////////////////////////////////////////
 //
 
+//
+// Class: lnkContactToFunctionalCI
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:lnkContactToFunctionalCI' => 'Verknüpfung Kontakt/FunctionalCI',
+	'Class:lnkContactToFunctionalCI+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'FunctionalCI',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'FunctionalCI-Name',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Kontakt',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Kontakt-Name',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
+));
+
 //
 // Class: FunctionalCI
 //
@@ -103,14 +120,8 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:FunctionalCI/Attribute:documents_list+' => '',
 	'Class:FunctionalCI/Attribute:applicationsolution_list' => 'Anwendungslösungen',
 	'Class:FunctionalCI/Attribute:applicationsolution_list+' => '',
-	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Provider-Verträge',
-	'Class:FunctionalCI/Attribute:providercontracts_list+' => '',
-	'Class:FunctionalCI/Attribute:services_list' => 'Services',
-	'Class:FunctionalCI/Attribute:services_list+' => '',
 	'Class:FunctionalCI/Attribute:softwares_list' => 'Software',
 	'Class:FunctionalCI/Attribute:softwares_list+' => '',
-	'Class:FunctionalCI/Attribute:tickets_list' => 'Tickets',
-	'Class:FunctionalCI/Attribute:tickets_list+' => '',
 	'Class:FunctionalCI/Attribute:finalclass' => 'Typ',
 	'Class:FunctionalCI/Attribute:finalclass+' => '',
 	'Class:FunctionalCI/Tab:OpenedTickets' => 'Offene Tickets',
diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/en.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/en.dict.itop-config-mgmt.php
index 1970354c1..6881afec2 100644
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/en.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/en.dict.itop-config-mgmt.php
@@ -76,6 +76,23 @@ Dict::Add('EN US', 'English', 'English', array(
 //////////////////////////////////////////////////////////////////////
 //
 
+//
+// Class: lnkContactToFunctionalCI
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:lnkContactToFunctionalCI' => 'Link Contact / FunctionalCI',
+	'Class:lnkContactToFunctionalCI+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Functionalci',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contact',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Contact name',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
+));
+
 //
 // Class: FunctionalCI
 //
@@ -107,14 +124,8 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:FunctionalCI/Attribute:documents_list+' => 'All the documents linked to this configuration item',
 	'Class:FunctionalCI/Attribute:applicationsolution_list' => 'Application solutions',
 	'Class:FunctionalCI/Attribute:applicationsolution_list+' => 'All the application solutions depending on this configuration item',
-	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Provider contracts',
-	'Class:FunctionalCI/Attribute:providercontracts_list+' => 'All the provider contracts for this configuration item',
-	'Class:FunctionalCI/Attribute:services_list' => 'Services',
-	'Class:FunctionalCI/Attribute:services_list+' => 'All the services impacted by this configuration item',
 	'Class:FunctionalCI/Attribute:softwares_list' => 'Softwares',
 	'Class:FunctionalCI/Attribute:softwares_list+' => 'All the softwares installed on this configuration item',
-	'Class:FunctionalCI/Attribute:tickets_list' => 'Tickets',
-	'Class:FunctionalCI/Attribute:tickets_list+' => 'All the tickets for this configuration item',
 	'Class:FunctionalCI/Attribute:finalclass' => 'CI sub-class',
 	'Class:FunctionalCI/Attribute:finalclass+' => 'Name of the final class',
 	'Class:FunctionalCI/Tab:OpenedTickets' => 'Active Tickets',
diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/es_cr.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/es_cr.dict.itop-config-mgmt.php
index 26e080246..922618be8 100644
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/es_cr.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/es_cr.dict.itop-config-mgmt.php
@@ -76,6 +76,23 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 //////////////////////////////////////////////////////////////////////
 //
 
+//
+// Class: lnkContactToFunctionalCI
+//
+
+Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+	'Class:lnkContactToFunctionalCI' => 'Relación Contacto y  EC Funcional',
+	'Class:lnkContactToFunctionalCI+' => 'Relación Contacto y  EC Funcional',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'EC Funcional',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => 'EC Funcional',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'EC Funcional',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => 'EC Funcional',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contacto',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => 'Contacto',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Contacto',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => 'Contacto',
+));
+
 //
 // Class: FunctionalCI
 //
@@ -107,14 +124,8 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'Class:FunctionalCI/Attribute:documents_list+' => 'Documentación para este EC',
 	'Class:FunctionalCI/Attribute:applicationsolution_list' => 'Soluciones Aplicativa',
 	'Class:FunctionalCI/Attribute:applicationsolution_list+' => 'Soluciones Aplicativa',
-	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Contratos',
-	'Class:FunctionalCI/Attribute:providercontracts_list+' => 'Contratos',
-	'Class:FunctionalCI/Attribute:services_list' => 'Servicios',
-	'Class:FunctionalCI/Attribute:services_list+' => 'Servicios',
 	'Class:FunctionalCI/Attribute:softwares_list' => 'Software',
 	'Class:FunctionalCI/Attribute:softwares_list+' => 'Software',
-	'Class:FunctionalCI/Attribute:tickets_list' => 'Tickets',
-	'Class:FunctionalCI/Attribute:tickets_list+' => 'Tickets relacionados con este EC',
 	'Class:FunctionalCI/Attribute:finalclass' => 'Clase',
 	'Class:FunctionalCI/Attribute:finalclass+' => 'Clase',
 	'Class:FunctionalCI/Tab:OpenedTickets' => 'Tickets Activos',
diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/fr.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/fr.dict.itop-config-mgmt.php
index f371005e8..934ab8e17 100644
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/fr.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/fr.dict.itop-config-mgmt.php
@@ -72,6 +72,23 @@ Dict::Add('FR FR', 'French', 'Français', array(
 //////////////////////////////////////////////////////////////////////
 //
 
+//
+// Class: lnkContactToFunctionalCI
+//
+
+Dict::Add('FR FR', 'French', 'Français', array(
+	'Class:lnkContactToFunctionalCI' => 'Lien Contact / CI Fonctionel',
+	'Class:lnkContactToFunctionalCI+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'CI',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Nom CI',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contact',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Nom contact',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
+));
+
 //
 // Class: FunctionalCI
 //
@@ -103,14 +120,8 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:FunctionalCI/Attribute:documents_list+' => '',
 	'Class:FunctionalCI/Attribute:applicationsolution_list' => 'Solutions applicatives',
 	'Class:FunctionalCI/Attribute:applicationsolution_list+' => '',
-	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Contrats fournisseur',
-	'Class:FunctionalCI/Attribute:providercontracts_list+' => '',
-	'Class:FunctionalCI/Attribute:services_list' => 'Services',
-	'Class:FunctionalCI/Attribute:services_list+' => '',
 	'Class:FunctionalCI/Attribute:softwares_list' => 'Logiciels',
 	'Class:FunctionalCI/Attribute:softwares_list+' => '',
-	'Class:FunctionalCI/Attribute:tickets_list' => 'Tickets',
-	'Class:FunctionalCI/Attribute:tickets_list+' => '',
 	'Class:FunctionalCI/Attribute:finalclass' => 'Sous-classe de CI',
 	'Class:FunctionalCI/Attribute:finalclass+' => 'Nom de la classe instanciable',
 	'Class:FunctionalCI/Tab:OpenedTickets' => 'Tickets en cours',
diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/hu.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/hu.dict.itop-config-mgmt.php
index 5932a7bb8..2e3c4d7d5 100644
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/hu.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/hu.dict.itop-config-mgmt.php
@@ -69,6 +69,23 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 //////////////////////////////////////////////////////////////////////
 //
 
+//
+// Class: lnkContactToFunctionalCI
+//
+
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+	'Class:lnkContactToFunctionalCI' => 'Link Contact / FunctionalCI~~',
+	'Class:lnkContactToFunctionalCI+' => '~~',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Functionalci~~',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '~~',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name~~',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '~~',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contact~~',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '~~',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Contact name~~',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '~~',
+));
+
 //
 // Class: FunctionalCI
 //
@@ -100,14 +117,8 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:FunctionalCI/Attribute:documents_list+' => 'All the documents linked to this configuration item~~',
 	'Class:FunctionalCI/Attribute:applicationsolution_list' => 'Application solutions~~',
 	'Class:FunctionalCI/Attribute:applicationsolution_list+' => 'All the application solutions depending on this configuration item~~',
-	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Provider contracts~~',
-	'Class:FunctionalCI/Attribute:providercontracts_list+' => 'All the provider contracts for this configuration item~~',
-	'Class:FunctionalCI/Attribute:services_list' => 'Services~~',
-	'Class:FunctionalCI/Attribute:services_list+' => 'All the services impacted by this configuration item~~',
 	'Class:FunctionalCI/Attribute:softwares_list' => 'Softwares~~',
 	'Class:FunctionalCI/Attribute:softwares_list+' => 'All the softwares installed on this configuration item~~',
-	'Class:FunctionalCI/Attribute:tickets_list' => 'Tickets~~',
-	'Class:FunctionalCI/Attribute:tickets_list+' => 'All the tickets for this configuration item~~',
 	'Class:FunctionalCI/Attribute:finalclass' => 'Típus',
 	'Class:FunctionalCI/Attribute:finalclass+' => '',
 	'Class:FunctionalCI/Tab:OpenedTickets' => 'Active Tickets~~',
@@ -1033,24 +1044,6 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:OSFamily+' => '~~',
 ));
 
-//
-// Class: DocumentType
-//
-
-Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'Class:DocumentType' => 'Document Type~~',
-	'Class:DocumentType+' => '~~',
-));
-
-//
-// Class: ContactType
-//
-
-Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'Class:ContactType' => 'Contact Type~~',
-	'Class:ContactType+' => '~~',
-));
-
 //
 // Class: Brand
 //
diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/it.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/it.dict.itop-config-mgmt.php
index 4dbf4d215..2448f35ff 100644
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/it.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/it.dict.itop-config-mgmt.php
@@ -69,6 +69,23 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 //////////////////////////////////////////////////////////////////////
 //
 
+//
+// Class: lnkContactToFunctionalCI
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:lnkContactToFunctionalCI' => 'Link Contact / FunctionalCI~~',
+	'Class:lnkContactToFunctionalCI+' => '~~',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Functionalci~~',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '~~',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name~~',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '~~',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contact~~',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '~~',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Contact name~~',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '~~',
+));
+
 //
 // Class: FunctionalCI
 //
@@ -100,14 +117,8 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:FunctionalCI/Attribute:documents_list+' => 'All the documents linked to this configuration item~~',
 	'Class:FunctionalCI/Attribute:applicationsolution_list' => 'Application solutions~~',
 	'Class:FunctionalCI/Attribute:applicationsolution_list+' => 'All the application solutions depending on this configuration item~~',
-	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Provider contracts~~',
-	'Class:FunctionalCI/Attribute:providercontracts_list+' => 'All the provider contracts for this configuration item~~',
-	'Class:FunctionalCI/Attribute:services_list' => 'Services~~',
-	'Class:FunctionalCI/Attribute:services_list+' => 'All the services impacted by this configuration item~~',
 	'Class:FunctionalCI/Attribute:softwares_list' => 'Softwares~~',
 	'Class:FunctionalCI/Attribute:softwares_list+' => 'All the softwares installed on this configuration item~~',
-	'Class:FunctionalCI/Attribute:tickets_list' => 'Tickets~~',
-	'Class:FunctionalCI/Attribute:tickets_list+' => 'All the tickets for this configuration item~~',
 	'Class:FunctionalCI/Attribute:finalclass' => 'Tipo',
 	'Class:FunctionalCI/Attribute:finalclass+' => '',
 	'Class:FunctionalCI/Tab:OpenedTickets' => 'Active Tickets~~',
diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/ja.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/ja.dict.itop-config-mgmt.php
index 9ab8eabee..21c13f464 100644
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/ja.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/ja.dict.itop-config-mgmt.php
@@ -69,6 +69,23 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 //////////////////////////////////////////////////////////////////////
 //
 
+//
+// Class: lnkContactToFunctionalCI
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:lnkContactToFunctionalCI' => 'リンク 連絡先/機能的CI',
+	'Class:lnkContactToFunctionalCI+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => '機能的ci',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => '機能的ci名',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => '連絡先',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => '連絡先名',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
+));
+
 //
 // Class: FunctionalCI
 //
@@ -100,14 +117,8 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:FunctionalCI/Attribute:documents_list+' => '',
 	'Class:FunctionalCI/Attribute:applicationsolution_list' => 'アプリケーションソリューション',
 	'Class:FunctionalCI/Attribute:applicationsolution_list+' => '',
-	'Class:FunctionalCI/Attribute:providercontracts_list' => 'プロバイダー契約',
-	'Class:FunctionalCI/Attribute:providercontracts_list+' => '',
-	'Class:FunctionalCI/Attribute:services_list' => 'サービス',
-	'Class:FunctionalCI/Attribute:services_list+' => '',
 	'Class:FunctionalCI/Attribute:softwares_list' => 'ソフトウエア',
 	'Class:FunctionalCI/Attribute:softwares_list+' => '',
-	'Class:FunctionalCI/Attribute:tickets_list' => 'チケット',
-	'Class:FunctionalCI/Attribute:tickets_list+' => '',
 	'Class:FunctionalCI/Attribute:finalclass' => 'CIタイプ',
 	'Class:FunctionalCI/Attribute:finalclass+' => '',
 	'Class:FunctionalCI/Tab:OpenedTickets' => 'Active Tickets~~',
diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/nl.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/nl.dict.itop-config-mgmt.php
index fea5f6b17..2872461e9 100644
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/nl.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/nl.dict.itop-config-mgmt.php
@@ -81,6 +81,23 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 //////////////////////////////////////////////////////////////////////
 //
 
+//
+// Class: lnkContactToFunctionalCI
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:lnkContactToFunctionalCI' => 'Link Contact / Functioneel CI',
+	'Class:lnkContactToFunctionalCI+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Functioneel CI',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Naam functioneel CI',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contact',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Naam contact',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
+));
+
 //
 // Class: FunctionalCI
 //
@@ -112,14 +129,8 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:FunctionalCI/Attribute:documents_list+' => 'Alle documenten gelinkt aan dit configuratie-item.',
 	'Class:FunctionalCI/Attribute:applicationsolution_list' => 'Applicatieoplossingen',
 	'Class:FunctionalCI/Attribute:applicationsolution_list+' => 'Alle applicatieoplossingen die afhankelijk zijn van dit configuratie-item',
-	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Leverancierscontracten',
-	'Class:FunctionalCI/Attribute:providercontracts_list+' => 'Alle leverancierscontracten voor dit configuratie-item',
-	'Class:FunctionalCI/Attribute:services_list' => 'Services',
-	'Class:FunctionalCI/Attribute:services_list+' => 'Alle services die impact hebben op dit configuratie-item',
 	'Class:FunctionalCI/Attribute:softwares_list' => 'Software',
 	'Class:FunctionalCI/Attribute:softwares_list+' => 'Alle software geïnstalleerd op dit configuratie-item',
-	'Class:FunctionalCI/Attribute:tickets_list' => 'Tickets',
-	'Class:FunctionalCI/Attribute:tickets_list+' => 'Alle tickets voor dit configuratie-item',
 	'Class:FunctionalCI/Attribute:finalclass' => 'Subklasse CI',
 	'Class:FunctionalCI/Attribute:finalclass+' => '',
 	'Class:FunctionalCI/Tab:OpenedTickets' => 'Actieve tickets',
diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/pt_br.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/pt_br.dict.itop-config-mgmt.php
index 0fb98b843..265939d00 100644
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/pt_br.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/pt_br.dict.itop-config-mgmt.php
@@ -75,6 +75,23 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //////////////////////////////////////////////////////////////////////
 //
 
+//
+// Class: lnkContactToFunctionalCI
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:lnkContactToFunctionalCI' => 'Link Contato / CI',
+	'Class:lnkContactToFunctionalCI+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'CIs',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Nome CI',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contato',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Nome contato',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
+));
+
 //
 // Class: FunctionalCI
 //
@@ -106,14 +123,8 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:FunctionalCI/Attribute:documents_list+' => 'Todos os documentos vinculados a este item de configuração',
 	'Class:FunctionalCI/Attribute:applicationsolution_list' => 'Soluções de aplicações',
 	'Class:FunctionalCI/Attribute:applicationsolution_list+' => 'Todas as soluções de aplicação, dependente desse item de configuração',
-	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Contrato provedor(a)',
-	'Class:FunctionalCI/Attribute:providercontracts_list+' => 'Todos os contratos para esse item de configuração',
-	'Class:FunctionalCI/Attribute:services_list' => 'Serviços',
-	'Class:FunctionalCI/Attribute:services_list+' => 'Todos os serviços impactados por esse item de configuração',
 	'Class:FunctionalCI/Attribute:softwares_list' => 'Softwares',
 	'Class:FunctionalCI/Attribute:softwares_list+' => 'Todos os softwares instalados neste item de configuração',
-	'Class:FunctionalCI/Attribute:tickets_list' => 'Solicitações',
-	'Class:FunctionalCI/Attribute:tickets_list+' => 'Todos as solicitações para este item de configuração',
 	'Class:FunctionalCI/Attribute:finalclass' => 'Tipo CI',
 	'Class:FunctionalCI/Attribute:finalclass+' => '',
 	'Class:FunctionalCI/Tab:OpenedTickets' => 'Ingressos Ativos',
diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/ru.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/ru.dict.itop-config-mgmt.php
index 981f58443..4036c40d5 100644
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/ru.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/ru.dict.itop-config-mgmt.php
@@ -62,6 +62,23 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 //////////////////////////////////////////////////////////////////////
 //
 
+//
+// Class: lnkContactToFunctionalCI
+//
+
+Dict::Add('RU RU', 'Russian', 'Русский', array(
+	'Class:lnkContactToFunctionalCI' => 'Связь Контакт/Функциональная КЕ',
+	'Class:lnkContactToFunctionalCI+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Функциональная КЕ',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Функциональная КЕ',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Контакт',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Контакт',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
+));
+
 //
 // Class: FunctionalCI
 //
@@ -93,14 +110,8 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:FunctionalCI/Attribute:documents_list+' => 'Связанные документы',
 	'Class:FunctionalCI/Attribute:applicationsolution_list' => 'Прикладные решения',
 	'Class:FunctionalCI/Attribute:applicationsolution_list+' => 'Связанные прикладные решения',
-	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Договоры',
-	'Class:FunctionalCI/Attribute:providercontracts_list+' => 'Связанные договоры',
-	'Class:FunctionalCI/Attribute:services_list' => 'Услуги',
-	'Class:FunctionalCI/Attribute:services_list+' => 'Связанные услуги',
 	'Class:FunctionalCI/Attribute:softwares_list' => 'ПО',
 	'Class:FunctionalCI/Attribute:softwares_list+' => 'Связанное программное обеспечение',
-	'Class:FunctionalCI/Attribute:tickets_list' => 'Тикеты',
-	'Class:FunctionalCI/Attribute:tickets_list+' => 'Связанные тикеты',
 	'Class:FunctionalCI/Attribute:finalclass' => 'Тип',
 	'Class:FunctionalCI/Attribute:finalclass+' => '',
 	'Class:FunctionalCI/Tab:OpenedTickets' => 'Активные тикеты',
diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/sk.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/sk.dict.itop-config-mgmt.php
index aa93b864f..d9c72bfac 100644
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/sk.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/sk.dict.itop-config-mgmt.php
@@ -74,6 +74,23 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 //////////////////////////////////////////////////////////////////////
 //
 
+//
+// Class: lnkContactToFunctionalCI
+//
+
+Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
+	'Class:lnkContactToFunctionalCI' => 'väzba - Kontakt / Komponent',
+	'Class:lnkContactToFunctionalCI+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Komponent',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Názov funkčných CI',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Kontakt',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Názov kontaktu',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
+));
+
 //
 // Class: FunctionalCI
 //
@@ -105,14 +122,8 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:FunctionalCI/Attribute:documents_list+' => '',
 	'Class:FunctionalCI/Attribute:applicationsolution_list' => 'Zoznam aplikačných riešení',
 	'Class:FunctionalCI/Attribute:applicationsolution_list+' => '',
-	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Poskytovateľské zmluvy',
-	'Class:FunctionalCI/Attribute:providercontracts_list+' => '',
-	'Class:FunctionalCI/Attribute:services_list' => 'Služby',
-	'Class:FunctionalCI/Attribute:services_list+' => '',
 	'Class:FunctionalCI/Attribute:softwares_list' => 'Softvér',
 	'Class:FunctionalCI/Attribute:softwares_list+' => '',
-	'Class:FunctionalCI/Attribute:tickets_list' => 'Tickety',
-	'Class:FunctionalCI/Attribute:tickets_list+' => '',
 	'Class:FunctionalCI/Attribute:finalclass' => 'Typ komponentu',
 	'Class:FunctionalCI/Attribute:finalclass+' => '',
 	'Class:FunctionalCI/Tab:OpenedTickets' => 'Active Tickets~~',
diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/tr.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/tr.dict.itop-config-mgmt.php
index f169debc7..80e924f6b 100644
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/tr.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/tr.dict.itop-config-mgmt.php
@@ -76,6 +76,23 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 //////////////////////////////////////////////////////////////////////
 //
 
+//
+// Class: lnkContactToFunctionalCI
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:lnkContactToFunctionalCI' => 'Link Contact / FunctionalCI~~',
+	'Class:lnkContactToFunctionalCI+' => '~~',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Functionalci~~',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '~~',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name~~',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '~~',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contact~~',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '~~',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Contact name~~',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '~~',
+));
+
 //
 // Class: FunctionalCI
 //
@@ -107,14 +124,8 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:FunctionalCI/Attribute:documents_list+' => 'All the documents linked to this configuration item~~',
 	'Class:FunctionalCI/Attribute:applicationsolution_list' => 'Application solutions~~',
 	'Class:FunctionalCI/Attribute:applicationsolution_list+' => 'All the application solutions depending on this configuration item~~',
-	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Provider contracts~~',
-	'Class:FunctionalCI/Attribute:providercontracts_list+' => 'All the provider contracts for this configuration item~~',
-	'Class:FunctionalCI/Attribute:services_list' => 'Services~~',
-	'Class:FunctionalCI/Attribute:services_list+' => 'All the services impacted by this configuration item~~',
 	'Class:FunctionalCI/Attribute:softwares_list' => 'Softwares~~',
 	'Class:FunctionalCI/Attribute:softwares_list+' => 'All the softwares installed on this configuration item~~',
-	'Class:FunctionalCI/Attribute:tickets_list' => 'Tickets~~',
-	'Class:FunctionalCI/Attribute:tickets_list+' => 'All the tickets for this configuration item~~',
 	'Class:FunctionalCI/Attribute:finalclass' => 'Tip',
 	'Class:FunctionalCI/Attribute:finalclass+' => '',
 	'Class:FunctionalCI/Tab:OpenedTickets' => 'Active Tickets~~',
diff --git a/datamodels/2.x/itop-config-mgmt/dictionaries/zh_cn.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/dictionaries/zh_cn.dict.itop-config-mgmt.php
index e34ffd22c..62cf53969 100644
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/zh_cn.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/zh_cn.dict.itop-config-mgmt.php
@@ -74,6 +74,23 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 //////////////////////////////////////////////////////////////////////
 //
 
+//
+// Class: lnkContactToFunctionalCI
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:lnkContactToFunctionalCI' => '链接 联系人 / 功能项',
+	'Class:lnkContactToFunctionalCI+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => '功能项',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => '功能项名称',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => '联系人',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => '联系人名称',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
+));
+
 //
 // Class: FunctionalCI
 //
@@ -105,14 +122,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:FunctionalCI/Attribute:documents_list+' => '该配置项关联的所有文档',
 	'Class:FunctionalCI/Attribute:applicationsolution_list' => '应用方案',
 	'Class:FunctionalCI/Attribute:applicationsolution_list+' => '该配置项依赖的所有应用方案',
-	'Class:FunctionalCI/Attribute:providercontracts_list' => '供应商合同',
-	'Class:FunctionalCI/Attribute:providercontracts_list+' => '该配置项的所有供应商合同',
-	'Class:FunctionalCI/Attribute:services_list' => '服务',
-	'Class:FunctionalCI/Attribute:services_list+' => '该配置项影响的所有服务',
 	'Class:FunctionalCI/Attribute:softwares_list' => '软件',
 	'Class:FunctionalCI/Attribute:softwares_list+' => '该配置项上已安装的所有软件',
-	'Class:FunctionalCI/Attribute:tickets_list' => '工单',
-	'Class:FunctionalCI/Attribute:tickets_list+' => '该配置项包含的所有工单',
 	'Class:FunctionalCI/Attribute:finalclass' => '二级配置项',
 	'Class:FunctionalCI/Attribute:finalclass+' => 'Name of the final class',
 	'Class:FunctionalCI/Tab:OpenedTickets' => '活跃的工单',
diff --git a/datamodels/2.x/itop-core-update/dictionaries/fr.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/dictionaries/fr.dict.itop-core-update.php
index 8dae6b928..fde558df6 100644
--- a/datamodels/2.x/itop-core-update/dictionaries/fr.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/dictionaries/fr.dict.itop-core-update.php
@@ -113,15 +113,4 @@ Dict::Add('FR FR', 'French', 'Français', array(
     'Class:ModuleInstallation/Attribute:name' => 'Nom',
     'Class:ModuleInstallation/Attribute:version' => 'Version',
     'Class:ModuleInstallation/Attribute:comment' => 'Commentaire',
-));
-
-
-
-// Additional language entries not present in English dict
-Dict::Add('FR FR', 'French', 'Français', array(
- 'iTopUpdate:UI:DoBackup' => 'Faire une sauvegarde des fichiers et de la base',
- 'iTopUpdate:UI:WithBackup' => 'Avec sauvegarde de l\'application, l\'archive sera dans \'%1$s\'',
- 'iTopUpdate:UI:InstallationCanBeUpdated' => 'L\'application peut être mise à jour',
- 'iTopUpdate:UI:InstallationCanNotBeUpdated' => 'L\'application ne peut pas être mise à jour',
- 'iTopUpdate:Error:NoUpdate' => 'La mise à jour n\'a pas été effectuée',
-));
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-knownerror-mgmt/data.sample.faq-domains.xml b/datamodels/2.x/itop-faq-light/data.sample.faq-domains.xml
similarity index 100%
rename from datamodels/2.x/itop-knownerror-mgmt/data.sample.faq-domains.xml
rename to datamodels/2.x/itop-faq-light/data.sample.faq-domains.xml
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
new file mode 100755
index 000000000..cc53f3af3
--- /dev/null
+++ b/datamodels/2.x/itop-faq-light/datamodel.itop-faq-light.xml
@@ -0,0 +1,338 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.7">
+  <classes>
+    <class id="FAQ" _delta="define">
+      <parent>cmdbAbstractObject</parent>
+      <properties>
+        <category>bizmodel,searchable,knownerrormgmt</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>faq</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="title"/>
+          </attributes>
+        </naming>
+        <display_template/>
+        <icon>images/faq.png</icon>
+        <reconciliation>
+          <attributes>
+            <attribute id="title"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
+        <field id="title" xsi:type="AttributeString">
+          <sql>title</sql>
+          <default_value/>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
+        <field id="summary" xsi:type="AttributeText">
+          <sql>summary</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="description" xsi:type="AttributeHTML">
+          <sql>description</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="category_id" xsi:type="AttributeExternalKey">
+          <sql>category_id</sql>
+          <target_class>FAQCategory</target_class>
+          <is_null_allowed>false</is_null_allowed>
+          <on_target_delete>DEL_MANUAL</on_target_delete>
+        </field>
+        <field id="category_name" xsi:type="AttributeExternalField">
+          <extkey_attcode>category_id</extkey_attcode>
+          <target_attcode>name</target_attcode>
+        </field>
+        <field id="error_code" xsi:type="AttributeString">
+          <sql>error_code</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="key_words" xsi:type="AttributeString">
+          <sql>key_words</sql>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
+        </field>
+        <field id="domains" xsi:type="AttributeTagSet">
+          <sql>domains</sql>
+          <is_null_allowed>true</is_null_allowed>
+          <tracking_level>all</tracking_level>
+          <max_items>12</max_items>
+        </field>
+      </fields>
+      <methods/>
+      <presentation>
+        <details>
+          <items>
+            <item id="category_id">
+              <rank>10</rank>
+            </item>
+            <item id="title">
+              <rank>20</rank>
+            </item>
+            <item id="error_code">
+              <rank>30</rank>
+            </item>
+            <item id="key_words">
+              <rank>40</rank>
+            </item>
+            <item id="domains">
+              <rank>50</rank>
+            </item>
+            <item id="summary">
+              <rank>60</rank>
+            </item>
+            <item id="description">
+              <rank>70</rank>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="category_id">
+              <rank>10</rank>
+            </item>
+            <item id="title">
+              <rank>20</rank>
+            </item>
+            <item id="summary">
+              <rank>30</rank>
+            </item>
+            <item id="error_code">
+              <rank>40</rank>
+            </item>
+            <item id="domains">
+              <rank>50</rank>
+            </item>
+          </items>
+        </search>
+        <default_search>
+          <items>
+            <item id="title">
+              <rank>10</rank>
+            </item>
+            <item id="summary">
+              <rank>20</rank>
+            </item>
+            <item id="category_id">
+              <rank>30</rank>
+            </item>
+          </items>
+        </default_search>
+        <list>
+          <items>
+            <item id="category_id">
+              <rank>10</rank>
+            </item>
+            <item id="error_code">
+              <rank>20</rank>
+            </item>
+            <item id="domains">
+              <rank>30</rank>
+            </item>
+          </items>
+        </list>
+      </presentation>
+    </class>
+    <class id="FAQCategory" _delta="define">
+      <parent>cmdbAbstractObject</parent>
+      <properties>
+        <category>bizmodel,searchable,knownerrormgmt</category>
+        <abstract>false</abstract>
+        <key_type>autoincrement</key_type>
+        <db_table>faqcategory</db_table>
+        <db_key_field>id</db_key_field>
+        <db_final_class_field/>
+        <naming>
+          <attributes>
+            <attribute id="name"/>
+          </attributes>
+        </naming>
+        <display_template/>
+        <icon/>
+        <reconciliation>
+          <attributes>
+            <attribute id="name"/>
+          </attributes>
+        </reconciliation>
+      </properties>
+      <fields>
+        <field id="name" xsi:type="AttributeString">
+          <sql>nam</sql>
+          <default_value/>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
+        <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>
+          <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="faq_list">
+              <rank>20</rank>
+            </item>
+          </items>
+        </details>
+        <search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+          </items>
+        </search>
+        <default_search>
+          <items>
+            <item id="name">
+              <rank>10</rank>
+            </item>
+          </items>
+        </default_search>
+      </presentation>
+    </class>
+  </classes>
+  <menus>
+    <menu id="ProblemManagement" xsi:type="MenuGroup" _delta="define_if_not_exists">
+      <rank>42</rank>
+    </menu>
+    <menu id="Problem:Shortcuts" xsi:type="TemplateMenuNode" _delta="define_if_not_exists">
+      <rank>5</rank>
+      <parent>ProblemManagement</parent>
+      <template_file/>
+    </menu>
+    <menu id="FAQCategory" xsi:type="OQLMenuNode" _delta="define">
+      <rank>4.5</rank>
+      <parent>Problem:Shortcuts</parent>
+      <oql>SELECT FAQCategory</oql>
+      <do_search>1</do_search>
+    </menu>
+    <menu id="FAQ" xsi:type="OQLMenuNode" _delta="define">
+      <rank>6</rank>
+      <parent>Problem:Shortcuts</parent>
+      <oql>SELECT FAQ</oql>
+      <do_search>1</do_search>
+    </menu>
+  </menus>
+  <module_designs>
+    <module_design id="itop-portal" xsi:type="portal">
+      <bricks>
+        <brick id="faq" xsi:type="Combodo\iTop\Portal\Brick\BrowseBrick" _delta="define">
+          <active>true</active>
+          <rank>
+			  <default>40</default>
+		  </rank>
+          <width>12</width>
+			<title>
+              <navigation_menu>Brick:Portal:FAQ:Menu</navigation_menu>
+			  <home>Brick:Portal:FAQ:Title</home>
+			</title>
+			<description>Brick:Portal:FAQ:Title+</description>
+			<decoration_class>
+				<default>fc fc-life-saver fc-2x</default>
+			</decoration_class>
+          <levels>
+            <level id="1">
+              <class>FAQCategory</class>
+              <parent_att/>
+              <name_att/>
+              <tooltip_att/>
+              <title>Class:FAQCategory</title>
+              <actions/>
+              <levels>
+                <level id="1">
+                  <class>FAQ</class>
+                  <parent_att>category_id</parent_att>
+                  <name_att>title</name_att>
+                  <tooltip_att>summary</tooltip_att>
+                  <title>Class:FAQ</title>
+                  <fields>
+                    <field id="error_code"/>
+					<field id="domains"/>
+					<field id="key_words">
+						<hidden>true</hidden>
+					</field>
+                  </fields>
+                  <actions>
+                    <action id="view" xsi:type="view"/>
+                  </actions>
+                  <levels/>
+                </level>
+              </levels>
+            </level>
+          </levels>
+          <browse_modes>
+            <availables>
+              <mode id="list"/>
+              <mode id="tree"/>
+            </availables>
+            <default>list</default>
+          </browse_modes>
+          <data_loading>full</data_loading>
+        </brick>
+      </bricks>
+      <forms>
+        <form id="faq" _delta="define">
+          <class>FAQ</class>
+          <!-- fields tag is optional. If not specified, attributes from zlist "details" will be choose as default -->
+          <fields>
+            <field id="category_name"/>
+            <field id="title"/>
+            <field id="error_code"/>
+            <field id="key_words"/>
+            <field id="domains"/>
+            <field id="summary"/>
+            <field id="description"/>
+          </fields>
+          <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>
+              <div class="col-sm-8">
+                <div class="form_field" data-field-id="description"></div>
+              </div>
+            </div>
+          </twig>
+          <modes>
+            <mode id="view"/>
+          </modes>
+        </form>
+      </forms>
+      <classes>
+        <class id="FAQCategory" _delta="define">
+          <scopes>
+            <scope id="all">
+              <oql_view><![CDATA[SELECT FAQCategory]]></oql_view>
+            </scope>
+          </scopes>
+        </class>
+        <class id="FAQ" _delta="define">
+          <scopes>
+            <scope id="all">
+              <oql_view><![CDATA[SELECT FAQ]]></oql_view>
+            </scope>
+          </scopes>
+        </class>
+      </classes>
+    </module_design>
+  </module_designs>
+</itop_design>
diff --git a/datamodels/2.x/itop-faq-light/dictionaries/cs.dict.itop-faq-light.php b/datamodels/2.x/itop-faq-light/dictionaries/cs.dict.itop-faq-light.php
new file mode 100644
index 000000000..6877cb299
--- /dev/null
+++ b/datamodels/2.x/itop-faq-light/dictionaries/cs.dict.itop-faq-light.php
@@ -0,0 +1,95 @@
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+ * Localized data.
+ *
+ * @author      Lukáš Dvořák <lukas.dvorak@itopportal.cz>
+ * @author      Daniel Rokos <daniel.rokos@itopportal.cz>
+ * @copyright   Copyright (C) 2010-2014 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+//
+// Class: FAQ
+//
+
+Dict::Add('CS CZ', 'Czech', 'Čeština', array(
+	'Class:FAQ' => 'FAQ',
+	'Class:FAQ+' => 'Často kladené dotazy',
+	'Class:FAQ/Attribute:title' => 'Název',
+	'Class:FAQ/Attribute:title+' => '',
+	'Class:FAQ/Attribute:summary' => 'Shrnutí',
+	'Class:FAQ/Attribute:summary+' => '',
+	'Class:FAQ/Attribute:description' => 'Popis',
+	'Class:FAQ/Attribute:description+' => '',
+	'Class:FAQ/Attribute:category_id' => 'Kategorie',
+	'Class:FAQ/Attribute:category_id+' => '',
+	'Class:FAQ/Attribute:category_name' => 'Název kategorie',
+	'Class:FAQ/Attribute:category_name+' => '',
+	'Class:FAQ/Attribute:error_code' => 'Kód chyby',
+	'Class:FAQ/Attribute:error_code+' => '',
+	'Class:FAQ/Attribute:key_words' => 'Klíčová slova',
+	'Class:FAQ/Attribute:key_words+' => '',
+	'Class:FAQ/Attribute:domains' => 'Domains~~',
+));
+
+//
+// Class: FAQCategory
+//
+
+Dict::Add('CS CZ', 'Czech', 'Čeština', array(
+	'Class:FAQCategory' => 'Kategorie FAQ',
+	'Class:FAQCategory+' => 'Kategorie pro FAQ',
+	'Class:FAQCategory/Attribute:name' => 'Název',
+	'Class:FAQCategory/Attribute:name+' => '',
+	'Class:FAQCategory/Attribute:faq_list' => 'FAQ',
+	'Class:FAQCategory/Attribute:faq_list+' => 'Všechny často kladené dotazy v této kategorii',
+));
+Dict::Add('CS CZ', 'Czech', 'Čeština', array(
+	'Menu:ProblemManagement' => 'Správa problémů',
+	'Menu:ProblemManagement+' => 'Správa problémů',
+	'Menu:Problem:Shortcuts' => 'Odkazy',
+	'Menu:FAQCategory' => 'Kategorie FAQ',
+	'Menu:FAQCategory+' => '',
+	'Menu:FAQ' => 'FAQ',
+	'Menu:FAQ+' => 'FAQ - Často kladené dotazy',
+	'Brick:Portal:FAQ:Menu' => 'FAQ',
+	'Brick:Portal:FAQ:Title' => 'Často kladené dotazy (FAQ)',
+	'Brick:Portal:FAQ:Title+' => '<p>Spěcháte?</p><p>Podívejte se na seznam nejčastějších otázek a (možná) najdete hledanou odpověď ihned.</p>',
+));
diff --git a/datamodels/2.x/itop-faq-light/dictionaries/da.dict.itop-faq-light.php b/datamodels/2.x/itop-faq-light/dictionaries/da.dict.itop-faq-light.php
new file mode 100644
index 000000000..593e7dbbf
--- /dev/null
+++ b/datamodels/2.x/itop-faq-light/dictionaries/da.dict.itop-faq-light.php
@@ -0,0 +1,70 @@
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+ * @author	Erik Bøg <erik@boegmoeller.dk>
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @licence	http://opensource.org/licenses/AGPL-3.0
+ */
+//
+// Class: FAQ
+//
+
+Dict::Add('DA DA', 'Danish', 'Dansk', array(
+	'Class:FAQ' => 'FAQ',
+	'Class:FAQ+' => '',
+	'Class:FAQ/Attribute:title' => 'Titel',
+	'Class:FAQ/Attribute:title+' => '',
+	'Class:FAQ/Attribute:summary' => 'Sammenfatning',
+	'Class:FAQ/Attribute:summary+' => '',
+	'Class:FAQ/Attribute:description' => 'Beskrivelse',
+	'Class:FAQ/Attribute:description+' => '',
+	'Class:FAQ/Attribute:category_id' => 'Kategori',
+	'Class:FAQ/Attribute:category_id+' => '',
+	'Class:FAQ/Attribute:category_name' => 'Kategorinavn',
+	'Class:FAQ/Attribute:category_name+' => '',
+	'Class:FAQ/Attribute:error_code' => 'Fejlkode',
+	'Class:FAQ/Attribute:error_code+' => '',
+	'Class:FAQ/Attribute:key_words' => 'Nøgleord',
+	'Class:FAQ/Attribute:key_words+' => '',
+	'Class:FAQ/Attribute:domains' => 'Domains~~',
+));
+
+//
+// Class: FAQCategory
+//
+
+Dict::Add('DA DA', 'Danish', 'Dansk', array(
+	'Class:FAQCategory' => 'FAQ-Kategori',
+	'Class:FAQCategory+' => '',
+	'Class:FAQCategory/Attribute:name' => 'Navn',
+	'Class:FAQCategory/Attribute:name+' => '',
+	'Class:FAQCategory/Attribute:faq_list' => 'FAQs',
+	'Class:FAQCategory/Attribute:faq_list+' => '',
+));
+Dict::Add('DA DA', 'Danish', 'Dansk', array(
+	'Menu:ProblemManagement' => 'Problem Management',
+	'Menu:ProblemManagement+' => 'Problem Management',
+	'Menu:Problem:Shortcuts' => 'Genvej',
+	'Menu:FAQCategory' => 'FAQ-Kategorier',
+	'Menu:FAQCategory+' => '',
+	'Menu:FAQ' => 'FAQs',
+	'Menu:FAQ+' => '',
+	'Brick:Portal:FAQ:Menu' => 'FAQ~~',
+	'Brick:Portal:FAQ:Title' => 'Frequently Asked Questions~~',
+	'Brick:Portal:FAQ:Title+' => '<p>In a hurry?</p><p>Check out the list of most common questions and (maybe) find the expected answer right away.</p>~~',
+));
diff --git a/datamodels/2.x/itop-faq-light/dictionaries/de.dict.itop-faq-light.php b/datamodels/2.x/itop-faq-light/dictionaries/de.dict.itop-faq-light.php
new file mode 100644
index 000000000..5c688d808
--- /dev/null
+++ b/datamodels/2.x/itop-faq-light/dictionaries/de.dict.itop-faq-light.php
@@ -0,0 +1,72 @@
+<?php
+// Copyright (C) 2010-2014 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/*
+* @author ITOMIG GmbH <martin.raenker@itomig.de>
+
+* @copyright     Copyright (C) 2017 Combodo SARL
+* @licence	http://opensource.org/licenses/AGPL-3.0
+*		
+*/
+//
+// Class: FAQ
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:FAQ' => 'FAQ',
+	'Class:FAQ+' => '',
+	'Class:FAQ/Attribute:title' => 'Titel',
+	'Class:FAQ/Attribute:title+' => '',
+	'Class:FAQ/Attribute:summary' => 'Zusammenfassung',
+	'Class:FAQ/Attribute:summary+' => '',
+	'Class:FAQ/Attribute:description' => 'Beschreibung',
+	'Class:FAQ/Attribute:description+' => '',
+	'Class:FAQ/Attribute:category_id' => 'Kategorie',
+	'Class:FAQ/Attribute:category_id+' => '',
+	'Class:FAQ/Attribute:category_name' => 'Kategoriename',
+	'Class:FAQ/Attribute:category_name+' => '',
+	'Class:FAQ/Attribute:error_code' => 'Fehlercode',
+	'Class:FAQ/Attribute:error_code+' => '',
+	'Class:FAQ/Attribute:key_words' => 'Schlüsselwörter',
+	'Class:FAQ/Attribute:key_words+' => '',
+	'Class:FAQ/Attribute:domains' => 'Domäne',
+));
+
+//
+// Class: FAQCategory
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:FAQCategory' => 'FAQ-Kategorie',
+	'Class:FAQCategory+' => '',
+	'Class:FAQCategory/Attribute:name' => 'Name',
+	'Class:FAQCategory/Attribute:name+' => '',
+	'Class:FAQCategory/Attribute:faq_list' => 'FAQs',
+	'Class:FAQCategory/Attribute:faq_list+' => '',
+));
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Menu:ProblemManagement' => 'Problem Management',
+	'Menu:ProblemManagement+' => 'Problem Management',
+	'Menu:Problem:Shortcuts' => 'Shortcuts',
+	'Menu:FAQCategory' => 'FAQ-Kategorien',
+	'Menu:FAQCategory+' => '',
+	'Menu:FAQ' => 'FAQs',
+	'Menu:FAQ+' => '',
+	'Brick:Portal:FAQ:Menu' => 'FAQ',
+	'Brick:Portal:FAQ:Title' => 'Oft gestellte Fragen (FAQs)',
+	'Brick:Portal:FAQ:Title+' => '<p>In Eile?</p><p>Sehen Sie sich die meistgestellten Fragen an (FAQs) und finden Sie (eventuell) die Antwort direkt dort.</p>',
+));
diff --git a/datamodels/2.x/itop-faq-light/dictionaries/en.dict.itop-faq-light.php b/datamodels/2.x/itop-faq-light/dictionaries/en.dict.itop-faq-light.php
new file mode 100644
index 000000000..45531ab51
--- /dev/null
+++ b/datamodels/2.x/itop-faq-light/dictionaries/en.dict.itop-faq-light.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2018 Combodo SARL
+ * @license    http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with iTop. If not, see <http://www.gnu.org/licenses/>
+ */
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//
+// Class: FAQ
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:FAQ' => 'FAQ',
+	'Class:FAQ+' => 'Frequently asked questions',
+	'Class:FAQ/Attribute:title' => 'Title',
+	'Class:FAQ/Attribute:title+' => '',
+	'Class:FAQ/Attribute:summary' => 'Summary',
+	'Class:FAQ/Attribute:summary+' => '',
+	'Class:FAQ/Attribute:description' => 'Description',
+	'Class:FAQ/Attribute:description+' => '',
+	'Class:FAQ/Attribute:category_id' => 'Category',
+	'Class:FAQ/Attribute:category_id+' => '',
+	'Class:FAQ/Attribute:category_name' => 'Category name',
+	'Class:FAQ/Attribute:category_name+' => '',
+	'Class:FAQ/Attribute:error_code' => 'Error code',
+	'Class:FAQ/Attribute:error_code+' => '',
+	'Class:FAQ/Attribute:key_words' => 'Key words',
+	'Class:FAQ/Attribute:key_words+' => '',
+	'Class:FAQ/Attribute:domains' => 'Domains',
+));
+
+//
+// Class: FAQCategory
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:FAQCategory' => 'FAQ Category',
+	'Class:FAQCategory+' => 'Category for FAQ',
+	'Class:FAQCategory/Attribute:name' => 'Name',
+	'Class:FAQCategory/Attribute:name+' => '',
+	'Class:FAQCategory/Attribute:faq_list' => 'FAQs',
+	'Class:FAQCategory/Attribute:faq_list+' => 'All the frequently asked questions related to this category',
+));
+Dict::Add('EN US', 'English', 'English', array(
+	'Menu:ProblemManagement' => 'Problem Management',
+	'Menu:ProblemManagement+' => 'Problem Management',
+	'Menu:Problem:Shortcuts' => 'Shortcuts',
+	'Menu:FAQCategory' => 'FAQ categories',
+	'Menu:FAQCategory+' => 'All FAQ categories',
+	'Menu:FAQ' => 'FAQs',
+	'Menu:FAQ+' => 'All FAQs',
+	'Brick:Portal:FAQ:Menu' => 'FAQ',
+	'Brick:Portal:FAQ:Title' => 'Frequently Asked Questions',
+	'Brick:Portal:FAQ:Title+' => '<p>In a hurry?</p><p>Check out the list of most common questions and (maybe) find the expected answer right away.</p>',
+));
diff --git a/datamodels/2.x/itop-faq-light/dictionaries/es_cr.dict.itop-faq-light.php b/datamodels/2.x/itop-faq-light/dictionaries/es_cr.dict.itop-faq-light.php
new file mode 100644
index 000000000..a4fbb2162
--- /dev/null
+++ b/datamodels/2.x/itop-faq-light/dictionaries/es_cr.dict.itop-faq-light.php
@@ -0,0 +1,94 @@
+<?php
+// Copyright (C) 2010-2013 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2013 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ * @traductor   Miguel Turrubiates <miguel_tf@yahoo.com> 
+ */
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+//
+// Class: FAQ
+//
+
+Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+	'Class:FAQ' => 'Preguntas y Respuestas Frecuentes',
+	'Class:FAQ+' => 'Preguntas y Respuestas Frecuentes',
+	'Class:FAQ/Attribute:title' => 'Asunto',
+	'Class:FAQ/Attribute:title+' => 'Asunto',
+	'Class:FAQ/Attribute:summary' => 'Resumen',
+	'Class:FAQ/Attribute:summary+' => 'Resumen',
+	'Class:FAQ/Attribute:description' => 'Descripción',
+	'Class:FAQ/Attribute:description+' => 'Descripción',
+	'Class:FAQ/Attribute:category_id' => 'Categoría',
+	'Class:FAQ/Attribute:category_id+' => 'Categoría',
+	'Class:FAQ/Attribute:category_name' => 'Categoría',
+	'Class:FAQ/Attribute:category_name+' => 'Categoría',
+	'Class:FAQ/Attribute:error_code' => 'Código de Error',
+	'Class:FAQ/Attribute:error_code+' => 'Código de Error',
+	'Class:FAQ/Attribute:key_words' => 'Palabras Clave',
+	'Class:FAQ/Attribute:key_words+' => 'Palabras Clave',
+	'Class:FAQ/Attribute:domains' => 'Domains~~',
+));
+
+//
+// Class: FAQCategory
+//
+
+Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+	'Class:FAQCategory' => 'Categoría de Preguntas y Respuesta Frecuentes',
+	'Class:FAQCategory+' => 'Categoría de Preguntas y Respuesta Frecuentes',
+	'Class:FAQCategory/Attribute:name' => 'Nombre',
+	'Class:FAQCategory/Attribute:name+' => 'Nombre de Categoría de Preguntas y Respuestas Frecuentes',
+	'Class:FAQCategory/Attribute:faq_list' => 'FAQs',
+	'Class:FAQCategory/Attribute:faq_list+' => 'FAQs',
+));
+Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+	'Menu:ProblemManagement' => 'Gestión de problemas',
+	'Menu:ProblemManagement+' => 'Gestión de problemas',
+	'Menu:Problem:Shortcuts' => 'Acceso Rápido',
+	'Menu:FAQCategory' => 'Categorías de FAQ',
+	'Menu:FAQCategory+' => 'Categorías FAQ',
+	'Menu:FAQ' => 'Preguntas y Respuestas Frecuentes',
+	'Menu:FAQ+' => 'Preguntas y Respuestas Frecuentes',
+	'Brick:Portal:FAQ:Menu' => 'Preguntas y Respuestas',
+	'Brick:Portal:FAQ:Title' => 'Preguntas y Respuestas Frecuentes',
+	'Brick:Portal:FAQ:Title+' => '<p>¿En una prisa?</p><p>Vea la lista de las preguntas más comunes y encontrará (tal vez) la respuesta inmediata a sus necesidades.</p>',
+));
diff --git a/datamodels/2.x/itop-faq-light/dictionaries/fr.dict.itop-faq-light.php b/datamodels/2.x/itop-faq-light/dictionaries/fr.dict.itop-faq-light.php
new file mode 100644
index 000000000..e68561a95
--- /dev/null
+++ b/datamodels/2.x/itop-faq-light/dictionaries/fr.dict.itop-faq-light.php
@@ -0,0 +1,71 @@
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+//
+// Class: FAQ
+//
+
+Dict::Add('FR FR', 'French', 'Français', array(
+	'Class:FAQ' => 'FAQ',
+	'Class:FAQ+' => 'Question fréquement posée',
+	'Class:FAQ/Attribute:title' => 'Titre',
+	'Class:FAQ/Attribute:title+' => '',
+	'Class:FAQ/Attribute:summary' => 'Résumé',
+	'Class:FAQ/Attribute:summary+' => '',
+	'Class:FAQ/Attribute:description' => 'Description',
+	'Class:FAQ/Attribute:description+' => '',
+	'Class:FAQ/Attribute:category_id' => 'Categorie',
+	'Class:FAQ/Attribute:category_id+' => '',
+	'Class:FAQ/Attribute:category_name' => 'Nom catégorie',
+	'Class:FAQ/Attribute:category_name+' => '',
+	'Class:FAQ/Attribute:error_code' => 'Code d\'erreur',
+	'Class:FAQ/Attribute:error_code+' => '',
+	'Class:FAQ/Attribute:key_words' => 'Mots clés',
+	'Class:FAQ/Attribute:key_words+' => '',
+	'Class:FAQ/Attribute:domains' => 'Domaines',
+));
+
+//
+// Class: FAQCategory
+//
+
+Dict::Add('FR FR', 'French', 'Français', array(
+	'Class:FAQCategory' => 'Catégorie de FAQ',
+	'Class:FAQCategory+' => 'Catégorie de FAQ',
+	'Class:FAQCategory/Attribute:name' => 'Nom',
+	'Class:FAQCategory/Attribute:name+' => '',
+	'Class:FAQCategory/Attribute:faq_list' => 'FAQs',
+	'Class:FAQCategory/Attribute:faq_list+' => '',
+));
+
+Dict::Add('FR FR', 'French', 'Français', array(
+	'Menu:ProblemManagement' => 'Gestion des problèmes',
+	'Menu:ProblemManagement+' => 'Gestion des problèmes',
+	'Menu:Problem:Shortcuts' => 'Raccourcis',
+	'Menu:FAQCategory' => 'Catégories de FAQ',
+	'Menu:FAQCategory+' => 'Toutes les catégories de FAQ',
+	'Menu:FAQ' => 'FAQs',
+	'Menu:FAQ+' => 'Toutes les  FAQs',
+	'Brick:Portal:FAQ:Menu' => 'FAQ',
+	'Brick:Portal:FAQ:Title' => 'Foire Aux Questions',
+	'Brick:Portal:FAQ:Title+' => '<p>Vous êtes pressé&nbsp;?</p><p>Consultez la liste des questions les plus fréquentes et vous trouverez (peut-être) immédiatement la réponse à votre besoin.</p>',
+));
diff --git a/datamodels/2.x/itop-faq-light/dictionaries/hu.dict.itop-faq-light.php b/datamodels/2.x/itop-faq-light/dictionaries/hu.dict.itop-faq-light.php
new file mode 100644
index 000000000..b177c4de9
--- /dev/null
+++ b/datamodels/2.x/itop-faq-light/dictionaries/hu.dict.itop-faq-light.php
@@ -0,0 +1,71 @@
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+//
+// Class: FAQ
+//
+
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+	'Class:FAQ' => 'FAQ~~',
+	'Class:FAQ+' => 'Frequently asked questions~~',
+	'Class:FAQ/Attribute:title' => 'Title~~',
+	'Class:FAQ/Attribute:title+' => '~~',
+	'Class:FAQ/Attribute:summary' => 'Summary~~',
+	'Class:FAQ/Attribute:summary+' => '~~',
+	'Class:FAQ/Attribute:description' => 'Description~~',
+	'Class:FAQ/Attribute:description+' => '~~',
+	'Class:FAQ/Attribute:category_id' => 'Category~~',
+	'Class:FAQ/Attribute:category_id+' => '~~',
+	'Class:FAQ/Attribute:category_name' => 'Category name~~',
+	'Class:FAQ/Attribute:category_name+' => '~~',
+	'Class:FAQ/Attribute:error_code' => 'Error code~~',
+	'Class:FAQ/Attribute:error_code+' => '~~',
+	'Class:FAQ/Attribute:key_words' => 'Key words~~',
+	'Class:FAQ/Attribute:key_words+' => '~~',
+	'Class:FAQ/Attribute:domains' => 'Domains~~',
+));
+
+//
+// Class: FAQCategory
+//
+
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+	'Class:FAQCategory' => 'FAQ Category~~',
+	'Class:FAQCategory+' => 'Category for FAQ~~',
+	'Class:FAQCategory/Attribute:name' => 'Name~~',
+	'Class:FAQCategory/Attribute:name+' => '~~',
+	'Class:FAQCategory/Attribute:faq_list' => 'FAQs~~',
+	'Class:FAQCategory/Attribute:faq_list+' => 'All the frequently asked questions related to this category~~',
+));
+
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+	'Menu:ProblemManagement' => 'Probléma menedzsment',
+	'Menu:ProblemManagement+' => '',
+	'Menu:Problem:Shortcuts' => 'Gyorsmenü',
+	'Menu:FAQCategory' => 'FAQ categories~~',
+	'Menu:FAQCategory+' => 'All FAQ categories~~',
+	'Menu:FAQ' => 'FAQs~~',
+	'Menu:FAQ+' => 'All FAQs~~',
+	'Brick:Portal:FAQ:Menu' => 'FAQ~~',
+	'Brick:Portal:FAQ:Title' => 'Frequently Asked Questions~~',
+	'Brick:Portal:FAQ:Title+' => '<p>In a hurry?</p><p>Check out the list of most common questions and (maybe) find the expected answer right away.</p>~~',
+));
diff --git a/datamodels/2.x/itop-faq-light/dictionaries/it.dict.itop-faq-light.php b/datamodels/2.x/itop-faq-light/dictionaries/it.dict.itop-faq-light.php
new file mode 100644
index 000000000..d6021053d
--- /dev/null
+++ b/datamodels/2.x/itop-faq-light/dictionaries/it.dict.itop-faq-light.php
@@ -0,0 +1,94 @@
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//
+// Class: FAQ
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:FAQ' => 'FAQ',
+	'Class:FAQ+' => 'Domande frequenti',
+	'Class:FAQ/Attribute:title' => 'Titolo',
+	'Class:FAQ/Attribute:title+' => '~~',
+	'Class:FAQ/Attribute:summary' => 'Riepilogo',
+	'Class:FAQ/Attribute:summary+' => '~~',
+	'Class:FAQ/Attribute:description' => 'Descrizione',
+	'Class:FAQ/Attribute:description+' => '~~',
+	'Class:FAQ/Attribute:category_id' => 'Categoria',
+	'Class:FAQ/Attribute:category_id+' => '~~',
+	'Class:FAQ/Attribute:category_name' => 'Nome della Categoria',
+	'Class:FAQ/Attribute:category_name+' => '~~',
+	'Class:FAQ/Attribute:error_code' => 'Codice errore',
+	'Class:FAQ/Attribute:error_code+' => '~~',
+	'Class:FAQ/Attribute:key_words' => 'Parola Chiave',
+	'Class:FAQ/Attribute:key_words+' => '~~',
+	'Class:FAQ/Attribute:domains' => 'Dominio',
+));
+
+//
+// Class: FAQCategory
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:FAQCategory' => 'Fategoria FAQ',
+	'Class:FAQCategory+' => 'Categoria per FAQ',
+	'Class:FAQCategory/Attribute:name' => 'Nome',
+	'Class:FAQCategory/Attribute:name+' => '~~',
+	'Class:FAQCategory/Attribute:faq_list' => 'FAQs',
+	'Class:FAQCategory/Attribute:faq_list+' => 'Tutte le faq legate a questa categoria',
+));
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Menu:ProblemManagement' => 'Gestione dei Problemi',
+	'Menu:ProblemManagement+' => 'Gestione dei Problemi',
+	'Menu:Problem:Shortcuts' => 'Scorciatoia',
+	'Menu:FAQCategory' => 'Categoria FAQ',
+	'Menu:FAQCategory+' => 'Tutte le categorie FAQ',
+	'Menu:FAQ' => 'FAQs',
+	'Menu:FAQ+' => 'Tutte le FAQs',
+	'Brick:Portal:FAQ:Menu' => 'FAQ',
+	'Brick:Portal:FAQ:Title' => 'Domande frequenti',
+	'Brick:Portal:FAQ:Title+' => '<p>Sei di fretta?</p><p>Verifica nella lista delle FAQ se trovi la risposta al tuo problema.</p>',
+));
diff --git a/datamodels/2.x/itop-faq-light/dictionaries/ja.dict.itop-faq-light.php b/datamodels/2.x/itop-faq-light/dictionaries/ja.dict.itop-faq-light.php
new file mode 100644
index 000000000..aefcb2303
--- /dev/null
+++ b/datamodels/2.x/itop-faq-light/dictionaries/ja.dict.itop-faq-light.php
@@ -0,0 +1,71 @@
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @licence	http://opensource.org/licenses/AGPL-3.0
+ */
+
+//
+// Class: FAQ
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:FAQ' => 'FAQ',
+	'Class:FAQ+' => 'よくある質問',
+	'Class:FAQ/Attribute:title' => 'タイトル',
+	'Class:FAQ/Attribute:title+' => '',
+	'Class:FAQ/Attribute:summary' => '要約',
+	'Class:FAQ/Attribute:summary+' => '',
+	'Class:FAQ/Attribute:description' => '説明',
+	'Class:FAQ/Attribute:description+' => '',
+	'Class:FAQ/Attribute:category_id' => 'カテゴリ',
+	'Class:FAQ/Attribute:category_id+' => '',
+	'Class:FAQ/Attribute:category_name' => 'カテゴリ名',
+	'Class:FAQ/Attribute:category_name+' => '',
+	'Class:FAQ/Attribute:error_code' => 'エラーコード',
+	'Class:FAQ/Attribute:error_code+' => '',
+	'Class:FAQ/Attribute:key_words' => 'キーワード',
+	'Class:FAQ/Attribute:key_words+' => '',
+	'Class:FAQ/Attribute:domains' => 'Domains~~',
+));
+
+//
+// Class: FAQCategory
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:FAQCategory' => 'FAQカテゴリ',
+	'Class:FAQCategory+' => 'FAQのためのカテゴリ',
+	'Class:FAQCategory/Attribute:name' => '名前',
+	'Class:FAQCategory/Attribute:name+' => '',
+	'Class:FAQCategory/Attribute:faq_list' => 'FAQ',
+	'Class:FAQCategory/Attribute:faq_list+' => '',
+));
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Menu:ProblemManagement' => '問題管理',
+	'Menu:ProblemManagement+' => '問題管理',
+	'Menu:Problem:Shortcuts' => 'ショートカット',
+	'Menu:FAQCategory' => 'FAQカテゴリ',
+	'Menu:FAQCategory+' => '全てのFAQカテゴリ',
+	'Menu:FAQ' => 'FAQ',
+	'Menu:FAQ+' => '全FAQ',
+	'Brick:Portal:FAQ:Menu' => 'FAQ~~',
+	'Brick:Portal:FAQ:Title' => 'Frequently Asked Questions~~',
+	'Brick:Portal:FAQ:Title+' => '<p>In a hurry?</p><p>Check out the list of most common questions and (maybe) find the expected answer right away.</p>~~',
+));
diff --git a/datamodels/2.x/itop-faq-light/dictionaries/nl.dict.itop-faq-light.php b/datamodels/2.x/itop-faq-light/dictionaries/nl.dict.itop-faq-light.php
new file mode 100644
index 000000000..1d77c6c33
--- /dev/null
+++ b/datamodels/2.x/itop-faq-light/dictionaries/nl.dict.itop-faq-light.php
@@ -0,0 +1,100 @@
+<?php
+// Copyright (C) 2010-2019 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+ * @author	LinProfs <info@linprofs.com>
+ * 
+ * Linux & Open Source Professionals
+ * http://www.linprofs.com
+ *
+ * @author Jeffrey Bostoen - <jbostoen.itop@outlook.com> (2018 - 2020)
+ * 
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @licence	http://opensource.org/licenses/AGPL-3.0
+ */
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//
+// Class: FAQ
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:FAQ' => 'FAQ',
+	'Class:FAQ+' => 'Veelgestelde vragen',
+	'Class:FAQ/Attribute:title' => 'Titel',
+	'Class:FAQ/Attribute:title+' => '',
+	'Class:FAQ/Attribute:summary' => 'Samenvatting',
+	'Class:FAQ/Attribute:summary+' => '',
+	'Class:FAQ/Attribute:description' => 'Omschrijving',
+	'Class:FAQ/Attribute:description+' => '',
+	'Class:FAQ/Attribute:category_id' => 'Categorie',
+	'Class:FAQ/Attribute:category_id+' => '',
+	'Class:FAQ/Attribute:category_name' => 'Naam categorie',
+	'Class:FAQ/Attribute:category_name+' => '',
+	'Class:FAQ/Attribute:error_code' => 'Foutcode',
+	'Class:FAQ/Attribute:error_code+' => '',
+	'Class:FAQ/Attribute:key_words' => 'Zoektermen',
+	'Class:FAQ/Attribute:key_words+' => '',
+	'Class:FAQ/Attribute:domains' => 'Domeinen',
+));
+
+//
+// Class: FAQCategory
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:FAQCategory' => 'FAQ-categorie',
+	'Class:FAQCategory+' => 'Categorie voor de FAQ',
+	'Class:FAQCategory/Attribute:name' => 'Naam',
+	'Class:FAQCategory/Attribute:name+' => '',
+	'Class:FAQCategory/Attribute:faq_list' => 'FAQ\'s',
+	'Class:FAQCategory/Attribute:faq_list+' => 'Alle veelgestelde vragen gerelateerd aan deze categorie',
+));
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Menu:ProblemManagement' => 'Probleem Management',
+	'Menu:ProblemManagement+' => 'Probleem Management',
+	'Menu:Problem:Shortcuts' => 'Snelkoppelingen',
+	'Menu:FAQCategory' => 'FAQ-categorieën',
+	'Menu:FAQCategory+' => 'Alle FAQ-categorieën',
+	'Menu:FAQ' => 'FAQ\'s',
+	'Menu:FAQ+' => 'Alle FAQ\'s',
+	'Brick:Portal:FAQ:Menu' => 'FAQ',
+	'Brick:Portal:FAQ:Title' => 'Veelgestelde vragen',
+	'Brick:Portal:FAQ:Title+' => '<p>Gehaast?</p><p>Bekijk deze lijst van veelgestelde vragen. Misschien staat er al een antwoord tussen.</p>',
+));
diff --git a/datamodels/2.x/itop-faq-light/dictionaries/pt_br.dict.itop-faq-light.php b/datamodels/2.x/itop-faq-light/dictionaries/pt_br.dict.itop-faq-light.php
new file mode 100644
index 000000000..0bafbdd58
--- /dev/null
+++ b/datamodels/2.x/itop-faq-light/dictionaries/pt_br.dict.itop-faq-light.php
@@ -0,0 +1,95 @@
+<?php
+// Copyright (C) 2010-2018 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2018 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//
+// Class: FAQ
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:FAQ' => 'FAQ',
+	'Class:FAQ+' => 'Perguntas mais frequentes',
+	'Class:FAQ/Attribute:title' => 'Título',
+	'Class:FAQ/Attribute:title+' => '',
+	'Class:FAQ/Attribute:summary' => 'Índice',
+	'Class:FAQ/Attribute:summary+' => '',
+	'Class:FAQ/Attribute:description' => 'Descrição',
+	'Class:FAQ/Attribute:description+' => '',
+	'Class:FAQ/Attribute:category_id' => 'Categoria',
+	'Class:FAQ/Attribute:category_id+' => '',
+	'Class:FAQ/Attribute:category_name' => 'Nome categoria',
+	'Class:FAQ/Attribute:category_name+' => '',
+	'Class:FAQ/Attribute:error_code' => 'Código erro',
+	'Class:FAQ/Attribute:error_code+' => '',
+	'Class:FAQ/Attribute:key_words' => 'Palavras-chaves',
+	'Class:FAQ/Attribute:key_words+' => '',
+	'Class:FAQ/Attribute:domains' => 'Domínios',
+));
+
+//
+// Class: FAQCategory
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:FAQCategory' => 'Categoria FAQ',
+	'Class:FAQCategory+' => 'Categoria por FAQ',
+	'Class:FAQCategory/Attribute:name' => 'Nome',
+	'Class:FAQCategory/Attribute:name+' => '',
+	'Class:FAQCategory/Attribute:faq_list' => 'FAQs',
+	'Class:FAQCategory/Attribute:faq_list+' => 'Todas as perguntas mais frequentes vinculadas a essa categoria',
+));
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Menu:ProblemManagement' => 'Gerencimento Problemas',
+	'Menu:ProblemManagement+' => 'Gerencimento Problemas',
+	'Menu:Problem:Shortcuts' => 'Atalho',
+	'Menu:FAQCategory' => 'Categorias FAQ',
+	'Menu:FAQCategory+' => 'Todas categorias FAQ',
+	'Menu:FAQ' => 'FAQs',
+	'Menu:FAQ+' => 'Todas FAQs',
+	'Brick:Portal:FAQ:Menu' => 'FAQ',
+	'Brick:Portal:FAQ:Title' => 'Perguntes frequentes (FAQ)',
+	'Brick:Portal:FAQ:Title+' => '<p>Com pressa?</p><p>Confira a lista de perguntas mais comuns e (talvez) encontre a resposta esperada imediatamente.</p>',
+));
diff --git a/datamodels/2.x/itop-faq-light/dictionaries/ru.dict.itop-faq-light.php b/datamodels/2.x/itop-faq-light/dictionaries/ru.dict.itop-faq-light.php
new file mode 100644
index 000000000..43055b352
--- /dev/null
+++ b/datamodels/2.x/itop-faq-light/dictionaries/ru.dict.itop-faq-light.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Локализация интерфейса Combodo iTop подготовлена сообществом iTop по-русски http://community.itop-itsm.ru.
+ *
+ * @author      Vladimir Kunin <v.b.kunin@gmail.com>
+ * @link        http://community.itop-itsm.ru  iTop Russian Community
+ * @link        https://github.com/itop-itsm-ru/itop-rus
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ *
+ */
+
+//
+// Class: FAQ
+//
+
+Dict::Add('RU RU', 'Russian', 'Русский', array(
+	'Class:FAQ' => 'FAQ',
+	'Class:FAQ+' => 'Часто задаваемые вопросы',
+	'Class:FAQ/Attribute:title' => 'Название',
+	'Class:FAQ/Attribute:title+' => '',
+	'Class:FAQ/Attribute:summary' => 'Краткое содержание',
+	'Class:FAQ/Attribute:summary+' => '',
+	'Class:FAQ/Attribute:description' => 'Описание',
+	'Class:FAQ/Attribute:description+' => '',
+	'Class:FAQ/Attribute:category_id' => 'Категория',
+	'Class:FAQ/Attribute:category_id+' => '',
+	'Class:FAQ/Attribute:category_name' => 'Категория',
+	'Class:FAQ/Attribute:category_name+' => '',
+	'Class:FAQ/Attribute:error_code' => 'Код ошибки',
+	'Class:FAQ/Attribute:error_code+' => '',
+	'Class:FAQ/Attribute:key_words' => 'Ключевые слова',
+	'Class:FAQ/Attribute:key_words+' => '',
+	'Class:FAQ/Attribute:domains' => 'Домены',
+));
+
+//
+// Class: FAQCategory
+//
+
+Dict::Add('RU RU', 'Russian', 'Русский', array(
+	'Class:FAQCategory' => 'Категории FAQ',
+	'Class:FAQCategory+' => 'Категории FAQ',
+	'Class:FAQCategory/Attribute:name' => 'Название',
+	'Class:FAQCategory/Attribute:name+' => '',
+	'Class:FAQCategory/Attribute:faq_list' => 'FAQ',
+	'Class:FAQCategory/Attribute:faq_list+' => 'Связанные FAQ',
+));
+
+Dict::Add('RU RU', 'Russian', 'Русский', array(
+	'Menu:ProblemManagement' => 'Управление проблемами',
+	'Menu:ProblemManagement+' => 'Управление проблемами',
+	'Menu:Problem:Shortcuts' => 'Ярлыки',
+	'Menu:FAQCategory' => 'Категории FAQ',
+	'Menu:FAQCategory+' => 'Категории FAQ',
+	'Menu:FAQ' => 'FAQ',
+	'Menu:FAQ+' => 'Часто задаваемые вопросы',
+	'Brick:Portal:FAQ:Menu' => 'FAQ',
+	'Brick:Portal:FAQ:Title' => 'Часто задаваемые вопросы',
+	'Brick:Portal:FAQ:Title+' => '<p>Торопитесь?</p><p>Проверьте список часто задаваемых вопросов, возможно, ответ уже есть.</p>',
+));
diff --git a/datamodels/2.x/itop-faq-light/dictionaries/sk.dict.itop-faq-light.php b/datamodels/2.x/itop-faq-light/dictionaries/sk.dict.itop-faq-light.php
new file mode 100644
index 000000000..686fa511a
--- /dev/null
+++ b/datamodels/2.x/itop-faq-light/dictionaries/sk.dict.itop-faq-light.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2018 Combodo SARL
+ * @license	http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with iTop. If not, see <http://www.gnu.org/licenses/>
+ */
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//
+// Class: FAQ
+//
+
+Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
+	'Class:FAQ' => 'FAQ~~',
+	'Class:FAQ+' => 'Frequently asked questions~~',
+	'Class:FAQ/Attribute:title' => 'Title~~',
+	'Class:FAQ/Attribute:title+' => '~~',
+	'Class:FAQ/Attribute:summary' => 'Summary~~',
+	'Class:FAQ/Attribute:summary+' => '~~',
+	'Class:FAQ/Attribute:description' => 'Description~~',
+	'Class:FAQ/Attribute:description+' => '~~',
+	'Class:FAQ/Attribute:category_id' => 'Category~~',
+	'Class:FAQ/Attribute:category_id+' => '~~',
+	'Class:FAQ/Attribute:category_name' => 'Category name~~',
+	'Class:FAQ/Attribute:category_name+' => '~~',
+	'Class:FAQ/Attribute:error_code' => 'Error code~~',
+	'Class:FAQ/Attribute:error_code+' => '~~',
+	'Class:FAQ/Attribute:key_words' => 'Key words~~',
+	'Class:FAQ/Attribute:key_words+' => '~~',
+	'Class:FAQ/Attribute:domains' => 'Domains~~',
+));
+
+//
+// Class: FAQCategory
+//
+
+Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
+	'Class:FAQCategory' => 'FAQ Category~~',
+	'Class:FAQCategory+' => 'Category for FAQ~~',
+	'Class:FAQCategory/Attribute:name' => 'Name~~',
+	'Class:FAQCategory/Attribute:name+' => '~~',
+	'Class:FAQCategory/Attribute:faq_list' => 'FAQs~~',
+	'Class:FAQCategory/Attribute:faq_list+' => 'All the frequently asked questions related to this category~~',
+));
+
+Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
+	'Menu:ProblemManagement' => 'Problem Management~~',
+	'Menu:ProblemManagement+' => 'Problem Management~~',
+	'Menu:Problem:Shortcuts' => 'Shortcuts~~',
+	'Menu:FAQCategory' => 'FAQ categories~~',
+	'Menu:FAQCategory+' => 'All FAQ categories~~',
+	'Menu:FAQ' => 'FAQs~~',
+	'Menu:FAQ+' => 'All FAQs~~',
+	'Brick:Portal:FAQ:Menu' => 'FAQ~~',
+	'Brick:Portal:FAQ:Title' => 'Frequently Asked Questions~~',
+	'Brick:Portal:FAQ:Title+' => '<p>In a hurry?</p><p>Check out the list of most common questions and (maybe) find the expected answer right away.</p>~~',
+));
diff --git a/datamodels/2.x/itop-faq-light/dictionaries/tr.dict.itop-faq-light.php b/datamodels/2.x/itop-faq-light/dictionaries/tr.dict.itop-faq-light.php
new file mode 100644
index 000000000..1289b4374
--- /dev/null
+++ b/datamodels/2.x/itop-faq-light/dictionaries/tr.dict.itop-faq-light.php
@@ -0,0 +1,96 @@
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+ * Localized data
+ *
+ * @author      Izzet Sirin <izzet.sirin@htr.com.tr>
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//
+// Class: FAQ
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:FAQ' => 'FAQ~~',
+	'Class:FAQ+' => 'Frequently asked questions~~',
+	'Class:FAQ/Attribute:title' => 'Title~~',
+	'Class:FAQ/Attribute:title+' => '~~',
+	'Class:FAQ/Attribute:summary' => 'Summary~~',
+	'Class:FAQ/Attribute:summary+' => '~~',
+	'Class:FAQ/Attribute:description' => 'Description~~',
+	'Class:FAQ/Attribute:description+' => '~~',
+	'Class:FAQ/Attribute:category_id' => 'Category~~',
+	'Class:FAQ/Attribute:category_id+' => '~~',
+	'Class:FAQ/Attribute:category_name' => 'Category name~~',
+	'Class:FAQ/Attribute:category_name+' => '~~',
+	'Class:FAQ/Attribute:error_code' => 'Error code~~',
+	'Class:FAQ/Attribute:error_code+' => '~~',
+	'Class:FAQ/Attribute:key_words' => 'Key words~~',
+	'Class:FAQ/Attribute:key_words+' => '~~',
+	'Class:FAQ/Attribute:domains' => 'Domains~~',
+));
+
+//
+// Class: FAQCategory
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:FAQCategory' => 'FAQ Category~~',
+	'Class:FAQCategory+' => 'Category for FAQ~~',
+	'Class:FAQCategory/Attribute:name' => 'Name~~',
+	'Class:FAQCategory/Attribute:name+' => '~~',
+	'Class:FAQCategory/Attribute:faq_list' => 'FAQs~~',
+	'Class:FAQCategory/Attribute:faq_list+' => 'All the frequently asked questions related to this category~~',
+));
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Menu:ProblemManagement' => 'Problem Yönetimi',
+	'Menu:ProblemManagement+' => 'Problem Yönetimi',
+	'Menu:Problem:Shortcuts' => 'Kısayollar',
+	'Menu:FAQCategory' => 'FAQ categories~~',
+	'Menu:FAQCategory+' => 'All FAQ categories~~',
+	'Menu:FAQ' => 'FAQs~~',
+	'Menu:FAQ+' => 'All FAQs~~',
+	'Brick:Portal:FAQ:Menu' => 'FAQ~~',
+	'Brick:Portal:FAQ:Title' => 'Frequently Asked Questions~~',
+	'Brick:Portal:FAQ:Title+' => '<p>In a hurry?</p><p>Check out the list of most common questions and (maybe) find the expected answer right away.</p>~~',
+));
diff --git a/datamodels/2.x/itop-faq-light/dictionaries/zh_cn.dict.itop-faq-light.php b/datamodels/2.x/itop-faq-light/dictionaries/zh_cn.dict.itop-faq-light.php
new file mode 100644
index 000000000..4de29fc63
--- /dev/null
+++ b/datamodels/2.x/itop-faq-light/dictionaries/zh_cn.dict.itop-faq-light.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2018 Combodo SARL
+ * @license    http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with iTop. If not, see <http://www.gnu.org/licenses/>
+ */
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//
+// Class: FAQ
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:FAQ' => 'FAQ',
+	'Class:FAQ+' => 'FAQ',
+	'Class:FAQ/Attribute:title' => '标题',
+	'Class:FAQ/Attribute:title+' => '',
+	'Class:FAQ/Attribute:summary' => '概要',
+	'Class:FAQ/Attribute:summary+' => '',
+	'Class:FAQ/Attribute:description' => '描述',
+	'Class:FAQ/Attribute:description+' => '',
+	'Class:FAQ/Attribute:category_id' => '类别',
+	'Class:FAQ/Attribute:category_id+' => '',
+	'Class:FAQ/Attribute:category_name' => '类别名称',
+	'Class:FAQ/Attribute:category_name+' => '',
+	'Class:FAQ/Attribute:error_code' => '错误代码',
+	'Class:FAQ/Attribute:error_code+' => '',
+	'Class:FAQ/Attribute:key_words' => '关键字',
+	'Class:FAQ/Attribute:key_words+' => '',
+	'Class:FAQ/Attribute:domains' => 'Domains~~',
+));
+
+//
+// Class: FAQCategory
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:FAQCategory' => 'FAQ 类别',
+	'Class:FAQCategory+' => 'FAQ 类别',
+	'Class:FAQCategory/Attribute:name' => '名称',
+	'Class:FAQCategory/Attribute:name+' => '',
+	'Class:FAQCategory/Attribute:faq_list' => 'FAQ',
+	'Class:FAQCategory/Attribute:faq_list+' => '该类别FAQ 相关的所有常见问题',
+));
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Menu:ProblemManagement' => '问题管理',
+	'Menu:ProblemManagement+' => '问题管理',
+	'Menu:Problem:Shortcuts' => '快捷方式',
+	'Menu:FAQCategory' => 'FAQ 类别',
+	'Menu:FAQCategory+' => '所有FAQ 类别',
+	'Menu:FAQ' => 'FAQ',
+	'Menu:FAQ+' => '所有FAQ',
+	'Brick:Portal:FAQ:Menu' => 'FAQ',
+	'Brick:Portal:FAQ:Title' => 'FAQ',
+	'Brick:Portal:FAQ:Title+' => '<p>需要帮助?</p><p>查阅列表中的常见问题,或许可以立即找到令您满意的答案.</p>',
+));
diff --git a/datamodels/2.x/itop-knownerror-mgmt/images/faq.png b/datamodels/2.x/itop-faq-light/images/faq.png
similarity index 100%
rename from datamodels/2.x/itop-knownerror-mgmt/images/faq.png
rename to datamodels/2.x/itop-faq-light/images/faq.png
diff --git a/datamodels/2.x/itop-knownerror-mgmt/module.itop-knownerror-mgmt.php b/datamodels/2.x/itop-faq-light/module.itop-faq-light.php
similarity index 93%
rename from datamodels/2.x/itop-knownerror-mgmt/module.itop-knownerror-mgmt.php
rename to datamodels/2.x/itop-faq-light/module.itop-faq-light.php
index 1c8217a0f..5b27be69c 100755
--- a/datamodels/2.x/itop-knownerror-mgmt/module.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-faq-light/module.itop-faq-light.php
@@ -3,18 +3,17 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-knownerror-mgmt/2.8.0',
+	'itop-faq-light/2.8.0',
 	array(
 		// Identification
 		//
-		'label' => 'Known Errors Database',
+		'label' => 'Frequently Asked Questions Database',
 		'category' => 'business',
 
 		// Setup
 		//
 		'dependencies' => array(
-			'itop-config-mgmt/2.2.0',
-			'itop-tickets/2.3.0',
+			'itop-structure/2.7.0',
 		),
 		'mandatory' => false,
 		'visible' => true,
@@ -23,7 +22,7 @@ SetupWebPage::AddModule(
 		// Components
 		//
 		'datamodel' => array(
-			'model.itop-knownerror-mgmt.php',
+			'model.itop-faq-light.php',
 		),
 		'data.struct' => array(
 			//'data.struct.itop-knownerror-mgmt.xml',
diff --git a/datamodels/2.x/itop-knownerror-mgmt/datamodel.itop-knownerror-mgmt.xml b/datamodels/2.x/itop-knownerror-light/datamodel.itop-knownerror-light.xml
similarity index 58%
rename from datamodels/2.x/itop-knownerror-mgmt/datamodel.itop-knownerror-mgmt.xml
rename to datamodels/2.x/itop-knownerror-light/datamodel.itop-knownerror-light.xml
index 956a2b88c..e93b98a2a 100755
--- a/datamodels/2.x/itop-knownerror-mgmt/datamodel.itop-knownerror-mgmt.xml
+++ b/datamodels/2.x/itop-knownerror-light/datamodel.itop-knownerror-light.xml
@@ -399,209 +399,6 @@
         </list>
       </presentation>
     </class>
-    <class id="FAQ" _delta="define">
-      <parent>cmdbAbstractObject</parent>
-      <properties>
-        <category>bizmodel,searchable,knownerrormgmt</category>
-        <abstract>false</abstract>
-        <key_type>autoincrement</key_type>
-        <db_table>faq</db_table>
-        <db_key_field>id</db_key_field>
-        <db_final_class_field/>
-        <naming>
-          <attributes>
-            <attribute id="title"/>
-          </attributes>
-        </naming>
-        <display_template/>
-        <icon>images/faq.png</icon>
-        <reconciliation>
-          <attributes>
-            <attribute id="title"/>
-          </attributes>
-        </reconciliation>
-      </properties>
-      <fields>
-        <field id="title" xsi:type="AttributeString">
-          <sql>title</sql>
-          <default_value/>
-          <is_null_allowed>false</is_null_allowed>
-        </field>
-        <field id="summary" xsi:type="AttributeText">
-          <sql>summary</sql>
-          <default_value/>
-          <is_null_allowed>true</is_null_allowed>
-        </field>
-        <field id="description" xsi:type="AttributeHTML">
-          <sql>description</sql>
-          <default_value/>
-          <is_null_allowed>true</is_null_allowed>
-        </field>
-        <field id="category_id" xsi:type="AttributeExternalKey">
-          <sql>category_id</sql>
-          <target_class>FAQCategory</target_class>
-          <is_null_allowed>false</is_null_allowed>
-          <on_target_delete>DEL_MANUAL</on_target_delete>
-        </field>
-        <field id="category_name" xsi:type="AttributeExternalField">
-          <extkey_attcode>category_id</extkey_attcode>
-          <target_attcode>name</target_attcode>
-        </field>
-        <field id="error_code" xsi:type="AttributeString">
-          <sql>error_code</sql>
-          <default_value/>
-          <is_null_allowed>true</is_null_allowed>
-        </field>
-        <field id="key_words" xsi:type="AttributeString">
-          <sql>key_words</sql>
-          <default_value/>
-          <is_null_allowed>true</is_null_allowed>
-        </field>
-        <field id="domains" xsi:type="AttributeTagSet">
-          <sql>domains</sql>
-          <is_null_allowed>true</is_null_allowed>
-          <tracking_level>all</tracking_level>
-          <max_items>12</max_items>
-        </field>
-      </fields>
-      <methods/>
-      <presentation>
-        <details>
-          <items>
-            <item id="category_id">
-              <rank>10</rank>
-            </item>
-            <item id="title">
-              <rank>20</rank>
-            </item>
-            <item id="error_code">
-              <rank>30</rank>
-            </item>
-            <item id="key_words">
-              <rank>40</rank>
-            </item>
-            <item id="domains">
-              <rank>50</rank>
-            </item>
-            <item id="summary">
-              <rank>60</rank>
-            </item>
-            <item id="description">
-              <rank>70</rank>
-            </item>
-          </items>
-        </details>
-        <search>
-          <items>
-            <item id="category_id">
-              <rank>10</rank>
-            </item>
-            <item id="title">
-              <rank>20</rank>
-            </item>
-            <item id="summary">
-              <rank>30</rank>
-            </item>
-            <item id="error_code">
-              <rank>40</rank>
-            </item>
-            <item id="domains">
-              <rank>50</rank>
-            </item>
-          </items>
-        </search>
-        <default_search>
-          <items>
-            <item id="title">
-              <rank>10</rank>
-            </item>
-            <item id="summary">
-              <rank>20</rank>
-            </item>
-            <item id="category_id">
-              <rank>30</rank>
-            </item>
-          </items>
-        </default_search>
-        <list>
-          <items>
-            <item id="category_id">
-              <rank>10</rank>
-            </item>
-            <item id="error_code">
-              <rank>20</rank>
-            </item>
-            <item id="domains">
-              <rank>30</rank>
-            </item>
-          </items>
-        </list>
-      </presentation>
-    </class>
-    <class id="FAQCategory" _delta="define">
-      <parent>cmdbAbstractObject</parent>
-      <properties>
-        <category>bizmodel,searchable,knownerrormgmt</category>
-        <abstract>false</abstract>
-        <key_type>autoincrement</key_type>
-        <db_table>faqcategory</db_table>
-        <db_key_field>id</db_key_field>
-        <db_final_class_field/>
-        <naming>
-          <attributes>
-            <attribute id="name"/>
-          </attributes>
-        </naming>
-        <display_template/>
-        <icon/>
-        <reconciliation>
-          <attributes>
-            <attribute id="name"/>
-          </attributes>
-        </reconciliation>
-      </properties>
-      <fields>
-        <field id="name" xsi:type="AttributeString">
-          <sql>nam</sql>
-          <default_value/>
-          <is_null_allowed>false</is_null_allowed>
-        </field>
-        <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>
-          <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="faq_list">
-              <rank>20</rank>
-            </item>
-          </items>
-        </details>
-        <search>
-          <items>
-            <item id="name">
-              <rank>10</rank>
-            </item>
-          </items>
-        </search>
-        <default_search>
-          <items>
-            <item id="name">
-              <rank>10</rank>
-            </item>
-          </items>
-        </default_search>
-      </presentation>
-    </class>
   </classes>
   <menus>
     <menu id="ProblemManagement" xsi:type="MenuGroup" _delta="define_if_not_exists">
@@ -628,125 +425,5 @@
       <oql>SELECT KnownError</oql>
       <do_search>1</do_search>
     </menu>
-    <menu id="FAQCategory" xsi:type="OQLMenuNode" _delta="define">
-      <rank>4.5</rank>
-      <parent>Problem:Shortcuts</parent>
-      <oql>SELECT FAQCategory</oql>
-      <do_search>1</do_search>
-    </menu>
-    <menu id="FAQ" xsi:type="OQLMenuNode" _delta="define">
-      <rank>6</rank>
-      <parent>Problem:Shortcuts</parent>
-      <oql>SELECT FAQ</oql>
-      <do_search>1</do_search>
-    </menu>
   </menus>
-  <module_designs>
-    <module_design id="itop-portal" xsi:type="portal">
-      <bricks>
-        <brick id="faq" xsi:type="Combodo\iTop\Portal\Brick\BrowseBrick" _delta="define">
-          <active>true</active>
-          <rank>
-			  <default>40</default>
-		  </rank>
-          <width>12</width>
-			<title>
-              <navigation_menu>Brick:Portal:FAQ:Menu</navigation_menu>
-			  <home>Brick:Portal:FAQ:Title</home>
-			</title>
-			<description>Brick:Portal:FAQ:Title+</description>
-			<decoration_class>
-				<default>fc fc-life-saver fc-2x</default>
-			</decoration_class>
-          <levels>
-            <level id="1">
-              <class>FAQCategory</class>
-              <parent_att/>
-              <name_att/>
-              <tooltip_att/>
-              <title>Class:FAQCategory</title>
-              <actions/>
-              <levels>
-                <level id="1">
-                  <class>FAQ</class>
-                  <parent_att>category_id</parent_att>
-                  <name_att>title</name_att>
-                  <tooltip_att>summary</tooltip_att>
-                  <title>Class:FAQ</title>
-                  <fields>
-                    <field id="error_code"/>
-					<field id="domains"/>
-					<field id="key_words">
-						<hidden>true</hidden>
-					</field>
-                  </fields>
-                  <actions>
-                    <action id="view" xsi:type="view"/>
-                  </actions>
-                  <levels/>
-                </level>
-              </levels>
-            </level>
-          </levels>
-          <browse_modes>
-            <availables>
-              <mode id="list"/>
-              <mode id="tree"/>
-            </availables>
-            <default>list</default>
-          </browse_modes>
-          <data_loading>full</data_loading>
-        </brick>
-      </bricks>
-      <forms>
-        <form id="faq" _delta="define">
-          <class>FAQ</class>
-          <!-- fields tag is optional. If not specified, attributes from zlist "details" will be choose as default -->
-          <fields>
-            <field id="category_name"/>
-            <field id="title"/>
-            <field id="error_code"/>
-            <field id="key_words"/>
-            <field id="domains"/>
-            <field id="summary"/>
-            <field id="description"/>
-          </fields>
-          <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>
-              <div class="col-sm-8">
-                <div class="form_field" data-field-id="description"></div>
-              </div>
-            </div>
-          </twig>
-          <modes>
-            <mode id="view"/>
-          </modes>
-        </form>
-      </forms>
-      <classes>
-        <class id="FAQCategory" _delta="define">
-          <scopes>
-            <scope id="all">
-              <oql_view><![CDATA[SELECT FAQCategory]]></oql_view>
-            </scope>
-          </scopes>
-        </class>
-        <class id="FAQ" _delta="define">
-          <scopes>
-            <scope id="all">
-              <oql_view><![CDATA[SELECT FAQ]]></oql_view>
-            </scope>
-          </scopes>
-        </class>
-      </classes>
-    </module_design>
-  </module_designs>
 </itop_design>
diff --git a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/cs.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-light/dictionaries/cs.dict.itop-knownerror-light.php
similarity index 80%
rename from datamodels/2.x/itop-knownerror-mgmt/dictionaries/cs.dict.itop-knownerror-mgmt.php
rename to datamodels/2.x/itop-knownerror-light/dictionaries/cs.dict.itop-knownerror-light.php
index 2023a8807..8e2fd0e48 100644
--- a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/cs.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-light/dictionaries/cs.dict.itop-knownerror-light.php
@@ -131,42 +131,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:lnkDocumentToError/Attribute:link_type+' => '',
 ));
 
-//
-// Class: FAQ
-//
-
-Dict::Add('CS CZ', 'Czech', 'Čeština', array(
-	'Class:FAQ' => 'FAQ',
-	'Class:FAQ+' => 'Často kladené dotazy',
-	'Class:FAQ/Attribute:title' => 'Název',
-	'Class:FAQ/Attribute:title+' => '',
-	'Class:FAQ/Attribute:summary' => 'Shrnutí',
-	'Class:FAQ/Attribute:summary+' => '',
-	'Class:FAQ/Attribute:description' => 'Popis',
-	'Class:FAQ/Attribute:description+' => '',
-	'Class:FAQ/Attribute:category_id' => 'Kategorie',
-	'Class:FAQ/Attribute:category_id+' => '',
-	'Class:FAQ/Attribute:category_name' => 'Název kategorie',
-	'Class:FAQ/Attribute:category_name+' => '',
-	'Class:FAQ/Attribute:error_code' => 'Kód chyby',
-	'Class:FAQ/Attribute:error_code+' => '',
-	'Class:FAQ/Attribute:key_words' => 'Klíčová slova',
-	'Class:FAQ/Attribute:key_words+' => '',
-	'Class:FAQ/Attribute:domains' => 'Domains~~',
-));
-
-//
-// Class: FAQCategory
-//
-
-Dict::Add('CS CZ', 'Czech', 'Čeština', array(
-	'Class:FAQCategory' => 'Kategorie FAQ',
-	'Class:FAQCategory+' => 'Kategorie pro FAQ',
-	'Class:FAQCategory/Attribute:name' => 'Název',
-	'Class:FAQCategory/Attribute:name+' => '',
-	'Class:FAQCategory/Attribute:faq_list' => 'FAQ',
-	'Class:FAQCategory/Attribute:faq_list+' => 'Všechny často kladené dotazy v této kategorii',
-));
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Menu:ProblemManagement' => 'Správa problémů',
 	'Menu:ProblemManagement+' => 'Správa problémů',
@@ -177,12 +141,4 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Menu:SearchError+' => 'Hledat známé chyby',
 	'Menu:Problem:KnownErrors' => 'Všechny známé chyby',
 	'Menu:Problem:KnownErrors+' => 'Všechny známé chyby',
-	'Menu:FAQCategory' => 'Kategorie FAQ',
-	'Menu:FAQCategory+' => '',
-	'Menu:FAQ' => 'FAQ',
-	'Menu:FAQ+' => 'FAQ - Často kladené dotazy',
-
-	'Brick:Portal:FAQ:Menu' => 'FAQ',
-	'Brick:Portal:FAQ:Title' => 'Často kladené dotazy (FAQ)',
-	'Brick:Portal:FAQ:Title+' => '<p>Spěcháte?</p><p>Podívejte se na seznam nejčastějších otázek a (možná) najdete hledanou odpověď ihned.</p>',
 ));
diff --git a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/da.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-light/dictionaries/da.dict.itop-knownerror-light.php
similarity index 77%
rename from datamodels/2.x/itop-knownerror-mgmt/dictionaries/da.dict.itop-knownerror-mgmt.php
rename to datamodels/2.x/itop-knownerror-light/dictionaries/da.dict.itop-knownerror-light.php
index ea5e3871b..1b8cead5d 100644
--- a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/da.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-light/dictionaries/da.dict.itop-knownerror-light.php
@@ -103,42 +103,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:lnkDocumentToError/Attribute:link_type+' => '',
 ));
 
-//
-// Class: FAQ
-//
-
-Dict::Add('DA DA', 'Danish', 'Dansk', array(
-	'Class:FAQ' => 'FAQ',
-	'Class:FAQ+' => '',
-	'Class:FAQ/Attribute:title' => 'Titel',
-	'Class:FAQ/Attribute:title+' => '',
-	'Class:FAQ/Attribute:summary' => 'Sammenfatning',
-	'Class:FAQ/Attribute:summary+' => '',
-	'Class:FAQ/Attribute:description' => 'Beskrivelse',
-	'Class:FAQ/Attribute:description+' => '',
-	'Class:FAQ/Attribute:category_id' => 'Kategori',
-	'Class:FAQ/Attribute:category_id+' => '',
-	'Class:FAQ/Attribute:category_name' => 'Kategorinavn',
-	'Class:FAQ/Attribute:category_name+' => '',
-	'Class:FAQ/Attribute:error_code' => 'Fejlkode',
-	'Class:FAQ/Attribute:error_code+' => '',
-	'Class:FAQ/Attribute:key_words' => 'Nøgleord',
-	'Class:FAQ/Attribute:key_words+' => '',
-	'Class:FAQ/Attribute:domains' => 'Domains~~',
-));
-
-//
-// Class: FAQCategory
-//
-
-Dict::Add('DA DA', 'Danish', 'Dansk', array(
-	'Class:FAQCategory' => 'FAQ-Kategori',
-	'Class:FAQCategory+' => '',
-	'Class:FAQCategory/Attribute:name' => 'Navn',
-	'Class:FAQCategory/Attribute:name+' => '',
-	'Class:FAQCategory/Attribute:faq_list' => 'FAQs',
-	'Class:FAQCategory/Attribute:faq_list+' => '',
-));
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Menu:ProblemManagement' => 'Problem Management',
 	'Menu:ProblemManagement+' => 'Problem Management',
@@ -149,12 +113,4 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Menu:SearchError+' => '',
 	'Menu:Problem:KnownErrors' => 'Alle kendte Fejl',
 	'Menu:Problem:KnownErrors+' => 'Alle kendte Fejl',
-	'Menu:FAQCategory' => 'FAQ-Kategorier',
-	'Menu:FAQCategory+' => '',
-	'Menu:FAQ' => 'FAQs',
-	'Menu:FAQ+' => '',
-
-	'Brick:Portal:FAQ:Menu' => 'FAQ~~',
-	'Brick:Portal:FAQ:Title' => 'Frequently Asked Questions~~',
-	'Brick:Portal:FAQ:Title+' => '<p>In a hurry?</p><p>Check out the list of most common questions and (maybe) find the expected answer right away.</p>~~',
 ));
diff --git a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/de.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-light/dictionaries/de.dict.itop-knownerror-light.php
similarity index 77%
rename from datamodels/2.x/itop-knownerror-mgmt/dictionaries/de.dict.itop-knownerror-mgmt.php
rename to datamodels/2.x/itop-knownerror-light/dictionaries/de.dict.itop-knownerror-light.php
index 746080013..33fd5a659 100644
--- a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/de.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-light/dictionaries/de.dict.itop-knownerror-light.php
@@ -105,42 +105,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkDocumentToError/Attribute:link_type+' => '',
 ));
 
-//
-// Class: FAQ
-//
-
-Dict::Add('DE DE', 'German', 'Deutsch', array(
-	'Class:FAQ' => 'FAQ',
-	'Class:FAQ+' => '',
-	'Class:FAQ/Attribute:title' => 'Titel',
-	'Class:FAQ/Attribute:title+' => '',
-	'Class:FAQ/Attribute:summary' => 'Zusammenfassung',
-	'Class:FAQ/Attribute:summary+' => '',
-	'Class:FAQ/Attribute:description' => 'Beschreibung',
-	'Class:FAQ/Attribute:description+' => '',
-	'Class:FAQ/Attribute:category_id' => 'Kategorie',
-	'Class:FAQ/Attribute:category_id+' => '',
-	'Class:FAQ/Attribute:category_name' => 'Kategoriename',
-	'Class:FAQ/Attribute:category_name+' => '',
-	'Class:FAQ/Attribute:error_code' => 'Fehlercode',
-	'Class:FAQ/Attribute:error_code+' => '',
-	'Class:FAQ/Attribute:key_words' => 'Schlüsselwörter',
-	'Class:FAQ/Attribute:key_words+' => '',
-	'Class:FAQ/Attribute:domains' => 'Domäne',
-));
-
-//
-// Class: FAQCategory
-//
-
-Dict::Add('DE DE', 'German', 'Deutsch', array(
-	'Class:FAQCategory' => 'FAQ-Kategorie',
-	'Class:FAQCategory+' => '',
-	'Class:FAQCategory/Attribute:name' => 'Name',
-	'Class:FAQCategory/Attribute:name+' => '',
-	'Class:FAQCategory/Attribute:faq_list' => 'FAQs',
-	'Class:FAQCategory/Attribute:faq_list+' => '',
-));
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Menu:ProblemManagement' => 'Problem Management',
 	'Menu:ProblemManagement+' => 'Problem Management',
@@ -151,12 +115,4 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Menu:SearchError+' => '',
 	'Menu:Problem:KnownErrors' => 'Alle Known Errors',
 	'Menu:Problem:KnownErrors+' => 'Alle Known Errors',
-	'Menu:FAQCategory' => 'FAQ-Kategorien',
-	'Menu:FAQCategory+' => '',
-	'Menu:FAQ' => 'FAQs',
-	'Menu:FAQ+' => '',
-
-	'Brick:Portal:FAQ:Menu' => 'FAQ',
-	'Brick:Portal:FAQ:Title' => 'Oft gestellte Fragen (FAQs)',
-	'Brick:Portal:FAQ:Title+' => '<p>In Eile?</p><p>Sehen Sie sich die meistgestellten Fragen an (FAQs) und finden Sie (eventuell) die Antwort direkt dort.</p>',
 ));
diff --git a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/en.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-light/dictionaries/en.dict.itop-knownerror-light.php
similarity index 79%
rename from datamodels/2.x/itop-knownerror-mgmt/dictionaries/en.dict.itop-knownerror-mgmt.php
rename to datamodels/2.x/itop-knownerror-light/dictionaries/en.dict.itop-knownerror-light.php
index 64fc0b15c..7f44bdd45 100644
--- a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/en.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-light/dictionaries/en.dict.itop-knownerror-light.php
@@ -133,42 +133,6 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:lnkDocumentToError/Attribute:link_type+' => '',
 ));
 
-//
-// Class: FAQ
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:FAQ' => 'FAQ',
-	'Class:FAQ+' => 'Frequently asked questions',
-	'Class:FAQ/Attribute:title' => 'Title',
-	'Class:FAQ/Attribute:title+' => '',
-	'Class:FAQ/Attribute:summary' => 'Summary',
-	'Class:FAQ/Attribute:summary+' => '',
-	'Class:FAQ/Attribute:description' => 'Description',
-	'Class:FAQ/Attribute:description+' => '',
-	'Class:FAQ/Attribute:category_id' => 'Category',
-	'Class:FAQ/Attribute:category_id+' => '',
-	'Class:FAQ/Attribute:category_name' => 'Category name',
-	'Class:FAQ/Attribute:category_name+' => '',
-	'Class:FAQ/Attribute:error_code' => 'Error code',
-	'Class:FAQ/Attribute:error_code+' => '',
-	'Class:FAQ/Attribute:key_words' => 'Key words',
-	'Class:FAQ/Attribute:key_words+' => '',
-	'Class:FAQ/Attribute:domains' => 'Domains',
-));
-
-//
-// Class: FAQCategory
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:FAQCategory' => 'FAQ Category',
-	'Class:FAQCategory+' => 'Category for FAQ',
-	'Class:FAQCategory/Attribute:name' => 'Name',
-	'Class:FAQCategory/Attribute:name+' => '',
-	'Class:FAQCategory/Attribute:faq_list' => 'FAQs',
-	'Class:FAQCategory/Attribute:faq_list+' => 'All the frequently asked questions related to this category',
-));
 Dict::Add('EN US', 'English', 'English', array(
 	'Menu:ProblemManagement' => 'Problem Management',
 	'Menu:ProblemManagement+' => 'Problem Management',
@@ -179,12 +143,4 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Menu:SearchError+' => 'Search for known errors',
 	'Menu:Problem:KnownErrors' => 'All known errors',
 	'Menu:Problem:KnownErrors+' => 'All known errors',
-	'Menu:FAQCategory' => 'FAQ categories',
-	'Menu:FAQCategory+' => 'All FAQ categories',
-	'Menu:FAQ' => 'FAQs',
-	'Menu:FAQ+' => 'All FAQs',
-
-	'Brick:Portal:FAQ:Menu' => 'FAQ',
-	'Brick:Portal:FAQ:Title' => 'Frequently Asked Questions',
-	'Brick:Portal:FAQ:Title+' => '<p>In a hurry?</p><p>Check out the list of most common questions and (maybe) find the expected answer right away.</p>',
 ));
diff --git a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/es_cr.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-light/dictionaries/es_cr.dict.itop-knownerror-light.php
similarity index 78%
rename from datamodels/2.x/itop-knownerror-mgmt/dictionaries/es_cr.dict.itop-knownerror-mgmt.php
rename to datamodels/2.x/itop-knownerror-light/dictionaries/es_cr.dict.itop-knownerror-light.php
index bedde5d2b..d362a9add 100644
--- a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/es_cr.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-light/dictionaries/es_cr.dict.itop-knownerror-light.php
@@ -130,42 +130,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'Class:lnkDocumentToError/Attribute:link_type+' => 'Tipo',
 ));
 
-//
-// Class: FAQ
-//
-
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
-	'Class:FAQ' => 'Preguntas y Respuestas Frecuentes',
-	'Class:FAQ+' => 'Preguntas y Respuestas Frecuentes',
-	'Class:FAQ/Attribute:title' => 'Asunto',
-	'Class:FAQ/Attribute:title+' => 'Asunto',
-	'Class:FAQ/Attribute:summary' => 'Resumen',
-	'Class:FAQ/Attribute:summary+' => 'Resumen',
-	'Class:FAQ/Attribute:description' => 'Descripción',
-	'Class:FAQ/Attribute:description+' => 'Descripción',
-	'Class:FAQ/Attribute:category_id' => 'Categoría',
-	'Class:FAQ/Attribute:category_id+' => 'Categoría',
-	'Class:FAQ/Attribute:category_name' => 'Categoría',
-	'Class:FAQ/Attribute:category_name+' => 'Categoría',
-	'Class:FAQ/Attribute:error_code' => 'Código de Error',
-	'Class:FAQ/Attribute:error_code+' => 'Código de Error',
-	'Class:FAQ/Attribute:key_words' => 'Palabras Clave',
-	'Class:FAQ/Attribute:key_words+' => 'Palabras Clave',
-	'Class:FAQ/Attribute:domains' => 'Domains~~',
-));
-
-//
-// Class: FAQCategory
-//
-
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
-	'Class:FAQCategory' => 'Categoría de Preguntas y Respuesta Frecuentes',
-	'Class:FAQCategory+' => 'Categoría de Preguntas y Respuesta Frecuentes',
-	'Class:FAQCategory/Attribute:name' => 'Nombre',
-	'Class:FAQCategory/Attribute:name+' => 'Nombre de Categoría de Preguntas y Respuestas Frecuentes',
-	'Class:FAQCategory/Attribute:faq_list' => 'FAQs',
-	'Class:FAQCategory/Attribute:faq_list+' => 'FAQs',
-));
 Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'Menu:ProblemManagement' => 'Gestión de problemas',
 	'Menu:ProblemManagement+' => 'Gestión de problemas',
@@ -176,12 +140,4 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'Menu:SearchError+' => 'Búsqueda de Errores Conocidos',
 	'Menu:Problem:KnownErrors' => 'Errores Conocidos',
 	'Menu:Problem:KnownErrors+' => 'Errores Conocidos',
-	'Menu:FAQCategory' => 'Categorías de FAQ',
-	'Menu:FAQCategory+' => 'Categorías FAQ',
-	'Menu:FAQ' => 'Preguntas y Respuestas Frecuentes',
-	'Menu:FAQ+' => 'Preguntas y Respuestas Frecuentes',
-
-	'Brick:Portal:FAQ:Menu' => 'Preguntas y Respuestas',
-	'Brick:Portal:FAQ:Title' => 'Preguntas y Respuestas Frecuentes',
-	'Brick:Portal:FAQ:Title+' => '<p>¿En una prisa?</p><p>Vea la lista de las preguntas más comunes y encontrará (tal vez) la respuesta inmediata a sus necesidades.</p>',
 ));
diff --git a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/fr.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-light/dictionaries/fr.dict.itop-knownerror-light.php
similarity index 76%
rename from datamodels/2.x/itop-knownerror-mgmt/dictionaries/fr.dict.itop-knownerror-mgmt.php
rename to datamodels/2.x/itop-knownerror-light/dictionaries/fr.dict.itop-knownerror-light.php
index e45929d70..59145fb96 100644
--- a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/fr.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-light/dictionaries/fr.dict.itop-knownerror-light.php
@@ -105,42 +105,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:lnkDocumentToError/Attribute:link_type+' => '',
 ));
 
-//
-// Class: FAQ
-//
-
-Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:FAQ' => 'FAQ',
-	'Class:FAQ+' => 'Question fréquement posée',
-	'Class:FAQ/Attribute:title' => 'Titre',
-	'Class:FAQ/Attribute:title+' => '',
-	'Class:FAQ/Attribute:summary' => 'Résumé',
-	'Class:FAQ/Attribute:summary+' => '',
-	'Class:FAQ/Attribute:description' => 'Description',
-	'Class:FAQ/Attribute:description+' => '',
-	'Class:FAQ/Attribute:category_id' => 'Categorie',
-	'Class:FAQ/Attribute:category_id+' => '',
-	'Class:FAQ/Attribute:category_name' => 'Nom catégorie',
-	'Class:FAQ/Attribute:category_name+' => '',
-	'Class:FAQ/Attribute:error_code' => 'Code d\'erreur',
-	'Class:FAQ/Attribute:error_code+' => '',
-	'Class:FAQ/Attribute:key_words' => 'Mots clés',
-	'Class:FAQ/Attribute:key_words+' => '',
-	'Class:FAQ/Attribute:domains' => 'Domaines',
-));
-
-//
-// Class: FAQCategory
-//
-
-Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:FAQCategory' => 'Catégorie de FAQ',
-	'Class:FAQCategory+' => 'Catégorie de FAQ',
-	'Class:FAQCategory/Attribute:name' => 'Nom',
-	'Class:FAQCategory/Attribute:name+' => '',
-	'Class:FAQCategory/Attribute:faq_list' => 'FAQs',
-	'Class:FAQCategory/Attribute:faq_list+' => '',
-));
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Menu:ProblemManagement' => 'Gestion des problèmes',
 	'Menu:ProblemManagement+' => 'Gestion des problèmes',
@@ -151,12 +115,4 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Menu:SearchError+' => 'Rechercher une erreur connue',
 	'Menu:Problem:KnownErrors' => 'Toutes les erreurs connues',
 	'Menu:Problem:KnownErrors+' => 'Toutes les erreurs connues',
-	'Menu:FAQCategory' => 'Catégories de FAQ',
-	'Menu:FAQCategory+' => 'Toutes les catégories de FAQ',
-	'Menu:FAQ' => 'FAQs',
-	'Menu:FAQ+' => 'Toutes les  FAQs',
-
-	'Brick:Portal:FAQ:Menu' => 'FAQ',
-	'Brick:Portal:FAQ:Title' => 'Foire Aux Questions',
-	'Brick:Portal:FAQ:Title+' => '<p>Vous êtes pressé&nbsp;?</p><p>Consultez la liste des questions les plus fréquentes et vous trouverez (peut-être) immédiatement la réponse à votre besoin.</p>',
 ));
diff --git a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/hu.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-light/dictionaries/hu.dict.itop-knownerror-light.php
similarity index 75%
rename from datamodels/2.x/itop-knownerror-mgmt/dictionaries/hu.dict.itop-knownerror-mgmt.php
rename to datamodels/2.x/itop-knownerror-light/dictionaries/hu.dict.itop-knownerror-light.php
index 282b248f9..ea9c0beb1 100644
--- a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/hu.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-light/dictionaries/hu.dict.itop-knownerror-light.php
@@ -102,42 +102,6 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:lnkDocumentToError/Attribute:link_type+' => '~~',
 ));
 
-//
-// Class: FAQ
-//
-
-Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'Class:FAQ' => 'FAQ~~',
-	'Class:FAQ+' => 'Frequently asked questions~~',
-	'Class:FAQ/Attribute:title' => 'Title~~',
-	'Class:FAQ/Attribute:title+' => '~~',
-	'Class:FAQ/Attribute:summary' => 'Summary~~',
-	'Class:FAQ/Attribute:summary+' => '~~',
-	'Class:FAQ/Attribute:description' => 'Description~~',
-	'Class:FAQ/Attribute:description+' => '~~',
-	'Class:FAQ/Attribute:category_id' => 'Category~~',
-	'Class:FAQ/Attribute:category_id+' => '~~',
-	'Class:FAQ/Attribute:category_name' => 'Category name~~',
-	'Class:FAQ/Attribute:category_name+' => '~~',
-	'Class:FAQ/Attribute:error_code' => 'Error code~~',
-	'Class:FAQ/Attribute:error_code+' => '~~',
-	'Class:FAQ/Attribute:key_words' => 'Key words~~',
-	'Class:FAQ/Attribute:key_words+' => '~~',
-	'Class:FAQ/Attribute:domains' => 'Domains~~',
-));
-
-//
-// Class: FAQCategory
-//
-
-Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'Class:FAQCategory' => 'FAQ Category~~',
-	'Class:FAQCategory+' => 'Category for FAQ~~',
-	'Class:FAQCategory/Attribute:name' => 'Name~~',
-	'Class:FAQCategory/Attribute:name+' => '~~',
-	'Class:FAQCategory/Attribute:faq_list' => 'FAQs~~',
-	'Class:FAQCategory/Attribute:faq_list+' => 'All the frequently asked questions related to this category~~',
-));
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Menu:ProblemManagement' => 'Probléma menedzsment',
 	'Menu:ProblemManagement+' => '',
@@ -148,12 +112,4 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Menu:SearchError+' => '',
 	'Menu:Problem:KnownErrors' => 'Összes ismert hiba',
 	'Menu:Problem:KnownErrors+' => '',
-	'Menu:FAQCategory' => 'FAQ categories~~',
-	'Menu:FAQCategory+' => 'All FAQ categories~~',
-	'Menu:FAQ' => 'FAQs~~',
-	'Menu:FAQ+' => 'All FAQs~~',
-
-	'Brick:Portal:FAQ:Menu' => 'FAQ~~',
-	'Brick:Portal:FAQ:Title' => 'Frequently Asked Questions~~',
-	'Brick:Portal:FAQ:Title+' => '<p>In a hurry?</p><p>Check out the list of most common questions and (maybe) find the expected answer right away.</p>~~',
 ));
diff --git a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/it.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-light/dictionaries/it.dict.itop-knownerror-light.php
similarity index 80%
rename from datamodels/2.x/itop-knownerror-mgmt/dictionaries/it.dict.itop-knownerror-mgmt.php
rename to datamodels/2.x/itop-knownerror-light/dictionaries/it.dict.itop-knownerror-light.php
index 21b7457c9..fb78d450e 100644
--- a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/it.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-light/dictionaries/it.dict.itop-knownerror-light.php
@@ -129,42 +129,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:lnkDocumentToError/Attribute:link_type+' => '~~',
 ));
 
-//
-// Class: FAQ
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:FAQ' => 'FAQ',
-	'Class:FAQ+' => 'Domande frequenti',
-	'Class:FAQ/Attribute:title' => 'Titolo',
-	'Class:FAQ/Attribute:title+' => '~~',
-	'Class:FAQ/Attribute:summary' => 'Riepilogo',
-	'Class:FAQ/Attribute:summary+' => '~~',
-	'Class:FAQ/Attribute:description' => 'Descrizione',
-	'Class:FAQ/Attribute:description+' => '~~',
-	'Class:FAQ/Attribute:category_id' => 'Categoria',
-	'Class:FAQ/Attribute:category_id+' => '~~',
-	'Class:FAQ/Attribute:category_name' => 'Nome della Categoria',
-	'Class:FAQ/Attribute:category_name+' => '~~',
-	'Class:FAQ/Attribute:error_code' => 'Codice errore',
-	'Class:FAQ/Attribute:error_code+' => '~~',
-	'Class:FAQ/Attribute:key_words' => 'Parola Chiave',
-	'Class:FAQ/Attribute:key_words+' => '~~',
-	'Class:FAQ/Attribute:domains' => 'Dominio',
-));
-
-//
-// Class: FAQCategory
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:FAQCategory' => 'Fategoria FAQ',
-	'Class:FAQCategory+' => 'Categoria per FAQ',
-	'Class:FAQCategory/Attribute:name' => 'Nome',
-	'Class:FAQCategory/Attribute:name+' => '~~',
-	'Class:FAQCategory/Attribute:faq_list' => 'FAQs',
-	'Class:FAQCategory/Attribute:faq_list+' => 'Tutte le faq legate a questa categoria',
-));
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Menu:ProblemManagement' => 'Gestione dei Problemi',
 	'Menu:ProblemManagement+' => 'Gestione dei Problemi',
@@ -175,12 +139,4 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Menu:SearchError+' => 'Ricerca per Errori Conosciuti',
 	'Menu:Problem:KnownErrors' => 'Tutti gli errori conosciuti',
 	'Menu:Problem:KnownErrors+' => 'Tutti gli errori conosciuti',
-	'Menu:FAQCategory' => 'Categoria FAQ',
-	'Menu:FAQCategory+' => 'Tutte le categorie FAQ',
-	'Menu:FAQ' => 'FAQs',
-	'Menu:FAQ+' => 'Tutte le FAQs',
-
-	'Brick:Portal:FAQ:Menu' => 'FAQ',
-	'Brick:Portal:FAQ:Title' => 'Domande frequenti',
-	'Brick:Portal:FAQ:Title+' => '<p>Sei di fretta?</p><p>Verifica nella lista delle FAQ se trovi la risposta al tuo problema.</p>',
 ));
diff --git a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/ja.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-light/dictionaries/ja.dict.itop-knownerror-light.php
similarity index 77%
rename from datamodels/2.x/itop-knownerror-mgmt/dictionaries/ja.dict.itop-knownerror-mgmt.php
rename to datamodels/2.x/itop-knownerror-light/dictionaries/ja.dict.itop-knownerror-light.php
index ae8a04ff8..092e256e9 100644
--- a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/ja.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-light/dictionaries/ja.dict.itop-knownerror-light.php
@@ -102,42 +102,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkDocumentToError/Attribute:link_type+' => '',
 ));
 
-//
-// Class: FAQ
-//
-
-Dict::Add('JA JP', 'Japanese', '日本語', array(
-	'Class:FAQ' => 'FAQ',
-	'Class:FAQ+' => 'よくある質問',
-	'Class:FAQ/Attribute:title' => 'タイトル',
-	'Class:FAQ/Attribute:title+' => '',
-	'Class:FAQ/Attribute:summary' => '要約',
-	'Class:FAQ/Attribute:summary+' => '',
-	'Class:FAQ/Attribute:description' => '説明',
-	'Class:FAQ/Attribute:description+' => '',
-	'Class:FAQ/Attribute:category_id' => 'カテゴリ',
-	'Class:FAQ/Attribute:category_id+' => '',
-	'Class:FAQ/Attribute:category_name' => 'カテゴリ名',
-	'Class:FAQ/Attribute:category_name+' => '',
-	'Class:FAQ/Attribute:error_code' => 'エラーコード',
-	'Class:FAQ/Attribute:error_code+' => '',
-	'Class:FAQ/Attribute:key_words' => 'キーワード',
-	'Class:FAQ/Attribute:key_words+' => '',
-	'Class:FAQ/Attribute:domains' => 'Domains~~',
-));
-
-//
-// Class: FAQCategory
-//
-
-Dict::Add('JA JP', 'Japanese', '日本語', array(
-	'Class:FAQCategory' => 'FAQカテゴリ',
-	'Class:FAQCategory+' => 'FAQのためのカテゴリ',
-	'Class:FAQCategory/Attribute:name' => '名前',
-	'Class:FAQCategory/Attribute:name+' => '',
-	'Class:FAQCategory/Attribute:faq_list' => 'FAQ',
-	'Class:FAQCategory/Attribute:faq_list+' => '',
-));
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Menu:ProblemManagement' => '問題管理',
 	'Menu:ProblemManagement+' => '問題管理',
@@ -148,12 +112,4 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Menu:SearchError+' => '既知のエラー検索',
 	'Menu:Problem:KnownErrors' => '全ての既知のエラー',
 	'Menu:Problem:KnownErrors+' => '全ての既知のエラー',
-	'Menu:FAQCategory' => 'FAQカテゴリ',
-	'Menu:FAQCategory+' => '全てのFAQカテゴリ',
-	'Menu:FAQ' => 'FAQ',
-	'Menu:FAQ+' => '全FAQ',
-
-	'Brick:Portal:FAQ:Menu' => 'FAQ~~',
-	'Brick:Portal:FAQ:Title' => 'Frequently Asked Questions~~',
-	'Brick:Portal:FAQ:Title+' => '<p>In a hurry?</p><p>Check out the list of most common questions and (maybe) find the expected answer right away.</p>~~',
 ));
diff --git a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/nl.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-light/dictionaries/nl.dict.itop-knownerror-light.php
similarity index 80%
rename from datamodels/2.x/itop-knownerror-mgmt/dictionaries/nl.dict.itop-knownerror-mgmt.php
rename to datamodels/2.x/itop-knownerror-light/dictionaries/nl.dict.itop-knownerror-light.php
index 94b31ae9c..f095a5fad 100644
--- a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/nl.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-light/dictionaries/nl.dict.itop-knownerror-light.php
@@ -134,42 +134,6 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:lnkDocumentToError/Attribute:link_type+' => '',
 ));
 
-//
-// Class: FAQ
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:FAQ' => 'FAQ',
-	'Class:FAQ+' => 'Veelgestelde vragen',
-	'Class:FAQ/Attribute:title' => 'Titel',
-	'Class:FAQ/Attribute:title+' => '',
-	'Class:FAQ/Attribute:summary' => 'Samenvatting',
-	'Class:FAQ/Attribute:summary+' => '',
-	'Class:FAQ/Attribute:description' => 'Omschrijving',
-	'Class:FAQ/Attribute:description+' => '',
-	'Class:FAQ/Attribute:category_id' => 'Categorie',
-	'Class:FAQ/Attribute:category_id+' => '',
-	'Class:FAQ/Attribute:category_name' => 'Naam categorie',
-	'Class:FAQ/Attribute:category_name+' => '',
-	'Class:FAQ/Attribute:error_code' => 'Foutcode',
-	'Class:FAQ/Attribute:error_code+' => '',
-	'Class:FAQ/Attribute:key_words' => 'Zoektermen',
-	'Class:FAQ/Attribute:key_words+' => '',
-	'Class:FAQ/Attribute:domains' => 'Domeinen',
-));
-
-//
-// Class: FAQCategory
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:FAQCategory' => 'FAQ-categorie',
-	'Class:FAQCategory+' => 'Categorie voor de FAQ',
-	'Class:FAQCategory/Attribute:name' => 'Naam',
-	'Class:FAQCategory/Attribute:name+' => '',
-	'Class:FAQCategory/Attribute:faq_list' => 'FAQ\'s',
-	'Class:FAQCategory/Attribute:faq_list+' => 'Alle veelgestelde vragen gerelateerd aan deze categorie',
-));
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Menu:ProblemManagement' => 'Probleem Management',
 	'Menu:ProblemManagement+' => 'Probleem Management',
@@ -180,12 +144,4 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Menu:SearchError+' => 'Zoek naar gekende fouten',
 	'Menu:Problem:KnownErrors' => 'Alle gekende fouten',
 	'Menu:Problem:KnownErrors+' => 'Alle gekende fouten',
-	'Menu:FAQCategory' => 'FAQ-categorieën',
-	'Menu:FAQCategory+' => 'Alle FAQ-categorieën',
-	'Menu:FAQ' => 'FAQ\'s',
-	'Menu:FAQ+' => 'Alle FAQ\'s',
-
-	'Brick:Portal:FAQ:Menu' => 'FAQ',
-	'Brick:Portal:FAQ:Title' => 'Veelgestelde vragen',
-	'Brick:Portal:FAQ:Title+' => '<p>Gehaast?</p><p>Bekijk deze lijst van veelgestelde vragen. Misschien staat er al een antwoord tussen.</p>',
 ));
diff --git a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/pt_br.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-light/dictionaries/pt_br.dict.itop-knownerror-light.php
similarity index 79%
rename from datamodels/2.x/itop-knownerror-mgmt/dictionaries/pt_br.dict.itop-knownerror-mgmt.php
rename to datamodels/2.x/itop-knownerror-light/dictionaries/pt_br.dict.itop-knownerror-light.php
index 9123f5528..30d5603cd 100644
--- a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/pt_br.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-light/dictionaries/pt_br.dict.itop-knownerror-light.php
@@ -129,42 +129,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkDocumentToError/Attribute:link_type+' => '',
 ));
 
-//
-// Class: FAQ
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:FAQ' => 'FAQ',
-	'Class:FAQ+' => 'Perguntas mais frequentes',
-	'Class:FAQ/Attribute:title' => 'Título',
-	'Class:FAQ/Attribute:title+' => '',
-	'Class:FAQ/Attribute:summary' => 'Índice',
-	'Class:FAQ/Attribute:summary+' => '',
-	'Class:FAQ/Attribute:description' => 'Descrição',
-	'Class:FAQ/Attribute:description+' => '',
-	'Class:FAQ/Attribute:category_id' => 'Categoria',
-	'Class:FAQ/Attribute:category_id+' => '',
-	'Class:FAQ/Attribute:category_name' => 'Nome categoria',
-	'Class:FAQ/Attribute:category_name+' => '',
-	'Class:FAQ/Attribute:error_code' => 'Código erro',
-	'Class:FAQ/Attribute:error_code+' => '',
-	'Class:FAQ/Attribute:key_words' => 'Palavras-chaves',
-	'Class:FAQ/Attribute:key_words+' => '',
-	'Class:FAQ/Attribute:domains' => 'Domínios',
-));
-
-//
-// Class: FAQCategory
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:FAQCategory' => 'Categoria FAQ',
-	'Class:FAQCategory+' => 'Categoria por FAQ',
-	'Class:FAQCategory/Attribute:name' => 'Nome',
-	'Class:FAQCategory/Attribute:name+' => '',
-	'Class:FAQCategory/Attribute:faq_list' => 'FAQs',
-	'Class:FAQCategory/Attribute:faq_list+' => 'Todas as perguntas mais frequentes vinculadas a essa categoria',
-));
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Menu:ProblemManagement' => 'Gerencimento Problemas',
 	'Menu:ProblemManagement+' => 'Gerencimento Problemas',
@@ -175,12 +139,4 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Menu:SearchError+' => 'Pesquisar por erros conhecidos',
 	'Menu:Problem:KnownErrors' => 'Todos erros conhecidos',
 	'Menu:Problem:KnownErrors+' => 'Todos erros conhecidos',
-	'Menu:FAQCategory' => 'Categorias FAQ',
-	'Menu:FAQCategory+' => 'Todas categorias FAQ',
-	'Menu:FAQ' => 'FAQs',
-	'Menu:FAQ+' => 'Todas FAQs',
-
-	'Brick:Portal:FAQ:Menu' => 'FAQ',
-	'Brick:Portal:FAQ:Title' => 'Perguntes frequentes (FAQ)',
-	'Brick:Portal:FAQ:Title+' => '<p>Com pressa?</p><p>Confira a lista de perguntas mais comuns e (talvez) encontre a resposta esperada imediatamente.</p>',
 ));
diff --git a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/ru.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-light/dictionaries/ru.dict.itop-knownerror-light.php
similarity index 75%
rename from datamodels/2.x/itop-knownerror-mgmt/dictionaries/ru.dict.itop-knownerror-mgmt.php
rename to datamodels/2.x/itop-knownerror-light/dictionaries/ru.dict.itop-knownerror-light.php
index 14c1b6c52..9de919e7c 100644
--- a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/ru.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-light/dictionaries/ru.dict.itop-knownerror-light.php
@@ -94,42 +94,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkDocumentToError/Attribute:link_type+' => '',
 ));
 
-//
-// Class: FAQ
-//
-
-Dict::Add('RU RU', 'Russian', 'Русский', array(
-	'Class:FAQ' => 'FAQ',
-	'Class:FAQ+' => 'Часто задаваемые вопросы',
-	'Class:FAQ/Attribute:title' => 'Название',
-	'Class:FAQ/Attribute:title+' => '',
-	'Class:FAQ/Attribute:summary' => 'Краткое содержание',
-	'Class:FAQ/Attribute:summary+' => '',
-	'Class:FAQ/Attribute:description' => 'Описание',
-	'Class:FAQ/Attribute:description+' => '',
-	'Class:FAQ/Attribute:category_id' => 'Категория',
-	'Class:FAQ/Attribute:category_id+' => '',
-	'Class:FAQ/Attribute:category_name' => 'Категория',
-	'Class:FAQ/Attribute:category_name+' => '',
-	'Class:FAQ/Attribute:error_code' => 'Код ошибки',
-	'Class:FAQ/Attribute:error_code+' => '',
-	'Class:FAQ/Attribute:key_words' => 'Ключевые слова',
-	'Class:FAQ/Attribute:key_words+' => '',
-	'Class:FAQ/Attribute:domains' => 'Домены',
-));
-
-//
-// Class: FAQCategory
-//
-
-Dict::Add('RU RU', 'Russian', 'Русский', array(
-	'Class:FAQCategory' => 'Категории FAQ',
-	'Class:FAQCategory+' => 'Категории FAQ',
-	'Class:FAQCategory/Attribute:name' => 'Название',
-	'Class:FAQCategory/Attribute:name+' => '',
-	'Class:FAQCategory/Attribute:faq_list' => 'FAQ',
-	'Class:FAQCategory/Attribute:faq_list+' => 'Связанные FAQ',
-));
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Menu:ProblemManagement' => 'Управление проблемами',
 	'Menu:ProblemManagement+' => 'Управление проблемами',
@@ -140,12 +104,4 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Menu:SearchError+' => 'Поиск известных ошибок',
 	'Menu:Problem:KnownErrors' => 'Известные ошибки',
 	'Menu:Problem:KnownErrors+' => 'База известных ошибок',
-	'Menu:FAQCategory' => 'Категории FAQ',
-	'Menu:FAQCategory+' => 'Категории FAQ',
-	'Menu:FAQ' => 'FAQ',
-	'Menu:FAQ+' => 'Часто задаваемые вопросы',
-
-	'Brick:Portal:FAQ:Menu' => 'FAQ',
-	'Brick:Portal:FAQ:Title' => 'Часто задаваемые вопросы',
-	'Brick:Portal:FAQ:Title+' => '<p>Торопитесь?</p><p>Проверьте список часто задаваемых вопросов, возможно, ответ уже есть.</p>',
 ));
diff --git a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/sk.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-light/dictionaries/sk.dict.itop-knownerror-light.php
similarity index 79%
rename from datamodels/2.x/itop-knownerror-mgmt/dictionaries/sk.dict.itop-knownerror-mgmt.php
rename to datamodels/2.x/itop-knownerror-light/dictionaries/sk.dict.itop-knownerror-light.php
index ff95560c1..a140c4c4a 100644
--- a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/sk.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-light/dictionaries/sk.dict.itop-knownerror-light.php
@@ -128,42 +128,6 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:lnkDocumentToError/Attribute:link_type+' => '~~',
 ));
 
-//
-// Class: FAQ
-//
-
-Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
-	'Class:FAQ' => 'FAQ~~',
-	'Class:FAQ+' => 'Frequently asked questions~~',
-	'Class:FAQ/Attribute:title' => 'Title~~',
-	'Class:FAQ/Attribute:title+' => '~~',
-	'Class:FAQ/Attribute:summary' => 'Summary~~',
-	'Class:FAQ/Attribute:summary+' => '~~',
-	'Class:FAQ/Attribute:description' => 'Description~~',
-	'Class:FAQ/Attribute:description+' => '~~',
-	'Class:FAQ/Attribute:category_id' => 'Category~~',
-	'Class:FAQ/Attribute:category_id+' => '~~',
-	'Class:FAQ/Attribute:category_name' => 'Category name~~',
-	'Class:FAQ/Attribute:category_name+' => '~~',
-	'Class:FAQ/Attribute:error_code' => 'Error code~~',
-	'Class:FAQ/Attribute:error_code+' => '~~',
-	'Class:FAQ/Attribute:key_words' => 'Key words~~',
-	'Class:FAQ/Attribute:key_words+' => '~~',
-	'Class:FAQ/Attribute:domains' => 'Domains~~',
-));
-
-//
-// Class: FAQCategory
-//
-
-Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
-	'Class:FAQCategory' => 'FAQ Category~~',
-	'Class:FAQCategory+' => 'Category for FAQ~~',
-	'Class:FAQCategory/Attribute:name' => 'Name~~',
-	'Class:FAQCategory/Attribute:name+' => '~~',
-	'Class:FAQCategory/Attribute:faq_list' => 'FAQs~~',
-	'Class:FAQCategory/Attribute:faq_list+' => 'All the frequently asked questions related to this category~~',
-));
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Menu:ProblemManagement' => 'Problem Management~~',
 	'Menu:ProblemManagement+' => 'Problem Management~~',
@@ -174,12 +138,4 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Menu:SearchError+' => 'Search for known errors~~',
 	'Menu:Problem:KnownErrors' => 'All known errors~~',
 	'Menu:Problem:KnownErrors+' => 'All known errors~~',
-	'Menu:FAQCategory' => 'FAQ categories~~',
-	'Menu:FAQCategory+' => 'All FAQ categories~~',
-	'Menu:FAQ' => 'FAQs~~',
-	'Menu:FAQ+' => 'All FAQs~~',
-
-	'Brick:Portal:FAQ:Menu' => 'FAQ~~',
-	'Brick:Portal:FAQ:Title' => 'Frequently Asked Questions~~',
-	'Brick:Portal:FAQ:Title+' => '<p>In a hurry?</p><p>Check out the list of most common questions and (maybe) find the expected answer right away.</p>~~',
 ));
diff --git a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/tr.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-light/dictionaries/tr.dict.itop-knownerror-light.php
similarity index 79%
rename from datamodels/2.x/itop-knownerror-mgmt/dictionaries/tr.dict.itop-knownerror-mgmt.php
rename to datamodels/2.x/itop-knownerror-light/dictionaries/tr.dict.itop-knownerror-light.php
index 8cac08887..5743e54d9 100644
--- a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/tr.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-light/dictionaries/tr.dict.itop-knownerror-light.php
@@ -130,42 +130,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:lnkDocumentToError/Attribute:link_type+' => '~~',
 ));
 
-//
-// Class: FAQ
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:FAQ' => 'FAQ~~',
-	'Class:FAQ+' => 'Frequently asked questions~~',
-	'Class:FAQ/Attribute:title' => 'Title~~',
-	'Class:FAQ/Attribute:title+' => '~~',
-	'Class:FAQ/Attribute:summary' => 'Summary~~',
-	'Class:FAQ/Attribute:summary+' => '~~',
-	'Class:FAQ/Attribute:description' => 'Description~~',
-	'Class:FAQ/Attribute:description+' => '~~',
-	'Class:FAQ/Attribute:category_id' => 'Category~~',
-	'Class:FAQ/Attribute:category_id+' => '~~',
-	'Class:FAQ/Attribute:category_name' => 'Category name~~',
-	'Class:FAQ/Attribute:category_name+' => '~~',
-	'Class:FAQ/Attribute:error_code' => 'Error code~~',
-	'Class:FAQ/Attribute:error_code+' => '~~',
-	'Class:FAQ/Attribute:key_words' => 'Key words~~',
-	'Class:FAQ/Attribute:key_words+' => '~~',
-	'Class:FAQ/Attribute:domains' => 'Domains~~',
-));
-
-//
-// Class: FAQCategory
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:FAQCategory' => 'FAQ Category~~',
-	'Class:FAQCategory+' => 'Category for FAQ~~',
-	'Class:FAQCategory/Attribute:name' => 'Name~~',
-	'Class:FAQCategory/Attribute:name+' => '~~',
-	'Class:FAQCategory/Attribute:faq_list' => 'FAQs~~',
-	'Class:FAQCategory/Attribute:faq_list+' => 'All the frequently asked questions related to this category~~',
-));
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Menu:ProblemManagement' => 'Problem Yönetimi',
 	'Menu:ProblemManagement+' => 'Problem Yönetimi',
@@ -176,12 +140,4 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Menu:SearchError+' => 'Bilinen hataları ara',
 	'Menu:Problem:KnownErrors' => 'Tüm bilinen hatalar',
 	'Menu:Problem:KnownErrors+' => 'Tüm bilinen hatalar',
-	'Menu:FAQCategory' => 'FAQ categories~~',
-	'Menu:FAQCategory+' => 'All FAQ categories~~',
-	'Menu:FAQ' => 'FAQs~~',
-	'Menu:FAQ+' => 'All FAQs~~',
-
-	'Brick:Portal:FAQ:Menu' => 'FAQ~~',
-	'Brick:Portal:FAQ:Title' => 'Frequently Asked Questions~~',
-	'Brick:Portal:FAQ:Title+' => '<p>In a hurry?</p><p>Check out the list of most common questions and (maybe) find the expected answer right away.</p>~~',
 ));
diff --git a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/zh_cn.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-light/dictionaries/zh_cn.dict.itop-knownerror-light.php
similarity index 80%
rename from datamodels/2.x/itop-knownerror-mgmt/dictionaries/zh_cn.dict.itop-knownerror-mgmt.php
rename to datamodels/2.x/itop-knownerror-light/dictionaries/zh_cn.dict.itop-knownerror-light.php
index 7ad085aa1..133cb62cb 100644
--- a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/zh_cn.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-light/dictionaries/zh_cn.dict.itop-knownerror-light.php
@@ -128,42 +128,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:lnkDocumentToError/Attribute:link_type+' => '',
 ));
 
-//
-// Class: FAQ
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:FAQ' => 'FAQ',
-	'Class:FAQ+' => 'FAQ',
-	'Class:FAQ/Attribute:title' => '标题',
-	'Class:FAQ/Attribute:title+' => '',
-	'Class:FAQ/Attribute:summary' => '概要',
-	'Class:FAQ/Attribute:summary+' => '',
-	'Class:FAQ/Attribute:description' => '描述',
-	'Class:FAQ/Attribute:description+' => '',
-	'Class:FAQ/Attribute:category_id' => '类别',
-	'Class:FAQ/Attribute:category_id+' => '',
-	'Class:FAQ/Attribute:category_name' => '类别名称',
-	'Class:FAQ/Attribute:category_name+' => '',
-	'Class:FAQ/Attribute:error_code' => '错误代码',
-	'Class:FAQ/Attribute:error_code+' => '',
-	'Class:FAQ/Attribute:key_words' => '关键字',
-	'Class:FAQ/Attribute:key_words+' => '',
-	'Class:FAQ/Attribute:domains' => 'Domains~~',
-));
-
-//
-// Class: FAQCategory
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:FAQCategory' => 'FAQ 类别',
-	'Class:FAQCategory+' => 'FAQ 类别',
-	'Class:FAQCategory/Attribute:name' => '名称',
-	'Class:FAQCategory/Attribute:name+' => '',
-	'Class:FAQCategory/Attribute:faq_list' => 'FAQ',
-	'Class:FAQCategory/Attribute:faq_list+' => '该类别FAQ 相关的所有常见问题',
-));
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Menu:ProblemManagement' => '问题管理',
 	'Menu:ProblemManagement+' => '问题管理',
@@ -174,12 +138,4 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Menu:SearchError+' => '搜索已知问题',
 	'Menu:Problem:KnownErrors' => '所有已知错误',
 	'Menu:Problem:KnownErrors+' => '所有已知错误',
-	'Menu:FAQCategory' => 'FAQ 类别',
-	'Menu:FAQCategory+' => '所有FAQ 类别',
-	'Menu:FAQ' => 'FAQ',
-	'Menu:FAQ+' => '所有FAQ',
-
-	'Brick:Portal:FAQ:Menu' => 'FAQ',
-	'Brick:Portal:FAQ:Title' => 'FAQ',
-	'Brick:Portal:FAQ:Title+' => '<p>需要帮助?</p><p>查阅列表中的常见问题,或许可以立即找到令您满意的答案.</p>',
 ));
diff --git a/datamodels/2.x/itop-knownerror-mgmt/images/known-error.png b/datamodels/2.x/itop-knownerror-light/images/known-error.png
similarity index 100%
rename from datamodels/2.x/itop-knownerror-mgmt/images/known-error.png
rename to datamodels/2.x/itop-knownerror-light/images/known-error.png
diff --git a/datamodels/2.x/itop-knownerror-light/module.itop-knownerror-light.php b/datamodels/2.x/itop-knownerror-light/module.itop-knownerror-light.php
new file mode 100755
index 000000000..76ea04922
--- /dev/null
+++ b/datamodels/2.x/itop-knownerror-light/module.itop-knownerror-light.php
@@ -0,0 +1,43 @@
+<?php
+
+
+SetupWebPage::AddModule(
+	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
+	'itop-knownerror-light/2.8.0',
+	array(
+		// Identification
+		//
+		'label' => 'Known Errors Database',
+		'category' => 'business',
+
+		// Setup
+		//
+		'dependencies' => array(
+			'itop-config-mgmt/2.2.0',
+			'itop-portal/2.7.0',
+		),
+		'mandatory' => false,
+		'visible' => true,
+
+		// Components
+		//
+		'datamodel' => array(
+			'model.itop-knownerror-light.php',
+		),
+		'data.struct' => array(
+			//'data.struct.itop-knownerror-mgmt.xml',
+		),
+		'data.sample' => array(
+		),
+		
+		// Documentation
+		//
+		'doc.manual_setup' => '', // No manual installation instructions
+		'doc.more_information' => '',
+
+		// Default settings
+		//
+		'settings' => array(
+		),
+	)
+);
diff --git a/datamodels/2.x/itop-portal/fr.dict.itop-portal.php b/datamodels/2.x/itop-portal/fr.dict.itop-portal.php
index 04bf15e78..f46974e08 100644
--- a/datamodels/2.x/itop-portal/fr.dict.itop-portal.php
+++ b/datamodels/2.x/itop-portal/fr.dict.itop-portal.php
@@ -29,7 +29,7 @@
 //////////////////////////////////////////////////////////////////////
 //
 
-Dict::Add('FR FR', 'French', 'Francais', array(
+Dict::Add('FR FR', 'French', 'Français', array(
 	'portal:itop-portal' => 'Portail standard', // This is the portal name that will be displayed in portal dispatcher (eg. URL in menus)
 	'Page:DefaultTitle' => '%1$s - Portail utilisateur',
 	'Brick:Portal:UserProfile:Title' => 'Mon profil',
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/cs.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/cs.dict.itop-service-mgmt.php
index 687513852..d66bd36b7 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/cs.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/cs.dict.itop-service-mgmt.php
@@ -40,7 +40,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Smlouvy podle úrovně služeb',
 	'UI-ServiceManagementMenu-ContractsByStatus' => 'Smlouvy podle stavu',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Smlouvy končící během 30 dní',
-
 	'Menu:ProviderContract' => 'Smlouvy s poskytovateli',
 	'Menu:ProviderContract+' => 'Smlouvy s poskytovateli',
 	'Menu:CustomerContract' => 'Smlouvy se zákazníky',
@@ -201,23 +200,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:lnkContractToDocument/Attribute:document_name+' => '',
 ));
 
-//
-// Class: lnkFunctionalCIToProviderContract
-//
-
-Dict::Add('CS CZ', 'Czech', 'Čeština', array(
-	'Class:lnkFunctionalCIToProviderContract' => 'Spojení (Funkční konfigurační položka / Smlouva s poskytovatelem)',
-	'Class:lnkFunctionalCIToProviderContract+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Smlouva s poskytovatelem',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Název smlouvy s poskytovatelem',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'Konfigurační položka',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'Název konfigurační položky',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
-));
-
 //
 // Class: ServiceFamily
 //
@@ -469,23 +451,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:lnkProviderContractToService/Attribute:providercontract_name+' => '',
 ));
 
-//
-// Class: lnkFunctionalCIToService
-//
-
-Dict::Add('CS CZ', 'Czech', 'Čeština', array(
-	'Class:lnkFunctionalCIToService' => 'Spojení (Funkční konfigurační položka / Služba)',
-	'Class:lnkFunctionalCIToService+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Služba',
-	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Název služby',
-	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'Konfigurační položka',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'Název konfigurační položky',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '',
-));
-
 //
 // Class: DeliveryModel
 //
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/da.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/da.dict.itop-service-mgmt.php
index 38e9142ae..e8f505f66 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/da.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/da.dict.itop-service-mgmt.php
@@ -28,7 +28,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Kontrakt(er) efter Service Level',
 	'UI-ServiceManagementMenu-ContractsByStatus' => 'Kontrakter efter status',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Kontrakt(er), der udløber om mindre end 30 dage',
-
 	'Menu:ProviderContract' => 'Leverandør kontrakter',
 	'Menu:ProviderContract+' => 'Leverandør kontrakter',
 	'Menu:CustomerContract' => 'Kunde kontrakter',
@@ -189,23 +188,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:lnkContractToDocument/Attribute:document_name+' => '',
 ));
 
-//
-// Class: lnkFunctionalCIToProviderContract
-//
-
-Dict::Add('DA DA', 'Danish', 'Dansk', array(
-	'Class:lnkFunctionalCIToProviderContract' => 'Sammenhæng FunctionalCI/Leverandør Kontrakt',
-	'Class:lnkFunctionalCIToProviderContract+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Leverandør kontrakt',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Leverandør kontrakt navn',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'CI navn',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
-));
-
 //
 // Class: ServiceFamily
 //
@@ -457,23 +439,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:lnkProviderContractToService/Attribute:providercontract_name+' => '',
 ));
 
-//
-// Class: lnkFunctionalCIToService
-//
-
-Dict::Add('DA DA', 'Danish', 'Dansk', array(
-	'Class:lnkFunctionalCIToService' => 'Sammenhæng FunctionalCI/Ydelse',
-	'Class:lnkFunctionalCIToService+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Ydelse',
-	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Ydelses navn',
-	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'CI',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'CI navn',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '',
-));
-
 //
 // Class: DeliveryModel
 //
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/de.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/de.dict.itop-service-mgmt.php
index a1af52d22..b9c0f0c35 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/de.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/de.dict.itop-service-mgmt.php
@@ -30,7 +30,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Verträge nach Service Level',
 	'UI-ServiceManagementMenu-ContractsByStatus' => 'Verträge nach Status',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Verträge, die in weniger als 30 Tagen enden',
-
 	'Menu:ProviderContract' => 'Provider-Verträge',
 	'Menu:ProviderContract+' => 'Provider-Verträge',
 	'Menu:CustomerContract' => 'Kundenverträge',
@@ -191,23 +190,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkContractToDocument/Attribute:document_name+' => '',
 ));
 
-//
-// Class: lnkFunctionalCIToProviderContract
-//
-
-Dict::Add('DE DE', 'German', 'Deutsch', array(
-	'Class:lnkFunctionalCIToProviderContract' => 'Verknüpfung FunctionalCI/Provider-Vertrag',
-	'Class:lnkFunctionalCIToProviderContract+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Provider-Vertrag',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Providervertrags-Name',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'CI-Name',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
-));
-
 //
 // Class: ServiceFamily
 //
@@ -459,23 +441,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkProviderContractToService/Attribute:providercontract_name+' => '',
 ));
 
-//
-// Class: lnkFunctionalCIToService
-//
-
-Dict::Add('DE DE', 'German', 'Deutsch', array(
-	'Class:lnkFunctionalCIToService' => 'Verknüpfung FunctionalCI/Service',
-	'Class:lnkFunctionalCIToService+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Service',
-	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Service-Name',
-	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'CI',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'CI-Name',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '',
-));
-
 //
 // Class: DeliveryModel
 //
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/en.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/en.dict.itop-service-mgmt.php
index 478eb9357..a138818d7 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/en.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/en.dict.itop-service-mgmt.php
@@ -40,7 +40,6 @@ Dict::Add('EN US', 'English', 'English', array(
 	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contracts by service level',
 	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contracts by status',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contracts ending in less then 30 days',
-
 	'Menu:ProviderContract' => 'Provider contracts',
 	'Menu:ProviderContract+' => 'Provider contracts',
 	'Menu:CustomerContract' => 'Customer contracts',
@@ -201,23 +200,6 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:lnkContractToDocument/Attribute:document_name+' => '',
 ));
 
-//
-// Class: lnkFunctionalCIToProviderContract
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:lnkFunctionalCIToProviderContract' => 'Link FunctionalCI / ProviderContract',
-	'Class:lnkFunctionalCIToProviderContract+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Provider contract',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Provider contract Name',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'CI Name',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
-));
-
 //
 // Class: ServiceFamily
 //
@@ -469,23 +451,6 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:lnkProviderContractToService/Attribute:providercontract_name+' => '',
 ));
 
-//
-// Class: lnkFunctionalCIToService
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:lnkFunctionalCIToService' => 'Link FunctionalCI / Service',
-	'Class:lnkFunctionalCIToService+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Service',
-	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Service Name',
-	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'CI',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'CI Name',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '',
-));
-
 //
 // Class: DeliveryModel
 //
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/es_cr.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/es_cr.dict.itop-service-mgmt.php
index af6a1f187..86c89c390 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/es_cr.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/es_cr.dict.itop-service-mgmt.php
@@ -39,7 +39,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contratos por Nivel de Servicio',
 	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contratos por Estatus',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contratos Finalizando en menos de 30 días',
-
 	'Menu:ProviderContract' => 'Contratos con Proveedores',
 	'Menu:ProviderContract+' => 'Contratos con Proveedores',
 	'Menu:CustomerContract' => 'Acuerdos con Clientes',
@@ -200,23 +199,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'Class:lnkContractToDocument/Attribute:document_name+' => 'Documento',
 ));
 
-//
-// Class: lnkFunctionalCIToProviderContract
-//
-
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
-	'Class:lnkFunctionalCIToProviderContract' => 'Relación EC Funcional y Contrato con Proveedor',
-	'Class:lnkFunctionalCIToProviderContract+' => 'Relación EC Funcional y Contrato con Proveedor',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Contrato con Proveedor',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => 'Contrato con Proveedor',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Contrato con Proveedor',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => 'Contrato con Proveedor',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'EC',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => 'Elemento de Configuración',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'Elemento de Configuración',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => 'Elemento de Configuración',
-));
-
 //
 // Class: ServiceFamily
 //
@@ -468,23 +450,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'Class:lnkProviderContractToService/Attribute:providercontract_name+' => 'Contrato con Proveedor',
 ));
 
-//
-// Class: lnkFunctionalCIToService
-//
-
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
-	'Class:lnkFunctionalCIToService' => 'Relación EC Funcional y Servicio',
-	'Class:lnkFunctionalCIToService+' => 'Relación EC Funcional y Servicio',
-	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Servicio',
-	'Class:lnkFunctionalCIToService/Attribute:service_id+' => 'Servicio',
-	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Servicio',
-	'Class:lnkFunctionalCIToService/Attribute:service_name+' => 'Servicio',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'EC',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => 'Elemento de Configuración',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'EC',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => 'Elemento de Configuración',
-));
-
 //
 // Class: DeliveryModel
 //
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/fr.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/fr.dict.itop-service-mgmt.php
index 99bd14b07..01d47871b 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/fr.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/fr.dict.itop-service-mgmt.php
@@ -30,7 +30,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contrats, par niveau de service',
 	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contrats, par état',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contrats se terminant dans moins d\'un mois',
-
 	'Menu:ProviderContract' => 'Contrats fournisseurs',
 	'Menu:ProviderContract+' => 'Contrats fournisseurs',
 	'Menu:CustomerContract' => 'Contrats clients',
@@ -191,23 +190,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:lnkContractToDocument/Attribute:document_name+' => '',
 ));
 
-//
-// Class: lnkFunctionalCIToProviderContract
-//
-
-Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:lnkFunctionalCIToProviderContract' => 'Lien CI / Contrat fournisseur',
-	'Class:lnkFunctionalCIToProviderContract+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Contrat fournisseur',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Nom contrat fournisseur',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'Nom CI',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
-));
-
 //
 // Class: ServiceFamily
 //
@@ -459,23 +441,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:lnkProviderContractToService/Attribute:providercontract_name+' => '',
 ));
 
-//
-// Class: lnkFunctionalCIToService
-//
-
-Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:lnkFunctionalCIToService' => 'Lien CI / Service',
-	'Class:lnkFunctionalCIToService+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Service',
-	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Nom service',
-	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'CI',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'Nom CI',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '',
-));
-
 //
 // Class: DeliveryModel
 //
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/hu.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/hu.dict.itop-service-mgmt.php
index 104f885c6..65f1d0063 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/hu.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/hu.dict.itop-service-mgmt.php
@@ -27,7 +27,6 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Szerződések szolgáltatás szintenként',
 	'UI-ServiceManagementMenu-ContractsByStatus' => 'Szerződések státuszonként',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => '30 napon belül lejáró szerződések',
-
 	'Menu:ProviderContract' => 'Szállítói szerződés',
 	'Menu:ProviderContract+' => '',
 	'Menu:CustomerContract' => 'Ügyfél szerződés',
@@ -188,23 +187,6 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:lnkContractToDocument/Attribute:document_name+' => '~~',
 ));
 
-//
-// Class: lnkFunctionalCIToProviderContract
-//
-
-Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'Class:lnkFunctionalCIToProviderContract' => 'Link FunctionalCI / ProviderContract~~',
-	'Class:lnkFunctionalCIToProviderContract+' => '~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Provider contract~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Provider contract Name~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'CI Name~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '~~',
-));
-
 //
 // Class: ServiceFamily
 //
@@ -456,23 +438,6 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:lnkProviderContractToService/Attribute:providercontract_name+' => '~~',
 ));
 
-//
-// Class: lnkFunctionalCIToService
-//
-
-Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'Class:lnkFunctionalCIToService' => 'Link FunctionalCI / Service~~',
-	'Class:lnkFunctionalCIToService+' => '~~',
-	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Service~~',
-	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '~~',
-	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Service Name~~',
-	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '~~',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'CI~~',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '~~',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'CI Name~~',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '~~',
-));
-
 //
 // Class: DeliveryModel
 //
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/it.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/it.dict.itop-service-mgmt.php
index a05f3f34d..d343b1cfb 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/it.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/it.dict.itop-service-mgmt.php
@@ -38,7 +38,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contratti per livello di servizio',
 	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contratti per stato',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contratti che terminano in meno di 30 giorni',
-
 	'Menu:ProviderContract' => 'Contratti con Provider',
 	'Menu:ProviderContract+' => 'Contratti con Provider',
 	'Menu:CustomerContract' => 'Contratti con Clienti',
@@ -199,23 +198,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:lnkContractToDocument/Attribute:document_name+' => '~~',
 ));
 
-//
-// Class: lnkFunctionalCIToProviderContract
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:lnkFunctionalCIToProviderContract' => 'Link FunctionalCI / ProviderContract~~',
-	'Class:lnkFunctionalCIToProviderContract+' => '~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Provider contract~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Provider contract Name~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'CI Name~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '~~',
-));
-
 //
 // Class: ServiceFamily
 //
@@ -467,23 +449,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:lnkProviderContractToService/Attribute:providercontract_name+' => '~~',
 ));
 
-//
-// Class: lnkFunctionalCIToService
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:lnkFunctionalCIToService' => 'Link FunctionalCI / Service~~',
-	'Class:lnkFunctionalCIToService+' => '~~',
-	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Service~~',
-	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '~~',
-	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Service Name~~',
-	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '~~',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'CI~~',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '~~',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'CI Name~~',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '~~',
-));
-
 //
 // Class: DeliveryModel
 //
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/ja.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/ja.dict.itop-service-mgmt.php
index cc3f652dc..92c1d7d9c 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/ja.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/ja.dict.itop-service-mgmt.php
@@ -27,7 +27,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'サービスレベル別契約',
 	'UI-ServiceManagementMenu-ContractsByStatus' => 'ステータス別契約',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => '30日以内に終了する契約',
-
 	'Menu:ProviderContract' => 'プロバイダー契約',
 	'Menu:ProviderContract+' => 'プロバイダー契約',
 	'Menu:CustomerContract' => '顧客契約',
@@ -188,23 +187,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkContractToDocument/Attribute:document_name+' => '',
 ));
 
-//
-// Class: lnkFunctionalCIToProviderContract
-//
-
-Dict::Add('JA JP', 'Japanese', '日本語', array(
-	'Class:lnkFunctionalCIToProviderContract' => 'リンク 機能的CI/プロバイダー契約',
-	'Class:lnkFunctionalCIToProviderContract+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'プロバイダー契約',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'プロバイダー契約名',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'CI名',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
-));
-
 //
 // Class: ServiceFamily
 //
@@ -456,23 +438,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkProviderContractToService/Attribute:providercontract_name+' => '',
 ));
 
-//
-// Class: lnkFunctionalCIToService
-//
-
-Dict::Add('JA JP', 'Japanese', '日本語', array(
-	'Class:lnkFunctionalCIToService' => 'リンク 機能的CI/サービス',
-	'Class:lnkFunctionalCIToService+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'サービス',
-	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'サービス名',
-	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'CI',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'CI名',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '',
-));
-
 //
 // Class: DeliveryModel
 //
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/nl.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/nl.dict.itop-service-mgmt.php
index fc7db7ee8..ddf13b1fd 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/nl.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/nl.dict.itop-service-mgmt.php
@@ -42,7 +42,6 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contracten per servicelevel',
 	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contracten per status',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contracten die in minder dan 30 dagen verlopen',
-
 	'Menu:ProviderContract' => 'Leverancierscontracten',
 	'Menu:ProviderContract+' => 'Leverancierscontracten',
 	'Menu:CustomerContract' => 'Klantencontracten',
@@ -203,23 +202,6 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:lnkContractToDocument/Attribute:document_name+' => '',
 ));
 
-//
-// Class: lnkFunctionalCIToProviderContract
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:lnkFunctionalCIToProviderContract' => 'Link Functioneel CI / Leverancierscontract',
-	'Class:lnkFunctionalCIToProviderContract+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Leverancierscontract',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Naam leverancierscontract',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'Naam CI',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
-));
-
 //
 // Class: ServiceFamily
 //
@@ -471,23 +453,6 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:lnkProviderContractToService/Attribute:providercontract_name+' => '',
 ));
 
-//
-// Class: lnkFunctionalCIToService
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:lnkFunctionalCIToService' => 'Link Functioneel CI / Service',
-	'Class:lnkFunctionalCIToService+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Service',
-	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Naam service',
-	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'CI',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'Naam CI',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '',
-));
-
 //
 // Class: DeliveryModel
 //
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/pt_br.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/pt_br.dict.itop-service-mgmt.php
index 852062ed5..2581a590f 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/pt_br.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/pt_br.dict.itop-service-mgmt.php
@@ -38,7 +38,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contratos por nível serviço',
 	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contratos por estado',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contratos finalizando em menos de 30 dias',
-
 	'Menu:ProviderContract' => 'Contratos Provedor(as)',
 	'Menu:ProviderContract+' => 'Contratos Provedor(as)',
 	'Menu:CustomerContract' => 'Contratos Clientes',
@@ -199,23 +198,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkContractToDocument/Attribute:document_name+' => '',
 ));
 
-//
-// Class: lnkFunctionalCIToProviderContract
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkFunctionalCIToProviderContract' => 'Link CI / Contrato provedor(a)',
-	'Class:lnkFunctionalCIToProviderContract+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Contrato provedor(a)',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Nome contrato provedor(a)',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CIs',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'Nome CI',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
-));
-
 //
 // Class: ServiceFamily
 //
@@ -467,23 +449,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkProviderContractToService/Attribute:providercontract_name+' => '',
 ));
 
-//
-// Class: lnkFunctionalCIToService
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkFunctionalCIToService' => 'Link CI / Serviço',
-	'Class:lnkFunctionalCIToService+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Serviço',
-	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Nome serviço',
-	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'CIs',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'Nome CI',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '',
-));
-
 //
 // Class: DeliveryModel
 //
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/ru.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/ru.dict.itop-service-mgmt.php
index bdb29ee52..062938292 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/ru.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/ru.dict.itop-service-mgmt.php
@@ -16,7 +16,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Договоры по уровню услуг',
 	'UI-ServiceManagementMenu-ContractsByStatus' => 'Договоры по статусу',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Договоры, оканчивающиеся в течение 30-ти дней',
-
 	'Menu:ProviderContract' => 'Договоры с поставщиками',
 	'Menu:ProviderContract+' => 'Договоры с поставщиками',
 	'Menu:CustomerContract' => 'Договоры с заказчиками',
@@ -177,23 +176,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkContractToDocument/Attribute:document_name+' => '',
 ));
 
-//
-// Class: lnkFunctionalCIToProviderContract
-//
-
-Dict::Add('RU RU', 'Russian', 'Русский', array(
-	'Class:lnkFunctionalCIToProviderContract' => 'Связь Функциональная КЕ/Договор с поставщиком',
-	'Class:lnkFunctionalCIToProviderContract+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Договор с поставщиком',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Договор с поставщиком',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'КЕ',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'КЕ',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
-));
-
 //
 // Class: ServiceFamily
 //
@@ -445,23 +427,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkProviderContractToService/Attribute:providercontract_name+' => '',
 ));
 
-//
-// Class: lnkFunctionalCIToService
-//
-
-Dict::Add('RU RU', 'Russian', 'Русский', array(
-	'Class:lnkFunctionalCIToService' => 'Связь Функциональная КЕ/Услуга',
-	'Class:lnkFunctionalCIToService+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Услуга',
-	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Услуга',
-	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'КЕ',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'КЕ',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '',
-));
-
 //
 // Class: DeliveryModel
 //
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/sk.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/sk.dict.itop-service-mgmt.php
index 668d43566..e4f02177e 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/sk.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/sk.dict.itop-service-mgmt.php
@@ -37,7 +37,6 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'zmluvy podľa úrovne služby',
 	'UI-ServiceManagementMenu-ContractsByStatus' => 'zmluvy podla stavu',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'zmluvy končiace za menej ako 30 dní',
-
 	'Menu:ProviderContract' => 'Poskytovateľské zmluvy',
 	'Menu:ProviderContract+' => '',
 	'Menu:CustomerContract' => 'Zákaznícke zmluvy',
@@ -198,23 +197,6 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:lnkContractToDocument/Attribute:document_name+' => '',
 ));
 
-//
-// Class: lnkFunctionalCIToProviderContract
-//
-
-Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
-	'Class:lnkFunctionalCIToProviderContract' => 'väzba - Komponent / Poskytovateľská zmluva',
-	'Class:lnkFunctionalCIToProviderContract+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Poskytovateľská zmluva',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Názov poskytovateľského zmluvy',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'Zariadenie',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'Názov CI',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
-));
-
 //
 // Class: ServiceFamily
 //
@@ -466,23 +448,6 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:lnkProviderContractToService/Attribute:providercontract_name+' => '',
 ));
 
-//
-// Class: lnkFunctionalCIToService
-//
-
-Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
-	'Class:lnkFunctionalCIToService' => 'väzba - Komponent / Služba',
-	'Class:lnkFunctionalCIToService+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Služba',
-	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Názov služby',
-	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'Zariadenie',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'Názov CI',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '',
-));
-
 //
 // Class: DeliveryModel
 //
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/tr.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/tr.dict.itop-service-mgmt.php
index a9f5ae313..7de05a913 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/tr.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/tr.dict.itop-service-mgmt.php
@@ -39,7 +39,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Hizmet seviyesine göre sözleşmeler',
 	'UI-ServiceManagementMenu-ContractsByStatus' => 'Durumuna göre sözleşmeler',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => '30 gün çinde biten sözleşmeler',
-
 	'Menu:ProviderContract' => 'Tedarikçi Sözleşmeleri',
 	'Menu:ProviderContract+' => 'Tedarikçi Sözleşmeleri',
 	'Menu:CustomerContract' => 'Müşteri Sözleşmeleri',
@@ -200,23 +199,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:lnkContractToDocument/Attribute:document_name+' => '~~',
 ));
 
-//
-// Class: lnkFunctionalCIToProviderContract
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:lnkFunctionalCIToProviderContract' => 'Link FunctionalCI / ProviderContract~~',
-	'Class:lnkFunctionalCIToProviderContract+' => '~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Provider contract~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Provider contract Name~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'CI Name~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '~~',
-));
-
 //
 // Class: ServiceFamily
 //
@@ -468,23 +450,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:lnkProviderContractToService/Attribute:providercontract_name+' => '~~',
 ));
 
-//
-// Class: lnkFunctionalCIToService
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:lnkFunctionalCIToService' => 'Link FunctionalCI / Service~~',
-	'Class:lnkFunctionalCIToService+' => '~~',
-	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Service~~',
-	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '~~',
-	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Service Name~~',
-	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '~~',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'CI~~',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '~~',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'CI Name~~',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '~~',
-));
-
 //
 // Class: DeliveryModel
 //
diff --git a/datamodels/2.x/itop-service-mgmt/dictionaries/zh_cn.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/dictionaries/zh_cn.dict.itop-service-mgmt.php
index b0562e714..b5ef4b3cb 100644
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/zh_cn.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/zh_cn.dict.itop-service-mgmt.php
@@ -37,7 +37,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI-ServiceManagementMenu-ContractsBySrvLevel' => '合同(按服务等级)',
 	'UI-ServiceManagementMenu-ContractsByStatus' => '合同(按状态)',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contracts ending in less then 30 days',
-
 	'Menu:ProviderContract' => '供应商合同',
 	'Menu:ProviderContract+' => '供应商合同',
 	'Menu:CustomerContract' => '客户合同',
@@ -198,23 +197,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:lnkContractToDocument/Attribute:document_name+' => '',
 ));
 
-//
-// Class: lnkFunctionalCIToProviderContract
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:lnkFunctionalCIToProviderContract' => '关联 功能配置项/供应商合同',
-	'Class:lnkFunctionalCIToProviderContract+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => '供应商合同',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => '供应商合同名称',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => '配置项',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => '配置项名称',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
-));
-
 //
 // Class: ServiceFamily
 //
@@ -466,23 +448,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:lnkProviderContractToService/Attribute:providercontract_name+' => '',
 ));
 
-//
-// Class: lnkFunctionalCIToService
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:lnkFunctionalCIToService' => '关联 功能配置项/服务',
-	'Class:lnkFunctionalCIToService+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:service_id' => '服务',
-	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:service_name' => '服务名称',
-	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => '配置项',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => '配置项名称',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '',
-));
-
 //
 // Class: DeliveryModel
 //
diff --git a/datamodels/2.x/itop-structure/cs.dict.itop-structure.php b/datamodels/2.x/itop-structure/cs.dict.itop-structure.php
index ecebf0410..38bf8b3f4 100644
--- a/datamodels/2.x/itop-structure/cs.dict.itop-structure.php
+++ b/datamodels/2.x/itop-structure/cs.dict.itop-structure.php
@@ -223,10 +223,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:Document/Attribute:status/Value:published+' => '',
 	'Class:Document/Attribute:cis_list' => 'Konfigurační položky',
 	'Class:Document/Attribute:cis_list+' => '',
-	'Class:Document/Attribute:contracts_list' => 'Smlouvy',
-	'Class:Document/Attribute:contracts_list+' => '',
-	'Class:Document/Attribute:services_list' => 'Služby',
-	'Class:Document/Attribute:services_list+' => '',
 	'Class:Document/Attribute:finalclass' => 'Typ dokumentu',
 	'Class:Document/Attribute:finalclass+' => '',
 ));
diff --git a/datamodels/2.x/itop-structure/da.dict.itop-structure.php b/datamodels/2.x/itop-structure/da.dict.itop-structure.php
index f50c316d7..a4f4e045a 100644
--- a/datamodels/2.x/itop-structure/da.dict.itop-structure.php
+++ b/datamodels/2.x/itop-structure/da.dict.itop-structure.php
@@ -212,10 +212,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:Document/Attribute:status/Value:published+' => '',
 	'Class:Document/Attribute:cis_list' => 'CIs',
 	'Class:Document/Attribute:cis_list+' => '',
-	'Class:Document/Attribute:contracts_list' => 'Kontrakter',
-	'Class:Document/Attribute:contracts_list+' => '',
-	'Class:Document/Attribute:services_list' => 'Ydelser',
-	'Class:Document/Attribute:services_list+' => '',
 	'Class:Document/Attribute:finalclass' => 'Dokumenttype',
 	'Class:Document/Attribute:finalclass+' => '',
 ));
diff --git a/datamodels/2.x/itop-config-mgmt/data.sample.locations.xml b/datamodels/2.x/itop-structure/data.sample.locations.xml
old mode 100755
new mode 100644
similarity index 100%
rename from datamodels/2.x/itop-config-mgmt/data.sample.locations.xml
rename to datamodels/2.x/itop-structure/data.sample.locations.xml
diff --git a/datamodels/2.x/itop-structure/datamodel.itop-structure.xml b/datamodels/2.x/itop-structure/datamodel.itop-structure.xml
index 68ec80c47..607816f9f 100644
--- a/datamodels/2.x/itop-structure/datamodel.itop-structure.xml
+++ b/datamodels/2.x/itop-structure/datamodel.itop-structure.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.6">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.7">
 <classes>
 		<class id="Organization" _delta="define">
 			<parent>cmdbAbstractObject</parent>
@@ -588,9 +588,6 @@
 				</field>
 				<field id="manager_id" xsi:type="AttributeExternalKey">
 					<filter><![CDATA[SELECT Person]]></filter>
-					<dependencies>
-						<attribute id="org_id"/>
-					</dependencies>
 					<sql>manager_id</sql>
 					<target_class>Person</target_class>
 					<is_null_allowed>true</is_null_allowed>
diff --git a/datamodels/2.x/itop-structure/de.dict.itop-structure.php b/datamodels/2.x/itop-structure/de.dict.itop-structure.php
index 6fdca2673..0f3051340 100644
--- a/datamodels/2.x/itop-structure/de.dict.itop-structure.php
+++ b/datamodels/2.x/itop-structure/de.dict.itop-structure.php
@@ -223,10 +223,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Document/Attribute:status/Value:published+' => '',
 	'Class:Document/Attribute:cis_list' => 'CIs',
 	'Class:Document/Attribute:cis_list+' => '',
-	'Class:Document/Attribute:contracts_list' => 'Verträge',
-	'Class:Document/Attribute:contracts_list+' => '',
-	'Class:Document/Attribute:services_list' => 'Services',
-	'Class:Document/Attribute:services_list+' => '',
 	'Class:Document/Attribute:finalclass' => 'Dokumenttyp',
 	'Class:Document/Attribute:finalclass+' => '',
 ));
diff --git a/datamodels/2.x/itop-structure/en.dict.itop-structure.php b/datamodels/2.x/itop-structure/en.dict.itop-structure.php
index f81435ce5..70db940f2 100644
--- a/datamodels/2.x/itop-structure/en.dict.itop-structure.php
+++ b/datamodels/2.x/itop-structure/en.dict.itop-structure.php
@@ -21,22 +21,7 @@
  * along with iTop. If not, see <http://www.gnu.org/licenses/>
  */
 
-//////////////////////////////////////////////////////////////////////
-// Relations
-//////////////////////////////////////////////////////////////////////
-//
 
-Dict::Add('EN US', 'English', 'English', array(
-	'Relation:impacts/Description' => 'Elements impacted by',
-	'Relation:impacts/DownStream' => 'Impacts...',
-	'Relation:impacts/DownStream+' => 'Elements impacted by',
-	'Relation:impacts/UpStream' => 'Depends on......',
-	'Relation:impacts/UpStream+' => 'Elements impacting',
-	// Legacy entries
-	'Relation:depends on/Description' => 'Elements impacting',
-	'Relation:depends on/DownStream' => 'Depends on...',
-	'Relation:depends on/UpStream' => 'Impacts...',
-));
 
 
 // Dictionnay conventions
@@ -261,10 +246,6 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:Document/Attribute:status/Value:published+' => '',
 	'Class:Document/Attribute:cis_list' => 'CIs',
 	'Class:Document/Attribute:cis_list+' => 'All the configuration items linked to this document',
-	'Class:Document/Attribute:contracts_list' => 'Contracts',
-	'Class:Document/Attribute:contracts_list+' => 'All the contracts linked to this document',
-	'Class:Document/Attribute:services_list' => 'Services',
-	'Class:Document/Attribute:services_list+' => 'All the services linked to this document',
 	'Class:Document/Attribute:finalclass' => 'Document sub-class',
 	'Class:Document/Attribute:finalclass+' => 'Name of the final class',
 ));
diff --git a/datamodels/2.x/itop-structure/es_cr.dict.itop-structure.php b/datamodels/2.x/itop-structure/es_cr.dict.itop-structure.php
index a900d3aad..5e3b60d6c 100644
--- a/datamodels/2.x/itop-structure/es_cr.dict.itop-structure.php
+++ b/datamodels/2.x/itop-structure/es_cr.dict.itop-structure.php
@@ -216,10 +216,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'Class:Document/Attribute:status/Value:published+' => 'Publicado',
 	'Class:Document/Attribute:cis_list' => 'ECs',
 	'Class:Document/Attribute:cis_list+' => 'Elementos de Configuración referenciados en este documento',
-	'Class:Document/Attribute:contracts_list' => 'Contratos',
-	'Class:Document/Attribute:contracts_list+' => 'Contratos Referenciados con este Documento',
-	'Class:Document/Attribute:services_list' => 'Servicios',
-	'Class:Document/Attribute:services_list+' => 'Servicios Referenciados con este Documento',
 	'Class:Document/Attribute:finalclass' => 'Tipo de Documento',
 	'Class:Document/Attribute:finalclass+' => 'Tipo de Documento',
 ));
diff --git a/datamodels/2.x/itop-structure/fr.dict.itop-structure.php b/datamodels/2.x/itop-structure/fr.dict.itop-structure.php
index 635a56afb..a67010afa 100644
--- a/datamodels/2.x/itop-structure/fr.dict.itop-structure.php
+++ b/datamodels/2.x/itop-structure/fr.dict.itop-structure.php
@@ -23,17 +23,7 @@
 //
 // Class: Organization
 //
-Dict::Add('FR FR', 'French', 'Français', array(
-	'Relation:impacts/Description' => 'Eléments impactés par',
-	'Relation:impacts/DownStream' => 'Impacte...',
-	'Relation:impacts/DownStream+' => 'Eléments impactés par',
-	'Relation:impacts/UpStream' => 'Dépend de...',
-	'Relation:impacts/UpStream+' => 'Eléments dont dépend',
-	// Legacy entries
-	'Relation:depends on/Description' => 'Eléments dont dépend',
-	'Relation:depends on/DownStream' => 'Dépend de...',
-	'Relation:depends on/UpStream' => 'Impacte...',
-));
+
 
 
 // Dictionnay conventions
@@ -259,10 +249,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:Document/Attribute:status/Value:published+' => '',
 	'Class:Document/Attribute:cis_list' => 'CIs',
 	'Class:Document/Attribute:cis_list+' => '',
-	'Class:Document/Attribute:contracts_list' => 'Contrats',
-	'Class:Document/Attribute:contracts_list+' => '',
-	'Class:Document/Attribute:services_list' => 'Services',
-	'Class:Document/Attribute:services_list+' => '',
 	'Class:Document/Attribute:finalclass' => 'Sous-classe de Document',
 	'Class:Document/Attribute:finalclass+' => 'Nom de la classe instanciable',
 ));
diff --git a/datamodels/2.x/itop-structure/hu.dict.itop-structure.php b/datamodels/2.x/itop-structure/hu.dict.itop-structure.php
index ca15ab7e5..f19bed7d4 100644
--- a/datamodels/2.x/itop-structure/hu.dict.itop-structure.php
+++ b/datamodels/2.x/itop-structure/hu.dict.itop-structure.php
@@ -214,10 +214,6 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:Document/Attribute:status/Value:published+' => '',
 	'Class:Document/Attribute:cis_list' => 'CIs~~',
 	'Class:Document/Attribute:cis_list+' => 'All the configuration items linked to this document~~',
-	'Class:Document/Attribute:contracts_list' => 'Contracts~~',
-	'Class:Document/Attribute:contracts_list+' => 'All the contracts linked to this document~~',
-	'Class:Document/Attribute:services_list' => 'Services~~',
-	'Class:Document/Attribute:services_list+' => 'All the services linked to this document~~',
 	'Class:Document/Attribute:finalclass' => 'Document Type~~',
 	'Class:Document/Attribute:finalclass+' => 'Name of the final class~~',
 ));
@@ -269,6 +265,24 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:Typology/Attribute:finalclass+' => 'Name of the final class~~',
 ));
 
+//
+// Class: DocumentType
+//
+
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+	'Class:DocumentType' => 'Document Type~~',
+	'Class:DocumentType+' => '~~',
+));
+
+//
+// Class: ContactType
+//
+
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+	'Class:ContactType' => 'Contact Type~~',
+	'Class:ContactType+' => '~~',
+));
+
 //
 // Class: lnkPersonToTeam
 //
@@ -331,5 +345,4 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'UI_WelcomeMenu_AllConfigItems' => 'Summary~~',
 	'Menu:ConfigManagement:Typology' => 'Typology configuration~~',
 ));
-
 ?>
\ No newline at end of file
diff --git a/datamodels/2.x/itop-structure/it.dict.itop-structure.php b/datamodels/2.x/itop-structure/it.dict.itop-structure.php
index d343b016d..2ea205c8f 100644
--- a/datamodels/2.x/itop-structure/it.dict.itop-structure.php
+++ b/datamodels/2.x/itop-structure/it.dict.itop-structure.php
@@ -214,10 +214,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:Document/Attribute:status/Value:published+' => '',
 	'Class:Document/Attribute:cis_list' => 'CIs~~',
 	'Class:Document/Attribute:cis_list+' => 'All the configuration items linked to this document~~',
-	'Class:Document/Attribute:contracts_list' => 'Contracts~~',
-	'Class:Document/Attribute:contracts_list+' => 'All the contracts linked to this document~~',
-	'Class:Document/Attribute:services_list' => 'Services~~',
-	'Class:Document/Attribute:services_list+' => 'All the services linked to this document~~',
 	'Class:Document/Attribute:finalclass' => 'Document Type~~',
 	'Class:Document/Attribute:finalclass+' => 'Name of the final class~~',
 ));
@@ -347,5 +343,4 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Menu:Typology+' => 'Typology configuration~~',
 	'UI_WelcomeMenu_AllConfigItems' => 'Summary~~',
 	'Menu:ConfigManagement:Typology' => 'Typology configuration~~',
-
 ));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-structure/ja.dict.itop-structure.php b/datamodels/2.x/itop-structure/ja.dict.itop-structure.php
index ee3831f4a..b36f971dd 100644
--- a/datamodels/2.x/itop-structure/ja.dict.itop-structure.php
+++ b/datamodels/2.x/itop-structure/ja.dict.itop-structure.php
@@ -215,10 +215,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:Document/Attribute:status/Value:published+' => '',
 	'Class:Document/Attribute:cis_list' => 'CI',
 	'Class:Document/Attribute:cis_list+' => '',
-	'Class:Document/Attribute:contracts_list' => '契約',
-	'Class:Document/Attribute:contracts_list+' => '',
-	'Class:Document/Attribute:services_list' => 'サービス',
-	'Class:Document/Attribute:services_list+' => '',
 	'Class:Document/Attribute:finalclass' => '文書タイプ',
 	'Class:Document/Attribute:finalclass+' => '',
 ));
diff --git a/datamodels/2.x/itop-structure/module.itop-structure.php b/datamodels/2.x/itop-structure/module.itop-structure.php
index 829e3f693..0ffe6ba92 100644
--- a/datamodels/2.x/itop-structure/module.itop-structure.php
+++ b/datamodels/2.x/itop-structure/module.itop-structure.php
@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-structure/2.7.1',
+	'itop-structure/2.8.0',
 	array(
 		// Identification
 		//
@@ -28,10 +28,11 @@ SetupWebPage::AddModule(
 		),
 		'data.sample' => array(
 			'data.sample.organizations.xml',
+			'data.sample.locations.xml',
 			'data.sample.persons.xml',
 			'data.sample.teams.xml',
 			'data.sample.contactteam.xml',
-
+			'data.sample.contacttype.xml',
 		),
 		
 		// Documentation
diff --git a/datamodels/2.x/itop-structure/nl.dict.itop-structure.php b/datamodels/2.x/itop-structure/nl.dict.itop-structure.php
index 81a2ac216..7604691ff 100644
--- a/datamodels/2.x/itop-structure/nl.dict.itop-structure.php
+++ b/datamodels/2.x/itop-structure/nl.dict.itop-structure.php
@@ -220,10 +220,6 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:Document/Attribute:status/Value:published+' => '',
 	'Class:Document/Attribute:cis_list' => 'CI\'s',
 	'Class:Document/Attribute:cis_list+' => 'Alle configuratie-items gerelateerd aan dit document',
-	'Class:Document/Attribute:contracts_list' => 'Contracten',
-	'Class:Document/Attribute:contracts_list+' => 'Alle contracten gerelateerd aan dit document',
-	'Class:Document/Attribute:services_list' => 'Services',
-	'Class:Document/Attribute:services_list+' => 'Alle services gerelateerd aan dit document.',
 	'Class:Document/Attribute:finalclass' => 'Subklasse document',
 	'Class:Document/Attribute:finalclass+' => '',
 ));
diff --git a/datamodels/2.x/itop-structure/pt_br.dict.itop-structure.php b/datamodels/2.x/itop-structure/pt_br.dict.itop-structure.php
index 440647436..763b8ab90 100644
--- a/datamodels/2.x/itop-structure/pt_br.dict.itop-structure.php
+++ b/datamodels/2.x/itop-structure/pt_br.dict.itop-structure.php
@@ -215,10 +215,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:Document/Attribute:status/Value:published+' => '',
 	'Class:Document/Attribute:cis_list' => 'CIs',
 	'Class:Document/Attribute:cis_list+' => 'Todos os itens de configuração vinculados a esse documento',
-	'Class:Document/Attribute:contracts_list' => 'Contratos',
-	'Class:Document/Attribute:contracts_list+' => 'Todos os contratos vinculados com esse documento',
-	'Class:Document/Attribute:services_list' => 'Services',
-	'Class:Document/Attribute:services_list+' => 'Todos os serviços vinculados a esse documento',
 	'Class:Document/Attribute:finalclass' => 'Tipo documento',
 	'Class:Document/Attribute:finalclass+' => '',
 ));
diff --git a/datamodels/2.x/itop-structure/ru.dict.itop-structure.php b/datamodels/2.x/itop-structure/ru.dict.itop-structure.php
index a7efe8d20..4df99bded 100644
--- a/datamodels/2.x/itop-structure/ru.dict.itop-structure.php
+++ b/datamodels/2.x/itop-structure/ru.dict.itop-structure.php
@@ -200,10 +200,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:Document/Attribute:status/Value:published+' => '',
 	'Class:Document/Attribute:cis_list' => 'КЕ',
 	'Class:Document/Attribute:cis_list+' => 'Связанные конфигурационные единицы',
-	'Class:Document/Attribute:contracts_list' => 'Договоры',
-	'Class:Document/Attribute:contracts_list+' => 'Связанные договоры',
-	'Class:Document/Attribute:services_list' => 'Услуги',
-	'Class:Document/Attribute:services_list+' => 'Связанные услуги',
 	'Class:Document/Attribute:finalclass' => 'Тип',
 	'Class:Document/Attribute:finalclass+' => '',
 ));
diff --git a/datamodels/2.x/itop-structure/sk.dict.itop-structure.php b/datamodels/2.x/itop-structure/sk.dict.itop-structure.php
index f2d42f26a..13b9ac83f 100644
--- a/datamodels/2.x/itop-structure/sk.dict.itop-structure.php
+++ b/datamodels/2.x/itop-structure/sk.dict.itop-structure.php
@@ -213,10 +213,6 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:Document/Attribute:status/Value:published+' => '',
 	'Class:Document/Attribute:cis_list' => 'Komponenty',
 	'Class:Document/Attribute:cis_list+' => '',
-	'Class:Document/Attribute:contracts_list' => 'Zmluvy',
-	'Class:Document/Attribute:contracts_list+' => '',
-	'Class:Document/Attribute:services_list' => 'Služby',
-	'Class:Document/Attribute:services_list+' => '',
 	'Class:Document/Attribute:finalclass' => 'Typ dokumentu',
 	'Class:Document/Attribute:finalclass+' => '',
 ));
diff --git a/datamodels/2.x/itop-structure/tr.dict.itop-structure.php b/datamodels/2.x/itop-structure/tr.dict.itop-structure.php
index 4ac08ddd3..4f9843630 100644
--- a/datamodels/2.x/itop-structure/tr.dict.itop-structure.php
+++ b/datamodels/2.x/itop-structure/tr.dict.itop-structure.php
@@ -215,10 +215,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:Document/Attribute:status/Value:published+' => '',
 	'Class:Document/Attribute:cis_list' => 'CIs~~',
 	'Class:Document/Attribute:cis_list+' => 'All the configuration items linked to this document~~',
-	'Class:Document/Attribute:contracts_list' => 'Contracts~~',
-	'Class:Document/Attribute:contracts_list+' => 'All the contracts linked to this document~~',
-	'Class:Document/Attribute:services_list' => 'Services~~',
-	'Class:Document/Attribute:services_list+' => 'All the services linked to this document~~',
 	'Class:Document/Attribute:finalclass' => 'Document Type~~',
 	'Class:Document/Attribute:finalclass+' => 'Name of the final class~~',
 ));
diff --git a/datamodels/2.x/itop-structure/zh_cn.dict.itop-structure.php b/datamodels/2.x/itop-structure/zh_cn.dict.itop-structure.php
index a8dc21e29..9afd2f100 100644
--- a/datamodels/2.x/itop-structure/zh_cn.dict.itop-structure.php
+++ b/datamodels/2.x/itop-structure/zh_cn.dict.itop-structure.php
@@ -213,10 +213,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:Document/Attribute:status/Value:published+' => '',
 	'Class:Document/Attribute:cis_list' => '配置项',
 	'Class:Document/Attribute:cis_list+' => '该文档关联的所有配置项',
-	'Class:Document/Attribute:contracts_list' => '合同',
-	'Class:Document/Attribute:contracts_list+' => '该文档关联的所有合同',
-	'Class:Document/Attribute:services_list' => '服务',
-	'Class:Document/Attribute:services_list+' => '该文档关联的所有服务',
 	'Class:Document/Attribute:finalclass' => '文档子类别',
 	'Class:Document/Attribute:finalclass+' => 'Name of the final class',
 ));
diff --git a/datamodels/2.x/itop-tickets/dictionaries/cs.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/cs.dict.itop-tickets.php
index 3d11e9998..6ae8d97e7 100644
--- a/datamodels/2.x/itop-tickets/dictionaries/cs.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/dictionaries/cs.dict.itop-tickets.php
@@ -214,3 +214,15 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTR',
 ));
+
+//
+// Class: Document
+//
+
+Dict::Add('CS CZ', 'Czech', 'Čeština', array(
+	'Class:Document/Attribute:contracts_list' => 'Smlouvy',
+	'Class:Document/Attribute:contracts_list+' => '',
+	'Class:Document/Attribute:services_list' => 'Služby',
+	'Class:Document/Attribute:services_list+' => '',
+));
+
diff --git a/datamodels/2.x/itop-tickets/dictionaries/da.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/da.dict.itop-tickets.php
index ba24dbf84..77e80e10a 100644
--- a/datamodels/2.x/itop-tickets/dictionaries/da.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/dictionaries/da.dict.itop-tickets.php
@@ -154,7 +154,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'WorkOrder:Details' => 'Detaljer',
 	'WorkOrder:Moreinfo' => 'Yderligere information',
 	'Tickets:ResolvedFrom' => 'Automatically resolved from %1$s~~',
-
 	'Class:cmdbAbstractObject/Method:Set' => 'Set~~',
 	'Class:cmdbAbstractObject/Method:Set+' => 'Set a field with a static value~~',
 	'Class:cmdbAbstractObject/Method:Set/Param:1' => 'Target Field~~',
@@ -200,3 +199,10 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve~~',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTR~~',
 ));
+
+Dict::Add('DA DA', 'Danish', 'Dansk', array(
+	'Class:Document/Attribute:contracts_list' => 'Kontrakter',
+	'Class:Document/Attribute:contracts_list+' => '',
+	'Class:Document/Attribute:services_list' => 'Ydelser',
+	'Class:Document/Attribute:services_list+' => '',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-tickets/dictionaries/de.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/de.dict.itop-tickets.php
index 94fed4080..17de83453 100644
--- a/datamodels/2.x/itop-tickets/dictionaries/de.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/dictionaries/de.dict.itop-tickets.php
@@ -142,7 +142,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 
 // Fieldset translation
 Dict::Add('DE DE', 'German', 'Deutsch', array(
-
 	'Ticket:baseinfo' => 'Allgemeine Informationen',
 	'Ticket:date' => 'Daten',
 	'Ticket:contact' => 'Kontakte',
@@ -156,7 +155,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'WorkOrder:Details' => 'Details',
 	'WorkOrder:Moreinfo' => 'Weitere Informationen',
 	'Tickets:ResolvedFrom' => 'Automatisch durch %1$s gelöst',
-
 	'Class:cmdbAbstractObject/Method:Set' => 'Set',
 	'Class:cmdbAbstractObject/Method:Set+' => 'Ein Attribut (Feld) mit einem statischen Wert beschreiben',
 	'Class:cmdbAbstractObject/Method:Set/Param:1' => 'Zielfeld',
@@ -202,3 +200,14 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve (Erstlösungszeit)',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Zielvorgabe (SLT) vom Typ TTR',
 ));
+
+//
+// Class: Document
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:Document/Attribute:contracts_list' => 'Verträge',
+	'Class:Document/Attribute:contracts_list+' => '',
+	'Class:Document/Attribute:services_list' => 'Services',
+	'Class:Document/Attribute:services_list+' => '',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-tickets/dictionaries/en.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/en.dict.itop-tickets.php
index 0f6357482..1ae80e023 100644
--- a/datamodels/2.x/itop-tickets/dictionaries/en.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/dictionaries/en.dict.itop-tickets.php
@@ -156,7 +156,6 @@ Dict::Add('EN US', 'English', 'English', array(
 
 // Fieldset translation
 Dict::Add('EN US', 'English', 'English', array(
-
 	'Ticket:baseinfo' => 'General Information',
 	'Ticket:date' => 'Dates',
 	'Ticket:contact' => 'Contacts',
@@ -170,7 +169,6 @@ Dict::Add('EN US', 'English', 'English', array(
 	'WorkOrder:Details' => 'Details',
 	'WorkOrder:Moreinfo' => 'More information',
 	'Tickets:ResolvedFrom' => 'Automatically resolved from %1$s',
-
 	'Class:cmdbAbstractObject/Method:Set' => 'Set',
 	'Class:cmdbAbstractObject/Method:Set+' => 'Set a field with a static value',
 	'Class:cmdbAbstractObject/Method:Set/Param:1' => 'Target Field',
@@ -216,3 +214,14 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTR',
 ));
+
+//
+// Class: Document
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:Document/Attribute:contracts_list' => 'Contracts',
+	'Class:Document/Attribute:contracts_list+' => 'All the contracts linked to this document',
+	'Class:Document/Attribute:services_list' => 'Services',
+	'Class:Document/Attribute:services_list+' => 'All the services linked to this document',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-tickets/dictionaries/es_cr.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/es_cr.dict.itop-tickets.php
index 76d6b0d88..b7ded5b05 100644
--- a/datamodels/2.x/itop-tickets/dictionaries/es_cr.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/dictionaries/es_cr.dict.itop-tickets.php
@@ -214,3 +214,14 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Tiempo a Resolución',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Objetivo basado en SLT de tipo TTR',
 ));
+
+//
+// Class: Document
+//
+
+Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+	'Class:Document/Attribute:contracts_list' => 'Contratos',
+	'Class:Document/Attribute:contracts_list+' => 'Contratos Referenciados con este Documento',
+	'Class:Document/Attribute:services_list' => 'Servicios',
+	'Class:Document/Attribute:services_list+' => 'Servicios Referenciados con este Documento',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-tickets/dictionaries/fr.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/fr.dict.itop-tickets.php
index 500f6f64f..c62e3199b 100644
--- a/datamodels/2.x/itop-tickets/dictionaries/fr.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/dictionaries/fr.dict.itop-tickets.php
@@ -142,7 +142,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 
 // Fieldset translation
 Dict::Add('FR FR', 'French', 'Français', array(
-
 	'Ticket:baseinfo' => 'Informations générales',
 	'Ticket:date' => 'Dates',
 	'Ticket:contact' => 'Contacts',
@@ -201,3 +200,14 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Temps de Résolution (TTR)',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Objectif calculé à partir d\'un SLT de type TTR',
 ));
+
+//
+// Class: Document
+//
+
+Dict::Add('FR FR', 'French', 'Français', array(
+	'Class:Document/Attribute:contracts_list' => 'Contrats',
+	'Class:Document/Attribute:contracts_list+' => '',
+	'Class:Document/Attribute:services_list' => 'Services',
+	'Class:Document/Attribute:services_list+' => '',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-tickets/dictionaries/hu.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/hu.dict.itop-tickets.php
index c9d69327e..2441637de 100644
--- a/datamodels/2.x/itop-tickets/dictionaries/hu.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/dictionaries/hu.dict.itop-tickets.php
@@ -199,3 +199,14 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve~~',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTR~~',
 ));
+
+//
+// Class: Document
+//
+
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+	'Class:Document/Attribute:contracts_list' => 'Contracts~~',
+	'Class:Document/Attribute:contracts_list+' => 'All the contracts linked to this document~~',
+	'Class:Document/Attribute:services_list' => 'Services~~',
+	'Class:Document/Attribute:services_list+' => 'All the services linked to this document~~',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-tickets/dictionaries/it.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/it.dict.itop-tickets.php
index d3073512d..89f40dd9f 100644
--- a/datamodels/2.x/itop-tickets/dictionaries/it.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/dictionaries/it.dict.itop-tickets.php
@@ -199,3 +199,14 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve~~',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTR~~',
 ));
+
+//
+// Class: Document
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:Document/Attribute:contracts_list' => 'Contracts~~',
+	'Class:Document/Attribute:contracts_list+' => 'All the contracts linked to this document~~',
+	'Class:Document/Attribute:services_list' => 'Services~~',
+	'Class:Document/Attribute:services_list+' => 'All the services linked to this document~~',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-tickets/dictionaries/ja.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/ja.dict.itop-tickets.php
index 139244563..4757e6a89 100644
--- a/datamodels/2.x/itop-tickets/dictionaries/ja.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/dictionaries/ja.dict.itop-tickets.php
@@ -199,3 +199,14 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve~~',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTR~~',
 ));
+
+//
+// Class: Document
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:Document/Attribute:contracts_list' => '契約',
+	'Class:Document/Attribute:contracts_list+' => '',
+	'Class:Document/Attribute:services_list' => 'サービス',
+	'Class:Document/Attribute:services_list+' => '',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-tickets/dictionaries/nl.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/nl.dict.itop-tickets.php
index 7489ac59d..1740ccbb8 100644
--- a/datamodels/2.x/itop-tickets/dictionaries/nl.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/dictionaries/nl.dict.itop-tickets.php
@@ -218,3 +218,14 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Doel gebaseerd op een SLT (TTR)',
 ));
+
+//
+// Class: Document
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:Document/Attribute:contracts_list' => 'Contracten',
+	'Class:Document/Attribute:contracts_list+' => 'Alle contracten gerelateerd aan dit document',
+	'Class:Document/Attribute:services_list' => 'Services',
+	'Class:Document/Attribute:services_list+' => 'Alle services gerelateerd aan dit document.',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-tickets/dictionaries/pt_br.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/pt_br.dict.itop-tickets.php
index f58b703cb..8da1b4463 100755
--- a/datamodels/2.x/itop-tickets/dictionaries/pt_br.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/dictionaries/pt_br.dict.itop-tickets.php
@@ -111,32 +111,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkContactToTicket/Attribute:role_code/Value:do_not_notify' => 'Não notificar',
 ));
 
-//
-// Class: lnkFunctionalCIToTicket
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkFunctionalCIToTicket' => 'Link CI / Solicitação',
-	'Class:lnkFunctionalCIToTicket+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Solicitação',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'Ref',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title' => 'Título do bilhete',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id' => 'CIs',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name' => 'Nome CI',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact' => 'Impacto',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code' => 'Impacto',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Adicionado manualmente',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Computado',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Não impactado',
-));
-
-
 //
 // Class: WorkOrder
 //
@@ -239,3 +213,14 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Objetivo baseado em um SLT do tipo TTR',
 ));
+
+//
+// Class: Document
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:Document/Attribute:contracts_list' => 'Contratos',
+	'Class:Document/Attribute:contracts_list+' => 'Todos os contratos vinculados com esse documento',
+	'Class:Document/Attribute:services_list' => 'Services',
+	'Class:Document/Attribute:services_list+' => 'Todos os serviços vinculados a esse documento',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-tickets/dictionaries/ru.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/ru.dict.itop-tickets.php
index 880c221bd..8bc3a3652 100644
--- a/datamodels/2.x/itop-tickets/dictionaries/ru.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/dictionaries/ru.dict.itop-tickets.php
@@ -191,3 +191,14 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve~~',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTR~~',
 ));
+
+//
+// Class: Document
+//
+
+Dict::Add('RU RU', 'Russian', 'Русский', array(
+	'Class:Document/Attribute:contracts_list' => 'Договоры',
+	'Class:Document/Attribute:contracts_list+' => 'Связанные договоры',
+	'Class:Document/Attribute:services_list' => 'Услуги',
+	'Class:Document/Attribute:services_list+' => 'Связанные услуги',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-tickets/dictionaries/sk.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/sk.dict.itop-tickets.php
index 58dec2f99..a0437796b 100644
--- a/datamodels/2.x/itop-tickets/dictionaries/sk.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/dictionaries/sk.dict.itop-tickets.php
@@ -212,3 +212,14 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve~~',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTR~~',
 ));
+
+//
+// Class: Document
+//
+
+Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
+	'Class:Document/Attribute:contracts_list' => 'Zmluvy',
+	'Class:Document/Attribute:contracts_list+' => '',
+	'Class:Document/Attribute:services_list' => 'Služby',
+	'Class:Document/Attribute:services_list+' => '',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-tickets/dictionaries/tr.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/tr.dict.itop-tickets.php
index 0624b8b8f..566b14982 100644
--- a/datamodels/2.x/itop-tickets/dictionaries/tr.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/dictionaries/tr.dict.itop-tickets.php
@@ -217,3 +217,14 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve~~',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTR~~',
 ));
+
+//
+// Class: Document
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:Document/Attribute:contracts_list' => 'Contracts~~',
+	'Class:Document/Attribute:contracts_list+' => 'All the contracts linked to this document~~',
+	'Class:Document/Attribute:services_list' => 'Services~~',
+	'Class:Document/Attribute:services_list+' => 'All the services linked to this document~~',
+));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-tickets/dictionaries/zh_cn.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/dictionaries/zh_cn.dict.itop-tickets.php
index 24dfda27d..cb8a02bee 100644
--- a/datamodels/2.x/itop-tickets/dictionaries/zh_cn.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/dictionaries/zh_cn.dict.itop-tickets.php
@@ -212,3 +212,14 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:ResponseTicketTTR/Interface:iMetricComputer' => '解决时间',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'SLT 的解决时间',
 ));
+
+//
+// Class: Document
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:Document/Attribute:contracts_list' => '合同',
+	'Class:Document/Attribute:contracts_list+' => '该文档关联的所有合同',
+	'Class:Document/Attribute:services_list' => '服务',
+	'Class:Document/Attribute:services_list+' => '该文档关联的所有服务',
+));
\ No newline at end of file
diff --git a/test/integration/iTopModulesPhpVersionChecklistTest.php b/test/integration/iTopModulesPhpVersionChecklistTest.php
index c71316265..c5bfd00f8 100644
--- a/test/integration/iTopModulesPhpVersionChecklistTest.php
+++ b/test/integration/iTopModulesPhpVersionChecklistTest.php
@@ -57,7 +57,7 @@ class iTopModulesPhpVersionIntegrationTest extends ItopTestCase
 			$matches
 		);
 
-		$this->assertRegExp("#$sExpectedVersion#", $matches[1], "$sPhpFile file refer does not refer to current itop version ($sModuleName/$matches[1] does not match regexp $sModuleName/$sExpectedVersion)");
+		$this->assertRegExp("#$sExpectedVersion#", $matches[1], " $sPhpFile:2 file refer does not refer to current itop version ($sModuleName/$matches[1] does not match regexp $sModuleName/$sExpectedVersion)");
 
 	}
 
diff --git a/test/setup_params/default-params.xml b/test/setup_params/default-params.xml
index a4c34e769..2a4948724 100644
--- a/test/setup_params/default-params.xml
+++ b/test/setup_params/default-params.xml
@@ -1,72 +1,81 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <installation>
-<!-- On manual installs, this file is generated in setup/install-*.xml -->
-    <mode>install</mode>
-    <preinstall>
-        <copies type="array"/>
-    </preinstall>
-    <source_dir>datamodels/2.x/</source_dir>
-    <datamodel_version>2.5.0</datamodel_version>
-    <previous_configuration_file>default-config-itop.php</previous_configuration_file>
-    <extensions_dir>extensions</extensions_dir>
-    <target_env>production</target_env>
-    <workspace_dir></workspace_dir>
-    <database>
-        <server></server>
-        <user>jenkins_itop</user>
-        <pwd>IKnowYouSeeMeInJenkinsConf</pwd>
-        <name>itop_ci</name>
-        <db_tls_enabled></db_tls_enabled>
-        <db_tls_ca></db_tls_ca>
-        <prefix></prefix>
-    </database>
-    <url>http://localhost/iTop/</url>
-    <graphviz_path>/usr/bin/dot</graphviz_path>
-    <admin_account>
-        <user>admin</user>
-        <pwd>admin</pwd>
-        <language>EN US</language>
-    </admin_account>
-    <language>EN US</language>
-    <selected_modules type="array">
-      <item>authent-external</item>
-      <item>authent-local</item>
-      <item>itop-backup</item>
-      <item>itop-config</item>
-      <item>itop-profiles-itil</item>
-      <item>itop-sla-computation</item>
-      <item>itop-tickets</item>
-      <item>itop-welcome-itil</item>
-      <item>itop-config-mgmt</item>
-      <item>itop-attachments</item>
-      <item>itop-datacenter-mgmt</item>
-      <item>itop-endusers-devices</item>
-      <item>itop-storage-mgmt</item>
-      <item>itop-virtualization-mgmt</item>
-      <item>itop-bridge-virtualization-storage</item>
-      <item>itop-service-mgmt</item>
-      <item>itop-request-mgmt</item>
-      <item>itop-portal</item>
-      <item>itop-portal-base</item>
-      <item>itop-change-mgmt</item>
-      <item>itop-knownerror-mgmt</item>
-    </selected_modules>
-    <selected_extensions type="array">
-      <item>itop-config-mgmt-core</item>
-      <item>itop-config-mgmt-datacenter</item>
-      <item>itop-config-mgmt-end-user</item>
-      <item>itop-config-mgmt-storage</item>
-      <item>itop-config-mgmt-virtualization</item>
-      <item>itop-service-mgmt-enterprise</item>
-      <item>itop-ticket-mgmt-simple-ticket</item>
-      <item>itop-ticket-mgmt-simple-ticket-enhanced-portal</item>
-      <item>itop-change-mgmt-simple</item>
-      <item>itop-kown-error-mgmt</item>
-    </selected_extensions>
-    <sample_data>1</sample_data>
-    <old_addon></old_addon>
-    <options>
-        <generate_config>1</generate_config>
-    </options>
-    <mysql_bindir></mysql_bindir>
+	<!-- On manual installs, this file is generated in setup/install-*.xml -->
+	<mode>install</mode>
+	<preinstall>
+		<copies type="array"/>
+	</preinstall>
+	<source_dir>datamodels/2.x/</source_dir>
+	<datamodel_version>2.5.0</datamodel_version>
+	<previous_configuration_file>default-config-itop.php</previous_configuration_file>
+	<extensions_dir>extensions</extensions_dir>
+	<target_env>production</target_env>
+	<workspace_dir></workspace_dir>
+	<database>
+		<server></server>
+		<user>jenkins_itop</user>
+		<pwd>IKnowYouSeeMeInJenkinsConf</pwd>
+		<name>itop_ci</name>
+		<db_tls_enabled></db_tls_enabled>
+		<db_tls_ca></db_tls_ca>
+		<prefix></prefix>
+	</database>
+	<url>http://localhost/iTop/</url>
+	<graphviz_path>/usr/bin/dot</graphviz_path>
+	<admin_account>
+		<user>admin</user>
+		<pwd>admin</pwd>
+		<language>EN US</language>
+	</admin_account>
+	<language>EN US</language>
+	<selected_modules type="array">
+		<item>authent-cas</item>
+		<item>authent-external</item>
+		<item>authent-ldap</item>
+		<item>authent-local</item>
+		<item>itop-backup</item>
+		<item>itop-config</item>
+		<item>itop-files-information</item>
+		<item>itop-portal-base</item>
+		<item>itop-profiles-itil</item>
+		<item>itop-sla-computation</item>
+		<item>itop-welcome-itil</item>
+		<item>itop-structure</item>
+		<item>itop-config-mgmt</item>
+		<item>itop-attachments</item>
+		<item>itop-tickets</item>
+		<item>combodo-db-tools</item>
+		<item>itop-core-update</item>
+		<item>itop-hub-connector</item>
+		<item>itop-datacenter-mgmt</item>
+		<item>itop-endusers-devices</item>
+		<item>itop-storage-mgmt</item>
+		<item>itop-virtualization-mgmt</item>
+		<item>itop-bridge-virtualization-storage</item>
+		<item>itop-service-mgmt</item>
+		<item>itop-bridge-cmdb-ticket</item>
+		<item>itop-request-mgmt</item>
+		<item>itop-portal</item>
+		<item>itop-change-mgmt</item>
+		<item>itop-knownerror-light</item>
+		<item>itop-faq-light</item>
+	</selected_modules>
+	<selected_extensions type="array">
+		<item>itop-config-mgmt-core</item>
+		<item>itop-config-mgmt-datacenter</item>
+		<item>itop-config-mgmt-end-user</item>
+		<item>itop-config-mgmt-storage</item>
+		<item>itop-config-mgmt-virtualization</item>
+		<item>itop-service-mgmt-enterprise</item>
+		<item>itop-ticket-mgmt-simple-ticket</item>
+		<item>itop-ticket-mgmt-simple-ticket-enhanced-portal</item>
+		<item>itop-change-mgmt-simple</item>
+		<item>itop-kown-error-mgmt</item>
+	</selected_extensions>
+	<sample_data>1</sample_data>
+	<old_addon></old_addon>
+	<options>
+		<generate_config>1</generate_config>
+	</options>
+	<mysql_bindir></mysql_bindir>
 </installation>

From 80b3212a1970b893269bd9b8cd7645ba82ac8624 Mon Sep 17 00:00:00 2001
From: acognet <anne-catherine.cognet@combodo.com>
Date: Tue, 29 Sep 2020 09:12:47 +0200
Subject: [PATCH 21/43] =?UTF-8?q?N=C2=B03335=20-=20Notifications=20on=20th?=
 =?UTF-8?q?reshold=20don't=20work=20when=20trigger=20is=20created=20on=20i?=
 =?UTF-8?q?Top=202.7.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/ormstopwatch.class.inc.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/ormstopwatch.class.inc.php b/core/ormstopwatch.class.inc.php
index 1913a36c4..805f9f336 100644
--- a/core/ormstopwatch.class.inc.php
+++ b/core/ormstopwatch.class.inc.php
@@ -607,10 +607,11 @@ class CheckStopWatchThresholds implements iBackgroundProcess
 							// Activate any existing trigger
 							// 
 							$sClassList = implode("', '", MetaModel::EnumParentClasses($sClass, ENUM_PARENT_CLASSES_ALL));
+
 							$oTriggerSet = new DBObjectSet(
-								DBObjectSearch::FromOQL("SELECT TriggerOnThresholdReached AS t WHERE t.target_class IN ('$sClassList') AND stop_watch_code=:stop_watch_code AND threshold_index = :threshold_index"),
+								DBObjectSearch::FromOQL("SELECT TriggerOnThresholdReached AS t WHERE t.target_class IN ('$sClassList') AND stop_watch_code MATCHES '$sAttCode' AND threshold_index = :threshold_index"),
 								array(), // order by
-								array('stop_watch_code' => $sAttCode, 'threshold_index' => $iThreshold)
+								array('threshold_index' => $iThreshold)
 							);
 							while ($oTrigger = $oTriggerSet->Fetch())
 							{

From 05a0d61244795052695050b068db47322a470996 Mon Sep 17 00:00:00 2001
From: acognet <anne-catherine.cognet@combodo.com>
Date: Tue, 29 Sep 2020 10:27:05 +0200
Subject: [PATCH 22/43] =?UTF-8?q?N=C2=B03335=20-=20Notifications=20on=20th?=
 =?UTF-8?q?reshold=20don't=20work=20when=20trigger=20is=20created=20on=20i?=
 =?UTF-8?q?Top=202.7.1=20-=20nicer=20fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/oql/expression.class.inc.php |  7 +++++--
 core/oql/oql-parser.php           | 32 +++++++++++++++----------------
 core/oql/oqlquery.class.inc.php   |  2 +-
 core/oql/version.txt              |  2 +-
 core/ormstopwatch.class.inc.php   |  4 ++--
 5 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/core/oql/expression.class.inc.php b/core/oql/expression.class.inc.php
index 26efeb1d3..596823041 100644
--- a/core/oql/expression.class.inc.php
+++ b/core/oql/expression.class.inc.php
@@ -839,12 +839,15 @@ class MatchExpression extends BinaryExpression
 	 * MatchExpression constructor.
 	 *
 	 * @param \FieldExpression $oLeftExpr
-	 * @param \ScalarExpression $oRightExpr
+	 * @param \Expression $oRightExpr
 	 *
 	 * @throws \CoreException
 	 */
-	public function __construct(FieldExpression $oLeftExpr, ScalarExpression $oRightExpr)
+	public function __construct(FieldExpression $oLeftExpr, Expression $oRightExpr)
 	{
+		if (!$oRightExpr instanceof ScalarExpression && !$oRightExpr instanceof VariableExpression) {
+			throw new CoreException('Only instance of ScalarExpression or VariableExpression are allowed in MATCHES '.get_class( $oRightExpr).' found', $oRightExpr);
+		}
 		parent::__construct($oLeftExpr, 'MATCHES', $oRightExpr);
 	}
 
diff --git a/core/oql/oql-parser.php b/core/oql/oql-parser.php
index d2f752da4..c67ffff7a 100644
--- a/core/oql/oql-parser.php
+++ b/core/oql/oql-parser.php
@@ -1600,38 +1600,38 @@ static public $yy_action = array(
 	$this->_retvalue = new ListOqlExpression($this->yystack[$this->yyidx + -1]->minor);
     }
 #line 1606 "..\oql-parser.php"
-#line 132 "..\oql-parser.y"
+#line 131 "..\oql-parser.y"
     function yy_r43(){
 	$this->_retvalue = new NestedQueryOqlExpression($this->yystack[$this->yyidx + -1]->minor);
     }
 #line 1611 "..\oql-parser.php"
-#line 147 "..\oql-parser.y"
+#line 146 "..\oql-parser.y"
     function yy_r47(){
 	$this->_retvalue = array();
     }
 #line 1616 "..\oql-parser.php"
-#line 158 "..\oql-parser.y"
+#line 157 "..\oql-parser.y"
     function yy_r51(){ $this->_retvalue = new IntervalOqlExpression($this->yystack[$this->yyidx + -1]->minor, $this->yystack[$this->yyidx + 0]->minor);     }
 #line 1619 "..\oql-parser.php"
-#line 171 "..\oql-parser.y"
+#line 170 "..\oql-parser.y"
     function yy_r61(){ $this->_retvalue = new ScalarOqlExpression($this->yystack[$this->yyidx + 0]->minor);     }
 #line 1622 "..\oql-parser.php"
-#line 173 "..\oql-parser.y"
+#line 172 "..\oql-parser.y"
     function yy_r63(){ $this->_retvalue = new ScalarOqlExpression(null);     }
 #line 1625 "..\oql-parser.php"
-#line 175 "..\oql-parser.y"
+#line 174 "..\oql-parser.y"
     function yy_r64(){ $this->_retvalue = new FieldOqlExpression($this->yystack[$this->yyidx + 0]->minor);     }
 #line 1628 "..\oql-parser.php"
-#line 176 "..\oql-parser.y"
+#line 175 "..\oql-parser.y"
     function yy_r65(){ $this->_retvalue = new FieldOqlExpression($this->yystack[$this->yyidx + 0]->minor, $this->yystack[$this->yyidx + -2]->minor);     }
 #line 1631 "..\oql-parser.php"
-#line 177 "..\oql-parser.y"
+#line 176 "..\oql-parser.y"
     function yy_r66(){ $this->_retvalue=$this->yystack[$this->yyidx + 0]->minor;     }
 #line 1634 "..\oql-parser.php"
-#line 180 "..\oql-parser.y"
+#line 179 "..\oql-parser.y"
     function yy_r67(){ $this->_retvalue = new VariableOqlExpression(substr($this->yystack[$this->yyidx + 0]->minor, 1));     }
 #line 1637 "..\oql-parser.php"
-#line 182 "..\oql-parser.y"
+#line 181 "..\oql-parser.y"
     function yy_r68(){
 	if ($this->yystack[$this->yyidx + 0]->minor[0] == '`')
 	{
@@ -1644,19 +1644,19 @@ static public $yy_action = array(
 	$this->_retvalue = new OqlName($name, $this->m_iColPrev);
     }
 #line 1650 "..\oql-parser.php"
-#line 193 "..\oql-parser.y"
+#line 192 "..\oql-parser.y"
     function yy_r69(){$this->_retvalue=(int)$this->yystack[$this->yyidx + 0]->minor;    }
 #line 1653 "..\oql-parser.php"
-#line 194 "..\oql-parser.y"
+#line 193 "..\oql-parser.y"
     function yy_r70(){$this->_retvalue=(int)-$this->yystack[$this->yyidx + 0]->minor;    }
 #line 1656 "..\oql-parser.php"
-#line 195 "..\oql-parser.y"
+#line 194 "..\oql-parser.y"
     function yy_r71(){$this->_retvalue=new OqlHexValue($this->yystack[$this->yyidx + 0]->minor);    }
 #line 1659 "..\oql-parser.php"
-#line 196 "..\oql-parser.y"
+#line 195 "..\oql-parser.y"
     function yy_r72(){$this->_retvalue=stripslashes(substr($this->yystack[$this->yyidx + 0]->minor, 1, strlen($this->yystack[$this->yyidx + 0]->minor) - 2));    }
 #line 1662 "..\oql-parser.php"
-#line 199 "..\oql-parser.y"
+#line 198 "..\oql-parser.y"
     function yy_r73(){$this->_retvalue=$this->yystack[$this->yyidx + 0]->minor;    }
 #line 1665 "..\oql-parser.php"
 
@@ -1940,7 +1940,7 @@ throw new OQLParserException($this->m_sSourceQuery, $this->m_iLine, $this->m_iCo
         } while ($yymajor != self::YYNOCODE && $this->yyidx >= 0);
     }
 }
-#line 264 "..\oql-parser.y"
+#line 263 "..\oql-parser.y"
 
 
 class OQLParserException extends OQLException
diff --git a/core/oql/oqlquery.class.inc.php b/core/oql/oqlquery.class.inc.php
index bc357c0c5..6a4bd5cd8 100644
--- a/core/oql/oqlquery.class.inc.php
+++ b/core/oql/oqlquery.class.inc.php
@@ -173,7 +173,7 @@ class MatchOqlExpression extends MatchExpression implements CheckableExpression
 			throw new OqlNormalizeException('Only "field MATCHES string" syntax is allowed', $sSourceQuery, new OqlName($this->m_oLeftExpr->RenderExpression(true), 0));
 		}
 		// Only field MATCHES scalar is allowed
-		if (!$this->m_oRightExpr instanceof ScalarExpression)
+		if (!$this->m_oRightExpr instanceof ScalarExpression && !$this->m_oRightExpr instanceof VariableOqlExpression)
 		{
 			throw new OqlNormalizeException('Only "field MATCHES string" syntax is allowed', $sSourceQuery, new OqlName($this->m_oRightExpr->RenderExpression(true), 0));
 		}
diff --git a/core/oql/version.txt b/core/oql/version.txt
index 3c8103be0..26a3e601d 100644
--- a/core/oql/version.txt
+++ b/core/oql/version.txt
@@ -1 +1 @@
-2019-12-03
\ No newline at end of file
+2020-09-29
\ No newline at end of file
diff --git a/core/ormstopwatch.class.inc.php b/core/ormstopwatch.class.inc.php
index 805f9f336..7bbe8e815 100644
--- a/core/ormstopwatch.class.inc.php
+++ b/core/ormstopwatch.class.inc.php
@@ -609,9 +609,9 @@ class CheckStopWatchThresholds implements iBackgroundProcess
 							$sClassList = implode("', '", MetaModel::EnumParentClasses($sClass, ENUM_PARENT_CLASSES_ALL));
 
 							$oTriggerSet = new DBObjectSet(
-								DBObjectSearch::FromOQL("SELECT TriggerOnThresholdReached AS t WHERE t.target_class IN ('$sClassList') AND stop_watch_code MATCHES '$sAttCode' AND threshold_index = :threshold_index"),
+								DBObjectSearch::FromOQL("SELECT TriggerOnThresholdReached AS t WHERE t.target_class IN ('$sClassList') AND stop_watch_code MATCHES :stop_watch_code AND threshold_index = :threshold_index"),
 								array(), // order by
-								array('threshold_index' => $iThreshold)
+								array('stop_watch_code' => $sAttCode, 'threshold_index' => $iThreshold)
 							);
 							while ($oTrigger = $oTriggerSet->Fetch())
 							{

From 5a46bb8461626e6f1ca0f3d8887f7456599317a8 Mon Sep 17 00:00:00 2001
From: Eric <eric.espie@combodo.com>
Date: Tue, 29 Sep 2020 11:23:49 +0200
Subject: [PATCH 23/43] =?UTF-8?q?N=C2=B03320:=20Do=20not=20display=20empty?=
 =?UTF-8?q?=20tabs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/webpage.class.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/webpage.class.inc.php b/application/webpage.class.inc.php
index efd63088f..0134a815f 100644
--- a/application/webpage.class.inc.php
+++ b/application/webpage.class.inc.php
@@ -1549,7 +1549,7 @@ class TabManager
 					}
 
 					// N°3320: Do not display empty tabs
-					if (empty($aTabData['html']))
+					if (empty($aTabData['html']) && empty($aTabData['url']))
 					{
 						unset($aTabs['tabs'][$sTabCode]);
 					}

From bef1832ac71c3f5009ed604b6198c95c3d4b2ce6 Mon Sep 17 00:00:00 2001
From: Eric <eric.espie@combodo.com>
Date: Tue, 22 Sep 2020 11:39:19 +0200
Subject: [PATCH 24/43] =?UTF-8?q?N=C2=B03317=20-=20Add=20http=20headers?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/ajaxwebpage.class.inc.php                    | 4 +++-
 application/csvpage.class.inc.php                        | 6 ++++--
 application/itopwebpage.class.inc.php                    | 8 +++++---
 application/loginwebpage.class.inc.php                   | 4 +++-
 application/webpage.class.inc.php                        | 5 +++--
 application/xmlpage.class.inc.php                        | 6 ++++--
 datamodels/2.x/combodo-db-tools/dbtools.php              | 1 +
 datamodels/2.x/itop-backup/status.php                    | 1 +
 datamodels/2.x/itop-config/config.php                    | 1 +
 .../itop-hub-connector/hubconnectorpage.class.inc.php    | 9 ++++++---
 pages/UI.php                                             | 1 +
 pages/UniversalSearch.php                                | 1 +
 pages/notifications.php                                  | 1 +
 pages/run_query.php                                      | 1 +
 pages/schema.php                                         | 1 +
 webservices/export-v2.php                                | 9 +++++++++
 16 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/application/ajaxwebpage.class.inc.php b/application/ajaxwebpage.class.inc.php
index 2717943a2..f84d13918 100644
--- a/application/ajaxwebpage.class.inc.php
+++ b/application/ajaxwebpage.class.inc.php
@@ -48,7 +48,9 @@ class ajax_page extends WebPage implements iTabbedPage
         parent::__construct($s_title, $bPrintable);
         $this->m_sReadyScript = "";
 		//$this->add_header("Content-type: text/html; charset=utf-8");
-		$this->add_header("Cache-control: no-cache");
+		$this->add_header('Cache-control: no-cache, no-store, must-revalidate');
+	    $this->add_header('Pragma: no-cache');
+	    $this->add_header('Expires: 0');
 		$this->m_oTabs = new TabManager();
 		$this->sContentType = 'text/html';
 		$this->sContentDisposition = 'inline';
diff --git a/application/csvpage.class.inc.php b/application/csvpage.class.inc.php
index e16113408..537c23194 100644
--- a/application/csvpage.class.inc.php
+++ b/application/csvpage.class.inc.php
@@ -32,8 +32,10 @@ class CSVPage extends WebPage
     function __construct($s_title)
     {
         parent::__construct($s_title);
-		$this->add_header("Content-type: text/plain; charset=utf-8");
-		$this->add_header("Cache-control: no-cache");
+	    $this->add_header("Content-type: text/plain; charset=utf-8");
+	    $this->add_header('Cache-control: no-cache, no-store, must-revalidate');
+	    $this->add_header('Pragma: no-cache');
+	    $this->add_header('Expires: 0');
 		//$this->add_header("Content-Transfer-Encoding: binary");
     }	
 
diff --git a/application/itopwebpage.class.inc.php b/application/itopwebpage.class.inc.php
index 8be3a424b..19a3aa7cf 100644
--- a/application/itopwebpage.class.inc.php
+++ b/application/itopwebpage.class.inc.php
@@ -3,7 +3,7 @@
 //
 //   This file is part of iTop.
 //
-//   iTop is free software; you can redistribute it and/or modify	
+//   iTop is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU Affero General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
 //   (at your option) any later version.
@@ -72,7 +72,9 @@ class iTopWebPage extends NiceWebPage implements iTabbedPage
 		$this->m_aMessages = array();
 		$this->SetRootUrl(utils::GetAbsoluteUrlAppRoot());
 		$this->add_header("Content-type: text/html; charset=utf-8");
-		$this->add_header("Cache-control: no-cache");
+		$this->add_header('Cache-control: no-cache, no-store, must-revalidate');
+		$this->add_header('Pragma: no-cache');
+		$this->add_header('Expires: 0');
 		$this->add_linked_stylesheet("../css/jquery.treeview.css");
 		$this->add_linked_stylesheet("../css/jquery.autocomplete.css");
 		$this->add_linked_stylesheet("../css/jquery-ui-timepicker-addon.css");
@@ -337,7 +339,7 @@ EOF
 		.magnificPopup({type: 'image', closeOnContentClick: true });
 EOF
 		);
-		
+
 		$this->add_init_script(
 			<<< EOF
 	try
diff --git a/application/loginwebpage.class.inc.php b/application/loginwebpage.class.inc.php
index 424d1231d..02b03f12b 100644
--- a/application/loginwebpage.class.inc.php
+++ b/application/loginwebpage.class.inc.php
@@ -69,7 +69,9 @@ class LoginWebPage extends NiceWebPage
 
 		parent::__construct($sTitle);
 		$this->SetStyleSheet();
-		$this->add_header("Cache-control: no-cache");
+		$this->add_header('Cache-control: no-cache, no-store, must-revalidate');
+		$this->add_header('Pragma: no-cache');
+		$this->add_header('Expires: 0');
 	}
 	
 	public function SetStyleSheet()
diff --git a/application/webpage.class.inc.php b/application/webpage.class.inc.php
index d06c5c06e..b75707c17 100644
--- a/application/webpage.class.inc.php
+++ b/application/webpage.class.inc.php
@@ -355,8 +355,9 @@ class WebPage implements Page
 	 */
 	public function no_cache()
 	{
-		$this->add_header("Cache-Control: no-cache, must-revalidate");  // HTTP/1.1
-		$this->add_header("Expires: Fri, 17 Jul 1970 05:00:00 GMT");    // Date in the past
+		$this->add_header('Cache-control: no-cache, no-store, must-revalidate');
+		$this->add_header('Pragma: no-cache');
+		$this->add_header('Expires: 0');
 	}
 
 	/**
diff --git a/application/xmlpage.class.inc.php b/application/xmlpage.class.inc.php
index bb2341248..7a8cb47fc 100644
--- a/application/xmlpage.class.inc.php
+++ b/application/xmlpage.class.inc.php
@@ -43,7 +43,9 @@ class XMLPage extends WebPage
 		$this->m_bPassThrough = $bPassThrough;
 		$this->m_bHeaderSent = false;
 		$this->add_header("Content-type: text/xml; charset=utf-8");
-		$this->add_header("Cache-control: no-cache");
+		$this->add_header('Cache-control: no-cache, no-store, must-revalidate');
+		$this->add_header('Pragma: no-cache');
+		$this->add_header('Expires: 0');
 		$this->add_header("Content-location: export.xml");
 	}	
 
@@ -53,7 +55,7 @@ class XMLPage extends WebPage
 		{
 			// Get the unexpected output but do nothing with it
 			$sTrash = $this->ob_get_clean_safe();
-					
+
 			$this->s_content = "<?xml version=\"1.0\" encoding=\"UTF-8\"?".">\n".trim($this->s_content);
 			$this->add_header("Content-Length: ".strlen($this->s_content));
 			foreach($this->a_headers as $s_header)
diff --git a/datamodels/2.x/combodo-db-tools/dbtools.php b/datamodels/2.x/combodo-db-tools/dbtools.php
index 32e22353e..4635eca09 100644
--- a/datamodels/2.x/combodo-db-tools/dbtools.php
+++ b/datamodels/2.x/combodo-db-tools/dbtools.php
@@ -570,6 +570,7 @@ try
 	$sPageId = 'db-tools';
 
 	$oP = new iTopWebPage($sPageTitle);
+	$this->m_oPage->add_header('X-Frame-Options: deny');
 	$oP->add_saas('env-'.utils::GetCurrentEnvironment().'/combodo-db-tools/default.scss');
 
 	$oP->add(
diff --git a/datamodels/2.x/itop-backup/status.php b/datamodels/2.x/itop-backup/status.php
index feeeb9b1b..d33615680 100644
--- a/datamodels/2.x/itop-backup/status.php
+++ b/datamodels/2.x/itop-backup/status.php
@@ -37,6 +37,7 @@ try
 {
 	$sTransactionId = utils::GetNewTransactionId();
 	$oP = new iTopWebPage(Dict::S('bkp-status-title'));
+	$oP->add_header('X-Frame-Options: deny');
 	$oP->set_base(utils::GetAbsoluteUrlAppRoot().'pages/');
 
 	$oP->add("<h1>".Dict::S('bkp-status-title')."</h1>");
diff --git a/datamodels/2.x/itop-config/config.php b/datamodels/2.x/itop-config/config.php
index 7e9f9231b..de9bb584d 100644
--- a/datamodels/2.x/itop-config/config.php
+++ b/datamodels/2.x/itop-config/config.php
@@ -100,6 +100,7 @@ ApplicationMenu::CheckMenuIdEnabled('ConfigEditor');
 //$oAppContext = new ApplicationContext();
 
 $oP = new iTopWebPage(Dict::S('config-edit-title'));
+$oP->add_header('X-Frame-Options: deny');
 $oP->set_base(utils::GetAbsoluteUrlAppRoot().'pages/');
 $oP->add_linked_script(utils::GetCurrentModuleUrl().'/js/ace.js');
 $oP->add_linked_script(utils::GetCurrentModuleUrl().'/js/mode-php.js');
diff --git a/datamodels/2.x/itop-hub-connector/hubconnectorpage.class.inc.php b/datamodels/2.x/itop-hub-connector/hubconnectorpage.class.inc.php
index f1782e9e6..9bbb2da35 100644
--- a/datamodels/2.x/itop-hub-connector/hubconnectorpage.class.inc.php
+++ b/datamodels/2.x/itop-hub-connector/hubconnectorpage.class.inc.php
@@ -5,9 +5,12 @@ class HubConnectorPage extends NiceWebPage
     public function __construct($sTitle)
     {
         parent::__construct($sTitle);
-        
-        $this->add_header("Cache-control: no-cache");
-        
+
+	    $this->add_header('Cache-control: no-cache, no-store, must-revalidate');
+	    $this->add_header('Pragma: no-cache');
+	    $this->add_header('Expires: 0');
+	    $this->add_header('X-Frame-Options: deny');
+
         $sImagesDir = utils::GetAbsoluteUrlAppRoot().'images';
         $sModuleImagesDir = utils::GetAbsoluteUrlModulesRoot().'itop-hub-connector/images';
         
diff --git a/pages/UI.php b/pages/UI.php
index f4222c540..367b4284d 100644
--- a/pages/UI.php
+++ b/pages/UI.php
@@ -1780,6 +1780,7 @@ EOF
 		///////////////////////////////////////////////////////////////////////////////////////////
 
 		default: // Menu node rendering (templates)
+		$oP->add_header('X-Frame-Options: deny');
 		ApplicationMenu::LoadAdditionalMenus();
 		$oMenuNode = ApplicationMenu::GetMenuNode(ApplicationMenu::GetMenuIndexById(ApplicationMenu::GetActiveNodeId()));
 		if (is_object($oMenuNode))
diff --git a/pages/UniversalSearch.php b/pages/UniversalSearch.php
index 04da4fe69..aeae6c3fb 100644
--- a/pages/UniversalSearch.php
+++ b/pages/UniversalSearch.php
@@ -38,6 +38,7 @@ ApplicationMenu::CheckMenuIdEnabled('UniversalSearchMenu');
 $oAppContext = new ApplicationContext();
 
 $oP = new iTopWebPage(Dict::S('UI:UniversalSearchTitle'));
+$oP->add_header('X-Frame-Options: deny');
 $oP->add_linked_script("../js/json.js");
 $oP->add_linked_script("../js/forms-json-utils.js");
 $oP->add_linked_script("../js/wizardhelper.js");
diff --git a/pages/notifications.php b/pages/notifications.php
index 384db331a..866c468da 100644
--- a/pages/notifications.php
+++ b/pages/notifications.php
@@ -37,6 +37,7 @@ ApplicationMenu::CheckMenuIdEnabled("NotificationsMenu");
 // Main program
 //
 $oP = new iTopWebPage(Dict::S('Menu:NotificationsMenu+'));
+$oP->add_header('X-Frame-Options: deny');
 
 $oP->add('<div class="page_header" style="padding:0.5em;">');
 $oP->add('<h1>'.dict::S('UI:NotificationsMenu:Title').'</h1>');
diff --git a/pages/run_query.php b/pages/run_query.php
index 2d9288c34..b2e49f96f 100644
--- a/pages/run_query.php
+++ b/pages/run_query.php
@@ -100,6 +100,7 @@ $oAppContext = new ApplicationContext();
 
 $oP = new iTopWebPage(Dict::S('UI:RunQuery:Title'));
 $oP->SetBreadCrumbEntry('ui-tool-runquery', Dict::S('Menu:RunQueriesMenu'), Dict::S('Menu:RunQueriesMenu+'), '', utils::GetAbsoluteUrlAppRoot().'images/wrench.png');
+$oP->add_header('X-Frame-Options: deny');
 
 // Main program
 $sExpression = utils::ReadParam('expression', '', false, 'raw_data');
diff --git a/pages/schema.php b/pages/schema.php
index 8c69eb18d..64fc0e97a 100644
--- a/pages/schema.php
+++ b/pages/schema.php
@@ -1074,6 +1074,7 @@ $operation = utils::ReadParam('operation', '');
 
 $oPage = new iTopWebPage(Dict::S('UI:Schema:Title'));
 $oPage->no_cache();
+$oPage->add_header('X-Frame-Options: deny');
 
 $oPage->SetBreadCrumbEntry('ui-tool-datamodel', Dict::S('Menu:DataModelMenu'), Dict::S('Menu:DataModelMenu+'), '', utils::GetAbsoluteUrlAppRoot().'images/wrench.png');
 $oPage->add_script(
diff --git a/webservices/export-v2.php b/webservices/export-v2.php
index ae5857aff..3046766b0 100644
--- a/webservices/export-v2.php
+++ b/webservices/export-v2.php
@@ -50,6 +50,7 @@ function ReportErrorAndExit($sErrorMessage)
 	else
 	{
 		$oP = new WebPage("iTop - Export");
+		$oP->add_header('X-Frame-Options: deny');
 		$oP->p('ERROR: '.$sErrorMessage);
 		$oP->output();
 		exit(-1);
@@ -69,6 +70,7 @@ function ReportErrorAndUsage($sErrorMessage)
 	else
 	{
 		$oP = new WebPage("iTop - Export");
+		$oP->add_header('X-Frame-Options: deny');
 		$oP->p('ERROR: '.$sErrorMessage);
 		Usage($oP);
 		$oP->output();
@@ -350,6 +352,7 @@ function InteractiveShell($sExpression, $sQueryId, $sFormat, $sFileName, $sMode)
 	if ($sMode == 'dialog')
 	{
 		$oP = new ajax_page('');
+		$oP->add_header('X-Frame-Options: deny');
 		$oP->add('<div id="interactive_export_dlg">');
 		$sExportBtnLabel = json_encode(Dict::S('UI:Button:Export'));
 		$sJSTitle = json_encode(htmlentities(utils::ReadParam('dialog_title', '', false, 'raw_data'), ENT_QUOTES, 'UTF-8'));
@@ -375,6 +378,7 @@ EOF
 	else
 	{
 		$oP = new iTopWebPage('iTop Export');
+		$oP->add_header('X-Frame-Options: deny');
 		$oP->SetBreadCrumbEntry('ui-tool-export', Dict::S('Menu:ExportMenu'), Dict::S('Menu:ExportMenu+'), '', utils::GetAbsoluteUrlAppRoot().'images/wrench.png');
 	}
 	
@@ -735,11 +739,13 @@ try
 			if($oExporter instanceof HTMLBulkExport)
 			{
 				$oP = new NiceWebPage('iTop export');
+				$oP->add_header('X-Frame-Options: deny');
 				$oP->add_ready_script("$('table.listResults').tablesorter({widgets: ['MyZebra']});");
 			}
 			else
 			{
 				$oP = new WebPage('iTop export');
+				$oP->add_header('X-Frame-Options: deny');
                 $oP->add_style("table br { mso-data-placement:same-cell; }"); // Trick for Excel: keep line breaks inside the same cell !
 			}
 			$oP->add_style("body { overflow: auto; }");
@@ -747,6 +753,7 @@ try
 		else
 		{
 			$oP = new ajax_page('iTop export');
+			$oP->add_header('X-Frame-Options: deny');
 			$oP->SetContentType($oExporter->GetMimeType());
 		}
 		DoExport($oP, $oExporter, false);
@@ -756,6 +763,7 @@ try
 catch (BulkExportMissingParameterException $e)
 {
 	$oP = new ajax_page('iTop Export');
+	$oP->add_header('X-Frame-Options: deny');
 	$oP->add($e->getMessage());
 	Usage($oP);
 	$oP->output();
@@ -763,6 +771,7 @@ catch (BulkExportMissingParameterException $e)
 catch (Exception $e)
 {
 	$oP = new WebPage('iTop Export');
+	$oP->add_header('X-Frame-Options: deny');
 	$oP->add('Error: '.$e->getMessage());
 	IssueLog::Error($e->getMessage()."\n".$e->getTraceAsString());
 	$oP->output();

From d86e904e18f440e4fc29bb2cf770b473f6ad99ce Mon Sep 17 00:00:00 2001
From: Eric <eric.espie@combodo.com>
Date: Tue, 29 Sep 2020 14:11:11 +0200
Subject: [PATCH 25/43] =?UTF-8?q?N=C2=B03317=20-=20Add=20http=20headers?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sources/application/TwigBase/Controller/Controller.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sources/application/TwigBase/Controller/Controller.php b/sources/application/TwigBase/Controller/Controller.php
index 7ff7eb49d..0a1309916 100644
--- a/sources/application/TwigBase/Controller/Controller.php
+++ b/sources/application/TwigBase/Controller/Controller.php
@@ -558,6 +558,7 @@ abstract class Controller
 		{
 			case 'html':
 				$this->m_oPage = new iTopWebPage($this->GetOperationTitle());
+				$this->m_oPage->add_header('X-Frame-Options: deny');
 				break;
 
 			case 'ajax':

From 20ce42b24b836f0177a514284624c6950c188fd9 Mon Sep 17 00:00:00 2001
From: odain <olivier.dain@combodo.com>
Date: Tue, 29 Sep 2020 08:57:57 +0200
Subject: [PATCH 26/43] =?UTF-8?q?Reintegrate=20validation=20tests=20to=20e?=
 =?UTF-8?q?ase=20iTop=20release=20management=20from=20=20develop=20=20=20?=
 =?UTF-8?q?=20=20=20-=20N=C2=B03053=20-=20Check=20XML=20conversion=20metho?=
 =?UTF-8?q?ds=20=20=20=20=20=20-=20N=C2=B03059=20-=20Automatically=20set?=
 =?UTF-8?q?=20the=20documentation=20URLs=20=20=20=20=20=20-=20N=C2=B03052?=
 =?UTF-8?q?=20-=20Check=20community=20modules=20XML=20version=20against=20?=
 =?UTF-8?q?latest=20version=20=20=20=20=20=20-=20N=C2=B03054=20-=20Check?=
 =?UTF-8?q?=20community=20modules=20version=20against=20major=20version=20?=
 =?UTF-8?q?=20=20=20=20=20-=20N=C2=B03062=20-=20setup.css=20file=20integri?=
 =?UTF-8?q?ty=20test=20=20=20=20=20=20-=20N=C2=B03060=20-=20Check=20consis?=
 =?UTF-8?q?tency=20between=20the=20list=20of=20modules=20and=20installatio?=
 =?UTF-8?q?n.xml=20=20=20=20=20=20-=20N=C2=B03061=20-=20Automatically=20ch?=
 =?UTF-8?q?eck=20the=20installation.xml=20consistency=20=20=20=20=20=20-?=
 =?UTF-8?q?=20N=C2=B03268=20Add=20test=20to=20check=20dictionary=20files:?=
 =?UTF-8?q?=20make=20sure=20that=20the=20Dict::Add=20declarations=20match?=
 =?UTF-8?q?=20the=20file=20name?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup/setuputils.class.inc.php                |   2 +-
 .../DictionariesConsistencyTest.php           | 108 ++++++++++++
 .../iTopModulesPhpVersionChecklistTest.php    |   2 +-
 .../iTopModulesXmlVersionChecklistTest.php    |  43 +++--
 ...ml.dist => postbuild_integration.xml.dist} |   4 +-
 .../SetupCssIntegrityChecklistTest.php        |   0
 .../iTopDesignFormatChecklistTest.php         | 164 ++++++++++++++++++
 ...iTopModuleXmlInstallationChecklistTest.php |   0
 .../iTopDesignFormatChecklistTest.php         | 101 -----------
 9 files changed, 302 insertions(+), 122 deletions(-)
 create mode 100644 test/integration/DictionariesConsistencyTest.php
 rename test/{releaseChecklist.xml.dist => postbuild_integration.xml.dist} (95%)
 rename test/{releaseChecklist => postbuild_integration}/SetupCssIntegrityChecklistTest.php (100%)
 create mode 100644 test/postbuild_integration/iTopDesignFormatChecklistTest.php
 rename test/{releaseChecklist => postbuild_integration}/iTopModuleXmlInstallationChecklistTest.php (100%)
 delete mode 100644 test/releaseChecklist/iTopDesignFormatChecklistTest.php

diff --git a/setup/setuputils.class.inc.php b/setup/setuputils.class.inc.php
index 2b260890c..217c4f77d 100644
--- a/setup/setuputils.class.inc.php
+++ b/setup/setuputils.class.inc.php
@@ -916,7 +916,7 @@ class SetupUtils
 		$oPage, $bIsItopInstall, $sDBServer, $sDBUser, $sDBPwd, $sDBName, $sDBPrefix, $bTlsEnabled, $sTlsCA,
 		$sNewDBName = ''
 	) {
-		$sWikiVersion = '2_7_0';
+		$sWikiVersion =  utils::GetItopVersionWikiSyntax(); //eg : '2_7_0';
 		$sMysqlTlsWikiPageUrl = 'https://wiki.openitop.org/doku.php?id='.$sWikiVersion.':install:php_and_mysql_tls';
 
 		$oPage->add('<tr><td colspan="2">');
diff --git a/test/integration/DictionariesConsistencyTest.php b/test/integration/DictionariesConsistencyTest.php
new file mode 100644
index 000000000..e11a4c7ea
--- /dev/null
+++ b/test/integration/DictionariesConsistencyTest.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * Copyright (C) 2013-2020 Combodo SARL
+ * This file is part of iTop.
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * You should have received a copy of the GNU Affero General Public License
+ */
+
+namespace Combodo\iTop\Test\UnitTest\Integration;
+
+use Combodo\iTop\Test\UnitTest\ItopTestCase;
+
+
+class DictionariesConsistencyTest extends ItopTestCase
+{
+	/**
+	 * Verify that language declarations match the file names (same language codes)
+	 *
+	 * @dataProvider DictionaryFileProvider
+	 *
+	 * @param $sDictFile
+	 */
+	public function testDictionariesLanguage($sDictFile)
+	{
+		$aPrefixToLanguageData = array(
+			'cs' => array('CS CZ', 'Czech', 'Čeština'),
+			'da' => array('DA DA', 'Danish', 'Dansk'),
+			'de' => array('DE DE', 'German', 'Deutsch'),
+			'en' => array('EN US', 'English', 'English'),
+			'es_cr' => array('ES CR', 'Spanish', 'Español, Castellaño'),
+			'fr' => array('FR FR', 'French', 'Français'),
+			'hu' => array('HU HU', 'Hungarian', 'Magyar'),
+			'it' => array('IT IT', 'Italian', 'Italiano'),
+			'ja' => array('JA JP', 'Japanese', '日本語'),
+			'nl' => array('NL NL', 'Dutch', 'Nederlands'),
+			'pt_br' => array('PT BR', 'Brazilian', 'Brazilian'),
+			'ru' => array('RU RU', 'Russian', 'Русский'),
+			'sk' => array('SK SK', 'Slovak', 'Slovenčina'),
+			'tr' => array('TR TR', 'Turkish', 'Türkçe'),
+			'zh_cn' => array('ZH CN', 'Chinese', '简体中文')
+		);
+
+		if (!preg_match('/^(.*)\\.dict/', basename($sDictFile), $aMatches))
+		{
+			static::fail("Dictionary file '$sDictFile' not matching the naming convention");
+		}
+
+		$sLangPrefix = $aMatches[1];
+		if (!array_key_exists($sLangPrefix, $aPrefixToLanguageData))
+		{
+			static::fail("Unknown prefix '$sLangPrefix' for dictionary file '$sDictFile'");
+		}
+
+		$sExpectedLanguageCode = $aPrefixToLanguageData[$sLangPrefix][0];
+		$sExpectedEnglishLanguageDesc = $aPrefixToLanguageData[$sLangPrefix][1];
+		$sExpectedLocalizedLanguageDesc = $aPrefixToLanguageData[$sLangPrefix][2];
+
+		$sDictPHP = file_get_contents($sDictFile);
+		if ($iCount = preg_match_all("@Dict::Add\('(.*)'\s*,\s*'(.*)'\s*,\s*'(.*)'@", $sDictPHP, $aMatches) === false)
+		{
+			static::fail("Pattern not working");
+		}
+		if ($iCount == 0)
+		{
+			// Empty dictionary, that's fine!
+			static::assertTrue(true);
+		}
+		foreach ($aMatches[1] as $sLanguageCode)
+		{
+			static::assertSame($sExpectedLanguageCode, $sLanguageCode,
+				"Unexpected language code for Dict::Add in dictionary $sDictFile");
+		}
+		foreach ($aMatches[2] as $sEnglishLanguageDesc)
+		{
+			static::assertSame($sExpectedEnglishLanguageDesc, $sEnglishLanguageDesc,
+				"Unexpected language description (english) for Dict::Add in dictionary $sDictFile");
+		}
+		foreach ($aMatches[3] as $sLocalizedLanguageDesc)
+		{
+			static::assertSame($sExpectedLocalizedLanguageDesc, $sLocalizedLanguageDesc,
+				"Unexpected language description for Dict::Add in dictionary $sDictFile");
+		}
+	}
+
+	public function DictionaryFileProvider()
+	{
+		static::setUp();
+
+		$aDictFiles = array_merge(
+			glob(APPROOT.'datamodels/2.x/*/*.dict*.php'), // legacy form in modules
+			glob(APPROOT.'datamodels/2.x/*/dictionaries/*.dict*.php'), // modern form in modules
+			glob(APPROOT.'dictionaries/*.dict*.php') // framework
+		);
+		$aTestCases = array();
+		foreach ($aDictFiles as $sDictFile)
+		{
+			$aTestCases[$sDictFile] = array('sDictFile' => $sDictFile);
+		}
+		return $aTestCases;
+	}
+}
diff --git a/test/integration/iTopModulesPhpVersionChecklistTest.php b/test/integration/iTopModulesPhpVersionChecklistTest.php
index c71316265..c5bfd00f8 100644
--- a/test/integration/iTopModulesPhpVersionChecklistTest.php
+++ b/test/integration/iTopModulesPhpVersionChecklistTest.php
@@ -57,7 +57,7 @@ class iTopModulesPhpVersionIntegrationTest extends ItopTestCase
 			$matches
 		);
 
-		$this->assertRegExp("#$sExpectedVersion#", $matches[1], "$sPhpFile file refer does not refer to current itop version ($sModuleName/$matches[1] does not match regexp $sModuleName/$sExpectedVersion)");
+		$this->assertRegExp("#$sExpectedVersion#", $matches[1], " $sPhpFile:2 file refer does not refer to current itop version ($sModuleName/$matches[1] does not match regexp $sModuleName/$sExpectedVersion)");
 
 	}
 
diff --git a/test/integration/iTopModulesXmlVersionChecklistTest.php b/test/integration/iTopModulesXmlVersionChecklistTest.php
index 9fde4b779..0ff89f3f0 100644
--- a/test/integration/iTopModulesXmlVersionChecklistTest.php
+++ b/test/integration/iTopModulesXmlVersionChecklistTest.php
@@ -32,48 +32,57 @@ use iTopDesignFormat;
  */
 class iTopModulesXmlVersionIntegrationTest extends ItopTestCase
 {
+	protected function setUp()
+	{
+		parent::setUp();
+
+		require_once APPROOT.'setup/itopdesignformat.class.inc.php';
+	}
 
 
 	/**
-	 * Verify if the datamodel.*.xml files refer to the current itop version
+	 * Verify if the datamodel.*.xml files refer to the latest version of the design
 	 * This is an integration test
 	 *
 	 * @group skipPostBuild
 	 *
 	 * @dataProvider DatamodelItopXmlVersionProvider
 	 */
-	public function testDatamodelItopXmlVersion($sExpectedXmlVersion, $sXmlFile)
+	public function testDatamodelItopXmlVersion($sXmlFile)
 	{
-		$sFileContent = file_get_contents($sXmlFile);
+		$oOriginalXml = new DOMDocument();
+		$oOriginalXml->load($sXmlFile);
 
-		preg_match(
-			'/<itop_design .* version="([^"]+)">/',
-			$sFileContent,
-			$matches
-		);
+		$oTransformedXml = new DOMDocument();
+		$oTransformedXml->load($sXmlFile);
+		$oFormat = new iTopDesignFormat($oTransformedXml);
 
-		$this->assertSame($sExpectedXmlVersion, $matches[1], "$sXmlFile file refer does not refer to current itop version ($matches[1] instead of expected $sExpectedXmlVersion)");
+		if ($oFormat->Convert())
+		{
+			// Compare the original and new format
+			$sExpectedXmlVersion = ITOP_DESIGN_LATEST_VERSION;
+			$this->assertSame($oTransformedXml->saveXML(), $oOriginalXml->saveXML(), "Datamodel file $sXmlFile:2 not in the latest format ($sExpectedXmlVersion)");
+		}
+		else
+		{
+			$this->fail("Failed to convert $sXmlFile into the latest format");
+		}
 	}
 
 	public function DatamodelItopXmlVersionProvider()
 	{
-		parent::setUp();
-
-		require_once APPROOT.'core/config.class.inc.php';
-		require_once APPROOT.'application/utils.inc.php';
+		static::setUp();
 
 		$sPath = APPROOT.'datamodels/2.x/*/datamodel.*.xml';
 		$aXmlFiles = glob($sPath);
 
-		$sItopVersionShort = \utils::GetItopPatchVersion();
-		$aItopVersion = explode('.', $sItopVersionShort);
-		$sExpectedXmlVersion = ($aItopVersion[0] - 1).'.'.($aItopVersion[1]); // eg: 2.7.0-dev become 1.7
+		$aXmlFiles[] = APPROOT.'core/datamodel.core.xml';
+		$aXmlFiles[] = APPROOT.'application/datamodel.application.xml';
 
 		$aTestCases = array();
 		foreach ($aXmlFiles as $sXmlFile)
 		{
 			$aTestCases[$sXmlFile] = array(
-				'sExpectedXmlVersion' => $sExpectedXmlVersion,
 				'sXmlFile' => $sXmlFile,
 			);
 		}
diff --git a/test/releaseChecklist.xml.dist b/test/postbuild_integration.xml.dist
similarity index 95%
rename from test/releaseChecklist.xml.dist
rename to test/postbuild_integration.xml.dist
index 8dea80426..d83d3199f 100644
--- a/test/releaseChecklist.xml.dist
+++ b/test/postbuild_integration.xml.dist
@@ -41,8 +41,8 @@
          verbose="false">
 
     <testsuites>
-        <testsuite name="ReleaseChecklist">
-            <directory>releaseChecklist</directory>
+        <testsuite name="PostBuildIntegration">
+            <directory>postbuild_integration</directory>
         </testsuite>
     </testsuites>
 
diff --git a/test/releaseChecklist/SetupCssIntegrityChecklistTest.php b/test/postbuild_integration/SetupCssIntegrityChecklistTest.php
similarity index 100%
rename from test/releaseChecklist/SetupCssIntegrityChecklistTest.php
rename to test/postbuild_integration/SetupCssIntegrityChecklistTest.php
diff --git a/test/postbuild_integration/iTopDesignFormatChecklistTest.php b/test/postbuild_integration/iTopDesignFormatChecklistTest.php
new file mode 100644
index 000000000..0518c84d5
--- /dev/null
+++ b/test/postbuild_integration/iTopDesignFormatChecklistTest.php
@@ -0,0 +1,164 @@
+<?php
+
+namespace Combodo\iTop\Test\UnitTest\ReleaseChecklist;
+
+use Combodo\iTop\Test\UnitTest\ItopTestCase;
+use iTopDesignFormat;
+use PHPUnit\Exception;
+
+
+/**
+ * Class iTopDesignFormatChecklistTest
+ * Ticket 3053 - Check XML conversion methods
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
+ * @backupGlobals disabled
+ *
+ * @covers iTopDesignFormat
+ *
+ * @package Combodo\iTop\Test\UnitTest\Setup
+ */
+class TestForITopDesignFormatClass extends ItopTestCase
+{
+	protected function setUp()
+	{
+		parent::setUp();
+
+		require_once APPROOT.'setup/modelfactory.class.inc.php';
+		require_once APPROOT.'setup/itopdesignformat.class.inc.php';
+	}
+
+	/**
+	 * release checklist step: make sure we have datamodel conversion functions for new iTop version
+	 */
+	public function testCurrentVersion_DataModelConversionFunctions()
+	{
+		$aErrors = [];
+		$aDatamodelCurrentVersions = array();
+		$aDataModelFiles = $this->GetDataModelFiles(APPROOT.'/datamodels');
+
+		//retrieve current XML version in datamoldels files
+		foreach ($aDataModelFiles as $sDataModelFile)
+		{
+			if (preg_match('/itop_design .* version="([\d\.]*)"/', file_get_contents($sDataModelFile), $aMatches))
+			{
+				$sVersion = $aMatches[1];
+				if (!array_key_exists($sVersion, $aDatamodelCurrentVersions))
+				{
+					if (trim($sVersion) === '')
+					{
+						$aErrors[] = "cannot retrieve itop_design datamodel version in $sDataModelFile:1";
+						continue;
+					}
+					
+					$aDatamodelCurrentVersions[$sVersion] = $sVersion;
+				}
+			}
+		}
+
+		//make sure there is only one found
+		$this->assertTrue(is_array($aDatamodelCurrentVersions));
+
+		$sFirstVersion = array_keys(iTopDesignFormat::$aVersions)[0];
+		$sLatestVersion = array_keys(iTopDesignFormat::$aVersions)[count(iTopDesignFormat::$aVersions)-1];
+		foreach ($aDatamodelCurrentVersions as $sCurrentVersion)
+		{
+			try{
+				//check we have migration function from current version to previous
+				$this->CheckCondition(array_key_exists($sCurrentVersion, iTopDesignFormat::$aVersions), "Missing $sCurrentVersion conversion functions in iTopDesignFormat.");
+				$aCurrentVersionInfo = iTopDesignFormat::$aVersions[$sCurrentVersion];
+				$this->CheckCondition(is_array($aCurrentVersionInfo), "Wrong $sCurrentVersion config in iTopDesignFormat.");
+				$this->CheckCondition(array_key_exists('previous', $aCurrentVersionInfo), "Missing previous for $sCurrentVersion config in iTopDesignFormat.");
+				$this->TestDefinedFunction($aCurrentVersionInfo, 'go_to_next', $sCurrentVersion, ($sCurrentVersion=== $sLatestVersion));
+				$this->TestDefinedFunction($aCurrentVersionInfo, 'go_to_previous', $sCurrentVersion, ($sCurrentVersion==='1.0'));
+
+				//check we have migration function from N-1 version to current one
+				if (($sCurrentVersion!=='1.0')) {
+					$sPreviousVersion = $aCurrentVersionInfo['previous'];
+					$this->CheckCondition(array_key_exists($sPreviousVersion, iTopDesignFormat::$aVersions),
+						"$sCurrentVersion: Missing $sPreviousVersion config in iTopDesignFormat.");
+					$aPreviousVersionInfo = iTopDesignFormat::$aVersions[$sPreviousVersion];
+					$this->CheckCondition(is_array($aPreviousVersionInfo),
+						"$sCurrentVersion: wrong $sPreviousVersion config in iTopDesignFormat.");
+					$this->CheckCondition(array_key_exists('previous', $aPreviousVersionInfo),
+						"$sCurrentVersion: Missing previous for $sPreviousVersion config in iTopDesignFormat.");
+					$this->TestDefinedFunction($aPreviousVersionInfo, 'go_to_previous', $sPreviousVersion, ($sPreviousVersion === '1.0'));
+					$this->TestDefinedFunction($aPreviousVersionInfo, 'go_to_next', $sPreviousVersion, ($sPreviousVersion === $sLatestVersion));
+				}
+
+				//check we have migration function from current version to next one
+				if (($sCurrentVersion!== $sLatestVersion)) {
+					$sNextVersion = $aCurrentVersionInfo['next'];
+					$this->CheckCondition(array_key_exists($sNextVersion, iTopDesignFormat::$aVersions),
+						"$sCurrentVersion: Missing $sNextVersion config in iTopDesignFormat.");
+					$aNextVersionInfo = iTopDesignFormat::$aVersions[$sNextVersion];
+					$this->CheckCondition(is_array($aNextVersionInfo),
+						"$sCurrentVersion: wrong $sNextVersion config in iTopDesignFormat.");
+					$this->CheckCondition(array_key_exists('previous', $aNextVersionInfo),
+						"$sCurrentVersion: Missing previous for $sNextVersion config in iTopDesignFormat.");
+					$this->TestDefinedFunction($aNextVersionInfo, 'go_to_previous', $sNextVersion, ($sNextVersion === '1.0'));
+					$this->TestDefinedFunction($aNextVersionInfo, 'go_to_next', $sNextVersion, ($sNextVersion === $sLatestVersion));
+				}
+			}
+			catch(Exception $e)
+			{
+				$aErrors[] = $e->getMessage();
+			}
+		}
+
+		if (count($aErrors)!=0)
+		{
+			$sMsg = "Issue with conversion functions:\n";
+			$sMsg .= implode("\n", $aErrors);
+			$this->fail($sMsg);
+		}
+		else
+		{
+			$this->assertTrue(true);
+		}
+	}
+
+	private function CheckCondition($bCondition, $sMsg)
+	{
+		if ($bCondition === false)
+		{
+			throw new \Exception($sMsg);
+		}
+	}
+
+	private function TestDefinedFunction($aCurrentVersionInfo, $sFunctionKey, $sVersion, $bNullFunction=false)
+	{
+		$sInfo = json_encode($aCurrentVersionInfo, true);
+		$this->CheckCondition(array_key_exists($sFunctionKey, $aCurrentVersionInfo), "Missing $sFunctionKey in $sVersion config in iTopDesignFormat: " . $sInfo);
+		//echo $aCurrentVersionInfo[$sFunctionKey].'\n';
+		if ($bNullFunction === false)
+		{
+			$oReflectionClass = new \ReflectionClass(iTopDesignFormat::class);
+			$this->CheckCondition($oReflectionClass->hasMethod($aCurrentVersionInfo[$sFunctionKey]), "wrong go_to_previous function '".$aCurrentVersionInfo[$sFunctionKey]."'' for $sVersion config in iTopDesignFormat." . $sInfo);
+		}
+		else
+		{
+			$this->CheckCondition(is_null($aCurrentVersionInfo[$sFunctionKey]), "$sVersion $sFunctionKey function should be null");
+		}
+	}
+
+	public function GetDataModelFiles($sFolder)
+	{
+		$aDataModelFiles = array();
+		if (is_dir($sFolder))
+		{
+			foreach (glob($sFolder."/*") as $sPath)
+			{
+				if (is_dir($sPath))
+				{
+					$aDataModelFiles = array_merge($aDataModelFiles, $this->GetDataModelFiles($sPath));
+				}
+				else if (preg_match("/datamodel\..*\.xml/", basename($sPath)))
+				{
+					$aDataModelFiles[] = $sPath;
+				}
+			}
+		}
+		return $aDataModelFiles;
+	}
+}
\ No newline at end of file
diff --git a/test/releaseChecklist/iTopModuleXmlInstallationChecklistTest.php b/test/postbuild_integration/iTopModuleXmlInstallationChecklistTest.php
similarity index 100%
rename from test/releaseChecklist/iTopModuleXmlInstallationChecklistTest.php
rename to test/postbuild_integration/iTopModuleXmlInstallationChecklistTest.php
diff --git a/test/releaseChecklist/iTopDesignFormatChecklistTest.php b/test/releaseChecklist/iTopDesignFormatChecklistTest.php
deleted file mode 100644
index 0cd5a8b6c..000000000
--- a/test/releaseChecklist/iTopDesignFormatChecklistTest.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-
-namespace Combodo\iTop\Test\UnitTest\ReleaseChecklist;
-
-use Combodo\iTop\Test\UnitTest\ItopTestCase;
-use iTopDesignFormat;
-
-
-/**
- * Class iTopDesignFormatChecklistTest
- * Ticket 3053 - Check XML conversion methods
- * @runTestsInSeparateProcesses
- * @preserveGlobalState disabled
- * @backupGlobals disabled
- *
- * @covers iTopDesignFormat
- *
- * @package Combodo\iTop\Test\UnitTest\Setup
- */
-class TestForITopDesignFormatClass extends ItopTestCase
-{
-	protected function setUp()
-	{
-		parent::setUp();
-
-		require_once APPROOT.'setup/modelfactory.class.inc.php';
-		require_once APPROOT.'setup/itopdesignformat.class.inc.php';
-	}
-
-	/**
-	 * release checklist step: make sure we have datamodel conversion functions for new iTop version
-	 */
-	public function testCurrentVersion_DataModelConversionFunctions()
-	{
-		$aDatamodelCurrentVersions = array();
-		$aDataModelFiles = $this->GetDataModelFiles(APPROOT.'/datamodels');
-
-		//retrieve current XML version in datamoldels files
-		foreach ($aDataModelFiles as $sDataModelFile)
-		{
-			if (preg_match('/itop_design .* version="([\d\.]*)"/', file_get_contents($sDataModelFile), $aMatches))
-			{
-				$sVersion = $aMatches[1];
-				if (!array_key_exists($sVersion, $aDatamodelCurrentVersions))
-				{
-					$aDatamodelCurrentVersions[$sVersion] = $sVersion;
-				}
-			}
-		}
-
-		//make sure there is only one found
-		$this->assertTrue(is_array($aDatamodelCurrentVersions));
-		$this->assertEquals(1, count($aDatamodelCurrentVersions), "Found too much XML versions: " . json_encode($aDatamodelCurrentVersions));
-
-		//check we have migration function from new version to previous one
-		$sCurrentVersion = array_values($aDatamodelCurrentVersions)[0];
-		$this->assertTrue(array_key_exists($sCurrentVersion, iTopDesignFormat::$aVersions), "Release checklist: missing $sCurrentVersion config in iTopDesignFormat ");
-		$aCurrentVersionInfo = iTopDesignFormat::$aVersions[$sCurrentVersion];
-		$this->assertTrue(is_array($aCurrentVersionInfo), "Release checklist: wrong $sCurrentVersion config in iTopDesignFormat ");
-		$this->assertTrue(array_key_exists('previous', $aCurrentVersionInfo), "Release checklist: missing previous for $sCurrentVersion config in iTopDesignFormat ");
-		$this->TestDefinedFunction($aCurrentVersionInfo, 'go_to_previous', $sCurrentVersion);
-
-		//check we have migration function from N-1 version to new one
-		$sPreviousVersion = $aCurrentVersionInfo['previous'];
-		$this->assertTrue(array_key_exists($sPreviousVersion, iTopDesignFormat::$aVersions), "Release checklist: missing $sPreviousVersion config in iTopDesignFormat ");
-		$aPreviousVersionInfo = iTopDesignFormat::$aVersions[$sPreviousVersion];
-		$this->assertTrue(is_array($aPreviousVersionInfo), "Release checklist: wrong $sPreviousVersion config in iTopDesignFormat ");
-		$this->assertTrue(array_key_exists('previous', $aPreviousVersionInfo), "Release checklist: missing previous for $sPreviousVersion config in iTopDesignFormat ");
-		$this->TestDefinedFunction($aPreviousVersionInfo, 'go_to_previous', $sPreviousVersion);
-		$this->TestDefinedFunction($aPreviousVersionInfo, 'go_to_next', $sPreviousVersion);
-	}
-
-	private function TestDefinedFunction($aCurrentVersionInfo, $sFunctionKey, $sVersion)
-	{
-		$sInfo = json_encode($aCurrentVersionInfo, true);
-		$this->assertTrue(array_key_exists($sFunctionKey, $aCurrentVersionInfo), "Release checklist: missing $sFunctionKey in $sVersion config in iTopDesignFormat: " . $sInfo);
-		echo $aCurrentVersionInfo[$sFunctionKey].'\n';
-		$oReflectionClass = new \ReflectionClass(iTopDesignFormat::class);
-		$this->assertTrue($oReflectionClass->hasMethod($aCurrentVersionInfo[$sFunctionKey]), "Release checklist: wrong go_to_previous function '".$aCurrentVersionInfo[$sFunctionKey]."'' for $sVersion config in iTopDesignFormat " . $sInfo);
-	}
-
-	public function GetDataModelFiles($sFolder)
-	{
-		$aDataModelFiles = array();
-		if (is_dir($sFolder))
-		{
-			foreach (glob($sFolder."/*") as $sPath)
-			{
-				if (is_dir($sPath))
-				{
-					$aDataModelFiles = array_merge($aDataModelFiles, $this->GetDataModelFiles($sPath));
-				}
-				else if (preg_match("/datamodel\..*\.xml/", basename($sPath)))
-				{
-					$aDataModelFiles[] = $sPath;
-				}
-			}
-		}
-		return $aDataModelFiles;
-	}
-}
\ No newline at end of file

From 5ef6b6c5d06eeae09db188c840cb04275bc5eba2 Mon Sep 17 00:00:00 2001
From: Thomas Casteleyn <thomas.casteleyn@super-visions.com>
Date: Tue, 29 Sep 2020 15:56:08 +0200
Subject: [PATCH 27/43] Cleanup references to Flash (#163)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

All remaining Flash files are removed. Dependent Combodo extensions will me modified for iTop 2.8.0 (Combodo ref N°3344, N°3345)

Old swf_navigator operation in UI.php was kept for compatibility but is deprecated

Co-authored-by: Molkobain <guillaume.lajarige@combodo.com>
Co-authored-by: Pierre Goiffon <pierre.goiffon@combodo.com>
Co-authored-by: rquetiez <romain.quetiez@combodo.com>
---
 application/displayblock.class.inc.php |   4 +-
 application/itopwebpage.class.inc.php  |   1 -
 images/charts.swf                      | Bin 29627 -> 0 bytes
 images/charts_library/arno.swf         | Bin 6541 -> 0 bytes
 images/charts_library/arst.swf         | Bin 6799 -> 0 bytes
 images/charts_library/brfl.swf         | Bin 6848 -> 0 bytes
 images/charts_library/brno.swf         | Bin 7004 -> 0 bytes
 images/charts_library/brst.swf         | Bin 6854 -> 0 bytes
 images/charts_library/cl3d.swf         | Bin 10125 -> 0 bytes
 images/charts_library/clfl.swf         | Bin 6613 -> 0 bytes
 images/charts_library/clno.swf         | Bin 6632 -> 0 bytes
 images/charts_library/clp3.swf         | Bin 10106 -> 0 bytes
 images/charts_library/cls3.swf         | Bin 10165 -> 0 bytes
 images/charts_library/clst.swf         | Bin 6655 -> 0 bytes
 images/charts_library/cnno.swf         | Bin 6801 -> 0 bytes
 images/charts_library/lnno.swf         | Bin 7239 -> 0 bytes
 images/charts_library/mxno.swf         | Bin 8736 -> 0 bytes
 images/charts_library/pi3d.swf         | Bin 8592 -> 0 bytes
 images/charts_library/pino.swf         | Bin 6152 -> 0 bytes
 images/charts_library/pono.swf         | Bin 8178 -> 0 bytes
 images/charts_library/scno.swf         | Bin 7209 -> 0 bytes
 images/open-flash-chart.swf            | Bin 276186 -> 0 bytes
 js/swfobject.js                        |   5 --
 pages/UI.php                           |   5 +-
 pages/navigator.php                    |  82 -------------------------
 25 files changed, 5 insertions(+), 92 deletions(-)
 delete mode 100644 images/charts.swf
 delete mode 100644 images/charts_library/arno.swf
 delete mode 100644 images/charts_library/arst.swf
 delete mode 100644 images/charts_library/brfl.swf
 delete mode 100644 images/charts_library/brno.swf
 delete mode 100644 images/charts_library/brst.swf
 delete mode 100644 images/charts_library/cl3d.swf
 delete mode 100644 images/charts_library/clfl.swf
 delete mode 100644 images/charts_library/clno.swf
 delete mode 100644 images/charts_library/clp3.swf
 delete mode 100644 images/charts_library/cls3.swf
 delete mode 100644 images/charts_library/clst.swf
 delete mode 100644 images/charts_library/cnno.swf
 delete mode 100644 images/charts_library/lnno.swf
 delete mode 100644 images/charts_library/mxno.swf
 delete mode 100644 images/charts_library/pi3d.swf
 delete mode 100644 images/charts_library/pino.swf
 delete mode 100644 images/charts_library/pono.swf
 delete mode 100644 images/charts_library/scno.swf
 delete mode 100644 images/open-flash-chart.swf
 delete mode 100644 js/swfobject.js
 delete mode 100755 pages/navigator.php

diff --git a/application/displayblock.class.inc.php b/application/displayblock.class.inc.php
index 6159282fb..3950eccb8 100644
--- a/application/displayblock.class.inc.php
+++ b/application/displayblock.class.inc.php
@@ -1677,11 +1677,11 @@ class MenuBlock extends DisplayBlock
 						{
 							if (array_key_exists('down', $aRelationInfo))
 							{
-								$aActions[$sRelationCode.'_down'] = array ('label' => $aRelationInfo['down'], 'url' => "{$sRootUrl}pages/$sUIPage?operation=swf_navigator&relation=$sRelationCode&direction=down&class=$sClass&id=$id{$sContext}") + $aActionParams;
+								$aActions[$sRelationCode.'_down'] = array ('label' => $aRelationInfo['down'], 'url' => "{$sRootUrl}pages/$sUIPage?operation=view_relations&relation=$sRelationCode&direction=down&class=$sClass&id=$id{$sContext}") + $aActionParams;
 							}
 							if (array_key_exists('up', $aRelationInfo))
 							{
-								$aActions[$sRelationCode.'_up'] = array ('label' => $aRelationInfo['up'], 'url' => "{$sRootUrl}pages/$sUIPage?operation=swf_navigator&relation=$sRelationCode&direction=up&class=$sClass&id=$id{$sContext}") + $aActionParams;
+								$aActions[$sRelationCode.'_up'] = array ('label' => $aRelationInfo['up'], 'url' => "{$sRootUrl}pages/$sUIPage?operation=view_relations&relation=$sRelationCode&direction=up&class=$sClass&id=$id{$sContext}") + $aActionParams;
 							}
 						}
 					}
diff --git a/application/itopwebpage.class.inc.php b/application/itopwebpage.class.inc.php
index f50b04a0a..1c6e2c9f0 100644
--- a/application/itopwebpage.class.inc.php
+++ b/application/itopwebpage.class.inc.php
@@ -89,7 +89,6 @@ class iTopWebPage extends NiceWebPage implements iTabbedPage
 		$this->add_linked_script("../js/jquery-ui-timepicker-addon-i18n.min.js");
 		$this->add_linked_script("../js/jquery.blockUI.js");
 		$this->add_linked_script("../js/utils.js");
-		$this->add_linked_script("../js/swfobject.js");
 		$this->add_linked_script("../js/ckeditor/ckeditor.js");
 		$this->add_linked_script("../js/ckeditor/adapters/jquery.js");
 		$this->add_linked_script("../js/ckeditor/plugins/codesnippet/lib/highlight/highlight.pack.js");
diff --git a/images/charts.swf b/images/charts.swf
deleted file mode 100644
index 69617526acce7624fdff4c4b00845c6342684cc5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 29627
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
C>?@W4

diff --git a/images/charts_library/arno.swf b/images/charts_library/arno.swf
deleted file mode 100644
index 8e5fc184438d9e99fab25eda6d14aba42537500b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6541
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

diff --git a/images/charts_library/arst.swf b/images/charts_library/arst.swf
deleted file mode 100644
index bbe113b00d984fa4c36a21ce8357f877e579882e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6799
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

diff --git a/images/charts_library/brfl.swf b/images/charts_library/brfl.swf
deleted file mode 100644
index 4abc116958ea4641a1ed5e6e4f2dc738eabccc45..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6848
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

diff --git a/images/charts_library/brno.swf b/images/charts_library/brno.swf
deleted file mode 100644
index c5fb27ac577ecbeead3d5994481c3532b0510f13..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7004
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

diff --git a/images/charts_library/brst.swf b/images/charts_library/brst.swf
deleted file mode 100644
index ebf09957be37b43625ccf2ae46f31e01b172642d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6854
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
A(*OVf

diff --git a/images/charts_library/cl3d.swf b/images/charts_library/cl3d.swf
deleted file mode 100644
index 663644ab913f9abe79f4402c48de2734b436c838..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10125
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

diff --git a/images/charts_library/clfl.swf b/images/charts_library/clfl.swf
deleted file mode 100644
index 9839c5189486568718a26bc278d3d9a2e74ded0c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6613
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
T<kS?RXlWf<jv@a5{DBb81Lo#=

diff --git a/images/charts_library/clno.swf b/images/charts_library/clno.swf
deleted file mode 100644
index cbbbc778c6a2f2aebf3ebe6afe986aef9801e370..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6632
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

diff --git a/images/charts_library/clp3.swf b/images/charts_library/clp3.swf
deleted file mode 100644
index 4e28ea4f613eab8a5e7697d876ada786d3842fb1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10106
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

diff --git a/images/charts_library/cls3.swf b/images/charts_library/cls3.swf
deleted file mode 100644
index 1f97c55004b038cc56cb04e45094e0a65459e859..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10165
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

diff --git a/images/charts_library/clst.swf b/images/charts_library/clst.swf
deleted file mode 100644
index fc693651526e8e9f2d0da480c2b9fe586e9c9cbc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6655
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
J{{XSZn`CGi@$3Kq

diff --git a/images/charts_library/cnno.swf b/images/charts_library/cnno.swf
deleted file mode 100644
index f8ec7eee7a80aed05c5ec3e650fcc027c9f79d12..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6801
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

diff --git a/images/charts_library/lnno.swf b/images/charts_library/lnno.swf
deleted file mode 100644
index 3a1d6f9980ba55e8e4f58882958468b7448a96d7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7239
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
VK!WUbg$Q|lJ6R5p{|`dBPfiYJ2#Npz

diff --git a/images/charts_library/mxno.swf b/images/charts_library/mxno.swf
deleted file mode 100644
index 44d71e648aef73a838d434940d9cf2917a5b6267..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8736
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
KApak{%it}bGX@C&

diff --git a/images/charts_library/pi3d.swf b/images/charts_library/pi3d.swf
deleted file mode 100644
index 678e60934c617f952c1786efad947157c6cb8946..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8592
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
Wwa8E{zEG~zyp~-ASN{+Bt;wacmAv`@

diff --git a/images/charts_library/pino.swf b/images/charts_library/pino.swf
deleted file mode 100644
index db384d91e6befedfaa1960fd78aef9b00b586f29..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6152
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
auRxdLo&hps?I}dqc~Q0wApZ~Rx*DuQ|2*RW

diff --git a/images/charts_library/pono.swf b/images/charts_library/pono.swf
deleted file mode 100644
index 0f2a2fe066dc7e85df05cb960c1521f5a8c41f64..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8178
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
YGs(}q=9~0;T`@cgX2ID10hlg8`kc!TH2?qr

diff --git a/images/charts_library/scno.swf b/images/charts_library/scno.swf
deleted file mode 100644
index ec98ec113b270fa4db09ef96a298d3983c041ede..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7209
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

diff --git a/images/open-flash-chart.swf b/images/open-flash-chart.swf
deleted file mode 100644
index 3a01e52aeeaba86b1a932c09ad48bb447e8ad8f3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 276186
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
HI2#KqOag35

diff --git a/js/swfobject.js b/js/swfobject.js
deleted file mode 100644
index 08fb27000..000000000
--- a/js/swfobject.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/* SWFObject v2.1 <http://code.google.com/p/swfobject/>
-	Copyright (c) 2007-2008 Geoff Stearns, Michael Williams, and Bobby van der Sluis
-	This software is released under the MIT License <http://www.opensource.org/licenses/mit-license.php>
-*/
-var swfobject=function(){var b="undefined",Q="object",n="Shockwave Flash",p="ShockwaveFlash.ShockwaveFlash",P="application/x-shockwave-flash",m="SWFObjectExprInst",j=window,K=document,T=navigator,o=[],N=[],i=[],d=[],J,Z=null,M=null,l=null,e=false,A=false;var h=function(){var v=typeof K.getElementById!=b&&typeof K.getElementsByTagName!=b&&typeof K.createElement!=b,AC=[0,0,0],x=null;if(typeof T.plugins!=b&&typeof T.plugins[n]==Q){x=T.plugins[n].description;if(x&&!(typeof T.mimeTypes!=b&&T.mimeTypes[P]&&!T.mimeTypes[P].enabledPlugin)){x=x.replace(/^.*\s+(\S+\s+\S+$)/,"$1");AC[0]=parseInt(x.replace(/^(.*)\..*$/,"$1"),10);AC[1]=parseInt(x.replace(/^.*\.(.*)\s.*$/,"$1"),10);AC[2]=/r/.test(x)?parseInt(x.replace(/^.*r(.*)$/,"$1"),10):0}}else{if(typeof j.ActiveXObject!=b){var y=null,AB=false;try{y=new ActiveXObject(p+".7")}catch(t){try{y=new ActiveXObject(p+".6");AC=[6,0,21];y.AllowScriptAccess="always"}catch(t){if(AC[0]==6){AB=true}}if(!AB){try{y=new ActiveXObject(p)}catch(t){}}}if(!AB&&y){try{x=y.GetVariable("$version");if(x){x=x.split(" ")[1].split(",");AC=[parseInt(x[0],10),parseInt(x[1],10),parseInt(x[2],10)]}}catch(t){}}}}var AD=T.userAgent.toLowerCase(),r=T.platform.toLowerCase(),AA=/webkit/.test(AD)?parseFloat(AD.replace(/^.*webkit\/(\d+(\.\d+)?).*$/,"$1")):false,q=false,z=r?/win/.test(r):/win/.test(AD),w=r?/mac/.test(r):/mac/.test(AD);/*@cc_on q=true;@if(@_win32)z=true;@elif(@_mac)w=true;@end@*/return{w3cdom:v,pv:AC,webkit:AA,ie:q,win:z,mac:w}}();var L=function(){if(!h.w3cdom){return }f(H);if(h.ie&&h.win){try{K.write("<script id=__ie_ondomload defer=true src=//:><\/script>");J=C("__ie_ondomload");if(J){I(J,"onreadystatechange",S)}}catch(q){}}if(h.webkit&&typeof K.readyState!=b){Z=setInterval(function(){if(/loaded|complete/.test(K.readyState)){E()}},10)}if(typeof K.addEventListener!=b){K.addEventListener("DOMContentLoaded",E,null)}R(E)}();function S(){if(J.readyState=="complete"){J.parentNode.removeChild(J);E()}}function E(){if(e){return }if(h.ie&&h.win){var v=a("span");try{var u=K.getElementsByTagName("body")[0].appendChild(v);u.parentNode.removeChild(u)}catch(w){return }}e=true;if(Z){clearInterval(Z);Z=null}var q=o.length;for(var r=0;r<q;r++){o[r]()}}function f(q){if(e){q()}else{o[o.length]=q}}function R(r){if(typeof j.addEventListener!=b){j.addEventListener("load",r,false)}else{if(typeof K.addEventListener!=b){K.addEventListener("load",r,false)}else{if(typeof j.attachEvent!=b){I(j,"onload",r)}else{if(typeof j.onload=="function"){var q=j.onload;j.onload=function(){q();r()}}else{j.onload=r}}}}}function H(){var t=N.length;for(var q=0;q<t;q++){var u=N[q].id;if(h.pv[0]>0){var r=C(u);if(r){N[q].width=r.getAttribute("width")?r.getAttribute("width"):"0";N[q].height=r.getAttribute("height")?r.getAttribute("height"):"0";if(c(N[q].swfVersion)){if(h.webkit&&h.webkit<312){Y(r)}W(u,true)}else{if(N[q].expressInstall&&!A&&c("6.0.65")&&(h.win||h.mac)){k(N[q])}else{O(r)}}}}else{W(u,true)}}}function Y(t){var q=t.getElementsByTagName(Q)[0];if(q){var w=a("embed"),y=q.attributes;if(y){var v=y.length;for(var u=0;u<v;u++){if(y[u].nodeName=="DATA"){w.setAttribute("src",y[u].nodeValue)}else{w.setAttribute(y[u].nodeName,y[u].nodeValue)}}}var x=q.childNodes;if(x){var z=x.length;for(var r=0;r<z;r++){if(x[r].nodeType==1&&x[r].nodeName=="PARAM"){w.setAttribute(x[r].getAttribute("name"),x[r].getAttribute("value"))}}}t.parentNode.replaceChild(w,t)}}function k(w){A=true;var u=C(w.id);if(u){if(w.altContentId){var y=C(w.altContentId);if(y){M=y;l=w.altContentId}}else{M=G(u)}if(!(/%$/.test(w.width))&&parseInt(w.width,10)<310){w.width="310"}if(!(/%$/.test(w.height))&&parseInt(w.height,10)<137){w.height="137"}K.title=K.title.slice(0,47)+" - Flash Player Installation";var z=h.ie&&h.win?"ActiveX":"PlugIn",q=K.title,r="MMredirectURL="+j.location+"&MMplayerType="+z+"&MMdoctitle="+q,x=w.id;if(h.ie&&h.win&&u.readyState!=4){var t=a("div");x+="SWFObjectNew";t.setAttribute("id",x);u.parentNode.insertBefore(t,u);u.style.display="none";var v=function(){u.parentNode.removeChild(u)};I(j,"onload",v)}U({data:w.expressInstall,id:m,width:w.width,height:w.height},{flashvars:r},x)}}function O(t){if(h.ie&&h.win&&t.readyState!=4){var r=a("div");t.parentNode.insertBefore(r,t);r.parentNode.replaceChild(G(t),r);t.style.display="none";var q=function(){t.parentNode.removeChild(t)};I(j,"onload",q)}else{t.parentNode.replaceChild(G(t),t)}}function G(v){var u=a("div");if(h.win&&h.ie){u.innerHTML=v.innerHTML}else{var r=v.getElementsByTagName(Q)[0];if(r){var w=r.childNodes;if(w){var q=w.length;for(var t=0;t<q;t++){if(!(w[t].nodeType==1&&w[t].nodeName=="PARAM")&&!(w[t].nodeType==8)){u.appendChild(w[t].cloneNode(true))}}}}}return u}function U(AG,AE,t){var q,v=C(t);if(v){if(typeof AG.id==b){AG.id=t}if(h.ie&&h.win){var AF="";for(var AB in AG){if(AG[AB]!=Object.prototype[AB]){if(AB.toLowerCase()=="data"){AE.movie=AG[AB]}else{if(AB.toLowerCase()=="styleclass"){AF+=' class="'+AG[AB]+'"'}else{if(AB.toLowerCase()!="classid"){AF+=" "+AB+'="'+AG[AB]+'"'}}}}}var AD="";for(var AA in AE){if(AE[AA]!=Object.prototype[AA]){AD+='<param name="'+AA+'" value="'+AE[AA]+'" />'}}v.outerHTML='<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"'+AF+">"+AD+"</object>";i[i.length]=AG.id;q=C(AG.id)}else{if(h.webkit&&h.webkit<312){var AC=a("embed");AC.setAttribute("type",P);for(var z in AG){if(AG[z]!=Object.prototype[z]){if(z.toLowerCase()=="data"){AC.setAttribute("src",AG[z])}else{if(z.toLowerCase()=="styleclass"){AC.setAttribute("class",AG[z])}else{if(z.toLowerCase()!="classid"){AC.setAttribute(z,AG[z])}}}}}for(var y in AE){if(AE[y]!=Object.prototype[y]){if(y.toLowerCase()!="movie"){AC.setAttribute(y,AE[y])}}}v.parentNode.replaceChild(AC,v);q=AC}else{var u=a(Q);u.setAttribute("type",P);for(var x in AG){if(AG[x]!=Object.prototype[x]){if(x.toLowerCase()=="styleclass"){u.setAttribute("class",AG[x])}else{if(x.toLowerCase()!="classid"){u.setAttribute(x,AG[x])}}}}for(var w in AE){if(AE[w]!=Object.prototype[w]&&w.toLowerCase()!="movie"){F(u,w,AE[w])}}v.parentNode.replaceChild(u,v);q=u}}}return q}function F(t,q,r){var u=a("param");u.setAttribute("name",q);u.setAttribute("value",r);t.appendChild(u)}function X(r){var q=C(r);if(q&&(q.nodeName=="OBJECT"||q.nodeName=="EMBED")){if(h.ie&&h.win){if(q.readyState==4){B(r)}else{j.attachEvent("onload",function(){B(r)})}}else{q.parentNode.removeChild(q)}}}function B(t){var r=C(t);if(r){for(var q in r){if(typeof r[q]=="function"){r[q]=null}}r.parentNode.removeChild(r)}}function C(t){var q=null;try{q=K.getElementById(t)}catch(r){}return q}function a(q){return K.createElement(q)}function I(t,q,r){t.attachEvent(q,r);d[d.length]=[t,q,r]}function c(t){var r=h.pv,q=t.split(".");q[0]=parseInt(q[0],10);q[1]=parseInt(q[1],10)||0;q[2]=parseInt(q[2],10)||0;return(r[0]>q[0]||(r[0]==q[0]&&r[1]>q[1])||(r[0]==q[0]&&r[1]==q[1]&&r[2]>=q[2]))?true:false}function V(v,r){if(h.ie&&h.mac){return }var u=K.getElementsByTagName("head")[0],t=a("style");t.setAttribute("type","text/css");t.setAttribute("media","screen");if(!(h.ie&&h.win)&&typeof K.createTextNode!=b){t.appendChild(K.createTextNode(v+" {"+r+"}"))}u.appendChild(t);if(h.ie&&h.win&&typeof K.styleSheets!=b&&K.styleSheets.length>0){var q=K.styleSheets[K.styleSheets.length-1];if(typeof q.addRule==Q){q.addRule(v,r)}}}function W(t,q){var r=q?"visible":"hidden";if(e&&C(t)){C(t).style.visibility=r}else{V("#"+t,"visibility:"+r)}}function g(s){var r=/[\\\"<>\.;]/;var q=r.exec(s)!=null;return q?encodeURIComponent(s):s}var D=function(){if(h.ie&&h.win){window.attachEvent("onunload",function(){var w=d.length;for(var v=0;v<w;v++){d[v][0].detachEvent(d[v][1],d[v][2])}var t=i.length;for(var u=0;u<t;u++){X(i[u])}for(var r in h){h[r]=null}h=null;for(var q in swfobject){swfobject[q]=null}swfobject=null})}}();return{registerObject:function(u,q,t){if(!h.w3cdom||!u||!q){return }var r={};r.id=u;r.swfVersion=q;r.expressInstall=t?t:false;N[N.length]=r;W(u,false)},getObjectById:function(v){var q=null;if(h.w3cdom){var t=C(v);if(t){var u=t.getElementsByTagName(Q)[0];if(!u||(u&&typeof t.SetVariable!=b)){q=t}else{if(typeof u.SetVariable!=b){q=u}}}}return q},embedSWF:function(x,AE,AB,AD,q,w,r,z,AC){if(!h.w3cdom||!x||!AE||!AB||!AD||!q){return }AB+="";AD+="";if(c(q)){W(AE,false);var AA={};if(AC&&typeof AC===Q){for(var v in AC){if(AC[v]!=Object.prototype[v]){AA[v]=AC[v]}}}AA.data=x;AA.width=AB;AA.height=AD;var y={};if(z&&typeof z===Q){for(var u in z){if(z[u]!=Object.prototype[u]){y[u]=z[u]}}}if(r&&typeof r===Q){for(var t in r){if(r[t]!=Object.prototype[t]){if(typeof y.flashvars!=b){y.flashvars+="&"+t+"="+r[t]}else{y.flashvars=t+"="+r[t]}}}}f(function(){U(AA,y,AE);if(AA.id==AE){W(AE,true)}})}else{if(w&&!A&&c("6.0.65")&&(h.win||h.mac)){A=true;W(AE,false);f(function(){var AF={};AF.id=AF.altContentId=AE;AF.width=AB;AF.height=AD;AF.expressInstall=w;k(AF)})}}},getFlashPlayerVersion:function(){return{major:h.pv[0],minor:h.pv[1],release:h.pv[2]}},hasFlashPlayerVersion:c,createSWF:function(t,r,q){if(h.w3cdom){return U(t,r,q)}else{return undefined}},removeSWF:function(q){if(h.w3cdom){X(q)}},createCSS:function(r,q){if(h.w3cdom){V(r,q)}},addDomLoadEvent:f,addLoadEvent:R,getQueryParamValue:function(v){var u=K.location.search||K.location.hash;if(v==null){return g(u)}if(u){var t=u.substring(1).split("&");for(var r=0;r<t.length;r++){if(t[r].substring(0,t[r].indexOf("="))==v){return g(t[r].substring((t[r].indexOf("=")+1)))}}}return""},expressInstallCallback:function(){if(A&&M){var q=C(m);if(q){q.parentNode.replaceChild(M,q);if(l){W(l,true);if(h.ie&&h.win){M.style.display="block"}}M=null;l=null;A=false}}}}}();
\ No newline at end of file
diff --git a/pages/UI.php b/pages/UI.php
index 36dfe94c4..18e0bb79d 100644
--- a/pages/UI.php
+++ b/pages/UI.php
@@ -1858,8 +1858,9 @@ EOF
 		break;
 
 		///////////////////////////////////////////////////////////////////////////////////////////
-		
-		case 'swf_navigator': // Graphical display of the relations "impact" / "depends on"
+
+		case 'swf_navigator': /** @deprecated SWF was removed in iTop */
+		case 'view_relations': // Graphical display of the relations "impact" / "depends on"
 		require_once(APPROOT.'core/simplegraph.class.inc.php');
 		require_once(APPROOT.'core/relationgraph.class.inc.php');
 		require_once(APPROOT.'core/displayablegraph.class.inc.php');
diff --git a/pages/navigator.php b/pages/navigator.php
deleted file mode 100755
index 70b8d9d74..000000000
--- a/pages/navigator.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/**
- * Copyright (C) 2013-2019 Combodo SARL
- *
- * This file is part of iTop.
- *
- * iTop is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * iTop is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- */
-
-
-/**
- * Display the Flash navigator, in the whole pane
- */
-require_once('../approot.inc.php');
-require_once(APPROOT.'/application/application.inc.php');
-require_once(APPROOT.'/application/itopwebpage.class.inc.php');
-
-require_once(APPROOT.'/application/startup.inc.php');
-
-require_once(APPROOT.'/application/loginwebpage.class.inc.php');
-LoginWebPage::DoLogin(); // Check user rights and prompt if needed
-
-$sOperation = utils::ReadParam('operation', 'menu');
-$oAppContext = new ApplicationContext();
-
-$oP = new iTopWebPage("iTop - Navigator");
-
-// Main program
-$sClass = utils::ReadParam('class', '', false, 'class');
-$id = utils::ReadParam('id', 0);
-$sRelation = utils::ReadParam('relation', 'neighbours');
-
-try
-{
-	$width = 1000;
-	$height = 700;
-	$sDrillUrl = urlencode(utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=details');
-//	$sParams = "pWidth=$width&pHeight=$height&drillUrl=".urlencode('../pages/UI.php?operation=details')."&displayController=false&xmlUrl=".urlencode("./xml.navigator.php")."&obj_class=$sClass&obj_id=$id&relation=$sRelation";
-	
-//	$oP->add("<object classid=\"clsid:d27cdb6e-ae6d-11cf-96b8-444553540000\" codebase=\"http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=7,0,0,0\" width=\"$width\" height=\"$height\" id=\"navigator\" align=\"middle\">
-//	<param name=\"allowScriptAccess\" value=\"sameDomain\" />
-//	<param name=\"allowFullScreen\" value=\"false\" />
-//	<param name=\"FlashVars\" value=\"$sParams\" />
-//	<param name=\"movie\" value=\"../images/navigator.swf\" /><param name=\"quality\" value=\"high\" /><param name=\"bgcolor\" value=\"#ffffff\" />
-//	<embed src=\"../images/navigator.swf\" flashVars=\"$sParams\" quality=\"high\" bgcolor=\"#ffffff\" width=\"$width\" height=\"$height\" name=\"navigator\" align=\"middle\" allowScriptAccess=\"sameDomain\" allowFullScreen=\"false\" type=\"application/x-shockwave-flash\" pluginspage=\"http://www.adobe.com/go/getflashplayer\" />
-//	</object>\n");
-	
-	$oP->add("<div id=\"navigator\">If the chart does not display, <a href=\"http://get.adobe.com/flash/\" target=\"_blank\">install Flash</a></div>\n");
-	$oP->add_ready_script(<<<EOF
-var iWidth = $('.ui-layout-content').width();
-var iHeight = $('.ui-layout-content').height();
-swfobject.embedSWF("../navigator/navigator.swf", "navigator", "100%", "100%","9.0.0", "expressInstall.swf",
-				   { pWidth: iWidth, pHeight: iHeight, drillUrl: '$sDrillUrl', displayController: false, obj_class: '$sClass', obj_id: $id, relation: '$sRelation'},
-				   {wmode: 'transparent'}
-				   );
-EOF
-);
-
-}
-catch(CoreException $e)
-{
-	$oP->p('<b>An error occured while running the query:</b>');
-	$oP->p($e->getHtmlDesc());
-}
-catch(Exception $e)
-{
-	$oP->p('<b>An error occured while running the query:</b>');
-	$oP->p($e->getMessage());
-}
-
-$oP->output();
-?>

From 1b2dd0440911e052ecfaaa4ef40a42553067a3a1 Mon Sep 17 00:00:00 2001
From: Molkobain <lajarige.guillaume@free.fr>
Date: Wed, 30 Sep 2020 14:36:00 +0200
Subject: [PATCH 28/43] =?UTF-8?q?N=C2=B02899=20-=20Setup:=20Remove=20mbstr?=
 =?UTF-8?q?ing=20from=20optional=20PHP=20extensions=20now=20that=20it=20is?=
 =?UTF-8?q?=20mandatory=20(7d1a61a2f)=20(Thanks=20@Hispka=20!)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup/setuputils.class.inc.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/setup/setuputils.class.inc.php b/setup/setuputils.class.inc.php
index 1b4614679..42520a88b 100644
--- a/setup/setuputils.class.inc.php
+++ b/setup/setuputils.class.inc.php
@@ -2137,7 +2137,7 @@ JS
 			'zlib',
 			'zip',
 			'fileinfo', // N°3123
-			'mbstring', // N°2899
+			'mbstring', 'For CryptEngine implementations, trace in Mail to ticket automation', // N°2891, N°2899
 			'gd', // test image type (always returns false if not installed), image resizing, PDF export
 		];
 	}
@@ -2153,7 +2153,6 @@ JS
 				'openssl' => 'Strong encryption will not be used.',
 			],
 			'ldap' => 'LDAP authentication will be disabled.',
-			'mbstring' => 'For CryptEngine implementations, trace in Mail to ticket automation', // N°2891
 		];
 
 		if (utils::IsDevelopmentEnvironment()) {

From ee9343cf40ee383c879b0396ddaab36df0c63129 Mon Sep 17 00:00:00 2001
From: odain <olivier.dain@combodo.com>
Date: Wed, 30 Sep 2020 16:00:36 +0200
Subject: [PATCH 29/43] =?UTF-8?q?N=C2=B03117:=20fix=20refactor=20regarding?=
 =?UTF-8?q?=20itop-structure=20setup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../2.x/itop-structure/module.itop-structure.php       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/datamodels/2.x/itop-structure/module.itop-structure.php b/datamodels/2.x/itop-structure/module.itop-structure.php
index 0ffe6ba92..d54078ac7 100644
--- a/datamodels/2.x/itop-structure/module.itop-structure.php
+++ b/datamodels/2.x/itop-structure/module.itop-structure.php
@@ -7,8 +7,8 @@ SetupWebPage::AddModule(
 	array(
 		// Identification
 		//
-		'label' => 'Structure de base iTop',
-		'category' => 'core',
+		'label' => 'Core iTop Structure',
+		'category' => 'business',
 
 		// Setup
 		//
@@ -16,7 +16,7 @@ SetupWebPage::AddModule(
 		),
 		'mandatory' => true,
 		'visible' => true,
-		'installer' => 'ConfigMgmtInstaller',
+		'installer' => 'StructureInstaller',
 
 		// Components
 		//
@@ -47,11 +47,11 @@ SetupWebPage::AddModule(
 	)
 );
 
-if (!class_exists('ConfigMgmtInstaller'))
+if (!class_exists('StructureInstaller'))
 {
 	// Module installation handler
 	//
-	class ConfigMgmtInstaller extends ModuleInstallerAPI
+	class StructureInstaller extends ModuleInstallerAPI
 	{
 		public static function BeforeWritingConfig(Config $oConfiguration)
 		{

From f8129fab74239038f90e14a5ba93d36e15f0e8d9 Mon Sep 17 00:00:00 2001
From: Molkobain <lajarige.guillaume@free.fr>
Date: Wed, 30 Sep 2020 16:19:51 +0200
Subject: [PATCH 30/43] =?UTF-8?q?N=C2=B02899=20-=20Setup:=20Fix=20"For=20C?=
 =?UTF-8?q?ryptoEngine=20..."=20mandatory=20PHP=20extension=20introduced?=
 =?UTF-8?q?=20in=20the=20previous=20commit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup/setuputils.class.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/setuputils.class.inc.php b/setup/setuputils.class.inc.php
index 42520a88b..341d90e08 100644
--- a/setup/setuputils.class.inc.php
+++ b/setup/setuputils.class.inc.php
@@ -2137,7 +2137,7 @@ JS
 			'zlib',
 			'zip',
 			'fileinfo', // N°3123
-			'mbstring', 'For CryptEngine implementations, trace in Mail to ticket automation', // N°2891, N°2899
+			'mbstring', // N°2891, N°2899
 			'gd', // test image type (always returns false if not installed), image resizing, PDF export
 		];
 	}

From 5862ecde69812b7765dba4d87ab027cb20a54767 Mon Sep 17 00:00:00 2001
From: odain <olivier.dain@combodo.com>
Date: Wed, 30 Sep 2020 17:32:07 +0200
Subject: [PATCH 31/43] =?UTF-8?q?N=C2=B03117:=20force=20itop-structure=20l?=
 =?UTF-8?q?oading=20during=20setup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 datamodels/2.x/itop-structure/module.itop-structure.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/datamodels/2.x/itop-structure/module.itop-structure.php b/datamodels/2.x/itop-structure/module.itop-structure.php
index d54078ac7..5576249fb 100644
--- a/datamodels/2.x/itop-structure/module.itop-structure.php
+++ b/datamodels/2.x/itop-structure/module.itop-structure.php
@@ -15,7 +15,7 @@ SetupWebPage::AddModule(
 		'dependencies' => array(
 		),
 		'mandatory' => true,
-		'visible' => true,
+		'visible' => false,
 		'installer' => 'StructureInstaller',
 
 		// Components

From e9f81bd9785bcd6ce3e821736e381eb83c6e2f28 Mon Sep 17 00:00:00 2001
From: Pierre Goiffon <pierre.goiffon@combodo.com>
Date: Thu, 1 Oct 2020 10:09:19 +0200
Subject: [PATCH 32/43] :wrench: Update .Editorconfig for braces always at eol

---
 .editorconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index d095a35cf..b30c0b63e 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -321,7 +321,7 @@ ij_php_call_parameters_right_paren_on_new_line = false
 ij_php_call_parameters_wrap = normal
 ij_php_catch_on_new_line = true
 ij_php_category_weight = 28
-ij_php_class_brace_style = next_line
+ij_php_class_brace_style = end_of_line
 ij_php_comma_after_last_array_element = true
 ij_php_concat_spaces = false
 ij_php_copyright_weight = 28
@@ -372,7 +372,7 @@ ij_php_link_weight = 28
 ij_php_lower_case_boolean_const = true
 ij_php_lower_case_keywords = true
 ij_php_lower_case_null_const = true
-ij_php_method_brace_style = next_line
+ij_php_method_brace_style = end_of_line
 ij_php_method_call_chain_wrap = off
 ij_php_method_parameters_new_line_after_left_paren = true
 ij_php_method_parameters_right_paren_on_new_line = true

From 6cd0670d6b70e33f8da20cb293c93f10479bf809 Mon Sep 17 00:00:00 2001
From: Pierre Goiffon <pierre.goiffon@combodo.com>
Date: Thu, 1 Oct 2020 09:45:00 +0200
Subject: [PATCH 33/43] :art: Fix parameter for all DBSearch::AllowAllData impl

---
 core/dbsearch.class.php      | 52 +++++++++++++++++-------------------
 core/dbunionsearch.class.php | 13 ++++-----
 2 files changed, 30 insertions(+), 35 deletions(-)

diff --git a/core/dbsearch.class.php b/core/dbsearch.class.php
index e5ce11999..e59493d80 100644
--- a/core/dbsearch.class.php
+++ b/core/dbsearch.class.php
@@ -97,42 +97,40 @@ abstract class DBSearch
 	/**
 	 * Perform a deep clone (as opposed to "clone" which does copy a reference to the underlying objects)
 	 *
-     * @internal
-     *
+	 * @internal
+	 *
 	 * @return \DBSearch
-	 **/	 	
+	 **/
 	public function DeepClone()
 	{
 		return unserialize(serialize($this)); // Beware this serializes/unserializes the search and its parameters as well
 	}
 
-    /**
-     * whether or not some information should be hidden to the current user.
-     *
-     * @api
-     * @see IsAllDataAllowed()
-     *
-     * @return mixed
-     */
-	abstract public function AllowAllData();
+	/**
+	 * @api
+	 * @see IsAllDataAllowed()
+	 *
+	 * @param bool $bAllowAllData whether or not some information should be hidden to the current user.
+	 */
+	abstract public function AllowAllData($bAllowAllData = true);
 
-    /**
-     * Current state of AllowAllData
-     *
-     * @internal
-     * @see AllowAllData()
-     *
-     * @return mixed
-     */
+	/**
+	 * Current state of AllowAllData
+	 *
+	 * @internal
+	 * @see AllowAllData()
+	 *
+	 * @return mixed
+	 */
 	abstract public function IsAllDataAllowed();
 
-    /**
-     * Should the archives be fetched
-     *
-     * @internal
-     *
-     * @param $bEnable
-     */
+	/**
+	 * Should the archives be fetched
+	 *
+	 * @internal
+	 *
+	 * @param $bEnable
+	 */
 	public function SetArchiveMode($bEnable)
 	{
 		$this->m_bArchiveMode = $bEnable;
diff --git a/core/dbunionsearch.class.php b/core/dbunionsearch.class.php
index 721191bd3..a574af4b7 100644
--- a/core/dbunionsearch.class.php
+++ b/core/dbunionsearch.class.php
@@ -65,9 +65,7 @@ class DBUnionSearch extends DBSearch
 				{
 					$this->aSearches[] = $oSubSearch->DeepClone();
 				}
-			}
-			else
-			{
+			} else {
 				$this->aSearches[] = $oSearch->DeepClone();
 			}
 		}
@@ -75,17 +73,16 @@ class DBUnionSearch extends DBSearch
 		$this->ComputeSelectedClasses();
 	}
 
-	public function AllowAllData()
+	public function AllowAllData($bAllowAllData = true)
 	{
-		foreach ($this->aSearches as $oSearch)
-		{
+		foreach ($this->aSearches as $oSearch) {
 			$oSearch->AllowAllData();
 		}
 	}
+
 	public function IsAllDataAllowed()
 	{
-		foreach ($this->aSearches as $oSearch)
-		{
+		foreach ($this->aSearches as $oSearch) {
 			if ($oSearch->IsAllDataAllowed() === false) return false;
 		}
 		return true;

From b2474d33689b419a08c93798e3a2dab7ad62f65e Mon Sep 17 00:00:00 2001
From: Pierre Goiffon <pierre.goiffon@combodo.com>
Date: Thu, 1 Oct 2020 11:31:24 +0200
Subject: [PATCH 34/43] =?UTF-8?q?N=C2=B03324=20Portal=20fix=20ignore=5Fsil?=
 =?UTF-8?q?o=20when=20using=20nested=20query=20in=20scopes=20The=20AllowAl?=
 =?UTF-8?q?lData=20attribute=20wasn't=20updated=20in=20the=20nested=20quer?=
 =?UTF-8?q?ies.=20It=20is=20now=20set=20both=20when=20calling=20DBObjectSe?=
 =?UTF-8?q?arch::AllowAllData=20and=20when=20creating=20a=20new=20nested?=
 =?UTF-8?q?=20query=20(\DBObjectSearch::AddConditionExpression)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/dbobjectsearch.class.php     |  85 +++++++++++++---------
 core/oql/expression.class.inc.php | 116 ++++++++++++++++++------------
 test/core/DBSearchTest.php        |  42 +++++++++--
 3 files changed, 159 insertions(+), 84 deletions(-)

diff --git a/core/dbobjectsearch.class.php b/core/dbobjectsearch.class.php
index fff7c2338..9b57078a8 100644
--- a/core/dbobjectsearch.class.php
+++ b/core/dbobjectsearch.class.php
@@ -63,9 +63,15 @@ class DBObjectSearch extends DBSearch
 	{
 		parent::__construct();
 
-		if (is_null($sClassAlias)) $sClassAlias = $sClass;
-		if(!is_string($sClass)) throw new Exception('DBObjectSearch::__construct called with a non-string parameter: $sClass = '.print_r($sClass, true));
-		if(!MetaModel::IsValidClass($sClass)) throw new Exception('DBObjectSearch::__construct called for an invalid class: "'.$sClass.'"');
+		if (is_null($sClassAlias)) {
+			$sClassAlias = $sClass;
+		}
+		if (!is_string($sClass)) {
+			throw new Exception('DBObjectSearch::__construct called with a non-string parameter: $sClass = '.print_r($sClass, true));
+		}
+		if (!MetaModel::IsValidClass($sClass)) {
+			throw new Exception('DBObjectSearch::__construct called for an invalid class: "'.$sClass.'"');
+		}
 
 		$this->m_aSelectedClasses = array($sClassAlias => $sClass);
 		$this->m_aClasses = array($sClassAlias => $sClass);
@@ -75,30 +81,43 @@ class DBObjectSearch extends DBSearch
 		$this->m_aReferencedBy = array();
 	}
 
-	public function AllowAllData($bAllowAllData = true) {$this->m_bAllowAllData = $bAllowAllData;}
-	public function IsAllDataAllowed() {return $this->m_bAllowAllData;}
-	protected function IsDataFiltered() {return $this->m_bDataFiltered; }
-	protected function SetDataFiltered() {$this->m_bDataFiltered = true;}
+	public function AllowAllData($bAllowAllData = true) {
+		$this->m_bAllowAllData = $bAllowAllData;
+
+		$this->m_oSearchCondition->Browse(function ($oThisExpression) use ($bAllowAllData) {
+			ExpressionHelper::ExpressionAllowAllDataCallback($oThisExpression, $bAllowAllData);
+		});
+	}
+
+	public function IsAllDataAllowed() {
+		return $this->m_bAllowAllData;
+	}
+
+	protected function IsDataFiltered() {
+		return $this->m_bDataFiltered;
+	}
+
+	protected function SetDataFiltered() {
+		$this->m_bDataFiltered = true;
+	}
 
 	// Create a search definition that leads to 0 result, still a valid search object
-	static public function FromEmptySet($sClass)
-	{
+	public static function FromEmptySet($sClass) {
 		$oResultFilter = new DBObjectSearch($sClass);
 		$oResultFilter->m_oSearchCondition = new FalseExpression;
+
 		return $oResultFilter;
 	}
 
 
-	public function GetJoinedClasses() {return $this->m_aClasses;}
+	public function GetJoinedClasses() {
+		return $this->m_aClasses;
+	}
 
-	public function GetClassName($sAlias)
-	{
-		if (array_key_exists($sAlias, $this->m_aSelectedClasses))
-		{
+	public function GetClassName($sAlias) {
+		if (array_key_exists($sAlias, $this->m_aSelectedClasses)) {
 			return $this->m_aSelectedClasses[$sAlias];
-		}
-		else
-		{
+		} else {
 			throw new CoreException("Invalid class alias '$sAlias'");
 		}
 	}
@@ -358,37 +377,35 @@ class DBObjectSearch extends DBSearch
 		}
 		foreach($this->m_aReferencedBy as $sForeignClass => $aReferences)
 		{
-			foreach($aReferences as $sForeignExtKeyAttCode => $aFiltersByOperator)
-			{
-				foreach ($aFiltersByOperator as $iOperatorCode => $aFilters)
-				{
-					foreach ($aFilters as $oForeignFilter)
-					{
+			foreach($aReferences as $sForeignExtKeyAttCode => $aFiltersByOperator) {
+				foreach ($aFiltersByOperator as $iOperatorCode => $aFilters) {
+					foreach ($aFilters as $oForeignFilter) {
 						$oForeignFilter->RenameParam($sOldName, $sNewName);
 					}
 				}
 			}
 		}
 	}
-	
-	public function ResetCondition()
-	{
+
+	public function ResetCondition() {
 		$this->m_oSearchCondition = new TrueExpression();
 		// ? is that usefull/enough, do I need to rebuild the list after the subqueries ?
 	}
 
-	public function MergeConditionExpression($oExpression)
-	{
-		$this->m_oSearchCondition = $this->m_oSearchCondition->LogOr($oExpression); 
+	public function MergeConditionExpression($oExpression) {
+		$this->m_oSearchCondition = $this->m_oSearchCondition->LogOr($oExpression);
 	}
 
-	public function AddConditionExpression($oExpression)
-	{
-		$this->m_oSearchCondition = $this->m_oSearchCondition->LogAnd($oExpression); 
+	public function AddConditionExpression($oExpression) {
+		$this->m_oSearchCondition = $this->m_oSearchCondition->LogAnd($oExpression);
+
+		$bRootSearchAllowAllData = $this->IsAllDataAllowed();
+		$oExpression->Browse(function ($oThisExpression) use ($bRootSearchAllowAllData) {
+			ExpressionHelper::ExpressionAllowAllDataCallback($oThisExpression, $bRootSearchAllowAllData);
+		});
 	}
 
-  	public function AddNameCondition($sName)
-	{
+	public function AddNameCondition($sName) {
 		$oValueExpr = new ScalarExpression($sName);
 		$oNameExpr = new FieldExpression('friendlyname', $this->GetClassAlias());
 		$oNewCondition = new BinaryExpression($oNameExpr, '=', $oValueExpr);
diff --git a/core/oql/expression.class.inc.php b/core/oql/expression.class.inc.php
index 596823041..69d04420d 100644
--- a/core/oql/expression.class.inc.php
+++ b/core/oql/expression.class.inc.php
@@ -1,32 +1,52 @@
 <?php
-// Copyright (c) 2010-2018 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-//
+/*
+ * Copyright (C) 2010-2020 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
 
-class MissingQueryArgument extends CoreException
-{
+class MissingQueryArgument extends CoreException {
+}
+
+
+class ExpressionHelper {
+	/**
+	 * Callback to be used with {@link Expression::Browse}, to update the AllowAllData attribute in the NestedQueryExpression that are
+	 * present in the Expression tree
+	 *
+	 * @param \Expression $oExpression
+	 * @param boolean $bAllowAllData
+	 *
+	 * @uses \DBSearch::AllowAllData()
+	 *
+	 * @since 2.7.2 2.8.0 N°3324
+	 */
+	public static function ExpressionAllowAllDataCallback($oExpression, $bAllowAllData) {
+		if (!($oExpression instanceof NestedQueryExpression)) {
+			return;
+		}
+
+		$oExpression->AllowAllData($bAllowAllData);
+	}
 }
 
 
 /**
  * @method Check($oModelReflection, array $aAliases, $sSourceQuery)
  */
-abstract class Expression
-{
+abstract class Expression {
 	const OPERATOR_BINARY = 'binary';
 	const OPERATOR_BOOLEAN = 'boolean_binary';
 	const OPERATOR_FIELD = 'field';
@@ -139,9 +159,13 @@ abstract class Expression
 	}
 
 	/**
-	 * Recursively browse the expression tree
-	 * @param Closure $callback
-	 * @return mixed
+	 * Recursively browse the expression tree.
+	 *
+	 * To access variables, specify them using the `use` keyword and the `&` to pass by reference if necessary
+	 *
+	 * @see https://www.php.net/manual/fr/functions.anonymous.php
+	 *
+	 * @param Closure $callback with current expression as parameter
 	 */
 	abstract public function Browse(Closure $callback);
 
@@ -2157,60 +2181,62 @@ class NestedQueryExpression extends Expression
 	}
 
 	/**/
-	public function ApplyParameters($aArgs)
-	{
+	public function ApplyParameters($aArgs) {
 		$this->m_oNestedQuery->ApplyParameters($aArgs);
 	}
 
 	/**/
-	public function GetUnresolvedFields($sAlias, &$aUnresolved)
-	{
+	public function GetUnresolvedFields($sAlias, &$aUnresolved) {
 	}
 
 	/**/
-	public function Translate($aTranslationData, $bMatchAll = true, $bMarkFieldsAsResolved = true)
-	{
+	public function Translate($aTranslationData, $bMatchAll = true, $bMarkFieldsAsResolved = true) {
 		// Check and prepare the select information
-		$this->m_oNestedQuery->TranslateConditions($aTranslationData, $bMatchAll , $bMarkFieldsAsResolved );
+		$this->m_oNestedQuery->TranslateConditions($aTranslationData, $bMatchAll, $bMarkFieldsAsResolved);
+
 		return clone $this;
 	}
 
-	public function ListRequiredFields()
-	{
+	public function ListRequiredFields() {
 		return array();
 	}
 
-	public function CollectUsedParents(&$aTable)
-	{
+	public function CollectUsedParents(&$aTable) {
 	}
 
-	public function ListConstantFields()
-	{
+	public function ListConstantFields() {
 		return $this->m_oNestedQuery->ListConstantFields();
 	}
 
-	public function ListParameters()
-	{
+	public function ListParameters() {
 		return $this->m_oNestedQuery->ListParameters();
 	}
 
-	public function RenameParam($sOldName, $sNewName)
-	{
+	public function RenameParam($sOldName, $sNewName) {
 		$this->m_oNestedQuery->RenameParam($sOldName, $sNewName);
 	}
 
-	public function RenameAlias($sOldName, $sNewName)
-	{
+	public function RenameAlias($sOldName, $sNewName) {
 		$this->m_oNestedQuery->RenameAlias($sOldName, $sNewName);
 	}
 
 	/**
 	 * @inheritDoc
 	 */
-	public function ToJSON(&$aArgs = null, $bRetrofitParams = false)
-	{
+	public function ToJSON(&$aArgs = null, $bRetrofitParams = false) {
 		return $this->m_oNestedQuery->ToJSON();
 	}
+
+	/**
+	 * Simple indirection to {@link \DBObjectSearch::AllowAllData()}
+	 *
+	 * @param bool $bAllowAllData
+	 *
+	 * @uses \DBSearch::AllowAllData()
+	 */
+	public function AllowAllData($bAllowAllData = true) {
+		$this->m_oNestedQuery->AllowAllData($bAllowAllData);
+	}
 }
 
 class FunctionExpression extends Expression
diff --git a/test/core/DBSearchTest.php b/test/core/DBSearchTest.php
index 9389bc9ca..abc8a7795 100644
--- a/test/core/DBSearchTest.php
+++ b/test/core/DBSearchTest.php
@@ -675,17 +675,49 @@ class DBSearchTest extends ItopDataTestCase
 		$TwoOrgIdsOnly = array($allOrgIds[0], $allOrgIds[1]);
 		$oSearch = DBSearch::FromOQL("SELECT UserRequest WHERE org_id IN (:org_ids)");
 		self::assertNotNull($oSearch);
-		$oSet = new \CMDBObjectSet($oSearch, array(), array('org_ids'=> $TwoOrgIdsOnly));
+		$oSet = new \CMDBObjectSet($oSearch, array(), array('org_ids' => $TwoOrgIdsOnly));
 		static::assertEquals(4, $oSet->Count());
 
-		$_SERVER['REQUEST_URI']='FAKE_REQUEST_URI' ;
-		$_SERVER['REQUEST_METHOD']='FAKE_REQUEST_METHOD';
+		$_SERVER['REQUEST_URI'] = 'FAKE_REQUEST_URI';
+		$_SERVER['REQUEST_METHOD'] = 'FAKE_REQUEST_METHOD';
 		$oP = new \iTopWebPage("test");
 		$oBlock = new \DisplayBlock($oSet->GetFilter(), 'list', false);
-		$sHtml = $oBlock->GetDisplay($oP, 'package_table', array ('menu'=>true, 'display_limit'=>false));
+		$sHtml = $oBlock->GetDisplay($oP, 'package_table', array('menu' => true, 'display_limit' => false));
 
 		$iHtmlUserRequestLineCount = substr_count($sHtml, '<tr><td  data-object-class="UserRequest"');
-		static::assertEquals(4, $iHtmlUserRequestLineCount, "Failed Generated html :" . $sHtml);
+		static::assertEquals(4, $iHtmlUserRequestLineCount, "Failed Generated html :".$sHtml);
 		$oP->output();
 	}
+
+	/**
+	 * @since 2.7.2 2.8.0 N°3324
+	 */
+	public function testAllowAllData() {
+		$oSimpleSearch = \DBObjectSearch::FromOQL('SELECT FunctionalCI');
+		$oSimpleSearch->AllowAllData(false);
+		self::assertFalse($oSimpleSearch->IsAllDataAllowed(), 'DBSearch AllowData value');
+		$oSimpleSearch->AllowAllData(true);
+		self::assertTrue($oSimpleSearch->IsAllDataAllowed(), 'DBSearch AllowData value');
+
+		$sNestedQuery = 'SELECT FunctionalCI WHERE id IN (SELECT Server)';
+		$this->CheckNestedSearch($sNestedQuery, true);
+		$this->CheckNestedSearch($sNestedQuery, false);
+	}
+
+	private function CheckNestedSearch($sQuery, $bAllowAllData) {
+		$oNestedQuerySearch = \DBObjectSearch::FromOQL($sQuery);
+		$oNestedQuerySearch->AllowAllData($bAllowAllData);
+		self::assertEquals($bAllowAllData, $oNestedQuerySearch->IsAllDataAllowed(), 'root DBSearch AllowData value');
+		$oNestedSearchInExpression = null;
+		$oNestedQuerySearch->GetCriteria()->Browse(function ($oExpression) use (&$oNestedSearchInExpression) {
+			if ($oExpression instanceof \NestedQueryExpression) {
+				$oNestedSearchInExpression = $oExpression->GetNestedQuery();
+
+				return;
+			}
+		});
+		self::assertNotNull($oNestedSearchInExpression, 'We must have a DBSearch inside a NestedQueryExpression inside the root DBSearch');
+		/** @var \DBObjectSearch $oNestedSearchInExpression */
+		self::assertEquals($bAllowAllData, $oNestedSearchInExpression->IsAllDataAllowed(), 'Nested DBSearch AllowData value');
+	}
 }

From e4b3871947c6a79cc5d579df528d0aa1f21177d4 Mon Sep 17 00:00:00 2001
From: Pierre Goiffon <pierre.goiffon@combodo.com>
Date: Thu, 1 Oct 2020 14:51:28 +0200
Subject: [PATCH 35/43] :memo: PHPDoc for \Expression::IsTrue

---
 core/oql/expression.class.inc.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/oql/expression.class.inc.php b/core/oql/expression.class.inc.php
index 69d04420d..18f51354c 100644
--- a/core/oql/expression.class.inc.php
+++ b/core/oql/expression.class.inc.php
@@ -177,6 +177,9 @@ abstract class Expression {
 	// recursively list field parents ($aTable = array of sParent => dummy)
 	abstract public function CollectUsedParents(&$aTable);
 
+	/**
+	 * @return boolean evaluation of the expression value, false if no conversion possible
+	 */
 	abstract public function IsTrue();
 
 	// recursively builds an array of [classAlias][fieldName] => value
@@ -185,8 +188,7 @@ abstract class Expression {
 	// recursively builds an array of parameters to give to current request
 	abstract public function ListParameters();
 
-	public function RequiresField($sClass, $sFieldName)
-	{
+	public function RequiresField($sClass, $sFieldName) {
 		// #@# todo - optimize : this is called quite often when building a single query !
 		$aRequired = $this->ListRequiredFields();
 		if (!in_array($sClass.'.'.$sFieldName, $aRequired)) return false;

From 93c91c40777d67673d7913b0decd23abe1caacd3 Mon Sep 17 00:00:00 2001
From: BenGrenoble <benjamin.planque@combodo.com>
Date: Thu, 1 Oct 2020 15:11:07 +0200
Subject: [PATCH 36/43] =?UTF-8?q?3354=20remove=20now=20from=20"Bitte=20bes?=
 =?UTF-8?q?t=C3=A4tigen=20sie,=20dass=20jetzt=20ein=20Backup=20erstellen?=
 =?UTF-8?q?=20wollen=20now."?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 datamodels/2.x/itop-backup/de.dict.itop-backup.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/datamodels/2.x/itop-backup/de.dict.itop-backup.php b/datamodels/2.x/itop-backup/de.dict.itop-backup.php
index d6145c39b..c925efb53 100644
--- a/datamodels/2.x/itop-backup/de.dict.itop-backup.php
+++ b/datamodels/2.x/itop-backup/de.dict.itop-backup.php
@@ -53,7 +53,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'bkp-next-backup' => 'Das nächste Backup wird am <b>%1$s</b> (%2$s) um %3$s durchgeführt',
 	'bkp-button-backup-now' => 'Starte Backup',
 	'bkp-button-restore-now' => 'Wiederherstellen!',
-	'bkp-confirm-backup' => 'Bitte bestätigen sie, dass sie jetzt ein Backup erstellen wollen now.',
+	'bkp-confirm-backup' => 'Bitte bestätigen sie, dass sie jetzt ein Backup erstellen wollen.',
 	'bkp-confirm-restore' => 'Bitte bestätigen sie, dass sie mit Backup %1$s eine Wiederherstellung durchführen wollen.',
 	'bkp-wait-backup' => 'Bitte warten, bis das Backup abgeschlossen ist ...',
 	'bkp-wait-restore' => 'Bitte warten, bis die Wiederherstellung abgeschlossen ist ...',

From db8c26da172383626091d7b1f921fd65f9860f18 Mon Sep 17 00:00:00 2001
From: Pierre Goiffon <pierre.goiffon@combodo.com>
Date: Thu, 1 Oct 2020 17:02:22 +0200
Subject: [PATCH 37/43] :memo: update PHPDoc for \Expression::IsTrue

---
 core/oql/expression.class.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/oql/expression.class.inc.php b/core/oql/expression.class.inc.php
index 18f51354c..1f65b5c5b 100644
--- a/core/oql/expression.class.inc.php
+++ b/core/oql/expression.class.inc.php
@@ -178,7 +178,7 @@ abstract class Expression {
 	abstract public function CollectUsedParents(&$aTable);
 
 	/**
-	 * @return boolean evaluation of the expression value, false if no conversion possible
+	 * @return boolean true if the expression's value is constant and evaluates to true, false otherwise
 	 */
 	abstract public function IsTrue();
 

From 37522459a868c505f106907ea198a082964b9db0 Mon Sep 17 00:00:00 2001
From: Pierre Goiffon <pierre.goiffon@combodo.com>
Date: Thu, 1 Oct 2020 18:02:31 +0200
Subject: [PATCH 38/43] =?UTF-8?q?N=C2=B03351=20restore=20LogKPI=20calls=20?=
 =?UTF-8?q?in=20portal=20index?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../config/legacy_silex_compat_layer.php      |  9 +++++++
 .../itop-portal-base/portal/public/index.php  | 25 +++++++++++++++----
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/datamodels/2.x/itop-portal-base/portal/config/legacy_silex_compat_layer.php b/datamodels/2.x/itop-portal-base/portal/config/legacy_silex_compat_layer.php
index 06e69d1d7..a92e34260 100644
--- a/datamodels/2.x/itop-portal-base/portal/config/legacy_silex_compat_layer.php
+++ b/datamodels/2.x/itop-portal-base/portal/config/legacy_silex_compat_layer.php
@@ -34,23 +34,30 @@ $oModuleDesign = new ModuleDesign($_ENV['PORTAL_ID']);
 
 // Load portal conf. such as properties, themes, templates, ...
 // Append into %combodo.portal.instance.conf%
+$oKPI = new ExecutionKPI();
 $oBasicCompat = new Basic($oModuleDesign);
 $oBasicCompat->Process($container);
+$oKPI->ComputeAndReport('Load portal conf. such as properties, themes, templates, ...');
 
 // Load portal forms definition
 // Append into %combodo.portal.instance.conf%
+$oKPI = new ExecutionKPI();
 $oFormsCompat = new Forms($oModuleDesign);
 $oFormsCompat->Process($container);
+$oKPI->ComputeAndReport('Load portal forms definition');
 
 // Load portal lists definition
 // Append into %combodo.portal.instance.conf%
+$oKPI = new ExecutionKPI();
 $oListsCompat = new Lists($oModuleDesign);
 $oListsCompat->Process($container);
+$oKPI->ComputeAndReport('Load portal lists definition');
 
 // Generating CSS files
 // Note: We do this here as it is not user dependent and therefore can be cached for everyone.
 // A dedicated listener 'CssFromSassCompiler' exists to compile files again when by-passing HTTP cache.
 // This is to keep developers comfort when tuning the SCSS files.
+$oKPI = new ExecutionKPI();
 $aImportPaths = array($_ENV['COMBODO_PORTAL_BASE_ABSOLUTE_PATH'].'css/');
 $aPortalConf = $container->getParameter('combodo.portal.instance.conf');
 foreach ($aPortalConf['properties']['themes'] as $sKey => $value)
@@ -71,4 +78,6 @@ foreach ($aPortalConf['properties']['themes'] as $sKey => $value)
 		$aPortalConf['properties']['themes'][$sKey] = $aValues;
 	}
 }
+$oKPI->ComputeAndReport('Generating CSS files');
+
 $container->setParameter('combodo.portal.instance.conf', $aPortalConf);
\ No newline at end of file
diff --git a/datamodels/2.x/itop-portal-base/portal/public/index.php b/datamodels/2.x/itop-portal-base/portal/public/index.php
index 04d090984..b9b7539d2 100644
--- a/datamodels/2.x/itop-portal-base/portal/public/index.php
+++ b/datamodels/2.x/itop-portal-base/portal/public/index.php
@@ -24,23 +24,38 @@ require_once MODULESROOT.'itop-portal-base/portal/config/bootstrap.php';
 
 // Stacking context tag so it knows we are in the portal
 $oContext = new ContextTag(ContextTag::TAG_PORTAL);
-$oContext2 = new ContextTag('Portal:' . $_ENV['PORTAL_ID']);
+$oContext2 = new ContextTag('Portal:'.$_ENV['PORTAL_ID']);
+
+
+$oKPI = new ExecutionKPI();
 
 // Note: Manually refactored ternary condition to be PHP 5.x compatible
-if ($trustedProxies = isset($_SERVER['TRUSTED_PROXIES']) ? $_SERVER['TRUSTED_PROXIES'] : (isset($_ENV['TRUSTED_PROXIES']) ? $_ENV['TRUSTED_PROXIES'] : false))
-{
+if ($trustedProxies = isset($_SERVER['TRUSTED_PROXIES']) ? $_SERVER['TRUSTED_PROXIES'] : (isset($_ENV['TRUSTED_PROXIES']) ? $_ENV['TRUSTED_PROXIES'] : false)) {
 	Request::setTrustedProxies(explode(',', $trustedProxies), Request::HEADER_X_FORWARDED_ALL ^ Request::HEADER_X_FORWARDED_HOST);
 }
 
 // Note: Manually refactored ternary condition to be PHP 5.x compatible
-if ($trustedHosts = isset($_SERVER['TRUSTED_HOSTS']) ? $_SERVER['TRUSTED_HOSTS'] : (isset($_ENV['TRUSTED_HOSTS']) ? $_ENV['TRUSTED_HOSTS'] : false))
-{
+if ($trustedHosts = isset($_SERVER['TRUSTED_HOSTS']) ? $_SERVER['TRUSTED_HOSTS'] : (isset($_ENV['TRUSTED_HOSTS']) ? $_ENV['TRUSTED_HOSTS'] : false)) {
 	Request::setTrustedHosts([$trustedHosts]);
 }
 
 $oKernel = new Kernel($_SERVER['APP_ENV'], (bool)$_SERVER['APP_DEBUG']);
+$oKPI->ComputeAndReport('Symfony kernel init');
+
+$oKPI = new ExecutionKPI();
 $oRequest = Request::createFromGlobals();
+$oKPI->ComputeAndReport('Symfony request parsing/creation');
+
+$oKPI = new ExecutionKPI();
 /** @noinspection PhpUnhandledExceptionInspection */
 $oResponse = $oKernel->handle($oRequest);
 $oResponse->send();
+$oKPI->ComputeAndReport('Page execution and rendering');
+
+
+$oKPI = new ExecutionKPI();
 $oKernel->terminate($oRequest, $oResponse);
+$oKPI->ComputeAndReport('Symfony kernel termination');
+
+
+ExecutionKPI::ReportStats();
\ No newline at end of file

From 2e08ae571afaebfaa16e74b056a94e6b125c5230 Mon Sep 17 00:00:00 2001
From: BenGrenoble <benjamin.planque@combodo.com>
Date: Fri, 2 Oct 2020 10:51:25 +0200
Subject: [PATCH 39/43] 3354 change sie by Sie

---
 datamodels/2.x/itop-backup/de.dict.itop-backup.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/datamodels/2.x/itop-backup/de.dict.itop-backup.php b/datamodels/2.x/itop-backup/de.dict.itop-backup.php
index c925efb53..b60f0cb1d 100644
--- a/datamodels/2.x/itop-backup/de.dict.itop-backup.php
+++ b/datamodels/2.x/itop-backup/de.dict.itop-backup.php
@@ -31,8 +31,8 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'bkp-status-title' => 'Geplante Backups',
 	'bkp-status-checks' => 'Einstellungen und Prüfungen',
 	'bkp-mysqldump-ok' => 'mysqldump ist vorhanden: %1$s',
-	'bkp-mysqldump-notfound' => 'mysqldump wurde nicht gefunden: %1$s - Stellen sie sicher, das er eingespielt und im Pfad verfügbar ist oder editieren sie die Konfigurationsdatei um das MySQL bindir anzupassen.',
-	'bkp-mysqldump-issue' => 'mysqldump konnte nicht eingespielt werden (retcode=%1$d): Stellen sie sicher, das es installiert und im Pfad verfügbar ist oder editieren sie die Konfigurationsdatei um das MySQL bindir anzupassen.',
+	'bkp-mysqldump-notfound' => 'mysqldump wurde nicht gefunden: %1$s - Stellen Sie sicher, das er eingespielt und im Pfad verfügbar ist oder editieren Sie die Konfigurationsdatei um das MySQL bindir anzupassen.',
+	'bkp-mysqldump-issue' => 'mysqldump konnte nicht eingespielt werden (retcode=%1$d): Stellen Sie sicher, das es installiert und im Pfad verfügbar ist oder editieren Sie die Konfigurationsdatei um das MySQL bindir anzupassen.',
 	'bkp-missing-dir' => 'Zielverzeichniss %1$s nicht gefunden',
 	'bkp-free-disk-space' => '<b>%1$s frei</b> in %2$s',
 	'bkp-dir-not-writeable' => '%1$s ist nicht schreibbar',
@@ -53,8 +53,8 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'bkp-next-backup' => 'Das nächste Backup wird am <b>%1$s</b> (%2$s) um %3$s durchgeführt',
 	'bkp-button-backup-now' => 'Starte Backup',
 	'bkp-button-restore-now' => 'Wiederherstellen!',
-	'bkp-confirm-backup' => 'Bitte bestätigen sie, dass sie jetzt ein Backup erstellen wollen.',
-	'bkp-confirm-restore' => 'Bitte bestätigen sie, dass sie mit Backup %1$s eine Wiederherstellung durchführen wollen.',
+	'bkp-confirm-backup' => 'Bitte bestätigen Sie, dass Sie jetzt ein Backup erstellen wollen.',
+	'bkp-confirm-restore' => 'Bitte bestätigen Sie, dass Sie mit Backup %1$s eine Wiederherstellung durchführen wollen.',
 	'bkp-wait-backup' => 'Bitte warten, bis das Backup abgeschlossen ist ...',
 	'bkp-wait-restore' => 'Bitte warten, bis die Wiederherstellung abgeschlossen ist ...',
 	'bkp-success-restore' => 'Wiederherstellung erfolgreich.',

From 155169419819c271cd3f22dec46b1a17cb8b3dd7 Mon Sep 17 00:00:00 2001
From: Pierre Goiffon <pierre.goiffon@combodo.com>
Date: Mon, 5 Oct 2020 14:31:26 +0200
Subject: [PATCH 40/43] =?UTF-8?q?N=C2=B03317=20Security=20hardening?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/ajaxwebpage.class.inc.php       | 23 +++++++++++----------
 application/csvpage.class.inc.php           |  5 +++--
 application/itopwebpage.class.inc.php       |  1 +
 application/loginwebpage.class.inc.php      |  8 +++----
 application/webpage.class.inc.php           |  1 +
 application/xmlpage.class.inc.php           |  3 ++-
 datamodels/2.x/combodo-db-tools/dbtools.php |  1 -
 datamodels/2.x/itop-backup/status.php       |  1 -
 datamodels/2.x/itop-config/config.php       |  1 -
 pages/UI.php                                |  1 -
 pages/UniversalSearch.php                   |  1 -
 pages/notifications.php                     |  1 -
 pages/run_query.php                         |  1 -
 pages/schema.php                            |  1 -
 webservices/export-v2.php                   |  4 ----
 15 files changed, 23 insertions(+), 30 deletions(-)

diff --git a/application/ajaxwebpage.class.inc.php b/application/ajaxwebpage.class.inc.php
index f84d13918..b74c17db8 100644
--- a/application/ajaxwebpage.class.inc.php
+++ b/application/ajaxwebpage.class.inc.php
@@ -42,21 +42,22 @@ class ajax_page extends WebPage implements iTabbedPage
      */	  
 	function __construct($s_title)
     {
-		$sPrintable = utils::ReadParam('printable', '0');
-		$bPrintable = ($sPrintable == '1');
+	    $sPrintable = utils::ReadParam('printable', '0');
+	    $bPrintable = ($sPrintable == '1');
 
-        parent::__construct($s_title, $bPrintable);
-        $this->m_sReadyScript = "";
-		//$this->add_header("Content-type: text/html; charset=utf-8");
-		$this->add_header('Cache-control: no-cache, no-store, must-revalidate');
+	    parent::__construct($s_title, $bPrintable);
+	    $this->m_sReadyScript = "";
+	    //$this->add_header("Content-type: text/html; charset=utf-8");
+	    $this->add_header('Cache-control: no-cache, no-store, must-revalidate');
 	    $this->add_header('Pragma: no-cache');
 	    $this->add_header('Expires: 0');
-		$this->m_oTabs = new TabManager();
-		$this->sContentType = 'text/html';
-		$this->sContentDisposition = 'inline';
-		$this->m_sMenu = "";
+	    $this->add_header('X-Frame-Options: deny');
+	    $this->m_oTabs = new TabManager();
+	    $this->sContentType = 'text/html';
+	    $this->sContentDisposition = 'inline';
+	    $this->m_sMenu = "";
 
-		utils::InitArchiveMode();
+	    utils::InitArchiveMode();
     }
 
 	public function AddTabContainer($sTabContainer, $sPrefix = '')
diff --git a/application/csvpage.class.inc.php b/application/csvpage.class.inc.php
index 537c23194..25dc612a2 100644
--- a/application/csvpage.class.inc.php
+++ b/application/csvpage.class.inc.php
@@ -31,12 +31,13 @@ class CSVPage extends WebPage
 {
     function __construct($s_title)
     {
-        parent::__construct($s_title);
+	    parent::__construct($s_title);
 	    $this->add_header("Content-type: text/plain; charset=utf-8");
 	    $this->add_header('Cache-control: no-cache, no-store, must-revalidate');
 	    $this->add_header('Pragma: no-cache');
 	    $this->add_header('Expires: 0');
-		//$this->add_header("Content-Transfer-Encoding: binary");
+	    $this->add_header('X-Frame-Options: deny');
+	    //$this->add_header("Content-Transfer-Encoding: binary");
     }	
 
     public function output()
diff --git a/application/itopwebpage.class.inc.php b/application/itopwebpage.class.inc.php
index 19a3aa7cf..e459d8ae9 100644
--- a/application/itopwebpage.class.inc.php
+++ b/application/itopwebpage.class.inc.php
@@ -75,6 +75,7 @@ class iTopWebPage extends NiceWebPage implements iTabbedPage
 		$this->add_header('Cache-control: no-cache, no-store, must-revalidate');
 		$this->add_header('Pragma: no-cache');
 		$this->add_header('Expires: 0');
+		$this->add_header('X-Frame-Options: deny');
 		$this->add_linked_stylesheet("../css/jquery.treeview.css");
 		$this->add_linked_stylesheet("../css/jquery.autocomplete.css");
 		$this->add_linked_stylesheet("../css/jquery-ui-timepicker-addon.css");
diff --git a/application/loginwebpage.class.inc.php b/application/loginwebpage.class.inc.php
index 02b03f12b..ce42ee050 100644
--- a/application/loginwebpage.class.inc.php
+++ b/application/loginwebpage.class.inc.php
@@ -62,16 +62,16 @@ class LoginWebPage extends NiceWebPage
 	
 	public function __construct($sTitle = null)
 	{
-	    if($sTitle === null)
-        {
-            $sTitle = Dict::S('UI:Login:Title');
-        }
+		if ($sTitle === null) {
+			$sTitle = Dict::S('UI:Login:Title');
+		}
 
 		parent::__construct($sTitle);
 		$this->SetStyleSheet();
 		$this->add_header('Cache-control: no-cache, no-store, must-revalidate');
 		$this->add_header('Pragma: no-cache');
 		$this->add_header('Expires: 0');
+		$this->add_header('X-Frame-Options: deny');
 	}
 	
 	public function SetStyleSheet()
diff --git a/application/webpage.class.inc.php b/application/webpage.class.inc.php
index b75707c17..bcaf20327 100644
--- a/application/webpage.class.inc.php
+++ b/application/webpage.class.inc.php
@@ -358,6 +358,7 @@ class WebPage implements Page
 		$this->add_header('Cache-control: no-cache, no-store, must-revalidate');
 		$this->add_header('Pragma: no-cache');
 		$this->add_header('Expires: 0');
+		$this->add_header('X-Frame-Options: deny');
 	}
 
 	/**
diff --git a/application/xmlpage.class.inc.php b/application/xmlpage.class.inc.php
index 7a8cb47fc..70d5ba2dd 100644
--- a/application/xmlpage.class.inc.php
+++ b/application/xmlpage.class.inc.php
@@ -46,8 +46,9 @@ class XMLPage extends WebPage
 		$this->add_header('Cache-control: no-cache, no-store, must-revalidate');
 		$this->add_header('Pragma: no-cache');
 		$this->add_header('Expires: 0');
+		$this->add_header('X-Frame-Options: deny');
 		$this->add_header("Content-location: export.xml");
-	}	
+	}
 
 	public function output()
 	{
diff --git a/datamodels/2.x/combodo-db-tools/dbtools.php b/datamodels/2.x/combodo-db-tools/dbtools.php
index 4635eca09..32e22353e 100644
--- a/datamodels/2.x/combodo-db-tools/dbtools.php
+++ b/datamodels/2.x/combodo-db-tools/dbtools.php
@@ -570,7 +570,6 @@ try
 	$sPageId = 'db-tools';
 
 	$oP = new iTopWebPage($sPageTitle);
-	$this->m_oPage->add_header('X-Frame-Options: deny');
 	$oP->add_saas('env-'.utils::GetCurrentEnvironment().'/combodo-db-tools/default.scss');
 
 	$oP->add(
diff --git a/datamodels/2.x/itop-backup/status.php b/datamodels/2.x/itop-backup/status.php
index d33615680..feeeb9b1b 100644
--- a/datamodels/2.x/itop-backup/status.php
+++ b/datamodels/2.x/itop-backup/status.php
@@ -37,7 +37,6 @@ try
 {
 	$sTransactionId = utils::GetNewTransactionId();
 	$oP = new iTopWebPage(Dict::S('bkp-status-title'));
-	$oP->add_header('X-Frame-Options: deny');
 	$oP->set_base(utils::GetAbsoluteUrlAppRoot().'pages/');
 
 	$oP->add("<h1>".Dict::S('bkp-status-title')."</h1>");
diff --git a/datamodels/2.x/itop-config/config.php b/datamodels/2.x/itop-config/config.php
index de9bb584d..7e9f9231b 100644
--- a/datamodels/2.x/itop-config/config.php
+++ b/datamodels/2.x/itop-config/config.php
@@ -100,7 +100,6 @@ ApplicationMenu::CheckMenuIdEnabled('ConfigEditor');
 //$oAppContext = new ApplicationContext();
 
 $oP = new iTopWebPage(Dict::S('config-edit-title'));
-$oP->add_header('X-Frame-Options: deny');
 $oP->set_base(utils::GetAbsoluteUrlAppRoot().'pages/');
 $oP->add_linked_script(utils::GetCurrentModuleUrl().'/js/ace.js');
 $oP->add_linked_script(utils::GetCurrentModuleUrl().'/js/mode-php.js');
diff --git a/pages/UI.php b/pages/UI.php
index 367b4284d..f4222c540 100644
--- a/pages/UI.php
+++ b/pages/UI.php
@@ -1780,7 +1780,6 @@ EOF
 		///////////////////////////////////////////////////////////////////////////////////////////
 
 		default: // Menu node rendering (templates)
-		$oP->add_header('X-Frame-Options: deny');
 		ApplicationMenu::LoadAdditionalMenus();
 		$oMenuNode = ApplicationMenu::GetMenuNode(ApplicationMenu::GetMenuIndexById(ApplicationMenu::GetActiveNodeId()));
 		if (is_object($oMenuNode))
diff --git a/pages/UniversalSearch.php b/pages/UniversalSearch.php
index aeae6c3fb..04da4fe69 100644
--- a/pages/UniversalSearch.php
+++ b/pages/UniversalSearch.php
@@ -38,7 +38,6 @@ ApplicationMenu::CheckMenuIdEnabled('UniversalSearchMenu');
 $oAppContext = new ApplicationContext();
 
 $oP = new iTopWebPage(Dict::S('UI:UniversalSearchTitle'));
-$oP->add_header('X-Frame-Options: deny');
 $oP->add_linked_script("../js/json.js");
 $oP->add_linked_script("../js/forms-json-utils.js");
 $oP->add_linked_script("../js/wizardhelper.js");
diff --git a/pages/notifications.php b/pages/notifications.php
index 866c468da..384db331a 100644
--- a/pages/notifications.php
+++ b/pages/notifications.php
@@ -37,7 +37,6 @@ ApplicationMenu::CheckMenuIdEnabled("NotificationsMenu");
 // Main program
 //
 $oP = new iTopWebPage(Dict::S('Menu:NotificationsMenu+'));
-$oP->add_header('X-Frame-Options: deny');
 
 $oP->add('<div class="page_header" style="padding:0.5em;">');
 $oP->add('<h1>'.dict::S('UI:NotificationsMenu:Title').'</h1>');
diff --git a/pages/run_query.php b/pages/run_query.php
index b2e49f96f..2d9288c34 100644
--- a/pages/run_query.php
+++ b/pages/run_query.php
@@ -100,7 +100,6 @@ $oAppContext = new ApplicationContext();
 
 $oP = new iTopWebPage(Dict::S('UI:RunQuery:Title'));
 $oP->SetBreadCrumbEntry('ui-tool-runquery', Dict::S('Menu:RunQueriesMenu'), Dict::S('Menu:RunQueriesMenu+'), '', utils::GetAbsoluteUrlAppRoot().'images/wrench.png');
-$oP->add_header('X-Frame-Options: deny');
 
 // Main program
 $sExpression = utils::ReadParam('expression', '', false, 'raw_data');
diff --git a/pages/schema.php b/pages/schema.php
index 64fc0e97a..8c69eb18d 100644
--- a/pages/schema.php
+++ b/pages/schema.php
@@ -1074,7 +1074,6 @@ $operation = utils::ReadParam('operation', '');
 
 $oPage = new iTopWebPage(Dict::S('UI:Schema:Title'));
 $oPage->no_cache();
-$oPage->add_header('X-Frame-Options: deny');
 
 $oPage->SetBreadCrumbEntry('ui-tool-datamodel', Dict::S('Menu:DataModelMenu'), Dict::S('Menu:DataModelMenu+'), '', utils::GetAbsoluteUrlAppRoot().'images/wrench.png');
 $oPage->add_script(
diff --git a/webservices/export-v2.php b/webservices/export-v2.php
index 3046766b0..ddd355b3b 100644
--- a/webservices/export-v2.php
+++ b/webservices/export-v2.php
@@ -352,7 +352,6 @@ function InteractiveShell($sExpression, $sQueryId, $sFormat, $sFileName, $sMode)
 	if ($sMode == 'dialog')
 	{
 		$oP = new ajax_page('');
-		$oP->add_header('X-Frame-Options: deny');
 		$oP->add('<div id="interactive_export_dlg">');
 		$sExportBtnLabel = json_encode(Dict::S('UI:Button:Export'));
 		$sJSTitle = json_encode(htmlentities(utils::ReadParam('dialog_title', '', false, 'raw_data'), ENT_QUOTES, 'UTF-8'));
@@ -378,7 +377,6 @@ EOF
 	else
 	{
 		$oP = new iTopWebPage('iTop Export');
-		$oP->add_header('X-Frame-Options: deny');
 		$oP->SetBreadCrumbEntry('ui-tool-export', Dict::S('Menu:ExportMenu'), Dict::S('Menu:ExportMenu+'), '', utils::GetAbsoluteUrlAppRoot().'images/wrench.png');
 	}
 	
@@ -753,7 +751,6 @@ try
 		else
 		{
 			$oP = new ajax_page('iTop export');
-			$oP->add_header('X-Frame-Options: deny');
 			$oP->SetContentType($oExporter->GetMimeType());
 		}
 		DoExport($oP, $oExporter, false);
@@ -763,7 +760,6 @@ try
 catch (BulkExportMissingParameterException $e)
 {
 	$oP = new ajax_page('iTop Export');
-	$oP->add_header('X-Frame-Options: deny');
 	$oP->add($e->getMessage());
 	Usage($oP);
 	$oP->output();

From 090119147cf6c80879e1a268de094c9b5d64ee46 Mon Sep 17 00:00:00 2001
From: Pierre Goiffon <pierre.goiffon@combodo.com>
Date: Mon, 5 Oct 2020 14:36:28 +0200
Subject: [PATCH 41/43] :art: PHP formatting

---
 application/ajaxwebpage.class.inc.php | 48 +++++++++++++--------------
 application/csvpage.class.inc.php     | 19 +++++------
 2 files changed, 33 insertions(+), 34 deletions(-)

diff --git a/application/ajaxwebpage.class.inc.php b/application/ajaxwebpage.class.inc.php
index b74c17db8..3c48108ab 100644
--- a/application/ajaxwebpage.class.inc.php
+++ b/application/ajaxwebpage.class.inc.php
@@ -30,35 +30,35 @@ class ajax_page extends WebPage implements iTabbedPage
 {
     /**
      * Jquery style ready script
-     * @var Hash     
-     */	  
+     * @var Hash
+     */
 	protected $m_sReadyScript;
 	protected $m_oTabs;
 	private $m_sMenu; // If set, then the menu will be updated
-	
-    /**
-     * constructor for the web page
-     * @param string $s_title Not used
-     */	  
-	function __construct($s_title)
-    {
-	    $sPrintable = utils::ReadParam('printable', '0');
-	    $bPrintable = ($sPrintable == '1');
 
-	    parent::__construct($s_title, $bPrintable);
-	    $this->m_sReadyScript = "";
-	    //$this->add_header("Content-type: text/html; charset=utf-8");
-	    $this->add_header('Cache-control: no-cache, no-store, must-revalidate');
-	    $this->add_header('Pragma: no-cache');
-	    $this->add_header('Expires: 0');
-	    $this->add_header('X-Frame-Options: deny');
-	    $this->m_oTabs = new TabManager();
-	    $this->sContentType = 'text/html';
-	    $this->sContentDisposition = 'inline';
-	    $this->m_sMenu = "";
+	/**
+	 * constructor for the web page
+	 *
+	 * @param string $s_title Not used
+	 */
+	function __construct($s_title) {
+		$sPrintable = utils::ReadParam('printable', '0');
+		$bPrintable = ($sPrintable == '1');
 
-	    utils::InitArchiveMode();
-    }
+		parent::__construct($s_title, $bPrintable);
+		$this->m_sReadyScript = "";
+		//$this->add_header("Content-type: text/html; charset=utf-8");
+		$this->add_header('Cache-control: no-cache, no-store, must-revalidate');
+		$this->add_header('Pragma: no-cache');
+		$this->add_header('Expires: 0');
+		$this->add_header('X-Frame-Options: deny');
+		$this->m_oTabs = new TabManager();
+		$this->sContentType = 'text/html';
+		$this->sContentDisposition = 'inline';
+		$this->m_sMenu = "";
+
+		utils::InitArchiveMode();
+	}
 
 	public function AddTabContainer($sTabContainer, $sPrefix = '')
 	{
diff --git a/application/csvpage.class.inc.php b/application/csvpage.class.inc.php
index 25dc612a2..4a12a7520 100644
--- a/application/csvpage.class.inc.php
+++ b/application/csvpage.class.inc.php
@@ -29,16 +29,15 @@ require_once(APPROOT."/application/webpage.class.inc.php");
 
 class CSVPage extends WebPage
 {
-    function __construct($s_title)
-    {
-	    parent::__construct($s_title);
-	    $this->add_header("Content-type: text/plain; charset=utf-8");
-	    $this->add_header('Cache-control: no-cache, no-store, must-revalidate');
-	    $this->add_header('Pragma: no-cache');
-	    $this->add_header('Expires: 0');
-	    $this->add_header('X-Frame-Options: deny');
-	    //$this->add_header("Content-Transfer-Encoding: binary");
-    }	
+	function __construct($s_title) {
+		parent::__construct($s_title);
+		$this->add_header("Content-type: text/plain; charset=utf-8");
+		$this->add_header('Cache-control: no-cache, no-store, must-revalidate');
+		$this->add_header('Pragma: no-cache');
+		$this->add_header('Expires: 0');
+		$this->add_header('X-Frame-Options: deny');
+		//$this->add_header("Content-Transfer-Encoding: binary");
+	}
 
     public function output()
     {

From 1f5375731864bd78a1b692b18dd8e7abc9a2c98b Mon Sep 17 00:00:00 2001
From: Eric <eric.espie@combodo.com>
Date: Tue, 18 Aug 2020 17:21:25 +0200
Subject: [PATCH 42/43] =?UTF-8?q?N=C2=B03248=20-=20code=20hardening=20(che?=
 =?UTF-8?q?rry=20picked=20from=20commit=206a2593374433a72b3d23832db04f48b7?=
 =?UTF-8?q?03854e4f)=20(cherry=20picked=20from=20commit=20f74c78d61c4bd204?=
 =?UTF-8?q?394a4c216e6fad0e1e199ddd)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/transaction.class.inc.php | 9 ++++++++-
 application/utils.inc.php             | 3 ++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/application/transaction.class.inc.php b/application/transaction.class.inc.php
index ec073cd52..0e4ca4be1 100644
--- a/application/transaction.class.inc.php
+++ b/application/transaction.class.inc.php
@@ -233,7 +233,14 @@ class privUITransactionFile
 	 */
 	public static function IsTransactionValid($id, $bRemoveTransaction = true)
 	{
-		$sFilepath = APPROOT.'data/transactions/'.$id;
+		// Constraint the transaction file within APPROOT.'data/transactions'
+		$sTransactionDir = realpath(APPROOT.'data/transactions');
+		$sFilepath = utils::RealPath($sTransactionDir.'/'.$id, $sTransactionDir);
+		if (($sFilepath === false) || (strlen($sTransactionDir) == strlen($sFilepath)))
+		{
+			return false;
+		}
+
 		clearstatcache(true, $sFilepath);
 		$bResult = file_exists($sFilepath);
 		if ($bResult)
diff --git a/application/utils.inc.php b/application/utils.inc.php
index 08d816459..5c9f34817 100644
--- a/application/utils.inc.php
+++ b/application/utils.inc.php
@@ -308,6 +308,7 @@ class utils
 			case 'context_param':
 			case 'parameter':
 			case 'field_name':
+			case 'transaction_id':
 				if (is_array($value))
 				{
 					$retValue = array();
@@ -2086,7 +2087,7 @@ class utils
 	 * @param string $sPath for example '/var/www/html/itop/data/backups/manual/itop_27-2019-10-03_15_35.tar.gz'
 	 * @param string $sBasePath for example '/var/www/html/itop/data/'
 	 *
-	 * @return bool false if path :
+	 * @return bool|string false if path :
 	 *      * invalid
 	 *      * not allowed
 	 *      * not contained in base path

From ed0e16494d731214dc156613b41993866b8fcb60 Mon Sep 17 00:00:00 2001
From: acognet <anne-catherine.cognet@combodo.com>
Date: Mon, 5 Oct 2020 16:23:56 +0200
Subject: [PATCH 43/43] =?UTF-8?q?N=C2=B03335=20-=20Fix=20test?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/core/OQLTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/core/OQLTest.php b/test/core/OQLTest.php
index eb7bf7230..32882a0ef 100644
--- a/test/core/OQLTest.php
+++ b/test/core/OQLTest.php
@@ -218,7 +218,7 @@ class OQLTest extends ItopDataTestCase
      *
      * @param $sQuery
      *
-     * @expectedException \TypeError
+     * @expectedException \CoreException
      *
      * @throws \OQLException
      */