diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow.xml
index 0329e9f78afca62564ddd7cd7055ac223f31aebe..9c9a14532ed91bbd981601b28f301f46bc519793 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.DCWorkflow</string>
-          <string>DCWorkflowDefinition</string>
-        </tuple>
-        <none/>
+        <global name="DCWorkflowDefinition" module="Products.DCWorkflow.DCWorkflow"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/scripts.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/scripts.xml
index 01ba35bf25f5084dde4a3822b204530dc92c3f47..66683dde0451b4de3eeb20f0fe5c7af60083c8a8 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/scripts.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/scripts.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Scripts</string>
-          <string>Scripts</string>
-        </tuple>
-        <none/>
+        <global name="Scripts" module="Products.DCWorkflow.Scripts"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/scripts/LeaveRequest_checkConsistency.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/scripts/LeaveRequest_checkConsistency.xml
index 09c10b9c004524e82701c67834239845f5daa0e8..97b8c01997a1ca2cdcf4f16e642b1df0abada9b6 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/scripts/LeaveRequest_checkConsistency.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/scripts/LeaveRequest_checkConsistency.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/states.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/states.xml
index d6c2d2d922f477087b83aa36eaaa28e50572f887..cd2db0fb0c7613eebbc6622ce8b6e45adb4dd062 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/states.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/states.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>States</string>
-        </tuple>
-        <none/>
+        <global name="States" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/states/cancelled.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/states/cancelled.xml
index 896fde13e48a86436b446c47ebf21de6e0a2ee22..f06348f847fbee3554260dcdd4ff7ea8ae84cc61 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/states/cancelled.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/states/cancelled.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/states/confirmed.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/states/confirmed.xml
index 4c0eb72a429742ee7a7d8f1c30a03bbc969f79fb..806425f8efcdeac97049aa66f08f1c894124ca81 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/states/confirmed.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/states/confirmed.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/states/deleted.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/states/deleted.xml
index a40a17d1e06ad75502489c22da306fa11b70550d..621249513b72b3ca0a9b1ed822a5b780201c5563 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/states/deleted.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/states/deleted.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/states/draft.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/states/draft.xml
index a6f9f6730fb124a4b30d8f0f346c48dd7a29fe3f..168c38b6782bc9cd5d4abd7f6113155f6fbe9761 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/states/draft.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/states/draft.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/states/planned.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/states/planned.xml
index c9d062747245a91e751b8fed6ead0f993bf08773..8e171893c65cec730c43e145c7ba28ba8f9b71cb 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/states/planned.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/states/planned.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/transitions.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/transitions.xml
index 3763e3df954ed4d9dcd0d5285c5b000528b79755..61f19d835aad719dc95cedb6501029cfdf94a7ae 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/transitions.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/transitions.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>Transitions</string>
-        </tuple>
-        <none/>
+        <global name="Transitions" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/transitions/cancel.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/transitions/cancel.xml
index ff3b3c4e7d8df6bc9a84c513e78cfa111394546a..7e6c616311aa4307d01b8df253ff6ecdf0322aed 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/transitions/cancel.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/transitions/cancel.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/transitions/cancel_action.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/transitions/cancel_action.xml
index ac38a9671e79306ac7ea4eadf4bf217c989e4088..88a862211e30c144a3954089fe7c27bda8f4ea56 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/transitions/cancel_action.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/transitions/cancel_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/transitions/confirm.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/transitions/confirm.xml
index 3bd201c43353731276b97e71c239e7f5821914e8..c9aabf5b528175b7ba709092f8f7bfc1edb747b9 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/transitions/confirm.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/transitions/confirm.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/transitions/confirm_action.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/transitions/confirm_action.xml
index f4bc4ea65a3febd8eeb48bb458eaec650d12e45a..404a55c0374d761bf5ec4f2af8ae4129ed560df1 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/transitions/confirm_action.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/transitions/confirm_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/transitions/delete.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/transitions/delete.xml
index 2659ed2cfab60b103e50ba08e57de27ab41d5a44..80cd6128ec2a7c9e600524a364347039b1ba31a5 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/transitions/delete.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/transitions/delete.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/transitions/delete_action.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/transitions/delete_action.xml
index ad5267c57a7244103ed86bdab0173c6522482bbc..6cdd7103c6791bd4786d75e030411cc98410deab 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/transitions/delete_action.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/transitions/delete_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/transitions/plan.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/transitions/plan.xml
index 00c5477576a9c41d66f9d1031ede5918c6784330..8e8939f70bc70cc21f6972f9fe80f8acb75b1a0e 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/transitions/plan.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/transitions/plan.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/transitions/plan_action.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/transitions/plan_action.xml
index dde34e24c3a062c0be11af8a42421c7b477c2d16..97a2642e6a33782ba3c7f460c132aac77b175b32 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/transitions/plan_action.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/transitions/plan_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/variables.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/variables.xml
index 07046d72fed718dfcad3c81c6d2ef1003e3b162d..7d9ea0fae8df235f1290022d3cb37eaf4a947ade 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/variables.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/variables.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>Variables</string>
-        </tuple>
-        <none/>
+        <global name="Variables" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/variables/action.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/variables/action.xml
index 4daf3ce5b87d2f39cc8cfed14c520906405b9381..032f581c9e7a6a8ef10c0e1b02b41813ab516a78 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/variables/action.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/variables/action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/variables/actor.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/variables/actor.xml
index c2df6979e57406cf4859961ff741ff57ac91b64d..1927985d24dc1c907dfe250b9540860882711c92 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/variables/actor.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/variables/actor.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/variables/comment.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/variables/comment.xml
index 1c6966bea49c9bcc9b644f12fea08cf701efdf41..9a211a035ceaa9303cf7f73eb8b9fc3081409ae9 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/variables/comment.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/variables/comment.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/variables/error_message.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/variables/error_message.xml
index 61c9a2d189462f3a412b62e1d8443a4567c4e849..aace5d205ede4909bb8a5286be089f5e7537ad39 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/variables/error_message.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/variables/error_message.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/variables/history.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/variables/history.xml
index 91a2bf48c29d477343299a02e0191bca04e0d741..568ac694698da78e55b9f42fe2c4ab1b3326b149 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/variables/history.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/variables/history.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/variables/portal_type.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/variables/portal_type.xml
index 20edbc7d0721e3fe1b4d89e73d18990a3ce39e6e..d4abc30a9a306b0355f568946eecf38f9e08e5e5 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/variables/portal_type.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/variables/portal_type.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/variables/time.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/variables/time.xml
index 053c0e2d671e52328a9f9774327fd6bb61def94e..c0c7fcf08ae33e6387f2995307ef5ea3aca42831 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/variables/time.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/variables/time.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/worklists.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/worklists.xml
index 746450c3183c449b0d4487bcffd01a780edb1e16..609a885c76263f454a385fb66fa97995f5c7bdcd 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/worklists.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/worklists.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Worklists</string>
-          <string>Worklists</string>
-        </tuple>
-        <none/>
+        <global name="Worklists" module="Products.DCWorkflow.Worklists"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/worklists/1_draft_leave_request_list.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/worklists/1_draft_leave_request_list.xml
similarity index 85%
rename from bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/worklists/1_draft_leave_request_list.xml
rename to bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/worklists/1_draft_leave_request_list.xml
index 3df8e5fedbd0a0de7f31aa1f33066e98a7230643..0d0a54d40a50c9e8babcb73e080b89aa18909d70 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/worklists/1_draft_leave_request_list.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/worklists/1_draft_leave_request_list.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Worklists</string>
-          <string>WorklistDefinition</string>
-        </tuple>
-        <none/>
+        <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -60,11 +57,8 @@ leave_request_module?simulation_state=draft&local_roles=Owner&reset:int=1
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Guard</string>
-          <string>Guard</string>
-        </tuple>
-        <none/>
+        <global name="Guard" module="Products.DCWorkflow.Guard"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -83,17 +77,14 @@ leave_request_module?simulation_state=draft&local_roles=Owner&reset:int=1
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
         <item>
-            <key> <string>_container</string> </key>
+            <key> <string>data</string> </key>
             <value>
               <dictionary>
                 <item>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/worklists/2_planned_leave_request_list.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/worklists/2_planned_leave_request_list.xml
similarity index 85%
rename from bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/worklists/2_planned_leave_request_list.xml
rename to bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/worklists/2_planned_leave_request_list.xml
index 3415dc61d5605fef80db48bb0c49f0632b588e58..bc72850ec2ae9810dd2416712fac2c10aa709440 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/worklists/2_planned_leave_request_list.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/worklists/2_planned_leave_request_list.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Worklists</string>
-          <string>WorklistDefinition</string>
-        </tuple>
-        <none/>
+        <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -60,11 +57,8 @@ leave_request_module?simulation_state=planned&local_roles=Assignee&reset:int=1
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Guard</string>
-          <string>Guard</string>
-        </tuple>
-        <none/>
+        <global name="Guard" module="Products.DCWorkflow.Guard"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -83,17 +77,14 @@ leave_request_module?simulation_state=planned&local_roles=Assignee&reset:int=1
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
         <item>
-            <key> <string>_container</string> </key>
+            <key> <string>data</string> </key>
             <value>
               <dictionary>
                 <item>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow.xml
index 1bfc38ae49f990ef5cf7a16bf7123697abe5bc21..40cf51a5c4fddd8b94b0c7efc67db1dbd7c01bdc 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.DCWorkflow</string>
-          <string>DCWorkflowDefinition</string>
-        </tuple>
-        <none/>
+        <global name="DCWorkflowDefinition" module="Products.DCWorkflow.DCWorkflow"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/scripts.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/scripts.xml
index 01ba35bf25f5084dde4a3822b204530dc92c3f47..66683dde0451b4de3eeb20f0fe5c7af60083c8a8 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/scripts.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/scripts.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Scripts</string>
-          <string>Scripts</string>
-        </tuple>
-        <none/>
+        <global name="Scripts" module="Products.DCWorkflow.Scripts"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/scripts/PresenceRequest_checkConsistency.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/scripts/PresenceRequest_checkConsistency.xml
index 76982e596c2d116b0ae9a83a0262abd2c111f6e0..962f23e3b28e55b8d7de8bf963f3ab667bc8c844 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/scripts/PresenceRequest_checkConsistency.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/scripts/PresenceRequest_checkConsistency.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/states.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/states.xml
index d6c2d2d922f477087b83aa36eaaa28e50572f887..cd2db0fb0c7613eebbc6622ce8b6e45adb4dd062 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/states.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/states.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>States</string>
-        </tuple>
-        <none/>
+        <global name="States" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/states/cancelled.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/states/cancelled.xml
index 896fde13e48a86436b446c47ebf21de6e0a2ee22..f06348f847fbee3554260dcdd4ff7ea8ae84cc61 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/states/cancelled.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/states/cancelled.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/states/confirmed.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/states/confirmed.xml
index 4c0eb72a429742ee7a7d8f1c30a03bbc969f79fb..806425f8efcdeac97049aa66f08f1c894124ca81 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/states/confirmed.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/states/confirmed.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/states/deleted.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/states/deleted.xml
index a40a17d1e06ad75502489c22da306fa11b70550d..621249513b72b3ca0a9b1ed822a5b780201c5563 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/states/deleted.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/states/deleted.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/states/draft.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/states/draft.xml
index a6f9f6730fb124a4b30d8f0f346c48dd7a29fe3f..168c38b6782bc9cd5d4abd7f6113155f6fbe9761 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/states/draft.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/states/draft.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/states/planned.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/states/planned.xml
index c9d062747245a91e751b8fed6ead0f993bf08773..8e171893c65cec730c43e145c7ba28ba8f9b71cb 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/states/planned.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/states/planned.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.States</string>
-          <string>StateDefinition</string>
-        </tuple>
-        <none/>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/transitions.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/transitions.xml
index 3763e3df954ed4d9dcd0d5285c5b000528b79755..61f19d835aad719dc95cedb6501029cfdf94a7ae 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/transitions.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/transitions.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>Transitions</string>
-        </tuple>
-        <none/>
+        <global name="Transitions" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/transitions/cancel.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/transitions/cancel.xml
index ff3b3c4e7d8df6bc9a84c513e78cfa111394546a..7e6c616311aa4307d01b8df253ff6ecdf0322aed 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/transitions/cancel.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/transitions/cancel.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/transitions/cancel_action.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/transitions/cancel_action.xml
index ac38a9671e79306ac7ea4eadf4bf217c989e4088..88a862211e30c144a3954089fe7c27bda8f4ea56 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/transitions/cancel_action.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/transitions/cancel_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/transitions/confirm.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/transitions/confirm.xml
index 3bd201c43353731276b97e71c239e7f5821914e8..c9aabf5b528175b7ba709092f8f7bfc1edb747b9 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/transitions/confirm.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/transitions/confirm.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/transitions/confirm_action.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/transitions/confirm_action.xml
index d5b951d330e7a2cabcb9e66bf0b0d9f96d38f15c..95049f1f19ac635c517975af53f196180ab20073 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/transitions/confirm_action.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/transitions/confirm_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/transitions/delete.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/transitions/delete.xml
index 2659ed2cfab60b103e50ba08e57de27ab41d5a44..80cd6128ec2a7c9e600524a364347039b1ba31a5 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/transitions/delete.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/transitions/delete.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/transitions/delete_action.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/transitions/delete_action.xml
index ad5267c57a7244103ed86bdab0173c6522482bbc..6cdd7103c6791bd4786d75e030411cc98410deab 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/transitions/delete_action.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/transitions/delete_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/transitions/plan.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/transitions/plan.xml
index 00c5477576a9c41d66f9d1031ede5918c6784330..8e8939f70bc70cc21f6972f9fe80f8acb75b1a0e 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/transitions/plan.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/transitions/plan.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/transitions/plan_action.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/transitions/plan_action.xml
index e17fb4104dc22b217d5d052ab9b6cfa8c0ffaa64..bef30b8f522df7af353537e59a22e4074c41b65f 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/transitions/plan_action.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/transitions/plan_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Transitions</string>
-          <string>TransitionDefinition</string>
-        </tuple>
-        <none/>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/variables.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/variables.xml
index 07046d72fed718dfcad3c81c6d2ef1003e3b162d..7d9ea0fae8df235f1290022d3cb37eaf4a947ade 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/variables.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/variables.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>Variables</string>
-        </tuple>
-        <none/>
+        <global name="Variables" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/variables/action.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/variables/action.xml
index 4daf3ce5b87d2f39cc8cfed14c520906405b9381..032f581c9e7a6a8ef10c0e1b02b41813ab516a78 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/variables/action.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/variables/action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/variables/actor.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/variables/actor.xml
index c2df6979e57406cf4859961ff741ff57ac91b64d..1927985d24dc1c907dfe250b9540860882711c92 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/variables/actor.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/variables/actor.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/variables/comment.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/variables/comment.xml
index 1c6966bea49c9bcc9b644f12fea08cf701efdf41..9a211a035ceaa9303cf7f73eb8b9fc3081409ae9 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/variables/comment.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/variables/comment.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/variables/error_message.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/variables/error_message.xml
index 61c9a2d189462f3a412b62e1d8443a4567c4e849..aace5d205ede4909bb8a5286be089f5e7537ad39 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/variables/error_message.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/variables/error_message.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/variables/history.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/variables/history.xml
index 91a2bf48c29d477343299a02e0191bca04e0d741..568ac694698da78e55b9f42fe2c4ab1b3326b149 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/variables/history.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/variables/history.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/variables/portal_type.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/variables/portal_type.xml
index 20edbc7d0721e3fe1b4d89e73d18990a3ce39e6e..d4abc30a9a306b0355f568946eecf38f9e08e5e5 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/variables/portal_type.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/variables/portal_type.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/variables/time.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/variables/time.xml
index 053c0e2d671e52328a9f9774327fd6bb61def94e..c0c7fcf08ae33e6387f2995307ef5ea3aca42831 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/variables/time.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/variables/time.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Variables</string>
-          <string>VariableDefinition</string>
-        </tuple>
-        <none/>
+        <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/worklists.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/worklists.xml
index 746450c3183c449b0d4487bcffd01a780edb1e16..609a885c76263f454a385fb66fa97995f5c7bdcd 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/worklists.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/worklists.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Worklists</string>
-          <string>Worklists</string>
-        </tuple>
-        <none/>
+        <global name="Worklists" module="Products.DCWorkflow.Worklists"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/worklists/1_draft_presence_request_list.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/worklists/1_draft_presence_request_list.xml
similarity index 85%
rename from bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/worklists/1_draft_presence_request_list.xml
rename to bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/worklists/1_draft_presence_request_list.xml
index d1aa64ef8da70f3b2540a0e9407f0fd73b8949e5..a6d6dbfdc9e136c8689643902e8fbc890bd739af 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/worklists/1_draft_presence_request_list.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/worklists/1_draft_presence_request_list.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Worklists</string>
-          <string>WorklistDefinition</string>
-        </tuple>
-        <none/>
+        <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -60,11 +57,8 @@ presence_request_module?simulation_state=draft&local_roles=Owner&reset:int=1
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Guard</string>
-          <string>Guard</string>
-        </tuple>
-        <none/>
+        <global name="Guard" module="Products.DCWorkflow.Guard"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -83,17 +77,14 @@ presence_request_module?simulation_state=draft&local_roles=Owner&reset:int=1
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
         <item>
-            <key> <string>_container</string> </key>
+            <key> <string>data</string> </key>
             <value>
               <dictionary>
                 <item>
diff --git a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/worklists/2_planned_presence_request_list.xml b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/worklists/2_planned_presence_request_list.xml
similarity index 85%
rename from bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/worklists/2_planned_presence_request_list.xml
rename to bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/worklists/2_planned_presence_request_list.xml
index 1b39bdc2ec38e6af5ab209dde87693a3e2161370..1f5d6322edd04134744d23b434d3d897acb43ac3 100644
--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/worklists/2_planned_presence_request_list.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/worklists/2_planned_presence_request_list.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Worklists</string>
-          <string>WorklistDefinition</string>
-        </tuple>
-        <none/>
+        <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -60,11 +57,8 @@ presence_request_module?simulation_state=planned&local_roles=Assignee&reset:int=
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.DCWorkflow.Guard</string>
-          <string>Guard</string>
-        </tuple>
-        <none/>
+        <global name="Guard" module="Products.DCWorkflow.Guard"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -83,17 +77,14 @@ presence_request_module?simulation_state=planned&local_roles=Assignee&reset:int=
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
         <item>
-            <key> <string>_container</string> </key>
+            <key> <string>data</string> </key>
             <value>
               <dictionary>
                 <item>
diff --git a/bt5/erp5_calendar/bt/revision b/bt5/erp5_calendar/bt/revision
index 0e92c3c0fc954ea08c56cf2c6b18bd68a0c7879b..5160788e93f43d2400cb3892ce16f12d2c87b590 100644
--- a/bt5/erp5_calendar/bt/revision
+++ b/bt5/erp5_calendar/bt/revision
@@ -1 +1 @@
-306
\ No newline at end of file
+307
\ No newline at end of file