diff --git a/datamodel/itop-change-mgmt-1.0.0/datamodel.itop-change-mgmt.xml b/datamodel/itop-change-mgmt-1.0.0/datamodel.itop-change-mgmt.xml
index 79eeb587c..df57a443a 100644
--- a/datamodel/itop-change-mgmt-1.0.0/datamodel.itop-change-mgmt.xml
+++ b/datamodel/itop-change-mgmt-1.0.0/datamodel.itop-change-mgmt.xml
@@ -4756,51 +4756,51 @@
     </class>
   </classes>
   <menus>
-    <menu id="ChangeManagement" xsi:type="MenuGroup">
+    <menu id="ChangeManagement" xsi:type="MenuGroup" _delta="define">
       <rank>50</rank>
     </menu>
-    <menu id="Change:Overview" xsi:type="TemplateMenuNode">
+    <menu id="Change:Overview" xsi:type="TemplateMenuNode" _delta="define">
       <rank>0</rank>
       <parent>ChangeManagement</parent>
       <template_file>overview.html</template_file>
     </menu>
-    <menu id="NewChange" xsi:type="NewObjectMenuNode">
+    <menu id="NewChange" xsi:type="NewObjectMenuNode" _delta="define">
       <rank>1</rank>
       <parent>ChangeManagement</parent>
       <class>Change</class>
     </menu>
-    <menu id="SearchChanges" xsi:type="SearchMenuNode">
+    <menu id="SearchChanges" xsi:type="SearchMenuNode" _delta="define">
       <rank>2</rank>
       <parent>ChangeManagement</parent>
       <class>Change</class>
     </menu>
-    <menu id="Change:Shortcuts" xsi:type="TemplateMenuNode">
+    <menu id="Change:Shortcuts" xsi:type="TemplateMenuNode" _delta="define">
       <rank>3</rank>
       <parent>ChangeManagement</parent>
       <template_file></template_file>
     </menu>
-    <menu id="MyChanges" xsi:type="OQLMenuNode">
+    <menu id="MyChanges" xsi:type="OQLMenuNode" _delta="define">
       <rank>1</rank>
       <parent>Change:Shortcuts</parent>
       <oql><![CDATA[SELECT Change WHERE agent_id = :current_contact_id AND status NOT IN ("closed", "resolved")]]></oql>
       <do_search></do_search>
       <auto_reload>fast</auto_reload>
     </menu>
-    <menu id="Changes" xsi:type="OQLMenuNode">
+    <menu id="Changes" xsi:type="OQLMenuNode" _delta="define">
       <rank>2</rank>
       <parent>Change:Shortcuts</parent>
       <oql><![CDATA[SELECT Change WHERE status != "closed"]]></oql>
       <do_search></do_search>
       <auto_reload>fast</auto_reload>
     </menu>
-    <menu id="WaitingApproval" xsi:type="OQLMenuNode">
+    <menu id="WaitingApproval" xsi:type="OQLMenuNode" _delta="define">
       <rank>3</rank>
       <parent>Change:Shortcuts</parent>
       <oql><![CDATA[SELECT ApprovedChange WHERE status IN ("plannedscheduled")]]></oql>
       <do_search></do_search>
       <auto_reload>fast</auto_reload>
     </menu>
-    <menu id="WaitingAcceptance" xsi:type="OQLMenuNode">
+    <menu id="WaitingAcceptance" xsi:type="OQLMenuNode" _delta="define">
       <rank>4</rank>
       <parent>Change:Shortcuts</parent>
       <oql><![CDATA[SELECT NormalChange WHERE status IN ("new")]]></oql>
diff --git a/datamodel/itop-config-mgmt-1.0.0/datamodel.itop-config-mgmt.xml b/datamodel/itop-config-mgmt-1.0.0/datamodel.itop-config-mgmt.xml
index 5a4e4443c..efafe3cd9 100644
--- a/datamodel/itop-config-mgmt-1.0.0/datamodel.itop-config-mgmt.xml
+++ b/datamodel/itop-config-mgmt-1.0.0/datamodel.itop-config-mgmt.xml
@@ -4157,133 +4157,133 @@
     </class>
   </classes>
   <menus>
-    <menu id="DataAdministration" xsi:type="MenuGroup">
+    <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="Audit" xsi:type="WebPageMenuNode">
+    <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">
+    <menu id="Catalogs" xsi:type="TemplateMenuNode" _delta="define">
       <rank>50</rank>
       <parent>DataAdministration</parent>
       <template_file></template_file>
     </menu>
-    <menu id="Organization" xsi:type="OQLMenuNode">
+    <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="Application" xsi:type="OQLMenuNode">
+    <menu id="Application" xsi:type="OQLMenuNode" _delta="define">
       <rank>20</rank>
       <parent>Catalogs</parent>
       <oql>SELECT Application</oql>
       <do_search></do_search>
     </menu>
-    <menu id="DBServer" xsi:type="OQLMenuNode">
+    <menu id="DBServer" xsi:type="OQLMenuNode" _delta="define">
       <rank>40</rank>
       <parent>Catalogs</parent>
       <oql>SELECT DBServer</oql>
       <do_search></do_search>
     </menu>
-    <menu id="ConfigManagement" xsi:type="MenuGroup">
+    <menu id="ConfigManagement" xsi:type="MenuGroup" _delta="define">
       <rank>20</rank>
     </menu>
-    <menu id="ConfigManagementOverview" xsi:type="TemplateMenuNode">
+    <menu id="ConfigManagementOverview" xsi:type="TemplateMenuNode" _delta="define">
       <rank>0</rank>
       <parent>ConfigManagement</parent>
       <template_file>overview.html</template_file>
     </menu>
-    <menu id="Contact" xsi:type="TemplateMenuNode">
+    <menu id="Contact" xsi:type="TemplateMenuNode" _delta="define">
       <rank>1</rank>
       <parent>ConfigManagement</parent>
       <template_file>contacts_menu.html</template_file>
     </menu>
-    <menu id="NewContact" xsi:type="NewObjectMenuNode">
+    <menu id="NewContact" xsi:type="NewObjectMenuNode" _delta="define">
       <rank>1</rank>
       <parent>Contact</parent>
       <class>Contact</class>
     </menu>
-    <menu id="SearchContacts" xsi:type="SearchMenuNode">
+    <menu id="SearchContacts" xsi:type="SearchMenuNode" _delta="define">
       <rank>2</rank>
       <parent>Contact</parent>
       <class>Contact</class>
     </menu>
-    <menu id="Document" xsi:type="OQLMenuNode">
+    <menu id="Document" xsi:type="OQLMenuNode" _delta="define">
       <rank>2</rank>
       <parent>ConfigManagement</parent>
       <oql>SELECT Document</oql>
       <do_search>1</do_search>
     </menu>
-    <menu id="Location" xsi:type="OQLMenuNode">
+    <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="Group" xsi:type="OQLMenuNode">
+    <menu id="Group" xsi:type="OQLMenuNode" _delta="define">
       <rank>4</rank>
       <parent>ConfigManagement</parent>
       <oql>SELECT Group</oql>
       <do_search>1</do_search>
     </menu>
-    <menu id="ConfigManagementCI" xsi:type="TemplateMenuNode">
+    <menu id="ConfigManagementCI" xsi:type="TemplateMenuNode" _delta="define">
       <rank>5</rank>
       <parent>ConfigManagement</parent>
       <template_file>cis_menu.html</template_file>
     </menu>
-    <menu id="NewCI" xsi:type="NewObjectMenuNode">
+    <menu id="NewCI" xsi:type="NewObjectMenuNode" _delta="define">
       <rank>0</rank>
       <parent>ConfigManagementCI</parent>
       <class>FunctionalCI</class>
     </menu>
-    <menu id="SearchCIs" xsi:type="SearchMenuNode">
+    <menu id="SearchCIs" xsi:type="SearchMenuNode" _delta="define">
       <rank>1</rank>
       <parent>ConfigManagementCI</parent>
       <class>FunctionalCI</class>
     </menu>
-    <menu id="ConfigManagement:Shortcuts" xsi:type="TemplateMenuNode">
+    <menu id="ConfigManagement:Shortcuts" xsi:type="TemplateMenuNode" _delta="define">
       <rank>6</rank>
       <parent>ConfigManagement</parent>
       <template_file></template_file>
     </menu>
-    <menu id="Server" xsi:type="OQLMenuNode">
+    <menu id="Server" xsi:type="OQLMenuNode" _delta="define">
       <rank>1</rank>
       <parent>ConfigManagement:Shortcuts</parent>
       <oql>SELECT Server</oql>
       <do_search></do_search>
     </menu>
-    <menu id="NetworkDevice" xsi:type="OQLMenuNode">
+    <menu id="NetworkDevice" xsi:type="OQLMenuNode" _delta="define">
       <rank>2</rank>
       <parent>ConfigManagement:Shortcuts</parent>
       <oql>SELECT NetworkDevice</oql>
       <do_search></do_search>
     </menu>
-    <menu id="Printer" xsi:type="OQLMenuNode">
+    <menu id="Printer" xsi:type="OQLMenuNode" _delta="define">
       <rank>3</rank>
       <parent>ConfigManagement:Shortcuts</parent>
       <oql>SELECT Printer</oql>
       <do_search></do_search>
     </menu>
-    <menu id="PC" xsi:type="OQLMenuNode">
+    <menu id="PC" xsi:type="OQLMenuNode" _delta="define">
       <rank>4</rank>
       <parent>ConfigManagement:Shortcuts</parent>
       <oql>SELECT PC</oql>
       <do_search></do_search>
     </menu>
-    <menu id="BusinessProcess" xsi:type="OQLMenuNode">
+    <menu id="BusinessProcess" xsi:type="OQLMenuNode" _delta="define">
       <rank>5</rank>
       <parent>ConfigManagement:Shortcuts</parent>
       <oql>SELECT BusinessProcess</oql>
       <do_search></do_search>
     </menu>
-    <menu id="ApplicationSolution" xsi:type="OQLMenuNode">
+    <menu id="ApplicationSolution" xsi:type="OQLMenuNode" _delta="define">
       <rank>6</rank>
       <parent>ConfigManagement:Shortcuts</parent>
       <oql>SELECT ApplicationSolution</oql>
diff --git a/datamodel/itop-incident-mgmt-1.0.0/datamodel.itop-incident-mgmt.xml b/datamodel/itop-incident-mgmt-1.0.0/datamodel.itop-incident-mgmt.xml
index d037f65de..8603099db 100644
--- a/datamodel/itop-incident-mgmt-1.0.0/datamodel.itop-incident-mgmt.xml
+++ b/datamodel/itop-incident-mgmt-1.0.0/datamodel.itop-incident-mgmt.xml
@@ -988,44 +988,44 @@
     </class>
   </classes>
   <menus>
-    <menu id="IncidentManagement" xsi:type="MenuGroup">
+    <menu id="IncidentManagement" xsi:type="MenuGroup" _delta="define">
       <rank>40</rank>
     </menu>
-    <menu id="Incident:Overview" xsi:type="TemplateMenuNode">
+    <menu id="Incident:Overview" xsi:type="TemplateMenuNode" _delta="define">
       <rank>0</rank>
       <parent>IncidentManagement</parent>
       <template_file>overview.html</template_file>
     </menu>
-    <menu id="NewIncident" xsi:type="NewObjectMenuNode">
+    <menu id="NewIncident" xsi:type="NewObjectMenuNode" _delta="define">
       <rank>1</rank>
       <parent>IncidentManagement</parent>
       <class>Incident</class>
     </menu>
-    <menu id="SearchIncidents" xsi:type="SearchMenuNode">
+    <menu id="SearchIncidents" xsi:type="SearchMenuNode" _delta="define">
       <rank>2</rank>
       <parent>IncidentManagement</parent>
       <class>Incident</class>
     </menu>
-    <menu id="Incident:Shortcuts" xsi:type="TemplateMenuNode">
+    <menu id="Incident:Shortcuts" xsi:type="TemplateMenuNode" _delta="define">
       <rank>3</rank>
       <parent>IncidentManagement</parent>
       <template_file></template_file>
     </menu>
-    <menu id="Incident:MyIncidents" xsi:type="OQLMenuNode">
+    <menu id="Incident:MyIncidents" xsi:type="OQLMenuNode" _delta="define">
       <rank>1</rank>
       <parent>Incident:Shortcuts</parent>
       <oql><![CDATA[SELECT Incident WHERE agent_id = :current_contact_id AND status NOT IN ("closed", "resolved")]]></oql>
       <do_search></do_search>
       <auto_reload>fast</auto_reload>
     </menu>
-    <menu id="Incident:EscalatedIncidents" xsi:type="OQLMenuNode">
+    <menu id="Incident:EscalatedIncidents" xsi:type="OQLMenuNode" _delta="define">
       <rank>2</rank>
       <parent>Incident:Shortcuts</parent>
       <oql><![CDATA[SELECT Incident WHERE status IN ("escalated_tto", "escalated_ttr")]]></oql>
       <do_search></do_search>
       <auto_reload>fast</auto_reload>
     </menu>
-    <menu id="Incident:OpenIncidents" xsi:type="OQLMenuNode">
+    <menu id="Incident:OpenIncidents" xsi:type="OQLMenuNode" _delta="define">
       <rank>3</rank>
       <parent>Incident:Shortcuts</parent>
       <oql><![CDATA[SELECT Incident WHERE status IN ("new", "assigned", "escalated_tto", "escalated_ttr", "resolved")]]></oql>
diff --git a/datamodel/itop-knownerror-mgmt-1.0.0/datamodel.itop-knownerror-mgmt.xml b/datamodel/itop-knownerror-mgmt-1.0.0/datamodel.itop-knownerror-mgmt.xml
index 6ca93b3ee..3796e4ea5 100644
--- a/datamodel/itop-knownerror-mgmt-1.0.0/datamodel.itop-knownerror-mgmt.xml
+++ b/datamodel/itop-knownerror-mgmt-1.0.0/datamodel.itop-knownerror-mgmt.xml
@@ -323,25 +323,25 @@
     </class>
   </classes>
   <menus>
-    <menu id="ProblemManagement" xsi:type="MenuGroup">
+    <menu id="ProblemManagement" xsi:type="MenuGroup" _delta="define">
       <rank>42</rank>
     </menu>
-    <menu id="NewError" xsi:type="NewObjectMenuNode">
+    <menu id="NewError" xsi:type="NewObjectMenuNode" _delta="define">
       <rank>3</rank>
       <parent>ProblemManagement</parent>
       <class>KnownError</class>
     </menu>
-    <menu id="SearchError" xsi:type="SearchMenuNode">
+    <menu id="SearchError" xsi:type="SearchMenuNode" _delta="define">
       <rank>4</rank>
       <parent>ProblemManagement</parent>
       <class>KnownError</class>
     </menu>
-    <menu id="Problem:Shortcuts" xsi:type="TemplateMenuNode">
+    <menu id="Problem:Shortcuts" xsi:type="TemplateMenuNode" _delta="define">
       <rank>5</rank>
       <parent>ProblemManagement</parent>
       <template_file></template_file>
     </menu>
-    <menu id="Problem:KnownErrors" xsi:type="OQLMenuNode">
+    <menu id="Problem:KnownErrors" xsi:type="OQLMenuNode" _delta="define">
       <rank>3</rank>
       <parent>Problem:Shortcuts</parent>
       <oql>SELECT KnownError</oql>
diff --git a/datamodel/itop-problem-mgmt-1.0.0/datamodel.itop-problem-mgmt.xml b/datamodel/itop-problem-mgmt-1.0.0/datamodel.itop-problem-mgmt.xml
index b2bae1ec9..818fa49e8 100644
--- a/datamodel/itop-problem-mgmt-1.0.0/datamodel.itop-problem-mgmt.xml
+++ b/datamodel/itop-problem-mgmt-1.0.0/datamodel.itop-problem-mgmt.xml
@@ -657,28 +657,28 @@
     </class>
   </classes>
   <menus>
-    <menu id="Problem:Overview" xsi:type="TemplateMenuNode">
+    <menu id="Problem:Overview" xsi:type="TemplateMenuNode" _delta="define">
       <rank>0</rank>
       <parent>ProblemManagement</parent>
       <template_file>overview.html</template_file>
     </menu>
-    <menu id="NewProblem" xsi:type="NewObjectMenuNode">
+    <menu id="NewProblem" xsi:type="NewObjectMenuNode" _delta="define">
       <rank>1</rank>
       <parent>ProblemManagement</parent>
       <class>Problem</class>
     </menu>
-    <menu id="SearchProblems" xsi:type="SearchMenuNode">
+    <menu id="SearchProblems" xsi:type="SearchMenuNode" _delta="define">
       <rank>2</rank>
       <parent>ProblemManagement</parent>
       <class>Problem</class>
     </menu>
-    <menu id="Problem:MyProblems" xsi:type="OQLMenuNode">
+    <menu id="Problem:MyProblems" xsi:type="OQLMenuNode" _delta="define">
       <rank>1</rank>
       <parent>Problem:Shortcuts</parent>
       <oql><![CDATA[SELECT Problem WHERE agent_id = :current_contact_id AND status NOT IN ("closed", "resolved")]]></oql>
       <do_search></do_search>
     </menu>
-    <menu id="Problem:OpenProblems" xsi:type="OQLMenuNode">
+    <menu id="Problem:OpenProblems" xsi:type="OQLMenuNode" _delta="define">
       <rank>2</rank>
       <parent>Problem:Shortcuts</parent>
       <oql><![CDATA[SELECT Problem WHERE status IN ("new", "assigned", "resolved")]]></oql>
diff --git a/datamodel/itop-request-mgmt-1.0.0/datamodel.itop-request-mgmt.xml b/datamodel/itop-request-mgmt-1.0.0/datamodel.itop-request-mgmt.xml
index fc23e12c8..138fc4944 100644
--- a/datamodel/itop-request-mgmt-1.0.0/datamodel.itop-request-mgmt.xml
+++ b/datamodel/itop-request-mgmt-1.0.0/datamodel.itop-request-mgmt.xml
@@ -958,44 +958,44 @@
     </class>
   </classes>
   <menus>
-    <menu id="RequestManagement" xsi:type="MenuGroup">
+    <menu id="RequestManagement" xsi:type="MenuGroup" _delta="define">
       <rank>30</rank>
     </menu>
-    <menu id="UserRequest:Overview" xsi:type="TemplateMenuNode">
+    <menu id="UserRequest:Overview" xsi:type="TemplateMenuNode" _delta="define">
       <rank>0</rank>
       <parent>RequestManagement</parent>
       <template_file>overview.html</template_file>
     </menu>
-    <menu id="NewUserRequest" xsi:type="NewObjectMenuNode">
+    <menu id="NewUserRequest" xsi:type="NewObjectMenuNode" _delta="define">
       <rank>1</rank>
       <parent>RequestManagement</parent>
       <class>UserRequest</class>
     </menu>
-    <menu id="SearchUserRequests" xsi:type="SearchMenuNode">
+    <menu id="SearchUserRequests" xsi:type="SearchMenuNode" _delta="define">
       <rank>2</rank>
       <parent>RequestManagement</parent>
       <class>UserRequest</class>
     </menu>
-    <menu id="UserRequest:Shortcuts" xsi:type="TemplateMenuNode">
+    <menu id="UserRequest:Shortcuts" xsi:type="TemplateMenuNode" _delta="define">
       <rank>3</rank>
       <parent>RequestManagement</parent>
       <template_file></template_file>
     </menu>
-    <menu id="UserRequest:MyRequests" xsi:type="OQLMenuNode">
+    <menu id="UserRequest:MyRequests" xsi:type="OQLMenuNode" _delta="define">
       <rank>1</rank>
       <parent>UserRequest:Shortcuts</parent>
       <oql><![CDATA[SELECT UserRequest WHERE agent_id = :current_contact_id AND status NOT IN ("closed","resolved")]]></oql>
       <do_search></do_search>
       <auto_reload>fast</auto_reload>
     </menu>
-    <menu id="UserRequest:EscalatedRequests" xsi:type="OQLMenuNode">
+    <menu id="UserRequest:EscalatedRequests" xsi:type="OQLMenuNode" _delta="define">
       <rank>2</rank>
       <parent>UserRequest:Shortcuts</parent>
       <oql><![CDATA[SELECT UserRequest WHERE status IN ("escalated_tto", "escalated_ttr")]]></oql>
       <do_search></do_search>
       <auto_reload>fast</auto_reload>
     </menu>
-    <menu id="UserRequest:OpenRequests" xsi:type="OQLMenuNode">
+    <menu id="UserRequest:OpenRequests" xsi:type="OQLMenuNode" _delta="define">
       <rank>3</rank>
       <parent>UserRequest:Shortcuts</parent>
       <oql><![CDATA[SELECT UserRequest WHERE status IN ("new", "assigned", "escalated_tto", "escalated_ttr", "frozen", "resolved")]]></oql>
diff --git a/datamodel/itop-service-mgmt-1.0.0/datamodel.itop-service-mgmt.xml b/datamodel/itop-service-mgmt-1.0.0/datamodel.itop-service-mgmt.xml
index 6c7921897..b2b2c6906 100644
--- a/datamodel/itop-service-mgmt-1.0.0/datamodel.itop-service-mgmt.xml
+++ b/datamodel/itop-service-mgmt-1.0.0/datamodel.itop-service-mgmt.xml
@@ -1546,45 +1546,45 @@
     </class>
   </classes>
   <menus>
-    <menu id="ServiceManagement" xsi:type="MenuGroup">
+    <menu id="ServiceManagement" xsi:type="MenuGroup" _delta="define">
       <rank>60</rank>
     </menu>
-    <menu id="Service:Overview" xsi:type="TemplateMenuNode">
+    <menu id="Service:Overview" xsi:type="TemplateMenuNode" _delta="define">
       <rank>0</rank>
       <parent>ServiceManagement</parent>
       <template_file>overview.html</template_file>
     </menu>
-    <menu id="ProviderContract" xsi:type="OQLMenuNode">
+    <menu id="ProviderContract" xsi:type="OQLMenuNode" _delta="define">
       <rank>1</rank>
       <parent>ServiceManagement</parent>
       <oql>SELECT ProviderContract</oql>
       <do_search>1</do_search>
     </menu>
-    <menu id="CustomerContract" xsi:type="OQLMenuNode">
+    <menu id="CustomerContract" xsi:type="OQLMenuNode" _delta="define">
       <rank>2</rank>
       <parent>ServiceManagement</parent>
       <oql>SELECT CustomerContract</oql>
       <do_search>1</do_search>
     </menu>
-    <menu id="Service" xsi:type="OQLMenuNode">
+    <menu id="Service" xsi:type="OQLMenuNode" _delta="define">
       <rank>3</rank>
       <parent>ServiceManagement</parent>
       <oql>SELECT Service</oql>
       <do_search>1</do_search>
     </menu>
-    <menu id="ServiceSubcategory" xsi:type="OQLMenuNode">
+    <menu id="ServiceSubcategory" xsi:type="OQLMenuNode" _delta="define">
       <rank>4</rank>
       <parent>ServiceManagement</parent>
       <oql>SELECT ServiceSubcategory</oql>
       <do_search>1</do_search>
     </menu>
-    <menu id="SLA" xsi:type="OQLMenuNode">
+    <menu id="SLA" xsi:type="OQLMenuNode" _delta="define">
       <rank>5</rank>
       <parent>ServiceManagement</parent>
       <oql>SELECT SLA</oql>
       <do_search>1</do_search>
     </menu>
-    <menu id="SLT" xsi:type="OQLMenuNode">
+    <menu id="SLT" xsi:type="OQLMenuNode" _delta="define">
       <rank>6</rank>
       <parent>ServiceManagement</parent>
       <oql>SELECT SLT</oql>