--- a/xml/schema/prov-core.xsd	Tue Feb 05 18:30:46 2013 +0100
+++ b/xml/schema/prov-core.xsd	Tue Feb 05 12:26:17 2013 -0700
@@ -275,11 +275,15 @@
 
   <!-- Component 4 -->
 
+  <!-- Is there a way to have this still extend prov:Entity? -->
+
   <xs:complexType name="Bundle">
 	<xs:complexContent>
 	  <xs:extension base="prov:Entity">
 		<xs:sequence>
-	      <xs:group ref="prov:documentElements"/>
+			<xs:choice maxOccurs="unbounded">
+				<xs:group ref="prov:documentElements"/>
+			</xs:choice>
 	    </xs:sequence>
 	  </xs:extension>
 	</xs:complexContent>
@@ -352,8 +356,8 @@
   <xs:element name="location" type="xs:anySimpleType"/>
   <xs:element name="value" type="xs:anySimpleType"/>
 
-  <xs:attribute name="id" type="xs:anyURI"/>
-  <xs:attribute name="ref" type="xs:anyURI"/>
+  <xs:attribute name="id" type="xs:QName"/>
+  <xs:attribute name="ref" type="xs:QName"/>
 
   <xs:complexType name="IDRef">
     <xs:attribute ref="prov:ref" use="required" />
@@ -441,7 +445,6 @@
 	    <xs:element ref="prov:emptyCollection"/>
         <xs:element ref="prov:hadMember"/>
         <xs:element ref="prov:plan"/>
-		<xs:any namespace="##other"/>
       </xs:choice>
       <xs:element ref="prov:abstractElement" minOccurs="0" maxOccurs="unbounded" />
     </xs:sequence>
@@ -452,7 +455,7 @@
     <xs:sequence>
       <xs:choice maxOccurs="unbounded">
         <xs:group ref="prov:documentElements"/>
-        <xs:element ref="prov:bundle"/>
+		<xs:any namespace="##other"/>
       </xs:choice>
     </xs:sequence>
   </xs:complexType>