Index: trunk/data/preferences.xsd
===================================================================
--- trunk/data/preferences.xsd	(revision 4655)
+++ trunk/data/preferences.xsd	(revision 4656)
@@ -11,4 +11,6 @@
 				<element name="collection" type="tns:collection" />
 				<element name="list" type="tns:list" />
+				<element name="lists" type="tns:lists" />
+				<element name="maps" type="tns:maps" />
 			</choice>
 		</sequence>
@@ -36,7 +38,9 @@
 			    <element name="entry" type="tns:entry" minOccurs="0" maxOccurs="unbounded"/>
             </sequence>
+            <!-- deprecated: remove mid 2012 -->
             <sequence>
 			    <element name="list" type="tns:slist" minOccurs="0" maxOccurs="unbounded"/>
             </sequence>
+            <!-- deprecated: remove mid 2012 -->
             <sequence>
 			    <element name="map" type="tns:map" minOccurs="0" maxOccurs="unbounded"/>
@@ -46,4 +50,18 @@
 	</complexType>
 	
+	<complexType name="lists">
+        <sequence>
+		    <element name="list" type="tns:slist" minOccurs="0" maxOccurs="unbounded"/>
+        </sequence>
+		<attribute name="key" type="string" use="required" />
+	</complexType>
+
+	<complexType name="maps">
+        <sequence>
+		    <element name="map" type="tns:map" minOccurs="0" maxOccurs="unbounded"/>
+        </sequence>
+		<attribute name="key" type="string" use="required" />
+	</complexType>
+
 	<complexType name="slist">
         <sequence>