--- a/xml/schema/extensions/prov-dictionary.xsd	Wed Jan 30 14:47:50 2013 -0700
+++ b/xml/schema/extensions/prov-dictionary.xsd	Wed Jan 30 15:48:17 2013 -0700
@@ -5,6 +5,16 @@
 	
 	<xs:include schemaLocation="../prov-core.xsd" />	
 		
+	<!-- Dictionary -->
+	<xs:complexType name="Dictionary">
+		<xs:complexContent>
+			<xs:extension base="prov:Collection">
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	
+	<xs:element name="dictionary" type="prov:Dictionary" substitutionGroup="prov:abstractElement" />
+		
 	<!-- Key-Value Pair -->
 	<xs:complexType name="KeyValuePair">
         <xs:sequence>
@@ -13,7 +23,7 @@
         </xs:sequence>
 	</xs:complexType>
 	
-	<xs:element name="keyValuePair" type="prov:KeyValuePair"/>
+	<xs:element name="keyValuePair" type="prov:KeyValuePair" substitutionGroup="prov:abstractElement"/>
 
 	<!-- Dictionary Membership -->
 	<xs:complexType name="DictionaryMembership">
@@ -23,7 +33,7 @@
 	  </xs:sequence>
 	</xs:complexType>
 	
-	<xs:element name="hadDictionaryMember" type="prov:DictionaryMembership"/>
+	<xs:element name="hadDictionaryMember" type="prov:DictionaryMembership" substitutionGroup="prov:abstractElement"/>
 
 	<!-- Insertion -->
 	<xs:complexType name="Insertion">
@@ -34,7 +44,7 @@
 	  </xs:sequence>
 	</xs:complexType>
 	
-	<xs:element name="derivedByInsertionFrom" type="prov:Insertion"/>
+	<xs:element name="derivedByInsertionFrom" type="prov:Insertion" substitutionGroup="prov:abstractElement"/>
 
 	<!-- Removal -->
 	<xs:complexType name="Removal">
@@ -45,6 +55,6 @@
 	  </xs:sequence>
 	</xs:complexType>
 	
-	<xs:element name="derivedByRemovalFrom" type="prov:Removal"/>
+	<xs:element name="derivedByRemovalFrom" type="prov:Removal" substitutionGroup="prov:abstractElement"/>
 
 </xs:schema>

--- a/xml/schema/prov.xsd	Wed Jan 30 14:47:50 2013 -0700
+++ b/xml/schema/prov.xsd	Wed Jan 30 15:48:17 2013 -0700
@@ -8,6 +8,5 @@
 	<xs:include schemaLocation="prov-core.xsd"/>
 	<xs:include schemaLocation="extensions/prov-dictionary.xsd"/>
 	<xs:include schemaLocation="extensions/prov-links.xsd"/>
-	<xs:include schemaLocation="extensions/prov-extended-elements.xsd"/>
 
 </xs:schema>