From 74639f371d281e0c4a4933ccbdc5f648286c1af1 Mon Sep 17 00:00:00 2001
From: Nicolas Delaby <nicolas@nexedi.com>
Date: Fri, 10 Sep 2010 12:13:07 +0000
Subject: [PATCH] 2010-09-10 nicolas delaby * Declare new mimetype text/csv *
 Accept text/csv as input mimetype for csv_to_text portal_transform chain.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@38265 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../ToolTemplateItem/mimetypes_registry.xml   | 3359 ++++-------------
 .../ToolTemplateItem/portal_transforms.xml    | 1480 ++++----
 .../ERP5/bootstrap/erp5_core/bt/change_log    |    4 +
 product/ERP5/bootstrap/erp5_core/bt/revision  |    2 +-
 4 files changed, 1458 insertions(+), 3387 deletions(-)

diff --git a/product/ERP5/bootstrap/erp5_core/ToolTemplateItem/mimetypes_registry.xml b/product/ERP5/bootstrap/erp5_core/ToolTemplateItem/mimetypes_registry.xml
index bbf8748d81..c7a7343a9a 100644
--- a/product/ERP5/bootstrap/erp5_core/ToolTemplateItem/mimetypes_registry.xml
+++ b/product/ERP5/bootstrap/erp5_core/ToolTemplateItem/mimetypes_registry.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="MimeTypesRegistry" module="Products.MimetypesRegistry.MimeTypesRegistry"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypesRegistry" module="Products.MimetypesRegistry.MimeTypesRegistry"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -143,10 +140,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -234,10 +228,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -2996,10 +2987,7 @@
   </record>
   <record id="5" aka="AAAAAAAAAAU=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -4845,10 +4833,7 @@
   </record>
   <record id="6" aka="AAAAAAAAAAY=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -5086,10 +5071,7 @@
   </record>
   <record id="7" aka="AAAAAAAAAAc=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -5423,10 +5405,7 @@
   </record>
   <record id="8" aka="AAAAAAAAAAg=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -5832,10 +5811,7 @@
   </record>
   <record id="9" aka="AAAAAAAAAAk=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -5893,10 +5869,7 @@
   </record>
   <record id="10" aka="AAAAAAAAAAo=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -5954,10 +5927,7 @@
   </record>
   <record id="11" aka="AAAAAAAAAAs=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -5991,10 +5961,7 @@
   </record>
   <record id="12" aka="AAAAAAAAAAw=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -6064,10 +6031,7 @@
   </record>
   <record id="13" aka="AAAAAAAAAA0=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -6084,7 +6048,7 @@
                 <item>
                     <key> <string>comma-separated-values</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAEQ=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAjg=</string> </persistent>
                     </value>
                 </item>
                 <item>
@@ -6093,6 +6057,12 @@
                       <persistent> <string encoding="base64">AAAAAAAAAEM=</string> </persistent>
                     </value>
                 </item>
+                <item>
+                    <key> <string>csv</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAEQ=</string> </persistent>
+                    </value>
+                </item>
                 <item>
                     <key> <string>directory</string> </key>
                     <value>
@@ -6102,7 +6072,7 @@
                 <item>
                     <key> <string>enriched</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAjg=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAjk=</string> </persistent>
                     </value>
                 </item>
                 <item>
@@ -6120,7 +6090,7 @@
                 <item>
                     <key> <string>htmlh</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAjk=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAjo=</string> </persistent>
                     </value>
                 </item>
                 <item>
@@ -6144,7 +6114,7 @@
                 <item>
                     <key> <string>plain-pre</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAjo=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAjs=</string> </persistent>
                     </value>
                 </item>
                 <item>
@@ -6156,7 +6126,7 @@
                 <item>
                     <key> <string>rdf</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAjs=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAjw=</string> </persistent>
                     </value>
                 </item>
                 <item>
@@ -6168,7 +6138,7 @@
                 <item>
                     <key> <string>rfc822-headers</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAjw=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAj0=</string> </persistent>
                     </value>
                 </item>
                 <item>
@@ -6180,7 +6150,7 @@
                 <item>
                     <key> <string>rss</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAj0=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAj4=</string> </persistent>
                     </value>
                 </item>
                 <item>
@@ -6192,13 +6162,13 @@
                 <item>
                     <key> <string>sgml</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAj4=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAj8=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>spreadsheet</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAj8=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAkA=</string> </persistent>
                     </value>
                 </item>
                 <item>
@@ -6240,19 +6210,19 @@
                 <item>
                     <key> <string>wiki</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAkA=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAkE=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>x-adasrc</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAkE=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAkI=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>x-authors</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAkI=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAkM=</string> </persistent>
                     </value>
                 </item>
                 <item>
@@ -6282,19 +6252,19 @@
                 <item>
                     <key> <string>x-comma-separated-values</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAkM=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAkQ=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>x-copying</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAkQ=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAkU=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>x-credits</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAkU=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAkY=</string> </persistent>
                     </value>
                 </item>
                 <item>
@@ -6306,7 +6276,7 @@
                 <item>
                     <key> <string>x-csharp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAkY=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAkc=</string> </persistent>
                     </value>
                 </item>
                 <item>
@@ -6318,13 +6288,13 @@
                 <item>
                     <key> <string>x-dcl</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAkc=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAkg=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>x-dsl</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAkg=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAkk=</string> </persistent>
                     </value>
                 </item>
                 <item>
@@ -6336,37 +6306,37 @@
                 <item>
                     <key> <string>x-dtd</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAkk=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAko=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>x-emacs-lisp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAko=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAks=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>x-fortran</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAks=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAkw=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>x-gettext-translation</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAkw=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAk0=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>x-gettext-translation-template</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAk0=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAk4=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>x-gtkrc</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAk4=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAk8=</string> </persistent>
                     </value>
                 </item>
                 <item>
@@ -6378,19 +6348,19 @@
                 <item>
                     <key> <string>x-html-safe</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAk8=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAlA=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>x-idl</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAlA=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAlE=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>x-install</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAlE=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAlI=</string> </persistent>
                     </value>
                 </item>
                 <item>
@@ -6402,7 +6372,7 @@
                 <item>
                     <key> <string>x-ksysv-log</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAlI=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAlM=</string> </persistent>
                     </value>
                 </item>
                 <item>
@@ -6414,13 +6384,13 @@
                 <item>
                     <key> <string>x-log</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAlM=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAlQ=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>x-makefile</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAlQ=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAlU=</string> </persistent>
                     </value>
                 </item>
                 <item>
@@ -6432,7 +6402,7 @@
                 <item>
                     <key> <string>x-objcsrc</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAlU=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAlY=</string> </persistent>
                     </value>
                 </item>
                 <item>
@@ -6444,7 +6414,7 @@
                 <item>
                     <key> <string>x-patch</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAlY=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAlc=</string> </persistent>
                     </value>
                 </item>
                 <item>
@@ -6474,7 +6444,7 @@
                 <item>
                     <key> <string>x-readme</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAlc=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAlg=</string> </persistent>
                     </value>
                 </item>
                 <item>
@@ -6486,7 +6456,7 @@
                 <item>
                     <key> <string>x-scheme</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAlg=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAlk=</string> </persistent>
                     </value>
                 </item>
                 <item>
@@ -6510,13 +6480,13 @@
                 <item>
                     <key> <string>x-speech</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAlk=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAlo=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>x-sql</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAlo=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAls=</string> </persistent>
                     </value>
                 </item>
                 <item>
@@ -6534,37 +6504,37 @@
                 <item>
                     <key> <string>x-texinfo</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAls=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAlw=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>x-troff-me</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAlw=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAl0=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>x-troff-mm</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAl0=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAl4=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>x-troff-ms</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAl4=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAl8=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>x-uil</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAl8=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAmA=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>x-uri</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAmA=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAmE=</string> </persistent>
                     </value>
                 </item>
                 <item>
@@ -6582,19 +6552,19 @@
                 <item>
                     <key> <string>x-xmi</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAmE=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAmI=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>x-xslfo</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAmI=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAmM=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>xmcd</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAmM=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAmQ=</string> </persistent>
                     </value>
                 </item>
                 <item>
@@ -6611,10 +6581,7 @@
   </record>
   <record id="14" aka="AAAAAAAAAA4=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -6649,7 +6616,7 @@
                 <item>
                     <key> <string>isivideo</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAmQ=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAmU=</string> </persistent>
                     </value>
                 </item>
                 <item>
@@ -6673,7 +6640,7 @@
                 <item>
                     <key> <string>vivo</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAmU=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAmY=</string> </persistent>
                     </value>
                 </item>
                 <item>
@@ -6685,25 +6652,25 @@
                 <item>
                     <key> <string>wavelet</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAmY=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAmc=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>x-anim</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAmc=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAmg=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>x-avi</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAmg=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAmk=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>x-flic</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAmk=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAmo=</string> </persistent>
                     </value>
                 </item>
                 <item>
@@ -6757,13 +6724,13 @@
                 <item>
                     <key> <string>x-nsv</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAmo=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAms=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>x-real-video</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAms=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAmw=</string> </persistent>
                     </value>
                 </item>
                 <item>
@@ -6780,10 +6747,7 @@
   </record>
   <record id="15" aka="AAAAAAAAAA8=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -6805,10 +6769,7 @@
   </record>
   <record id="16" aka="AAAAAAAAABA=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -6830,10 +6791,7 @@
   </record>
   <record id="17" aka="AAAAAAAAABE=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -6890,10 +6848,7 @@
   </record>
   <record id="18" aka="AAAAAAAAABI=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -6934,10 +6889,7 @@
   </record>
   <record id="19" aka="AAAAAAAAABM=">
     <pickle>
-      <tuple>
-        <global name="application_octet_stream" module="Products.MimetypesRegistry.mime_types.mtr_mimetypes"/>
-        <tuple/>
-      </tuple>
+      <global name="application_octet_stream" module="Products.MimetypesRegistry.mime_types.mtr_mimetypes"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -6969,10 +6921,7 @@
   </record>
   <record id="20" aka="AAAAAAAAABQ=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -7024,10 +6973,7 @@
   </record>
   <record id="21" aka="AAAAAAAAABU=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -7078,10 +7024,7 @@
   </record>
   <record id="22" aka="AAAAAAAAABY=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -7134,10 +7077,7 @@
   </record>
   <record id="23" aka="AAAAAAAAABc=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -7178,10 +7118,7 @@
   </record>
   <record id="24" aka="AAAAAAAAABg=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -7222,10 +7159,7 @@
   </record>
   <record id="25" aka="AAAAAAAAABk=">
     <pickle>
-      <tuple>
-        <global name="text_plain" module="Products.MimetypesRegistry.mime_types.mtr_mimetypes"/>
-        <tuple/>
-      </tuple>
+      <global name="text_plain" module="Products.MimetypesRegistry.mime_types.mtr_mimetypes"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -7260,10 +7194,7 @@
   </record>
   <record id="26" aka="AAAAAAAAABo=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -7314,10 +7245,7 @@
   </record>
   <record id="27" aka="AAAAAAAAABs=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -7358,10 +7286,7 @@
   </record>
   <record id="28" aka="AAAAAAAAABw=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -7403,10 +7328,7 @@
   </record>
   <record id="29" aka="AAAAAAAAAB0=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -7457,10 +7379,7 @@
   </record>
   <record id="30" aka="AAAAAAAAAB4=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -7509,10 +7428,7 @@
   </record>
   <record id="31" aka="AAAAAAAAAB8=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -7553,10 +7469,7 @@
   </record>
   <record id="32" aka="AAAAAAAAACA=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -7600,10 +7513,7 @@
   </record>
   <record id="33" aka="AAAAAAAAACE=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -7652,10 +7562,7 @@
   </record>
   <record id="34" aka="AAAAAAAAACI=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -7704,10 +7611,7 @@
   </record>
   <record id="35" aka="AAAAAAAAACM=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -7748,10 +7652,7 @@
   </record>
   <record id="36" aka="AAAAAAAAACQ=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -7798,10 +7699,7 @@
   </record>
   <record id="37" aka="AAAAAAAAACU=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -7842,10 +7740,7 @@
   </record>
   <record id="38" aka="AAAAAAAAACY=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -7894,10 +7789,7 @@
   </record>
   <record id="39" aka="AAAAAAAAACc=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -7953,10 +7845,7 @@
   </record>
   <record id="40" aka="AAAAAAAAACg=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -7997,10 +7886,7 @@
   </record>
   <record id="41" aka="AAAAAAAAACk=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -8042,10 +7928,7 @@
   </record>
   <record id="42" aka="AAAAAAAAACo=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -8088,10 +7971,7 @@
   </record>
   <record id="43" aka="AAAAAAAAACs=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -8132,10 +8012,7 @@
   </record>
   <record id="44" aka="AAAAAAAAACw=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -8176,10 +8053,7 @@
   </record>
   <record id="45" aka="AAAAAAAAAC0=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -8220,10 +8094,7 @@
   </record>
   <record id="46" aka="AAAAAAAAAC4=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -8264,10 +8135,7 @@
   </record>
   <record id="47" aka="AAAAAAAAAC8=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -8308,10 +8176,7 @@
   </record>
   <record id="48" aka="AAAAAAAAADA=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -8352,10 +8217,7 @@
   </record>
   <record id="49" aka="AAAAAAAAADE=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -8397,10 +8259,7 @@
   </record>
   <record id="50" aka="AAAAAAAAADI=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -8441,10 +8300,7 @@
   </record>
   <record id="51" aka="AAAAAAAAADM=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -8485,10 +8341,7 @@
   </record>
   <record id="52" aka="AAAAAAAAADQ=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -8537,10 +8390,7 @@
   </record>
   <record id="53" aka="AAAAAAAAADU=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -8581,10 +8431,7 @@
   </record>
   <record id="54" aka="AAAAAAAAADY=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -8625,10 +8472,7 @@
   </record>
   <record id="55" aka="AAAAAAAAADc=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -8683,10 +8527,7 @@
   </record>
   <record id="56" aka="AAAAAAAAADg=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -8727,10 +8568,7 @@
   </record>
   <record id="57" aka="AAAAAAAAADk=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -8771,10 +8609,7 @@
   </record>
   <record id="58" aka="AAAAAAAAADo=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -8815,10 +8650,7 @@
   </record>
   <record id="59" aka="AAAAAAAAADs=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -8859,10 +8691,7 @@
   </record>
   <record id="60" aka="AAAAAAAAADw=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -8911,10 +8740,7 @@
   </record>
   <record id="61" aka="AAAAAAAAAD0=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -8955,10 +8781,7 @@
   </record>
   <record id="62" aka="AAAAAAAAAD4=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -8999,10 +8822,7 @@
   </record>
   <record id="63" aka="AAAAAAAAAD8=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -9055,10 +8875,7 @@
   </record>
   <record id="64" aka="AAAAAAAAAEA=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -9099,10 +8916,7 @@
   </record>
   <record id="65" aka="AAAAAAAAAEE=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -9143,10 +8957,7 @@
   </record>
   <record id="66" aka="AAAAAAAAAEI=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -9188,10 +8999,7 @@
   </record>
   <record id="67" aka="AAAAAAAAAEM=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -9241,16 +9049,13 @@
   </record>
   <record id="68" aka="AAAAAAAAAEQ=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
         <item>
             <key> <string>__name__</string> </key>
-            <value> <string>text/comma-separated-values</string> </value>
+            <value> <string>csv</string> </value>
         </item>
         <item>
             <key> <string>binary</string> </key>
@@ -9259,9 +9064,17 @@
         <item>
             <key> <string>extensions</string> </key>
             <value>
-              <tuple>
+              <list>
                 <string>csv</string>
-              </tuple>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string>globs</string> </key>
+            <value>
+              <list>
+                <string>*.csv</string>
+              </list>
             </value>
         </item>
         <item>
@@ -9270,14 +9083,14 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>text/comma-separated-values</string> </value>
+            <value> <string>csv</string> </value>
         </item>
         <item>
             <key> <string>mimetypes</string> </key>
             <value>
-              <tuple>
-                <string>text/comma-separated-values</string>
-              </tuple>
+              <list>
+                <string>text/csv</string>
+              </list>
             </value>
         </item>
       </dictionary>
@@ -9285,10 +9098,7 @@
   </record>
   <record id="69" aka="AAAAAAAAAEU=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -9329,10 +9139,7 @@
   </record>
   <record id="70" aka="AAAAAAAAAEY=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -9373,10 +9180,7 @@
   </record>
   <record id="71" aka="AAAAAAAAAEc=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -9417,10 +9221,7 @@
   </record>
   <record id="72" aka="AAAAAAAAAEg=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -9469,10 +9270,7 @@
   </record>
   <record id="73" aka="AAAAAAAAAEk=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -9517,10 +9315,7 @@
   </record>
   <record id="74" aka="AAAAAAAAAEo=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -9563,10 +9358,7 @@
   </record>
   <record id="75" aka="AAAAAAAAAEs=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -9608,10 +9400,7 @@
   </record>
   <record id="76" aka="AAAAAAAAAEw=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -9653,10 +9442,7 @@
   </record>
   <record id="77" aka="AAAAAAAAAE0=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -9708,10 +9494,7 @@
   </record>
   <record id="78" aka="AAAAAAAAAE4=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -9752,10 +9535,7 @@
   </record>
   <record id="79" aka="AAAAAAAAAE8=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -9796,10 +9576,7 @@
   </record>
   <record id="80" aka="AAAAAAAAAFA=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -9840,10 +9617,7 @@
   </record>
   <record id="81" aka="AAAAAAAAAFE=">
     <pickle>
-      <tuple>
-        <global name="application_msword" module="Products.MimetypesRegistry.mime_types.mtr_mimetypes"/>
-        <tuple/>
-      </tuple>
+      <global name="application_msword" module="Products.MimetypesRegistry.mime_types.mtr_mimetypes"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -9883,10 +9657,7 @@
   </record>
   <record id="82" aka="AAAAAAAAAFI=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -9935,10 +9706,7 @@
   </record>
   <record id="83" aka="AAAAAAAAAFM=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -9980,10 +9748,7 @@
   </record>
   <record id="84" aka="AAAAAAAAAFQ=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -10025,10 +9790,7 @@
   </record>
   <record id="85" aka="AAAAAAAAAFU=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -10078,10 +9840,7 @@
   </record>
   <record id="86" aka="AAAAAAAAAFY=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -10123,10 +9882,7 @@
   </record>
   <record id="87" aka="AAAAAAAAAFc=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -10175,10 +9931,7 @@
   </record>
   <record id="88" aka="AAAAAAAAAFg=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -10227,10 +9980,7 @@
   </record>
   <record id="89" aka="AAAAAAAAAFk=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -10272,10 +10022,7 @@
   </record>
   <record id="90" aka="AAAAAAAAAFo=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -10316,10 +10063,7 @@
   </record>
   <record id="91" aka="AAAAAAAAAFs=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -10360,10 +10104,7 @@
   </record>
   <record id="92" aka="AAAAAAAAAFw=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -10404,10 +10145,7 @@
   </record>
   <record id="93" aka="AAAAAAAAAF0=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -10448,10 +10186,7 @@
   </record>
   <record id="94" aka="AAAAAAAAAF4=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -10494,10 +10229,7 @@
   </record>
   <record id="95" aka="AAAAAAAAAF8=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -10540,10 +10272,7 @@
   </record>
   <record id="96" aka="AAAAAAAAAGA=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -10584,10 +10313,7 @@
   </record>
   <record id="97" aka="AAAAAAAAAGE=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -10628,10 +10354,7 @@
   </record>
   <record id="98" aka="AAAAAAAAAGI=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -10672,10 +10395,7 @@
   </record>
   <record id="99" aka="AAAAAAAAAGM=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -10716,10 +10436,7 @@
   </record>
   <record id="100" aka="AAAAAAAAAGQ=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -10768,10 +10485,7 @@
   </record>
   <record id="101" aka="AAAAAAAAAGU=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -10820,10 +10534,7 @@
   </record>
   <record id="102" aka="AAAAAAAAAGY=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -10864,10 +10575,7 @@
   </record>
   <record id="103" aka="AAAAAAAAAGc=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -10916,10 +10624,7 @@
   </record>
   <record id="104" aka="AAAAAAAAAGg=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -10960,10 +10665,7 @@
   </record>
   <record id="105" aka="AAAAAAAAAGk=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11008,10 +10710,7 @@
   </record>
   <record id="106" aka="AAAAAAAAAGo=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11052,10 +10751,7 @@
   </record>
   <record id="107" aka="AAAAAAAAAGs=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11106,10 +10802,7 @@
   </record>
   <record id="108" aka="AAAAAAAAAGw=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11160,10 +10853,7 @@
   </record>
   <record id="109" aka="AAAAAAAAAG0=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11216,10 +10906,7 @@
   </record>
   <record id="110" aka="AAAAAAAAAG4=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11268,10 +10955,7 @@
   </record>
   <record id="111" aka="AAAAAAAAAG8=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11312,10 +10996,7 @@
   </record>
   <record id="112" aka="AAAAAAAAAHA=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11362,10 +11043,7 @@
   </record>
   <record id="113" aka="AAAAAAAAAHE=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11414,10 +11092,7 @@
   </record>
   <record id="114" aka="AAAAAAAAAHI=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11458,10 +11133,7 @@
   </record>
   <record id="115" aka="AAAAAAAAAHM=">
     <pickle>
-      <tuple>
-        <global name="text_html" module="Products.MimetypesRegistry.mime_types.mtr_mimetypes"/>
-        <tuple/>
-      </tuple>
+      <global name="text_html" module="Products.MimetypesRegistry.mime_types.mtr_mimetypes"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11493,10 +11165,7 @@
   </record>
   <record id="116" aka="AAAAAAAAAHQ=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11537,10 +11206,7 @@
   </record>
   <record id="117" aka="AAAAAAAAAHU=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11581,10 +11247,7 @@
   </record>
   <record id="118" aka="AAAAAAAAAHY=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11625,10 +11288,7 @@
   </record>
   <record id="119" aka="AAAAAAAAAHc=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11681,10 +11341,7 @@
   </record>
   <record id="120" aka="AAAAAAAAAHg=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11733,10 +11390,7 @@
   </record>
   <record id="121" aka="AAAAAAAAAHk=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11778,10 +11432,7 @@
   </record>
   <record id="122" aka="AAAAAAAAAHo=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11822,10 +11473,7 @@
   </record>
   <record id="123" aka="AAAAAAAAAHs=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11867,10 +11515,7 @@
   </record>
   <record id="124" aka="AAAAAAAAAHw=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11911,10 +11556,7 @@
   </record>
   <record id="125" aka="AAAAAAAAAH0=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -11956,10 +11598,7 @@
   </record>
   <record id="126" aka="AAAAAAAAAH4=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -12000,10 +11639,7 @@
   </record>
   <record id="127" aka="AAAAAAAAAH8=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -12044,10 +11680,7 @@
   </record>
   <record id="128" aka="AAAAAAAAAIA=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -12096,10 +11729,7 @@
   </record>
   <record id="129" aka="AAAAAAAAAIE=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -12140,10 +11770,7 @@
   </record>
   <record id="130" aka="AAAAAAAAAII=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -12192,10 +11819,7 @@
   </record>
   <record id="131" aka="AAAAAAAAAIM=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -12244,10 +11868,7 @@
   </record>
   <record id="132" aka="AAAAAAAAAIQ=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -12300,10 +11921,7 @@
   </record>
   <record id="133" aka="AAAAAAAAAIU=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -12352,10 +11970,7 @@
   </record>
   <record id="134" aka="AAAAAAAAAIY=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -12408,10 +12023,7 @@
   </record>
   <record id="135" aka="AAAAAAAAAIc=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -12458,10 +12070,7 @@
   </record>
   <record id="136" aka="AAAAAAAAAIg=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -12510,10 +12119,7 @@
   </record>
   <record id="137" aka="AAAAAAAAAIk=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -12554,10 +12160,7 @@
   </record>
   <record id="138" aka="AAAAAAAAAIo=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -12608,10 +12211,7 @@
   </record>
   <record id="139" aka="AAAAAAAAAIs=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -12660,10 +12260,7 @@
   </record>
   <record id="140" aka="AAAAAAAAAIw=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -12714,10 +12311,7 @@
   </record>
   <record id="141" aka="AAAAAAAAAI0=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -12758,10 +12352,7 @@
   </record>
   <record id="142" aka="AAAAAAAAAI4=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -12811,10 +12402,7 @@
   </record>
   <record id="143" aka="AAAAAAAAAI8=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -12863,10 +12451,7 @@
   </record>
   <record id="144" aka="AAAAAAAAAJA=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -12908,10 +12493,7 @@
   </record>
   <record id="145" aka="AAAAAAAAAJE=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -12952,10 +12534,7 @@
   </record>
   <record id="146" aka="AAAAAAAAAJI=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -12996,10 +12575,7 @@
   </record>
   <record id="147" aka="AAAAAAAAAJM=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -13057,10 +12633,7 @@
   </record>
   <record id="148" aka="AAAAAAAAAJQ=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -13109,10 +12682,7 @@
   </record>
   <record id="149" aka="AAAAAAAAAJU=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -13166,10 +12736,7 @@
   </record>
   <record id="150" aka="AAAAAAAAAJY=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -13218,10 +12785,7 @@
   </record>
   <record id="151" aka="AAAAAAAAAJc=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -13262,10 +12826,7 @@
   </record>
   <record id="152" aka="AAAAAAAAAJg=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -13306,10 +12867,7 @@
   </record>
   <record id="153" aka="AAAAAAAAAJk=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -13350,10 +12908,7 @@
   </record>
   <record id="154" aka="AAAAAAAAAJo=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -13394,10 +12949,7 @@
   </record>
   <record id="155" aka="AAAAAAAAAJs=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -13440,10 +12992,7 @@
   </record>
   <record id="156" aka="AAAAAAAAAJw=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -13492,10 +13041,7 @@
   </record>
   <record id="157" aka="AAAAAAAAAJ0=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -13536,10 +13082,7 @@
   </record>
   <record id="158" aka="AAAAAAAAAJ4=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -13581,10 +13124,7 @@
   </record>
   <record id="159" aka="AAAAAAAAAJ8=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -13625,10 +13165,7 @@
   </record>
   <record id="160" aka="AAAAAAAAAKA=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -13677,10 +13214,7 @@
   </record>
   <record id="161" aka="AAAAAAAAAKE=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -13729,10 +13263,7 @@
   </record>
   <record id="162" aka="AAAAAAAAAKI=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -13773,10 +13304,7 @@
   </record>
   <record id="163" aka="AAAAAAAAAKM=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -13825,10 +13353,7 @@
   </record>
   <record id="164" aka="AAAAAAAAAKQ=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -13869,10 +13394,7 @@
   </record>
   <record id="165" aka="AAAAAAAAAKU=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -13913,10 +13435,7 @@
   </record>
   <record id="166" aka="AAAAAAAAAKY=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -13957,10 +13476,7 @@
   </record>
   <record id="167" aka="AAAAAAAAAKc=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -14013,10 +13529,7 @@
   </record>
   <record id="168" aka="AAAAAAAAAKg=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -14065,10 +13578,7 @@
   </record>
   <record id="169" aka="AAAAAAAAAKk=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -14117,10 +13627,7 @@
   </record>
   <record id="170" aka="AAAAAAAAAKo=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -14161,10 +13668,7 @@
   </record>
   <record id="171" aka="AAAAAAAAAKs=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -14205,10 +13709,7 @@
   </record>
   <record id="172" aka="AAAAAAAAAKw=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -14249,10 +13750,7 @@
   </record>
   <record id="173" aka="AAAAAAAAAK0=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -14293,10 +13791,7 @@
   </record>
   <record id="174" aka="AAAAAAAAAK4=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -14345,10 +13840,7 @@
   </record>
   <record id="175" aka="AAAAAAAAAK8=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -14398,10 +13890,7 @@
   </record>
   <record id="176" aka="AAAAAAAAALA=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -14442,10 +13931,7 @@
   </record>
   <record id="177" aka="AAAAAAAAALE=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -14494,10 +13980,7 @@
   </record>
   <record id="178" aka="AAAAAAAAALI=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -14546,10 +14029,7 @@
   </record>
   <record id="179" aka="AAAAAAAAALM=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -14598,10 +14078,7 @@
   </record>
   <record id="180" aka="AAAAAAAAALQ=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -14650,10 +14127,7 @@
   </record>
   <record id="181" aka="AAAAAAAAALU=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -14702,10 +14176,7 @@
   </record>
   <record id="182" aka="AAAAAAAAALY=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -14754,10 +14225,7 @@
   </record>
   <record id="183" aka="AAAAAAAAALc=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -14806,10 +14274,7 @@
   </record>
   <record id="184" aka="AAAAAAAAALg=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -14858,10 +14323,7 @@
   </record>
   <record id="185" aka="AAAAAAAAALk=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -14910,10 +14372,7 @@
   </record>
   <record id="186" aka="AAAAAAAAALo=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -14962,10 +14421,7 @@
   </record>
   <record id="187" aka="AAAAAAAAALs=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -15014,10 +14470,7 @@
   </record>
   <record id="188" aka="AAAAAAAAALw=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -15066,10 +14519,7 @@
   </record>
   <record id="189" aka="AAAAAAAAAL0=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -15118,10 +14568,7 @@
   </record>
   <record id="190" aka="AAAAAAAAAL4=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -15170,10 +14617,7 @@
   </record>
   <record id="191" aka="AAAAAAAAAL8=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -15222,10 +14666,7 @@
   </record>
   <record id="192" aka="AAAAAAAAAMA=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -15274,10 +14715,7 @@
   </record>
   <record id="193" aka="AAAAAAAAAME=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -15326,10 +14764,7 @@
   </record>
   <record id="194" aka="AAAAAAAAAMI=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -15370,10 +14805,7 @@
   </record>
   <record id="195" aka="AAAAAAAAAMM=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -15424,10 +14856,7 @@
   </record>
   <record id="196" aka="AAAAAAAAAMQ=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -15478,10 +14907,7 @@
   </record>
   <record id="197" aka="AAAAAAAAAMU=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -15528,10 +14954,7 @@
   </record>
   <record id="198" aka="AAAAAAAAAMY=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -15572,10 +14995,7 @@
   </record>
   <record id="199" aka="AAAAAAAAAMc=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -15616,10 +15036,7 @@
   </record>
   <record id="200" aka="AAAAAAAAAMg=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -15660,10 +15077,7 @@
   </record>
   <record id="201" aka="AAAAAAAAAMk=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -15712,10 +15126,7 @@
   </record>
   <record id="202" aka="AAAAAAAAAMo=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -15758,10 +15169,7 @@
   </record>
   <record id="203" aka="AAAAAAAAAMs=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -15802,10 +15210,7 @@
   </record>
   <record id="204" aka="AAAAAAAAAMw=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -15855,10 +15260,7 @@
   </record>
   <record id="205" aka="AAAAAAAAAM0=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -15907,10 +15309,7 @@
   </record>
   <record id="206" aka="AAAAAAAAAM4=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -15959,10 +15358,7 @@
   </record>
   <record id="207" aka="AAAAAAAAAM8=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -16009,10 +15405,7 @@
   </record>
   <record id="208" aka="AAAAAAAAANA=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -16055,10 +15448,7 @@
   </record>
   <record id="209" aka="AAAAAAAAANE=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -16099,10 +15489,7 @@
   </record>
   <record id="210" aka="AAAAAAAAANI=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -16143,10 +15530,7 @@
   </record>
   <record id="211" aka="AAAAAAAAANM=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -16187,10 +15571,7 @@
   </record>
   <record id="212" aka="AAAAAAAAANQ=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -16231,10 +15612,7 @@
   </record>
   <record id="213" aka="AAAAAAAAANU=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -16275,10 +15653,7 @@
   </record>
   <record id="214" aka="AAAAAAAAANY=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -16327,10 +15702,7 @@
   </record>
   <record id="215" aka="AAAAAAAAANc=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -16372,10 +15744,7 @@
   </record>
   <record id="216" aka="AAAAAAAAANg=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -16424,10 +15793,7 @@
   </record>
   <record id="217" aka="AAAAAAAAANk=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -16476,10 +15842,7 @@
   </record>
   <record id="218" aka="AAAAAAAAANo=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -16528,10 +15891,7 @@
   </record>
   <record id="219" aka="AAAAAAAAANs=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -16572,10 +15932,7 @@
   </record>
   <record id="220" aka="AAAAAAAAANw=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -16630,10 +15987,7 @@
   </record>
   <record id="221" aka="AAAAAAAAAN0=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -16682,10 +16036,7 @@
   </record>
   <record id="222" aka="AAAAAAAAAN4=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -16726,10 +16077,7 @@
   </record>
   <record id="223" aka="AAAAAAAAAN8=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -16770,10 +16118,7 @@
   </record>
   <record id="224" aka="AAAAAAAAAOA=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -16814,10 +16159,7 @@
   </record>
   <record id="225" aka="AAAAAAAAAOE=">
     <pickle>
-      <tuple>
-        <global name="text_python" module="Products.MimetypesRegistry.mime_types.mtr_mimetypes"/>
-        <tuple/>
-      </tuple>
+      <global name="text_python" module="Products.MimetypesRegistry.mime_types.mtr_mimetypes"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -16838,10 +16180,7 @@
   </record>
   <record id="226" aka="AAAAAAAAAOI=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -16883,10 +16222,7 @@
   </record>
   <record id="227" aka="AAAAAAAAAOM=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -16927,10 +16263,7 @@
   </record>
   <record id="228" aka="AAAAAAAAAOQ=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -16971,10 +16304,7 @@
   </record>
   <record id="229" aka="AAAAAAAAAOU=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -17028,10 +16358,7 @@
   </record>
   <record id="230" aka="AAAAAAAAAOY=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -17072,10 +16399,7 @@
   </record>
   <record id="231" aka="AAAAAAAAAOc=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -17124,10 +16448,7 @@
   </record>
   <record id="232" aka="AAAAAAAAAOg=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -17168,10 +16489,7 @@
   </record>
   <record id="233" aka="AAAAAAAAAOk=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -17212,10 +16530,7 @@
   </record>
   <record id="234" aka="AAAAAAAAAOo=">
     <pickle>
-      <tuple>
-        <global name="text_rest" module="Products.MimetypesRegistry.mime_types.mtr_mimetypes"/>
-        <tuple/>
-      </tuple>
+      <global name="text_rest" module="Products.MimetypesRegistry.mime_types.mtr_mimetypes"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -17228,10 +16543,7 @@
   </record>
   <record id="235" aka="AAAAAAAAAOs=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -17280,10 +16592,7 @@
   </record>
   <record id="236" aka="AAAAAAAAAOw=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -17336,10 +16645,7 @@
   </record>
   <record id="237" aka="AAAAAAAAAO0=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -17380,10 +16686,7 @@
   </record>
   <record id="238" aka="AAAAAAAAAO4=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -17424,10 +16727,7 @@
   </record>
   <record id="239" aka="AAAAAAAAAO8=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -17468,10 +16768,7 @@
   </record>
   <record id="240" aka="AAAAAAAAAPA=">
     <pickle>
-      <tuple>
-        <global name="application_rtf" module="Products.MimetypesRegistry.mime_types.mtr_mimetypes"/>
-        <tuple/>
-      </tuple>
+      <global name="application_rtf" module="Products.MimetypesRegistry.mime_types.mtr_mimetypes"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -17492,10 +16789,7 @@
   </record>
   <record id="241" aka="AAAAAAAAAPE=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -17544,10 +16838,7 @@
   </record>
   <record id="242" aka="AAAAAAAAAPI=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -17588,10 +16879,7 @@
   </record>
   <record id="243" aka="AAAAAAAAAPM=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -17633,10 +16921,7 @@
   </record>
   <record id="244" aka="AAAAAAAAAPQ=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -17678,10 +16963,7 @@
   </record>
   <record id="245" aka="AAAAAAAAAPU=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -17722,10 +17004,7 @@
   </record>
   <record id="246" aka="AAAAAAAAAPY=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -17774,10 +17053,7 @@
   </record>
   <record id="247" aka="AAAAAAAAAPc=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -17826,10 +17102,7 @@
   </record>
   <record id="248" aka="AAAAAAAAAPg=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -17880,10 +17153,7 @@
   </record>
   <record id="249" aka="AAAAAAAAAPk=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -17932,10 +17202,7 @@
   </record>
   <record id="250" aka="AAAAAAAAAPo=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -17987,10 +17254,7 @@
   </record>
   <record id="251" aka="AAAAAAAAAPs=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -18031,10 +17295,7 @@
   </record>
   <record id="252" aka="AAAAAAAAAPw=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -18075,10 +17336,7 @@
   </record>
   <record id="253" aka="AAAAAAAAAP0=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -18119,10 +17377,7 @@
   </record>
   <record id="254" aka="AAAAAAAAAP4=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -18164,10 +17419,7 @@
   </record>
   <record id="255" aka="AAAAAAAAAP8=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -18208,10 +17460,7 @@
   </record>
   <record id="256" aka="AAAAAAAAAQA=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -18260,10 +17509,7 @@
   </record>
   <record id="257" aka="AAAAAAAAAQE=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -18313,10 +17559,7 @@
   </record>
   <record id="258" aka="AAAAAAAAAQI=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -18357,10 +17600,7 @@
   </record>
   <record id="259" aka="AAAAAAAAAQM=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -18411,10 +17651,7 @@
   </record>
   <record id="260" aka="AAAAAAAAAQQ=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -18458,10 +17695,7 @@
   </record>
   <record id="261" aka="AAAAAAAAAQU=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -18510,10 +17744,7 @@
   </record>
   <record id="262" aka="AAAAAAAAAQY=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -18565,10 +17796,7 @@
   </record>
   <record id="263" aka="AAAAAAAAAQc=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -18609,10 +17837,7 @@
   </record>
   <record id="264" aka="AAAAAAAAAQg=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -18653,10 +17878,7 @@
   </record>
   <record id="265" aka="AAAAAAAAAQk=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -18705,10 +17927,7 @@
   </record>
   <record id="266" aka="AAAAAAAAAQo=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -18757,10 +17976,7 @@
   </record>
   <record id="267" aka="AAAAAAAAAQs=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -18809,10 +18025,7 @@
   </record>
   <record id="268" aka="AAAAAAAAAQw=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -18861,10 +18074,7 @@
   </record>
   <record id="269" aka="AAAAAAAAAQ0=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -18905,10 +18115,7 @@
   </record>
   <record id="270" aka="AAAAAAAAAQ4=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -18957,10 +18164,7 @@
   </record>
   <record id="271" aka="AAAAAAAAAQ8=">
     <pickle>
-      <tuple>
-        <global name="text_structured" module="Products.MimetypesRegistry.mime_types.mtr_mimetypes"/>
-        <tuple/>
-      </tuple>
+      <global name="text_structured" module="Products.MimetypesRegistry.mime_types.mtr_mimetypes"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -18973,10 +18177,7 @@
   </record>
   <record id="272" aka="AAAAAAAAARA=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -19025,10 +18226,7 @@
   </record>
   <record id="273" aka="AAAAAAAAARE=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -19077,10 +18275,7 @@
   </record>
   <record id="274" aka="AAAAAAAAARI=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -19130,10 +18325,7 @@
   </record>
   <record id="275" aka="AAAAAAAAARM=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -19174,10 +18366,7 @@
   </record>
   <record id="276" aka="AAAAAAAAARQ=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -19227,10 +18416,7 @@
   </record>
   <record id="277" aka="AAAAAAAAARU=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -19279,10 +18465,7 @@
   </record>
   <record id="278" aka="AAAAAAAAARY=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -19331,10 +18514,7 @@
   </record>
   <record id="279" aka="AAAAAAAAARc=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -19383,10 +18563,7 @@
   </record>
   <record id="280" aka="AAAAAAAAARg=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -19435,10 +18612,7 @@
   </record>
   <record id="281" aka="AAAAAAAAARk=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -19487,10 +18661,7 @@
   </record>
   <record id="282" aka="AAAAAAAAARo=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -19539,10 +18710,7 @@
   </record>
   <record id="283" aka="AAAAAAAAARs=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -19591,10 +18759,7 @@
   </record>
   <record id="284" aka="AAAAAAAAARw=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -19645,10 +18810,7 @@
   </record>
   <record id="285" aka="AAAAAAAAAR0=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -19690,10 +18852,7 @@
   </record>
   <record id="286" aka="AAAAAAAAAR4=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -19734,10 +18893,7 @@
   </record>
   <record id="287" aka="AAAAAAAAAR8=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -19788,10 +18944,7 @@
   </record>
   <record id="288" aka="AAAAAAAAASA=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -19833,10 +18986,7 @@
   </record>
   <record id="289" aka="AAAAAAAAASE=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -19885,10 +19035,7 @@
   </record>
   <record id="290" aka="AAAAAAAAASI=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -19929,10 +19076,7 @@
   </record>
   <record id="291" aka="AAAAAAAAASM=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -19981,10 +19125,7 @@
   </record>
   <record id="292" aka="AAAAAAAAASQ=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -20025,10 +19166,7 @@
   </record>
   <record id="293" aka="AAAAAAAAASU=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -20077,10 +19215,7 @@
   </record>
   <record id="294" aka="AAAAAAAAASY=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -20121,10 +19256,7 @@
   </record>
   <record id="295" aka="AAAAAAAAASc=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -20176,10 +19308,7 @@
   </record>
   <record id="296" aka="AAAAAAAAASg=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -20220,10 +19349,7 @@
   </record>
   <record id="297" aka="AAAAAAAAASk=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -20264,10 +19390,7 @@
   </record>
   <record id="298" aka="AAAAAAAAASo=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -20310,10 +19433,7 @@
   </record>
   <record id="299" aka="AAAAAAAAASs=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -20354,10 +19474,7 @@
   </record>
   <record id="300" aka="AAAAAAAAASw=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -20398,10 +19515,7 @@
   </record>
   <record id="301" aka="AAAAAAAAAS0=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -20452,10 +19566,7 @@
   </record>
   <record id="302" aka="AAAAAAAAAS4=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -20496,10 +19607,7 @@
   </record>
   <record id="303" aka="AAAAAAAAAS8=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -20540,10 +19648,7 @@
   </record>
   <record id="304" aka="AAAAAAAAATA=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -20584,10 +19689,7 @@
   </record>
   <record id="305" aka="AAAAAAAAATE=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -20628,10 +19730,7 @@
   </record>
   <record id="306" aka="AAAAAAAAATI=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -20672,10 +19771,7 @@
   </record>
   <record id="307" aka="AAAAAAAAATM=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -20716,10 +19812,7 @@
   </record>
   <record id="308" aka="AAAAAAAAATQ=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -20760,10 +19853,7 @@
   </record>
   <record id="309" aka="AAAAAAAAATU=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -20812,10 +19902,7 @@
   </record>
   <record id="310" aka="AAAAAAAAATY=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -20856,10 +19943,7 @@
   </record>
   <record id="311" aka="AAAAAAAAATc=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -20900,10 +19984,7 @@
   </record>
   <record id="312" aka="AAAAAAAAATg=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -20944,10 +20025,7 @@
   </record>
   <record id="313" aka="AAAAAAAAATk=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -20996,10 +20074,7 @@
   </record>
   <record id="314" aka="AAAAAAAAATo=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -21040,10 +20115,7 @@
   </record>
   <record id="315" aka="AAAAAAAAATs=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -21084,10 +20156,7 @@
   </record>
   <record id="316" aka="AAAAAAAAATw=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -21128,10 +20197,7 @@
   </record>
   <record id="317" aka="AAAAAAAAAT0=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -21182,10 +20248,7 @@
   </record>
   <record id="318" aka="AAAAAAAAAT4=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -21226,10 +20289,7 @@
   </record>
   <record id="319" aka="AAAAAAAAAT8=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -21270,10 +20330,7 @@
   </record>
   <record id="320" aka="AAAAAAAAAUA=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -21322,10 +20379,7 @@
   </record>
   <record id="321" aka="AAAAAAAAAUE=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -21366,10 +20420,7 @@
   </record>
   <record id="322" aka="AAAAAAAAAUI=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -21419,10 +20470,7 @@
   </record>
   <record id="323" aka="AAAAAAAAAUM=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -21481,10 +20529,7 @@
   </record>
   <record id="324" aka="AAAAAAAAAUQ=">
     <pickle>
-      <tuple>
-        <global name="text_xml" module="Products.MimetypesRegistry.mime_types.mtr_mimetypes"/>
-        <tuple/>
-      </tuple>
+      <global name="text_xml" module="Products.MimetypesRegistry.mime_types.mtr_mimetypes"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -21505,10 +20550,7 @@
   </record>
   <record id="325" aka="AAAAAAAAAUU=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -21549,10 +20591,7 @@
   </record>
   <record id="326" aka="AAAAAAAAAUY=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -21601,10 +20640,7 @@
   </record>
   <record id="327" aka="AAAAAAAAAUc=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -21645,10 +20681,7 @@
   </record>
   <record id="328" aka="AAAAAAAAAUg=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -21689,10 +20722,7 @@
   </record>
   <record id="329" aka="AAAAAAAAAUk=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -21741,10 +20771,7 @@
   </record>
   <record id="330" aka="AAAAAAAAAUo=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -21793,10 +20820,7 @@
   </record>
   <record id="331" aka="AAAAAAAAAUs=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -21837,10 +20861,7 @@
   </record>
   <record id="332" aka="AAAAAAAAAUw=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -22005,7 +21026,7 @@
                 <int>0</int>
               </tuple>
             </object>
-            <persistent> <string encoding="base64">AAAAAAAAAmo=</string> </persistent>
+            <persistent> <string encoding="base64">AAAAAAAAAms=</string> </persistent>
           </tuple>
           <unicode>*.PAR2</unicode>
           <tuple>
@@ -22118,7 +21139,7 @@
                 <int>0</int>
               </tuple>
             </object>
-            <persistent> <string encoding="base64">AAAAAAAAAkE=</string> </persistent>
+            <persistent> <string encoding="base64">AAAAAAAAAkI=</string> </persistent>
           </tuple>
           <unicode>*.ads</unicode>
           <tuple>
@@ -22129,7 +21150,7 @@
                 <int>0</int>
               </tuple>
             </object>
-            <persistent> <string encoding="base64">AAAAAAAAAkE=</string> </persistent>
+            <persistent> <string encoding="base64">AAAAAAAAAkI=</string> </persistent>
           </tuple>
           <unicode>*.afm</unicode>
           <tuple>
@@ -22217,7 +21238,7 @@
                 <int>0</int>
               </tuple>
             </object>
-            <persistent> <string encoding="base64">AAAAAAAAAmc=</string> </persistent>
+            <persistent> <string encoding="base64">AAAAAAAAAmg=</string> </persistent>
           </tuple>
           <unicode>*.arj</unicode>
           <tuple>
@@ -22638,7 +21659,7 @@
                 <int>0</int>
               </tuple>
             </object>
-            <persistent> <string encoding="base64">AAAAAAAAAkY=</string> </persistent>
+            <persistent> <string encoding="base64">AAAAAAAAAkc=</string> </persistent>
           </tuple>
           <unicode>*.csh</unicode>
           <tuple>
@@ -22667,11 +21688,11 @@
             <object>
               <klass> <reference id="335.1"/> </klass>
               <tuple>
-                <unicode>.*\\.csv$</unicode>
+                <string>.*\\.csv$</string>
                 <int>0</int>
               </tuple>
             </object>
-            <persistent> <string encoding="base64">AAAAAAAAAkM=</string> </persistent>
+            <persistent> <string encoding="base64">AAAAAAAAAEQ=</string> </persistent>
           </tuple>
         </tuple>
         <persistent> <string encoding="base64">AAAAAAAAAVA=</string> </persistent>
@@ -22773,7 +21794,7 @@
                 <int>0</int>
               </tuple>
             </object>
-            <persistent> <string encoding="base64">AAAAAAAAAkc=</string> </persistent>
+            <persistent> <string encoding="base64">AAAAAAAAAkg=</string> </persistent>
           </tuple>
           <unicode>*.dcm</unicode>
           <tuple>
@@ -22839,7 +21860,7 @@
                 <int>0</int>
               </tuple>
             </object>
-            <persistent> <string encoding="base64">AAAAAAAAAlY=</string> </persistent>
+            <persistent> <string encoding="base64">AAAAAAAAAlc=</string> </persistent>
           </tuple>
           <unicode>*.djv</unicode>
           <tuple>
@@ -22883,7 +21904,7 @@
                 <int>0</int>
               </tuple>
             </object>
-            <persistent> <string encoding="base64">AAAAAAAAAkg=</string> </persistent>
+            <persistent> <string encoding="base64">AAAAAAAAAkk=</string> </persistent>
           </tuple>
           <unicode>*.dtd</unicode>
           <tuple>
@@ -22894,7 +21915,7 @@
                 <int>0</int>
               </tuple>
             </object>
-            <persistent> <string encoding="base64">AAAAAAAAAkk=</string> </persistent>
+            <persistent> <string encoding="base64">AAAAAAAAAko=</string> </persistent>
           </tuple>
           <unicode>*.dvi</unicode>
           <tuple>
@@ -22963,7 +21984,7 @@
                 <int>0</int>
               </tuple>
             </object>
-            <persistent> <string encoding="base64">AAAAAAAAAko=</string> </persistent>
+            <persistent> <string encoding="base64">AAAAAAAAAks=</string> </persistent>
           </tuple>
           <unicode>*.eps</unicode>
           <tuple>
@@ -23051,7 +22072,7 @@
                 <int>0</int>
               </tuple>
             </object>
-            <persistent> <string encoding="base64">AAAAAAAAAks=</string> </persistent>
+            <persistent> <string encoding="base64">AAAAAAAAAkw=</string> </persistent>
           </tuple>
           <unicode>*.f9[05]</unicode>
           <tuple>
@@ -23062,7 +22083,7 @@
                 <int>0</int>
               </tuple>
             </object>
-            <persistent> <string encoding="base64">AAAAAAAAAks=</string> </persistent>
+            <persistent> <string encoding="base64">AAAAAAAAAkw=</string> </persistent>
           </tuple>
           <unicode>*.fig</unicode>
           <tuple>
@@ -23106,7 +22127,7 @@
                 <int>0</int>
               </tuple>
             </object>
-            <persistent> <string encoding="base64">AAAAAAAAAmk=</string> </persistent>
+            <persistent> <string encoding="base64">AAAAAAAAAmo=</string> </persistent>
           </tuple>
           <unicode>*.fli</unicode>
           <tuple>
@@ -23117,7 +22138,7 @@
                 <int>0</int>
               </tuple>
             </object>
-            <persistent> <string encoding="base64">AAAAAAAAAmk=</string> </persistent>
+            <persistent> <string encoding="base64">AAAAAAAAAmo=</string> </persistent>
           </tuple>
           <unicode>*.flw</unicode>
           <tuple>
@@ -23139,7 +22160,7 @@
                 <int>0</int>
               </tuple>
             </object>
-            <persistent> <string encoding="base64">AAAAAAAAAmI=</string> </persistent>
+            <persistent> <string encoding="base64">AAAAAAAAAmM=</string> </persistent>
           </tuple>
           <unicode>*.for</unicode>
           <tuple>
@@ -23150,7 +22171,7 @@
                 <int>0</int>
               </tuple>
             </object>
-            <persistent> <string encoding="base64">AAAAAAAAAks=</string> </persistent>
+            <persistent> <string encoding="base64">AAAAAAAAAkw=</string> </persistent>
           </tuple>
           <unicode>*.g3</unicode>
           <tuple>
@@ -23519,7 +22540,7 @@
                 <int>0</int>
               </tuple>
             </object>
-            <persistent> <string encoding="base64">AAAAAAAAAlA=</string> </persistent>
+            <persistent> <string encoding="base64">AAAAAAAAAlE=</string> </persistent>
           </tuple>
           <unicode>*.ief</unicode>
           <tuple>
@@ -23921,7 +22942,7 @@
                 <int>0</int>
               </tuple>
             </object>
-            <persistent> <string encoding="base64">AAAAAAAAAlM=</string> </persistent>
+            <persistent> <string encoding="base64">AAAAAAAAAlQ=</string> </persistent>
           </tuple>
           <unicode>*.ltx</unicode>
           <tuple>
@@ -24009,7 +23030,7 @@
                 <int>0</int>
               </tuple>
             </object>
-            <persistent> <string encoding="base64">AAAAAAAAAlU=</string> </persistent>
+            <persistent> <string encoding="base64">AAAAAAAAAlY=</string> </persistent>
           </tuple>
           <unicode>*.m15</unicode>
           <tuple>
@@ -24086,7 +23107,7 @@
                 <int>0</int>
               </tuple>
             </object>
-            <persistent> <string encoding="base64">AAAAAAAAAlw=</string> </persistent>
+            <persistent> <string encoding="base64">AAAAAAAAAl0=</string> </persistent>
           </tuple>
           <unicode>*.mgp</unicode>
           <tuple>
@@ -24166,7 +23187,7 @@
                 <int>0</int>
               </tuple>
             </object>
-            <persistent> <string encoding="base64">AAAAAAAAAl0=</string> </persistent>
+            <persistent> <string encoding="base64">AAAAAAAAAl4=</string> </persistent>
           </tuple>
           <unicode>*.mml</unicode>
           <tuple>
@@ -24320,7 +23341,7 @@
                 <int>0</int>
               </tuple>
             </object>
-            <persistent> <string encoding="base64">AAAAAAAAAl4=</string> </persistent>
+            <persistent> <string encoding="base64">AAAAAAAAAl8=</string> </persistent>
           </tuple>
           <unicode>*.msod</unicode>
           <tuple>
@@ -24422,7 +23443,7 @@
                 <int>0</int>
               </tuple>
             </object>
-            <persistent> <string encoding="base64">AAAAAAAAAmo=</string> </persistent>
+            <persistent> <string encoding="base64">AAAAAAAAAms=</string> </persistent>
           </tuple>
           <unicode>*.o</unicode>
           <tuple>
@@ -24722,7 +23743,7 @@
                 <int>0</int>
               </tuple>
             </object>
-            <persistent> <string encoding="base64">AAAAAAAAAlY=</string> </persistent>
+            <persistent> <string encoding="base64">AAAAAAAAAlc=</string> </persistent>
           </tuple>
           <unicode>*.pbm</unicode>
           <tuple>
@@ -25033,7 +24054,7 @@
                 <int>0</int>
               </tuple>
             </object>
-            <persistent> <string encoding="base64">AAAAAAAAAkw=</string> </persistent>
+            <persistent> <string encoding="base64">AAAAAAAAAk0=</string> </persistent>
           </tuple>
           <unicode>*.pot</unicode>
           <tuple>
@@ -25314,7 +24335,7 @@
                 <int>0</int>
               </tuple>
             </object>
-            <persistent> <string encoding="base64">AAAAAAAAAjs=</string> </persistent>
+            <persistent> <string encoding="base64">AAAAAAAAAjw=</string> </persistent>
           </tuple>
           <unicode>*.rej</unicode>
           <tuple>
@@ -25402,7 +24423,7 @@
                 <int>0</int>
               </tuple>
             </object>
-            <persistent> <string encoding="base64">AAAAAAAAAj0=</string> </persistent>
+            <persistent> <string encoding="base64">AAAAAAAAAj4=</string> </persistent>
           </tuple>
           <unicode>*.rtf</unicode>
           <tuple>
@@ -25457,7 +24478,7 @@
                 <int>0</int>
               </tuple>
             </object>
-            <persistent> <string encoding="base64">AAAAAAAAAlg=</string> </persistent>
+            <persistent> <string encoding="base64">AAAAAAAAAlk=</string> </persistent>
           </tuple>
           <unicode>*.sda</unicode>
           <tuple>
@@ -25570,7 +24591,7 @@
                 <int>0</int>
               </tuple>
             </object>
-            <persistent> <string encoding="base64">AAAAAAAAAj4=</string> </persistent>
+            <persistent> <string encoding="base64">AAAAAAAAAj8=</string> </persistent>
           </tuple>
           <unicode>*.sgml</unicode>
           <tuple>
@@ -25581,7 +24602,7 @@
                 <int>0</int>
               </tuple>
             </object>
-            <persistent> <string encoding="base64">AAAAAAAAAj4=</string> </persistent>
+            <persistent> <string encoding="base64">AAAAAAAAAj8=</string> </persistent>
           </tuple>
           <unicode>*.sh</unicode>
           <tuple>
@@ -25669,7 +24690,7 @@
                 <int>0</int>
               </tuple>
             </object>
-            <persistent> <string encoding="base64">AAAAAAAAAj8=</string> </persistent>
+            <persistent> <string encoding="base64">AAAAAAAAAkA=</string> </persistent>
           </tuple>
           <unicode>*.smd</unicode>
           <tuple>
@@ -25779,7 +24800,7 @@
                 <int>0</int>
               </tuple>
             </object>
-            <persistent> <string encoding="base64">AAAAAAAAAlo=</string> </persistent>
+            <persistent> <string encoding="base64">AAAAAAAAAls=</string> </persistent>
           </tuple>
           <unicode>*.src</unicode>
           <tuple>
@@ -26002,7 +25023,7 @@
                 <int>0</int>
               </tuple>
             </object>
-            <persistent> <string encoding="base64">AAAAAAAAAj8=</string> </persistent>
+            <persistent> <string encoding="base64">AAAAAAAAAkA=</string> </persistent>
           </tuple>
           <unicode>*.t</unicode>
           <tuple>
@@ -26126,7 +25147,7 @@
                 <int>0</int>
               </tuple>
             </object>
-            <persistent> <string encoding="base64">AAAAAAAAAls=</string> </persistent>
+            <persistent> <string encoding="base64">AAAAAAAAAlw=</string> </persistent>
           </tuple>
           <unicode>*.texinfo</unicode>
           <tuple>
@@ -26137,7 +25158,7 @@
                 <int>0</int>
               </tuple>
             </object>
-            <persistent> <string encoding="base64">AAAAAAAAAls=</string> </persistent>
+            <persistent> <string encoding="base64">AAAAAAAAAlw=</string> </persistent>
           </tuple>
           <unicode>*.tga</unicode>
           <tuple>
@@ -26316,7 +25337,7 @@
                 <int>0</int>
               </tuple>
             </object>
-            <persistent> <string encoding="base64">AAAAAAAAAl8=</string> </persistent>
+            <persistent> <string encoding="base64">AAAAAAAAAmA=</string> </persistent>
           </tuple>
           <unicode>*.ult</unicode>
           <tuple>
@@ -26349,7 +25370,7 @@
                 <int>0</int>
               </tuple>
             </object>
-            <persistent> <string encoding="base64">AAAAAAAAAmA=</string> </persistent>
+            <persistent> <string encoding="base64">AAAAAAAAAmE=</string> </persistent>
           </tuple>
           <unicode>*.url</unicode>
           <tuple>
@@ -26360,7 +25381,7 @@
                 <int>0</int>
               </tuple>
             </object>
-            <persistent> <string encoding="base64">AAAAAAAAAmA=</string> </persistent>
+            <persistent> <string encoding="base64">AAAAAAAAAmE=</string> </persistent>
           </tuple>
           <unicode>*.ustar</unicode>
           <tuple>
@@ -26828,7 +25849,7 @@
                 <int>0</int>
               </tuple>
             </object>
-            <persistent> <string encoding="base64">AAAAAAAAAmE=</string> </persistent>
+            <persistent> <string encoding="base64">AAAAAAAAAmI=</string> </persistent>
           </tuple>
           <unicode>*.xml</unicode>
           <tuple>
@@ -26872,7 +25893,7 @@
                 <int>0</int>
               </tuple>
             </object>
-            <persistent> <string encoding="base64">AAAAAAAAAmI=</string> </persistent>
+            <persistent> <string encoding="base64">AAAAAAAAAmM=</string> </persistent>
           </tuple>
           <unicode>*.xslt</unicode>
           <tuple>
@@ -26985,7 +26006,7 @@
                 <int>0</int>
               </tuple>
             </object>
-            <persistent> <string encoding="base64">AAAAAAAAAk4=</string> </persistent>
+            <persistent> <string encoding="base64">AAAAAAAAAk8=</string> </persistent>
           </tuple>
           <unicode>AUTHORS</unicode>
           <tuple>
@@ -26996,7 +26017,7 @@
                 <int>0</int>
               </tuple>
             </object>
-            <persistent> <string encoding="base64">AAAAAAAAAkI=</string> </persistent>
+            <persistent> <string encoding="base64">AAAAAAAAAkM=</string> </persistent>
           </tuple>
           <unicode>COPYING</unicode>
           <tuple>
@@ -27007,7 +26028,7 @@
                 <int>0</int>
               </tuple>
             </object>
-            <persistent> <string encoding="base64">AAAAAAAAAkQ=</string> </persistent>
+            <persistent> <string encoding="base64">AAAAAAAAAkU=</string> </persistent>
           </tuple>
           <unicode>CREDITS</unicode>
           <tuple>
@@ -27018,7 +26039,7 @@
                 <int>0</int>
               </tuple>
             </object>
-            <persistent> <string encoding="base64">AAAAAAAAAkU=</string> </persistent>
+            <persistent> <string encoding="base64">AAAAAAAAAkY=</string> </persistent>
           </tuple>
           <unicode>INSTALL</unicode>
           <tuple>
@@ -27029,7 +26050,7 @@
                 <int>0</int>
               </tuple>
             </object>
-            <persistent> <string encoding="base64">AAAAAAAAAlE=</string> </persistent>
+            <persistent> <string encoding="base64">AAAAAAAAAlI=</string> </persistent>
           </tuple>
           <unicode>README*</unicode>
           <tuple>
@@ -27040,7 +26061,7 @@
                 <int>0</int>
               </tuple>
             </object>
-            <persistent> <string encoding="base64">AAAAAAAAAlc=</string> </persistent>
+            <persistent> <string encoding="base64">AAAAAAAAAlg=</string> </persistent>
           </tuple>
           <unicode>RMAIL</unicode>
           <tuple>
@@ -27062,7 +26083,7 @@
                 <int>0</int>
               </tuple>
             </object>
-            <persistent> <string encoding="base64">AAAAAAAAAlQ=</string> </persistent>
+            <persistent> <string encoding="base64">AAAAAAAAAlU=</string> </persistent>
           </tuple>
           <unicode>core</unicode>
           <tuple>
@@ -27095,7 +26116,7 @@
                 <int>0</int>
               </tuple>
             </object>
-            <persistent> <string encoding="base64">AAAAAAAAAk4=</string> </persistent>
+            <persistent> <string encoding="base64">AAAAAAAAAk8=</string> </persistent>
           </tuple>
           <unicode>makefile*</unicode>
           <tuple>
@@ -27106,7 +26127,7 @@
                 <int>0</int>
               </tuple>
             </object>
-            <persistent> <string encoding="base64">AAAAAAAAAlQ=</string> </persistent>
+            <persistent> <string encoding="base64">AAAAAAAAAlU=</string> </persistent>
           </tuple>
         </tuple>
       </tuple>
@@ -27114,10 +26135,7 @@
   </record>
   <record id="355" aka="AAAAAAAAAWM=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -27158,10 +26176,7 @@
   </record>
   <record id="356" aka="AAAAAAAAAWQ=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -27202,10 +26217,7 @@
   </record>
   <record id="357" aka="AAAAAAAAAWU=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -27246,10 +26258,7 @@
   </record>
   <record id="358" aka="AAAAAAAAAWY=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -27288,10 +26297,7 @@
   </record>
   <record id="359" aka="AAAAAAAAAWc=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -27332,10 +26338,7 @@
   </record>
   <record id="360" aka="AAAAAAAAAWg=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -27376,10 +26379,7 @@
   </record>
   <record id="361" aka="AAAAAAAAAWk=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -27420,10 +26420,7 @@
   </record>
   <record id="362" aka="AAAAAAAAAWo=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -27464,10 +26461,7 @@
   </record>
   <record id="363" aka="AAAAAAAAAWs=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -27512,10 +26506,7 @@
   </record>
   <record id="364" aka="AAAAAAAAAWw=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -27556,10 +26547,7 @@
   </record>
   <record id="365" aka="AAAAAAAAAW0=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -27600,10 +26588,7 @@
   </record>
   <record id="366" aka="AAAAAAAAAW4=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -27642,10 +26627,7 @@
   </record>
   <record id="367" aka="AAAAAAAAAW8=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -27686,10 +26668,7 @@
   </record>
   <record id="368" aka="AAAAAAAAAXA=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -27730,10 +26709,7 @@
   </record>
   <record id="369" aka="AAAAAAAAAXE=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -27774,10 +26750,7 @@
   </record>
   <record id="370" aka="AAAAAAAAAXI=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -27818,10 +26791,7 @@
   </record>
   <record id="371" aka="AAAAAAAAAXM=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -27862,10 +26832,7 @@
   </record>
   <record id="372" aka="AAAAAAAAAXQ=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -27904,10 +26871,7 @@
   </record>
   <record id="373" aka="AAAAAAAAAXU=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -27948,10 +26912,7 @@
   </record>
   <record id="374" aka="AAAAAAAAAXY=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -27992,10 +26953,7 @@
   </record>
   <record id="375" aka="AAAAAAAAAXc=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -28036,10 +26994,7 @@
   </record>
   <record id="376" aka="AAAAAAAAAXg=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -28078,10 +27033,7 @@
   </record>
   <record id="377" aka="AAAAAAAAAXk=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -28124,10 +27076,7 @@
   </record>
   <record id="378" aka="AAAAAAAAAXo=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -28169,10 +27118,7 @@
   </record>
   <record id="379" aka="AAAAAAAAAXs=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -28214,10 +27160,7 @@
   </record>
   <record id="380" aka="AAAAAAAAAXw=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -28258,10 +27201,7 @@
   </record>
   <record id="381" aka="AAAAAAAAAX0=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -28302,10 +27242,7 @@
   </record>
   <record id="382" aka="AAAAAAAAAX4=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -28346,10 +27283,7 @@
   </record>
   <record id="383" aka="AAAAAAAAAX8=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -28388,10 +27322,7 @@
   </record>
   <record id="384" aka="AAAAAAAAAYA=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -28432,10 +27363,7 @@
   </record>
   <record id="385" aka="AAAAAAAAAYE=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -28477,10 +27405,7 @@
   </record>
   <record id="386" aka="AAAAAAAAAYI=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -28521,10 +27446,7 @@
   </record>
   <record id="387" aka="AAAAAAAAAYM=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -28565,10 +27487,7 @@
   </record>
   <record id="388" aka="AAAAAAAAAYQ=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -28609,10 +27528,7 @@
   </record>
   <record id="389" aka="AAAAAAAAAYU=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -28653,10 +27569,7 @@
   </record>
   <record id="390" aka="AAAAAAAAAYY=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -28697,10 +27610,7 @@
   </record>
   <record id="391" aka="AAAAAAAAAYc=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -28739,10 +27649,7 @@
   </record>
   <record id="392" aka="AAAAAAAAAYg=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -28783,10 +27690,7 @@
   </record>
   <record id="393" aka="AAAAAAAAAYk=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -28827,10 +27731,7 @@
   </record>
   <record id="394" aka="AAAAAAAAAYo=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -28871,10 +27772,7 @@
   </record>
   <record id="395" aka="AAAAAAAAAYs=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -28917,10 +27815,7 @@
   </record>
   <record id="396" aka="AAAAAAAAAYw=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -28961,10 +27856,7 @@
   </record>
   <record id="397" aka="AAAAAAAAAY0=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -29005,10 +27897,7 @@
   </record>
   <record id="398" aka="AAAAAAAAAY4=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -29049,10 +27938,7 @@
   </record>
   <record id="399" aka="AAAAAAAAAY8=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -29093,10 +27979,7 @@
   </record>
   <record id="400" aka="AAAAAAAAAZA=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -29137,10 +28020,7 @@
   </record>
   <record id="401" aka="AAAAAAAAAZE=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -29181,10 +28061,7 @@
   </record>
   <record id="402" aka="AAAAAAAAAZI=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -29223,10 +28100,7 @@
   </record>
   <record id="403" aka="AAAAAAAAAZM=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -29265,10 +28139,7 @@
   </record>
   <record id="404" aka="AAAAAAAAAZQ=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -29307,10 +28178,7 @@
   </record>
   <record id="405" aka="AAAAAAAAAZU=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -29351,10 +28219,7 @@
   </record>
   <record id="406" aka="AAAAAAAAAZY=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -29393,10 +28258,7 @@
   </record>
   <record id="407" aka="AAAAAAAAAZc=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -29437,10 +28299,7 @@
   </record>
   <record id="408" aka="AAAAAAAAAZg=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -29481,10 +28340,7 @@
   </record>
   <record id="409" aka="AAAAAAAAAZk=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -29523,10 +28379,7 @@
   </record>
   <record id="410" aka="AAAAAAAAAZo=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -29565,10 +28418,7 @@
   </record>
   <record id="411" aka="AAAAAAAAAZs=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -29607,10 +28457,7 @@
   </record>
   <record id="412" aka="AAAAAAAAAZw=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -29651,10 +28498,7 @@
   </record>
   <record id="413" aka="AAAAAAAAAZ0=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -29698,10 +28542,7 @@
   </record>
   <record id="414" aka="AAAAAAAAAZ4=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -29740,10 +28581,7 @@
   </record>
   <record id="415" aka="AAAAAAAAAZ8=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -29782,10 +28620,7 @@
   </record>
   <record id="416" aka="AAAAAAAAAaA=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -29826,10 +28661,7 @@
   </record>
   <record id="417" aka="AAAAAAAAAaE=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -29868,10 +28700,7 @@
   </record>
   <record id="418" aka="AAAAAAAAAaI=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -29913,10 +28742,7 @@
   </record>
   <record id="419" aka="AAAAAAAAAaM=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -29958,10 +28784,7 @@
   </record>
   <record id="420" aka="AAAAAAAAAaQ=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -30002,10 +28825,7 @@
   </record>
   <record id="421" aka="AAAAAAAAAaU=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -30046,10 +28866,7 @@
   </record>
   <record id="422" aka="AAAAAAAAAaY=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -30088,10 +28905,7 @@
   </record>
   <record id="423" aka="AAAAAAAAAac=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -30134,10 +28948,7 @@
   </record>
   <record id="424" aka="AAAAAAAAAag=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -30178,10 +28989,7 @@
   </record>
   <record id="425" aka="AAAAAAAAAak=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -30220,10 +29028,7 @@
   </record>
   <record id="426" aka="AAAAAAAAAao=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -30264,10 +29069,7 @@
   </record>
   <record id="427" aka="AAAAAAAAAas=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -30308,10 +29110,7 @@
   </record>
   <record id="428" aka="AAAAAAAAAaw=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -30350,10 +29149,7 @@
   </record>
   <record id="429" aka="AAAAAAAAAa0=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -30394,10 +29190,7 @@
   </record>
   <record id="430" aka="AAAAAAAAAa4=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -30438,10 +29231,7 @@
   </record>
   <record id="431" aka="AAAAAAAAAa8=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -30483,10 +29273,7 @@
   </record>
   <record id="432" aka="AAAAAAAAAbA=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -30527,10 +29314,7 @@
   </record>
   <record id="433" aka="AAAAAAAAAbE=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -30571,10 +29355,7 @@
   </record>
   <record id="434" aka="AAAAAAAAAbI=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -30615,10 +29396,7 @@
   </record>
   <record id="435" aka="AAAAAAAAAbM=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -30659,10 +29437,7 @@
   </record>
   <record id="436" aka="AAAAAAAAAbQ=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -30703,10 +29478,7 @@
   </record>
   <record id="437" aka="AAAAAAAAAbU=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -30747,10 +29519,7 @@
   </record>
   <record id="438" aka="AAAAAAAAAbY=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -30789,10 +29558,7 @@
   </record>
   <record id="439" aka="AAAAAAAAAbc=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -30831,10 +29597,7 @@
   </record>
   <record id="440" aka="AAAAAAAAAbg=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -30875,10 +29638,7 @@
   </record>
   <record id="441" aka="AAAAAAAAAbk=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -30917,10 +29677,7 @@
   </record>
   <record id="442" aka="AAAAAAAAAbo=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -30961,10 +29718,7 @@
   </record>
   <record id="443" aka="AAAAAAAAAbs=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -31005,10 +29759,7 @@
   </record>
   <record id="444" aka="AAAAAAAAAbw=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -31049,10 +29800,7 @@
   </record>
   <record id="445" aka="AAAAAAAAAb0=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -31093,10 +29841,7 @@
   </record>
   <record id="446" aka="AAAAAAAAAb4=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -31135,10 +29880,7 @@
   </record>
   <record id="447" aka="AAAAAAAAAb8=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -31179,10 +29921,7 @@
   </record>
   <record id="448" aka="AAAAAAAAAcA=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -31223,10 +29962,7 @@
   </record>
   <record id="449" aka="AAAAAAAAAcE=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -31265,10 +30001,7 @@
   </record>
   <record id="450" aka="AAAAAAAAAcI=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -31307,10 +30040,7 @@
   </record>
   <record id="451" aka="AAAAAAAAAcM=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -31349,10 +30079,7 @@
   </record>
   <record id="452" aka="AAAAAAAAAcQ=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -31393,10 +30120,7 @@
   </record>
   <record id="453" aka="AAAAAAAAAcU=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -31437,10 +30161,7 @@
   </record>
   <record id="454" aka="AAAAAAAAAcY=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -31481,10 +30202,7 @@
   </record>
   <record id="455" aka="AAAAAAAAAcc=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -31523,10 +30241,7 @@
   </record>
   <record id="456" aka="AAAAAAAAAcg=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -31567,10 +30282,7 @@
   </record>
   <record id="457" aka="AAAAAAAAAck=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -31609,10 +30321,7 @@
   </record>
   <record id="458" aka="AAAAAAAAAco=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -31651,10 +30360,7 @@
   </record>
   <record id="459" aka="AAAAAAAAAcs=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -31695,10 +30401,7 @@
   </record>
   <record id="460" aka="AAAAAAAAAcw=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -31737,10 +30440,7 @@
   </record>
   <record id="461" aka="AAAAAAAAAc0=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -31782,10 +30482,7 @@
   </record>
   <record id="462" aka="AAAAAAAAAc4=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -31824,10 +30521,7 @@
   </record>
   <record id="463" aka="AAAAAAAAAc8=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -31871,10 +30565,7 @@
   </record>
   <record id="464" aka="AAAAAAAAAdA=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -31917,10 +30608,7 @@
   </record>
   <record id="465" aka="AAAAAAAAAdE=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -31961,10 +30649,7 @@
   </record>
   <record id="466" aka="AAAAAAAAAdI=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -32005,10 +30690,7 @@
   </record>
   <record id="467" aka="AAAAAAAAAdM=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -32050,10 +30732,7 @@
   </record>
   <record id="468" aka="AAAAAAAAAdQ=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -32096,10 +30775,7 @@
   </record>
   <record id="469" aka="AAAAAAAAAdU=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -32140,10 +30816,7 @@
   </record>
   <record id="470" aka="AAAAAAAAAdY=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -32184,10 +30857,7 @@
   </record>
   <record id="471" aka="AAAAAAAAAdc=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -32228,10 +30898,7 @@
   </record>
   <record id="472" aka="AAAAAAAAAdg=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -32272,10 +30939,7 @@
   </record>
   <record id="473" aka="AAAAAAAAAdk=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -32316,10 +30980,7 @@
   </record>
   <record id="474" aka="AAAAAAAAAdo=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -32358,10 +31019,7 @@
   </record>
   <record id="475" aka="AAAAAAAAAds=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -32402,10 +31060,7 @@
   </record>
   <record id="476" aka="AAAAAAAAAdw=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -32446,10 +31101,7 @@
   </record>
   <record id="477" aka="AAAAAAAAAd0=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -32490,10 +31142,7 @@
   </record>
   <record id="478" aka="AAAAAAAAAd4=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -32534,10 +31183,7 @@
   </record>
   <record id="479" aka="AAAAAAAAAd8=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -32578,10 +31224,7 @@
   </record>
   <record id="480" aka="AAAAAAAAAeA=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -32620,10 +31263,7 @@
   </record>
   <record id="481" aka="AAAAAAAAAeE=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -32665,10 +31305,7 @@
   </record>
   <record id="482" aka="AAAAAAAAAeI=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -32709,10 +31346,7 @@
   </record>
   <record id="483" aka="AAAAAAAAAeM=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -32753,10 +31387,7 @@
   </record>
   <record id="484" aka="AAAAAAAAAeQ=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -32797,10 +31428,7 @@
   </record>
   <record id="485" aka="AAAAAAAAAeU=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -32839,10 +31467,7 @@
   </record>
   <record id="486" aka="AAAAAAAAAeY=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -32881,10 +31506,7 @@
   </record>
   <record id="487" aka="AAAAAAAAAec=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -32926,10 +31548,7 @@
   </record>
   <record id="488" aka="AAAAAAAAAeg=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -32970,10 +31589,7 @@
   </record>
   <record id="489" aka="AAAAAAAAAek=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -33014,10 +31630,7 @@
   </record>
   <record id="490" aka="AAAAAAAAAeo=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -33056,10 +31669,7 @@
   </record>
   <record id="491" aka="AAAAAAAAAes=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -33100,10 +31710,7 @@
   </record>
   <record id="492" aka="AAAAAAAAAew=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -33145,10 +31752,7 @@
   </record>
   <record id="493" aka="AAAAAAAAAe0=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -33189,10 +31793,7 @@
   </record>
   <record id="494" aka="AAAAAAAAAe4=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -33234,10 +31835,7 @@
   </record>
   <record id="495" aka="AAAAAAAAAe8=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -33276,10 +31874,7 @@
   </record>
   <record id="496" aka="AAAAAAAAAfA=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -33318,10 +31913,7 @@
   </record>
   <record id="497" aka="AAAAAAAAAfE=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -33360,10 +31952,7 @@
   </record>
   <record id="498" aka="AAAAAAAAAfI=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -33404,10 +31993,7 @@
   </record>
   <record id="499" aka="AAAAAAAAAfM=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -33448,10 +32034,7 @@
   </record>
   <record id="500" aka="AAAAAAAAAfQ=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -33498,10 +32081,7 @@
   </record>
   <record id="501" aka="AAAAAAAAAfU=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -33540,10 +32120,7 @@
   </record>
   <record id="502" aka="AAAAAAAAAfY=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -33582,10 +32159,7 @@
   </record>
   <record id="503" aka="AAAAAAAAAfc=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -33624,10 +32198,7 @@
   </record>
   <record id="504" aka="AAAAAAAAAfg=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -33666,10 +32237,7 @@
   </record>
   <record id="505" aka="AAAAAAAAAfk=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -33710,10 +32278,7 @@
   </record>
   <record id="506" aka="AAAAAAAAAfo=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -33754,10 +32319,7 @@
   </record>
   <record id="507" aka="AAAAAAAAAfs=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -33798,10 +32360,7 @@
   </record>
   <record id="508" aka="AAAAAAAAAfw=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -33842,10 +32401,7 @@
   </record>
   <record id="509" aka="AAAAAAAAAf0=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -33886,10 +32442,7 @@
   </record>
   <record id="510" aka="AAAAAAAAAf4=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -33930,10 +32483,7 @@
   </record>
   <record id="511" aka="AAAAAAAAAf8=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -33974,10 +32524,7 @@
   </record>
   <record id="512" aka="AAAAAAAAAgA=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -34016,10 +32563,7 @@
   </record>
   <record id="513" aka="AAAAAAAAAgE=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -34060,10 +32604,7 @@
   </record>
   <record id="514" aka="AAAAAAAAAgI=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -34102,10 +32643,7 @@
   </record>
   <record id="515" aka="AAAAAAAAAgM=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -34146,10 +32684,7 @@
   </record>
   <record id="516" aka="AAAAAAAAAgQ=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -34190,10 +32725,7 @@
   </record>
   <record id="517" aka="AAAAAAAAAgU=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -34234,10 +32766,7 @@
   </record>
   <record id="518" aka="AAAAAAAAAgY=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -34278,10 +32807,7 @@
   </record>
   <record id="519" aka="AAAAAAAAAgc=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -34322,10 +32848,7 @@
   </record>
   <record id="520" aka="AAAAAAAAAgg=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -34366,10 +32889,7 @@
   </record>
   <record id="521" aka="AAAAAAAAAgk=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -34411,10 +32931,7 @@
   </record>
   <record id="522" aka="AAAAAAAAAgo=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -34453,10 +32970,7 @@
   </record>
   <record id="523" aka="AAAAAAAAAgs=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -34499,10 +33013,7 @@
   </record>
   <record id="524" aka="AAAAAAAAAgw=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -34543,10 +33054,7 @@
   </record>
   <record id="525" aka="AAAAAAAAAg0=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -34585,10 +33093,7 @@
   </record>
   <record id="526" aka="AAAAAAAAAg4=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -34629,10 +33134,7 @@
   </record>
   <record id="527" aka="AAAAAAAAAg8=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -34673,10 +33175,7 @@
   </record>
   <record id="528" aka="AAAAAAAAAhA=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -34717,10 +33216,7 @@
   </record>
   <record id="529" aka="AAAAAAAAAhE=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -34761,10 +33257,7 @@
   </record>
   <record id="530" aka="AAAAAAAAAhI=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -34806,10 +33299,7 @@
   </record>
   <record id="531" aka="AAAAAAAAAhM=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -34850,10 +33340,7 @@
   </record>
   <record id="532" aka="AAAAAAAAAhQ=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -34894,10 +33381,7 @@
   </record>
   <record id="533" aka="AAAAAAAAAhU=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -34936,10 +33420,7 @@
   </record>
   <record id="534" aka="AAAAAAAAAhY=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -34978,10 +33459,7 @@
   </record>
   <record id="535" aka="AAAAAAAAAhc=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -35022,10 +33500,7 @@
   </record>
   <record id="536" aka="AAAAAAAAAhg=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -35068,10 +33543,7 @@
   </record>
   <record id="537" aka="AAAAAAAAAhk=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -35112,10 +33584,7 @@
   </record>
   <record id="538" aka="AAAAAAAAAho=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -35156,10 +33625,7 @@
   </record>
   <record id="539" aka="AAAAAAAAAhs=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -35200,10 +33666,7 @@
   </record>
   <record id="540" aka="AAAAAAAAAhw=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -35244,10 +33707,7 @@
   </record>
   <record id="541" aka="AAAAAAAAAh0=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -35288,10 +33748,7 @@
   </record>
   <record id="542" aka="AAAAAAAAAh4=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -35332,10 +33789,7 @@
   </record>
   <record id="543" aka="AAAAAAAAAh8=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -35376,10 +33830,7 @@
   </record>
   <record id="544" aka="AAAAAAAAAiA=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -35420,10 +33871,7 @@
   </record>
   <record id="545" aka="AAAAAAAAAiE=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -35462,10 +33910,7 @@
   </record>
   <record id="546" aka="AAAAAAAAAiI=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -35504,10 +33949,7 @@
   </record>
   <record id="547" aka="AAAAAAAAAiM=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -35546,10 +33988,7 @@
   </record>
   <record id="548" aka="AAAAAAAAAiQ=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -35588,10 +34027,7 @@
   </record>
   <record id="549" aka="AAAAAAAAAiU=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -35630,10 +34066,7 @@
   </record>
   <record id="550" aka="AAAAAAAAAiY=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -35672,10 +34105,7 @@
   </record>
   <record id="551" aka="AAAAAAAAAic=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -35714,10 +34144,7 @@
   </record>
   <record id="552" aka="AAAAAAAAAig=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -35756,10 +34183,7 @@
   </record>
   <record id="553" aka="AAAAAAAAAik=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -35798,10 +34222,7 @@
   </record>
   <record id="554" aka="AAAAAAAAAio=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -35840,10 +34261,7 @@
   </record>
   <record id="555" aka="AAAAAAAAAis=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -35882,10 +34300,7 @@
   </record>
   <record id="556" aka="AAAAAAAAAiw=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -35924,10 +34339,7 @@
   </record>
   <record id="557" aka="AAAAAAAAAi0=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -35968,10 +34380,7 @@
   </record>
   <record id="558" aka="AAAAAAAAAi4=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -36012,10 +34421,7 @@
   </record>
   <record id="559" aka="AAAAAAAAAi8=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -36054,10 +34460,7 @@
   </record>
   <record id="560" aka="AAAAAAAAAjA=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -36096,10 +34499,7 @@
   </record>
   <record id="561" aka="AAAAAAAAAjE=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -36138,10 +34538,7 @@
   </record>
   <record id="562" aka="AAAAAAAAAjI=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -36180,10 +34577,7 @@
   </record>
   <record id="563" aka="AAAAAAAAAjM=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -36222,10 +34616,7 @@
   </record>
   <record id="564" aka="AAAAAAAAAjQ=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -36264,10 +34655,7 @@
   </record>
   <record id="565" aka="AAAAAAAAAjU=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -36306,10 +34694,7 @@
   </record>
   <record id="566" aka="AAAAAAAAAjY=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -36348,10 +34733,7 @@
   </record>
   <record id="567" aka="AAAAAAAAAjc=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -36390,10 +34772,48 @@
   </record>
   <record id="568" aka="AAAAAAAAAjg=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>__name__</string> </key>
+            <value> <string>text/comma-separated-values</string> </value>
+        </item>
+        <item>
+            <key> <string>binary</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>extensions</string> </key>
+            <value>
+              <tuple>
+                <string>csv</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>icon_path</string> </key>
+            <value> <string>text.png</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>text/comma-separated-values</string> </value>
+        </item>
+        <item>
+            <key> <string>mimetypes</string> </key>
+            <value>
+              <tuple>
+                <string>text/comma-separated-values</string>
+              </tuple>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="569" aka="AAAAAAAAAjk=">
+    <pickle>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -36430,12 +34850,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="569" aka="AAAAAAAAAjk=">
+  <record id="570" aka="AAAAAAAAAjo=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -36472,12 +34889,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="570" aka="AAAAAAAAAjo=">
+  <record id="571" aka="AAAAAAAAAjs=">
     <pickle>
-      <tuple>
-        <global name="text_pre_plain" module="Products.MimetypesRegistry.mime_types.mtr_mimetypes"/>
-        <tuple/>
-      </tuple>
+      <global name="text_pre_plain" module="Products.MimetypesRegistry.mime_types.mtr_mimetypes"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -36488,12 +34902,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="571" aka="AAAAAAAAAjs=">
+  <record id="572" aka="AAAAAAAAAjw=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -36532,12 +34943,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="572" aka="AAAAAAAAAjw=">
+  <record id="573" aka="AAAAAAAAAj0=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -36574,12 +34982,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="573" aka="AAAAAAAAAj0=">
+  <record id="574" aka="AAAAAAAAAj4=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -36618,12 +35023,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="574" aka="AAAAAAAAAj4=">
+  <record id="575" aka="AAAAAAAAAj8=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -36663,12 +35065,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="575" aka="AAAAAAAAAj8=">
+  <record id="576" aka="AAAAAAAAAkA=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -36708,12 +35107,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="576" aka="AAAAAAAAAkA=">
+  <record id="577" aka="AAAAAAAAAkE=">
     <pickle>
-      <tuple>
-        <global name="text_wiki" module="Products.MimetypesRegistry.mime_types.mtr_mimetypes"/>
-        <tuple/>
-      </tuple>
+      <global name="text_wiki" module="Products.MimetypesRegistry.mime_types.mtr_mimetypes"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -36724,12 +35120,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="577" aka="AAAAAAAAAkE=">
+  <record id="578" aka="AAAAAAAAAkI=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -36769,12 +35162,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="578" aka="AAAAAAAAAkI=">
+  <record id="579" aka="AAAAAAAAAkM=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -36813,12 +35203,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="579" aka="AAAAAAAAAkM=">
+  <record id="580" aka="AAAAAAAAAkQ=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -36857,12 +35244,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="580" aka="AAAAAAAAAkQ=">
+  <record id="581" aka="AAAAAAAAAkU=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -36901,12 +35285,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="581" aka="AAAAAAAAAkU=">
+  <record id="582" aka="AAAAAAAAAkY=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -36945,12 +35326,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="582" aka="AAAAAAAAAkY=">
+  <record id="583" aka="AAAAAAAAAkc=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -36989,12 +35367,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="583" aka="AAAAAAAAAkc=">
+  <record id="584" aka="AAAAAAAAAkg=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -37033,12 +35408,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="584" aka="AAAAAAAAAkg=">
+  <record id="585" aka="AAAAAAAAAkk=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -37077,12 +35449,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="585" aka="AAAAAAAAAkk=">
+  <record id="586" aka="AAAAAAAAAko=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -37121,12 +35490,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="586" aka="AAAAAAAAAko=">
+  <record id="587" aka="AAAAAAAAAks=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -37165,12 +35531,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="587" aka="AAAAAAAAAks=">
+  <record id="588" aka="AAAAAAAAAkw=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -37211,12 +35574,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="588" aka="AAAAAAAAAkw=">
+  <record id="589" aka="AAAAAAAAAk0=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -37255,12 +35615,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="589" aka="AAAAAAAAAk0=">
+  <record id="590" aka="AAAAAAAAAk4=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -37297,12 +35654,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="590" aka="AAAAAAAAAk4=">
+  <record id="591" aka="AAAAAAAAAk8=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -37342,12 +35696,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="591" aka="AAAAAAAAAk8=">
+  <record id="592" aka="AAAAAAAAAlA=">
     <pickle>
-      <tuple>
-        <global name="text_html_safe" module="Products.MimetypesRegistry.mime_types.mtr_mimetypes"/>
-        <tuple/>
-      </tuple>
+      <global name="text_html_safe" module="Products.MimetypesRegistry.mime_types.mtr_mimetypes"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -37358,12 +35709,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="592" aka="AAAAAAAAAlA=">
+  <record id="593" aka="AAAAAAAAAlE=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -37402,12 +35750,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="593" aka="AAAAAAAAAlE=">
+  <record id="594" aka="AAAAAAAAAlI=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -37446,12 +35791,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="594" aka="AAAAAAAAAlI=">
+  <record id="595" aka="AAAAAAAAAlM=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -37488,12 +35830,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="595" aka="AAAAAAAAAlM=">
+  <record id="596" aka="AAAAAAAAAlQ=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -37532,12 +35871,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="596" aka="AAAAAAAAAlQ=">
+  <record id="597" aka="AAAAAAAAAlU=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -37577,12 +35913,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="597" aka="AAAAAAAAAlU=">
+  <record id="598" aka="AAAAAAAAAlY=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -37621,12 +35954,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="598" aka="AAAAAAAAAlY=">
+  <record id="599" aka="AAAAAAAAAlc=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -37666,12 +35996,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="599" aka="AAAAAAAAAlc=">
+  <record id="600" aka="AAAAAAAAAlg=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -37710,12 +36037,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="600" aka="AAAAAAAAAlg=">
+  <record id="601" aka="AAAAAAAAAlk=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -37754,12 +36078,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="601" aka="AAAAAAAAAlk=">
+  <record id="602" aka="AAAAAAAAAlo=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -37796,12 +36117,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="602" aka="AAAAAAAAAlo=">
+  <record id="603" aka="AAAAAAAAAls=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -37840,12 +36158,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="603" aka="AAAAAAAAAls=">
+  <record id="604" aka="AAAAAAAAAlw=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -37885,12 +36200,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="604" aka="AAAAAAAAAlw=">
+  <record id="605" aka="AAAAAAAAAl0=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -37929,12 +36241,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="605" aka="AAAAAAAAAl0=">
+  <record id="606" aka="AAAAAAAAAl4=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -37973,12 +36282,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="606" aka="AAAAAAAAAl4=">
+  <record id="607" aka="AAAAAAAAAl8=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -38017,12 +36323,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="607" aka="AAAAAAAAAl8=">
+  <record id="608" aka="AAAAAAAAAmA=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -38061,12 +36364,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="608" aka="AAAAAAAAAmA=">
+  <record id="609" aka="AAAAAAAAAmE=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -38106,12 +36406,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="609" aka="AAAAAAAAAmE=">
+  <record id="610" aka="AAAAAAAAAmI=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -38150,12 +36447,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="610" aka="AAAAAAAAAmI=">
+  <record id="611" aka="AAAAAAAAAmM=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -38195,12 +36489,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="611" aka="AAAAAAAAAmM=">
+  <record id="612" aka="AAAAAAAAAmQ=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -38237,12 +36528,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="612" aka="AAAAAAAAAmQ=">
+  <record id="613" aka="AAAAAAAAAmU=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -38279,12 +36567,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="613" aka="AAAAAAAAAmU=">
+  <record id="614" aka="AAAAAAAAAmY=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -38321,12 +36606,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="614" aka="AAAAAAAAAmY=">
+  <record id="615" aka="AAAAAAAAAmc=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -38363,12 +36645,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="615" aka="AAAAAAAAAmc=">
+  <record id="616" aka="AAAAAAAAAmg=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -38407,12 +36686,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="616" aka="AAAAAAAAAmg=">
+  <record id="617" aka="AAAAAAAAAmk=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -38449,12 +36725,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="617" aka="AAAAAAAAAmk=">
+  <record id="618" aka="AAAAAAAAAmo=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -38494,12 +36767,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="618" aka="AAAAAAAAAmo=">
+  <record id="619" aka="AAAAAAAAAms=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -38539,12 +36809,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="619" aka="AAAAAAAAAms=">
+  <record id="620" aka="AAAAAAAAAmw=">
     <pickle>
-      <tuple>
-        <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
-        <tuple/>
-      </tuple>
+      <global name="MimeTypeItem" module="Products.MimetypesRegistry.MimeTypeItem"/>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/product/ERP5/bootstrap/erp5_core/ToolTemplateItem/portal_transforms.xml b/product/ERP5/bootstrap/erp5_core/ToolTemplateItem/portal_transforms.xml
index 1f83004636..a4096aa376 100644
--- a/product/ERP5/bootstrap/erp5_core/ToolTemplateItem/portal_transforms.xml
+++ b/product/ERP5/bootstrap/erp5_core/ToolTemplateItem/portal_transforms.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="TransformTool" module="Products.PortalTransforms.TransformEngine"/>
-        <tuple/>
-      </tuple>
+      <global name="TransformTool" module="Products.PortalTransforms.TransformEngine"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -440,53 +437,59 @@
                     </value>
                 </item>
                 <item>
-                    <key> <string>text/html</string> </key>
+                    <key> <string>text/comma-separated-values</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAEk=</string> </persistent>
                     </value>
                 </item>
                 <item>
-                    <key> <string>text/plain</string> </key>
+                    <key> <string>text/html</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAEo=</string> </persistent>
                     </value>
                 </item>
                 <item>
-                    <key> <string>text/plain-pre</string> </key>
+                    <key> <string>text/plain</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAEs=</string> </persistent>
                     </value>
                 </item>
                 <item>
-                    <key> <string>text/python-source</string> </key>
+                    <key> <string>text/plain-pre</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAEw=</string> </persistent>
                     </value>
                 </item>
                 <item>
-                    <key> <string>text/restructured</string> </key>
+                    <key> <string>text/python-source</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAE0=</string> </persistent>
                     </value>
                 </item>
                 <item>
-                    <key> <string>text/structured</string> </key>
+                    <key> <string>text/restructured</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAE4=</string> </persistent>
                     </value>
                 </item>
                 <item>
-                    <key> <string>text/x-python</string> </key>
+                    <key> <string>text/structured</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAE8=</string> </persistent>
                     </value>
                 </item>
                 <item>
-                    <key> <string>text/x-rst</string> </key>
+                    <key> <string>text/x-python</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAFA=</string> </persistent>
                     </value>
                 </item>
+                <item>
+                    <key> <string>text/x-rst</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAFE=</string> </persistent>
+                    </value>
+                </item>
               </dictionary>
             </value>
         </item>
@@ -503,7 +506,7 @@
         <item>
             <key> <string>_policies</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAFE=</string> </persistent>
+              <persistent> <string encoding="base64">AAAAAAAAAFI=</string> </persistent>
             </value>
         </item>
         <item>
@@ -515,10 +518,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -529,7 +529,7 @@
                 <item>
                     <key> <string>text/html</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAFI=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAFM=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -540,10 +540,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -554,19 +551,19 @@
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAFM=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAFQ=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>text/html</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAFQ=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAFU=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>text/plain</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAFU=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAFY=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -577,10 +574,7 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -591,7 +585,7 @@
                 <item>
                     <key> <string>text/html</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAFY=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAFc=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -602,10 +596,7 @@
   </record>
   <record id="5" aka="AAAAAAAAAAU=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -616,31 +607,31 @@
                 <item>
                     <key> <string>application/msword</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAFc=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAFg=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>application/pdf</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAFg=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAFk=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <unicode>application/vnd.ms-word</unicode> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAFk=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAFo=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <unicode>application/x-pdf</unicode> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAFo=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAFs=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>text/xml</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAFs=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAFw=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -651,10 +642,7 @@
   </record>
   <record id="6" aka="AAAAAAAAAAY=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -665,19 +653,19 @@
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAFw=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAF0=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>text/html</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAF0=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAF4=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>text/plain</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAF4=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAF8=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -688,10 +676,7 @@
   </record>
   <record id="7" aka="AAAAAAAAAAc=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -702,43 +687,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAF8=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAGA=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAGA=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAGE=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAGE=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAGI=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAGI=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAGM=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAGM=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAGQ=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAGQ=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAGU=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAGU=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAGY=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -749,10 +734,7 @@
   </record>
   <record id="8" aka="AAAAAAAAAAg=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -763,43 +745,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAGY=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAGc=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAGc=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAGg=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAGg=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAGk=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAGk=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAGo=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAGo=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAGs=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAGs=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAGw=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAGw=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAG0=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -810,10 +792,7 @@
   </record>
   <record id="9" aka="AAAAAAAAAAk=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -824,43 +803,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAG0=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAG4=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAG4=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAG8=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAG8=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAHA=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAHA=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAHE=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAHE=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAHI=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAHI=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAHM=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAHM=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAHQ=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -871,10 +850,7 @@
   </record>
   <record id="10" aka="AAAAAAAAAAo=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -885,43 +861,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAHQ=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAHU=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAHU=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAHY=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAHY=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAHc=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAHc=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAHg=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAHg=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAHk=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAHk=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAHo=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAHo=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAHs=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -932,10 +908,7 @@
   </record>
   <record id="11" aka="AAAAAAAAAAs=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -946,43 +919,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAHs=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAHw=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAHw=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAH0=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAH0=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAH4=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAH4=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAH8=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAH8=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAIA=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAIA=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAIE=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAIE=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAII=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -993,10 +966,7 @@
   </record>
   <record id="12" aka="AAAAAAAAAAw=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -1007,43 +977,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAII=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAIM=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAIM=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAIQ=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAIQ=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAIU=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAIU=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAIY=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAIY=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAIc=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAIc=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAIg=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAIg=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAIk=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -1054,10 +1024,7 @@
   </record>
   <record id="13" aka="AAAAAAAAAA0=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -1068,43 +1035,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAIk=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAIo=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAIo=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAIs=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAIs=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAIw=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAIw=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAI0=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAI0=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAI4=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAI4=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAI8=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAI8=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAJA=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -1115,10 +1082,7 @@
   </record>
   <record id="14" aka="AAAAAAAAAA4=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -1129,43 +1093,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAJA=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAJE=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAJE=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAJI=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAJI=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAJM=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAJM=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAJQ=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAJQ=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAJU=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAJU=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAJY=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAJY=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAJc=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -1176,10 +1140,7 @@
   </record>
   <record id="15" aka="AAAAAAAAAA8=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -1190,43 +1151,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAJc=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAJg=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAJg=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAJk=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAJk=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAJo=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAJo=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAJs=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAJs=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAJw=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAJw=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAJ0=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAJ0=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAJ4=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -1237,10 +1198,7 @@
   </record>
   <record id="16" aka="AAAAAAAAABA=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -1251,43 +1209,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAJ4=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAJ8=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAJ8=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAKA=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAKA=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAKE=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAKE=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAKI=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAKI=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAKM=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAKM=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAKQ=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAKQ=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAKU=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -1298,10 +1256,7 @@
   </record>
   <record id="17" aka="AAAAAAAAABE=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -1312,43 +1267,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAKU=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAKY=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAKY=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAKc=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAKc=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAKg=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAKg=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAKk=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAKk=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAKo=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAKo=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAKs=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAKs=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAKw=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -1359,10 +1314,7 @@
   </record>
   <record id="18" aka="AAAAAAAAABI=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -1373,43 +1325,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAKw=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAK0=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAK0=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAK4=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAK4=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAK8=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAK8=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAALA=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAALA=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAALE=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAALE=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAALI=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAALI=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAALM=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -1420,10 +1372,7 @@
   </record>
   <record id="19" aka="AAAAAAAAABM=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -1434,49 +1383,49 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAALM=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAALQ=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAALQ=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAALU=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAALU=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAALY=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAALY=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAALc=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAALc=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAALg=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAALg=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAALk=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAALk=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAALo=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>text/plain</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAALo=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAALs=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -1487,10 +1436,7 @@
   </record>
   <record id="20" aka="AAAAAAAAABQ=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -1501,43 +1447,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAALs=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAALw=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAALw=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAL0=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAL0=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAL4=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAL4=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAL8=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAL8=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAMA=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAMA=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAME=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAME=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAMI=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -1548,10 +1494,7 @@
   </record>
   <record id="21" aka="AAAAAAAAABU=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -1562,43 +1505,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAMI=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAMM=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAMM=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAMQ=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAMQ=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAMU=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAMU=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAMY=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAMY=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAMc=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAMc=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAMg=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAMg=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAMk=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -1609,10 +1552,7 @@
   </record>
   <record id="22" aka="AAAAAAAAABY=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -1623,43 +1563,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAMk=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAMo=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAMo=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAMs=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAMs=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAMw=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAMw=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAM0=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAM0=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAM4=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAM4=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAM8=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAM8=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAANA=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -1670,10 +1610,7 @@
   </record>
   <record id="23" aka="AAAAAAAAABc=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -1684,43 +1621,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAANA=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAANE=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAANE=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAANI=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAANI=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAANM=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAANM=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAANQ=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAANQ=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAANU=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAANU=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAANY=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAANY=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAANc=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -1731,10 +1668,7 @@
   </record>
   <record id="24" aka="AAAAAAAAABg=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -1745,43 +1679,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAANc=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAANg=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAANg=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAANk=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAANk=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAANo=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAANo=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAANs=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAANs=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAANw=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAANw=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAN0=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAN0=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAN4=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -1792,10 +1726,7 @@
   </record>
   <record id="25" aka="AAAAAAAAABk=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -1806,43 +1737,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAN4=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAN8=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAN8=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAOA=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAOA=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAOE=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAOE=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAOI=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAOI=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAOM=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAOM=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAOQ=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAOQ=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAOU=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -1853,10 +1784,7 @@
   </record>
   <record id="26" aka="AAAAAAAAABo=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -1867,43 +1795,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAOU=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAOY=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAOY=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAOc=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAOc=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAOg=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAOg=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAOk=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAOk=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAOo=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAOo=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAOs=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAOs=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAOw=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -1914,10 +1842,7 @@
   </record>
   <record id="27" aka="AAAAAAAAABs=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -1928,43 +1853,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAOw=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAO0=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAO0=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAO4=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAO4=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAO8=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAO8=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAPA=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAPA=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAPE=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAPE=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAPI=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAPI=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAPM=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -1975,10 +1900,7 @@
   </record>
   <record id="28" aka="AAAAAAAAABw=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -1989,43 +1911,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAPM=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAPQ=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAPQ=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAPU=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAPU=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAPY=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAPY=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAPc=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAPc=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAPg=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAPg=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAPk=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAPk=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAPo=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -2036,10 +1958,7 @@
   </record>
   <record id="29" aka="AAAAAAAAAB0=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -2050,43 +1969,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAPo=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAPs=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAPs=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAPw=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAPw=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAP0=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAP0=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAP4=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAP4=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAP8=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAP8=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAQA=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAQA=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAQE=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -2097,10 +2016,7 @@
   </record>
   <record id="30" aka="AAAAAAAAAB4=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -2111,43 +2027,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAQE=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAQI=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAQI=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAQM=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAQM=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAQQ=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAQQ=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAQU=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAQU=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAQY=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAQY=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAQc=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAQc=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAQg=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -2158,10 +2074,7 @@
   </record>
   <record id="31" aka="AAAAAAAAAB8=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -2172,43 +2085,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAQg=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAQk=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAQk=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAQo=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAQo=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAQs=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAQs=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAQw=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAQw=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAQ0=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAQ0=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAQ4=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAQ4=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAQ8=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -2219,10 +2132,7 @@
   </record>
   <record id="32" aka="AAAAAAAAACA=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -2233,43 +2143,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAQ8=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAARA=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAARA=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAARE=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAARE=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAARI=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAARI=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAARM=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAARM=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAARQ=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAARQ=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAARU=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAARU=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAARY=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -2280,10 +2190,7 @@
   </record>
   <record id="33" aka="AAAAAAAAACE=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -2294,43 +2201,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAARY=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAARc=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAARc=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAARg=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAARg=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAARk=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAARk=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAARo=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAARo=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAARs=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAARs=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAARw=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAARw=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAR0=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -2341,10 +2248,7 @@
   </record>
   <record id="34" aka="AAAAAAAAACI=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -2355,43 +2259,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAR0=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAR4=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAR4=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAR8=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAR8=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAASA=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAASA=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAASE=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAASE=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAASI=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAASI=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAASM=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAASM=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAASQ=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -2402,10 +2306,7 @@
   </record>
   <record id="35" aka="AAAAAAAAACM=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -2416,43 +2317,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAASQ=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAASU=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAASU=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAASY=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAASY=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAASc=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAASc=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAASg=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAASg=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAASk=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAASk=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAASo=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAASo=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAASs=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -2463,10 +2364,7 @@
   </record>
   <record id="36" aka="AAAAAAAAACQ=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -2477,43 +2375,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAASs=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAASw=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAASw=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAS0=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAS0=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAS4=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAS4=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAS8=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAS8=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAATA=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAATA=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAATE=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAATE=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAATI=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -2524,10 +2422,7 @@
   </record>
   <record id="37" aka="AAAAAAAAACU=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -2538,43 +2433,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAATI=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAATM=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAATM=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAATQ=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAATQ=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAATU=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAATU=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAATY=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAATY=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAATc=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAATc=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAATg=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAATg=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAATk=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -2585,10 +2480,7 @@
   </record>
   <record id="38" aka="AAAAAAAAACY=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -2599,43 +2491,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAATk=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAATo=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAATo=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAATs=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAATs=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAATw=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAATw=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAT0=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAT0=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAT4=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAT4=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAT8=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAT8=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAUA=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -2646,10 +2538,7 @@
   </record>
   <record id="39" aka="AAAAAAAAACc=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -2660,43 +2549,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAUA=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAUE=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAUE=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAUI=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAUI=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAUM=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAUM=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAUQ=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAUQ=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAUU=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAUU=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAUY=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAUY=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAUc=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -2707,10 +2596,7 @@
   </record>
   <record id="40" aka="AAAAAAAAACg=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -2721,43 +2607,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAUc=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAUg=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAUg=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAUk=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAUk=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAUo=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAUo=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAUs=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAUs=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAUw=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAUw=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAU0=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAU0=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAU4=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -2768,10 +2654,7 @@
   </record>
   <record id="41" aka="AAAAAAAAACk=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -2782,43 +2665,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAU4=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAU8=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAU8=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAVA=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAVA=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAVE=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAVE=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAVI=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAVI=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAVM=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAVM=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAVQ=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAVQ=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAVU=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -2829,10 +2712,7 @@
   </record>
   <record id="42" aka="AAAAAAAAACo=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -2843,43 +2723,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAVU=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAVY=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAVY=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAVc=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAVc=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAVg=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAVg=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAVk=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAVk=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAVo=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAVo=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAVs=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAVs=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAVw=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -2890,10 +2770,7 @@
   </record>
   <record id="43" aka="AAAAAAAAACs=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -2904,43 +2781,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAVw=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAV0=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAV0=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAV4=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAV4=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAV8=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAV8=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAWA=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAWA=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAWE=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAWE=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAWI=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAWI=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAWM=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -2951,10 +2828,7 @@
   </record>
   <record id="44" aka="AAAAAAAAACw=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -2965,43 +2839,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAWM=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAWQ=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAWQ=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAWU=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAWU=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAWY=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAWY=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAWc=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAWc=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAWg=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAWg=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAWk=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAWk=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAWo=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -3012,10 +2886,7 @@
   </record>
   <record id="45" aka="AAAAAAAAAC0=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -3026,43 +2897,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAWo=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAWs=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAWs=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAWw=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAWw=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAW0=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAW0=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAW4=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAW4=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAW8=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAW8=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAXA=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAXA=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAXE=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -3073,10 +2944,7 @@
   </record>
   <record id="46" aka="AAAAAAAAAC4=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -3087,43 +2955,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAXE=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAXI=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAXI=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAXM=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAXM=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAXQ=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAXQ=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAXU=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAXU=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAXY=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAXY=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAXc=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAXc=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAXg=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -3134,10 +3002,7 @@
   </record>
   <record id="47" aka="AAAAAAAAAC8=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -3148,43 +3013,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAXg=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAXk=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAXk=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAXo=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAXo=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAXs=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAXs=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAXw=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAXw=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAX0=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAX0=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAX4=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAX4=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAX8=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -3195,10 +3060,7 @@
   </record>
   <record id="48" aka="AAAAAAAAADA=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -3209,43 +3071,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAX8=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAYA=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAYA=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAYE=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAYE=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAYI=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAYI=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAYM=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAYM=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAYQ=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAYQ=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAYU=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAYU=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAYY=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -3256,10 +3118,7 @@
   </record>
   <record id="49" aka="AAAAAAAAADE=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -3270,43 +3129,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAYY=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAYc=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAYc=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAYg=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAYg=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAYk=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAYk=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAYo=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAYo=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAYs=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAYs=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAYw=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAYw=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAY0=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -3317,10 +3176,7 @@
   </record>
   <record id="50" aka="AAAAAAAAADI=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -3331,43 +3187,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAY0=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAY4=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAY4=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAY8=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAY8=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAZA=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAZA=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAZE=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAZE=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAZI=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAZI=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAZM=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAZM=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAZQ=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -3378,10 +3234,7 @@
   </record>
   <record id="51" aka="AAAAAAAAADM=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -3392,43 +3245,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAZQ=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAZU=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAZU=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAZY=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAZY=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAZc=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAZc=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAZg=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAZg=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAZk=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAZk=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAZo=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAZo=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAZs=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -3439,10 +3292,7 @@
   </record>
   <record id="52" aka="AAAAAAAAADQ=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -3453,43 +3303,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAZs=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAZw=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAZw=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAZ0=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAZ0=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAZ4=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAZ4=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAZ8=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAZ8=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAaA=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAaA=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAaE=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAaE=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAaI=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -3500,10 +3350,7 @@
   </record>
   <record id="53" aka="AAAAAAAAADU=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -3514,43 +3361,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAaI=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAaM=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAaM=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAaQ=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAaQ=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAaU=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAaU=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAaY=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAaY=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAac=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAac=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAag=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAag=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAak=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -3561,10 +3408,7 @@
   </record>
   <record id="54" aka="AAAAAAAAADY=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -3575,43 +3419,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAak=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAao=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAao=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAas=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAas=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAaw=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAaw=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAa0=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAa0=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAa4=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAa4=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAa8=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAa8=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAbA=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -3622,10 +3466,7 @@
   </record>
   <record id="55" aka="AAAAAAAAADc=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -3636,43 +3477,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAbA=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAbE=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAbE=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAbI=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAbI=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAbM=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAbM=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAbQ=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAbQ=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAbU=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAbU=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAbY=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAbY=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAbc=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -3683,10 +3524,7 @@
   </record>
   <record id="56" aka="AAAAAAAAADg=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -3697,43 +3535,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAbc=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAbg=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAbg=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAbk=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAbk=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAbo=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAbo=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAbs=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAbs=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAbw=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAbw=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAb0=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAb0=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAb4=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -3744,10 +3582,7 @@
   </record>
   <record id="57" aka="AAAAAAAAADk=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -3758,43 +3593,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAb4=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAb8=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAb8=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAcA=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAcA=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAcE=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAcE=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAcI=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAcI=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAcM=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAcM=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAcQ=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAcQ=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAcU=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -3805,10 +3640,7 @@
   </record>
   <record id="58" aka="AAAAAAAAADo=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -3819,43 +3651,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAcU=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAcY=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAcY=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAcc=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAcc=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAcg=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAcg=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAck=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAck=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAco=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAco=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAcs=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAcs=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAcw=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -3866,10 +3698,7 @@
   </record>
   <record id="59" aka="AAAAAAAAADs=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -3880,43 +3709,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAcw=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAc0=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAc0=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAc4=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAc4=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAc8=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAc8=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAdA=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAdA=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAdE=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAdE=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAdI=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAdI=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAdM=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -3927,10 +3756,7 @@
   </record>
   <record id="60" aka="AAAAAAAAADw=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -3941,43 +3767,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAdM=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAdQ=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAdQ=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAdU=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAdU=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAdY=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAdY=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAdc=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAdc=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAdg=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAdg=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAdk=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAdk=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAdo=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -3988,10 +3814,7 @@
   </record>
   <record id="61" aka="AAAAAAAAAD0=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -4002,43 +3825,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAdo=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAds=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAds=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAdw=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAdw=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAd0=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAd0=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAd4=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAd4=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAd8=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAd8=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAeA=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAeA=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAeE=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -4049,10 +3872,7 @@
   </record>
   <record id="62" aka="AAAAAAAAAD4=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -4063,43 +3883,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAeE=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAeI=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAeI=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAeM=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAeM=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAeQ=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAeQ=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAeU=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAeU=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAeY=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAeY=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAec=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAec=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAeg=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -4110,10 +3930,7 @@
   </record>
   <record id="63" aka="AAAAAAAAAD8=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -4124,43 +3941,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAeg=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAek=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAek=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAeo=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAeo=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAes=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAes=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAew=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAew=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAe0=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAe0=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAe4=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAe4=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAe8=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -4171,10 +3988,7 @@
   </record>
   <record id="64" aka="AAAAAAAAAEA=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -4185,43 +3999,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAe8=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAfA=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAfA=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAfE=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAfE=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAfI=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAfI=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAfM=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAfM=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAfQ=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAfQ=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAfU=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAfU=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAfY=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -4232,10 +4046,7 @@
   </record>
   <record id="65" aka="AAAAAAAAAEE=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -4246,43 +4057,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAfY=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAfc=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAfc=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAfg=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAfg=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAfk=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAfk=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAfo=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAfo=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAfs=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAfs=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAfw=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAfw=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAf0=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -4293,10 +4104,7 @@
   </record>
   <record id="66" aka="AAAAAAAAAEI=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -4307,43 +4115,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAf0=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAf4=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAf4=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAf8=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAf8=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAgA=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAgA=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAgE=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAgE=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAgI=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAgI=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAgM=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAgM=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAgQ=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -4354,10 +4162,7 @@
   </record>
   <record id="67" aka="AAAAAAAAAEM=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -4368,43 +4173,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAgQ=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAgU=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAgU=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAgY=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAgY=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAgc=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAgc=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAgg=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAgg=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAgk=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAgk=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAgo=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAgo=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAgs=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -4415,10 +4220,7 @@
   </record>
   <record id="68" aka="AAAAAAAAAEQ=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -4429,43 +4231,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAgs=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAgw=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAgw=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAg0=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAg0=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAg4=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAg4=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAg8=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAg8=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAhA=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAhA=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAhE=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAhE=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAhI=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -4476,10 +4278,7 @@
   </record>
   <record id="69" aka="AAAAAAAAAEU=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -4490,43 +4289,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAhI=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAhM=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAhM=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAhQ=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAhQ=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAhU=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAhU=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAhY=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAhY=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAhc=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAhc=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAhg=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAhg=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAhk=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -4537,10 +4336,7 @@
   </record>
   <record id="70" aka="AAAAAAAAAEY=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -4551,43 +4347,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAhk=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAho=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAho=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAhs=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAhs=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAhw=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAhw=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAh0=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAh0=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAh4=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAh4=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAh8=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAh8=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAiA=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -4598,10 +4394,7 @@
   </record>
   <record id="71" aka="AAAAAAAAAEc=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -4612,43 +4405,43 @@
                 <item>
                     <key> <string>image/gif</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAiA=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAiE=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/jpeg</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAiE=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAiI=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/pcx</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAiI=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAiM=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/png</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAiM=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAiQ=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/tiff</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAiQ=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAiU=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-ms-bmp</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAiU=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAiY=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>image/x-portable-pixmap</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAiY=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAic=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -4659,10 +4452,7 @@
   </record>
   <record id="72" aka="AAAAAAAAAEg=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -4673,13 +4463,13 @@
                 <item>
                     <key> <string>text/html</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAic=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAig=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>text/plain</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAig=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAik=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -4690,10 +4480,29 @@
   </record>
   <record id="73" aka="AAAAAAAAAEk=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>text/plain</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAio=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="74" aka="AAAAAAAAAEo=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -4704,25 +4513,25 @@
                 <item>
                     <key> <string>application/vnd.oasis.opendocument.text</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAik=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAis=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>text/html</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAio=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAiw=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>text/plain</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAis=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAi0=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>text/x-html-safe</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAiw=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAi4=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -4731,12 +4540,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="74" aka="AAAAAAAAAEo=">
+  <record id="75" aka="AAAAAAAAAEs=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -4747,7 +4553,7 @@
                 <item>
                     <key> <string>text/html</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAi0=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAi8=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -4756,12 +4562,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="75" aka="AAAAAAAAAEs=">
+  <record id="76" aka="AAAAAAAAAEw=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -4772,7 +4575,7 @@
                 <item>
                     <key> <string>text/html</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAi4=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAjA=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -4781,12 +4584,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="76" aka="AAAAAAAAAEw=">
+  <record id="77" aka="AAAAAAAAAE0=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -4797,7 +4597,7 @@
                 <item>
                     <key> <string>text/html</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAi8=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAjE=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -4806,12 +4606,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="77" aka="AAAAAAAAAE0=">
+  <record id="78" aka="AAAAAAAAAE4=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -4822,13 +4619,13 @@
                 <item>
                     <key> <string>text/html</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAjA=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAjI=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>text/plain</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAjE=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAjM=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -4837,12 +4634,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="78" aka="AAAAAAAAAE4=">
+  <record id="79" aka="AAAAAAAAAE8=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -4853,7 +4647,7 @@
                 <item>
                     <key> <string>text/html</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAjI=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAjQ=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -4862,12 +4656,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="79" aka="AAAAAAAAAE8=">
+  <record id="80" aka="AAAAAAAAAFA=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -4878,7 +4669,7 @@
                 <item>
                     <key> <string>text/html</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAjM=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAjU=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -4887,12 +4678,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="80" aka="AAAAAAAAAFA=">
+  <record id="81" aka="AAAAAAAAAFE=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -4903,13 +4691,13 @@
                 <item>
                     <key> <string>text/html</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAjQ=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAjY=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key> <string>text/plain</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAjU=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAjc=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -4918,12 +4706,9 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="81" aka="AAAAAAAAAFE=">
+  <record id="82" aka="AAAAAAAAAFI=">
     <pickle>
-      <tuple>
-        <global name="PersistentMapping" module="Persistence.mapping"/>
-        <tuple/>
-      </tuple>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -4945,21 +4730,6 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="82" aka="AAAAAAAAAFI=">
-    <pickle>
-      <global name="PersistentList" module="persistent.list"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>data</string> </key>
-            <value>
-              <list/>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
   <record id="83" aka="AAAAAAAAAFM=">
     <pickle>
       <global name="PersistentList" module="persistent.list"/>
@@ -12205,4 +11975,34 @@
       </dictionary>
     </pickle>
   </record>
+  <record id="566" aka="AAAAAAAAAjY=">
+    <pickle>
+      <global name="PersistentList" module="persistent.list"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="567" aka="AAAAAAAAAjc=">
+    <pickle>
+      <global name="PersistentList" module="persistent.list"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
 </ZopeData>
diff --git a/product/ERP5/bootstrap/erp5_core/bt/change_log b/product/ERP5/bootstrap/erp5_core/bt/change_log
index fce99e71d6..f533f41d78 100644
--- a/product/ERP5/bootstrap/erp5_core/bt/change_log
+++ b/product/ERP5/bootstrap/erp5_core/bt/change_log
@@ -1,3 +1,7 @@
+2010-09-10 nicolas delaby
+* Declare new mimetype text/csv
+* Accept text/csv as input mimetype for csv_to_text portal_transform chain.
+
 2010-09-10 nicolas.dumazet
 * Property Sheet portal type and view
 
diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision
index 9cc2f9d9f7..98ced614c4 100644
--- a/product/ERP5/bootstrap/erp5_core/bt/revision
+++ b/product/ERP5/bootstrap/erp5_core/bt/revision
@@ -1 +1 @@
-1694
+1696
\ No newline at end of file
-- 
2.30.9