diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/agent.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/agent.xml
index 1ee81ec3acc216b2563b679fad2db6592f1a840b..99883902bbf83c8a24bed14d7f3a77206ad5de81 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/agent.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/agent.xml
@@ -31,21 +31,43 @@
             </value>
         </item>
         <item>
-            <key> <string>_owner</string> </key>
+            <key> <string>_tree</string> </key>
             <value>
-              <none/>
+              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string>_tree</string> </key>
+            <key> <string>acquisition_append_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_base_category</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>acquisition_copy_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_mask_value</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_object_id</string> </key>
+            <value>
+              <tuple/>
             </value>
         </item>
         <item>
             <key> <string>acquisition_portal_type</string> </key>
             <value> <string>python: []</string> </value>
         </item>
+        <item>
+            <key> <string>acquisition_sync_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
         <item>
             <key> <string>categories</string> </key>
             <value>
@@ -54,17 +76,105 @@
               </tuple>
             </value>
         </item>
+        <item>
+            <key> <string>category_type</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>criterion_property</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>fallback_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>agent</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>last_id</string> </key>
+            <value> <string>1</string> </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>portal_type</string> </key>
             <value> <string>Base Category</string> </value>
         </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>uid</string> </key>
@@ -72,6 +182,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/agent_privilege.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/agent_privilege.xml
index adf14cb79c7315722b8cdf3e086545ecd5a14dc1..67748629e398b7cc7bc8029f0d3b50985a227327 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/agent_privilege.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/agent_privilege.xml
@@ -31,21 +31,43 @@
             </value>
         </item>
         <item>
-            <key> <string>_owner</string> </key>
+            <key> <string>_tree</string> </key>
             <value>
-              <none/>
+              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string>_tree</string> </key>
+            <key> <string>acquisition_append_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_base_category</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>acquisition_copy_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_mask_value</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_object_id</string> </key>
+            <value>
+              <tuple/>
             </value>
         </item>
         <item>
             <key> <string>acquisition_portal_type</string> </key>
             <value> <string>python: []</string> </value>
         </item>
+        <item>
+            <key> <string>acquisition_sync_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
         <item>
             <key> <string>categories</string> </key>
             <value>
@@ -54,21 +76,105 @@
               </tuple>
             </value>
         </item>
+        <item>
+            <key> <string>category_type</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>criterion_property</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>fallback_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>agent_privilege</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>last_id</string> </key>
             <value> <string>2</string> </value>
         </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>portal_type</string> </key>
             <value> <string>Base Category</string> </value>
         </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>uid</string> </key>
@@ -76,6 +182,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/currency_exchange_type.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/currency_exchange_type.xml
index 48c7dd2d869c8c9cc23829c0c6458a2483ad1460..a0beeb65db52b681238289abdaa42286285c3c52 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/currency_exchange_type.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/currency_exchange_type.xml
@@ -31,21 +31,43 @@
             </value>
         </item>
         <item>
-            <key> <string>_owner</string> </key>
+            <key> <string>_tree</string> </key>
             <value>
-              <none/>
+              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string>_tree</string> </key>
+            <key> <string>acquisition_append_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_base_category</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>acquisition_copy_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_mask_value</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_object_id</string> </key>
+            <value>
+              <tuple/>
             </value>
         </item>
         <item>
             <key> <string>acquisition_portal_type</string> </key>
             <value> <string>python: []</string> </value>
         </item>
+        <item>
+            <key> <string>acquisition_sync_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
         <item>
             <key> <string>categories</string> </key>
             <value>
@@ -54,21 +76,105 @@
               </tuple>
             </value>
         </item>
+        <item>
+            <key> <string>category_type</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>criterion_property</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>fallback_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>currency_exchange_type</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>last_id</string> </key>
             <value> <string>1</string> </value>
         </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>portal_type</string> </key>
             <value> <string>Base Category</string> </value>
         </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>uid</string> </key>
@@ -76,6 +182,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/economical_class.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/economical_class.xml
index 1bb983addcf5bc925750f97309303ffd212aaafd..a7bac90e40daaac850d8075a410e8550310a4b8b 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/economical_class.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/economical_class.xml
@@ -31,21 +31,43 @@
             </value>
         </item>
         <item>
-            <key> <string>_owner</string> </key>
+            <key> <string>_tree</string> </key>
             <value>
-              <none/>
+              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string>_tree</string> </key>
+            <key> <string>acquisition_append_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_base_category</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>acquisition_copy_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_mask_value</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_object_id</string> </key>
+            <value>
+              <tuple/>
             </value>
         </item>
         <item>
             <key> <string>acquisition_portal_type</string> </key>
             <value> <string>python: []</string> </value>
         </item>
+        <item>
+            <key> <string>acquisition_sync_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
         <item>
             <key> <string>categories</string> </key>
             <value>
@@ -55,18 +77,100 @@
               </tuple>
             </value>
         </item>
+        <item>
+            <key> <string>category_type</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>criterion_property</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>fallback_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>economical_class</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>last_id</string> </key>
             <value> <string>1</string> </value>
         </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>portal_type</string> </key>
             <value> <string>Base Category</string> </value>
         </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string>Economical Class</string> </value>
@@ -77,6 +181,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/function.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/function.xml
index 4eab509f3795a8d5552adb65871ff4dbb25e7407..64e62c02697ee9aab57346390397e16efff6ef38 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/function.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/function.xml
@@ -4,7 +4,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5.Tool.Category</string>
+          <string>Products.ERP5Type.Document.BaseCategory</string>
           <string>BaseCategory</string>
         </tuple>
         <none/>
@@ -30,309 +30,6 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>_properties</string> </key>
-            <value>
-              <list>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Local ID of the object in its enclosing container</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Unique ID of the object in the ZSQLCatalog</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>uid</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>int</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>catalog_index</string> </key>
-                      <value>
-                        <tuple>
-                          <string>COUNT</string>
-                        </tuple>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>catalog_metadata</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>title</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>description</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>text</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if acquired value should be copied</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_copy_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the local value have priority</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_mask_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be appended</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_append_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be synced</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_sync_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_object_id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The default contained object id to look up</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_object_id_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>lines</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The base categories to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_portal_type</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The portal types to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_portal_type_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>multivalued</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tales</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>fallback_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>another base category to get if everything else fails</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>fallback_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-              </list>
-            </value>
-        </item>
         <item>
             <key> <string>_tree</string> </key>
             <value>
@@ -352,18 +49,6 @@
               </tuple>
             </value>
         </item>
-        <item>
-            <key> <string>acquisition_base_category_list</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-        <item>
-            <key> <string>acquisition_base_category_list_list</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
         <item>
             <key> <string>acquisition_copy_value</string> </key>
             <value> <int>0</int> </value>
@@ -383,76 +68,114 @@
             </value>
         </item>
         <item>
-            <key> <string>acquisition_object_id_list</string> </key>
+            <key> <string>acquisition_portal_type</string> </key>
+            <value> <string>python: list( portal.getPortalAcquisitionMovementTypeList() + portal.getPortalItemTypeList() + portal.getPortalDeliveryTypeList() + portal.getPortalOrderTypeList() + portal.getPortalInvoiceTypeList() ) + [\'Organisation\', \'Career\']</string> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_sync_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>categories</string> </key>
             <value>
-              <tuple>
-                <string>default_career</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>acquisition_object_id_list_list</string> </key>
+            <key> <string>category_type</string> </key>
             <value>
               <tuple>
-                <string>default_career</string>
+                <string>assignment</string>
               </tuple>
             </value>
         </item>
         <item>
-            <key> <string>acquisition_portal_type</string> </key>
-            <value> <string>python: list( portal.getPortalAcquisitionMovementTypeList() + portal.getPortalItemTypeList() + portal.getPortalDeliveryTypeList() + portal.getPortalOrderTypeList() + portal.getPortalInvoiceTypeList() ) + [\'Organisation\', \'Career\']</string> </value>
+            <key> <string>criterion_property</string> </key>
+            <value>
+              <tuple/>
+            </value>
         </item>
         <item>
-            <key> <string>acquisition_portal_type_list</string> </key>
-            <value> <string>python: (\'Career\',)</string> </value>
+            <key> <string>description</string> </key>
+            <value> <string>Function correspond to the task you do day by day.</string> </value>
         </item>
         <item>
-            <key> <string>acquisition_portal_type_list_list</string> </key>
-            <value> <string>python:(\'Career\',)</string> </value>
+            <key> <string>fallback_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
         </item>
         <item>
-            <key> <string>acquisition_sync_value</string> </key>
-            <value> <int>0</int> </value>
+            <key> <string>id</string> </key>
+            <value> <string>function</string> </value>
         </item>
         <item>
-            <key> <string>base_category</string> </key>
+            <key> <string>id_generator</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAE=</string> </persistent>
+              <none/>
             </value>
         </item>
         <item>
-            <key> <string>categories</string> </key>
+            <key> <string>id_group</string> </key>
             <value>
-              <tuple/>
+              <none/>
             </value>
         </item>
         <item>
-            <key> <string>category_type</string> </key>
+            <key> <string>last_id</string> </key>
+            <value> <string>1</string> </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
             <value>
-              <tuple>
-                <string>assignment</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>description</string> </key>
-            <value> <string>Function correspond to the task you do day by day.</string> </value>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
         </item>
         <item>
-            <key> <string>fallback_base_category_list</string> </key>
+            <key> <string>multimembership_criterion_base_category</string> </key>
             <value>
               <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>fallback_base_category_list_list</string> </key>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Base Category</string> </value>
+        </item>
+        <item>
+            <key> <string>read_permission</string> </key>
             <value>
-              <tuple/>
+              <none/>
             </value>
         </item>
         <item>
-            <key> <string>id</string> </key>
-            <value> <string>function</string> </value>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
         </item>
         <item>
             <key> <string>title</string> </key>
@@ -464,6 +187,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/gender.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/gender.xml
index b2fe53bd16db2727a37b5d120d5ec8c857a33f03..35c276f19011014a99d3f01494c60f6fbde85bc5 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/gender.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/gender.xml
@@ -4,7 +4,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5.Tool.Category</string>
+          <string>Products.ERP5Type.Document.BaseCategory</string>
           <string>BaseCategory</string>
         </tuple>
         <none/>
@@ -30,315 +30,6 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_properties</string> </key>
-            <value>
-              <list>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Local ID of the object in its enclosing container</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Unique ID of the object in the ZSQLCatalog</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>uid</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>int</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>catalog_index</string> </key>
-                      <value>
-                        <tuple>
-                          <string>COUNT</string>
-                        </tuple>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>catalog_metadata</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>title</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>description</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>text</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if acquired value should be copied</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_copy_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the local value have priority</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_mask_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be appended</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_append_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be synced</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_sync_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_object_id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The default contained object id to look up</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_object_id_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>lines</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The base categories to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_portal_type</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The portal types to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_portal_type_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>multivalued</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tales</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>fallback_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>another base category to get if everything else fails</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>fallback_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-              </list>
-            </value>
-        </item>
         <item>
             <key> <string>_tree</string> </key>
             <value>
@@ -378,23 +69,27 @@
             <value> <int>0</int> </value>
         </item>
         <item>
-            <key> <string>base_category</string> </key>
+            <key> <string>categories</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAE=</string> </persistent>
+              <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>categories</string> </key>
+            <key> <string>category_type</string> </key>
             <value>
               <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>description</string> </key>
+            <key> <string>criterion_property</string> </key>
             <value>
-              <none/>
+              <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
         <item>
             <key> <string>fallback_base_category</string> </key>
             <value>
@@ -405,10 +100,74 @@
             <key> <string>id</string> </key>
             <value> <string>gender</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>last_id</string> </key>
             <value> <string>1</string> </value>
         </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Base Category</string> </value>
+        </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value>
@@ -421,6 +180,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/grade.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/grade.xml
index a3dd18bcac03174f6b08f88128894ca006c61952..9575adce3b5bcc52784ed3534760be53b6ea0671 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/grade.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/grade.xml
@@ -4,7 +4,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5.Tool.Category</string>
+          <string>Products.ERP5Type.Document.BaseCategory</string>
           <string>BaseCategory</string>
         </tuple>
         <none/>
@@ -30,315 +30,6 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_properties</string> </key>
-            <value>
-              <list>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Local ID of the object in its enclosing container</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Unique ID of the object in the ZSQLCatalog</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>uid</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>int</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>catalog_index</string> </key>
-                      <value>
-                        <tuple>
-                          <string>COUNT</string>
-                        </tuple>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>catalog_metadata</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>title</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>description</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>text</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if acquired value should be copied</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_copy_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the local value have priority</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_mask_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be appended</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_append_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be synced</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_sync_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_object_id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The default contained object id to look up</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_object_id_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>lines</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The base categories to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_portal_type</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The portal types to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_portal_type_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>multivalued</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tales</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>fallback_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>another base category to get if everything else fails</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>fallback_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-              </list>
-            </value>
-        </item>
         <item>
             <key> <string>_tree</string> </key>
             <value>
@@ -350,7 +41,7 @@
             <value> <int>0</int> </value>
         </item>
         <item>
-            <key> <string>acquisition_base_category_list</string> </key>
+            <key> <string>acquisition_base_category</string> </key>
             <value>
               <tuple/>
             </value>
@@ -371,38 +62,114 @@
               </tuple>
             </value>
         </item>
-        <item>
-            <key> <string>acquisition_object_id_list</string> </key>
-            <value>
-              <tuple>
-<string></string>
-              </tuple>
-            </value>
-        </item>
         <item>
             <key> <string>acquisition_portal_type</string> </key>
             <value> <string>python: [\'Career\']</string> </value>
         </item>
         <item>
-            <key> <string>acquisition_portal_type_list</string> </key>
+            <key> <string>acquisition_sync_value</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>categories</string> </key>
             <value>
-              <tuple>
-<string></string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>acquisition_sync_value</string> </key>
-            <value> <int>1</int> </value>
+            <key> <string>category_type</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>criterion_property</string> </key>
+            <value>
+              <tuple/>
+            </value>
         </item>
         <item>
             <key> <string>description</string> </key>
             <value> <string>Grade is like a job classification on which the employee pay is determined. It\'s also similar to military grade.</string> </value>
         </item>
+        <item>
+            <key> <string>fallback_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>grade</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>last_id</string> </key>
+            <value> <string>1</string> </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Base Category</string> </value>
+        </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string>grade</string> </value>
@@ -413,6 +180,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/group.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/group.xml
index 530fe191008a88b2f0c258cc69a670caf819596b..d953593ffcf0ac6e6cd156545d55dcb1efe9ac18 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/group.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/group.xml
@@ -4,7 +4,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5.Tool.Category</string>
+          <string>Products.ERP5Type.Document.BaseCategory</string>
           <string>BaseCategory</string>
         </tuple>
         <none/>
@@ -30,309 +30,6 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>_properties</string> </key>
-            <value>
-              <list>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Local ID of the object in its enclosing container</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Unique ID of the object in the ZSQLCatalog</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>uid</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>int</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>catalog_index</string> </key>
-                      <value>
-                        <tuple>
-                          <string>COUNT</string>
-                        </tuple>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>catalog_metadata</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>title</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>description</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>text</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if acquired value should be copied</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_copy_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the local value have priority</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_mask_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be appended</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_append_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be synced</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_sync_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_object_id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The default contained object id to look up</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_object_id_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>lines</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The base categories to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_portal_type</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The portal types to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_portal_type_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>multivalued</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tales</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>fallback_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>another base category to get if everything else fails</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>fallback_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-              </list>
-            </value>
-        </item>
         <item>
             <key> <string>_tree</string> </key>
             <value>
@@ -373,12 +70,6 @@
             <key> <string>acquisition_sync_value</string> </key>
             <value> <int>0</int> </value>
         </item>
-        <item>
-            <key> <string>base_category</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAE=</string> </persistent>
-            </value>
-        </item>
         <item>
             <key> <string>categories</string> </key>
             <value>
@@ -393,6 +84,12 @@
               </tuple>
             </value>
         </item>
+        <item>
+            <key> <string>criterion_property</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>description</string> </key>
             <value> <string>Group define the corporate group and the business unit structure. Group is acquired through careers and subordination.</string> </value>
@@ -407,6 +104,74 @@
             <key> <string>id</string> </key>
             <value> <string>group</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>last_id</string> </key>
+            <value> <string>1</string> </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Base Category</string> </value>
+        </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string>Group</string> </value>
@@ -417,6 +182,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/insurance_coverage.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/insurance_coverage.xml
index 832e86f81b8bf88738a694e7d53fe61a4b01545b..d6813a2a80c78f0c50a1b357d1cf2e43fdbcc1e7 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/insurance_coverage.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/insurance_coverage.xml
@@ -31,21 +31,43 @@
             </value>
         </item>
         <item>
-            <key> <string>_owner</string> </key>
+            <key> <string>_tree</string> </key>
             <value>
-              <none/>
+              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string>_tree</string> </key>
+            <key> <string>acquisition_append_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_base_category</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>acquisition_copy_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_mask_value</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_object_id</string> </key>
+            <value>
+              <tuple/>
             </value>
         </item>
         <item>
             <key> <string>acquisition_portal_type</string> </key>
             <value> <string>python: []</string> </value>
         </item>
+        <item>
+            <key> <string>acquisition_sync_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
         <item>
             <key> <string>categories</string> </key>
             <value>
@@ -55,18 +77,100 @@
               </tuple>
             </value>
         </item>
+        <item>
+            <key> <string>category_type</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>criterion_property</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>description</string> </key>
             <value> <string>This base category defines the insurance coverage of a Person or Organisation. A Person can be covered by the insurance of another Person and/or and Insurance contract directly.</string> </value>
         </item>
+        <item>
+            <key> <string>fallback_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>insurance_coverage</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>last_id</string> </key>
+            <value> <string>1</string> </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>portal_type</string> </key>
             <value> <string>Base Category</string> </value>
         </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string>Insurance Coverage</string> </value>
@@ -77,6 +181,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/legal_parent.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/legal_parent.xml
index e0c43cd1b53827cea0f7b526ed3b1e30f72495d2..cea474114c2293af4efda118c03d61bdb2dcc311 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/legal_parent.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/legal_parent.xml
@@ -31,21 +31,43 @@
             </value>
         </item>
         <item>
-            <key> <string>_owner</string> </key>
+            <key> <string>_tree</string> </key>
             <value>
-              <none/>
+              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string>_tree</string> </key>
+            <key> <string>acquisition_append_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_base_category</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>acquisition_copy_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_mask_value</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_object_id</string> </key>
+            <value>
+              <tuple/>
             </value>
         </item>
         <item>
             <key> <string>acquisition_portal_type</string> </key>
             <value> <string>python: []</string> </value>
         </item>
+        <item>
+            <key> <string>acquisition_sync_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
         <item>
             <key> <string>categories</string> </key>
             <value>
@@ -54,18 +76,100 @@
               </tuple>
             </value>
         </item>
+        <item>
+            <key> <string>category_type</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>criterion_property</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>description</string> </key>
             <value> <string>This base category is used to define the legal parents (as opposed to blood relation) of a Person</string> </value>
         </item>
+        <item>
+            <key> <string>fallback_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>legal_parent</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>last_id</string> </key>
+            <value> <string>1</string> </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>portal_type</string> </key>
             <value> <string>Base Category</string> </value>
         </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string>Legal Parent</string> </value>
@@ -76,6 +180,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/marital_status.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/marital_status.xml
index 2dc592d0a51a113681b8f20b4c05d957d3f7fef4..4be5127308a27c1f42bd01cd2a890dc412ee4e4b 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/marital_status.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/marital_status.xml
@@ -31,21 +31,43 @@
             </value>
         </item>
         <item>
-            <key> <string>_owner</string> </key>
+            <key> <string>_tree</string> </key>
             <value>
-              <none/>
+              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string>_tree</string> </key>
+            <key> <string>acquisition_append_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_base_category</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>acquisition_copy_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_mask_value</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_object_id</string> </key>
+            <value>
+              <tuple/>
             </value>
         </item>
         <item>
             <key> <string>acquisition_portal_type</string> </key>
             <value> <string>python: []</string> </value>
         </item>
+        <item>
+            <key> <string>acquisition_sync_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
         <item>
             <key> <string>categories</string> </key>
             <value>
@@ -54,24 +76,100 @@
               </tuple>
             </value>
         </item>
+        <item>
+            <key> <string>category_type</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>criterion_property</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>fallback_base_category</string> </key>
             <value>
-              <none/>
+              <tuple/>
             </value>
         </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>marital_status</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>last_id</string> </key>
             <value> <string>1</string> </value>
         </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>portal_type</string> </key>
             <value> <string>Base Category</string> </value>
         </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value>
@@ -84,6 +182,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/market_segment.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/market_segment.xml
index 7ea9ec93e5def95535662cf3e89ab744b5cc82b1..7f91c81a1334d647d1a46452c6ae31be5c0f6bd9 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/market_segment.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/market_segment.xml
@@ -4,7 +4,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5.Tool.Category</string>
+          <string>Products.ERP5Type.Document.BaseCategory</string>
           <string>BaseCategory</string>
         </tuple>
         <none/>
@@ -30,309 +30,6 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>_properties</string> </key>
-            <value>
-              <list>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Local ID of the object in its enclosing container</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Unique ID of the object in the ZSQLCatalog</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>uid</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>int</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>catalog_index</string> </key>
-                      <value>
-                        <tuple>
-                          <string>COUNT</string>
-                        </tuple>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>catalog_metadata</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>title</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>description</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>text</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if acquired value should be copied</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_copy_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the local value have priority</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_mask_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be appended</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_append_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be synced</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_sync_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_object_id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The default contained object id to look up</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_object_id_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>lines</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The base categories to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_portal_type</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The portal types to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_portal_type_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>multivalued</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tales</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>fallback_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>another base category to get if everything else fails</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>fallback_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-              </list>
-            </value>
-        </item>
         <item>
             <key> <string>_tree</string> </key>
             <value>
@@ -372,13 +69,19 @@
             <value> <int>0</int> </value>
         </item>
         <item>
-            <key> <string>base_category</string> </key>
+            <key> <string>categories</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAE=</string> </persistent>
+              <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>categories</string> </key>
+            <key> <string>category_type</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>criterion_property</string> </key>
             <value>
               <tuple/>
             </value>
@@ -397,9 +100,79 @@
             <key> <string>id</string> </key>
             <value> <string>market_segment</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>last_id</string> </key>
+            <value> <string>1</string> </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Base Category</string> </value>
+        </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>uid</string> </key>
@@ -407,6 +180,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/nationality.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/nationality.xml
index 04301a72e153b3fed10c36cb178ac15b770f4cb4..d2ed17afdb330929f45ae6267d37b4cc31d71320 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/nationality.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/nationality.xml
@@ -4,7 +4,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5.Tool.Category</string>
+          <string>Products.ERP5Type.Document.BaseCategory</string>
           <string>BaseCategory</string>
         </tuple>
         <none/>
@@ -30,315 +30,6 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_properties</string> </key>
-            <value>
-              <list>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Local ID of the object in its enclosing container</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Unique ID of the object in the ZSQLCatalog</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>uid</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>int</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>catalog_index</string> </key>
-                      <value>
-                        <tuple>
-                          <string>COUNT</string>
-                        </tuple>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>catalog_metadata</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>title</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>description</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>text</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if acquired value should be copied</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_copy_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the local value have priority</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_mask_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be appended</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_append_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be synced</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_sync_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_object_id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The default contained object id to look up</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_object_id_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>lines</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The base categories to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_portal_type</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The portal types to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_portal_type_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>multivalued</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tales</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>fallback_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>another base category to get if everything else fails</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>fallback_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-              </list>
-            </value>
-        </item>
         <item>
             <key> <string>_tree</string> </key>
             <value>
@@ -378,13 +69,19 @@
             <value> <int>0</int> </value>
         </item>
         <item>
-            <key> <string>base_category</string> </key>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>category_type</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAE=</string> </persistent>
+              <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>categories</string> </key>
+            <key> <string>criterion_property</string> </key>
             <value>
               <tuple/>
             </value>
@@ -403,9 +100,79 @@
             <key> <string>id</string> </key>
             <value> <string>nationality</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>last_id</string> </key>
+            <value> <string>1</string> </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Base Category</string> </value>
+        </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>uid</string> </key>
@@ -413,6 +180,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/natural_parent.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/natural_parent.xml
index 0fb0ff97262a6de2aa78fc69d8a65f20c69f2f93..b100fb6c3e421267f7de02e46cdf1ba5dad487bf 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/natural_parent.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/natural_parent.xml
@@ -31,21 +31,43 @@
             </value>
         </item>
         <item>
-            <key> <string>_owner</string> </key>
+            <key> <string>_tree</string> </key>
             <value>
-              <none/>
+              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string>_tree</string> </key>
+            <key> <string>acquisition_append_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_base_category</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>acquisition_copy_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_mask_value</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_object_id</string> </key>
+            <value>
+              <tuple/>
             </value>
         </item>
         <item>
             <key> <string>acquisition_portal_type</string> </key>
             <value> <string>python: []</string> </value>
         </item>
+        <item>
+            <key> <string>acquisition_sync_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
         <item>
             <key> <string>categories</string> </key>
             <value>
@@ -54,18 +76,100 @@
               </tuple>
             </value>
         </item>
+        <item>
+            <key> <string>category_type</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>criterion_property</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>description</string> </key>
             <value> <string>This base category is used to define the blood relation between one person and another</string> </value>
         </item>
+        <item>
+            <key> <string>fallback_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>natural_parent</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>last_id</string> </key>
+            <value> <string>1</string> </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>portal_type</string> </key>
             <value> <string>Base Category</string> </value>
         </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string>Natural Parent</string> </value>
@@ -76,6 +180,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/price_currency.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/price_currency.xml
index 33b8064b204056c56e43ce1db32ffa2e64280d91..1c1905e189c5bc4903aa7967ac46ab87d55ce23c 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/price_currency.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/price_currency.xml
@@ -30,18 +30,16 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>_tree</string> </key>
             <value>
               <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
             </value>
         </item>
+        <item>
+            <key> <string>acquisition_append_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
         <item>
             <key> <string>acquisition_base_category</string> </key>
             <value>
@@ -50,10 +48,28 @@
               </tuple>
             </value>
         </item>
+        <item>
+            <key> <string>acquisition_copy_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_mask_value</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_object_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>acquisition_portal_type</string> </key>
             <value> <string>python: list( portal.getPortalAcquisitionMovementTypeList() + portal.getPortalItemTypeList() + portal.getPortalDeliveryTypeList() + portal.getPortalOrderTypeList() + portal.getPortalInvoiceTypeList() + portal.getPortalSupplyTypeList() + portal.getPortalSupplyPathTypeList() + (\'Currency\', ))</string> </value>
         </item>
+        <item>
+            <key> <string>acquisition_sync_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
         <item>
             <key> <string>categories</string> </key>
             <value>
@@ -62,20 +78,100 @@
               </tuple>
             </value>
         </item>
+        <item>
+            <key> <string>category_type</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>criterion_property</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>fallback_base_category</string> </key>
             <value>
-              <none/>
+              <tuple/>
             </value>
         </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>price_currency</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>last_id</string> </key>
+            <value> <string>1</string> </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>portal_type</string> </key>
             <value> <string>Base Category</string> </value>
         </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string>price_currency</string> </value>
@@ -86,6 +182,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/region.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/region.xml
index 5aa3c03262bb6c6133852dae07f81c21ebe9de9c..9c217a27dcabe53892705cbbbfcc984546df0b79 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/region.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/region.xml
@@ -4,7 +4,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5.Tool.Category</string>
+          <string>Products.ERP5Type.Document.BaseCategory</string>
           <string>BaseCategory</string>
         </tuple>
         <none/>
@@ -30,315 +30,6 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_properties</string> </key>
-            <value>
-              <list>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Local ID of the object in its enclosing container</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Unique ID of the object in the ZSQLCatalog</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>uid</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>int</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>catalog_index</string> </key>
-                      <value>
-                        <tuple>
-                          <string>COUNT</string>
-                        </tuple>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>catalog_metadata</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>title</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>description</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>text</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if acquired value should be copied</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_copy_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the local value have priority</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_mask_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be appended</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_append_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be synced</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_sync_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_object_id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The default contained object id to look up</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_object_id_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>lines</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The base categories to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_portal_type</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The portal types to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_portal_type_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>multivalued</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tales</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>fallback_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>another base category to get if everything else fails</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>fallback_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-              </list>
-            </value>
-        </item>
         <item>
             <key> <string>_tree</string> </key>
             <value>
@@ -357,14 +48,6 @@
               </tuple>
             </value>
         </item>
-        <item>
-            <key> <string>acquisition_base_category_list</string> </key>
-            <value>
-              <tuple>
-                <string>subordination</string>
-              </tuple>
-            </value>
-        </item>
         <item>
             <key> <string>acquisition_copy_value</string> </key>
             <value> <int>0</int> </value>
@@ -381,60 +64,114 @@
               </tuple>
             </value>
         </item>
-        <item>
-            <key> <string>acquisition_object_id_list</string> </key>
-            <value>
-              <tuple>
-                <string>default_address</string>
-                <string>default_career</string>
-              </tuple>
-            </value>
-        </item>
         <item>
             <key> <string>acquisition_portal_type</string> </key>
             <value> <string>python: [\'Address\', \'Organisation\', \'Person\']</string> </value>
         </item>
-        <item>
-            <key> <string>acquisition_portal_type_list</string> </key>
-            <value>
-              <tuple>
-                <string>Organisation</string>
-                <string>Career</string>
-                <string>Person</string>
-                <string>Address</string>
-              </tuple>
-            </value>
-        </item>
         <item>
             <key> <string>acquisition_sync_value</string> </key>
             <value> <int>0</int> </value>
         </item>
         <item>
-            <key> <string>base_category</string> </key>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>category_type</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAE=</string> </persistent>
+              <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>categories</string> </key>
+            <key> <string>criterion_property</string> </key>
             <value>
               <tuple/>
             </value>
         </item>
         <item>
             <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>fallback_base_category</string> </key>
             <value>
-              <none/>
+              <tuple/>
             </value>
         </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>region</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>last_id</string> </key>
             <value> <string>1</string> </value>
         </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Base Category</string> </value>
+        </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string>Region</string> </value>
@@ -445,6 +182,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/role.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/role.xml
index 1d93eecf8e0e934165aafbfbd0c918d987077b32..28222e7439f9625344d91d328ba0e8049ac8ed39 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/role.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/role.xml
@@ -4,7 +4,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5.Tool.Category</string>
+          <string>Products.ERP5Type.Document.BaseCategory</string>
           <string>BaseCategory</string>
         </tuple>
         <none/>
@@ -30,309 +30,6 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>_properties</string> </key>
-            <value>
-              <list>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Local ID of the object in its enclosing container</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Unique ID of the object in the ZSQLCatalog</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>uid</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>int</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>catalog_index</string> </key>
-                      <value>
-                        <tuple>
-                          <string>COUNT</string>
-                        </tuple>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>catalog_metadata</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>title</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>description</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>text</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if acquired value should be copied</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_copy_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the local value have priority</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_mask_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be appended</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_append_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be synced</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_sync_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_object_id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The default contained object id to look up</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_object_id_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>lines</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The base categories to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_portal_type</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The portal types to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_portal_type_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>multivalued</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tales</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>fallback_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>another base category to get if everything else fails</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>fallback_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-              </list>
-            </value>
-        </item>
         <item>
             <key> <string>_tree</string> </key>
             <value>
@@ -345,22 +42,6 @@
         </item>
         <item>
             <key> <string>acquisition_base_category</string> </key>
-            <value>
-              <list>
-                <string>subordination</string>
-              </list>
-            </value>
-        </item>
-        <item>
-            <key> <string>acquisition_base_category_list</string> </key>
-            <value>
-              <tuple>
-                <string>subordination</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>acquisition_base_category_list_list</string> </key>
             <value>
               <tuple>
                 <string>subordination</string>
@@ -384,70 +65,112 @@
             </value>
         </item>
         <item>
-            <key> <string>acquisition_object_id_list</string> </key>
+            <key> <string>acquisition_portal_type</string> </key>
+            <value> <string>python: [\'Career\', \'Organisation\']</string> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_sync_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>categories</string> </key>
             <value>
-              <tuple>
-                <string>default_career</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>acquisition_object_id_list_list</string> </key>
+            <key> <string>category_type</string> </key>
             <value>
-              <tuple>
-                <string>default_career</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>acquisition_portal_type</string> </key>
-            <value> <string>python: [\'Career\', \'Organisation\']</string> </value>
+            <key> <string>criterion_property</string> </key>
+            <value>
+              <tuple/>
+            </value>
         </item>
         <item>
-            <key> <string>acquisition_portal_type_list</string> </key>
-            <value> <string>python: (\'Organisation\', \'Career\')</string> </value>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
         </item>
         <item>
-            <key> <string>acquisition_portal_type_list_list</string> </key>
-            <value> <string>(\'Organisation\', \'Career\')</string> </value>
+            <key> <string>fallback_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
         </item>
         <item>
-            <key> <string>acquisition_sync_value</string> </key>
-            <value> <int>0</int> </value>
+            <key> <string>id</string> </key>
+            <value> <string>role</string> </value>
         </item>
         <item>
-            <key> <string>base_category</string> </key>
+            <key> <string>id_generator</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAE=</string> </persistent>
+              <none/>
             </value>
         </item>
         <item>
-            <key> <string>categories</string> </key>
+            <key> <string>id_group</string> </key>
             <value>
-              <tuple/>
+              <none/>
             </value>
         </item>
         <item>
-            <key> <string>description</string> </key>
+            <key> <string>last_id</string> </key>
+            <value> <string>1</string> </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
             <value>
-              <none/>
+              <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>fallback_base_category_list</string> </key>
+            <key> <string>membership_criterion_category</string> </key>
             <value>
               <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>fallback_base_category_list_list</string> </key>
+            <key> <string>multimembership_criterion_base_category</string> </key>
             <value>
               <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>id</string> </key>
-            <value> <string>role</string> </value>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Base Category</string> </value>
+        </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
         </item>
         <item>
             <key> <string>title</string> </key>
@@ -459,6 +182,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/salary_level.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/salary_level.xml
index 759e2f569caeb60ba9e5110fecb6b3207dfeea52..bdfd640bad98a50130df9341425a59dee9338b6f 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/salary_level.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/salary_level.xml
@@ -31,17 +31,29 @@
             </value>
         </item>
         <item>
-            <key> <string>_owner</string> </key>
+            <key> <string>_tree</string> </key>
             <value>
-              <none/>
+              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string>_tree</string> </key>
+            <key> <string>acquisition_append_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_base_category</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+              <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>acquisition_copy_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_mask_value</string> </key>
+            <value> <int>1</int> </value>
+        </item>
         <item>
             <key> <string>acquisition_object_id</string> </key>
             <value>
@@ -54,6 +66,10 @@
             <key> <string>acquisition_portal_type</string> </key>
             <value> <string>python: [\'Career\']</string> </value>
         </item>
+        <item>
+            <key> <string>acquisition_sync_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
         <item>
             <key> <string>categories</string> </key>
             <value>
@@ -62,24 +78,100 @@
               </tuple>
             </value>
         </item>
+        <item>
+            <key> <string>category_type</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>criterion_property</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>fallback_base_category</string> </key>
             <value>
-              <none/>
+              <tuple/>
             </value>
         </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>salary_level</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>last_id</string> </key>
             <value> <string>2</string> </value>
         </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>portal_type</string> </key>
             <value> <string>Base Category</string> </value>
         </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value> <string>Salary level</string> </value>
@@ -90,6 +182,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/site.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/site.xml
index 4bfc49b7d5edbef8deba8dd5f54f9b3263de1fcc..a943afadfefb79a452397c1d7aa39be967e8f018 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/site.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/site.xml
@@ -31,21 +31,43 @@
             </value>
         </item>
         <item>
-            <key> <string>_owner</string> </key>
+            <key> <string>_tree</string> </key>
             <value>
-              <none/>
+              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string>_tree</string> </key>
+            <key> <string>acquisition_append_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_base_category</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>acquisition_copy_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_mask_value</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_object_id</string> </key>
+            <value>
+              <tuple/>
             </value>
         </item>
         <item>
             <key> <string>acquisition_portal_type</string> </key>
             <value> <string>python: []</string> </value>
         </item>
+        <item>
+            <key> <string>acquisition_sync_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
         <item>
             <key> <string>categories</string> </key>
             <value>
@@ -62,24 +84,94 @@
               </tuple>
             </value>
         </item>
+        <item>
+            <key> <string>criterion_property</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>fallback_base_category</string> </key>
             <value>
-              <none/>
+              <tuple/>
             </value>
         </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>site</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>last_id</string> </key>
             <value> <string>2</string> </value>
         </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>portal_type</string> </key>
             <value> <string>Base Category</string> </value>
         </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value>
@@ -92,6 +184,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/skill.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/skill.xml
index 4baf0a82b583be84ec4114339afb52d5fcfe73b8..e9e44cc2828523669e15477cb563f8528004efb6 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/skill.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/skill.xml
@@ -4,7 +4,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5.Tool.Category</string>
+          <string>Products.ERP5Type.Document.BaseCategory</string>
           <string>BaseCategory</string>
         </tuple>
         <none/>
@@ -30,309 +30,6 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>_properties</string> </key>
-            <value>
-              <list>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Local ID of the object in its enclosing container</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Unique ID of the object in the ZSQLCatalog</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>uid</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>int</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>catalog_index</string> </key>
-                      <value>
-                        <tuple>
-                          <string>COUNT</string>
-                        </tuple>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>catalog_metadata</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>title</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>description</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>text</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if acquired value should be copied</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_copy_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the local value have priority</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_mask_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be appended</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_append_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be synced</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_sync_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_object_id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The default contained object id to look up</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_object_id_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>lines</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The base categories to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_portal_type</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The portal types to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_portal_type_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>multivalued</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tales</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>fallback_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>another base category to get if everything else fails</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>fallback_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-              </list>
-            </value>
-        </item>
         <item>
             <key> <string>_tree</string> </key>
             <value>
@@ -351,18 +48,6 @@
               </tuple>
             </value>
         </item>
-        <item>
-            <key> <string>acquisition_base_category_list</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-        <item>
-            <key> <string>acquisition_base_category_list_list</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
         <item>
             <key> <string>acquisition_copy_value</string> </key>
             <value> <int>0</int> </value>
@@ -380,68 +65,112 @@
             </value>
         </item>
         <item>
-            <key> <string>acquisition_object_id_list</string> </key>
+            <key> <string>acquisition_portal_type</string> </key>
+            <value> <string>python: [\'Organisation\', \'Career\']</string> </value>
+        </item>
+        <item>
+            <key> <string>acquisition_sync_value</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>categories</string> </key>
             <value>
-              <tuple>
-                <string>default_career</string>
-              </tuple>
+              <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>acquisition_object_id_list_list</string> </key>
+            <key> <string>category_type</string> </key>
             <value>
               <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>acquisition_portal_type</string> </key>
-            <value> <string>python: [\'Organisation\', \'Career\']</string> </value>
+            <key> <string>criterion_property</string> </key>
+            <value>
+              <tuple/>
+            </value>
         </item>
         <item>
-            <key> <string>acquisition_portal_type_list</string> </key>
-            <value> <string>python: (\'Career\',)</string> </value>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
         </item>
         <item>
-            <key> <string>acquisition_portal_type_list_list</string> </key>
-            <value> <string>[]</string> </value>
+            <key> <string>fallback_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
         </item>
         <item>
-            <key> <string>acquisition_sync_value</string> </key>
-            <value> <int>0</int> </value>
+            <key> <string>id</string> </key>
+            <value> <string>skill</string> </value>
         </item>
         <item>
-            <key> <string>base_category</string> </key>
+            <key> <string>id_generator</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAE=</string> </persistent>
+              <none/>
             </value>
         </item>
         <item>
-            <key> <string>categories</string> </key>
+            <key> <string>id_group</string> </key>
             <value>
-              <tuple/>
+              <none/>
             </value>
         </item>
         <item>
-            <key> <string>description</string> </key>
+            <key> <string>last_id</string> </key>
+            <value> <string>1</string> </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
             <value>
-              <none/>
+              <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>fallback_base_category_list</string> </key>
+            <key> <string>membership_criterion_category</string> </key>
             <value>
               <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>fallback_base_category_list_list</string> </key>
+            <key> <string>multimembership_criterion_base_category</string> </key>
             <value>
               <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>id</string> </key>
-            <value> <string>skill</string> </value>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Base Category</string> </value>
+        </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
         </item>
         <item>
             <key> <string>title</string> </key>
@@ -453,6 +182,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/social_form.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/social_form.xml
index 85dcafdefc5cb7ff5dfe71cd0450477f2df95c47..daad361b5d10140bc91063fa1252e7b9c929067d 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/social_form.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/social_form.xml
@@ -4,7 +4,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5.Tool.Category</string>
+          <string>Products.ERP5Type.Document.BaseCategory</string>
           <string>BaseCategory</string>
         </tuple>
         <none/>
@@ -30,309 +30,6 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>_properties</string> </key>
-            <value>
-              <list>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Local ID of the object in its enclosing container</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Unique ID of the object in the ZSQLCatalog</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>uid</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>int</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>catalog_index</string> </key>
-                      <value>
-                        <tuple>
-                          <string>COUNT</string>
-                        </tuple>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>catalog_metadata</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>title</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>description</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>text</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if acquired value should be copied</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_copy_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the local value have priority</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_mask_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be appended</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_append_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be synced</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_sync_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_object_id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The default contained object id to look up</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_object_id_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>lines</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The base categories to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_portal_type</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The portal types to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_portal_type_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>multivalued</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tales</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>fallback_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>another base category to get if everything else fails</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>fallback_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-              </list>
-            </value>
-        </item>
         <item>
             <key> <string>_tree</string> </key>
             <value>
@@ -372,13 +69,19 @@
             <value> <int>0</int> </value>
         </item>
         <item>
-            <key> <string>base_category</string> </key>
+            <key> <string>categories</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAE=</string> </persistent>
+              <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>categories</string> </key>
+            <key> <string>category_type</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>criterion_property</string> </key>
             <value>
               <tuple/>
             </value>
@@ -397,9 +100,79 @@
             <key> <string>id</string> </key>
             <value> <string>social_form</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>last_id</string> </key>
+            <value> <string>1</string> </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Base Category</string> </value>
+        </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>uid</string> </key>
@@ -407,6 +180,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/specialise.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/specialise.xml
index 5d9a77979159e7cb7b588e10404b251bf1867e58..d16b5ce0e77903f7825dc8230ea89dc105e886e5 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/specialise.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/specialise.xml
@@ -4,7 +4,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5.Tool.Category</string>
+          <string>Products.ERP5Type.Document.BaseCategory</string>
           <string>BaseCategory</string>
         </tuple>
         <none/>
@@ -30,315 +30,6 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_properties</string> </key>
-            <value>
-              <list>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Local ID of the object in its enclosing container</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Unique ID of the object in the ZSQLCatalog</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>uid</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>int</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>catalog_index</string> </key>
-                      <value>
-                        <tuple>
-                          <string>COUNT</string>
-                        </tuple>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>catalog_metadata</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>title</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>description</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>text</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if acquired value should be copied</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_copy_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the local value have priority</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_mask_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be appended</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_append_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be synced</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_sync_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_object_id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The default contained object id to look up</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_object_id_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>lines</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The base categories to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_portal_type</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The portal types to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_portal_type_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>multivalued</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tales</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>fallback_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>another base category to get if everything else fails</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>fallback_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-              </list>
-            </value>
-        </item>
         <item>
             <key> <string>_tree</string> </key>
             <value>
@@ -377,6 +68,24 @@
             <key> <string>acquisition_sync_value</string> </key>
             <value> <int>0</int> </value>
         </item>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>category_type</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>criterion_property</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>description</string> </key>
             <value> <string></string> </value>
@@ -391,9 +100,79 @@
             <key> <string>id</string> </key>
             <value> <string>specialise</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>last_id</string> </key>
+            <value> <string>1</string> </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Base Category</string> </value>
+        </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>uid</string> </key>
@@ -401,6 +180,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_base/CategoryTemplateItem/portal_categories/subordination.xml b/bt5/erp5_base/CategoryTemplateItem/portal_categories/subordination.xml
index 214b786a4ab6425c33e6271c0a7e191827dcb708..4976e7cacc3c0be44f55bdd9884cf78a0c0b59c5 100644
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/subordination.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/subordination.xml
@@ -4,7 +4,7 @@
     <pickle>
       <tuple>
         <tuple>
-          <string>Products.ERP5.Tool.Category</string>
+          <string>Products.ERP5Type.Document.BaseCategory</string>
           <string>BaseCategory</string>
         </tuple>
         <none/>
@@ -30,309 +30,6 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
-        <item>
-            <key> <string>_properties</string> </key>
-            <value>
-              <list>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Local ID of the object in its enclosing container</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Unique ID of the object in the ZSQLCatalog</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>uid</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>int</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>catalog_index</string> </key>
-                      <value>
-                        <tuple>
-                          <string>COUNT</string>
-                        </tuple>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>catalog_metadata</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>title</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>string</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string></string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>description</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>text</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if acquired value should be copied</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_copy_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the local value have priority</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_mask_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be appended</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_append_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value> <int>0</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>Determines if the acquired value should be synced</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_sync_value</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>boolean</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_object_id</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The default contained object id to look up</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_object_id_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>lines</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The base categories to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>acquisition_portal_type</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>The portal types to browse</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>acquisition_portal_type_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>multivalued</string> </key>
-                      <value> <int>1</int> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tales</string> </value>
-                  </item>
-                </dictionary>
-                <dictionary>
-                  <item>
-                      <key> <string>base_id</string> </key>
-                      <value> <string>fallback_base_category</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>default</string> </key>
-                      <value>
-                        <list/>
-                      </value>
-                  </item>
-                  <item>
-                      <key> <string>description</string> </key>
-                      <value> <string>another base category to get if everything else fails</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>id</string> </key>
-                      <value> <string>fallback_base_category_list</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>mode</string> </key>
-                      <value> <string>w</string> </value>
-                  </item>
-                  <item>
-                      <key> <string>type</string> </key>
-                      <value> <string>tokens</string> </value>
-                  </item>
-                </dictionary>
-              </list>
-            </value>
-        </item>
         <item>
             <key> <string>_tree</string> </key>
             <value>
@@ -343,6 +40,12 @@
             <key> <string>acquisition_append_value</string> </key>
             <value> <int>0</int> </value>
         </item>
+        <item>
+            <key> <string>acquisition_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>acquisition_copy_value</string> </key>
             <value> <int>0</int> </value>
@@ -368,27 +71,105 @@
             <value> <int>1</int> </value>
         </item>
         <item>
-            <key> <string>base_category</string> </key>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>category_type</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAE=</string> </persistent>
+              <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>categories</string> </key>
+            <key> <string>criterion_property</string> </key>
             <value>
               <tuple/>
             </value>
         </item>
         <item>
             <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>fallback_base_category</string> </key>
             <value>
-              <none/>
+              <tuple/>
             </value>
         </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>subordination</string> </value>
         </item>
+        <item>
+            <key> <string>id_generator</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id_group</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>last_id</string> </key>
+            <value> <string>1</string> </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>membership_criterion_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>multimembership_criterion_base_category</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Base Category</string> </value>
+        </item>
+        <item>
+            <key> <string>read_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>rid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>short_title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>test_method_id</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>title</string> </key>
             <value>
@@ -401,6 +182,12 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
       </dictionary>
     </pickle>
   </record>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchange_getExchangeRateList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchange_getExchangeRateList.xml
index 992b56d2724e8d60cf923f0cd828928eab070663..ed26c2510eb872eae0920fb9c2e786037f20bb9a 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchange_getExchangeRateList.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/CurrencyExchange_getExchangeRateList.xml
@@ -94,23 +94,33 @@ if to_currency is not None:\n
       start_date = DateTime()\n
     from Products.ERP5Type.Document import newTempBase\n
     temp_object = newTempBase(context.getPortalObject(),\'temp_object\')\n
-    temp_kw = {\'category_list\':[\'resource/%s\' % to_currency,\n
+    temp_kw = {\'category_list\':[\'resource/%s\' % from_currency,\n
                                 \'currency_exchange_type/%s\' % currency_exchange_type,\n
-                                \'price_currency/%s\' % from_currency],\n
+                                \'price_currency/%s\' % to_currency],\n
                \'start_date\':DateTime()\n
               }\n
-    context.log(\'Exchange Value temp_kw\',temp_kw)\n
     temp_object.edit(**temp_kw)\n
     object = temp_object\n
     mapped_value = context.portal_domains.generateMappedValue(object, \n
                                                       has_cell_content=0, \n
                                                       sort_method=sort_by_date)\n
+    predicate_list = context.portal_domains.searchPredicateList(object,\n
+        has_cell_content=0,\n
+        sort_method=sort_by_date)\n
+    context.log(\'predicate_list with test\',predicate_list)\n
+    context.log(\'temp_object.showDict\',temp_object.showDict())\n
+    predicate_list = context.portal_domains.searchPredicateList(object,\n
+        has_cell_content=0,\n
+        sort_method=sort_by_date,\n
+        test=0)\n
+    context.log(\'predicate_list without test\',predicate_list)\n
+    context.log\n
     result = [getattr(mapped_value, \'base_price\', None), \n
               getattr(mapped_value, \'discount\', None)]\n
     return result\n
   # The cache duration must not be too long, 300 is the maximum\n
   calculateExchangeFromParameters = CachingMethod(calculateExchangeFromParameters, \n
-                      id = \'calculateExchangeFromParameters\', cache_duration = 300)\n
+                      id = \'calculateExchangeFromParameterss\', cache_duration = 0)\n
   result = calculateExchangeFromParameters(start_date=start_date,\n
                        currency_exchange_type=currency_exchange_type,\n
                        from_currency=from_currency,to_currency=to_currency)\n
@@ -120,6 +130,7 @@ else:\n
                                                    sort_method=sort_by_date)\n
   result = [getattr(mapped_value, \'base_price\', None), \n
             getattr(mapped_value, \'discount\', None)]\n
+context.log(\'CurrencyExchange_getExchangeRateList,result:\',result)\n
 return result\n