diff --git a/bt5/erp5_hr/ModuleTemplateItem/position_announcement_module.xml b/bt5/erp5_hr/ModuleTemplateItem/position_announcement_module.xml
index 878c2b551206ad16fd4ebd2089bb0422004cadad..fe5c0f7fc82a57435de63fba110d01bff7edbd22 100644
--- a/bt5/erp5_hr/ModuleTemplateItem/position_announcement_module.xml
+++ b/bt5/erp5_hr/ModuleTemplateItem/position_announcement_module.xml
@@ -64,6 +64,10 @@
    <name>Add CMF Caching Policy Managers</name>
    <role>Manager</role>
   </permission>
+  <permission type='tuple'>
+   <name>Add CMF Calendar Tools</name>
+   <role>Manager</role>
+  </permission>
   <permission type='tuple'>
    <name>Add CMF Core Tools</name>
    <role>Manager</role>
@@ -73,17 +77,21 @@
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Add CMF Groups Tools</name>
+   <name>Add CMF Report Tools</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Add CMF Report Tools</name>
+   <name>Add CMF Setup Tools</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add CMF Sites</name>
    <role>Manager</role>
   </permission>
+  <permission type='tuple'>
+   <name>Add CMF Unique Id Tools</name>
+   <role>Manager</role>
+  </permission>
   <permission type='tuple'>
    <name>Add CMFActivity Tools</name>
    <role>Manager</role>
@@ -96,6 +104,10 @@
    <name>Add CMFMailIn Tools</name>
    <role>Manager</role>
   </permission>
+  <permission type='tuple'>
+   <name>Add Configured CMF Sites</name>
+   <role>Manager</role>
+  </permission>
   <permission type='tuple'>
    <name>Add Content Type Registrys</name>
    <role>Manager</role>
@@ -197,15 +209,7 @@
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Add GroupUserFolder</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add GroupUserFolders</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Groups</name>
+   <name>Add Local File Systems</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -236,14 +240,6 @@
    <name>Add Page Templates</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add Photo Folders</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Photos</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add Pluggable Index</name>
    <role>Manager</role>
@@ -288,10 +284,6 @@
    <name>Add User Folders</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add Versions</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add Virtual Host Monsters</name>
    <role>Manager</role>
@@ -338,6 +330,10 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
+  <permission type='tuple'>
+   <name>Add portal events</name>
+   <role>Manager</role>
+  </permission>
   <permission type='tuple'>
    <name>Add portal folders</name>
    <role>Assignor</role>
@@ -352,10 +348,6 @@
    <name>Add portal topics</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add secure MailHost objects</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Change Browser Id Manager</name>
    <role>Manager</role>
@@ -397,15 +389,15 @@
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Change Lock Information</name>
+   <name>Change Local File System properties</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Change Page Templates</name>
+   <name>Change Lock Information</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Change Photo</name>
+   <name>Change Page Templates</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -453,6 +445,10 @@
    <name>Change permissions</name>
    <role>Manager</role>
   </permission>
+  <permission type='tuple'>
+   <name>Change portal events</name>
+   <role>Manager</role>
+  </permission>
   <permission type='tuple'>
    <name>Change portal topics</name>
    <role>Manager</role>
@@ -463,6 +459,11 @@
   </permission>
   <permission type='tuple'>
    <name>Copy or Move</name>
+   <role>Assignee</role>
+   <role>Assignor</role>
+   <role>Associate</role>
+   <role>Auditor</role>
+   <role>Author</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -478,7 +479,7 @@
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Delete Groups</name>
+   <name>Delete local files</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -580,11 +581,11 @@
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Manage extensions</name>
+   <name>Manage languages</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Manage languages</name>
+   <name>Manage local files</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -620,6 +621,10 @@
    <name>Open/Close Database Connections</name>
    <role>Manager</role>
   </permission>
+  <permission type='tuple'>
+   <name>Overwrite local files</name>
+   <role>Manager</role>
+  </permission>
   <permission type='tuple'>
    <name>Post mail to ZMailIn</name>
    <role>Manager</role>
@@ -652,10 +657,6 @@
    <name>Search for principals</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Set Group Ownership</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Set own password</name>
    <role>Manager</role>
@@ -680,6 +681,10 @@
    <name>Undo changes</name>
    <role>Manager</role>
   </permission>
+  <permission type='tuple'>
+   <name>Upload local files</name>
+   <role>Manager</role>
+  </permission>
   <permission type='tuple'>
    <name>Use Database Methods</name>
    <role>Manager</role>
@@ -702,11 +707,10 @@
    <role>Assignor</role>
    <role>Associate</role>
    <role>Auditor</role>
-   <role>Author</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>View Groups</name>
+   <name>View Directory Index</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
diff --git a/bt5/erp5_hr/ModuleTemplateItem/position_module.xml b/bt5/erp5_hr/ModuleTemplateItem/position_module.xml
index 0082cebfe62c8737e119b4c777978a56da5db9ea..f063b1674726d92f5524643bf2b61501bb174c79 100644
--- a/bt5/erp5_hr/ModuleTemplateItem/position_module.xml
+++ b/bt5/erp5_hr/ModuleTemplateItem/position_module.xml
@@ -64,6 +64,10 @@
    <name>Add CMF Caching Policy Managers</name>
    <role>Manager</role>
   </permission>
+  <permission type='tuple'>
+   <name>Add CMF Calendar Tools</name>
+   <role>Manager</role>
+  </permission>
   <permission type='tuple'>
    <name>Add CMF Core Tools</name>
    <role>Manager</role>
@@ -73,17 +77,21 @@
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Add CMF Groups Tools</name>
+   <name>Add CMF Report Tools</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Add CMF Report Tools</name>
+   <name>Add CMF Setup Tools</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add CMF Sites</name>
    <role>Manager</role>
   </permission>
+  <permission type='tuple'>
+   <name>Add CMF Unique Id Tools</name>
+   <role>Manager</role>
+  </permission>
   <permission type='tuple'>
    <name>Add CMFActivity Tools</name>
    <role>Manager</role>
@@ -96,6 +104,10 @@
    <name>Add CMFMailIn Tools</name>
    <role>Manager</role>
   </permission>
+  <permission type='tuple'>
+   <name>Add Configured CMF Sites</name>
+   <role>Manager</role>
+  </permission>
   <permission type='tuple'>
    <name>Add Content Type Registrys</name>
    <role>Manager</role>
@@ -197,15 +209,7 @@
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Add GroupUserFolder</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add GroupUserFolders</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Groups</name>
+   <name>Add Local File Systems</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -236,14 +240,6 @@
    <name>Add Page Templates</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add Photo Folders</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Photos</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add Pluggable Index</name>
    <role>Manager</role>
@@ -288,10 +284,6 @@
    <name>Add User Folders</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add Versions</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add Virtual Host Monsters</name>
    <role>Manager</role>
@@ -338,6 +330,10 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
+  <permission type='tuple'>
+   <name>Add portal events</name>
+   <role>Manager</role>
+  </permission>
   <permission type='tuple'>
    <name>Add portal folders</name>
    <role>Assignor</role>
@@ -352,10 +348,6 @@
    <name>Add portal topics</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add secure MailHost objects</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Change Browser Id Manager</name>
    <role>Manager</role>
@@ -397,15 +389,15 @@
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Change Lock Information</name>
+   <name>Change Local File System properties</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Change Page Templates</name>
+   <name>Change Lock Information</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Change Photo</name>
+   <name>Change Page Templates</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -453,6 +445,10 @@
    <name>Change permissions</name>
    <role>Manager</role>
   </permission>
+  <permission type='tuple'>
+   <name>Change portal events</name>
+   <role>Manager</role>
+  </permission>
   <permission type='tuple'>
    <name>Change portal topics</name>
    <role>Manager</role>
@@ -463,6 +459,11 @@
   </permission>
   <permission type='tuple'>
    <name>Copy or Move</name>
+   <role>Assignee</role>
+   <role>Assignor</role>
+   <role>Associate</role>
+   <role>Auditor</role>
+   <role>Author</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -478,7 +479,7 @@
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Delete Groups</name>
+   <name>Delete local files</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -580,11 +581,11 @@
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Manage extensions</name>
+   <name>Manage languages</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Manage languages</name>
+   <name>Manage local files</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -620,6 +621,10 @@
    <name>Open/Close Database Connections</name>
    <role>Manager</role>
   </permission>
+  <permission type='tuple'>
+   <name>Overwrite local files</name>
+   <role>Manager</role>
+  </permission>
   <permission type='tuple'>
    <name>Post mail to ZMailIn</name>
    <role>Manager</role>
@@ -652,10 +657,6 @@
    <name>Search for principals</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Set Group Ownership</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Set own password</name>
    <role>Manager</role>
@@ -680,6 +681,10 @@
    <name>Undo changes</name>
    <role>Manager</role>
   </permission>
+  <permission type='tuple'>
+   <name>Upload local files</name>
+   <role>Manager</role>
+  </permission>
   <permission type='tuple'>
    <name>Use Database Methods</name>
    <role>Manager</role>
@@ -702,11 +707,10 @@
    <role>Assignor</role>
    <role>Associate</role>
    <role>Auditor</role>
-   <role>Author</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>View Groups</name>
+   <name>View Directory Index</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
diff --git a/bt5/erp5_hr/ModuleTemplateItem/position_opportunity_module.xml b/bt5/erp5_hr/ModuleTemplateItem/position_opportunity_module.xml
index 0f17a4c15091aa47ba2404677085b066ac50532c..e2153d541aa6ad3f393c1d5e81d30ebabe471e8a 100644
--- a/bt5/erp5_hr/ModuleTemplateItem/position_opportunity_module.xml
+++ b/bt5/erp5_hr/ModuleTemplateItem/position_opportunity_module.xml
@@ -64,6 +64,10 @@
    <name>Add CMF Caching Policy Managers</name>
    <role>Manager</role>
   </permission>
+  <permission type='tuple'>
+   <name>Add CMF Calendar Tools</name>
+   <role>Manager</role>
+  </permission>
   <permission type='tuple'>
    <name>Add CMF Core Tools</name>
    <role>Manager</role>
@@ -73,17 +77,21 @@
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Add CMF Groups Tools</name>
+   <name>Add CMF Report Tools</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Add CMF Report Tools</name>
+   <name>Add CMF Setup Tools</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
    <name>Add CMF Sites</name>
    <role>Manager</role>
   </permission>
+  <permission type='tuple'>
+   <name>Add CMF Unique Id Tools</name>
+   <role>Manager</role>
+  </permission>
   <permission type='tuple'>
    <name>Add CMFActivity Tools</name>
    <role>Manager</role>
@@ -96,6 +104,10 @@
    <name>Add CMFMailIn Tools</name>
    <role>Manager</role>
   </permission>
+  <permission type='tuple'>
+   <name>Add Configured CMF Sites</name>
+   <role>Manager</role>
+  </permission>
   <permission type='tuple'>
    <name>Add Content Type Registrys</name>
    <role>Manager</role>
@@ -197,15 +209,7 @@
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Add GroupUserFolder</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add GroupUserFolders</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Groups</name>
+   <name>Add Local File Systems</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -236,14 +240,6 @@
    <name>Add Page Templates</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add Photo Folders</name>
-   <role>Manager</role>
-  </permission>
-  <permission type='tuple'>
-   <name>Add Photos</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add Pluggable Index</name>
    <role>Manager</role>
@@ -288,10 +284,6 @@
    <name>Add User Folders</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add Versions</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Add Virtual Host Monsters</name>
    <role>Manager</role>
@@ -338,6 +330,10 @@
    <role>Author</role>
    <role>Manager</role>
   </permission>
+  <permission type='tuple'>
+   <name>Add portal events</name>
+   <role>Manager</role>
+  </permission>
   <permission type='tuple'>
    <name>Add portal folders</name>
    <role>Assignor</role>
@@ -352,10 +348,6 @@
    <name>Add portal topics</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Add secure MailHost objects</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Change Browser Id Manager</name>
    <role>Manager</role>
@@ -397,15 +389,15 @@
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Change Lock Information</name>
+   <name>Change Local File System properties</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Change Page Templates</name>
+   <name>Change Lock Information</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Change Photo</name>
+   <name>Change Page Templates</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -453,6 +445,10 @@
    <name>Change permissions</name>
    <role>Manager</role>
   </permission>
+  <permission type='tuple'>
+   <name>Change portal events</name>
+   <role>Manager</role>
+  </permission>
   <permission type='tuple'>
    <name>Change portal topics</name>
    <role>Manager</role>
@@ -463,6 +459,11 @@
   </permission>
   <permission type='tuple'>
    <name>Copy or Move</name>
+   <role>Assignee</role>
+   <role>Assignor</role>
+   <role>Associate</role>
+   <role>Auditor</role>
+   <role>Author</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -478,7 +479,7 @@
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Delete Groups</name>
+   <name>Delete local files</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -580,11 +581,11 @@
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Manage extensions</name>
+   <name>Manage languages</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>Manage languages</name>
+   <name>Manage local files</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
@@ -620,6 +621,10 @@
    <name>Open/Close Database Connections</name>
    <role>Manager</role>
   </permission>
+  <permission type='tuple'>
+   <name>Overwrite local files</name>
+   <role>Manager</role>
+  </permission>
   <permission type='tuple'>
    <name>Post mail to ZMailIn</name>
    <role>Manager</role>
@@ -652,10 +657,6 @@
    <name>Search for principals</name>
    <role>Manager</role>
   </permission>
-  <permission type='tuple'>
-   <name>Set Group Ownership</name>
-   <role>Manager</role>
-  </permission>
   <permission type='tuple'>
    <name>Set own password</name>
    <role>Manager</role>
@@ -680,6 +681,10 @@
    <name>Undo changes</name>
    <role>Manager</role>
   </permission>
+  <permission type='tuple'>
+   <name>Upload local files</name>
+   <role>Manager</role>
+  </permission>
   <permission type='tuple'>
    <name>Use Database Methods</name>
    <role>Manager</role>
@@ -702,11 +707,10 @@
    <role>Assignor</role>
    <role>Associate</role>
    <role>Auditor</role>
-   <role>Author</role>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
-   <name>View Groups</name>
+   <name>View Directory Index</name>
    <role>Manager</role>
   </permission>
   <permission type='tuple'>
diff --git a/bt5/erp5_hr/bt/comment b/bt5/erp5_hr/bt/comment
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/bt5/erp5_hr/bt/revision b/bt5/erp5_hr/bt/revision
index 56a6051ca2b02b04ef92d5150c9ef600403cb1de..d8263ee9860594d2806b0dfd1bfd17528b0ba2a4 100644
--- a/bt5/erp5_hr/bt/revision
+++ b/bt5/erp5_hr/bt/revision
@@ -1 +1 @@
-1
\ No newline at end of file
+2
\ No newline at end of file
diff --git a/bt5/erp5_hr/bt/template_catalog_datetime_key_list b/bt5/erp5_hr/bt/template_catalog_datetime_key_list
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/bt5/erp5_hr/bt/template_catalog_local_role_key_list b/bt5/erp5_hr/bt/template_catalog_local_role_key_list
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/bt5/erp5_hr/bt/template_catalog_role_key_list b/bt5/erp5_hr/bt/template_catalog_role_key_list
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/bt5/erp5_hr/bt/template_catalog_scriptable_key_list b/bt5/erp5_hr/bt/template_catalog_scriptable_key_list
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/bt5/erp5_hr/bt/template_tool_id_list b/bt5/erp5_hr/bt/template_tool_id_list
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/bt5/erp5_publication/ModuleTemplateItem/publication_module.xml b/bt5/erp5_publication/ModuleTemplateItem/publication_module.xml
index ebf8bb36f12b50e83cf748430fc83149128385b1..f77d28f371884508ec4d93331a44c86d28d6e6ea 100644
--- a/bt5/erp5_publication/ModuleTemplateItem/publication_module.xml
+++ b/bt5/erp5_publication/ModuleTemplateItem/publication_module.xml
@@ -1,515 +1,746 @@
 <module>
  <id>publication_module</id>
  <permission_list>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Access Transient Objects</name>
-  </permission>
-  <permission type='list'>
+   <role>Assignee</role>
+   <role>Assignor</role>
+   <role>Associate</role>
+   <role>Auditor</role>
+   <role>Author</role>
+   <role>Manager</role>
+  </permission>
+  <permission type='tuple'>
    <name>Access arbitrary user session data</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Access contents information</name>
-  </permission>
-  <permission type='list'>
+   <role>Assignee</role>
+   <role>Assignor</role>
+   <role>Associate</role>
+   <role>Auditor</role>
+   <role>Author</role>
+   <role>Manager</role>
+  </permission>
+  <permission type='tuple'>
    <name>Access future portal content</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Access inactive portal content</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Access session data</name>
-  </permission>
-  <permission type='list'>
+   <role>Assignee</role>
+   <role>Assignor</role>
+   <role>Associate</role>
+   <role>Auditor</role>
+   <role>Author</role>
+   <role>Manager</role>
+  </permission>
+  <permission type='tuple'>
    <name>Add Accelerated HTTP Cache Managers</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add BTreeFolder2s</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Browser Id Manager</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMF Action Icons Tools</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMF Active Processs</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMF Caching Policy Managers</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMF Calendar Tools</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMF Core Tools</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMF Default Tools</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMF Report Tools</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMF Setup Tools</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMF Sites</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMF Unique Id Tools</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMFActivity Tools</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMFCategory Tools</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add CMFMailIn Tools</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Configured CMF Sites</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Content Type Registrys</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Cookie Crumblers</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Database Methods</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Documents, Images, and Files</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 Filesystem Formulator Forms</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 Forms</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 OOo Templates</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 PDF Forms</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 PDF Templates</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 Publications</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 Reports</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 Sites</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 Subscriptions</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5 Tools</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5Catalog Tools</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5Form Tools</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5Subversion Tools</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5SyncML Tools</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ERP5Type Tools</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ExtFiles</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ExtImages</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add External Methods</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Filesystem Directory Views</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Folders</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Formulator Forms</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
+   <name>Add Local File Systems</name>
+   <role>Manager</role>
+  </permission>
+  <permission type='tuple'>
    <name>Add LocalContents</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add LocalFolders</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Localizers</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add MailHost objects</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add MessageCatalogs</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add Page Templates</name>
-  </permission>
-  <permission type='list'>
-   <name>Add Photo Folders</name>
+  <permission type='tuple'>
+   <name>Add MimetypesRegistry Tools</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add Photos</name>
+  <permission type='tuple'>
+   <name>Add Page Templates</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Pluggable Index</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Plugin Registrys</name>
+   <role>Manager</role>
+  </permission>
+  <permission type='tuple'>
+   <name>Add PortalTransforms Tools</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Python Scripts</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add RAM Cache Managers</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ReStructuredText Documents</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Session Data Manager</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Site Roots</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Temporary Folder</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Transient Object Container</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add User Folders</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Add Versions</name>
-  </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Virtual Host Monsters</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Vocabularies</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Z Gadfly Database Connections</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Z MySQL Database Connections</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Z MySQL Deferred Database Connections</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ZCatalogs</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ZMailIn Clients</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ZMailMessages</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add ZODB Mount Points</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add Zope Tutorials</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add portal content</name>
+   <role>Assignor</role>
+   <role>Author</role>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add portal events</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add portal folders</name>
+   <role>Assignor</role>
+   <role>Author</role>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add portal member</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Add portal topics</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change Browser Id Manager</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change DTML Documents</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change DTML Methods</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change Database Connections</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change Database Methods</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change ExtFile/ExtImage</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change External Methods</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change Formulator Fields</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change Formulator Forms</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change Images and Files</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
+   <name>Change Local File System properties</name>
+   <role>Manager</role>
+  </permission>
+  <permission type='tuple'>
    <name>Change Lock Information</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change Page Templates</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Change Photo</name>
-  </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change Python Scripts</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change Session Data Manager</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change Versions</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change ZMailIn</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change ZMailMessages</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change bindings</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change cache managers</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change cache settings</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change configuration</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change local roles</name>
+   <role>Assignor</role>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change permissions</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change portal events</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change portal topics</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Change proxy roles</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Copy or Move</name>
-  </permission>
-  <permission type='list'>
+   <role>Assignee</role>
+   <role>Assignor</role>
+   <role>Associate</role>
+   <role>Auditor</role>
+   <role>Author</role>
+   <role>Manager</role>
+  </permission>
+  <permission type='tuple'>
    <name>Create Transient Objects</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Create class instances</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Define permissions</name>
+   <role>Manager</role>
+  </permission>
+  <permission type='tuple'>
+   <name>Delete local files</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Delete objects</name>
+   <role>Assignor</role>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Download ExtFile/ExtImage</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Edit Factories</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Edit ReStructuredText</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Edit target</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>FTP access</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Import/Export objects</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Join/leave Versions</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>List folder contents</name>
-  </permission>
-  <permission type='list'>
+   <role>Assignee</role>
+   <role>Assignor</role>
+   <role>Associate</role>
+   <role>Auditor</role>
+   <role>Author</role>
+   <role>Manager</role>
+  </permission>
+  <permission type='tuple'>
    <name>List portal members</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>List undoable changes</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Log Site Errors</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Log to the Event Log</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Mail forgotten password</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Manage Access Rules</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Manage Groups</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Manage Selenium test cases</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Manage Transient Object Container</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Manage Vocabulary</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Manage WebDAV Locks</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Manage Z Classes</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Manage ZCatalog Entries</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Manage ZCatalogIndex Entries</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>Manage extensions</name>
-  </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Manage languages</name>
+   <role>Manager</role>
+  </permission>
+  <permission type='tuple'>
+   <name>Manage local files</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Manage messages</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Manage portal</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Manage properties</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Manage users</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Modify Cookie Crumblers</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Modify portal content</name>
+   <role>Assignor</role>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Open/Close Database Connection</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Open/Close Database Connections</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
+   <name>Overwrite local files</name>
+   <role>Manager</role>
+  </permission>
+  <permission type='tuple'>
    <name>Post mail to ZMailIn</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Query Vocabulary</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Reply to item</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Request review</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Review portal content</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Save/discard Version changes</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Search ZCatalog</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Search for principals</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Set own password</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Set own properties</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Take ownership</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Test Database Connections</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Translate Content</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Undo changes</name>
+   <role>Manager</role>
+  </permission>
+  <permission type='tuple'>
+   <name>Upload local files</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Use Database Methods</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Use Factories</name>
+   <role>Manager</role>
+  </permission>
+  <permission type='tuple'>
+   <name>Use external editor</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>Use mailhost services</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>View</name>
+   <role>Assignee</role>
+   <role>Assignor</role>
+   <role>Associate</role>
+   <role>Auditor</role>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
-   <name>View History</name>
+  <permission type='tuple'>
+   <name>View Directory Index</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
+   <name>View History</name>
+   <role>Assignee</role>
+   <role>Assignor</role>
+   <role>Associate</role>
+   <role>Auditor</role>
+   <role>Author</role>
+   <role>Manager</role>
+  </permission>
+  <permission type='tuple'>
    <name>View ZMailMessage</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>View management screens</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>WebDAV Lock items</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>WebDAV Unlock items</name>
+   <role>Manager</role>
   </permission>
-  <permission type='list'>
+  <permission type='tuple'>
    <name>WebDAV access</name>
+   <role>Manager</role>
   </permission>
  </permission_list>
  <portal_type>Publication Module</portal_type>
diff --git a/bt5/erp5_publication/bt/comment b/bt5/erp5_publication/bt/comment
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/bt5/erp5_publication/bt/revision b/bt5/erp5_publication/bt/revision
index d8263ee9860594d2806b0dfd1bfd17528b0ba2a4..e440e5c842586965a7fb77deda2eca68612b1f53 100644
--- a/bt5/erp5_publication/bt/revision
+++ b/bt5/erp5_publication/bt/revision
@@ -1 +1 @@
-2
\ No newline at end of file
+3
\ No newline at end of file
diff --git a/bt5/erp5_publication/bt/template_catalog_datetime_key_list b/bt5/erp5_publication/bt/template_catalog_datetime_key_list
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/bt5/erp5_publication/bt/template_catalog_local_role_key_list b/bt5/erp5_publication/bt/template_catalog_local_role_key_list
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/bt5/erp5_publication/bt/template_catalog_role_key_list b/bt5/erp5_publication/bt/template_catalog_role_key_list
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/bt5/erp5_publication/bt/template_catalog_scriptable_key_list b/bt5/erp5_publication/bt/template_catalog_scriptable_key_list
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/bt5/erp5_publication/bt/template_tool_id_list b/bt5/erp5_publication/bt/template_tool_id_list
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391