merge
authorTim L <lebot@rpi.edu>
Wed, 11 Jul 2012 08:34:45 -0400
changeset 3938 5a7c6aa026e0
parent 3937 c35ed390bb30 (current diff)
parent 3936 d2ebba0daead (diff)
child 3939 11bd44cd29a8
child 3940 af164689d92a
merge
--- a/model/comments/issue-438-khalid.txt	Wed Jul 11 08:34:30 2012 -0400
+++ b/model/comments/issue-438-khalid.txt	Wed Jul 11 08:34:45 2012 -0400
@@ -46,11 +46,16 @@
    >   one of id, entity, time, and attributes must be present." However,
    >   according to the definition of Usage in [12], the activity
    >   identifier is not optional.
+
+correct, the activity identifier is not optional
+
    > 
    > - Section 3.2.1, defines derivation as: [17] derivationExpression ::=
    >  "wasDerivedFrom" "(" optionalIdentifier eIdentifier "," eIdentifier (
    >  "," aIdentifierOrMarker "," gIdentifierOrMarker ","
    >  uIdentifierOrMarker )? optionalAttributeValuePairs ")"
+
+
    >  
    >  I may be wrong, but the ( "," aIdentifierOrMarker ","
    >  gIdentifierOrMarker "," uIdentifierOrMarker )?  means that either all
@@ -62,12 +67,22 @@
    > eIdentifier "," eIdentifier ( "," aIdentifierOrMarker)?  (","
    > gIdentifierOrMarker ")? (," uIdentifierOrMarker )?
    > optionalAttributeValuePairs ")"
+
+No, we went for a all-or-nothing approach for optionals.
    > 
    > - Looking at the definition of Revision, Quotation and Primary source,
    >   I am wondering if it would make sense to say something about the
    >   kind of derivation in the derivationExpression, to state that it may
    >   contain an additional optional element that specifies the kind of
    >   derivation.
+
+This is already said in prov-dm, and we just wanted to have the minimum 
+necessary to explain the syntax.
+
+
+Thanks,
+Luc
+
    > 
    > Khalid
    > 
--- a/model/comments/issue-438-tom.txt	Wed Jul 11 08:34:30 2012 -0400
+++ b/model/comments/issue-438-tom.txt	Wed Jul 11 08:34:45 2012 -0400
@@ -17,7 +17,7 @@
    > following expressions, the optional activity a is specified along with
    > the generation and usage identifiers g2 and u1:"
 
-example 2 has changed? issue no longer applies
+Text was updated.
 
    > 
    > - 2.2 EBNF Grammar
@@ -26,12 +26,15 @@
    >  activityExpression etc., This sentence is a bit weird. Should the
    >  first "expression" be omitted?
 
-already fixed 
+Sentence was fixed
 
    > 
    > - 2.5 Comments
    > typo: "cooments" (is fixed in latest editors draft I think)
    > 
+
+done
+
    > - 3.1.4 - 3.1.8 
    > 
    > Even though the production usageExpression allows for expressions
--- a/model/diff-n.html	Wed Jul 11 08:34:30 2012 -0400
+++ b/model/diff-n.html	Wed Jul 11 08:34:45 2012 -0400
@@ -568,20 +568,24 @@
 <li> <span class="delete">PROV-N,</span><a href="http://www.w3.org/TR/prov-n/"><span class="insert">PROV-N</span></a><span class="insert">,</span> a notation for provenance aimed at human consumption  (this document);</li>
 <li> <span class="delete">PROV-O,</span><a href="http://www.w3.org/TR/prov-o/"><span class="insert">PROV-O</span></a><span class="insert">,</span> the PROV ontology, an <span class="delete">OWL-RL</span><span class="insert">OWL2</span> ontology allowing the mapping of PROV to RDF;</li>
 <li> <span class="delete">PROV-AQ,</span><a href="http://www.w3.org/TR/prov-aq/"><span class="insert">PROV-AQ</span></a><span class="insert">,</span> the mechanisms for accessing and querying provenance; </li>
-<li> <span class="delete">PROV-PRIMER,</span><a href="http://www.w3.org/TR/prov-primer/"><span class="insert">PROV-PRIMER</span></a><span class="insert">,</span> a primer for the PROV data model;</li>
-<li> PROV-SEM, a formal semantics for the PROV data model;</li>
-<li> PROV-XML, an XML schema for the PROV data model.</li>
+<li> <span class="delete">PROV-PRIMER,</span><a href="http://www.w3.org/TR/prov-primer/"><span class="insert">PROV-PRIMER</span></a><span class="insert">,</span> a primer<span class="delete"> for the PROV data model;</span>
+<span class="delete"> PROV-SEM, a formal semantics for the PROV data model;</span>
+<span class="delete"> PROV-XML, an XML schema</span> for the PROV data model.</li>
+
+
 </ul>
 <h4 id="how-to-read-the-prov-family-of-specifications">How to read the PROV Family of Specifications</h4>
 <ul>
 <li>The primer is the entry point to PROV offering an introduction to the provenance model.</li>
-<li>The Linked Data and Semantic Web community should focus on PROV-O defining PROV classes and properties specified in an <span class="delete">OWL-RL</span><span class="insert">OWL2</span> ontology. For further details, PROV-DM and PROV-CONSTRAINTS specify the constraints applicable to the data model, and its interpretation. PROV-SEM provides a mathematical semantics.</li>
-<li>The XML community should focus on PROV-XML defining an XML schema for PROV. Further details can also be found in PROV-DM, PROV-CONSTRAINTS, and PROV-SEM.</li>
+<li>The Linked Data and Semantic Web community should focus on PROV-O defining PROV classes and properties specified in an <span class="delete">OWL-RL</span><span class="insert">OWL2</span> ontology. For further details, PROV-DM and PROV-CONSTRAINTS specify the constraints applicable to the data model, and its interpretation. <span class="delete">PROV-SEM provides a mathematical semantics.</span></li>
+<span class="delete">The XML community should focus on PROV-XML defining an XML schema for PROV. Further details can also be found in PROV-DM, PROV-CONSTRAINTS, and PROV-SEM.</span>
+
+
 <li>Developers seeking to retrieve or publish provenance should focus on PROV-AQ.</li>
 <li>Readers seeking to implement other PROV serializations
-should focus on PROV-DM and PROV-CONSTRAINTS.  PROV-O, PROV-N, PROV-XML offer examples of mapping to RDF, text, and XML, respectively.</li>
+should focus on PROV-DM and PROV-CONSTRAINTS.  <span class="delete">PROV-O, PROV-N, PROV-XML</span><span class="insert">PROV-O and PROV-N</span> offer examples of mapping to <span class="delete">RDF,</span><span class="insert">RDF and</span> text,<span class="delete"> and XML,</span> respectively.</li>
 </ul>
-<p>This document was published by the <a href="http://www.w3.org/2011/prov/">Provenance Working Group</a> as an Editor's Draft. If you wish to make comments regarding this document, please send them to <a href="mailto:[email protected]">[email protected]</a> (<a href="mailto:[email protected]?subject=subscribe">subscribe</a>, <a href="http://lists.w3.org/Archives/Public/public-prov-comments/">archives</a>). All feedback is welcome.</p><p>Publication as an Editor's Draft does not imply endorsement by the <acronym title="World Wide Web Consortium">W3C</acronym> Membership. This is a draft document and may be updated, replaced or obsoleted by other documents at any time. It is inappropriate to cite this document as other than work in progress.</p><p>This document was produced by a group operating under the <a href="http://www.w3.org/Consortium/Patent-Policy-20040205/">5 February 2004 <acronym title="World Wide Web Consortium">W3C</acronym> Patent Policy</a>. <acronym title="World Wide Web Consortium">W3C</acronym> maintains a <a href="http://www.w3.org/2004/01/pp-impl/46974/status" rel="disclosure">public list of any patent disclosures</a> made in connection with the deliverables of the group; that page also includes instructions for disclosing a patent. An individual who has actual knowledge of a patent which the individual believes contains <a href="http://www.w3.org/Consortium/Patent-Policy-20040205/#def-essential">Essential Claim(s)</a> must disclose the information in accordance with <a href="http://www.w3.org/Consortium/Patent-Policy-20040205/#sec-Disclosure">section 6 of the <acronym title="World Wide Web Consortium">W3C</acronym> Patent Policy</a>.</p></div><div id="toc" class="section"><h2 class="introductory">Table of Contents</h2><ul class="toc"><li class="tocline"><a href="#introduction" class="tocxref"><span class="secno">1. </span>Introduction</a><ul class="toc"><li class="tocline"><a href="#purpose" class="tocxref"><span class="secno">1.1 </span>Purpose of this Document and target audience</a></li><li class="tocline"><a href="#structure-of-this-document" class="tocxref"><span class="secno">1.2 </span>Structure of this Document</a></li><li class="tocline"><a href="#notational-conventions" class="tocxref"><span class="secno">1.3 </span>Notational Conventions</a></li></ul></li><li class="tocline"><a href="#general-conventions" class="tocxref"><span class="secno">2. </span>General grammar considerations</a><ul class="toc"><li class="tocline"><a href="#functional-syntax" class="tocxref"><span class="secno">2.1 </span>Functional-style Syntax</a></li><li class="tocline"><a href="#grammar-notation" class="tocxref"><span class="secno">2.2 </span>EBNF Grammar</a></li><li class="tocline"><a href="#main-productions" class="tocxref"><span class="secno"><span class="insert">2.3 </span></span><span class="insert">Main Productions</span></a></li><li class="tocline"><a href="#prov-n-optionals" class="tocxref"><span class="secno"><span class="delete">2.3</span><span class="insert">2.4</span> </span>Optional terms in expressions</a></li><li class="tocline"><a href="#prov-n-standard-terms" class="tocxref"><span class="secno"><span class="delete">2.4</span><span class="insert">2.5</span> </span>Identifiers and attributes</a></li><li class="tocline"><a href="#comments" class="tocxref"><span class="secno"><span class="delete">2.5</span><span class="insert">2.6</span> </span>Comments</a></li></ul></li><li class="tocline"><a href="#prov-n-expressions" class="tocxref"><span class="secno">3. </span>PROV-N Productions per Component</a><ul class="toc"><li class="tocline"><a href="#component1" class="tocxref"><span class="secno">3.1 </span>Component 1: Entities and Activities</a><ul class="toc"><li class="tocline"><a href="#expression-Entity" class="tocxref"><span class="secno">3.1.1 </span>Entity</a></li><li class="tocline"><a href="#expression-Activity" class="tocxref"><span class="secno">3.1.2 </span>Activity</a></li><li class="tocline"><a href="#expression-Generation" class="tocxref"><span class="secno">3.1.3 </span>Generation</a></li><li class="tocline"><a href="#expression-Usage" class="tocxref"><span class="secno">3.1.4 </span>Usage</a></li><li class="tocline"><a href="#expression-wasInformedBy" class="tocxref"><span class="secno">3.1.5 </span>Communication</a></li><li class="tocline"><a href="#expression-Start" class="tocxref"><span class="secno">3.1.6 </span>Start</a></li><li class="tocline"><a href="#expression-End" class="tocxref"><span class="secno">3.1.7 </span>End</a></li><li class="tocline"><a href="#expression-Invalidation" class="tocxref"><span class="secno">3.1.8 </span>Invalidation</a></li></ul></li><li class="tocline"><a href="#component2" class="tocxref"><span class="secno">3.2 </span>Component 2: Derivations</a><ul class="toc"><li class="tocline"><a href="#Derivation-Relation" class="tocxref"><span class="secno">3.2.1 </span>Derivation</a></li><li class="tocline"><a href="#expression-Revision" class="tocxref"><span class="secno">3.2.2 </span>Revision</a></li><li class="tocline"><a href="#expression-quotation" class="tocxref"><span class="secno">3.2.3 </span>Quotation</a></li><li class="tocline"><a href="#expression-original-source" class="tocxref"><span class="secno">3.2.4 </span>Primary Source</a></li></ul></li><li class="tocline"><a href="#component3" class="tocxref"><span class="secno">3.3 </span>Component 3: Agents, Responsibility, and Influence</a><ul class="toc"><li class="tocline"><a href="#expression-Agent" class="tocxref"><span class="secno">3.3.1 </span>Agent</a></li><li class="tocline"><a href="#expression-attribution" class="tocxref"><span class="secno">3.3.2 </span>Attribution</a></li><li class="tocline"><a href="#expression-Association" class="tocxref"><span class="secno">3.3.3 </span>Association</a></li><li class="tocline"><a href="#expression-delegation" class="tocxref"><span class="secno">3.3.4 </span>Delegation</a></li><li class="tocline"><a href="#expression-influence" class="tocxref"><span class="secno">3.3.5 </span>Influence</a></li></ul></li><li class="tocline"><a href="#component4" class="tocxref"><span class="secno">3.4 </span>Component 4: Bundles</a><ul class="toc"><li class="tocline"><a href="#expression-bundle-constructor" class="tocxref"><span class="secno">3.4.1 </span>Bundle <span class="delete">Declaration</span><span class="insert">Constructor</span></a></li></ul></li><li class="tocline"><a href="#component5" class="tocxref"><span class="secno">3.5 </span>Component 5: Alternate Entities</a><ul class="toc"><li class="tocline"><a href="#expression-alternate" class="tocxref"><span class="secno">3.5.1 </span>Alternate</a></li><li class="tocline"><a href="#expression-specialization" class="tocxref"><span class="secno">3.5.2 </span>Specialization</a></li><li class="tocline"><a href="#expression-mention" class="tocxref"><span class="secno">3.5.3 </span>Mention</a></li></ul></li><li class="tocline"><a href="#component6" class="tocxref"><span class="secno">3.6 </span>Component 6: Collections</a><ul class="toc"><li class="tocline"><a href="#expression-collection-membership" class="tocxref"><span class="secno">3.6.1 </span>Membership</a></li></ul></li><li class="tocline"><a href="#subexpressions" class="tocxref"><span class="secno">3.7 </span>Further Expressions</a><ul class="toc"><li class="tocline"><a href="#expression-identifier" class="tocxref"><span class="secno">3.7.1 </span>Identifier</a></li><li class="tocline"><a href="#expression-attribute" class="tocxref"><span class="secno">3.7.2 </span>Attribute</a></li><li class="tocline"><a href="#expression-literal" class="tocxref"><span class="secno">3.7.3 </span>Literal</a><ul class="toc"><li class="tocline"><a href="#expression-types" class="tocxref"><span class="secno">3.7.3.1 </span>Reserved Type Values</a></li><li class="tocline"><a href="#expression-Time" class="tocxref"><span class="secno">3.7.3.2 </span>Time Values</a></li></ul></li><li class="tocline"><a href="#expression-NamespaceDeclaration" class="tocxref"><span class="secno">3.7.4 </span>Namespace Declaration</a></li></ul></li></ul></li><li class="tocline"><a href="#toplevelBundle" class="tocxref"><span class="secno">4. </span>Toplevel Bundle</a></li><li class="tocline"><a href="#extensibility" class="tocxref"><span class="secno"><span class="insert">5. </span></span><span class="insert">Extensibility</span></a></li><li class="tocline"><a href="#media-type" class="tocxref"><span class="secno"><span class="delete">5.</span><span class="insert">6.</span> </span>Media Type</a></li><li class="tocline"><a href="#acknowledgements" class="tocxref"><span class="secno">A. </span>Acknowledgements</a></li><li class="tocline"><a href="#references" class="tocxref"><span class="secno">B. </span>References</a><ul class="toc"><li class="tocline"><a href="#normative-references" class="tocxref"><span class="secno">B.1 </span>Normative references</a></li><li class="tocline"><a href="#informative-references" class="tocxref"><span class="secno">B.2 </span>Informative references</a></li></ul></li></ul></div> 
+<p>This document was published by the <a href="http://www.w3.org/2011/prov/">Provenance Working Group</a> as an Editor's Draft. If you wish to make comments regarding this document, please send them to <a href="mailto:[email protected]">[email protected]</a> (<a href="mailto:[email protected]?subject=subscribe">subscribe</a>, <a href="http://lists.w3.org/Archives/Public/public-prov-comments/">archives</a>). All feedback is welcome.</p><p>Publication as an Editor's Draft does not imply endorsement by the <acronym title="World Wide Web Consortium">W3C</acronym> Membership. This is a draft document and may be updated, replaced or obsoleted by other documents at any time. It is inappropriate to cite this document as other than work in progress.</p><p>This document was produced by a group operating under the <a href="http://www.w3.org/Consortium/Patent-Policy-20040205/">5 February 2004 <acronym title="World Wide Web Consortium">W3C</acronym> Patent Policy</a>. <acronym title="World Wide Web Consortium">W3C</acronym> maintains a <a href="http://www.w3.org/2004/01/pp-impl/46974/status" rel="disclosure">public list of any patent disclosures</a> made in connection with the deliverables of the group; that page also includes instructions for disclosing a patent. An individual who has actual knowledge of a patent which the individual believes contains <a href="http://www.w3.org/Consortium/Patent-Policy-20040205/#def-essential">Essential Claim(s)</a> must disclose the information in accordance with <a href="http://www.w3.org/Consortium/Patent-Policy-20040205/#sec-Disclosure">section 6 of the <acronym title="World Wide Web Consortium">W3C</acronym> Patent Policy</a>.</p></div><div id="toc" class="section"><h2 class="introductory">Table of Contents</h2><ul class="toc"><li class="tocline"><a href="#introduction" class="tocxref"><span class="secno">1. </span>Introduction</a><ul class="toc"><li class="tocline"><a href="#purpose" class="tocxref"><span class="secno">1.1 </span>Purpose of this Document and <span class="delete">target audience</span><span class="insert">Target Audience</span></a></li><li class="tocline"><a href="#structure-of-this-document" class="tocxref"><span class="secno">1.2 </span>Structure of this Document</a></li><li class="tocline"><a href="#notational-conventions" class="tocxref"><span class="secno">1.3 </span>Notational Conventions</a></li></ul></li><li class="tocline"><a href="#general-conventions" class="tocxref"><span class="secno">2. </span>General grammar considerations</a><ul class="toc"><li class="tocline"><a href="#functional-syntax" class="tocxref"><span class="secno">2.1 </span>Functional-style Syntax</a></li><li class="tocline"><a href="#grammar-notation" class="tocxref"><span class="secno">2.2 </span>EBNF Grammar</a></li><li class="tocline"><a href="#main-productions" class="tocxref"><span class="secno"><span class="insert">2.3 </span></span><span class="insert">Main Productions</span></a></li><li class="tocline"><a href="#prov-n-optionals" class="tocxref"><span class="secno"><span class="delete">2.3</span><span class="insert">2.4</span> </span>Optional terms in expressions</a></li><li class="tocline"><a href="#prov-n-standard-terms" class="tocxref"><span class="secno"><span class="delete">2.4</span><span class="insert">2.5</span> </span>Identifiers and attributes</a></li><li class="tocline"><a href="#comments" class="tocxref"><span class="secno"><span class="delete">2.5</span><span class="insert">2.6</span> </span>Comments</a></li></ul></li><li class="tocline"><a href="#prov-n-expressions" class="tocxref"><span class="secno">3. </span>PROV-N Productions per Component</a><ul class="toc"><li class="tocline"><a href="#component1" class="tocxref"><span class="secno">3.1 </span>Component 1: Entities and Activities</a><ul class="toc"><li class="tocline"><a href="#expression-Entity" class="tocxref"><span class="secno">3.1.1 </span>Entity</a></li><li class="tocline"><a href="#expression-Activity" class="tocxref"><span class="secno">3.1.2 </span>Activity</a></li><li class="tocline"><a href="#expression-Generation" class="tocxref"><span class="secno">3.1.3 </span>Generation</a></li><li class="tocline"><a href="#expression-Usage" class="tocxref"><span class="secno">3.1.4 </span>Usage</a></li><li class="tocline"><a href="#expression-wasInformedBy" class="tocxref"><span class="secno">3.1.5 </span>Communication</a></li><li class="tocline"><a href="#expression-Start" class="tocxref"><span class="secno">3.1.6 </span>Start</a></li><li class="tocline"><a href="#expression-End" class="tocxref"><span class="secno">3.1.7 </span>End</a></li><li class="tocline"><a href="#expression-Invalidation" class="tocxref"><span class="secno">3.1.8 </span>Invalidation</a></li></ul></li><li class="tocline"><a href="#component2" class="tocxref"><span class="secno">3.2 </span>Component 2: Derivations</a><ul class="toc"><li class="tocline"><a href="#Derivation-Relation" class="tocxref"><span class="secno">3.2.1 </span>Derivation</a></li><li class="tocline"><a href="#expression-Revision" class="tocxref"><span class="secno">3.2.2 </span>Revision</a></li><li class="tocline"><a href="#expression-quotation" class="tocxref"><span class="secno">3.2.3 </span>Quotation</a></li><li class="tocline"><a href="#expression-original-source" class="tocxref"><span class="secno">3.2.4 </span>Primary Source</a></li></ul></li><li class="tocline"><a href="#component3" class="tocxref"><span class="secno">3.3 </span>Component 3: Agents, Responsibility, and Influence</a><ul class="toc"><li class="tocline"><a href="#expression-Agent" class="tocxref"><span class="secno">3.3.1 </span>Agent</a></li><li class="tocline"><a href="#expression-attribution" class="tocxref"><span class="secno">3.3.2 </span>Attribution</a></li><li class="tocline"><a href="#expression-Association" class="tocxref"><span class="secno">3.3.3 </span>Association</a></li><li class="tocline"><a href="#expression-delegation" class="tocxref"><span class="secno">3.3.4 </span>Delegation</a></li><li class="tocline"><a href="#expression-influence" class="tocxref"><span class="secno">3.3.5 </span>Influence</a></li></ul></li><li class="tocline"><a href="#component4" class="tocxref"><span class="secno">3.4 </span>Component 4: Bundles</a><ul class="toc"><li class="tocline"><a href="#expression-bundle-constructor" class="tocxref"><span class="secno">3.4.1 </span>Bundle <span class="delete">Declaration</span><span class="insert">Constructor</span></a></li></ul></li><li class="tocline"><a href="#component5" class="tocxref"><span class="secno">3.5 </span>Component 5: Alternate Entities</a><ul class="toc"><li class="tocline"><a href="#expression-alternate" class="tocxref"><span class="secno">3.5.1 </span>Alternate</a></li><li class="tocline"><a href="#expression-specialization" class="tocxref"><span class="secno">3.5.2 </span>Specialization</a></li><li class="tocline"><a href="#expression-mention" class="tocxref"><span class="secno">3.5.3 </span>Mention</a></li></ul></li><li class="tocline"><a href="#component6" class="tocxref"><span class="secno">3.6 </span>Component 6: Collections</a><ul class="toc"><li class="tocline"><a href="#expression-collection-membership" class="tocxref"><span class="secno">3.6.1 </span>Membership</a></li></ul></li><li class="tocline"><a href="#subexpressions" class="tocxref"><span class="secno">3.7 </span>Further Expressions</a><ul class="toc"><li class="tocline"><a href="#expression-identifier" class="tocxref"><span class="secno">3.7.1 </span>Identifier</a></li><li class="tocline"><a href="#expression-attribute" class="tocxref"><span class="secno">3.7.2 </span>Attribute</a></li><li class="tocline"><a href="#expression-literal" class="tocxref"><span class="secno">3.7.3 </span>Literal</a><ul class="toc"><li class="tocline"><a href="#expression-types" class="tocxref"><span class="secno">3.7.3.1 </span>Reserved Type Values</a></li><li class="tocline"><a href="#expression-Time" class="tocxref"><span class="secno">3.7.3.2 </span>Time Values</a></li></ul></li><li class="tocline"><a href="#expression-NamespaceDeclaration" class="tocxref"><span class="secno">3.7.4 </span>Namespace Declaration</a></li></ul></li></ul></li><li class="tocline"><a href="#toplevelBundle" class="tocxref"><span class="secno">4. </span>Toplevel Bundle</a></li><li class="tocline"><a href="#extensibility" class="tocxref"><span class="secno"><span class="insert">5. </span></span><span class="insert">Extensibility</span></a></li><li class="tocline"><a href="#media-type" class="tocxref"><span class="secno"><span class="delete">5.</span><span class="insert">6.</span> </span>Media Type</a></li><li class="tocline"><a href="#acknowledgements" class="tocxref"><span class="secno">A. </span>Acknowledgements</a></li><li class="tocline"><a href="#references" class="tocxref"><span class="secno">B. </span>References</a><ul class="toc"><li class="tocline"><a href="#normative-references" class="tocxref"><span class="secno">B.1 </span>Normative references</a></li><li class="tocline"><a href="#informative-references" class="tocxref"><span class="secno">B.2 </span>Informative references</a></li></ul></li></ul></div> 
 
 
 
@@ -601,7 +605,7 @@
 </p>
 
 <div id="purpose" class="section"> 
-<h3><span class="secno">1.1 </span>Purpose of this Document and target audience</h3>
+<h3><span class="secno">1.1 </span>Purpose of this Document and <span class="delete">target audience</span><span class="insert">Target Audience</span></h3>
 
 A key goal of PROV is the specification of a machine-processable data model for provenance. However, communicating provenance between humans is also important when teaching, illustrating, formalizing, and discussing provenance-related issues. 
 
@@ -628,8 +632,8 @@
 <p>Its target audience is twofold:
 </p><ul>
 <li>Developers of provenance management applications, as well as implementors of new PROV data model encodings, and thus in particular of PROV-N parsers. These readers may be interested in the entire structure of the grammar, starting from the top level nonterminal 
-<a class="grammarRef" href="#prod-bundle">bundle</a>.</li>
-<li>Readers of the  [<cite><a class="bibref" rel="biblioentry" href="#bib-PROV-DM">PROV-DM</a></cite>] and of  [<cite><a class="bibref" rel="biblioentry" href="#bib-PROV-CONSTRAINTS">PROV-CONSTRAINTS</a></cite>] documents, who are interested in the details of the formal language underpinning the notation used in the examples and in the definition of the constraints. Those readers may find the  <a class="grammarRef" href="#prod-expression">expression</a> nonterminal a useful entry point into the grammar.</li>
+<code><a class="grammarRef" href="#prod-bundle">bundle</a></code>.</li>
+<li>Readers of the  [<cite><a class="bibref" rel="biblioentry" href="#bib-PROV-DM">PROV-DM</a></cite>] and of  [<cite><a class="bibref" rel="biblioentry" href="#bib-PROV-CONSTRAINTS">PROV-CONSTRAINTS</a></cite>] documents, who are interested in the details of the formal language underpinning the notation used in the examples and in the definition of the constraints. Those readers may find the  <code><a class="grammarRef" href="#prod-expression">expression</a></code> nonterminal a useful entry point into the grammar.</li>
 </ul>
 
 </div>
@@ -646,7 +650,11 @@
 <p><a href="#toplevelBundle">Section 4</a> defines the grammar of toplevel bundles, a house-keeping construct of PROV-N capable of packaging up PROV-N expressions and namespace declarations.</p>
 
 
-<p><a href="#media-type">Section 5</a> defines media type for the PROV-N notation.</p>
+
+
+<p><a href="#extensibility"><span class="insert">Section 5</span></a><span class="insert"> defines the extensibility mechanism for the PROV-N notation.</span></p>
+
+<p><a href="#media-type">Section <span class="delete">5</span><span class="insert">6</span></a> defines media type for the PROV-N notation.</p>
 
 
     </div> 
@@ -740,8 +748,8 @@
 
 <p>
   <span class="delete">Each</span><span class="insert">EBNF specifies a series of</span> production <span class="delete">rule (or </span><span class="insert">rules (</span><dfn id="dfn-production">production</dfn><span class="delete">, for short)</span><span class="insert">). 
-A production rule</span> in the grammar defines <span class="delete">one </span><span class="insert">a symbol 
- </span><code class="grammarRef"><span class="insert">expr</span></code><span class="insert">  (</span><dfn id="dfn-non-terminal-symbol">non-terminal symbol <span class="delete">E</span><span class="delete">, in</span></dfn><span class="insert">)
+A production rule</span> in the grammar defines <span class="delete">one non-terminal</span><span class="insert">a</span> symbol <span class="delete">E</span><span class="delete">, in</span> 
+ <code class="grammarRef"><span class="insert">expr</span></code><span class="insert">  (</span><dfn id="dfn-nonterminal-symbol"><span class="insert">nonterminal symbol</span></dfn><span class="insert">)
   using</span> the following form:</p>
 
 <span class="delete">E</span>
@@ -769,7 +777,7 @@
 </p><ul>
 <li> 
 <span class="delete">E</span> 
- <code class="grammarRef"><span class="insert">expr</span></code>: matches <span class="delete">term satisfying rule</span><span class="insert">production</span> for <span class="insert">non-terminal </span>symbol <span class="delete">E.</span><code class="grammarRef"><span class="insert">expr</span></code>
+ <code class="grammarRef"><span class="insert">expr</span></code>: matches <span class="delete">term satisfying rule</span><span class="insert">production</span> for <span class="insert">nonterminal </span>symbol <span class="delete">E.</span><code class="grammarRef"><span class="insert">expr</span></code>
 </li>
 
 
@@ -806,44 +814,53 @@
 </ul>
 
 
+
+<p><span class="insert">Where suitable, the PROV-N grammar reuses production and terminal names of the SPARQL grammar [</span><cite><a class="bibref" rel="biblioentry" href="#bib-RDF-SPARQL-QUERY"><span class="insert">RDF-SPARQL-QUERY</span></a></cite><span class="insert">].</span></p>
+
 </div>
 
 <div id="main-productions" class="section">
 <h3><span class="secno"><span class="insert">2.3 </span></span><span class="insert">Main Productions</span></h3>
-The grammar <span class="insert">groups the general PROV-N </span><em><span class="insert">non-terminals</span></em><span class="insert"> in a
-</span><em><span class="insert">production rule</span></em><span class="insert"> called </span><code class="grammarRef"><span class="insert">expression</span></code><span class="insert">
-(shown below). This production </span>is <span class="delete">centered on nonterminals</span><span class="insert">introduced as it provides an 
-entry point</span> for <span class="delete">various types</span><span class="insert">the core expressions</span> of <span class="delete">expression</span><span class="delete">. The main</span><span class="insert">this grammar. Note that parser
-developers should use the</span> production <span class="delete">is introduced here below</span><span class="insert">rule for the </span><a href="#prod-bundle"><span class="insert">top
-level </span><span class="grammarRef"><span class="insert">bundle</span></span></a> as <span class="delete">it reflects the rationale for the design of the entire grammar. Note that parser developers may use the top level
-</span><span class="delete">bundle</span><span class="delete">  nonterminal as </span>a starting point 
-instead.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<table class="grammar">
+
+<p><span class="insert">Two productions are entry points to the grammar.</span></p>
+
+<p>The <span class="delete">grammar is centered on nonterminals for various types of </span><span class="insert">production </span><code class="grammarRef"><a class="grammarRef" href="#prod-expression">expression</a><span class="delete">. The main production is introduced here below as it reflects the rationale</span></code><span class="insert">
+provides the structure</span> for the <span class="delete">design</span><em><span class="insert">core expressions</span></em> of <span class="delete">the entire grammar. Note that parser developers may use the top level
+</span><span class="delete">bundle</span><span class="delete">  nonterminal as a starting point instead.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</span><span class="insert">PROV-N. 
+
+
+
+
+</span></p><table class="grammar">
 <tbody class="prod"> <tr valign="baseline"> <td><a id="prod-expression" name="prod-expression"></a>[<span class="prodNo">2</span>]&nbsp;&nbsp;&nbsp;</td> <td><code class="production prod">expression</code></td> <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> <td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-entityExpression">entityExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-activityExpression">activityExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-generationExpression">generationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-usageExpression">usageExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-startExpression">startExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-endExpression">endExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-invalidationExpression">invalidationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-communicationExpression">communicationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-agentExpression">agentExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-associationExpression">associationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-attributionExpression">attributionExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-delegationExpression">delegationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-derivationExpression">derivationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-influenceExpression">influenceExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-alternateExpression">alternateExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-specializationExpression">specializationExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-mentionExpression">mentionExpression</a></span> | <span class="prod"><a class="grammarRef" href="#prod-membershipExpression">membershipExpression</a></span> <span class="insert">| </span><span class="prod"><a class="grammarRef" href="#prod-extensibilityExpression"><span class="insert">extensibilityExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-insertionExpression"><span class="insert">insertionExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-removalExpression"><span class="insert">removalExpression</span></a></span><span class="insert"> | </span><span class="prod"><a class="grammarRef" href="#prod-dictMembershipExpression"><span class="insert">dictMembershipExpression</span></a></span> )</code></td> </tr> </tbody>
 </table>
 
 
-<p>Each <span class="insert">of the symbols included in </span><code>expression<span class="delete"> non-terminal </span><span class="delete">expression</span><span class="delete">,</span></code><span class="insert"> above,</span> i.e., <code><a class="grammarRef" href="#prod-entityExpression">entityExpression</a></code>,  <code><a class="grammarRef" href="#prod-activityExpression">activityExpression</a></code> etc., corresponds to one element <span class="delete">(entity,</span><span class="insert">(e.g., entity,</span> activity, etc.) of the PROV data model.
-</p>
-
-<p>A PROV-N document consists of a collection of <a title="expression">expressions</a>, wrapped in a <a class="grammarRef" href="#prod-bundle">toplevel bundle</a> with some namespace declarations, such that the text for an element matches the corresponding <a class="grammarRef" href="#prod-expression">expression</a> production of the grammar.
-
-</p></div>
+<p>Each <span class="insert">of the symbols included in </span><code>expression<span class="delete"> non-terminal </span></code><span class="insert"> above, i.e., </span><code><a class="grammarRef" href="#prod-entityExpression"><span class="insert">entityExpression</span></a></code><span class="insert">,  </span><code><a class="grammarRef" href="#prod-activityExpression"><span class="insert">activityExpression</span></a></code><span class="insert"> etc., corresponds to one concept (e.g., Entity, Activity, etc.) of the PROV data model.</span></p>
+
+
+<p><span class="insert">Alternatively,  the production rule </span><code><a href="#prod-bundle"><span class="grammarRef"><span class="insert">bundle</span></span></a></code><span class="insert">
+provides the overall structure of PROV-N descriptions.  It is a wrapper  for
+ a set of expressions, such that the text for an element matches the corresponding </span><code><a class="grammarRef" href="#prod-expression">expression</a><span class="delete">, i.e., </span><span class="delete">entityExpression</span><span class="delete">,</span></code><span class="insert"> production,</span>  <span class="delete">activityExpression</span><span class="delete"> etc., corresponds to one element (entity, activity, etc.) of the PROV data model.
+</span><span class="delete">A PROV-N document consists of a collection of </span><span class="delete">expressions</span><span class="delete">, wrapped in a </span><span class="delete">toplevel bundle</span><span class="delete"> with</span><span class="insert">and</span> some namespace <span class="delete">declarations, such that the text for an element matches the corresponding </span><span class="delete">expression</span><span class="delete"> production of the grammar.</span><span class="insert">declarations.</span></p>
+
+</div>
 
 
 <div id="prov-n-optionals" class="section"> 
@@ -906,7 +923,7 @@
 <div id="prov-n-standard-terms" class="section"> 
 <h3><span class="secno"><span class="delete">2.4</span><span class="insert">2.5</span> </span>Identifiers and attributes</h3>
 
-<p><span class="insert">Almost all expressions defined in the grammar include an identifier. </span>Most expressions<span class="delete"> defined</span><span class="insert">
+<p><span class="insert">Almost all expressions defined in the grammar include an identifier (see </span><a href="#expression-identifier"><span class="insert">Section 3.7.1</span></a><span class="insert"> for the full syntax of identifiers). </span>Most expressions<span class="delete"> defined</span><span class="insert">
 can aslo include a set of attribute-value pairs, delimited by square brackets. Identifiers are optional except for Entities, Activites, and Agents. Identifiers are always the first term</span> in <span class="delete">the grammar include the use of two terms: an identifier and</span><span class="insert">any expression.  Optional identifiers </span><em class="rfc2119" title="must"><span class="insert">must</span></em><span class="insert"> be separated using</span> a <span class="delete">set of attribute-value pairs, delimited by square brackets. Identifiers</span><span class="insert">semi-colon ';', but where the identifiers</span> are <span class="delete">optional except for Entities, Activites, and Agents. Identifiers are always the first term in any expression. By convention, optional identifiers are separated using</span><span class="insert">required,</span> a <span class="delete">semi-colon ';'.</span><span class="insert">regular comma ',' </span><em class="rfc2119" title="must"><span class="insert">must</span></em><span class="insert"> be used.</span> This makes it possible to completely omit an optional identifier with no ambiguity arising. Also, if the set of attribute-value pairs is present, it is always the last term in any expression.</p>
 
 <div class="anexample" id="example_9"><div class="anexampleTitle"><a class="internalDFN" href="#example_9">Example <span class="delete">7</span><span class="insert">9</span></a></div>
@@ -922,12 +939,13 @@
 
 
 <div class="anexample" id="example_10"><div class="anexampleTitle"><a class="internalDFN" href="#example_10">Example <span class="delete">8</span><span class="insert">10</span></a></div>
-<p>The first and second activities have no <span class="delete">attributes.</span><span class="insert">attributes, and are equivalent.</span>
-
-The third activity  has two attributes. 
-</p><pre class="codeexample">activity(ex:a10)
-activity(ex:a10, [])
-activity(ex:a10, [ex:param1="a", ex:param2="b"])
+<p>The first and second <span class="delete">activities</span><span class="insert">activity expressions</span> have no <span class="delete">attributes.</span><span class="insert">attributes, and are equivalent.</span>
+
+The third activity  <span class="insert"> expression </span>has two attributes. 
+</p><pre class="codeexample"><span class="delete">activity(ex:a10)
+activity(ex:a10,</span><span class="insert">activity(ex:a1)
+activity(ex:a1,</span> [])
+<span class="delete">activity(ex:a10,</span><span class="insert">activity(ex:a1,</span> [ex:param1="a", ex:param2="b"])
 </pre>
 </div>
 
@@ -973,7 +991,7 @@
 </table>
 
 
-<p>The following table summarizes how each constituent of a PROV-DM Entity maps to a non-terminal.</p>
+<p>The following table summarizes how each constituent of a PROV-DM Entity maps to a <span class="delete">non-terminal.</span><span class="insert">PROV-N syntax element.</span></p>
 <div style="text-align: left; ">
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
 <tbody><tr><td><b>Entity</b></td><td><b>Non-Terminal</b></td></tr>
@@ -1009,7 +1027,7 @@
 <tbody class="prod"> <tr valign="baseline"> <td><a id="prod-timeOrMarker" name="prod-timeOrMarker"></a>[<span class="prodNo">8</span>]&nbsp;&nbsp;&nbsp;</td> <td><code class="production prod">timeOrMarker</code></td> <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> <td><code class="content">( <span class="prod"><a class="grammarRef" href="#prod-time">time</a></span> | "-" )</code></td> </tr> </tbody>
 </table>
 
-<p>The following table summarizes how each constituent of a PROV-DM Activity maps to a non-terminal.</p>
+<p>The following table summarizes how each constituent of a PROV-DM Activity maps to a <span class="delete">non-terminal.</span><span class="insert">PROV-N syntax element.</span></p>
 <div style="text-align: left; ">
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
 <tbody><tr><td><b>Activity</b></td><td><b>Non-Terminal</b></td></tr>
@@ -1061,7 +1079,7 @@
 
 </table>
 
-<p>The following table summarizes how each constituent of a PROV-DM Generation maps to a non-terminal.</p>
+<p>The following table summarizes how each constituent of a PROV-DM Generation maps to a <span class="delete">non-terminal.</span><span class="insert">PROV-N syntax element.</span></p>
 <div style="text-align: left; ">
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
 <tbody><tr><td><b>Generation</b></td><td><b>Non-Terminal</b></td></tr>
@@ -1113,7 +1131,7 @@
 </table>
 
 
-<p>The following table summarizes how each constituent of a PROV-DM Usage maps to a non-terminal.</p>
+<p>The following table summarizes how each constituent of a PROV-DM Usage maps to a <span class="delete">non-terminal.</span><span class="insert">PROV-N syntax element.</span></p>
 <div style="text-align: left; ">
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
 <tbody><tr><td><b>Usage</b></td><td><b>Non-Terminal</b></td></tr>
@@ -1145,7 +1163,7 @@
 </div>
 
 
-<p>Even though the production <code class="content"><a class="grammarRef" href="#prod-usageExpression">usageExpression</a></code> allows for expressions <span class="name">used(a2, -, -)</span>  and <span class="name">used(-; <span class="delete">e2,</span><span class="insert">a2,</span> -, -)</span>, these expressions are not valid in PROV-N, since at least one  of <a href="http://www.w3.org/TR/prov-dm/#usage.id"><span class="attribute">id</span></a>, <a href="http://www.w3.org/TR/prov-dm/#usage.entity"><span class="attribute">entity</span></a>, <a href="http://www.w3.org/TR/prov-dm/#usage.time"><span class="attribute">time</span></a>, and  <a href="http://www.w3.org/TR/prov-dm/#usage.attributes"><span class="attribute">attributes</span></a> <em class="rfc2119" title="must">must</em> be present.</p>
+<p><strong><span class="insert">Note:</span></strong> Even though the production <code class="content"><a class="grammarRef" href="#prod-usageExpression">usageExpression</a></code> allows for expressions <span class="name">used(a2, -, -)</span>  and <span class="name">used(-; <span class="delete">e2,</span><span class="insert">a2,</span> -, -)</span>, these expressions are not valid in PROV-N, since at least one  of <a href="http://www.w3.org/TR/prov-dm/#usage.id"><span class="attribute">id</span></a>, <a href="http://www.w3.org/TR/prov-dm/#usage.entity"><span class="attribute">entity</span></a>, <a href="http://www.w3.org/TR/prov-dm/#usage.time"><span class="attribute">time</span></a>, and  <a href="http://www.w3.org/TR/prov-dm/#usage.attributes"><span class="attribute">attributes</span></a> <em class="rfc2119" title="must">must</em> be present.</p>
 
 
 
@@ -1164,7 +1182,7 @@
 </table>
 
 
-<p>The following table summarizes how each constituent of a PROV-DM Communication maps to a non-terminal.</p>
+<p>The following table summarizes how each constituent of a PROV-DM Communication maps to a <span class="delete">non-terminal.</span><span class="insert">PROV-N syntax element.</span></p>
 <div style="text-align: left; ">
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
 <tbody><tr><td><b>Communication</b></td><td><b>Non-Terminal</b></td></tr>
@@ -1204,7 +1222,7 @@
 <tbody class="prod"> <tr valign="baseline"> <td><a id="prod-startExpression" name="prod-startExpression"></a>[<span class="prodNo">14</span>]&nbsp;&nbsp;&nbsp;</td> <td><code class="production prod">startExpression</code></td> <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> <td><code class="content">"wasStartedBy" "(" <span class="prod"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></span> <span class="prod"><a class="grammarRef" href="#prod-aIdentifier">aIdentifier</a></span> ( "," <span class="prod"><a class="grammarRef" href="#prod-eIdentifierOrMarker">eIdentifierOrMarker</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-aIdentifierOrMarker">aIdentifierOrMarker</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-timeOrMarker">timeOrMarker</a></span> )? <span class="prod"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></span> ")"</code></td> </tr> </tbody>
 </table>
 
-<p>The following table summarizes how each constituent of a PROV-DM Start maps to a non-terminal.</p>
+<p>The following table summarizes how each constituent of a PROV-DM Start maps to a <span class="delete">non-terminal.</span><span class="insert">PROV-N syntax element.</span></p>
 <div style="text-align: left; ">
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
 <tbody><tr><td><b>Start</b></td><td><b>Non-Terminal</b></td></tr>
@@ -1256,7 +1274,7 @@
 </table>
 
 
-<p>The following table summarizes how each constituent of a PROV-DM End maps to a non-terminal.</p>
+<p>The following table summarizes how each constituent of a PROV-DM End maps to a <span class="delete">non-terminal.</span><span class="insert">PROV-N syntax element.</span></p>
 <div style="text-align: left; ">
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
 <tbody><tr><td><b>End</b></td><td><b>Non-Terminal</b></td></tr>
@@ -1314,7 +1332,7 @@
 </table>
 
 
-<p>The following table summarizes how each constituent of a PROV-DM Invalidation maps to a non-terminal.</p>
+<p>The following table summarizes how each constituent of a PROV-DM Invalidation maps to a <span class="delete">non-terminal.</span><span class="insert">PROV-N syntax element.</span></p>
 <div style="text-align: left; ">
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
 <tbody><tr><td><b>Invalidation</b></td><td><b>Non-Terminal</b></td></tr>
@@ -1346,7 +1364,7 @@
 </pre>
 </div>
 
-<p>Even though the production  <code class="content"><a class="grammarRef" href="#prod-invalidationExpression">invalidationExpression</a></code> allows for expressions <span class="name">wasInvalidatedBy(e2, -, -)</span>  and <span class="name">wasInvalidatedBy(-; e2, -, -)</span>, these expressions are not valid in PROV-N, since 
+<p><strong><span class="insert">Note:</span></strong> Even though the production  <code class="content"><a class="grammarRef" href="#prod-invalidationExpression">invalidationExpression</a></code> allows for expressions <span class="name">wasInvalidatedBy(e2, -, -)</span>  and <span class="name">wasInvalidatedBy(-; e2, -, -)</span>, these expressions are not valid in PROV-N, since 
 since at least one  of <a href="http://www.w3.org/TR/prov-dm/#invalidation.id"><span class="attribute">id</span></a>, <a href="http://www.w3.org/TR/prov-dm/#invalidation.activity"><span class="attribute">activity</span></a>, <a href="http://www.w3.org/TR/prov-dm/#invalidation.time"><span class="attribute">time</span></a>, and  <a href="http://www.w3.org/TR/prov-dm/#invalidation.attributes"><span class="attribute">attributes</span></a> <em class="rfc2119" title="must">must</em> be present.</p>
 
 
@@ -1369,7 +1387,7 @@
 <tbody class="prod"> <tr valign="baseline"> <td><a id="prod-derivationExpression" name="prod-derivationExpression"></a>[<span class="prodNo">17</span>]&nbsp;&nbsp;&nbsp;</td> <td><code class="production prod">derivationExpression</code></td> <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> <td><code class="content">"wasDerivedFrom" "(" <span class="prod"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></span> <span class="prod"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-eIdentifier">eIdentifier</a></span> ( "," <span class="prod"><a class="grammarRef" href="#prod-aIdentifierOrMarker">aIdentifierOrMarker</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-gIdentifierOrMarker">gIdentifierOrMarker</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-uIdentifierOrMarker">uIdentifierOrMarker</a></span> )? <span class="prod"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></span> ")"</code></td> </tr> </tbody>
 </table>
 
-<p>The following table summarizes how each constituent of a PROV-DM Derivation maps to a non-terminal.</p>
+<p>The following table summarizes how each constituent of a PROV-DM Derivation maps to a <span class="delete">non-terminal.</span><span class="insert">PROV-N syntax element.</span></p>
 <div style="text-align: left; ">
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
 <tbody><tr><td><b>Derivation</b></td><td><b>Non-Terminal</b></td></tr>
@@ -1400,7 +1418,7 @@
 
 
 <div class="anexample" id="anexample-derivation"><div class="anexampleTitle"><a class="internalDFN" href="#anexample-derivation">Example <span class="delete">17</span><span class="insert">19</span></a></div>
-    <pre class="codeexample">wasDerivedFrom(d, e2, e1, a, g2, u1, [ex:comment="a righteous derivation"])
+    <pre class="codeexample"><span class="delete">wasDerivedFrom(d,</span><span class="insert">wasDerivedFrom(d;</span> e2, e1, a, g2, u1, [ex:comment="a righteous derivation"])
   </pre>
 <p>  Here
     <span class="name">d</span> is the optional derivation identifier,
@@ -1497,7 +1515,7 @@
 
 </table>
 
-<p>The following table summarizes how each constituent of a PROV-DM Agent maps to a non-terminal.</p>
+<p>The following table summarizes how each constituent of a PROV-DM Agent maps to a <span class="delete">non-terminal.</span><span class="insert">PROV-N syntax element.</span></p>
 <div style="text-align: left; ">
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
 <tbody><tr><td><b>Agent</b></td><td><b>Non-Terminal</b></td></tr>
@@ -1535,7 +1553,7 @@
 </table>
 
 
-<p>The following table summarizes how each constituent of a PROV-DM Attribution maps to a non-terminal.</p>
+<p>The following table summarizes how each constituent of a PROV-DM Attribution maps to a <span class="delete">non-terminal.</span><span class="insert">PROV-N syntax element.</span></p>
 <div style="text-align: left; ">
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
 <tbody><tr><td><b>Attribution</b></td><td><b>Non-Terminal</b></td></tr>
@@ -1580,7 +1598,7 @@
 </table>
 
 
-<p>The following table summarizes how each constituent of a PROV-DM Association maps to a non-terminal.</p>
+<p>The following table summarizes how each constituent of a PROV-DM Association maps to a <span class="delete">non-terminal.</span><span class="insert">PROV-N syntax element.</span></p>
 <div style="text-align: left; ">
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
 <tbody><tr><td><b>Association</b></td><td><b>Non-Terminal</b></td></tr>
@@ -1637,7 +1655,7 @@
 
 </table>
 
-<p>The following table summarizes how each constituent of a PROV-DM Delegation maps to a non-terminal.</p>
+<p>The following table summarizes how each constituent of a PROV-DM Delegation maps to a <span class="delete">non-terminal.</span><span class="insert">PROV-N syntax element.</span></p>
 <div style="text-align: left; ">
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
 <tbody><tr><td><b>Delegation</b></td><td><b>Non-Terminal</b></td></tr>
@@ -1691,7 +1709,7 @@
 </table>
 
 
-<p>The following table summarizes how each constituent of a PROV-DM Influence maps to a non-terminal.</p>
+<p>The following table summarizes how each constituent of a PROV-DM Influence maps to a <span class="delete">non-terminal.</span><span class="insert">PROV-N syntax element.</span></p>
 <div style="text-align: left; ">
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
 <tbody><tr><td><b>Influence</b></td><td><b>Non-Terminal</b></td></tr>
@@ -1714,7 +1732,7 @@
 <p>  Here
     <span class="name">id</span> is the optional influence identifier,
   <span class="name">e2</span> is an entity identifier,
-  <span class="name">e1</span> is the identifier for an ancestor entity that   <span class="name">e2</span> depends on,
+  <span class="name">e1</span> is the identifier for an ancestor entity that   <span class="name">e2</span> <span class="delete">depends on,</span><span class="insert">is influenced by,</span>
   and <span class="name">[ex:param="a"]</span> is the optional set of attributes. </p>
 The remaining examples show cases where some of the optionals are omitted.
 
@@ -1779,7 +1797,7 @@
 </table>
 
 
-<p>The following table summarizes how each constituent of a PROV-DM Alternate maps to a non-terminal.</p>
+<p>The following table summarizes how each constituent of a PROV-DM Alternate maps to a <span class="delete">non-terminal.</span><span class="insert">PROV-N syntax element.</span></p>
 <div style="text-align: left; ">
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
 <tbody><tr><td><b>Alternate</b></td><td><b>Non-Terminal</b></td></tr>
@@ -1814,7 +1832,7 @@
 
 </table>
 
-<p>The following table summarizes how each constituent of a PROV-DM Specialization maps to a non-terminal.</p>
+<p>The following table summarizes how each constituent of a PROV-DM Specialization maps to a <span class="delete">non-terminal.</span><span class="insert">PROV-N syntax element.</span></p>
 <div style="text-align: left; ">
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
 <tbody><tr><td><b>Specialization</b></td><td><b>Non-Terminal</b></td></tr>
@@ -1857,7 +1875,7 @@
 </table>
 
 
-<p>The following table summarizes how each constituent of a PROV-DM Mention maps to a non-terminal.</p>
+<p>The following table summarizes how each constituent of a PROV-DM Mention maps to a <span class="delete">non-terminal.</span><span class="insert">PROV-N syntax element.</span></p>
 <div style="text-align: left; ">
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
 <tbody><tr><td><b>Mention</b></td><td><b>Non-Terminal</b></td></tr>
@@ -1915,7 +1933,7 @@
 </table>
 
 
-<p>The following table summarizes how each constituent of a PROV-DM Membership maps to a non-terminal.</p>
+<p>The following table summarizes how each constituent of a PROV-DM Membership maps to a <span class="delete">non-terminal.</span><span class="insert">PROV-N syntax element.</span></p>
 <div style="text-align: left; ">
 <table class="thinborder" style="margin-left: auto; margin-right: auto;">
 <tbody><tr><td><b>Collection Membership</b></td><td><b>Non-Terminal</b></td></tr>
@@ -2011,11 +2029,11 @@
 A <dfn id="dfn-qualifiedName">qualified name</dfn> is a name subject to <a>namespace</a> interpretation. It consists of a <a>namespace</a>, denoted by an optional prefix, and a local name.
 The PROV data model  stipulates that a qualified name can be mapped into an IRI
  by concatenating the IRI associated with the prefix and the local part.
-<span class="insert">  This section provides the exact details of this procedure for qualified names supported by PROV-N. </span></p>
+<span class="insert">  This section provides the exact details of this procedure for qualified names defined by PROV-N. </span></p>
 
 <p>A qualified name's prefix is <em class="rfc2119" title="optional">optional</em>. If a prefix occurs in a
- qualified name, it <span class="delete">refers</span><em class="rfc2119" title="must"><span class="insert">must</span></em><span class="insert"> refer</span> to a <a>namespace</a> declared in a namespace declaration.  In the absence of prefix, the qualified name 
- refers to the <a title="default namespace declaration">default namespace</a>.</p>
+ qualified name, <span class="delete">it refers</span><span class="insert">the prefix </span><em class="rfc2119" title="must"><span class="insert">must</span></em><span class="insert"> refer</span> to a <a>namespace</a> declared in a namespace declaration.  In the absence of prefix, the qualified name 
+ <span class="delete">refers</span><span class="insert">belongs</span> to the <a title="default namespace declaration">default namespace</a>.</p>
 
 
 
@@ -2331,8 +2349,8 @@
 
 </table>
 
-<p>A <code><a class="grammarRef" href="#prod-namespaceDeclaration">namespaceDeclaration</a></code> consists of a binding between a prefix and a namespace. Every qualified name with this prefix in the scope of this declaration refers to this namespace. <span class="insert">
-A </span><code><a class="grammarRef" href="#prod-defaultNamespaceDeclaration"><span class="insert">defaultNamespaceDeclaration</span></a></code><span class="insert"> consists of a namespace. Every qualified name without prefix in the scope of this declaration refers to this namespace. Scope of a declaration is specified as follows:</span></p>
+<p>A <code><a class="grammarRef" href="#prod-namespaceDeclaration">namespaceDeclaration</a></code> consists of a binding between a prefix and a namespace. Every qualified name with this prefix in the scope of this declaration <span class="delete">refers</span><span class="insert">belongs</span> to this namespace. <span class="insert"> 
+A </span><code><a class="grammarRef" href="#prod-defaultNamespaceDeclaration"><span class="insert">defaultNamespaceDeclaration</span></a></code><span class="insert"> consists of a namespace. Every qualified name without prefix in the scope of this declaration belongs to this namespace. Scope of a declaration is specified as follows:</span></p>
 <ul>
 <li> 
 The scope of a namespace declaration <span class="delete">is the </span><span class="insert">directly occurring in a </span><code><a class="grammarRef" href="#prod-namedBundle">namedBundle</a><span class="delete"> or </span></code><span class="insert"> is the </span><code><a class="grammarRef" href="#prod-namedBundle"><span class="insert">namedBundle</span></a></code><span class="insert"> itself;</span></li>
@@ -2517,12 +2535,13 @@
 <a href="#component6"><span class="insert">Collections</span></a><span class="insert"> are sets of entities, whose membership can be expressed using the </span><span class="name"><span class="insert">hadMembers</span></span><span class="insert"> relation.  The following example shows how one can express membership for an extension of Collections, namely sets of key-value pairs. The notation is a variation of that used for Collections membership, in which the elements of the set are pairs. The name of the relation is qualified with the extension-specific namespace </span><span class="name"><span class="insert">http://example.org/dictionaries</span></span><span class="insert">.
 </span></p>
 <pre class="codeexample"><span class="insert">  prefix dictExt &lt;http://example.org/dictionaries&gt;
-  dictExt:hadMembers(mId; d, {(k1,e1), (k2,e2), (k3,e3)}, []) 
+  dictExt:hadMembers(mId; d, {("k1",e1), ("k2",e2), ("k3",e3)}, []) 
 </span></pre><span class="insert">
 
 Note that the generic </span><code class="content"><a class="grammarRef" href="#prod-extensibilityExpression"><span class="insert">extensibilityExpression</span></a></code><span class="insert"> production  above allows for alternative notations to be used for expressing membership, if the designers of the extensions so desire. Here is an alternate syntax that is consistent with the productions:
 </span><pre class="codeexample"><span class="insert">  prefix dictExt &lt;http://example.org/dictionaries&gt;
-  dictExt:hadMembers(mid; d, dictExt:set(dictExt:pair(k1,e1), dictExt:pair(k2,e2), dictExt:pair(k3,e3), [dictExt:uniqueKeys="true"]) 
+  dictExt:hadMembers(mid; d, dictExt:set(dictExt:pair("k1",e1), dictExt:pair("k2",e2), dictExt:pair("k3",e3)), 
+                            [dictExt:uniqueKeys="true"]) 
 </span></pre>
 
   
@@ -2542,11 +2561,11 @@
 The media type of PROV-N is <span class="name"><span class="delete">text/prov-n</span><span class="insert">text/provenance-notation</span></span>. The content encoding of PROV-N content is UTF-8.
 </p>
 
-<div class="note">
-<p>
-See <a href="http://www.w3.org/2002/06/registering-mediatype">http://www.w3.org/2002/06/registering-mediatype</a> for Register an Internet Media Type for a <acronym title="World Wide Web Consortium">W3C</acronym> Spec.</p>
-Following text adapted from <a href="http://www.w3.org/TeamSubmission/turtle/#sec-mediaReg">turtle</a>.
-</div>
+
+<span class="delete">
+See </span><span class="delete">http://www.w3.org/2002/06/registering-mediatype</span><span class="delete"> for Register an Internet Media Type for a </span><span class="delete">W3C</span><span class="delete"> Spec.</span><span class="delete">
+Following text adapted from </span><span class="delete">turtle</span><span class="delete">.
+</span>
 
 
  <dl> 
@@ -2597,7 +2616,7 @@
       <dt>Interoperability considerations:</dt> 
       <dd>There are no known interoperability issues.</dd> 
       <dt>Published specification:</dt> 
-      <dd><span class="delete">This specification.</span><span class="insert">PROV-N: The Provenance Notation, Moreau and Missier, eds,
+      <dd><span class="delete">This specification.</span><span class="insert">PROV-N: The Provenance Notation, Moreau, Missier, (eds), Cheney, Soiland-Reyes
       </span><a href="http://www.w3.org/TR/prov-n/"><span class="insert">http://www.w3.org/TR/prov-n/</span></a></dd> 
       <dt>Applications which use this media type:</dt> 
       <dd>No widely deployed applications are known to use this media type. It may be used by some web services and clients consuming their data.</dd> 
@@ -2717,7 +2736,7 @@
 </dd><dt id="bib-PROV-DM">[PROV-DM]</dt><dd>Luc Moreau and Paolo Missier (eds.) Khalid Belhajjame, Reza B'Far, Stephen Cresswell, Yolanda Gil, Paul Groth, Graham Klyne, Jim McCusker, Simon Miles, James Myers, Satya Sahoo, and Curt Tilmes<a href="http://www.w3.org/TR/prov-dm/"><cite>PROV-DM: The PROV Data Model</cite></a>. 2012, Working Draft. URL: <a href="http://www.w3.org/TR/prov-dm/">http://www.w3.org/TR/prov-dm/</a>
 </dd><dt id="bib-PROV-RDF">[PROV-RDF]</dt><dd>James Cheney<a href="http://www.w3.org/2011/prov/wiki/ProvRDF"><cite>PROV-RDF Mapping </cite></a>2012, Working in Progress. URL: <a href="http://www.w3.org/2011/prov/wiki/ProvRDF">http://www.w3.org/2011/prov/wiki/ProvRDF</a>
 </dd><dt id="bib-PROV-SEM">[PROV-SEM]</dt><dd>James Cheney <a href="http://www.w3.org/2011/prov/wiki/FormalSemanticsStrawman"><cite>Formal Semantics Strawman</cite></a>. 2011, Work in progress. URL: <a href="http://www.w3.org/2011/prov/wiki/FormalSemanticsStrawman">http://www.w3.org/2011/prov/wiki/FormalSemanticsStrawman</a>
-</dd><dt id="bib-PROV-XML">[PROV-XML]</dt><dd>James Cheney<a href="http://www.w3.org/2011/prov/wiki/ProvXML"><cite>PROV-XML Mapping </cite></a>2012, Working in Progress. URL: <a href="http://www.w3.org/2011/prov/wiki/ProvXML">http://www.w3.org/2011/prov/wiki/ProvXML</a>
+</dd><dt id="bib-PROV-XML">[PROV-XML]</dt><dd>James Cheney <a href="http://www.w3.org/2011/prov/wiki/ProvXML"><cite>PROV-XML Mapping </cite></a>2012, Working in Progress. URL: <a href="http://www.w3.org/2011/prov/wiki/ProvXML">http://www.w3.org/2011/prov/wiki/ProvXML</a>
 </dd><dt id="bib-UNICODE5">[UNICODE5]</dt><dd>The Unicode Consortium. <a href="http://www.unicode.org/versions/Unicode5.1.0/"><cite>The Unicode Standard, Version 5.1.0.</cite></a> Addison-Wesley. 2007. ISBN 0-321-48091-0. URL: <a href="http://www.unicode.org/versions/Unicode5.1.0/">http://www.unicode.org/versions/Unicode5.1.0/</a> 
 </dd><dt id="bib-UNISEC">[UNISEC]</dt><dd> Mark Davis and Michel Suignard. <a href="http://www.unicode.org/reports/tr36/"><cite>Unicode Security Considerations<cite></cite></cite></a>.  4 August 2010. URL: <a href="http://www.unicode.org/reports/tr36/">http://www.unicode.org/reports/tr36/</a>
 </dd></dl></div></div></body></html>
--- a/model/prov-dm.html	Wed Jul 11 08:34:30 2012 -0400
+++ b/model/prov-dm.html	Wed Jul 11 08:34:45 2012 -0400
@@ -261,7 +261,7 @@
           "URL: <a href=\"http://www.w3.org/TR/prov-constraints/\">http://www.w3.org/TR/prov-constraints/</a>",
 
         "PROV-N":
-          "Luc Moreau and Paolo Missier (eds.) "+
+          "Luc Moreau and Paolo Missier (eds.) James Cheney, Stian Soiland-Reyes "+
           "<a href=\"http://www.w3.org/TR/prov-n/\"><cite>PROV-N: The Provenance Notation</cite></a>. "+
           "2011, Working Draft. "+
           "URL: <a href=\"http://www.w3.org/TR/prov-n/\">http://www.w3.org/TR/prov-n/</a>",
@@ -279,6 +279,7 @@
           "URL: <a href=\"http://www.omg.org/spec/UML/2.0/Superstructure/PDF/\">http://www.omg.org/spec/UML/2.0/Superstructure/PDF/</a>",
 
         "RDF-CONCEPTS11":
+          "Richard Cyganiak and David Wood (eds.) " +
           "RDF 1.1 Concepts and Abstract Syntax "+
           "<a href=\"http://www.w3.org/TR/rdf11-concepts/\"><cite>RDF 1.1 Concepts and Abstract Syntax</cite></a>. "+
           "URL: <a href=\"http://www.w3.org/TR/rdf11-concepts/\">http://www.w3.org/TR/rdf11-concepts/</a>",
@@ -301,7 +302,7 @@
  
           // if your specification has a subtitle that goes below the main
           // formal title, define it here
-      subtitle   :  "Final review before Last Call Vote (WD6) (<a href=\"diff.html\">Diffs since last release</a>)",
+      subtitle   :  "Version for Last Call Vote (WD6) (<a href=\"diff.html\">Diffs since last release</a>)",
 
  
           // if you wish the publication date to be other than today, set this
@@ -446,22 +447,19 @@
 interchange of provenance information in heterogeneous environments such as the Web.  The specifications are:
 <ul>
 <li> PROV-DM, the PROV data model for provenance (this document);</li>
-<li> PROV-CONSTRAINTS, a set of constraints applying to the PROV data model;</li>
-<li> PROV-N, a notation for provenance aimed at human consumption;</li>
-<li> PROV-O, the PROV ontology, an OWL2 ontology allowing the mapping of PROV to RDF;</li>
-<li> PROV-AQ, the mechanisms for accessing and querying provenance; </li>
-<li> PROV-PRIMER, a primer for the PROV data model;</li>
-<li> PROV-SEM, a formal semantics for the PROV data model;</li>
-<li> PROV-XML, an XML schema for the PROV data model.</li>
+<li> PROV-CONSTRAINTS, a set of constraints applying to the PROV data model [[PROV-CONSTRAINTS]];</li>
+<li> PROV-N, a notation for provenance aimed at human consumption [[PROV-N]];</li>
+<li> PROV-O, the PROV ontology, an OWL2 ontology allowing the mapping of PROV to RDF [[PROV-O]];</li>
+<li> PROV-AQ, the mechanisms for accessing and querying provenance [[PROV-AQ]]; </li>
+<li> PROV-PRIMER, a primer for the PROV data model [[PROV-PRIMER]].</li>
 </ul>
 <h4>How to read the PROV Family of Specifications</h4>
 <ul>
 <li>The primer is the entry point to PROV offering an introduction to the provenance model.</li>
-<li>The Linked Data and Semantic Web community should focus on PROV-O defining PROV classes and properties specified in an OWL2 ontology. For further details, PROV-DM and PROV-CONSTRAINTS specify the constraints applicable to the data model, and its interpretation. PROV-SEM provides a mathematical semantics.</li>
-<li>The XML community should focus on PROV-XML defining an XML schema for PROV. Further details can also be found in PROV-DM, PROV-CONSTRAINTS, and PROV-SEM.</li>
+<li>The Linked Data and Semantic Web community should focus on PROV-O defining PROV classes and properties specified in an OWL2 ontology. For further details, PROV-DM and PROV-CONSTRAINTS specify the constraints applicable to the data model, and its interpretation. </li>
 <li>Developers seeking to retrieve or publish provenance should focus on PROV-AQ.</li>
 <li>Readers seeking to implement other PROV serializations
-should focus on PROV-DM and PROV-CONSTRAINTS.  PROV-O, PROV-N, PROV-XML offer examples of mapping to RDF, text, and XML, respectively.</li>
+should focus on PROV-DM and PROV-CONSTRAINTS.  PROV-O and PROV-N offer examples of mapping to RDF and text, respectively.</li>
 </ul>
 </section>
 
@@ -3140,7 +3138,7 @@
 A collection is an entity that has some members. The members are themselves entities, and therefore their provenance can be expressed. Some applications need to be able to express the provenance of the collection  itself: e.g. who maintains the collection (attribution), which members it contains as it evolves, and how it was assembled. The purpose of Component 6 is to define the types and relations that are useful to express the provenance of collections.  </p>
 
 <p><a href="#figure-component6">Figure 11</a> depicts
-the sixth component with two  new classes (Collection, Empty Collection) and one association (MemberOf).
+the sixth component with two  new classes (Collection, Empty Collection) and one association (HadMembers).
 </p>
 
 
--- a/model/prov-n.html	Wed Jul 11 08:34:30 2012 -0400
+++ b/model/prov-n.html	Wed Jul 11 08:34:45 2012 -0400
@@ -234,7 +234,7 @@
           // if your specification has a subtitle that goes below the main
           // formal title, define it here
         //          subtitle   :  "About-to-be-frozen WD4 (for internal release)",
-          subtitle   :  "Final review before Last Call Vote (<a href=\"diff-n.html\">Diffs since last release</a>)",
+          subtitle   :  "Version for Last Call Vote (<a href=\"diff-n.html\">Diffs since last release</a>)",
 
           // if you wish the publication date to be other than today, set this
 //           publishDate:  "2012-05-03",
Binary file model/uml/Component-Dictionary.png has changed
--- a/model/uml/Component-Dictionary.svg	Wed Jul 11 08:34:30 2012 -0400
+++ b/model/uml/Component-Dictionary.svg	Wed Jul 11 08:34:45 2012 -0400
@@ -30,70 +30,70 @@
       ><path d="M0 0 L0 37 L80 37 L80 0 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath9"
-      ><path d="M-7 -7 L91 -7 L91 75 L-7 75 L-7 -7 Z"
+      ><path d="M-7 -7 L104 -7 L104 75 L-7 75 L-7 -7 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath10"
-      ><path d="M0 0 L0 61 L80 61 L80 0 Z"
+      ><path d="M0 0 L0 61 L93 61 L93 0 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath11"
-      ><path d="M-7 -7 L131 -7 L131 51 L-7 51 L-7 -7 Z"
+      ><path d="M0 0 L93 0 L93 14 L0 14 L0 0 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath12"
-      ><path d="M0 0 L0 23 L120 23 L120 0 Z"
+      ><path d="M-7 -7 L131 -7 L131 51 L-7 51 L-7 -7 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath13"
-      ><path d="M0 0 L120 0 L120 28 L0 28 L0 0 Z"
+      ><path d="M0 0 L0 23 L120 23 L120 0 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath14"
-      ><path d="M-7 -7 L51 -7 L51 31 L-7 31 L-7 -7 Z"
+      ><path d="M0 0 L120 0 L120 28 L0 28 L0 0 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath15"
-      ><path d="M0 0 L233 0 L233 104 L0 104 L0 0 Z"
+      ><path d="M-7 -7 L51 -7 L51 31 L-7 31 L-7 -7 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath16"
-      ><path d="M0 0 L193 0 L193 104 L0 104 L0 0 Z"
+      ><path d="M0 0 L233 0 L233 104 L0 104 L0 0 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath17"
+      ><path d="M0 0 L193 0 L193 104 L0 104 L0 0 Z"
+      /></clipPath
+      ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath18"
       ><path d="M0 0 L144 0 L144 273 L0 273 L0 0 Z"
       /></clipPath
-      ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath18"
+      ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath19"
       ><path d="M0 0 L143 0 L143 273 L0 273 L0 0 Z"
       /></clipPath
-      ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath19"
+      ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath20"
       ><path d="M0 0 L174 0 L174 194 L0 194 L0 0 Z"
       /></clipPath
-      ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath20"
+      ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath21"
       ><path d="M0 0 L274 0 L274 194 L0 194 L0 0 Z"
       /></clipPath
-      ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath21"
+      ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath22"
       ><path d="M0 0 L273 0 L273 104 L0 104 L0 0 Z"
       /></clipPath
-      ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath22"
-      ><path d="M0 0 L164 0 L164 204 L0 204 L0 0 Z"
-      /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath23"
-      ><path d="M0 0 L394 0 L394 374 L0 374 L0 0 Z"
+      ><path d="M0 0 L164 0 L164 204 L0 204 L0 0 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath24"
+      ><path d="M0 0 L394 0 L394 374 L0 374 L0 0 Z"
+      /></clipPath
+      ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath25"
       ><path d="M0 0 L433 0 L433 454 L0 454 L0 0 Z"
       /></clipPath
-      ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath25"
+      ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath26"
       ><path d="M0 0 L604 0 L604 324 L0 324 L0 0 Z"
       /></clipPath
-      ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath26"
+      ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath27"
       ><path d="M0 0 L104 0 L104 133 L0 133 L0 0 Z"
       /></clipPath
-      ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath27"
+      ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath28"
       ><path d="M0 0 L153 0 L153 104 L0 104 L0 0 Z"
       /></clipPath
-      ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath28"
-      ><path d="M0 0 L324 0 L324 144 L0 144 L0 0 Z"
-      /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath29"
       ><path d="M-40 -20 L80 -20 L80 40 L-40 40 L-40 -20 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath30"
-      ><path d="M-76 -14 L152 -14 L152 28 L-76 28 L-76 -14 Z"
+      ><path d="M-90 -14 L180 -14 L180 28 L-90 28 L-90 -14 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath31"
       ><path d="M-66 -14 L132 -14 L132 28 L-66 28 L-66 -14 Z"
@@ -207,11 +207,11 @@
       >Removal</text
     ></g
     ><g font-size="11" transform="translate(382,292)" fill-opacity="1" fill="silver" text-rendering="geometricPrecision" font-family="sans-serif" stroke="silver" font-weight="bold" stroke-opacity="1"
-    ><rect x="0" width="80" height="64" y="0" clip-path="url(#clipPath9)" stroke="none"
+    ><rect x="0" width="93" height="64" y="0" clip-path="url(#clipPath9)" stroke="none"
     /></g
     ><g font-size="11" stroke-linecap="butt" transform="translate(382,292)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke="black" font-weight="bold" stroke-opacity="1" stroke-miterlimit="0"
-    ><rect fill="none" x="0" width="80" height="64" y="0" clip-path="url(#clipPath9)"
-      /><line y2="14" fill="none" x1="0" clip-path="url(#clipPath9)" x2="80" y1="14"
+    ><rect fill="none" x="0" width="93" height="64" y="0" clip-path="url(#clipPath9)"
+      /><line y2="14" fill="none" x1="0" clip-path="url(#clipPath9)" x2="93" y1="14"
     /></g
     ><g font-size="11" transform="translate(382,306)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
     ><text x="2" xml:space="preserve" y="13" clip-path="url(#clipPath10)" stroke="none"
@@ -222,28 +222,28 @@
       > attributes</text
     ></g
     ><g font-size="11" transform="translate(382,292)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" font-weight="bold" stroke-opacity="1"
-    ><text x="9" xml:space="preserve" y="11" clip-path="url(#clipPath3)" stroke="none"
-      >MemberOf</text
+    ><text x="8" xml:space="preserve" y="11" clip-path="url(#clipPath11)" stroke="none"
+      >HadMembers</text
     ></g
     ><g font-size="11" transform="translate(802,2)" fill-opacity="1" fill="rgb(179,214,249)" text-rendering="geometricPrecision" font-family="sans-serif" stroke="rgb(179,214,249)" font-weight="bold" stroke-opacity="1"
-    ><rect x="0" width="120" height="40" y="0" clip-path="url(#clipPath11)" stroke="none"
+    ><rect x="0" width="120" height="40" y="0" clip-path="url(#clipPath12)" stroke="none"
     /></g
     ><g font-size="11" stroke-linecap="butt" transform="translate(802,2)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke="black" font-weight="bold" stroke-opacity="1" stroke-miterlimit="0"
-    ><rect fill="none" x="0" width="120" height="40" y="0" clip-path="url(#clipPath11)"
-      /><line y2="28" fill="none" x1="0" clip-path="url(#clipPath11)" x2="120" y1="28"
+    ><rect fill="none" x="0" width="120" height="40" y="0" clip-path="url(#clipPath12)"
+      /><line y2="28" fill="none" x1="0" clip-path="url(#clipPath12)" x2="120" y1="28"
     /></g
     ><g font-size="11" transform="translate(802,2)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
-    ><text x="16" xml:space="preserve" y="11" clip-path="url(#clipPath13)" stroke="none"
+    ><text x="16" xml:space="preserve" y="11" clip-path="url(#clipPath14)" stroke="none"
       >&lt;&lt;prov:type&gt;&gt;</text
-      ><text x="13" xml:space="preserve" y="25" font-weight="bold" clip-path="url(#clipPath13)" stroke="none"
+      ><text x="13" xml:space="preserve" y="25" font-weight="bold" clip-path="url(#clipPath14)" stroke="none"
       >EmptyDictionary</text
     ></g
     ><g font-size="11" transform="translate(382,112)" fill-opacity="1" fill="silver" text-rendering="geometricPrecision" font-family="sans-serif" stroke="silver" font-weight="bold" stroke-opacity="1"
-    ><rect x="0" width="80" height="64" y="0" clip-path="url(#clipPath9)" stroke="none"
+    ><rect x="0" width="93" height="64" y="0" clip-path="url(#clipPath9)" stroke="none"
     /></g
     ><g font-size="11" stroke-linecap="butt" transform="translate(382,112)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke="black" font-weight="bold" stroke-opacity="1" stroke-miterlimit="0"
-    ><rect fill="none" x="0" width="80" height="64" y="0" clip-path="url(#clipPath9)"
-      /><line y2="14" fill="none" x1="0" clip-path="url(#clipPath9)" x2="80" y1="14"
+    ><rect fill="none" x="0" width="93" height="64" y="0" clip-path="url(#clipPath9)"
+      /><line y2="14" fill="none" x1="0" clip-path="url(#clipPath9)" x2="93" y1="14"
     /></g
     ><g font-size="11" transform="translate(382,126)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
     ><text x="2" xml:space="preserve" y="13" clip-path="url(#clipPath10)" stroke="none"
@@ -254,102 +254,83 @@
       > attributes</text
     ></g
     ><g font-size="11" transform="translate(382,112)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" font-weight="bold" stroke-opacity="1"
-    ><text x="9" xml:space="preserve" y="11" clip-path="url(#clipPath3)" stroke="none"
-      >MemberOf</text
+    ><text x="8" xml:space="preserve" y="11" clip-path="url(#clipPath11)" stroke="none"
+      >HadMembers</text
     ></g
     ><g font-size="11" stroke-linecap="butt" transform="translate(262,-28)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke="black" stroke-opacity="1"
-    ><line y2="50" fill="none" x1="50" clip-path="url(#clipPath15)" x2="179" y1="50"
-      /><polygon fill="white" clip-path="url(#clipPath15)" points=" 50 50 62 56 62 44" stroke="none"
-      /><polygon fill="none" points=" 50 50 62 56 62 44" clip-path="url(#clipPath15)"
-    /></g
-    ><g font-size="11" stroke-linecap="butt" transform="translate(502,-28)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke="black" stroke-opacity="1"
-    ><line y2="50" fill="none" x1="50" clip-path="url(#clipPath16)" x2="139" y1="50"
+    ><line y2="50" fill="none" x1="50" clip-path="url(#clipPath16)" x2="179" y1="50"
       /><polygon fill="white" clip-path="url(#clipPath16)" points=" 50 50 62 56 62 44" stroke="none"
       /><polygon fill="none" points=" 50 50 62 56 62 44" clip-path="url(#clipPath16)"
     /></g
+    ><g font-size="11" stroke-linecap="butt" transform="translate(502,-28)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke="black" stroke-opacity="1"
+    ><line y2="50" fill="none" x1="50" clip-path="url(#clipPath17)" x2="139" y1="50"
+      /><polygon fill="white" clip-path="url(#clipPath17)" points=" 50 50 62 56 62 44" stroke="none"
+      /><polygon fill="none" points=" 50 50 62 56 62 44" clip-path="url(#clipPath17)"
+    /></g
     ><g font-size="11" stroke-linecap="butt" transform="translate(62,-28)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke="black" stroke-opacity="1"
-    ><line y2="50" fill="none" x1="90" clip-path="url(#clipPath17)" x2="90" y1="219"
-      /><line y2="50" fill="none" x1="90" clip-path="url(#clipPath17)" x2="50" y1="50"
+    ><line y2="50" fill="none" x1="90" clip-path="url(#clipPath18)" x2="90" y1="219"
+      /><line y2="50" fill="none" x1="90" clip-path="url(#clipPath18)" x2="50" y1="50"
     /></g
     ><g font-size="11" stroke-linecap="butt" transform="translate(142,-28)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke="black" stroke-opacity="1"
-    ><line y2="50" fill="none" x1="50" clip-path="url(#clipPath18)" x2="50" y1="219"
-      /><line y2="50" fill="none" x1="50" clip-path="url(#clipPath18)" x2="89" y1="50"
+    ><line y2="50" fill="none" x1="50" clip-path="url(#clipPath19)" x2="50" y1="219"
+      /><line y2="50" fill="none" x1="50" clip-path="url(#clipPath19)" x2="89" y1="50"
     /></g
     ><g font-size="11" stroke-linecap="butt" transform="translate(562,-18)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke="black" stroke-opacity="1"
-    ><line y2="140" fill="none" x1="120" clip-path="url(#clipPath19)" x2="120" y1="60"
-      /><line y2="140" fill="none" x1="120" clip-path="url(#clipPath19)" x2="50" y1="140"
-      /><line y2="50" fill="none" x1="50" clip-path="url(#clipPath19)" x2="50" y1="140"
-      /><line y2="50" fill="none" x1="50" clip-path="url(#clipPath19)" x2="79" y1="50"
-      /><line y2="44" fill="none" x1="79" clip-path="url(#clipPath19)" x2="67" y1="50"
-      /><line y2="56" fill="none" x1="79" clip-path="url(#clipPath19)" x2="67" y1="50"
-    /></g
-    ><g font-size="11" stroke-linecap="butt" transform="translate(412,72)" stroke-dashoffset="1" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke-dasharray="5" stroke="black" stroke-opacity="1"
-    ><line y2="140" fill="none" x1="220" clip-path="url(#clipPath20)" x2="220" y1="50"
-      /><line y2="140" fill="none" x1="220" clip-path="url(#clipPath20)" x2="50" y1="140"
-    /></g
-    ><g font-size="11" stroke-linecap="butt" transform="translate(162,162)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke="black" stroke-opacity="1"
-    ><line y2="50" fill="none" x1="219" clip-path="url(#clipPath21)" x2="50" y1="50"
-    /></g
-    ><g font-size="11" stroke-linecap="butt" transform="translate(662,-28)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke="black" stroke-opacity="1"
-    ><line y2="150" fill="none" x1="50" clip-path="url(#clipPath22)" x2="50" y1="70"
-      /><line y2="150" fill="none" x1="50" clip-path="url(#clipPath22)" x2="110" y1="150"
-      /><line y2="50" fill="none" x1="110" clip-path="url(#clipPath22)" x2="110" y1="150"
-      /><line y2="50" fill="none" x1="110" clip-path="url(#clipPath22)" x2="90" y1="50"
-      /><line y2="82" fill="none" x1="50" clip-path="url(#clipPath22)" x2="44" y1="70"
-      /><line y2="82" fill="none" x1="50" clip-path="url(#clipPath22)" x2="56" y1="70"
+    ><line y2="140" fill="none" x1="120" clip-path="url(#clipPath20)" x2="120" y1="60"
+      /><line y2="140" fill="none" x1="120" clip-path="url(#clipPath20)" x2="50" y1="140"
+      /><line y2="50" fill="none" x1="50" clip-path="url(#clipPath20)" x2="50" y1="140"
+      /><line y2="50" fill="none" x1="50" clip-path="url(#clipPath20)" x2="79" y1="50"
+      /><line y2="44" fill="none" x1="79" clip-path="url(#clipPath20)" x2="67" y1="50"
+      /><line y2="56" fill="none" x1="79" clip-path="url(#clipPath20)" x2="67" y1="50"
     /></g
     ><g font-size="11" stroke-linecap="butt" transform="translate(412,72)" stroke-dashoffset="1" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke-dasharray="5" stroke="black" stroke-opacity="1"
-    ><line y2="320" fill="none" x1="340" clip-path="url(#clipPath23)" x2="340" y1="50"
-      /><line y2="320" fill="none" x1="340" clip-path="url(#clipPath23)" x2="50" y1="320"
+    ><line y2="140" fill="none" x1="220" clip-path="url(#clipPath21)" x2="220" y1="50"
+      /><line y2="140" fill="none" x1="220" clip-path="url(#clipPath21)" x2="50" y1="140"
+    /></g
+    ><g font-size="11" stroke-linecap="butt" transform="translate(162,162)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke="black" stroke-opacity="1"
+    ><line y2="50" fill="none" x1="219" clip-path="url(#clipPath22)" x2="50" y1="50"
+    /></g
+    ><g font-size="11" stroke-linecap="butt" transform="translate(662,-28)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke="black" stroke-opacity="1"
+    ><line y2="150" fill="none" x1="50" clip-path="url(#clipPath23)" x2="50" y1="70"
+      /><line y2="150" fill="none" x1="50" clip-path="url(#clipPath23)" x2="110" y1="150"
+      /><line y2="50" fill="none" x1="110" clip-path="url(#clipPath23)" x2="110" y1="150"
+      /><line y2="50" fill="none" x1="110" clip-path="url(#clipPath23)" x2="90" y1="50"
+      /><line y2="82" fill="none" x1="50" clip-path="url(#clipPath23)" x2="44" y1="70"
+      /><line y2="82" fill="none" x1="50" clip-path="url(#clipPath23)" x2="56" y1="70"
+    /></g
+    ><g font-size="11" stroke-linecap="butt" transform="translate(412,72)" stroke-dashoffset="1" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke-dasharray="5" stroke="black" stroke-opacity="1"
+    ><line y2="320" fill="none" x1="340" clip-path="url(#clipPath24)" x2="340" y1="50"
+      /><line y2="320" fill="none" x1="340" clip-path="url(#clipPath24)" x2="50" y1="320"
     /></g
     ><g font-size="11" stroke-linecap="butt" transform="translate(2,-8)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke="black" stroke-opacity="1"
-    ><line y2="400" fill="none" x1="379" clip-path="url(#clipPath24)" x2="50" y1="400"
-      /><line y2="50" fill="none" x1="50" clip-path="url(#clipPath24)" x2="50" y1="400"
+    ><line y2="400" fill="none" x1="379" clip-path="url(#clipPath25)" x2="50" y1="400"
+      /><line y2="50" fill="none" x1="50" clip-path="url(#clipPath25)" x2="50" y1="400"
     /></g
     ><g font-size="11" stroke-linecap="butt" transform="translate(142,-8)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke="black" stroke-opacity="1"
-    ><line y2="270" fill="none" x1="50" clip-path="url(#clipPath25)" x2="50" y1="240"
-      /><line y2="270" fill="none" x1="50" clip-path="url(#clipPath25)" x2="550" y1="270"
-      /><line y2="74" fill="none" x1="550" clip-path="url(#clipPath25)" x2="550" y1="270"
-      /><line y2="252" fill="none" x1="50" clip-path="url(#clipPath25)" x2="44" y1="240"
-      /><line y2="252" fill="none" x1="50" clip-path="url(#clipPath25)" x2="56" y1="240"
-      /><polygon fill="none" points=" 550 50 544 62 550 74 556 62" clip-path="url(#clipPath25)"
+    ><line y2="270" fill="none" x1="50" clip-path="url(#clipPath26)" x2="50" y1="240"
+      /><line y2="270" fill="none" x1="50" clip-path="url(#clipPath26)" x2="550" y1="270"
+      /><line y2="74" fill="none" x1="550" clip-path="url(#clipPath26)" x2="550" y1="270"
+      /><line y2="252" fill="none" x1="50" clip-path="url(#clipPath26)" x2="44" y1="240"
+      /><line y2="252" fill="none" x1="50" clip-path="url(#clipPath26)" x2="56" y1="240"
+      /><polygon fill="none" points=" 550 50 544 62 550 74 556 62" clip-path="url(#clipPath26)"
     /></g
     ><g font-size="11" stroke-linecap="butt" transform="translate(362,212)" stroke-dashoffset="1" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke-dasharray="5" stroke="black" stroke-opacity="1"
-    ><line y2="70" fill="none" x1="50" clip-path="url(#clipPath26)" x2="50" y1="50"
-      /><line y2="79" fill="none" x1="50" clip-path="url(#clipPath26)" x2="50" y1="70"
+    ><line y2="70" fill="none" x1="50" clip-path="url(#clipPath27)" x2="50" y1="50"
+      /><line y2="79" fill="none" x1="50" clip-path="url(#clipPath27)" x2="50" y1="70"
     /></g
     ><g font-size="11" stroke-linecap="butt" transform="translate(702,-38)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke="black" stroke-opacity="1"
-    ><line y2="50" fill="none" x1="50" clip-path="url(#clipPath27)" x2="99" y1="50"
-      /><polygon fill="white" clip-path="url(#clipPath27)" points=" 50 50 62 56 62 44" stroke="none"
-      /><polygon fill="none" points=" 50 50 62 56 62 44" clip-path="url(#clipPath27)"
-    /></g
-    ><g font-size="11" stroke-linecap="butt" transform="translate(222,-8)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke="black" stroke-opacity="1"
-    ><line y2="90" fill="none" x1="270" clip-path="url(#clipPath28)" x2="270" y1="74"
-      /><line y2="90" fill="none" x1="270" clip-path="url(#clipPath28)" x2="50" y1="90"
-      /><line y2="60" fill="none" x1="50" clip-path="url(#clipPath28)" x2="50" y1="90"
-      /><polygon fill="none" points=" 270 50 264 62 270 74 276 62" clip-path="url(#clipPath28)"
-      /><line y2="72" fill="none" x1="50" clip-path="url(#clipPath28)" x2="44" y1="60"
-      /><line y2="72" fill="none" x1="50" clip-path="url(#clipPath28)" x2="56" y1="60"
-    /></g
-    ><g font-size="11" stroke-linecap="butt" transform="translate(372,32)" stroke-dashoffset="1" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke-dasharray="5" stroke="black" stroke-opacity="1"
-    ><line y2="79" fill="none" x1="50" clip-path="url(#clipPath26)" x2="50" y1="50"
+    ><line y2="50" fill="none" x1="50" clip-path="url(#clipPath28)" x2="99" y1="50"
+      /><polygon fill="white" clip-path="url(#clipPath28)" points=" 50 50 62 56 62 44" stroke="none"
+      /><polygon fill="none" points=" 50 50 62 56 62 44" clip-path="url(#clipPath28)"
     /></g
     ><g font-size="11" transform="translate(712,42)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
     ><text x="9" xml:space="preserve" y="14" clip-path="url(#clipPath29)" stroke="none"
       >0..1</text
     ></g
-    ><g font-size="11" transform="translate(186,242)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
-    ><text x="10" xml:space="preserve" y="14" clip-path="url(#clipPath29)" stroke="none"
-      >1..*</text
-    ></g
     ><g font-size="11" transform="translate(122,22)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
     ><text x="16" xml:space="preserve" y="14" clip-path="url(#clipPath29)" stroke="none"
       >1</text
     ></g
-    ><g font-size="11" transform="translate(272,52)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
-    ><text x="10" xml:space="preserve" y="14" clip-path="url(#clipPath29)" stroke="none"
-      >1..*</text
-    ></g
     ><g font-size="11" transform="translate(612,32)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
     ><text x="9" xml:space="preserve" y="14" clip-path="url(#clipPath29)" stroke="none"
       >0..1</text
@@ -366,13 +347,9 @@
     ><text x="16" xml:space="preserve" y="14" clip-path="url(#clipPath29)" stroke="none"
       >1</text
     ></g
-    ><g font-size="11" transform="translate(349,68)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
-    ><text x="9" xml:space="preserve" y="11" clip-path="url(#clipPath30)" stroke="none"
-      >MemberOf</text
-    ></g
     ><g font-size="11" transform="translate(277,272)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
     ><text x="9" xml:space="preserve" y="11" clip-path="url(#clipPath30)" stroke="none"
-      >MemberOf</text
+      >HadMembers</text
     ></g
     ><g font-size="11" transform="translate(752,132)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
     ><text x="9" xml:space="preserve" y="11" clip-path="url(#clipPath31)" stroke="none"
Binary file model/uml/component6.png has changed
--- a/model/uml/component6.svg	Wed Jul 11 08:34:30 2012 -0400
+++ b/model/uml/component6.svg	Wed Jul 11 08:34:45 2012 -0400
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.0//EN'
           'http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd'>
-<svg fill-opacity="0" xmlns:xlink="http://www.w3.org/1999/xlink" color-rendering="auto" color-interpolation="auto" stroke="rgb(0,0,0)" text-rendering="auto" stroke-linecap="square" width="546" stroke-miterlimit="10" stroke-opacity="0" shape-rendering="auto" fill="rgb(0,0,0)" stroke-dasharray="none" font-weight="normal" stroke-width="1" height="180" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" font-style="normal" stroke-linejoin="miter" font-size="12" stroke-dashoffset="0" image-rendering="auto"
+<svg fill-opacity="0" xmlns:xlink="http://www.w3.org/1999/xlink" color-rendering="auto" color-interpolation="auto" stroke="rgb(0,0,0)" text-rendering="auto" stroke-linecap="square" width="546" stroke-miterlimit="10" stroke-opacity="0" shape-rendering="auto" fill="rgb(0,0,0)" stroke-dasharray="none" font-weight="normal" stroke-width="1" height="186" xmlns="http://www.w3.org/2000/svg" font-family="&apos;Dialog&apos;" font-style="normal" stroke-linejoin="miter" font-size="12" stroke-dashoffset="0" image-rendering="auto"
 ><!--Generated by the Batik Graphics2D SVG Generator--><defs id="genericDefs"
   /><g
   ><defs id="defs1"
@@ -15,13 +15,13 @@
       ><path d="M0 0 L80 0 L80 14 L0 14 L0 0 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath4"
-      ><path d="M-7 -7 L91 -7 L91 75 L-7 75 L-7 -7 Z"
+      ><path d="M-7 -7 L111 -7 L111 81 L-7 81 L-7 -7 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath5"
-      ><path d="M0 0 L0 61 L80 61 L80 0 Z"
+      ><path d="M0 0 L0 67 L100 67 L100 0 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath6"
-      ><path d="M-7 -7 L51 -7 L51 31 L-7 31 L-7 -7 Z"
+      ><path d="M0 0 L100 0 L100 14 L0 14 L0 0 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath7"
       ><path d="M-7 -7 L121 -7 L121 51 L-7 51 L-7 -7 Z"
@@ -54,14 +54,11 @@
       ><path d="M0 0 L213 0 L213 104 L0 104 L0 0 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath17"
-      ><path d="M-76 -14 L152 -14 L152 28 L-76 28 L-76 -14 Z"
-      /></clipPath
-      ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath18"
-      ><path d="M-40 -20 L80 -20 L80 40 L-40 40 L-40 -20 Z"
+      ><path d="M-90 -14 L180 -14 L180 28 L-90 28 L-90 -14 Z"
       /></clipPath
     ></defs
     ><g fill="white" text-rendering="geometricPrecision" fill-opacity="1" stroke-opacity="1" stroke="white"
-    ><rect x="0" width="546" height="180" y="0" stroke="none"
+    ><rect x="0" width="546" height="186" y="0" stroke="none"
     /></g
     ><g font-size="11" transform="translate(2,2)" fill-opacity="1" fill="rgb(122,207,245)" text-rendering="geometricPrecision" font-family="sans-serif" stroke="rgb(122,207,245)" font-weight="bold" stroke-opacity="1"
     ><rect x="0" width="80" height="50" y="0" clip-path="url(#clipPath1)" stroke="none"
@@ -81,11 +78,11 @@
       >Entity</text
     ></g
     ><g font-size="11" transform="translate(122,112)" fill-opacity="1" fill="silver" text-rendering="geometricPrecision" font-family="sans-serif" stroke="silver" font-weight="bold" stroke-opacity="1"
-    ><rect x="0" width="80" height="64" y="0" clip-path="url(#clipPath4)" stroke="none"
+    ><rect x="0" width="100" height="70" y="0" clip-path="url(#clipPath4)" stroke="none"
     /></g
     ><g font-size="11" stroke-linecap="butt" transform="translate(122,112)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke="black" font-weight="bold" stroke-opacity="1" stroke-miterlimit="0"
-    ><rect fill="none" x="0" width="80" height="64" y="0" clip-path="url(#clipPath4)"
-      /><line y2="14" fill="none" x1="0" clip-path="url(#clipPath4)" x2="80" y1="14"
+    ><rect fill="none" x="0" width="100" height="70" y="0" clip-path="url(#clipPath4)"
+      /><line y2="14" fill="none" x1="0" clip-path="url(#clipPath4)" x2="100" y1="14"
     /></g
     ><g font-size="11" transform="translate(122,126)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
     ><text x="2" xml:space="preserve" y="13" clip-path="url(#clipPath5)" stroke="none"
@@ -96,8 +93,8 @@
       > attributes</text
     ></g
     ><g font-size="11" transform="translate(122,112)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" font-weight="bold" stroke-opacity="1"
-    ><text x="9" xml:space="preserve" y="11" clip-path="url(#clipPath3)" stroke="none"
-      >MemberOf</text
+    ><text x="12" xml:space="preserve" y="11" clip-path="url(#clipPath6)" stroke="none"
+      >HadMembers</text
     ></g
     ><g font-size="11" transform="translate(202,2)" fill-opacity="1" fill="rgb(179,214,249)" text-rendering="geometricPrecision" font-family="sans-serif" stroke="rgb(179,214,249)" font-weight="bold" stroke-opacity="1"
     ><rect x="0" width="110" height="40" y="0" clip-path="url(#clipPath7)" stroke="none"
@@ -146,13 +143,9 @@
       /><polygon fill="white" clip-path="url(#clipPath16)" points=" 50 50 62 56 62 44" stroke="none"
       /><polygon fill="none" points=" 50 50 62 56 62 44" clip-path="url(#clipPath16)"
     /></g
-    ><g font-size="11" transform="translate(82,92)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
+    ><g font-size="11" transform="translate(72,92)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
     ><text x="9" xml:space="preserve" y="11" clip-path="url(#clipPath17)" stroke="none"
-      >MemberOf</text
-    ></g
-    ><g font-size="11" transform="translate(42,52)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
-    ><text x="10" xml:space="preserve" y="14" clip-path="url(#clipPath18)" stroke="none"
-      >1..*</text
+      >HadMembers</text
     ></g
     ><g fill="rgb(120,120,120)" text-rendering="geometricPrecision" fill-opacity="1" font-size="8" stroke-opacity="1" stroke="rgb(120,120,120)"
     ></g