diff --git a/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/scripts.xml b/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/scripts.xml
index 01ba35bf25f5084dde4a3822b204530dc92c3f47..66683dde0451b4de3eeb20f0fe5c7af60083c8a8 100644
--- a/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/scripts.xml
+++ b/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_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_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/scripts/doRaiseValidationFailed.xml b/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/scripts/doRaiseValidationFailed.xml
index 2e4129414450122144e7676f2d72f3c29258d05b..ca7525f29bef7b5b4ebff951aea279085533458f 100644
--- a/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/scripts/doRaiseValidationFailed.xml
+++ b/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/scripts/doRaiseValidationFailed.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_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/states.xml b/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/states.xml
index d6c2d2d922f477087b83aa36eaaa28e50572f887..cd2db0fb0c7613eebbc6622ce8b6e45adb4dd062 100644
--- a/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/states.xml
+++ b/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_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_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/states/deleted.xml b/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/states/deleted.xml
index ee48e05fb2af188cfabe6bf4681bba8d02a8dc90..5ad66643eb3cef8aef258343638e09576298c760 100644
--- a/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/states/deleted.xml
+++ b/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_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_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/states/draft.xml b/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/states/draft.xml
index 2496f6554b31ebb39c2fce35195974eba00dafee..30025f4dfcb5f803e7d4cd487c094503cddfd927 100644
--- a/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/states/draft.xml
+++ b/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_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_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/states/invalidated.xml b/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/states/invalidated.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c82ee3f14d58f4426284b33df6cfa6aa1cb65cd8
--- /dev/null
+++ b/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/states/invalidated.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>invalidated</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Invalidated</string> </value>
+        </item>
+        <item>
+            <key> <string>transitions</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>type_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/states/validated.xml b/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/states/validated.xml
index 02812c382bde68b938e5c635dc96b824d610336e..15a3ba5e47651e8df92d141ba30ada98bcfd6f11 100644
--- a/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/states/validated.xml
+++ b/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/states/validated.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>
@@ -33,7 +30,10 @@
         <item>
             <key> <string>transitions</string> </key>
             <value>
-              <tuple/>
+              <tuple>
+                <string>invalidate</string>
+                <string>invalidate_action</string>
+              </tuple>
             </value>
         </item>
         <item>
diff --git a/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/transitions.xml b/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/transitions.xml
index 3763e3df954ed4d9dcd0d5285c5b000528b79755..61f19d835aad719dc95cedb6501029cfdf94a7ae 100644
--- a/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/transitions.xml
+++ b/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_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_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/transitions/delete.xml b/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/transitions/delete.xml
index 2659ed2cfab60b103e50ba08e57de27ab41d5a44..80cd6128ec2a7c9e600524a364347039b1ba31a5 100644
--- a/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/transitions/delete.xml
+++ b/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_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_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/transitions/delete_action.xml b/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/transitions/delete_action.xml
index ef98f2d5de1919d6ee7ebbe00dcfbfb3de53442c..21dfb58cebf05aa5f5832ab0f3104ab1f0e2c705 100644
--- a/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/transitions/delete_action.xml
+++ b/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_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_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/transitions/dummy_action.xml b/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/transitions/dummy_action.xml
index a12378ec6513270e28b52bd6464f837fdc7615a3..d748f6fc38aaeec68ce4ede40b927347472ef634 100644
--- a/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/transitions/dummy_action.xml
+++ b/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/transitions/dummy_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_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/transitions/dummy_failing_action.xml b/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/transitions/dummy_failing_action.xml
index 2e08e62e64ae4123729347835e199b65a90ead9a..b11ffd887e43c91494d69c57f1e8fb3c844e884c 100644
--- a/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/transitions/dummy_failing_action.xml
+++ b/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/transitions/dummy_failing_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_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/transitions/invalidate.xml b/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/transitions/invalidate.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f2b812b2587890ec40687d2cef997ec6ac8ac26e
--- /dev/null
+++ b/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/transitions/invalidate.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>actbox_category</string> </key>
+            <value> <string>workflow</string> </value>
+        </item>
+        <item>
+            <key> <string>actbox_name</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>actbox_url</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>after_script_name</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>guard</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>invalidate</string> </value>
+        </item>
+        <item>
+            <key> <string>new_state_id</string> </key>
+            <value> <string>invalidated</string> </value>
+        </item>
+        <item>
+            <key> <string>script_name</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>trigger_type</string> </key>
+            <value> <int>2</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/transitions/invalidate_action.xml b/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/transitions/invalidate_action.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b057e866c9a4d9f97aecca8e4d43926f56e21e05
--- /dev/null
+++ b/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/transitions/invalidate_action.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__ac_local_roles__</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>actbox_category</string> </key>
+            <value> <string>workflow</string> </value>
+        </item>
+        <item>
+            <key> <string>actbox_name</string> </key>
+            <value> <string>Invalidate Action</string> </value>
+        </item>
+        <item>
+            <key> <string>actbox_url</string> </key>
+            <value> <string>%(content_url)s/Base_viewWorkflowActionDialog?workflow_action=invalidate_action</string> </value>
+        </item>
+        <item>
+            <key> <string>after_script_name</string> </key>
+            <value> <string>invalidate</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>guard</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>invalidate_action</string> </value>
+        </item>
+        <item>
+            <key> <string>new_state_id</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>script_name</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>trigger_type</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/transitions/validate.xml b/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/transitions/validate.xml
index af9c3f821cad02f62b494b3bde0a5cd40df68b27..e6d9db6383fad25dc38b6aa6b1fb0d180a215434 100644
--- a/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/transitions/validate.xml
+++ b/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/transitions/validate.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_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/transitions/validate_action.xml b/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/transitions/validate_action.xml
index 1d6d5b1b06d6912fd4b2c1408ce19ae4ce402be4..fa6650b6260926afdc5443eb5102ae6fed9651a2 100644
--- a/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/transitions/validate_action.xml
+++ b/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/transitions/validate_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_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/variables.xml b/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/variables.xml
index 07046d72fed718dfcad3c81c6d2ef1003e3b162d..7d9ea0fae8df235f1290022d3cb37eaf4a947ade 100644
--- a/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/variables.xml
+++ b/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_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_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/variables/action.xml b/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/variables/action.xml
index 4daf3ce5b87d2f39cc8cfed14c520906405b9381..032f581c9e7a6a8ef10c0e1b02b41813ab516a78 100644
--- a/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/variables/action.xml
+++ b/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_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_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/variables/actor.xml b/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/variables/actor.xml
index c2df6979e57406cf4859961ff741ff57ac91b64d..1927985d24dc1c907dfe250b9540860882711c92 100644
--- a/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/variables/actor.xml
+++ b/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_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_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/variables/comment.xml b/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/variables/comment.xml
index 1c6966bea49c9bcc9b644f12fea08cf701efdf41..9a211a035ceaa9303cf7f73eb8b9fc3081409ae9 100644
--- a/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/variables/comment.xml
+++ b/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_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_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/variables/error_message.xml b/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/variables/error_message.xml
index 61c9a2d189462f3a412b62e1d8443a4567c4e849..aace5d205ede4909bb8a5286be089f5e7537ad39 100644
--- a/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/variables/error_message.xml
+++ b/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_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_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/variables/history.xml b/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/variables/history.xml
index 91a2bf48c29d477343299a02e0191bca04e0d741..568ac694698da78e55b9f42fe2c4ab1b3326b149 100644
--- a/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/variables/history.xml
+++ b/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_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_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/variables/time.xml b/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/variables/time.xml
index 053c0e2d671e52328a9f9774327fd6bb61def94e..c0c7fcf08ae33e6387f2995307ef5ea3aca42831 100644
--- a/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/variables/time.xml
+++ b/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_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_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/worklists.xml b/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/worklists.xml
index 746450c3183c449b0d4487bcffd01a780edb1e16..609a885c76263f454a385fb66fa97995f5c7bdcd 100644
--- a/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/worklists.xml
+++ b/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_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_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/worklists/draft.xml b/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/worklists/draft.xml
index 5aca0c0016824f0f4c90dd709f86ae4f6b920060..8031fcbc8224a673d929ca292cf21442e581a083 100644
--- a/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/worklists/draft.xml
+++ b/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/worklists/draft.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>
diff --git a/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/worklists/validated.xml b/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/worklists/validated.xml
index 74f15e7ce4852b189c674996db82ff7ad31fc253..5ad9cc5e79b98069f2619299456f8b7f56652ec6 100644
--- a/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/worklists/validated.xml
+++ b/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/worklists/validated.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>
diff --git a/bt5/erp5_ui_test/bt/revision b/bt5/erp5_ui_test/bt/revision
index 9e6181a6edf278d8fe3d626196e7a67223fae140..53c731105c7803f053a072618b750de8b3a1189c 100644
--- a/bt5/erp5_ui_test/bt/revision
+++ b/bt5/erp5_ui_test/bt/revision
@@ -1 +1 @@
-285
\ No newline at end of file
+286
\ No newline at end of file